From e730c74f0d2fa7963f344de3743f79b7133318f8 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Wed, 28 Jun 2017 13:22:53 +0200
Subject: [PATCH 001/826] Initialize chrome infrastructure config branch

---
 README.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 000000000000..0513e02f6f46
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+Configuration for chrome infrastructure services

From 78a2ee6fc7809e1481dce9ce674accc6d6c0f41b Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Fri, 30 Jun 2017 13:45:07 +0200
Subject: [PATCH 002/826] Add initial buildbucket configuration for dart
 trybots

Bug:
Change-Id: I1704e58e6fc4d189b9743a1b778023f0bf21bf93
---
 OWNERS              |  3 +++
 codereview.settings |  4 ++++
 cr-buildbucket.cfg  | 27 +++++++++++++++++++++++++++
 project.cfg         |  5 +++++
 refs.cfg            |  6 ++++++
 5 files changed, 45 insertions(+)
 create mode 100644 OWNERS
 create mode 100644 codereview.settings
 create mode 100644 cr-buildbucket.cfg
 create mode 100644 project.cfg
 create mode 100644 refs.cfg

diff --git a/OWNERS b/OWNERS
new file mode 100644
index 000000000000..bca822ed0176
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,3 @@
+whesse@google.com
+kustermann@google.com
+tandrii@google.com
diff --git a/codereview.settings b/codereview.settings
new file mode 100644
index 000000000000..7313cb6ffc10
--- /dev/null
+++ b/codereview.settings
@@ -0,0 +1,4 @@
+CODE_REVIEW_SERVER: https://dart-review.googlesource.com
+CC_LIST: whesse@google.com
+VIEW_VC: https://dart.googlesource.com/sdk/+/
+PROJECT: dart
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
new file mode 100644
index 000000000000..2862bb0f63df
--- /dev/null
+++ b/cr-buildbucket.cfg
@@ -0,0 +1,27 @@
+# Defines buckets on cr-buildbucket.appspot.com, used to schedule builds
+# on buildbot. In particular, CQ uses some of these buckets to schedule tryjobs.
+#
+# See http://luci-config.appspot.com/schemas/projects:buildbucket.cfg for
+# schema of this file and documentation.
+#
+# Please keep this list sorted by bucket name.
+
+buckets {
+  name: "master.tryserver.client.dart"
+  acls {
+    role: READER
+    group: "all"
+  }
+  acls {
+    role: SCHEDULER
+    group: "service-account-dart-trybots"
+  }
+  acls {
+    role: SCHEDULER
+    group: "service-account-cq"
+  }
+   acls {
+    role: WRITER
+    group: "service-account-dart-trybots"
+  }
+}
diff --git a/project.cfg b/project.cfg
new file mode 100644
index 000000000000..617702a87c27
--- /dev/null
+++ b/project.cfg
@@ -0,0 +1,5 @@
+# For the schema of this file and documentation, see ProjectCfg message in
+# https://luci-config.appspot.com/schemas/projects:project.cfg
+
+name: "Dart"
+access: "group:all" # public
diff --git a/refs.cfg b/refs.cfg
new file mode 100644
index 000000000000..6cceaff29b30
--- /dev/null
+++ b/refs.cfg
@@ -0,0 +1,6 @@
+# Schema of this file:
+# https://luci-config.appspot.com/schemas/projects:refs.cfg
+refs {
+  name: "refs/heads/master"
+  config_path: "tools/infra/config"
+}

From 9f8af3e381088e76ebc7d238e170692eb3075115 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Mon, 3 Jul 2017 18:18:11 +0200
Subject: [PATCH 003/826] Commit queue: Address comments on CL
 https://dart-review.googlesource.com/c/2241/

Bug: https://bugs.chromium.org/p/chromium/issues/detail?id=735039
Change-Id: I57e106ab4e5354b2c2e3c48c42d959f58342c6a3
---
 codereview.settings | 1 -
 cr-buildbucket.cfg  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/codereview.settings b/codereview.settings
index 7313cb6ffc10..8defd0414fb7 100644
--- a/codereview.settings
+++ b/codereview.settings
@@ -1,4 +1,3 @@
 CODE_REVIEW_SERVER: https://dart-review.googlesource.com
 CC_LIST: whesse@google.com
 VIEW_VC: https://dart.googlesource.com/sdk/+/
-PROJECT: dart
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 2862bb0f63df..b077e6f862cb 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -14,7 +14,7 @@ buckets {
   }
   acls {
     role: SCHEDULER
-    group: "service-account-dart-trybots"
+    group: "project-dart-tryjob-access"
   }
   acls {
     role: SCHEDULER

From 547e9e6e85638237166628e0284fed5d6b3d8719 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Mon, 3 Jul 2017 21:53:20 +0200
Subject: [PATCH 004/826] Switch to service-account-v8.json creds temporarily

Change-Id: I51a25ca9be67534c4c958077cedc9903ff3c23a3
---
 cr-buildbucket.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index b077e6f862cb..7e12b7868e2e 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -22,6 +22,6 @@ buckets {
   }
    acls {
     role: WRITER
-    group: "service-account-dart-trybots"
+    group: "service-account-v8-master"
   }
 }

From 23c692f66cd14adeb218d7e76c870560a6ae7f38 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Thu, 27 Jul 2017 15:19:07 +0200
Subject: [PATCH 005/826] Change buildbucket config to use swarming, no master

Bug:
Change-Id: I150e5aa7d572de8126a46affa7e63e6f949a644c
---
 cr-buildbucket.cfg | 68 ++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 63 insertions(+), 5 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 7e12b7868e2e..de072a08455f 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -6,8 +6,8 @@
 #
 # Please keep this list sorted by bucket name.
 
-buckets {
-  name: "master.tryserver.client.dart"
+acl_sets {
+  name: "tryserver"
   acls {
     role: READER
     group: "all"
@@ -20,8 +20,66 @@ buckets {
     role: SCHEDULER
     group: "service-account-cq"
   }
-   acls {
-    role: WRITER
-    group: "service-account-v8-master"
+}
+
+buckets {
+  name: "luci.dart.try"
+  acl_sets: "tryserver"
+
+  swarming {
+    hostname: "chromium-swarm.appspot.com"
+    url_format: "https://ci.chromium.org/swarming/task/{task_id}"
+    builder_defaults {
+      category: "Dart CQ"
+      dimensions: "cpu:x86-64"
+      dimensions: "pool:Dart.LUCI"
+      recipe {
+        repository: "https://chromium.googlesource.com/chromium/tools/build.git"
+        properties: "mastername:dart.try"
+        name: "dart/dart_vm"
+      }
+    }
+    builders {
+      name: "vm-linux-release-x64-try"
+      dimensions: "os:Ubuntu-14.04"
+      recipe {
+        properties: "buildername:vm-linux-release-x64-try"
+      }
+    }
+    builders {
+      name: "vm-linux-debug-x64-try"
+      dimensions: "os:Ubuntu-14.04"
+      recipe {
+        properties: "buildername:vm-linux-debug-x64-try"
+      }
+    }
+    builders {
+      name: "vm-mac-release-x64-try"
+      dimensions: "os:Mac"
+      recipe {
+        properties: "buildername:vm-mac-release-x64-try"
+      }
+    }
+    builders {
+      name: "vm-mac-debug-x64-try"
+      dimensions: "os:Mac"
+      recipe {
+        properties: "buildername:vm-mac-debug-x64-try"
+      }
+    }
+    builders {
+      name: "vm-win-release-x64-try"
+      dimensions: "os:Windows"
+      recipe {
+        properties: "buildername:vm-win-release-x64-try"
+      }
+    }
+    builders {
+      name: "vm-win-debug-x64-try"
+      dimensions: "os:Windows"
+      recipe {
+        properties: "buildername:vm-win-debug-x64-try"
+      }
+    }
   }
 }

From 51c1917b88897b2d9d00560994bc4d0bf4d8194b Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Thu, 27 Jul 2017 15:53:45 +0200
Subject: [PATCH 006/826] Remove explicit buildername property from builders -
 it is set from name

Bug:
Change-Id: Ib5d6fc047307bca0bbc58d36188f83f5806ea30b
---
 cr-buildbucket.cfg | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index de072a08455f..d544f82cffd5 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -42,44 +42,26 @@ buckets {
     builders {
       name: "vm-linux-release-x64-try"
       dimensions: "os:Ubuntu-14.04"
-      recipe {
-        properties: "buildername:vm-linux-release-x64-try"
-      }
     }
     builders {
       name: "vm-linux-debug-x64-try"
       dimensions: "os:Ubuntu-14.04"
-      recipe {
-        properties: "buildername:vm-linux-debug-x64-try"
-      }
     }
     builders {
       name: "vm-mac-release-x64-try"
       dimensions: "os:Mac"
-      recipe {
-        properties: "buildername:vm-mac-release-x64-try"
-      }
     }
     builders {
       name: "vm-mac-debug-x64-try"
       dimensions: "os:Mac"
-      recipe {
-        properties: "buildername:vm-mac-debug-x64-try"
-      }
     }
     builders {
       name: "vm-win-release-x64-try"
       dimensions: "os:Windows"
-      recipe {
-        properties: "buildername:vm-win-release-x64-try"
-      }
     }
     builders {
       name: "vm-win-debug-x64-try"
       dimensions: "os:Windows"
-      recipe {
-        properties: "buildername:vm-win-debug-x64-try"
-      }
     }
   }
 }

From 5bc60b58f35411bcadae278b516358d1e3d8629e Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Thu, 27 Jul 2017 16:12:16 +0200
Subject: [PATCH 007/826] Add luci-logdog configuration to project

Bug:
Change-Id: I6fefd7c5899b51e2d0ec10083ee2a2b7edf8d350
---
 luci-logdog.cfg | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 luci-logdog.cfg

diff --git a/luci-logdog.cfg b/luci-logdog.cfg
new file mode 100644
index 000000000000..8b232e90d2e5
--- /dev/null
+++ b/luci-logdog.cfg
@@ -0,0 +1,14 @@
+# Copyright (c) 2017 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+#
+# For the schema of this file and documentation, see ProjectConfig message in
+# https://luci-config.appspot.com/schemas/services/luci-logdog:logdog.cfg
+# Auth groups who can read log streams.
+reader_auth_groups: "all"
+# Auth groups who can register and emit new log streams.
+writer_auth_groups: "luci-logdog-chromium-writers"
+# The base Google Storage archival path for this project.
+#
+# Archived LogDog logs will be written to this bucket/path.
+archive_gs_bucket: "chromium-luci-logdog"

From 253958341118c38c2989a75dd0be100cdca96041 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Thu, 27 Jul 2017 16:46:03 +0200
Subject: [PATCH 008/826] Add 3 new recipes to trybot builders in buildbucket
 config

Bug:
Change-Id: I449557d058a826a6d69facc63b8eb2e2baabec4a
---
 cr-buildbucket.cfg | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index d544f82cffd5..02a45fbdc063 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -63,5 +63,26 @@ buckets {
       name: "vm-win-debug-x64-try"
       dimensions: "os:Windows"
     }
+    builders {
+      name: "dart2js-linux-d8-hostchecked-unittest-try"
+      dimensions: "os:Ubuntu-14.04"
+      recipe {
+        name: "dart/dart2js"
+      }
+    }
+    builders {
+      name: "analyzer-linux-release-strong-try"
+      dimensions: "os:Ubuntu-14.04"
+      recipe {
+        name: "dart/packages"
+      }
+    }
+    builders {
+      name: "dart-sdk-linux-try"
+      dimensions: "os:Ubuntu-14.04"
+      recipe {
+        name: "dart/sdk_builder"
+      }
+    }
   }
 }

From e360338f2234cc5e72d8834d96d9218666515394 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Fri, 28 Jul 2017 11:17:19 +0200
Subject: [PATCH 009/826] Remove sdk builder, change analyzer recipe in
 buildbucket config.

Bug:
Change-Id: Ic4666b9f9024a3e8e234721d5777096afcab1fed
---
 cr-buildbucket.cfg | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 02a45fbdc063..0914caf3e884 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -74,14 +74,7 @@ buckets {
       name: "analyzer-linux-release-strong-try"
       dimensions: "os:Ubuntu-14.04"
       recipe {
-        name: "dart/packages"
-      }
-    }
-    builders {
-      name: "dart-sdk-linux-try"
-      dimensions: "os:Ubuntu-14.04"
-      recipe {
-        name: "dart/sdk_builder"
+        name: "dart/analyzer_swarming"
       }
     }
   }

From f1a39685456ef0e8fa212dbdef2cafe0bee5a43d Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 15 Aug 2017 09:15:31 +0200
Subject: [PATCH 010/826] Adding ddc try builder

Bug:
Change-Id: I5207326fd21bf5cb8a99a1d34032cb3a50a5cd80
---
 cr-buildbucket.cfg | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 0914caf3e884..6ebf79967773 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -70,6 +70,13 @@ buckets {
         name: "dart/dart2js"
       }
     }
+    builders {
+      name: "ddc-linux-release-be-try"
+      dimensions: "os:Ubuntu-14.04"
+      recipe {
+        name: "dart/ddc"
+      }
+    }
     builders {
       name: "analyzer-linux-release-strong-try"
       dimensions: "os:Ubuntu-14.04"

From c7984b541b998d23aca89a3b3e20414de9ae9f01 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 15 Aug 2017 10:11:50 +0200
Subject: [PATCH 011/826] Use swarming recipe for try bots

Bug:
Change-Id: I0ea2455335b630fc9afc19057ec983a08fae6536
---
 cr-buildbucket.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 6ebf79967773..2ce27c4d86e4 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -74,7 +74,7 @@ buckets {
       name: "ddc-linux-release-be-try"
       dimensions: "os:Ubuntu-14.04"
       recipe {
-        name: "dart/ddc"
+        name: "dart/ddc_swarming"
       }
     }
     builders {

From 3a0a0fcaa0e41e07bb7b9440941000a884bbab5c Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 15 Aug 2017 11:18:28 +0200
Subject: [PATCH 012/826] Remove -be added by mistake

Bug:
Change-Id: Id42f9180094f632c56b48613b4a1a509658db37d
---
 cr-buildbucket.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 2ce27c4d86e4..6e2194a05f0a 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -71,7 +71,7 @@ buckets {
       }
     }
     builders {
-      name: "ddc-linux-release-be-try"
+      name: "ddc-linux-release-try"
       dimensions: "os:Ubuntu-14.04"
       recipe {
         name: "dart/ddc_swarming"

From dc1c44e26b11cb0ce89bd977f213e36ad7593a70 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 15 Aug 2017 18:21:04 +0200
Subject: [PATCH 013/826] Add vm-kernel builders

Bug:
Change-Id: I28fc18527329c69d93e65853604a2c73cfbc0edd
---
 cr-buildbucket.cfg | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 6e2194a05f0a..ffb05fcc5e5c 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -63,6 +63,34 @@ buckets {
       name: "vm-win-debug-x64-try"
       dimensions: "os:Windows"
     }
+    builders {
+      name: "vm-kernel-linux-release-x64-try"
+      dimensions: "os:Ubuntu-14.04"
+      recipe {
+        name: "dart/vm_kernel_swarming"
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-debug-x64-try"
+      dimensions: "os:Ubuntu-14.04"
+      recipe {
+        name: "dart/vm_kernel_swarming"
+      }
+    }
+    builders {
+      name: "vm-kernel-mac-release-x64-try"
+      dimensions: "os:Mac"
+      recipe {
+        name: "dart/vm_kernel_swarming"
+      }
+    }
+    builders {
+      name: "vm-kernel-mac-debug-x64-try"
+      dimensions: "os:Mac"
+      recipe {
+        name: "dart/vm_kernel_swarming"
+      }
+    }
     builders {
       name: "dart2js-linux-d8-hostchecked-unittest-try"
       dimensions: "os:Ubuntu-14.04"

From 3e78310b0ece1050e1e851bd759fd15173fbb584 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 17 Aug 2017 09:31:09 +0200
Subject: [PATCH 014/826] Use swarming recipe for dart2js

Bug:
Change-Id: Iffdf057a24d3aec20a448902804de715824cd038
---
 cr-buildbucket.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index ffb05fcc5e5c..592712df9b37 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -95,7 +95,7 @@ buckets {
       name: "dart2js-linux-d8-hostchecked-unittest-try"
       dimensions: "os:Ubuntu-14.04"
       recipe {
-        name: "dart/dart2js"
+        name: "dart/dart2js_swarming"
       }
     }
     builders {

From e9b164da2041ee92f118356b36f9c9d1014ef95f Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 21 Aug 2017 09:28:29 +0200
Subject: [PATCH 015/826] Add pkg-linux-release-try builder

Bug:
Change-Id: I006b9a1743dbc0572c4bb185952070217aa7aa0a
---
 cr-buildbucket.cfg | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 592712df9b37..f662c2260037 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -112,5 +112,12 @@ buckets {
         name: "dart/analyzer_swarming"
       }
     }
+    builders {
+      name: "pkg-linux-release-try"
+      dimensions: "os:Ubuntu-14.04"
+      recipe {
+        name: "dart/analyzer_swarming"
+      }
+    }
   }
 }

From 95b6078e7d4a7eec45076587bf7c6b04483bea8c Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 21 Aug 2017 17:02:22 +0200
Subject: [PATCH 016/826] Add shards build property to the builders that
 require it or will require soon

Bug:
Change-Id: If92c8abf7e3217323285f40a62f377947a8f9462
---
 cr-buildbucket.cfg | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index f662c2260037..bc6ac046b648 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -68,6 +68,7 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
       recipe {
         name: "dart/vm_kernel_swarming"
+        properties_j: "shards:6"
       }
     }
     builders {
@@ -75,6 +76,7 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
       recipe {
         name: "dart/vm_kernel_swarming"
+        properties_j: "shards:6"
       }
     }
     builders {
@@ -82,6 +84,7 @@ buckets {
       dimensions: "os:Mac"
       recipe {
         name: "dart/vm_kernel_swarming"
+        properties_j: "shards:6"
       }
     }
     builders {
@@ -89,6 +92,7 @@ buckets {
       dimensions: "os:Mac"
       recipe {
         name: "dart/vm_kernel_swarming"
+        properties_j: "shards:6"
       }
     }
     builders {
@@ -96,6 +100,7 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
       recipe {
         name: "dart/dart2js_swarming"
+        properties_j: "shards:6"
       }
     }
     builders {

From f4268f51f97f1b1c0abb9d6071fe35f786d5e053 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 21 Aug 2017 19:56:58 +0200
Subject: [PATCH 017/826] Add 'dart2js-linux-chrome-try' builder

Bug:
Change-Id: I5d8227bf3caf9d7e05a41505585bbe9dc68a0aaf
Reviewed-on: https://dart-review.googlesource.com/2785
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index bc6ac046b648..b24f90d5c6bc 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -95,6 +95,14 @@ buckets {
         properties_j: "shards:6"
       }
     }
+    builders {
+      name: "dart2js-linux-chrome-try"
+      dimensions: "os:Ubuntu-14.04"
+      recipe {
+        name: "dart/dart2js_swarming"
+        properties_j: "shards:6"
+      }
+    }
     builders {
       name: "dart2js-linux-d8-hostchecked-unittest-try"
       dimensions: "os:Ubuntu-14.04"

From bd15ea11020d0ab9a151d8cd374a498be06c05d9 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 29 Aug 2017 16:55:51 +0200
Subject: [PATCH 018/826] Add try builders for dartjs (ie/edge), precomp, and
 vm product.

Bug:
Change-Id: I5c34a439dfda050248856b4b606735f6a93da6fb
Reviewed-on: https://dart-review.googlesource.com/2801
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index b24f90d5c6bc..99037370b4d7 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -63,6 +63,14 @@ buckets {
       name: "vm-win-debug-x64-try"
       dimensions: "os:Windows"
     }
+    builders {
+      name: "precomp-linux-release-x64-try"
+      dimensions: "os:Ubuntu-14.04"
+    }
+    builders {
+      name: "vm-linux-product-x64-try"
+      dimensions: "os:Ubuntu-14.04"
+    }
     builders {
       name: "vm-kernel-linux-release-x64-try"
       dimensions: "os:Ubuntu-14.04"
@@ -111,6 +119,22 @@ buckets {
         properties_j: "shards:6"
       }
     }
+    builders {
+      name: "dart2js-win10-ie11-try"
+      dimensions: "os:Windows-10"
+      recipe {
+        name: "dart/dart2js_swarming"
+        properties_j: "shards:6"
+      }
+    }
+    builders {
+      name: "dart2js-win10-edge-try"
+      dimensions: "os:Windows-10"
+      recipe {
+        name: "dart/dart2js_swarming"
+        properties_j: "shards:6"
+      }
+    }
     builders {
       name: "ddc-linux-release-try"
       dimensions: "os:Ubuntu-14.04"

From 61f55e6c679c76988cd1cf072230dfed6e613813 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 6 Sep 2017 17:37:11 +0200
Subject: [PATCH 019/826] Add SDK builders to config

Bug:
Change-Id: I751678ed6f0d37a246a326984c646dfc78a7d9c2
Reviewed-on: https://dart-review.googlesource.com/3641
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 99037370b4d7..4b9261614038 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -111,6 +111,27 @@ buckets {
         properties_j: "shards:6"
       }
     }
+    builders {
+      name: "dart-sdk-linux-try"
+      dimensions: "os:Ubuntu-14.04"
+      recipe {
+        name: "dart/sdk_swarming"
+      }
+    }
+    builders {
+      name: "dart-sdk-mac-try"
+      dimensions: "os:Mac"
+      recipe {
+        name: "dart/sdk_swarming"
+      }
+    }
+    builders {
+      name: "dart-sdk-windows-try"
+      dimensions: "os:Windows"
+      recipe {
+        name: "dart/sdk_swarming"
+      }
+    }
     builders {
       name: "dart2js-linux-d8-hostchecked-unittest-try"
       dimensions: "os:Ubuntu-14.04"

From 3d00ea18f767bca46ebc89f8b46bae90d743fe36 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 18 Sep 2017 17:51:21 +0000
Subject: [PATCH 020/826] Add builders to extract unit tests from dart2js d8
 builder to a separate builder

Bug:
Change-Id: I9fa10847d2591685a42b3a7f5780f3be4c9786d5
Reviewed-on: https://dart-review.googlesource.com/6465
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 4b9261614038..687eebddf132 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -140,6 +140,21 @@ buckets {
         properties_j: "shards:6"
       }
     }
+    builders {
+      name: "dart2js-linux-d8-hostchecked-try"
+      dimensions: "os:Ubuntu-14.04"
+      recipe {
+        name: "dart/dart2js_swarming"
+        properties_j: "shards:6"
+      }
+    }
+    builders {
+      name: "dart2js-linux-none-only-unittest-try"
+      dimensions: "os:Ubuntu-14.04"
+      recipe {
+        name: "dart/dart2js_swarming"
+      }
+    }
     builders {
       name: "dart2js-win10-ie11-try"
       dimensions: "os:Windows-10"

From 66032dac62d81ed8c383276cedf9e09a2b01ccbe Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 18 Sep 2017 17:51:21 +0000
Subject: [PATCH 021/826] Use 8 core machines for the vm mac tests

Bug:
Change-Id: I96a9aedf0c47d6fa379ea1fd60cabef078559800
Reviewed-on: https://dart-review.googlesource.com/6581
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 687eebddf132..fd182d2f57c9 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -50,10 +50,12 @@ buckets {
     builders {
       name: "vm-mac-release-x64-try"
       dimensions: "os:Mac"
+      dimensions: "cores:8"
     }
     builders {
       name: "vm-mac-debug-x64-try"
       dimensions: "os:Mac"
+      dimensions: "cores:8"
     }
     builders {
       name: "vm-win-release-x64-try"

From 7020bc37370d5c656439bdff2c6f9f231be905ae Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 26 Sep 2017 17:43:49 +0000
Subject: [PATCH 022/826] Add hostchecked builder for analyzer to buildbucket
 config

Bug:
Change-Id: Ife4f0808f50de485c48353bff377dd4e34956b48
Reviewed-on: https://dart-review.googlesource.com/8562
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index fd182d2f57c9..23dcd0937872 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -187,6 +187,13 @@ buckets {
         name: "dart/analyzer_swarming"
       }
     }
+    builders {
+      name: "analyzer-linux-release-strong-hostchecked-try"
+      dimensions: "os:Ubuntu-14.04"
+      recipe {
+        name: "dart/analyzer_swarming"
+      }
+    }
     builders {
       name: "pkg-linux-release-try"
       dimensions: "os:Ubuntu-14.04"

From 9704babc933a11a001217e2990f238d84cc2f078 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 28 Sep 2017 08:59:27 +0000
Subject: [PATCH 023/826] Change dimensions to match the sharded tasks

Change-Id: Ib6e8e8ca5a277500c39f581a9f07a789b184b09c
Reviewed-on: https://dart-review.googlesource.com/9180
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 23dcd0937872..7150a55b052b 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -33,6 +33,7 @@ buckets {
       category: "Dart CQ"
       dimensions: "cpu:x86-64"
       dimensions: "pool:Dart.LUCI"
+      dimensions: "os:Linux"
       recipe {
         repository: "https://chromium.googlesource.com/chromium/tools/build.git"
         properties: "mastername:dart.try"
@@ -41,11 +42,9 @@ buckets {
     }
     builders {
       name: "vm-linux-release-x64-try"
-      dimensions: "os:Ubuntu-14.04"
     }
     builders {
       name: "vm-linux-debug-x64-try"
-      dimensions: "os:Ubuntu-14.04"
     }
     builders {
       name: "vm-mac-release-x64-try"
@@ -67,15 +66,12 @@ buckets {
     }
     builders {
       name: "precomp-linux-release-x64-try"
-      dimensions: "os:Ubuntu-14.04"
     }
     builders {
       name: "vm-linux-product-x64-try"
-      dimensions: "os:Ubuntu-14.04"
     }
     builders {
       name: "vm-kernel-linux-release-x64-try"
-      dimensions: "os:Ubuntu-14.04"
       recipe {
         name: "dart/vm_kernel_swarming"
         properties_j: "shards:6"
@@ -83,7 +79,6 @@ buckets {
     }
     builders {
       name: "vm-kernel-linux-debug-x64-try"
-      dimensions: "os:Ubuntu-14.04"
       recipe {
         name: "dart/vm_kernel_swarming"
         properties_j: "shards:6"
@@ -107,7 +102,6 @@ buckets {
     }
     builders {
       name: "dart2js-linux-chrome-try"
-      dimensions: "os:Ubuntu-14.04"
       recipe {
         name: "dart/dart2js_swarming"
         properties_j: "shards:6"
@@ -115,7 +109,6 @@ buckets {
     }
     builders {
       name: "dart-sdk-linux-try"
-      dimensions: "os:Ubuntu-14.04"
       recipe {
         name: "dart/sdk_swarming"
       }
@@ -136,7 +129,6 @@ buckets {
     }
     builders {
       name: "dart2js-linux-d8-hostchecked-unittest-try"
-      dimensions: "os:Ubuntu-14.04"
       recipe {
         name: "dart/dart2js_swarming"
         properties_j: "shards:6"
@@ -144,7 +136,6 @@ buckets {
     }
     builders {
       name: "dart2js-linux-d8-hostchecked-try"
-      dimensions: "os:Ubuntu-14.04"
       recipe {
         name: "dart/dart2js_swarming"
         properties_j: "shards:6"
@@ -152,7 +143,6 @@ buckets {
     }
     builders {
       name: "dart2js-linux-none-only-unittest-try"
-      dimensions: "os:Ubuntu-14.04"
       recipe {
         name: "dart/dart2js_swarming"
       }
@@ -175,28 +165,24 @@ buckets {
     }
     builders {
       name: "ddc-linux-release-try"
-      dimensions: "os:Ubuntu-14.04"
       recipe {
         name: "dart/ddc_swarming"
       }
     }
     builders {
       name: "analyzer-linux-release-strong-try"
-      dimensions: "os:Ubuntu-14.04"
       recipe {
         name: "dart/analyzer_swarming"
       }
     }
     builders {
       name: "analyzer-linux-release-strong-hostchecked-try"
-      dimensions: "os:Ubuntu-14.04"
       recipe {
         name: "dart/analyzer_swarming"
       }
     }
     builders {
       name: "pkg-linux-release-try"
-      dimensions: "os:Ubuntu-14.04"
       recipe {
         name: "dart/analyzer_swarming"
       }

From db9d7a3f724886a0e512ce012cc62c24d48520b0 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 6 Oct 2017 19:38:47 +0000
Subject: [PATCH 024/826] Temporarily restrict chrome builders to non-GCE bots

TBR=whesse@google.com

Bug:
Change-Id: Iac88e2378d41bd2732ff109000d433ce59f3364a
Reviewed-on: https://dart-review.googlesource.com/12160
Reviewed-by: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 7150a55b052b..02dc9f0c446c 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -102,6 +102,7 @@ buckets {
     }
     builders {
       name: "dart2js-linux-chrome-try"
+      dimensions: "kvm:0"
       recipe {
         name: "dart/dart2js_swarming"
         properties_j: "shards:6"
@@ -165,6 +166,7 @@ buckets {
     }
     builders {
       name: "ddc-linux-release-try"
+      dimensions: "kvm:0"
       recipe {
         name: "dart/ddc_swarming"
       }

From 7b4bb10da4c896d433b048acba7eeb6fb6b227b9 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 10 Oct 2017 12:43:36 +0000
Subject: [PATCH 025/826] Remove cores dimensions from VM Mac builders

Change-Id: I63619168ab8d6aa6a70268e089fc5bb4f1ff8a85
Reviewed-on: https://dart-review.googlesource.com/12448
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 2 --
 1 file changed, 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 02dc9f0c446c..a16a3230fadc 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -49,12 +49,10 @@ buckets {
     builders {
       name: "vm-mac-release-x64-try"
       dimensions: "os:Mac"
-      dimensions: "cores:8"
     }
     builders {
       name: "vm-mac-debug-x64-try"
       dimensions: "os:Mac"
-      dimensions: "cores:8"
     }
     builders {
       name: "vm-win-release-x64-try"

From 9ba65238b685e5a2378ff9294b5ad6435cdab6aa Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 18 Oct 2017 09:55:52 +0000
Subject: [PATCH 026/826] Add LUCI builders for main consoles

Add acls for waterfall
Use mixin for vm-kernel on CQ

Change-Id: I80c80aa5af82edc6506541b65116be471a0a4be6
Reviewed-on: https://dart-review.googlesource.com/14521
Reviewed-by: William Hesse <whesse@google.com>
Reviewed-by: Morten Krogh-jespersen <mkroghj@google.com>
---
 cr-buildbucket.cfg | 139 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 122 insertions(+), 17 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index a16a3230fadc..fa2ad0ec4be0 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -6,6 +6,18 @@
 #
 # Please keep this list sorted by bucket name.
 
+acl_sets {
+  name: "waterfall"
+  acls {
+    role: READER
+    group: "all"
+  }
+  acls {
+    role: SCHEDULER
+    identity: "luci-scheduler@appspot.gserviceaccount.com"
+  }
+}
+
 acl_sets {
   name: "tryserver"
   acls {
@@ -22,6 +34,112 @@ acl_sets {
   }
 }
 
+builder_mixins {
+  name: "vm-kernel"
+  recipe {
+    name: "dart/vm_kernel_swarming"
+    properties_j: "shards:6"
+  }
+}
+
+buckets {
+  name: "luci.dart.ci"
+  acl_sets: "waterfall"
+
+  swarming {
+    hostname: "chromium-swarm.appspot.com"
+    url_format: "https://ci.chromium.org/swarming/task/{task_id}"
+    builder_defaults {
+      category: "Dart CI"
+      dimensions: "cpu:x86-64"
+      dimensions: "pool:Dart.LUCI"
+      dimensions: "os:Linux"
+      recipe {
+        repository: "https://chromium.googlesource.com/chromium/tools/build.git"
+        properties: "mastername:dart"
+        name: "dart/neo"
+      }
+    }
+    builders { name: "analyzer-linux" }
+    builders { name: "analyzer-linux-release" }
+    builders { name: "analyzer-mac-release" dimensions: "os:Mac" }
+    builders { name: "analyzer-strong-linux-release" }
+    builders { name: "analyzer-strong-mac-release" dimensions: "os:Mac" }
+    builders { name: "analyzer-strong-win-release" dimensions: "os:Windows" }
+    builders { name: "analyzer-win-release" dimensions: "os:Windows" }
+    builders { name: "app-linux-debug-x64" }
+    builders { name: "app-linux-product-x64" }
+    builders { name: "app-linux-release-x64" }
+    builders { name: "cross-vm-linux-release-arm64" }
+    builders { name: "dart-sdk-linux" }
+    builders { name: "dart-sdk-mac" dimensions: "os:Mac" }
+    builders { name: "dart-sdk-win" dimensions: "os:Windows" }
+    builders { name: "dart2js-csp-minified-linux-ia32-drt" }
+    builders { name: "dart2js-hostchecked-linux-ia32-d8" }
+    builders { name: "dart2js-linux-chrome" }
+    builders { name: "dart2js-linux-ff" }
+    builders { name: "dart2js-linux-ia32-drt" }
+    builders { name: "dart2js-linux-jsshell" }
+    builders { name: "dart2js-mac-ia32-chrome" dimensions: "os:Mac" }
+    builders { name: "dart2js-mac-ia32-safari" dimensions: "os:Mac" }
+    builders { name: "dart2js-minified-linux-ia32-d8" }
+    builders { name: "dart2js-only-unittest-linux-ia32-none" }
+    builders { name: "dart2js-win-ia32-chrome" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-ia32-edge" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-ia32-ff" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-ia32-ie11" dimensions: "os:Windows" }
+    builders { name: "ddc-linux-release" }
+    builders { name: "ddc-mac-release" dimensions: "os:Mac" }
+    builders { name: "ddc-win-release" dimensions: "os:Windows" }
+    builders { name: "debianpackage-linux" }
+    builders { name: "pkg-linux-release" }
+    builders { name: "pkg-mac-release" dimensions: "os:Mac" }
+    builders { name: "pkg-win-release" dimensions: "os:Windows" }
+    builders { name: "precomp-linux-debug-x64" }
+    builders { name: "precomp-linux-product-x64" }
+    builders { name: "target-vm-linux-release-arm64" }
+    builders { name: "versionchecker-linux" }
+    builders { name: "vm-asan-linux-release-ia32" }
+    builders { name: "vm-asan-linux-release-x64" }
+    builders { name: "vm-kernel-linux-debug-x64" }
+    builders { name: "vm-kernel-linux-release-x64" }
+    builders { name: "vm-kernel-mac-debug-x64" dimensions: "os:Mac" }
+    builders { name: "vm-kernel-mac-release-x64" dimensions: "os:Mac" }
+    builders { name: "vm-linux-debug-ia32" }
+    builders { name: "vm-linux-debug-simarm" }
+    builders { name: "vm-linux-debug-x64" }
+    builders { name: "vm-linux-product-x64" }
+    builders { name: "vm-linux-release-ia32" }
+    builders { name: "vm-linux-release-simarm" }
+    builders { name: "vm-linux-release-simarm64" }
+    builders { name: "vm-linux-release-x64" }
+    builders { name: "vm-mac-debug-ia32" dimensions: "os:Mac" }
+    builders { name: "vm-mac-debug-simdbc64" dimensions: "os:Mac" }
+    builders { name: "vm-mac-debug-x64" dimensions: "os:Mac" }
+    builders { name: "vm-mac-product-x64" dimensions: "os:Mac" }
+    builders { name: "vm-mac-release-ia32" dimensions: "os:Mac" }
+    builders { name: "vm-mac-release-simdbc64" dimensions: "os:Mac" }
+    builders { name: "vm-mac-release-x64" dimensions: "os:Mac" }
+    builders { name: "vm-noopt-mac-simarm64" dimensions: "os:Mac" }
+    builders { name: "vm-optcounter-threshold-linux-release-ia32" }
+    builders { name: "vm-optcounter-threshold-linux-release-x64" }
+    builders { name: "vm-precomp-android-release" }
+    builders { name: "vm-precomp-win-simarm64" dimensions: "os:Windows" }
+    builders { name: "vm-reload-linux-debug-x64" }
+    builders { name: "vm-reload-linux-release-x64" }
+    builders { name: "vm-reload-mac-debug-simdbc64" dimensions: "os:Mac" }
+    builders { name: "vm-reload-mac-release-simdbc64" dimensions: "os:Mac" }
+    builders { name: "vm-reload-rollback-linux-debug-x64" }
+    builders { name: "vm-reload-rollback-linux-release-x64" }
+    builders { name: "vm-russian-win-debug-ia32" dimensions: "os:Windows" }
+    builders { name: "vm-win-debug-ia32" dimensions: "os:Windows" }
+    builders { name: "vm-win-debug-x64" dimensions: "os:Windows" }
+    builders { name: "vm-win-product-x64" dimensions: "os:Windows" }
+    builders { name: "vm-win-release-ia32" dimensions: "os:Windows" }
+    builders { name: "vm-win-release-x64" dimensions: "os:Windows" }
+  }
+}
+
 buckets {
   name: "luci.dart.try"
   acl_sets: "tryserver"
@@ -70,33 +188,20 @@ buckets {
     }
     builders {
       name: "vm-kernel-linux-release-x64-try"
-      recipe {
-        name: "dart/vm_kernel_swarming"
-        properties_j: "shards:6"
-      }
+      mixins: "vm-kernel"
     }
     builders {
       name: "vm-kernel-linux-debug-x64-try"
-      recipe {
-        name: "dart/vm_kernel_swarming"
-        properties_j: "shards:6"
-      }
+      mixins: "vm-kernel"
     }
     builders {
       name: "vm-kernel-mac-release-x64-try"
       dimensions: "os:Mac"
-      recipe {
-        name: "dart/vm_kernel_swarming"
-        properties_j: "shards:6"
-      }
+      mixins: "vm-kernel"
     }
     builders {
       name: "vm-kernel-mac-debug-x64-try"
-      dimensions: "os:Mac"
-      recipe {
-        name: "dart/vm_kernel_swarming"
-        properties_j: "shards:6"
-      }
+      mixins: "vm-kernel"
     }
     builders {
       name: "dart2js-linux-chrome-try"

From b1192de90b02ab54bf05601cfe6d17d1a89ef28d Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 18 Oct 2017 12:21:51 +0000
Subject: [PATCH 027/826] Add gerrit host setting

Change-Id: Iec67c89bb14177335463d15375b2b204bb193a61
Reviewed-on: https://dart-review.googlesource.com/14762
Reviewed-by: William Hesse <whesse@google.com>
---
 codereview.settings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/codereview.settings b/codereview.settings
index 8defd0414fb7..ea2fa057e008 100644
--- a/codereview.settings
+++ b/codereview.settings
@@ -1,3 +1,4 @@
+GERRIT_HOST: True
 CODE_REVIEW_SERVER: https://dart-review.googlesource.com
 CC_LIST: whesse@google.com
 VIEW_VC: https://dart.googlesource.com/sdk/+/

From d005b7f559d9e38699e3169165bff37776471b86 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 18 Oct 2017 12:24:29 +0000
Subject: [PATCH 028/826] Mark special builders

Accidently submitted 14521 before applying all review comments.

R=whesse@google.com

Change-Id: I0af8e5128bb1c7d55b9f5676ed7c9f0c6d89d995
Reviewed-on: https://dart-review.googlesource.com/14763
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index fa2ad0ec4be0..2ff8f70c5dfa 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -34,6 +34,16 @@ acl_sets {
   }
 }
 
+builder_mixins {
+  name: "debianpackage"
+  # todo(athom): how should this machine be defined?
+}
+
+builder_mixins {
+  name: "russian"
+  # todo(athom): how should this machine be defined?
+}
+
 builder_mixins {
   name: "vm-kernel"
   recipe {
@@ -91,13 +101,13 @@ buckets {
     builders { name: "ddc-linux-release" }
     builders { name: "ddc-mac-release" dimensions: "os:Mac" }
     builders { name: "ddc-win-release" dimensions: "os:Windows" }
-    builders { name: "debianpackage-linux" }
+    builders { name: "debianpackage-linux" mixins: "debianpackage" }
     builders { name: "pkg-linux-release" }
     builders { name: "pkg-mac-release" dimensions: "os:Mac" }
     builders { name: "pkg-win-release" dimensions: "os:Windows" }
     builders { name: "precomp-linux-debug-x64" }
     builders { name: "precomp-linux-product-x64" }
-    builders { name: "target-vm-linux-release-arm64" }
+    builders { name: "target-vm-linux-release-arm64" dimensions: "cpu:arm64" }
     builders { name: "versionchecker-linux" }
     builders { name: "vm-asan-linux-release-ia32" }
     builders { name: "vm-asan-linux-release-x64" }
@@ -131,7 +141,11 @@ buckets {
     builders { name: "vm-reload-mac-release-simdbc64" dimensions: "os:Mac" }
     builders { name: "vm-reload-rollback-linux-debug-x64" }
     builders { name: "vm-reload-rollback-linux-release-x64" }
-    builders { name: "vm-russian-win-debug-ia32" dimensions: "os:Windows" }
+    builders {
+      name: "vm-russian-win-debug-ia32"
+      mixins: "russian"
+      dimensions: "os:Windows"
+    }
     builders { name: "vm-win-debug-ia32" dimensions: "os:Windows" }
     builders { name: "vm-win-debug-x64" dimensions: "os:Windows" }
     builders { name: "vm-win-product-x64" dimensions: "os:Windows" }

From d1a25804883d6f8a7bb1c7a83a300716dd2056a0 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 18 Oct 2017 14:26:42 +0000
Subject: [PATCH 029/826] Add LUCI Milo config for be, dev, and stable consoles

Change-Id: I2007ced32786f29ec79155688d25a01cbe292f47
Reviewed-on: https://dart-review.googlesource.com/14841
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-milo.cfg | 1163 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1163 insertions(+)
 create mode 100644 luci-milo.cfg

diff --git a/luci-milo.cfg b/luci-milo.cfg
new file mode 100644
index 000000000000..2298b9536235
--- /dev/null
+++ b/luci-milo.cfg
@@ -0,0 +1,1163 @@
+consoles: {
+  id: "be"
+  name: "SDK Bleeding Edge Console"
+  repo_url: "https://dart.googlesource.com/sdk/"
+  ref: "master"
+  manifest_name: "REVISION"
+  builders: {
+    name: "buildbucket/luci.dart.ci/app-linux-debug-x64"
+    category: "1vm-app|all"
+    short_name: "ad64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/app-linux-product-x64"
+    category: "1vm-app|all"
+    short_name: "ap64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/app-linux-release-x64"
+    category: "1vm-app|all"
+    short_name: "ar64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
+    category: "1vm-misc|all"
+    short_name: "cr64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64"
+    category: "1vm-precomp|all"
+    short_name: "pd64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64"
+    category: "1vm-precomp|all"
+    short_name: "pp64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64"
+    category: "1vm-misc|all"
+    short_name: "tarm"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-ia32"
+    category: "1vm-misc|all"
+    short_name: "as32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64"
+    category: "1vm-misc|all"
+    short_name: "as64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64"
+    category: "1vm-kernel|all"
+    short_name: "d64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64"
+    category: "1vm-kernel|all"
+    short_name: "r64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64"
+    category: "1vm-kernel|all"
+    short_name: "md64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64"
+    category: "1vm-kernel|all"
+    short_name: "mr64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
+    category: "1vm|all"
+    short_name: "d32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm"
+    category: "1vm|all"
+    short_name: "da"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64"
+    category: "1vm|all"
+    short_name: "d64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-linux-product-x64"
+    category: "1vm-product|all"
+    short_name: "p64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32"
+    category: "1vm|all"
+    short_name: "r32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm"
+    category: "1vm|all"
+    short_name: "ra"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64"
+    category: "1vm|all"
+    short_name: "ra64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-linux-release-x64"
+    category: "1vm|all"
+    short_name: "r64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32"
+    category: "1vm|all"
+    short_name: "mr32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64"
+    category: "1vm|all"
+    short_name: "mdsi"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64"
+    category: "1vm|all"
+    short_name: "md64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-mac-product-x64"
+    category: "1vm-product|all"
+    short_name: "mp64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32"
+    category: "1vm|all"
+    short_name: "mr32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64"
+    category: "1vm|all"
+    short_name: "mrsi"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-mac-release-x64"
+    category: "1vm|all"
+    short_name: "mr64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64"
+    category: "1vm-precomp|all"
+    short_name: "nopt"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32"
+    category: "1vm-misc|all"
+    short_name: "op32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64"
+    category: "1vm-misc|all"
+    short_name: "op64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-precomp-android-release"
+    category: "1vm-precomp|all"
+    short_name: "par"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64"
+    category: "1vm-precomp|all"
+    short_name: "wpsi"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64"
+    category: "1vm-reload|all"
+    short_name: "rd64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64"
+    category: "1vm-reload|all"
+    short_name: "rr64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64"
+    category: "1vm-reload|all"
+    short_name: "mdsi"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64"
+    category: "1vm-reload|all"
+    short_name: "mrsi"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64"
+    category: "1vm-reload|all"
+    short_name: "rrd"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64"
+    category: "1vm-reload|all"
+    short_name: "rrr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-russian-win-debug-ia32"
+    category: "1vm-misc|all"
+    short_name: "rus"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32"
+    category: "1vm|all"
+    short_name: "wd32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-win-debug-x64"
+    category: "1vm|all"
+    short_name: "wd64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-win-product-x64"
+    category: "1vm-product|all"
+    short_name: "wp64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-win-release-ia32"
+    category: "1vm|all"
+    short_name: "wp32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-win-release-x64"
+    category: "1vm|all"
+    short_name: "wr64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8"
+    category: "20dart2js-d8|all"
+    short_name: "hc"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-ia32-d8"
+    category: "20dart2js-d8|all"
+    short_name: "mi"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none"
+    category: "20dart2js-d8|all"
+    short_name: "ut"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-linux-jsshell"
+    category: "23dart2js-jsshell|all"
+    short_name: "js"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/analyzer-linux"
+    category: "30analyzer|all"
+    short_name: "l"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/analyzer-linux-release"
+    category: "30analyzer|all"
+    short_name: "lr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/analyzer-mac-release"
+    category: "30analyzer|all"
+    short_name: "mr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
+    category: "30analyzer|all"
+    short_name: "lrs"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
+    category: "30analyzer|all"
+    short_name: "mrs"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
+    category: "30analyzer|all"
+    short_name: "wrs"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/analyzer-win-release"
+    category: "30analyzer|all"
+    short_name: "wr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart-sdk-linux"
+    category: "4dart-sdk|all"
+    short_name: "l"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac"
+    category: "4dart-sdk|all"
+    short_name: "m"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart-sdk-win"
+    category: "4dart-sdk|all"
+    short_name: "w"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/ddc-linux-release"
+    category: "5ddc|all"
+    short_name: "lr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/ddc-mac-release"
+    category: "5ddc|all"
+    short_name: "mr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/ddc-win-release"
+    category: "5ddc|all"
+    short_name: "wr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-linux-chrome"
+    category: "7dart2js-linux|all"
+    short_name: "lc"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-linux-ff"
+    category: "7dart2js-linux|all"
+    short_name: "lf"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-ia32-drt"
+    category: "8chrome|all"
+    short_name: "cmin"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-drt"
+    category: "8chrome|all"
+    short_name: "drt"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-mac-ia32-chrome"
+    category: "8chrome|all"
+    short_name: "mc"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-mac-ia32-safari"
+    category: "90safari|all"
+    short_name: "ms"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-win-ia32-chrome"
+    category: "92dart2js-windows|all"
+    short_name: "wc"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-win-ia32-ff"
+    category: "92dart2js-windows|all"
+    short_name: "wf"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-win-ia32-ie11"
+    category: "92dart2js-windows|all"
+    short_name: "wi"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/pkg-linux-release"
+    category: "94pub-pkg|all"
+    short_name: "lr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/pkg-mac-release"
+    category: "94pub-pkg|all"
+    short_name: "mr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/pkg-win-release"
+    category: "94pub-pkg|all"
+    short_name: "wr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/debianpackage-linux"
+    category: "99misc|all"
+    short_name: "dbl"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/versionchecker-linux"
+    category: "99misc|all"
+    short_name: "vcl"
+  }
+}
+
+consoles: {
+  id: "dev"
+  name: "SDK Dev Console"
+  repo_url: "https://dart.googlesource.com/sdk/"
+  ref: "dev"
+  manifest_name: "REVISION"
+  builders: {
+    name: "buildbucket/luci.dart.ci/app-linux-debug-x64"
+    category: "1vm-app|all"
+    short_name: "ad64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/app-linux-product-x64"
+    category: "1vm-app|all"
+    short_name: "ap64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/app-linux-release-x64"
+    category: "1vm-app|all"
+    short_name: "ar64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
+    category: "1vm-misc|all"
+    short_name: "cr64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64"
+    category: "1vm-precomp|all"
+    short_name: "pd64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64"
+    category: "1vm-precomp|all"
+    short_name: "pp64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64"
+    category: "1vm-misc|all"
+    short_name: "tarm"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-ia32"
+    category: "1vm-misc|all"
+    short_name: "as32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64"
+    category: "1vm-misc|all"
+    short_name: "as64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64"
+    category: "1vm-kernel|all"
+    short_name: "d64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64"
+    category: "1vm-kernel|all"
+    short_name: "r64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64"
+    category: "1vm-kernel|all"
+    short_name: "md64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64"
+    category: "1vm-kernel|all"
+    short_name: "mr64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
+    category: "1vm|all"
+    short_name: "d32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm"
+    category: "1vm|all"
+    short_name: "da"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64"
+    category: "1vm|all"
+    short_name: "d64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-linux-product-x64"
+    category: "1vm-product|all"
+    short_name: "p64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32"
+    category: "1vm|all"
+    short_name: "r32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm"
+    category: "1vm|all"
+    short_name: "ra"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64"
+    category: "1vm|all"
+    short_name: "ra64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-linux-release-x64"
+    category: "1vm|all"
+    short_name: "r64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32"
+    category: "1vm|all"
+    short_name: "mr32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64"
+    category: "1vm|all"
+    short_name: "mdsi"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64"
+    category: "1vm|all"
+    short_name: "md64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-mac-product-x64"
+    category: "1vm-product|all"
+    short_name: "mp64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32"
+    category: "1vm|all"
+    short_name: "mr32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64"
+    category: "1vm|all"
+    short_name: "mrsi"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-mac-release-x64"
+    category: "1vm|all"
+    short_name: "mr64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64"
+    category: "1vm-precomp|all"
+    short_name: "nopt"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32"
+    category: "1vm-misc|all"
+    short_name: "op32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64"
+    category: "1vm-misc|all"
+    short_name: "op64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-precomp-android-release"
+    category: "1vm-precomp|all"
+    short_name: "par"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64"
+    category: "1vm-precomp|all"
+    short_name: "wpsi"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64"
+    category: "1vm-reload|all"
+    short_name: "rd64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64"
+    category: "1vm-reload|all"
+    short_name: "rr64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64"
+    category: "1vm-reload|all"
+    short_name: "mdsi"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64"
+    category: "1vm-reload|all"
+    short_name: "mrsi"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64"
+    category: "1vm-reload|all"
+    short_name: "rrd"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64"
+    category: "1vm-reload|all"
+    short_name: "rrr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-russian-win-debug-ia32"
+    category: "1vm-misc|all"
+    short_name: "rus"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32"
+    category: "1vm|all"
+    short_name: "wd32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-win-debug-x64"
+    category: "1vm|all"
+    short_name: "wd64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-win-product-x64"
+    category: "1vm-product|all"
+    short_name: "wp64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-win-release-ia32"
+    category: "1vm|all"
+    short_name: "wp32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-win-release-x64"
+    category: "1vm|all"
+    short_name: "wr64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8"
+    category: "20dart2js-d8|all"
+    short_name: "hc"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-ia32-d8"
+    category: "20dart2js-d8|all"
+    short_name: "mi"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none"
+    category: "20dart2js-d8|all"
+    short_name: "ut"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-linux-jsshell"
+    category: "23dart2js-jsshell|all"
+    short_name: "js"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/analyzer-linux"
+    category: "30analyzer|all"
+    short_name: "l"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/analyzer-linux-release"
+    category: "30analyzer|all"
+    short_name: "lr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/analyzer-mac-release"
+    category: "30analyzer|all"
+    short_name: "mr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
+    category: "30analyzer|all"
+    short_name: "lrs"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
+    category: "30analyzer|all"
+    short_name: "mrs"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
+    category: "30analyzer|all"
+    short_name: "wrs"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/analyzer-win-release"
+    category: "30analyzer|all"
+    short_name: "wr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart-sdk-linux"
+    category: "4dart-sdk|all"
+    short_name: "l"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac"
+    category: "4dart-sdk|all"
+    short_name: "m"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart-sdk-win"
+    category: "4dart-sdk|all"
+    short_name: "w"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/ddc-linux-release"
+    category: "5ddc|all"
+    short_name: "lr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/ddc-mac-release"
+    category: "5ddc|all"
+    short_name: "mr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/ddc-win-release"
+    category: "5ddc|all"
+    short_name: "wr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-linux-chrome"
+    category: "7dart2js-linux|all"
+    short_name: "lc"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-linux-ff"
+    category: "7dart2js-linux|all"
+    short_name: "lf"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-ia32-drt"
+    category: "8chrome|all"
+    short_name: "cmin"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-drt"
+    category: "8chrome|all"
+    short_name: "drt"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-mac-ia32-chrome"
+    category: "8chrome|all"
+    short_name: "mc"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-mac-ia32-safari"
+    category: "90safari|all"
+    short_name: "ms"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-win-ia32-chrome"
+    category: "92dart2js-windows|all"
+    short_name: "wc"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-win-ia32-ff"
+    category: "92dart2js-windows|all"
+    short_name: "wf"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-win-ia32-ie11"
+    category: "92dart2js-windows|all"
+    short_name: "wi"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/pkg-linux-release"
+    category: "94pub-pkg|all"
+    short_name: "lr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/pkg-mac-release"
+    category: "94pub-pkg|all"
+    short_name: "mr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/pkg-win-release"
+    category: "94pub-pkg|all"
+    short_name: "wr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/debianpackage-linux"
+    category: "99misc|all"
+    short_name: "dbl"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/versionchecker-linux"
+    category: "99misc|all"
+    short_name: "vcl"
+  }
+}
+
+consoles: {
+  id: "dev"
+  name: "SDK Dev Console"
+  repo_url: "https://dart.googlesource.com/sdk/"
+  ref: "dev"
+  manifest_name: "REVISION"
+  builders: {
+    name: "buildbucket/luci.dart.ci/app-linux-debug-x64"
+    category: "1vm-app|all"
+    short_name: "ad64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/app-linux-product-x64"
+    category: "1vm-app|all"
+    short_name: "ap64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/app-linux-release-x64"
+    category: "1vm-app|all"
+    short_name: "ar64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
+    category: "1vm-misc|all"
+    short_name: "cr64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64"
+    category: "1vm-precomp|all"
+    short_name: "pd64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64"
+    category: "1vm-precomp|all"
+    short_name: "pp64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64"
+    category: "1vm-misc|all"
+    short_name: "tarm"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-ia32"
+    category: "1vm-misc|all"
+    short_name: "as32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64"
+    category: "1vm-misc|all"
+    short_name: "as64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64"
+    category: "1vm-kernel|all"
+    short_name: "d64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64"
+    category: "1vm-kernel|all"
+    short_name: "r64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64"
+    category: "1vm-kernel|all"
+    short_name: "md64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64"
+    category: "1vm-kernel|all"
+    short_name: "mr64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
+    category: "1vm|all"
+    short_name: "d32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm"
+    category: "1vm|all"
+    short_name: "da"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64"
+    category: "1vm|all"
+    short_name: "d64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-linux-product-x64"
+    category: "1vm-product|all"
+    short_name: "p64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32"
+    category: "1vm|all"
+    short_name: "r32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm"
+    category: "1vm|all"
+    short_name: "ra"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64"
+    category: "1vm|all"
+    short_name: "ra64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-linux-release-x64"
+    category: "1vm|all"
+    short_name: "r64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32"
+    category: "1vm|all"
+    short_name: "mr32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64"
+    category: "1vm|all"
+    short_name: "mdsi"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64"
+    category: "1vm|all"
+    short_name: "md64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-mac-product-x64"
+    category: "1vm-product|all"
+    short_name: "mp64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32"
+    category: "1vm|all"
+    short_name: "mr32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64"
+    category: "1vm|all"
+    short_name: "mrsi"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-mac-release-x64"
+    category: "1vm|all"
+    short_name: "mr64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64"
+    category: "1vm-precomp|all"
+    short_name: "nopt"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32"
+    category: "1vm-misc|all"
+    short_name: "op32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64"
+    category: "1vm-misc|all"
+    short_name: "op64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-precomp-android-release"
+    category: "1vm-precomp|all"
+    short_name: "par"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64"
+    category: "1vm-precomp|all"
+    short_name: "wpsi"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64"
+    category: "1vm-reload|all"
+    short_name: "rd64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64"
+    category: "1vm-reload|all"
+    short_name: "rr64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64"
+    category: "1vm-reload|all"
+    short_name: "mdsi"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64"
+    category: "1vm-reload|all"
+    short_name: "mrsi"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64"
+    category: "1vm-reload|all"
+    short_name: "rrd"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64"
+    category: "1vm-reload|all"
+    short_name: "rrr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-russian-win-debug-ia32"
+    category: "1vm-misc|all"
+    short_name: "rus"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32"
+    category: "1vm|all"
+    short_name: "wd32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-win-debug-x64"
+    category: "1vm|all"
+    short_name: "wd64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-win-product-x64"
+    category: "1vm-product|all"
+    short_name: "wp64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-win-release-ia32"
+    category: "1vm|all"
+    short_name: "wp32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-win-release-x64"
+    category: "1vm|all"
+    short_name: "wr64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8"
+    category: "20dart2js-d8|all"
+    short_name: "hc"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-ia32-d8"
+    category: "20dart2js-d8|all"
+    short_name: "mi"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none"
+    category: "20dart2js-d8|all"
+    short_name: "ut"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-linux-jsshell"
+    category: "23dart2js-jsshell|all"
+    short_name: "js"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/analyzer-linux"
+    category: "30analyzer|all"
+    short_name: "l"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/analyzer-linux-release"
+    category: "30analyzer|all"
+    short_name: "lr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/analyzer-mac-release"
+    category: "30analyzer|all"
+    short_name: "mr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
+    category: "30analyzer|all"
+    short_name: "lrs"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
+    category: "30analyzer|all"
+    short_name: "mrs"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
+    category: "30analyzer|all"
+    short_name: "wrs"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/analyzer-win-release"
+    category: "30analyzer|all"
+    short_name: "wr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart-sdk-linux"
+    category: "4dart-sdk|all"
+    short_name: "l"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac"
+    category: "4dart-sdk|all"
+    short_name: "m"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart-sdk-win"
+    category: "4dart-sdk|all"
+    short_name: "w"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/ddc-linux-release"
+    category: "5ddc|all"
+    short_name: "lr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/ddc-mac-release"
+    category: "5ddc|all"
+    short_name: "mr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/ddc-win-release"
+    category: "5ddc|all"
+    short_name: "wr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-linux-chrome"
+    category: "7dart2js-linux|all"
+    short_name: "lc"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-linux-ff"
+    category: "7dart2js-linux|all"
+    short_name: "lf"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-ia32-drt"
+    category: "8chrome|all"
+    short_name: "cmin"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-drt"
+    category: "8chrome|all"
+    short_name: "drt"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-mac-ia32-chrome"
+    category: "8chrome|all"
+    short_name: "mc"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-mac-ia32-safari"
+    category: "90safari|all"
+    short_name: "ms"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-win-ia32-chrome"
+    category: "92dart2js-windows|all"
+    short_name: "wc"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-win-ia32-ff"
+    category: "92dart2js-windows|all"
+    short_name: "wf"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-win-ia32-ie11"
+    category: "92dart2js-windows|all"
+    short_name: "wi"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/pkg-linux-release"
+    category: "94pub-pkg|all"
+    short_name: "lr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/pkg-mac-release"
+    category: "94pub-pkg|all"
+    short_name: "mr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/pkg-win-release"
+    category: "94pub-pkg|all"
+    short_name: "wr"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/debianpackage-linux"
+    category: "99misc|all"
+    short_name: "dbl"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/versionchecker-linux"
+    category: "99misc|all"
+    short_name: "vcl"
+  }
+}
\ No newline at end of file

From a5ca3f9ac47f7b7918df45f9455887a3b23eedf6 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 18 Oct 2017 16:47:15 +0000
Subject: [PATCH 030/826] Fix stable Milo console

TBR=whesse@google.com

Change-Id: I9992f3385eae2733ee2b1d2cb2dbbac90c951ead
Reviewed-on: https://dart-review.googlesource.com/14843
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-milo.cfg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 2298b9536235..18fcdb909d2e 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -775,10 +775,10 @@ consoles: {
 }
 
 consoles: {
-  id: "dev"
-  name: "SDK Dev Console"
+  id: "stable"
+  name: "SDK Stable Console"
   repo_url: "https://dart.googlesource.com/sdk/"
-  ref: "dev"
+  ref: "stable"
   manifest_name: "REVISION"
   builders: {
     name: "buildbucket/luci.dart.ci/app-linux-debug-x64"

From 1ce7a4931d0d750450c9902910ca62db5b155b74 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 19 Oct 2017 13:03:48 +0000
Subject: [PATCH 031/826] Compact Milo consoles

Fix some dart2js builders missing -ia32
Add edge to consoles
Make ordering in file match ordering in buildbot console
Replace "all" category with more meaningful categories

TBR=whesse@google.com

Change-Id: Iefe861a1d6cb315c39cbfacccbb520129fb35b40
Reviewed-on: https://dart-review.googlesource.com/15141
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg |    8 +-
 luci-milo.cfg      | 1167 ++++++++++++++++++++++----------------------
 2 files changed, 595 insertions(+), 580 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 2ff8f70c5dfa..bc947a8d23f6 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -70,7 +70,7 @@ buckets {
         name: "dart/neo"
       }
     }
-    builders { name: "analyzer-linux" }
+    builders { name: "analyzer-linux-debug" }
     builders { name: "analyzer-linux-release" }
     builders { name: "analyzer-mac-release" dimensions: "os:Mac" }
     builders { name: "analyzer-strong-linux-release" }
@@ -86,10 +86,10 @@ buckets {
     builders { name: "dart-sdk-win" dimensions: "os:Windows" }
     builders { name: "dart2js-csp-minified-linux-ia32-drt" }
     builders { name: "dart2js-hostchecked-linux-ia32-d8" }
-    builders { name: "dart2js-linux-chrome" }
-    builders { name: "dart2js-linux-ff" }
+    builders { name: "dart2js-linux-ia32-chrome" }
+    builders { name: "dart2js-linux-ia32-ff" }
     builders { name: "dart2js-linux-ia32-drt" }
-    builders { name: "dart2js-linux-jsshell" }
+    builders { name: "dart2js-linux-ia32-jsshell" }
     builders { name: "dart2js-mac-ia32-chrome" dimensions: "os:Mac" }
     builders { name: "dart2js-mac-ia32-safari" dimensions: "os:Mac" }
     builders { name: "dart2js-minified-linux-ia32-d8" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 18fcdb909d2e..5224d8993048 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -5,384 +5,389 @@ consoles: {
   ref: "master"
   manifest_name: "REVISION"
   builders: {
-    name: "buildbucket/luci.dart.ci/app-linux-debug-x64"
-    category: "1vm-app|all"
-    short_name: "ad64"
-  }
-  builders: {
-    name: "buildbucket/luci.dart.ci/app-linux-product-x64"
-    category: "1vm-app|all"
-    short_name: "ap64"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
+    category: "vm|debug"
+    short_name: "32"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/app-linux-release-x64"
-    category: "1vm-app|all"
-    short_name: "ar64"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm"
+    category: "vm|simarm"
+    short_name: "d"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
-    category: "1vm-misc|all"
-    short_name: "cr64"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64"
+    category: "vm|debug"
+    short_name: "64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64"
-    category: "1vm-precomp|all"
-    short_name: "pd64"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32"
+    category: "vm|release"
+    short_name: "32"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64"
-    category: "1vm-precomp|all"
-    short_name: "pp64"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm"
+    category: "vm|simarm"
+    short_name: "r"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64"
-    category: "1vm-misc|all"
-    short_name: "tarm"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64"
+    category: "vm|simarm"
+    short_name: "r64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-ia32"
-    category: "1vm-misc|all"
-    short_name: "as32"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-x64"
+    category: "vm|release"
+    short_name: "64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64"
-    category: "1vm-misc|all"
-    short_name: "as64"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32"
+    category: "vm|debug"
+    short_name: "m32"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64"
-    category: "1vm-kernel|all"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64"
+    category: "vm|debug"
+    short_name: "msi"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64"
-    category: "1vm-kernel|all"
-    short_name: "r64"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64"
+    category: "vm|debug"
+    short_name: "m64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64"
-    category: "1vm-kernel|all"
-    short_name: "md64"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32"
+    category: "vm|release"
+    short_name: "m32"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64"
-    category: "1vm-kernel|all"
-    short_name: "mr64"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64"
+    category: "vm|release"
+    short_name: "msi"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
-    category: "1vm|all"
-    short_name: "d32"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-x64"
+    category: "vm|release"
+    short_name: "m64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm"
-    category: "1vm|all"
-    short_name: "da"
+    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32"
+    category: "vm|debug"
+    short_name: "w32"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64"
-    category: "1vm|all"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.ci/vm-win-debug-x64"
+    category: "vm|debug"
+    short_name: "w64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-linux-product-x64"
-    category: "1vm-product|all"
-    short_name: "p64"
+    name: "buildbucket/luci.dart.ci/vm-win-release-ia32"
+    category: "vm|release"
+    short_name: "w32"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32"
-    category: "1vm|all"
-    short_name: "r32"
+    name: "buildbucket/luci.dart.ci/vm-win-release-x64"
+    category: "vm|release"
+    short_name: "w64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm"
-    category: "1vm|all"
-    short_name: "ra"
+    name: "buildbucket/luci.dart.ci/app-linux-debug-x64"
+    category: "vm|app"
+    short_name: "d64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64"
-    category: "1vm|all"
-    short_name: "ra64"
+    name: "buildbucket/luci.dart.ci/app-linux-product-x64"
+    category: "vm|app"
+    short_name: "p64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-x64"
-    category: "1vm|all"
+    name: "buildbucket/luci.dart.ci/app-linux-release-x64"
+    category: "vm|app"
     short_name: "r64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32"
-    category: "1vm|all"
-    short_name: "mr32"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64"
+    category: "vm|kernel"
+    short_name: "d"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64"
-    category: "1vm|all"
-    short_name: "mdsi"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "r"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64"
-    category: "1vm|all"
-    short_name: "md64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64"
+    category: "vm|kernel"
+    short_name: "md"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-mac-product-x64"
-    category: "1vm-product|all"
-    short_name: "mp64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64"
+    category: "vm|kernel"
+    short_name: "mr"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32"
-    category: "1vm|all"
-    short_name: "mr32"
+    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
+    category: "vm|misc"
+    short_name: "cra"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64"
-    category: "1vm|all"
-    short_name: "mrsi"
+    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64"
+    category: "vm|misc"
+    short_name: "tra"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-x64"
-    category: "1vm|all"
-    short_name: "mr64"
+    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-ia32"
+    category: "vm|misc"
+    short_name: "a32"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64"
-    category: "1vm-precomp|all"
-    short_name: "nopt"
+    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "a64"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32"
-    category: "1vm-misc|all"
-    short_name: "op32"
+    category: "vm|misc"
+    short_name: "o32"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64"
-    category: "1vm-misc|all"
-    short_name: "op64"
+    category: "vm|misc"
+    short_name: "o64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-precomp-android-release"
-    category: "1vm-precomp|all"
-    short_name: "par"
+    name: "buildbucket/luci.dart.ci/vm-russian-win-debug-ia32"
+    category: "vm|misc"
+    short_name: "ru"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64"
-    category: "1vm-precomp|all"
-    short_name: "wpsi"
+    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64"
+    category: "vm|precomp"
+    short_name: "d64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64"
-    category: "1vm-reload|all"
-    short_name: "rd64"
+    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64"
+    category: "vm|precomp"
+    short_name: "p64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64"
-    category: "1vm-reload|all"
-    short_name: "rr64"
+    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64"
+    category: "vm|precomp"
+    short_name: "no"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64"
-    category: "1vm-reload|all"
-    short_name: "mdsi"
+    name: "buildbucket/luci.dart.ci/vm-precomp-android-release"
+    category: "vm|precomp"
+    short_name: "and"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64"
-    category: "1vm-reload|all"
-    short_name: "mrsi"
+    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64"
+    category: "vm|precomp"
+    short_name: "wsi"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64"
-    category: "1vm-reload|all"
-    short_name: "rrd"
+    name: "buildbucket/luci.dart.ci/vm-linux-product-x64"
+    category: "vm|product"
+    short_name: "64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64"
-    category: "1vm-reload|all"
-    short_name: "rrr"
+    name: "buildbucket/luci.dart.ci/vm-mac-product-x64"
+    category: "vm|product"
+    short_name: "m64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-russian-win-debug-ia32"
-    category: "1vm-misc|all"
-    short_name: "rus"
+    name: "buildbucket/luci.dart.ci/vm-win-product-x64"
+    category: "vm|product"
+    short_name: "w64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32"
-    category: "1vm|all"
-    short_name: "wd32"
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64"
+    category: "vm|reload"
+    short_name: "d"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-x64"
-    category: "1vm|all"
-    short_name: "wd64"
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64"
+    category: "vm|reload"
+    short_name: "r"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-win-product-x64"
-    category: "1vm-product|all"
-    short_name: "wp64"
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64"
+    category: "vm|reload"
+    short_name: "mds"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-win-release-ia32"
-    category: "1vm|all"
-    short_name: "wp32"
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64"
+    category: "vm|reload"
+    short_name: "mrs"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-win-release-x64"
-    category: "1vm|all"
-    short_name: "wr64"
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64"
+    category: "vm|reload"
+    short_name: "dro"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64"
+    category: "vm|reload"
+    short_name: "rro"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8"
-    category: "20dart2js-d8|all"
+    category: "dart2js|d8"
     short_name: "hc"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-minified-linux-ia32-d8"
-    category: "20dart2js-d8|all"
+    category: "dart2js|d8"
     short_name: "mi"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none"
-    category: "20dart2js-d8|all"
+    category: "dart2js|misc"
     short_name: "ut"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-jsshell"
-    category: "23dart2js-jsshell|all"
-    short_name: "js"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-jsshell"
+    category: "dart2js|misc"
+    short_name: "jsh"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/analyzer-linux"
-    category: "30analyzer|all"
-    short_name: "l"
+    name: "buildbucket/luci.dart.ci/analyzer-linux-debug"
+    category: "analyzer"
+    short_name: "d"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/analyzer-linux-release"
-    category: "30analyzer|all"
-    short_name: "lr"
+    category: "analyzer"
+    short_name: "r"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/analyzer-mac-release"
-    category: "30analyzer|all"
+    category: "analyzer"
     short_name: "mr"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
-    category: "30analyzer|all"
-    short_name: "lrs"
+    category: "analyzer"
+    short_name: "sr"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
-    category: "30analyzer|all"
-    short_name: "mrs"
+    category: "analyzer"
+    short_name: "smr"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
-    category: "30analyzer|all"
-    short_name: "wrs"
+    category: "analyzer"
+    short_name: "swr"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/analyzer-win-release"
-    category: "30analyzer|all"
-    short_name: "wr"
+    category: "analyzer"
+    short_name: "awr"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart-sdk-linux"
-    category: "4dart-sdk|all"
+    category: "sdk"
     short_name: "l"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart-sdk-mac"
-    category: "4dart-sdk|all"
+    category: "sdk"
     short_name: "m"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart-sdk-win"
-    category: "4dart-sdk|all"
+    category: "sdk"
     short_name: "w"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/ddc-linux-release"
-    category: "5ddc|all"
-    short_name: "lr"
+    category: "ddc"
+    short_name: "l"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/ddc-mac-release"
-    category: "5ddc|all"
-    short_name: "mr"
+    category: "ddc"
+    short_name: "m"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/ddc-win-release"
-    category: "5ddc|all"
-    short_name: "wr"
+    category: "ddc"
+    short_name: "w"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-chrome"
-    category: "7dart2js-linux|all"
-    short_name: "lc"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-chrome"
+    category: "dart2js|chrome"
+    short_name: "l"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-ff"
-    category: "7dart2js-linux|all"
-    short_name: "lf"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-ff"
+    category: "dart2js|ff"
+    short_name: "l"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-ia32-drt"
-    category: "8chrome|all"
-    short_name: "cmin"
+    category: "dart2js|chrome"
+    short_name: "csp"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-drt"
-    category: "8chrome|all"
+    category: "dart2js|chrome"
     short_name: "drt"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-mac-ia32-chrome"
-    category: "8chrome|all"
-    short_name: "mc"
+    category: "dart2js|chrome"
+    short_name: "m"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-mac-ia32-safari"
-    category: "90safari|all"
-    short_name: "ms"
+    category: "dart2js|safari"
+    short_name: "m"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-win-ia32-chrome"
-    category: "92dart2js-windows|all"
-    short_name: "wc"
+    category: "dart2js|chrome"
+    short_name: "w"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-win-ia32-edge"
+    category: "dart2js|ms"
+    short_name: "ed"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-win-ia32-ff"
-    category: "92dart2js-windows|all"
-    short_name: "wf"
+    category: "dart2js|ff"
+    short_name: "w"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-win-ia32-ie11"
-    category: "92dart2js-windows|all"
-    short_name: "wi"
+    category: "dart2js|ms"
+    short_name: "ie"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/pkg-linux-release"
-    category: "94pub-pkg|all"
-    short_name: "lr"
+    category: "pub|pkg"
+    short_name: "l"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/pkg-mac-release"
-    category: "94pub-pkg|all"
-    short_name: "mr"
+    category: "pub|pkg"
+    short_name: "m"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/pkg-win-release"
-    category: "94pub-pkg|all"
-    short_name: "wr"
+    category: "pub|pkg"
+    short_name: "w"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/debianpackage-linux"
-    category: "99misc|all"
-    short_name: "dbl"
+    category: "misc"
+    short_name: "dp"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/versionchecker-linux"
-    category: "99misc|all"
-    short_name: "vcl"
+    category: "misc"
+    short_name: "vc"
   }
 }
 
@@ -393,384 +398,389 @@ consoles: {
   ref: "dev"
   manifest_name: "REVISION"
   builders: {
-    name: "buildbucket/luci.dart.ci/app-linux-debug-x64"
-    category: "1vm-app|all"
-    short_name: "ad64"
-  }
-  builders: {
-    name: "buildbucket/luci.dart.ci/app-linux-product-x64"
-    category: "1vm-app|all"
-    short_name: "ap64"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
+    category: "vm|debug"
+    short_name: "32"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/app-linux-release-x64"
-    category: "1vm-app|all"
-    short_name: "ar64"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm"
+    category: "vm|simarm"
+    short_name: "d"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
-    category: "1vm-misc|all"
-    short_name: "cr64"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64"
+    category: "vm|debug"
+    short_name: "64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64"
-    category: "1vm-precomp|all"
-    short_name: "pd64"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32"
+    category: "vm|release"
+    short_name: "32"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64"
-    category: "1vm-precomp|all"
-    short_name: "pp64"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm"
+    category: "vm|simarm"
+    short_name: "r"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64"
-    category: "1vm-misc|all"
-    short_name: "tarm"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64"
+    category: "vm|simarm"
+    short_name: "r64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-ia32"
-    category: "1vm-misc|all"
-    short_name: "as32"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-x64"
+    category: "vm|release"
+    short_name: "64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64"
-    category: "1vm-misc|all"
-    short_name: "as64"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32"
+    category: "vm|debug"
+    short_name: "m32"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64"
-    category: "1vm-kernel|all"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64"
+    category: "vm|debug"
+    short_name: "msi"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64"
-    category: "1vm-kernel|all"
-    short_name: "r64"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64"
+    category: "vm|debug"
+    short_name: "m64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64"
-    category: "1vm-kernel|all"
-    short_name: "md64"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32"
+    category: "vm|release"
+    short_name: "m32"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64"
-    category: "1vm-kernel|all"
-    short_name: "mr64"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64"
+    category: "vm|release"
+    short_name: "msi"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
-    category: "1vm|all"
-    short_name: "d32"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-x64"
+    category: "vm|release"
+    short_name: "m64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm"
-    category: "1vm|all"
-    short_name: "da"
+    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32"
+    category: "vm|debug"
+    short_name: "w32"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64"
-    category: "1vm|all"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.ci/vm-win-debug-x64"
+    category: "vm|debug"
+    short_name: "w64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-linux-product-x64"
-    category: "1vm-product|all"
-    short_name: "p64"
+    name: "buildbucket/luci.dart.ci/vm-win-release-ia32"
+    category: "vm|release"
+    short_name: "w32"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32"
-    category: "1vm|all"
-    short_name: "r32"
+    name: "buildbucket/luci.dart.ci/vm-win-release-x64"
+    category: "vm|release"
+    short_name: "w64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm"
-    category: "1vm|all"
-    short_name: "ra"
+    name: "buildbucket/luci.dart.ci/app-linux-debug-x64"
+    category: "vm|app"
+    short_name: "d64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64"
-    category: "1vm|all"
-    short_name: "ra64"
+    name: "buildbucket/luci.dart.ci/app-linux-product-x64"
+    category: "vm|app"
+    short_name: "p64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-x64"
-    category: "1vm|all"
+    name: "buildbucket/luci.dart.ci/app-linux-release-x64"
+    category: "vm|app"
     short_name: "r64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32"
-    category: "1vm|all"
-    short_name: "mr32"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64"
+    category: "vm|kernel"
+    short_name: "d"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64"
-    category: "1vm|all"
-    short_name: "mdsi"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "r"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64"
-    category: "1vm|all"
-    short_name: "md64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64"
+    category: "vm|kernel"
+    short_name: "md"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-mac-product-x64"
-    category: "1vm-product|all"
-    short_name: "mp64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64"
+    category: "vm|kernel"
+    short_name: "mr"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32"
-    category: "1vm|all"
-    short_name: "mr32"
+    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
+    category: "vm|misc"
+    short_name: "cra"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64"
-    category: "1vm|all"
-    short_name: "mrsi"
+    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64"
+    category: "vm|misc"
+    short_name: "tra"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-x64"
-    category: "1vm|all"
-    short_name: "mr64"
+    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-ia32"
+    category: "vm|misc"
+    short_name: "a32"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64"
-    category: "1vm-precomp|all"
-    short_name: "nopt"
+    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "a64"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32"
-    category: "1vm-misc|all"
-    short_name: "op32"
+    category: "vm|misc"
+    short_name: "o32"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64"
-    category: "1vm-misc|all"
-    short_name: "op64"
+    category: "vm|misc"
+    short_name: "o64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-precomp-android-release"
-    category: "1vm-precomp|all"
-    short_name: "par"
+    name: "buildbucket/luci.dart.ci/vm-russian-win-debug-ia32"
+    category: "vm|misc"
+    short_name: "ru"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64"
-    category: "1vm-precomp|all"
-    short_name: "wpsi"
+    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64"
+    category: "vm|precomp"
+    short_name: "d64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64"
-    category: "1vm-reload|all"
-    short_name: "rd64"
+    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64"
+    category: "vm|precomp"
+    short_name: "p64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64"
-    category: "1vm-reload|all"
-    short_name: "rr64"
+    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64"
+    category: "vm|precomp"
+    short_name: "no"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64"
-    category: "1vm-reload|all"
-    short_name: "mdsi"
+    name: "buildbucket/luci.dart.ci/vm-precomp-android-release"
+    category: "vm|precomp"
+    short_name: "and"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64"
-    category: "1vm-reload|all"
-    short_name: "mrsi"
+    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64"
+    category: "vm|precomp"
+    short_name: "wsi"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64"
-    category: "1vm-reload|all"
-    short_name: "rrd"
+    name: "buildbucket/luci.dart.ci/vm-linux-product-x64"
+    category: "vm|product"
+    short_name: "64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64"
-    category: "1vm-reload|all"
-    short_name: "rrr"
+    name: "buildbucket/luci.dart.ci/vm-mac-product-x64"
+    category: "vm|product"
+    short_name: "m64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-russian-win-debug-ia32"
-    category: "1vm-misc|all"
-    short_name: "rus"
+    name: "buildbucket/luci.dart.ci/vm-win-product-x64"
+    category: "vm|product"
+    short_name: "w64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32"
-    category: "1vm|all"
-    short_name: "wd32"
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64"
+    category: "vm|reload"
+    short_name: "d"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-x64"
-    category: "1vm|all"
-    short_name: "wd64"
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64"
+    category: "vm|reload"
+    short_name: "r"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-win-product-x64"
-    category: "1vm-product|all"
-    short_name: "wp64"
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64"
+    category: "vm|reload"
+    short_name: "mds"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-win-release-ia32"
-    category: "1vm|all"
-    short_name: "wp32"
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64"
+    category: "vm|reload"
+    short_name: "mrs"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-win-release-x64"
-    category: "1vm|all"
-    short_name: "wr64"
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64"
+    category: "vm|reload"
+    short_name: "dro"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64"
+    category: "vm|reload"
+    short_name: "rro"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8"
-    category: "20dart2js-d8|all"
+    category: "dart2js|d8"
     short_name: "hc"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-minified-linux-ia32-d8"
-    category: "20dart2js-d8|all"
+    category: "dart2js|d8"
     short_name: "mi"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none"
-    category: "20dart2js-d8|all"
+    category: "dart2js|misc"
     short_name: "ut"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-jsshell"
-    category: "23dart2js-jsshell|all"
-    short_name: "js"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-jsshell"
+    category: "dart2js|misc"
+    short_name: "jsh"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/analyzer-linux"
-    category: "30analyzer|all"
-    short_name: "l"
+    name: "buildbucket/luci.dart.ci/analyzer-linux-debug"
+    category: "analyzer"
+    short_name: "d"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/analyzer-linux-release"
-    category: "30analyzer|all"
-    short_name: "lr"
+    category: "analyzer"
+    short_name: "r"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/analyzer-mac-release"
-    category: "30analyzer|all"
+    category: "analyzer"
     short_name: "mr"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
-    category: "30analyzer|all"
-    short_name: "lrs"
+    category: "analyzer"
+    short_name: "sr"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
-    category: "30analyzer|all"
-    short_name: "mrs"
+    category: "analyzer"
+    short_name: "smr"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
-    category: "30analyzer|all"
-    short_name: "wrs"
+    category: "analyzer"
+    short_name: "swr"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/analyzer-win-release"
-    category: "30analyzer|all"
-    short_name: "wr"
+    category: "analyzer"
+    short_name: "awr"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart-sdk-linux"
-    category: "4dart-sdk|all"
+    category: "sdk"
     short_name: "l"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart-sdk-mac"
-    category: "4dart-sdk|all"
+    category: "sdk"
     short_name: "m"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart-sdk-win"
-    category: "4dart-sdk|all"
+    category: "sdk"
     short_name: "w"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/ddc-linux-release"
-    category: "5ddc|all"
-    short_name: "lr"
+    category: "ddc"
+    short_name: "l"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/ddc-mac-release"
-    category: "5ddc|all"
-    short_name: "mr"
+    category: "ddc"
+    short_name: "m"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/ddc-win-release"
-    category: "5ddc|all"
-    short_name: "wr"
+    category: "ddc"
+    short_name: "w"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-chrome"
-    category: "7dart2js-linux|all"
-    short_name: "lc"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-chrome"
+    category: "dart2js|chrome"
+    short_name: "l"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-ff"
-    category: "7dart2js-linux|all"
-    short_name: "lf"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-ff"
+    category: "dart2js|ff"
+    short_name: "l"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-ia32-drt"
-    category: "8chrome|all"
-    short_name: "cmin"
+    category: "dart2js|chrome"
+    short_name: "csp"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-drt"
-    category: "8chrome|all"
+    category: "dart2js|chrome"
     short_name: "drt"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-mac-ia32-chrome"
-    category: "8chrome|all"
-    short_name: "mc"
+    category: "dart2js|chrome"
+    short_name: "m"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-mac-ia32-safari"
-    category: "90safari|all"
-    short_name: "ms"
+    category: "dart2js|safari"
+    short_name: "m"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-win-ia32-chrome"
-    category: "92dart2js-windows|all"
-    short_name: "wc"
+    category: "dart2js|chrome"
+    short_name: "w"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-win-ia32-edge"
+    category: "dart2js|ms"
+    short_name: "ed"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-win-ia32-ff"
-    category: "92dart2js-windows|all"
-    short_name: "wf"
+    category: "dart2js|ff"
+    short_name: "w"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-win-ia32-ie11"
-    category: "92dart2js-windows|all"
-    short_name: "wi"
+    category: "dart2js|ms"
+    short_name: "ie"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/pkg-linux-release"
-    category: "94pub-pkg|all"
-    short_name: "lr"
+    category: "pub|pkg"
+    short_name: "l"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/pkg-mac-release"
-    category: "94pub-pkg|all"
-    short_name: "mr"
+    category: "pub|pkg"
+    short_name: "m"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/pkg-win-release"
-    category: "94pub-pkg|all"
-    short_name: "wr"
+    category: "pub|pkg"
+    short_name: "w"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/debianpackage-linux"
-    category: "99misc|all"
-    short_name: "dbl"
+    category: "misc"
+    short_name: "dp"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/versionchecker-linux"
-    category: "99misc|all"
-    short_name: "vcl"
+    category: "misc"
+    short_name: "vc"
   }
 }
 
@@ -781,383 +791,388 @@ consoles: {
   ref: "stable"
   manifest_name: "REVISION"
   builders: {
-    name: "buildbucket/luci.dart.ci/app-linux-debug-x64"
-    category: "1vm-app|all"
-    short_name: "ad64"
-  }
-  builders: {
-    name: "buildbucket/luci.dart.ci/app-linux-product-x64"
-    category: "1vm-app|all"
-    short_name: "ap64"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
+    category: "vm|debug"
+    short_name: "32"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/app-linux-release-x64"
-    category: "1vm-app|all"
-    short_name: "ar64"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm"
+    category: "vm|simarm"
+    short_name: "d"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
-    category: "1vm-misc|all"
-    short_name: "cr64"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64"
+    category: "vm|debug"
+    short_name: "64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64"
-    category: "1vm-precomp|all"
-    short_name: "pd64"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32"
+    category: "vm|release"
+    short_name: "32"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64"
-    category: "1vm-precomp|all"
-    short_name: "pp64"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm"
+    category: "vm|simarm"
+    short_name: "r"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64"
-    category: "1vm-misc|all"
-    short_name: "tarm"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64"
+    category: "vm|simarm"
+    short_name: "r64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-ia32"
-    category: "1vm-misc|all"
-    short_name: "as32"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-x64"
+    category: "vm|release"
+    short_name: "64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64"
-    category: "1vm-misc|all"
-    short_name: "as64"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32"
+    category: "vm|debug"
+    short_name: "m32"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64"
-    category: "1vm-kernel|all"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64"
+    category: "vm|debug"
+    short_name: "msi"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64"
-    category: "1vm-kernel|all"
-    short_name: "r64"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64"
+    category: "vm|debug"
+    short_name: "m64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64"
-    category: "1vm-kernel|all"
-    short_name: "md64"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32"
+    category: "vm|release"
+    short_name: "m32"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64"
-    category: "1vm-kernel|all"
-    short_name: "mr64"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64"
+    category: "vm|release"
+    short_name: "msi"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
-    category: "1vm|all"
-    short_name: "d32"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-x64"
+    category: "vm|release"
+    short_name: "m64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm"
-    category: "1vm|all"
-    short_name: "da"
+    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32"
+    category: "vm|debug"
+    short_name: "w32"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64"
-    category: "1vm|all"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.ci/vm-win-debug-x64"
+    category: "vm|debug"
+    short_name: "w64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-linux-product-x64"
-    category: "1vm-product|all"
-    short_name: "p64"
+    name: "buildbucket/luci.dart.ci/vm-win-release-ia32"
+    category: "vm|release"
+    short_name: "w32"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32"
-    category: "1vm|all"
-    short_name: "r32"
+    name: "buildbucket/luci.dart.ci/vm-win-release-x64"
+    category: "vm|release"
+    short_name: "w64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm"
-    category: "1vm|all"
-    short_name: "ra"
+    name: "buildbucket/luci.dart.ci/app-linux-debug-x64"
+    category: "vm|app"
+    short_name: "d64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64"
-    category: "1vm|all"
-    short_name: "ra64"
+    name: "buildbucket/luci.dart.ci/app-linux-product-x64"
+    category: "vm|app"
+    short_name: "p64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-x64"
-    category: "1vm|all"
+    name: "buildbucket/luci.dart.ci/app-linux-release-x64"
+    category: "vm|app"
     short_name: "r64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32"
-    category: "1vm|all"
-    short_name: "mr32"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64"
+    category: "vm|kernel"
+    short_name: "d"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64"
-    category: "1vm|all"
-    short_name: "mdsi"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "r"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64"
-    category: "1vm|all"
-    short_name: "md64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64"
+    category: "vm|kernel"
+    short_name: "md"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-mac-product-x64"
-    category: "1vm-product|all"
-    short_name: "mp64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64"
+    category: "vm|kernel"
+    short_name: "mr"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32"
-    category: "1vm|all"
-    short_name: "mr32"
+    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
+    category: "vm|misc"
+    short_name: "cra"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64"
-    category: "1vm|all"
-    short_name: "mrsi"
+    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64"
+    category: "vm|misc"
+    short_name: "tra"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-x64"
-    category: "1vm|all"
-    short_name: "mr64"
+    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-ia32"
+    category: "vm|misc"
+    short_name: "a32"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64"
-    category: "1vm-precomp|all"
-    short_name: "nopt"
+    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "a64"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32"
-    category: "1vm-misc|all"
-    short_name: "op32"
+    category: "vm|misc"
+    short_name: "o32"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64"
-    category: "1vm-misc|all"
-    short_name: "op64"
+    category: "vm|misc"
+    short_name: "o64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-precomp-android-release"
-    category: "1vm-precomp|all"
-    short_name: "par"
+    name: "buildbucket/luci.dart.ci/vm-russian-win-debug-ia32"
+    category: "vm|misc"
+    short_name: "ru"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64"
-    category: "1vm-precomp|all"
-    short_name: "wpsi"
+    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64"
+    category: "vm|precomp"
+    short_name: "d64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64"
-    category: "1vm-reload|all"
-    short_name: "rd64"
+    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64"
+    category: "vm|precomp"
+    short_name: "p64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64"
-    category: "1vm-reload|all"
-    short_name: "rr64"
+    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64"
+    category: "vm|precomp"
+    short_name: "no"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64"
-    category: "1vm-reload|all"
-    short_name: "mdsi"
+    name: "buildbucket/luci.dart.ci/vm-precomp-android-release"
+    category: "vm|precomp"
+    short_name: "and"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64"
-    category: "1vm-reload|all"
-    short_name: "mrsi"
+    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64"
+    category: "vm|precomp"
+    short_name: "wsi"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64"
-    category: "1vm-reload|all"
-    short_name: "rrd"
+    name: "buildbucket/luci.dart.ci/vm-linux-product-x64"
+    category: "vm|product"
+    short_name: "64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64"
-    category: "1vm-reload|all"
-    short_name: "rrr"
+    name: "buildbucket/luci.dart.ci/vm-mac-product-x64"
+    category: "vm|product"
+    short_name: "m64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-russian-win-debug-ia32"
-    category: "1vm-misc|all"
-    short_name: "rus"
+    name: "buildbucket/luci.dart.ci/vm-win-product-x64"
+    category: "vm|product"
+    short_name: "w64"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32"
-    category: "1vm|all"
-    short_name: "wd32"
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64"
+    category: "vm|reload"
+    short_name: "d"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-x64"
-    category: "1vm|all"
-    short_name: "wd64"
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64"
+    category: "vm|reload"
+    short_name: "r"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-win-product-x64"
-    category: "1vm-product|all"
-    short_name: "wp64"
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64"
+    category: "vm|reload"
+    short_name: "mds"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-win-release-ia32"
-    category: "1vm|all"
-    short_name: "wp32"
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64"
+    category: "vm|reload"
+    short_name: "mrs"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/vm-win-release-x64"
-    category: "1vm|all"
-    short_name: "wr64"
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64"
+    category: "vm|reload"
+    short_name: "dro"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64"
+    category: "vm|reload"
+    short_name: "rro"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8"
-    category: "20dart2js-d8|all"
+    category: "dart2js|d8"
     short_name: "hc"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-minified-linux-ia32-d8"
-    category: "20dart2js-d8|all"
+    category: "dart2js|d8"
     short_name: "mi"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none"
-    category: "20dart2js-d8|all"
+    category: "dart2js|misc"
     short_name: "ut"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-jsshell"
-    category: "23dart2js-jsshell|all"
-    short_name: "js"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-jsshell"
+    category: "dart2js|misc"
+    short_name: "jsh"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/analyzer-linux"
-    category: "30analyzer|all"
-    short_name: "l"
+    name: "buildbucket/luci.dart.ci/analyzer-linux-debug"
+    category: "analyzer"
+    short_name: "d"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/analyzer-linux-release"
-    category: "30analyzer|all"
-    short_name: "lr"
+    category: "analyzer"
+    short_name: "r"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/analyzer-mac-release"
-    category: "30analyzer|all"
+    category: "analyzer"
     short_name: "mr"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
-    category: "30analyzer|all"
-    short_name: "lrs"
+    category: "analyzer"
+    short_name: "sr"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
-    category: "30analyzer|all"
-    short_name: "mrs"
+    category: "analyzer"
+    short_name: "smr"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
-    category: "30analyzer|all"
-    short_name: "wrs"
+    category: "analyzer"
+    short_name: "swr"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/analyzer-win-release"
-    category: "30analyzer|all"
-    short_name: "wr"
+    category: "analyzer"
+    short_name: "awr"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart-sdk-linux"
-    category: "4dart-sdk|all"
+    category: "sdk"
     short_name: "l"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart-sdk-mac"
-    category: "4dart-sdk|all"
+    category: "sdk"
     short_name: "m"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart-sdk-win"
-    category: "4dart-sdk|all"
+    category: "sdk"
     short_name: "w"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/ddc-linux-release"
-    category: "5ddc|all"
-    short_name: "lr"
+    category: "ddc"
+    short_name: "l"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/ddc-mac-release"
-    category: "5ddc|all"
-    short_name: "mr"
+    category: "ddc"
+    short_name: "m"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/ddc-win-release"
-    category: "5ddc|all"
-    short_name: "wr"
+    category: "ddc"
+    short_name: "w"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-chrome"
-    category: "7dart2js-linux|all"
-    short_name: "lc"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-chrome"
+    category: "dart2js|chrome"
+    short_name: "l"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-ff"
-    category: "7dart2js-linux|all"
-    short_name: "lf"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-ff"
+    category: "dart2js|ff"
+    short_name: "l"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-ia32-drt"
-    category: "8chrome|all"
-    short_name: "cmin"
+    category: "dart2js|chrome"
+    short_name: "csp"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-drt"
-    category: "8chrome|all"
+    category: "dart2js|chrome"
     short_name: "drt"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-mac-ia32-chrome"
-    category: "8chrome|all"
-    short_name: "mc"
+    category: "dart2js|chrome"
+    short_name: "m"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-mac-ia32-safari"
-    category: "90safari|all"
-    short_name: "ms"
+    category: "dart2js|safari"
+    short_name: "m"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-win-ia32-chrome"
-    category: "92dart2js-windows|all"
-    short_name: "wc"
+    category: "dart2js|chrome"
+    short_name: "w"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-win-ia32-edge"
+    category: "dart2js|ms"
+    short_name: "ed"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-win-ia32-ff"
-    category: "92dart2js-windows|all"
-    short_name: "wf"
+    category: "dart2js|ff"
+    short_name: "w"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-win-ia32-ie11"
-    category: "92dart2js-windows|all"
-    short_name: "wi"
+    category: "dart2js|ms"
+    short_name: "ie"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/pkg-linux-release"
-    category: "94pub-pkg|all"
-    short_name: "lr"
+    category: "pub|pkg"
+    short_name: "l"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/pkg-mac-release"
-    category: "94pub-pkg|all"
-    short_name: "mr"
+    category: "pub|pkg"
+    short_name: "m"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/pkg-win-release"
-    category: "94pub-pkg|all"
-    short_name: "wr"
+    category: "pub|pkg"
+    short_name: "w"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/debianpackage-linux"
-    category: "99misc|all"
-    short_name: "dbl"
+    category: "misc"
+    short_name: "dp"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/versionchecker-linux"
-    category: "99misc|all"
-    short_name: "vcl"
+    category: "misc"
+    short_name: "vc"
   }
 }
\ No newline at end of file

From 9e0c3b9aba7e12ed4821ef17b711b2c027b204a4 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 19 Oct 2017 13:42:53 +0000
Subject: [PATCH 032/826] Add athom@ to OWNERS for infra/config

R=whesse@google.com

Change-Id: I6bf74726e3ba9e5f876a2984efeff05f0574ec95
Reviewed-on: https://dart-review.googlesource.com/15142
Reviewed-by: William Hesse <whesse@google.com>
---
 OWNERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OWNERS b/OWNERS
index bca822ed0176..647d54fbc844 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1,4 @@
 whesse@google.com
+athom@google.com
 kustermann@google.com
 tandrii@google.com

From 2fda545b54a5121409ebca94d52f2d696420d663 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 23 Oct 2017 10:18:16 +0000
Subject: [PATCH 033/826] Add FYI builders to CI buildbucket

Change-Id: Ic660a425b50222d782b0046f1e4a38e563cae514
Reviewed-on: https://dart-review.googlesource.com/15880
Reviewed-by: Morten Krogh-jespersen <mkroghj@google.com>
---
 cr-buildbucket.cfg | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index bc947a8d23f6..618304e3a177 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -34,6 +34,11 @@ acl_sets {
   }
 }
 
+builder_mixins {
+  name: "android"
+  # todo(athom): how should this machine be defined?
+}
+
 builder_mixins {
   name: "debianpackage"
   # todo(athom): how should this machine be defined?
@@ -44,6 +49,12 @@ builder_mixins {
   # todo(athom): how should this machine be defined?
 }
 
+builder_mixins {
+  name: "safarimobilesim"
+  dimensions: "os:Mac"
+  # todo(athom): how should this machine be defined?
+}
+
 builder_mixins {
   name: "vm-kernel"
   recipe {
@@ -77,6 +88,7 @@ buckets {
     builders { name: "analyzer-strong-mac-release" dimensions: "os:Mac" }
     builders { name: "analyzer-strong-win-release" dimensions: "os:Windows" }
     builders { name: "analyzer-win-release" dimensions: "os:Windows" }
+    builders { name: "androidvm-linux-release-x64" mixins: "android" }
     builders { name: "app-linux-debug-x64" }
     builders { name: "app-linux-product-x64" }
     builders { name: "app-linux-release-x64" }
@@ -85,13 +97,17 @@ buckets {
     builders { name: "dart-sdk-mac" dimensions: "os:Mac" }
     builders { name: "dart-sdk-win" dimensions: "os:Windows" }
     builders { name: "dart2js-csp-minified-linux-ia32-drt" }
+    builders { name: "dart2js-dumpinfo-linux-ia32-none" }
     builders { name: "dart2js-hostchecked-linux-ia32-d8" }
+    builders { name: "dart2js-hostchecked-linux-debug-ia32-none" }
     builders { name: "dart2js-linux-ia32-chrome" }
     builders { name: "dart2js-linux-ia32-ff" }
+    builders { name: "dart2js-linux-debug-ia32-none" }
     builders { name: "dart2js-linux-ia32-drt" }
     builders { name: "dart2js-linux-ia32-jsshell" }
     builders { name: "dart2js-mac-ia32-chrome" dimensions: "os:Mac" }
     builders { name: "dart2js-mac-ia32-safari" dimensions: "os:Mac" }
+    builders { name: "dart2js-mac-ia32-safarimobilesim" mixins: "safarimobilesim" }
     builders { name: "dart2js-minified-linux-ia32-d8" }
     builders { name: "dart2js-only-unittest-linux-ia32-none" }
     builders { name: "dart2js-win-ia32-chrome" dimensions: "os:Windows" }
@@ -105,14 +121,20 @@ buckets {
     builders { name: "pkg-linux-release" }
     builders { name: "pkg-mac-release" dimensions: "os:Mac" }
     builders { name: "pkg-win-release" dimensions: "os:Windows" }
+    builders { name: "pub-linux-release" }
+    builders { name: "pub-mac-release" dimensions: "os:Mac" }
+    builders { name: "pub-win-release" dimensions: "os:Windows" }
     builders { name: "precomp-linux-debug-x64" }
     builders { name: "precomp-linux-product-x64" }
     builders { name: "target-vm-linux-release-arm64" dimensions: "cpu:arm64" }
     builders { name: "versionchecker-linux" }
     builders { name: "vm-asan-linux-release-ia32" }
     builders { name: "vm-asan-linux-release-x64" }
+    builders { name: "vm-kernel-checked-linux-release-x64" }
     builders { name: "vm-kernel-linux-debug-x64" }
     builders { name: "vm-kernel-linux-release-x64" }
+    builders { name: "vm-kernel-precomp-linux-debug-x64" }
+    builders { name: "vm-kernel-precomp-linux-release-x64" }
     builders { name: "vm-kernel-mac-debug-x64" dimensions: "os:Mac" }
     builders { name: "vm-kernel-mac-release-x64" dimensions: "os:Mac" }
     builders { name: "vm-linux-debug-ia32" }

From b23649b9d74c09eb79beba6c78850da0213305b3 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 23 Oct 2017 10:30:52 +0000
Subject: [PATCH 034/826] Add FYI builders to LUCI Milo consoles

Change-Id: I8de842316e0675a67fee5447bd1f6e1fabb777eb
Reviewed-on: https://dart-review.googlesource.com/15882
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-milo.cfg | 91 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 82 insertions(+), 9 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 5224d8993048..12a72240b6de 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -244,6 +244,11 @@ consoles: {
     category: "dart2js|misc"
     short_name: "ut"
   }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-dumpinfo-linux-ia32-none"
+    category: "dart2js|misc"
+    short_name: "dp"
+  }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-jsshell"
     category: "dart2js|misc"
@@ -366,17 +371,17 @@ consoles: {
   }
   builders: {
     name: "buildbucket/luci.dart.ci/pkg-linux-release"
-    category: "pub|pkg"
+    category: "pkg"
     short_name: "l"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/pkg-mac-release"
-    category: "pub|pkg"
+    category: "pkg"
     short_name: "m"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/pkg-win-release"
-    category: "pub|pkg"
+    category: "pkg"
     short_name: "w"
   }
   builders: {
@@ -637,6 +642,11 @@ consoles: {
     category: "dart2js|misc"
     short_name: "ut"
   }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-dumpinfo-linux-ia32-none"
+    category: "dart2js|misc"
+    short_name: "dp"
+  }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-jsshell"
     category: "dart2js|misc"
@@ -759,17 +769,17 @@ consoles: {
   }
   builders: {
     name: "buildbucket/luci.dart.ci/pkg-linux-release"
-    category: "pub|pkg"
+    category: "pkg"
     short_name: "l"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/pkg-mac-release"
-    category: "pub|pkg"
+    category: "pkg"
     short_name: "m"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/pkg-win-release"
-    category: "pub|pkg"
+    category: "pkg"
     short_name: "w"
   }
   builders: {
@@ -1030,6 +1040,11 @@ consoles: {
     category: "dart2js|misc"
     short_name: "ut"
   }
+  builders: {
+    name: "buildbucket/luci.dart.ci/dart2js-dumpinfo-linux-ia32-none"
+    category: "dart2js|misc"
+    short_name: "dp"
+  }
   builders: {
     name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-jsshell"
     category: "dart2js|misc"
@@ -1152,17 +1167,17 @@ consoles: {
   }
   builders: {
     name: "buildbucket/luci.dart.ci/pkg-linux-release"
-    category: "pub|pkg"
+    category: "pkg"
     short_name: "l"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/pkg-mac-release"
-    category: "pub|pkg"
+    category: "pkg"
     short_name: "m"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/pkg-win-release"
-    category: "pub|pkg"
+    category: "pkg"
     short_name: "w"
   }
   builders: {
@@ -1175,4 +1190,62 @@ consoles: {
     category: "misc"
     short_name: "vc"
   }
+}
+
+consoles: {
+  id: "fyi"
+  name: "SDK FYI Console"
+  repo_url: "https://dart.googlesource.com/sdk/"
+  ref: "master"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64"
+    category: "vm-kernel"
+    short_name: "pd"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64"
+    category: "vm-kernel"
+    short_name: "pr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-checked-linux-release-x64"
+    category: "vm-kernel"
+    short_name: "cr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-debug-ia32-none"
+    category: "dart2js"
+    short_name: "hcd"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart2js-linux-debug-ia32-none"
+    category: "dart2js"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart2js-mac-ia32-safarimobilesim"
+    category: "dart2js"
+    short_name: "sim"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/pub-linux-release"
+    category: "pub"
+    short_name: "l"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/pub-mac-release"
+    category: "pub"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/pub-win-release"
+    category: "pub"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/androidvm-linux-release-x64"
+    category: "android"
+    short_name: "vm"
+  }
 }
\ No newline at end of file

From 77b74d79759cf19fa02503baeafcb4bf3af5a8b6 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 25 Oct 2017 12:51:33 +0000
Subject: [PATCH 035/826] Add LUCI scheduler configuration for sdk builders

Change-Id: I972200deb8047086af7afb4d85831bd3785c46c1
Reviewed-on: https://dart-review.googlesource.com/16521
Reviewed-by: Morten Krogh-jespersen <mkroghj@google.com>
---
 luci-scheduler.cfg | 65 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 luci-scheduler.cfg

diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
new file mode 100644
index 000000000000..02e5013b005e
--- /dev/null
+++ b/luci-scheduler.cfg
@@ -0,0 +1,65 @@
+# Defines jobs on luci-scheduler.appspot.com.
+#
+# For schema of this file and documentation see ProjectConfig message in
+# https://github.com/luci/luci-go/blob/master/scheduler/appengine/messages/cron.proto
+acl_sets {
+  name: "default"
+  acls {
+    role: READER
+    granted_to: "group:all"
+  }
+  acls {
+    role: OWNER
+    granted_to: "group:project-dart-committers"
+  }
+}
+
+trigger {
+  id: "dart-gitiles-trigger"
+  acl_sets: "default"
+  gitiles: {
+    repo: "https://dart.googlesource.com/sdk/"
+    refs: "refs/heads/master"
+    refs: "refs/heads/dev"
+    refs: "refs/heads/stable"
+  }
+  triggers: "dart-sdk-linux"
+  triggers: "dart-sdk-mac"
+  triggers: "dart-sdk-win"
+}
+
+job {
+  id: "dart-sdk-linux"
+  acl_sets: "default"
+  disabled: true
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-linux"
+  }
+}
+
+job {
+  id: "dart-sdk-mac"
+  acl_sets: "default"
+  disabled: true
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-mac"
+  }
+}
+
+job {
+  id: "dart-sdk-win"
+  acl_sets: "default"
+  disabled: true
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-win"
+  }
+}

From 0ea3227f8c02b6a964014da0c93b4444404b149e Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 25 Oct 2017 14:21:42 +0000
Subject: [PATCH 036/826] Enable LUCI SDK CI builders

TBR=whesse@google.com

Change-Id: I021c9381833e4c12739acbecab8fcc1460dfedba
Reviewed-on: https://dart-review.googlesource.com/16525
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-scheduler.cfg | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 02e5013b005e..11646cc0601c 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -31,7 +31,6 @@ trigger {
 job {
   id: "dart-sdk-linux"
   acl_sets: "default"
-  disabled: true
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
@@ -43,7 +42,6 @@ job {
 job {
   id: "dart-sdk-mac"
   acl_sets: "default"
-  disabled: true
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
@@ -55,7 +53,6 @@ job {
 job {
   id: "dart-sdk-win"
   acl_sets: "default"
-  disabled: true
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"

From 4ba6ce9ba092423d812d596b2f228a4c54d47176 Mon Sep 17 00:00:00 2001
From: Morten Krogh-Jespersen <mkroghj@google.com>
Date: Tue, 7 Nov 2017 22:00:29 +0000
Subject: [PATCH 037/826] Change analyzer-linux-debug builder to
 analyzer-analysis-server-linux.

Bug:
Change-Id: Ia17d531e9f376e28eb89529cbe997fbf0700a29a
Reviewed-on: https://dart-review.googlesource.com/18940
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 2 +-
 luci-milo.cfg      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 618304e3a177..654014591070 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -81,7 +81,7 @@ buckets {
         name: "dart/neo"
       }
     }
-    builders { name: "analyzer-linux-debug" }
+    builders { name: "analyzer-analysis-server-linux" }
     builders { name: "analyzer-linux-release" }
     builders { name: "analyzer-mac-release" dimensions: "os:Mac" }
     builders { name: "analyzer-strong-linux-release" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 12a72240b6de..8f5fec76e857 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -255,9 +255,9 @@ consoles: {
     short_name: "jsh"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/analyzer-linux-debug"
+    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
     category: "analyzer"
-    short_name: "d"
+    short_name: "aas"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/analyzer-linux-release"

From 4b53e1efaf6f2eb5a3f88ee2b018b007827b3bca Mon Sep 17 00:00:00 2001
From: Morten Krogh-Jespersen <mkroghj@google.com>
Date: Tue, 7 Nov 2017 22:03:46 +0000
Subject: [PATCH 038/826] Update README with information to checkout
 repository.

The README now explain how to checkout infra/config and how to use it with
gerrit.

Bug:
Change-Id: I15c3947a8c9e2ff136a1b519784a8c3fa6192640
Reviewed-on: https://dart-review.googlesource.com/19080
Reviewed-by: Alexander Thomas <athom@google.com>
---
 README.md | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0513e02f6f46..2093d83760ec 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,31 @@
-Configuration for chrome infrastructure services
+# infra/config branch
+
+This branch contains dart project-wide configurations for infra services. For
+example, cr-buildbucket.cfg defines builders that run on the dart waterfall and
+commit queue.
+
+## Making changes
+
+It is recommended to have a separate checkout for this branch, so switching
+to/from this branch does not populate/delete all files in the master branch.
+
+### Initial setup:
+
+```console
+mkdir config
+cd config
+git init
+git remote add origin https://dart.googlesource.com/sdk
+git fetch origin infra/config
+git reset --hard origin/infra/config
+git config depot-tools.upstream origin/infra/config
+```
+Now you can create a new branch to make changes:
+
+```console
+git new-branch add-new-builder
+# edit cr-buildbucket.cfg
+git commit -a
+
+git cl upload
+```
\ No newline at end of file

From 6419b115a3d04242f5a8f0ff2fdd09c9477fcaa8 Mon Sep 17 00:00:00 2001
From: Morten Krogh-Jespersen <mkroghj@google.com>
Date: Wed, 8 Nov 2017 03:48:12 +0000
Subject: [PATCH 039/826] Add service-account to all builders to allow for
 triggering of builds.

Bug:
Change-Id: I79fe72bd30d65c2c26e642e0a911b5e7a650fe35
Reviewed-on: https://dart-review.googlesource.com/19081
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 654014591070..d49ec28e59d6 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -80,6 +80,7 @@ buckets {
         properties: "mastername:dart"
         name: "dart/neo"
       }
+      service_account: "dart-ci-sdk-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders { name: "analyzer-analysis-server-linux" }
     builders { name: "analyzer-linux-release" }

From 22042dc6ede99ebf385a6474dd51273353667115 Mon Sep 17 00:00:00 2001
From: Morten Krogh-Jespersen <mkroghj@google.com>
Date: Thu, 9 Nov 2017 00:21:59 +0000
Subject: [PATCH 040/826] Change the service account from dart-ci-sdk-builder
 to dart-luci-ci-builder.

The service account is to be used on all builders, so renaming it
sounds like a good idea.

Bug:
Change-Id: Id9751702585d88777ea5cdbb9a675f8216e15528
Reviewed-on: https://dart-review.googlesource.com/19460
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index d49ec28e59d6..bcb027cd0f17 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -80,7 +80,7 @@ buckets {
         properties: "mastername:dart"
         name: "dart/neo"
       }
-      service_account: "dart-ci-sdk-builder@dart-ci.iam.gserviceaccount.com"
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders { name: "analyzer-analysis-server-linux" }
     builders { name: "analyzer-linux-release" }

From c0af61b182dd60827c894d9bdd77442704b24a3b Mon Sep 17 00:00:00 2001
From: Morten Krogh-Jespersen <mkroghj@google.com>
Date: Thu, 9 Nov 2017 19:14:12 +0000
Subject: [PATCH 041/826] Add dart-luci-ci-builder service account as a
 scheduler.

Bug:
Change-Id: Ic93b7225e1ee9672a10691aa7d059704b55d108c
Reviewed-on: https://dart-review.googlesource.com/19560
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index bcb027cd0f17..b8145c1c5e47 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -16,6 +16,10 @@ acl_sets {
     role: SCHEDULER
     identity: "luci-scheduler@appspot.gserviceaccount.com"
   }
+  acls {
+    role: SCHEDULER
+    identity: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+  }
 }
 
 acl_sets {

From cde7c3780c5bce2875e3c3e2f31137038479541f Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 10 Nov 2017 23:00:50 +0000
Subject: [PATCH 042/826] Add benchmark builder to CQ buildbucket

Change-Id: Icbb4c1038997b79be3a0e99a6d96ab8839a19c16
Reviewed-on: https://dart-review.googlesource.com/20301
Reviewed-by: Morten Krogh-jespersen <mkroghj@google.com>
---
 cr-buildbucket.cfg | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index b8145c1c5e47..1cb18205a6b0 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -199,6 +199,12 @@ buckets {
         name: "dart/dart_vm"
       }
     }
+    builders {
+      name: "benchmark-linux-try"
+      recipe {
+        name: "dart/neo"
+      }
+    }
     builders {
       name: "vm-linux-release-x64-try"
     }

From e8fccff5fd1428a0da5dbdf540447c8f688e062b Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 13 Nov 2017 23:51:24 +0000
Subject: [PATCH 043/826] Add tree status header to Milo consoles

Change-Id: I913c6a63090e99169ddd05c124b283e7d66d71ba
Reviewed-on: https://dart-review.googlesource.com/20581
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-milo.cfg | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 8f5fec76e857..69da8b143177 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -394,6 +394,9 @@ consoles: {
     category: "misc"
     short_name: "vc"
   }
+  header: {
+    tree_status_host: "dart-status.appspot.com"
+  }
 }
 
 consoles: {
@@ -1190,6 +1193,9 @@ consoles: {
     category: "misc"
     short_name: "vc"
   }
+  header: {
+    tree_status_host: "dart-status.appspot.com"
+  }
 }
 
 consoles: {
@@ -1248,4 +1254,7 @@ consoles: {
     category: "android"
     short_name: "vm"
   }
+  header: {
+    tree_status_host: "dart-status.appspot.com"
+  }
 }
\ No newline at end of file

From 69cc791492bd6bf0f1e3e90fd23a544db30c5bb4 Mon Sep 17 00:00:00 2001
From: Morten Krogh-Jespersen <mkroghj@google.com>
Date: Mon, 13 Nov 2017 23:59:34 +0000
Subject: [PATCH 044/826] Disable the linux sdk-builder while our pool is
 limited.

Bug:
Change-Id: Ibd9ada0e8e00b1a51baad15965a0b6d11db501cc
Reviewed-on: https://dart-review.googlesource.com/20600
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-scheduler.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 11646cc0601c..6206e8aca49e 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -32,6 +32,7 @@ job {
   id: "dart-sdk-linux"
   acl_sets: "default"
   schedule: "triggered"
+  disabled: true,
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"

From 426960cd85fedf2f703dfd17ca057bab48ebd71a Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 14 Nov 2017 18:05:32 +0000
Subject: [PATCH 045/826] Add links to the other Milo consoles to the header

Change-Id: Ie5b58bb734baa21417caf667922d96a71d8b0407
Reviewed-on: https://dart-review.googlesource.com/20820
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-milo.cfg | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 95 insertions(+)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 69da8b143177..153772e14f9d 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -395,6 +395,29 @@ consoles: {
     short_name: "vc"
   }
   header: {
+    links: {
+      name: "Consoles"
+      links: {
+        text: "dart.be"
+        url: "/consoles/dart/be"
+        alt: "SDK BE Console"
+      }
+      links: {
+        text: "dart.dev"
+        url: "/consoles/dart/dev"
+        alt: "SDK Dev Console"
+      }
+      links: {
+        text: "dart.stable"
+        url: "/consoles/dart/stable"
+        alt: "SDK Stable Console"
+      }
+      links: {
+        text: "dart.fyi"
+        url: "/consoles/dart/fyi"
+        alt: "SDK FYI Console"
+      }
+    }
     tree_status_host: "dart-status.appspot.com"
   }
 }
@@ -795,6 +818,32 @@ consoles: {
     category: "misc"
     short_name: "vc"
   }
+  header: {
+    links: {
+      name: "Consoles"
+      links: {
+        text: "dart.be"
+        url: "/consoles/dart/be"
+        alt: "SDK BE Console"
+      }
+      links: {
+        text: "dart.dev"
+        url: "/consoles/dart/dev"
+        alt: "SDK Dev Console"
+      }
+      links: {
+        text: "dart.stable"
+        url: "/consoles/dart/stable"
+        alt: "SDK Stable Console"
+      }
+      links: {
+        text: "dart.fyi"
+        url: "/consoles/dart/fyi"
+        alt: "SDK FYI Console"
+      }
+    }
+    tree_status_host: "dart-status.appspot.com"
+  }
 }
 
 consoles: {
@@ -1194,6 +1243,29 @@ consoles: {
     short_name: "vc"
   }
   header: {
+    links: {
+      name: "Consoles"
+      links: {
+        text: "dart.be"
+        url: "/consoles/dart/be"
+        alt: "SDK BE Console"
+      }
+      links: {
+        text: "dart.dev"
+        url: "/consoles/dart/dev"
+        alt: "SDK Dev Console"
+      }
+      links: {
+        text: "dart.stable"
+        url: "/consoles/dart/stable"
+        alt: "SDK Stable Console"
+      }
+      links: {
+        text: "dart.fyi"
+        url: "/consoles/dart/fyi"
+        alt: "SDK FYI Console"
+      }
+    }
     tree_status_host: "dart-status.appspot.com"
   }
 }
@@ -1255,6 +1327,29 @@ consoles: {
     short_name: "vm"
   }
   header: {
+    links: {
+      name: "Consoles"
+      links: {
+        text: "dart.be"
+        url: "/consoles/dart/be"
+        alt: "SDK BE Console"
+      }
+      links: {
+        text: "dart.dev"
+        url: "/consoles/dart/dev"
+        alt: "SDK Dev Console"
+      }
+      links: {
+        text: "dart.stable"
+        url: "/consoles/dart/stable"
+        alt: "SDK Stable Console"
+      }
+      links: {
+        text: "dart.fyi"
+        url: "/consoles/dart/fyi"
+        alt: "SDK FYI Console"
+      }
+    }
     tree_status_host: "dart-status.appspot.com"
   }
 }
\ No newline at end of file

From a5cb7eedbc8d9285fa451821bd40d589b112eade Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 14 Nov 2017 18:18:27 +0000
Subject: [PATCH 046/826] Fix links in Milo consoles

TBR=whesse@google.com

Change-Id: I3abdfc69b81353b30767dd76e7aff704e9222f71
Reviewed-on: https://dart-review.googlesource.com/20821
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-milo.cfg | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 153772e14f9d..d7c403c1de62 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -399,22 +399,22 @@ consoles: {
       name: "Consoles"
       links: {
         text: "dart.be"
-        url: "/consoles/dart/be"
+        url: "/console/dart/be"
         alt: "SDK BE Console"
       }
       links: {
         text: "dart.dev"
-        url: "/consoles/dart/dev"
+        url: "/console/dart/dev"
         alt: "SDK Dev Console"
       }
       links: {
         text: "dart.stable"
-        url: "/consoles/dart/stable"
+        url: "/console/dart/stable"
         alt: "SDK Stable Console"
       }
       links: {
         text: "dart.fyi"
-        url: "/consoles/dart/fyi"
+        url: "/console/dart/fyi"
         alt: "SDK FYI Console"
       }
     }
@@ -823,22 +823,22 @@ consoles: {
       name: "Consoles"
       links: {
         text: "dart.be"
-        url: "/consoles/dart/be"
+        url: "/console/dart/be"
         alt: "SDK BE Console"
       }
       links: {
         text: "dart.dev"
-        url: "/consoles/dart/dev"
+        url: "/console/dart/dev"
         alt: "SDK Dev Console"
       }
       links: {
         text: "dart.stable"
-        url: "/consoles/dart/stable"
+        url: "/console/dart/stable"
         alt: "SDK Stable Console"
       }
       links: {
         text: "dart.fyi"
-        url: "/consoles/dart/fyi"
+        url: "/console/dart/fyi"
         alt: "SDK FYI Console"
       }
     }
@@ -1247,22 +1247,22 @@ consoles: {
       name: "Consoles"
       links: {
         text: "dart.be"
-        url: "/consoles/dart/be"
+        url: "/console/dart/be"
         alt: "SDK BE Console"
       }
       links: {
         text: "dart.dev"
-        url: "/consoles/dart/dev"
+        url: "/console/dart/dev"
         alt: "SDK Dev Console"
       }
       links: {
         text: "dart.stable"
-        url: "/consoles/dart/stable"
+        url: "/console/dart/stable"
         alt: "SDK Stable Console"
       }
       links: {
         text: "dart.fyi"
-        url: "/consoles/dart/fyi"
+        url: "/console/dart/fyi"
         alt: "SDK FYI Console"
       }
     }
@@ -1331,22 +1331,22 @@ consoles: {
       name: "Consoles"
       links: {
         text: "dart.be"
-        url: "/consoles/dart/be"
+        url: "/console/dart/be"
         alt: "SDK BE Console"
       }
       links: {
         text: "dart.dev"
-        url: "/consoles/dart/dev"
+        url: "/console/dart/dev"
         alt: "SDK Dev Console"
       }
       links: {
         text: "dart.stable"
-        url: "/consoles/dart/stable"
+        url: "/console/dart/stable"
         alt: "SDK Stable Console"
       }
       links: {
         text: "dart.fyi"
-        url: "/consoles/dart/fyi"
+        url: "/console/dart/fyi"
         alt: "SDK FYI Console"
       }
     }

From 7d60a4493104ae06a30c819800443c846ebead19 Mon Sep 17 00:00:00 2001
From: Morten Krogh-Jespersen <mkroghj@google.com>
Date: Tue, 14 Nov 2017 23:19:25 +0000
Subject: [PATCH 047/826] Change triggered dart2js-builders from ia32 to x64.

Bug:
Change-Id: Ia280ca24a0e9c1068a5663ecce3edfd88c3f6b76
Reviewed-on: https://dart-review.googlesource.com/20920
Reviewed-by: William Hesse <whesse@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 26 ++++++++--------
 luci-milo.cfg      | 74 +++++++++++++++++++++++-----------------------
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 1cb18205a6b0..ca45de68108b 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -101,24 +101,24 @@ buckets {
     builders { name: "dart-sdk-linux" }
     builders { name: "dart-sdk-mac" dimensions: "os:Mac" }
     builders { name: "dart-sdk-win" dimensions: "os:Windows" }
-    builders { name: "dart2js-csp-minified-linux-ia32-drt" }
+    builders { name: "dart2js-csp-minified-linux-x64-drt" }
     builders { name: "dart2js-dumpinfo-linux-ia32-none" }
     builders { name: "dart2js-hostchecked-linux-ia32-d8" }
     builders { name: "dart2js-hostchecked-linux-debug-ia32-none" }
-    builders { name: "dart2js-linux-ia32-chrome" }
-    builders { name: "dart2js-linux-ia32-ff" }
+    builders { name: "dart2js-linux-x64-chrome" }
+    builders { name: "dart2js-linux-x64-ff" }
     builders { name: "dart2js-linux-debug-ia32-none" }
-    builders { name: "dart2js-linux-ia32-drt" }
-    builders { name: "dart2js-linux-ia32-jsshell" }
-    builders { name: "dart2js-mac-ia32-chrome" dimensions: "os:Mac" }
-    builders { name: "dart2js-mac-ia32-safari" dimensions: "os:Mac" }
-    builders { name: "dart2js-mac-ia32-safarimobilesim" mixins: "safarimobilesim" }
-    builders { name: "dart2js-minified-linux-ia32-d8" }
+    builders { name: "dart2js-linux-x64-drt" }
+    builders { name: "dart2js-linux-x64-jsshell" }
+    builders { name: "dart2js-mac-x64-chrome" dimensions: "os:Mac" }
+    builders { name: "dart2js-mac-x64-safari" dimensions: "os:Mac" }
+    builders { name: "dart2js-mac-x64-safarimobilesim" mixins: "safarimobilesim" }
+    builders { name: "dart2js-minified-linux-x64-d8" }
     builders { name: "dart2js-only-unittest-linux-ia32-none" }
-    builders { name: "dart2js-win-ia32-chrome" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-ia32-edge" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-ia32-ff" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-ia32-ie11" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-chrome" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-edge" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-ff" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-ie11" dimensions: "os:Windows" }
     builders { name: "ddc-linux-release" }
     builders { name: "ddc-mac-release" dimensions: "os:Mac" }
     builders { name: "ddc-win-release" dimensions: "os:Windows" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index d7c403c1de62..c9d03e4aeb62 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -235,7 +235,7 @@ consoles: {
     short_name: "hc"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-ia32-d8"
+    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-x64-d8"
     category: "dart2js|d8"
     short_name: "mi"
   }
@@ -250,7 +250,7 @@ consoles: {
     short_name: "dp"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-jsshell"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-jsshell"
     category: "dart2js|misc"
     short_name: "jsh"
   }
@@ -320,52 +320,52 @@ consoles: {
     short_name: "w"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-ff"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff"
     category: "dart2js|ff"
     short_name: "l"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-ia32-drt"
+    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-drt"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-drt"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-drt"
     category: "dart2js|chrome"
     short_name: "drt"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-ia32-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-ia32-safari"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-safari"
     category: "dart2js|safari"
     short_name: "m"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-win-ia32-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-win-ia32-edge"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-edge"
     category: "dart2js|ms"
     short_name: "ed"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-win-ia32-ff"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ff"
     category: "dart2js|ff"
     short_name: "w"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-win-ia32-ie11"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ie11"
     category: "dart2js|ms"
     short_name: "ie"
   }
@@ -659,7 +659,7 @@ consoles: {
     short_name: "hc"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-ia32-d8"
+    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-x64-d8"
     category: "dart2js|d8"
     short_name: "mi"
   }
@@ -674,7 +674,7 @@ consoles: {
     short_name: "dp"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-jsshell"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-jsshell"
     category: "dart2js|misc"
     short_name: "jsh"
   }
@@ -744,52 +744,52 @@ consoles: {
     short_name: "w"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-ff"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff"
     category: "dart2js|ff"
     short_name: "l"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-ia32-drt"
+    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-drt"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-drt"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-drt"
     category: "dart2js|chrome"
     short_name: "drt"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-ia32-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-ia32-safari"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-safari"
     category: "dart2js|safari"
     short_name: "m"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-win-ia32-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-win-ia32-edge"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-edge"
     category: "dart2js|ms"
     short_name: "ed"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-win-ia32-ff"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ff"
     category: "dart2js|ff"
     short_name: "w"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-win-ia32-ie11"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ie11"
     category: "dart2js|ms"
     short_name: "ie"
   }
@@ -1083,7 +1083,7 @@ consoles: {
     short_name: "hc"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-ia32-d8"
+    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-x64-d8"
     category: "dart2js|d8"
     short_name: "mi"
   }
@@ -1098,7 +1098,7 @@ consoles: {
     short_name: "dp"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-jsshell"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-jsshell"
     category: "dart2js|misc"
     short_name: "jsh"
   }
@@ -1168,52 +1168,52 @@ consoles: {
     short_name: "w"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-ff"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff"
     category: "dart2js|ff"
     short_name: "l"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-ia32-drt"
+    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-drt"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-ia32-drt"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-drt"
     category: "dart2js|chrome"
     short_name: "drt"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-ia32-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-ia32-safari"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-safari"
     category: "dart2js|safari"
     short_name: "m"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-win-ia32-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-win-ia32-edge"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-edge"
     category: "dart2js|ms"
     short_name: "ed"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-win-ia32-ff"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ff"
     category: "dart2js|ff"
     short_name: "w"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/dart2js-win-ia32-ie11"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ie11"
     category: "dart2js|ms"
     short_name: "ie"
   }
@@ -1302,7 +1302,7 @@ consoles: {
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-ia32-safarimobilesim"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-safarimobilesim"
     category: "dart2js"
     short_name: "sim"
   }

From 439058e7c533217cf7f407aca1c34ce4b9d1c2b9 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 15 Nov 2017 02:08:31 +0000
Subject: [PATCH 048/826] Prioritize commit queue tasks on swarming

Change-Id: I2d393722e6a425f958f7bd37c7ac98648971c22e
Reviewed-on: https://dart-review.googlesource.com/20823
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index ca45de68108b..225c51e2b5b2 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -79,6 +79,7 @@ buckets {
       dimensions: "cpu:x86-64"
       dimensions: "pool:Dart.LUCI"
       dimensions: "os:Linux"
+      priority: 50
       recipe {
         repository: "https://chromium.googlesource.com/chromium/tools/build.git"
         properties: "mastername:dart"
@@ -193,6 +194,7 @@ buckets {
       dimensions: "cpu:x86-64"
       dimensions: "pool:Dart.LUCI"
       dimensions: "os:Linux"
+      priority: 30
       recipe {
         repository: "https://chromium.googlesource.com/chromium/tools/build.git"
         properties: "mastername:dart.try"

From e7e1b93bfa35a5e5eaf6878c5ef2ff51b387800d Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 27 Nov 2017 16:17:21 +0000
Subject: [PATCH 049/826] Add VM canary builder to try bucket

Change-Id: I7d34a8c3b6569c650e20a70872fda191c5f62ab0
Reviewed-on: https://dart-review.googlesource.com/23667
Reviewed-by: Morten Krogh-jespersen <mkroghj@google.com>
---
 cr-buildbucket.cfg | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 225c51e2b5b2..f81bfcac5411 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -207,6 +207,12 @@ buckets {
         name: "dart/neo"
       }
     }
+    builders {
+      name: "vm-canary-linux-debug-try"
+      recipe {
+        name: "dart/neo"
+      }
+    }
     builders {
       name: "vm-linux-release-x64-try"
     }

From 2f2831843e276f29c7d7aefe2eb0e5629d21f249 Mon Sep 17 00:00:00 2001
From: Morten Krogh-Jespersen <mkroghj@google.com>
Date: Thu, 30 Nov 2017 09:58:45 +0000
Subject: [PATCH 050/826] Add test try builders to allow running custom
 commands.

Bug:
Change-Id: I0e7114ee28183120a798ac3891d3f32c52585ba8
Reviewed-on: https://dart-review.googlesource.com/24760
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index f81bfcac5411..a2dc0aa32a55 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -347,5 +347,25 @@ buckets {
         name: "dart/analyzer_swarming"
       }
     }
+    builders {
+      name: "cl-linux-try"
+      recipe {
+        name: "dart/neo"
+      }
+    }
+    builders {
+      name: "cl-win-try"
+      dimensions: "os:Windows-10"
+      recipe {
+        name: "dart/neo"
+      }
+    }
+    builders {
+      name: "cl-mac-try"
+      dimensions: "os:Mac"
+      recipe {
+        name: "dart/neo"
+      }
+    }
   }
 }

From 2632c476939dc45a2092f17e04606fd727d154a8 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 4 Dec 2017 12:04:52 +0000
Subject: [PATCH 051/826] Use test matrix for DDC builder on commit queue

This enables DDK testing on the CQ.

Change-Id: If64d28b9672229c2b30ef3b6e16fbd01625a044b
Reviewed-on: https://dart-review.googlesource.com/24420
Reviewed-by: Morten Krogh-jespersen <mkroghj@google.com>
---
 cr-buildbucket.cfg | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index a2dc0aa32a55..2a58d6987d32 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -326,7 +326,8 @@ buckets {
       name: "ddc-linux-release-try"
       dimensions: "kvm:0"
       recipe {
-        name: "dart/ddc_swarming"
+        name: "dart/neo"
+        properties: "clobber:true"
       }
     }
     builders {

From 6d3c5606bca8350ef11dee8411355ac9a00a53bf Mon Sep 17 00:00:00 2001
From: Erik Staab <estaab@google.com>
Date: Thu, 7 Dec 2017 08:56:00 +0000
Subject: [PATCH 052/826] Add logo for dart to milo project listing.

Bug:
Change-Id: I48ce7e40462315b7a00682f1a4d3b44e4283b087
Reviewed-on: https://dart-review.googlesource.com/22903
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-milo.cfg | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index c9d03e4aeb62..67610d9fb13b 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -1,3 +1,5 @@
+logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png"
+
 consoles: {
   id: "be"
   name: "SDK Bleeding Edge Console"
@@ -1352,4 +1354,4 @@ consoles: {
     }
     tree_status_host: "dart-status.appspot.com"
   }
-}
\ No newline at end of file
+}

From 908f93ea3b3f9add31ec57733bd10f5bf3306859 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 11 Dec 2017 11:28:32 +0000
Subject: [PATCH 053/826] Adjust milo console links to new URL scheme

Change-Id: I37033b5678073e57b4a386c3c4e0bb249cb0532e
Reviewed-on: https://dart-review.googlesource.com/23320
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-milo.cfg | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 67610d9fb13b..6a8bd166f370 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -401,22 +401,22 @@ consoles: {
       name: "Consoles"
       links: {
         text: "dart.be"
-        url: "/console/dart/be"
+        url: "/p/dart/g/be/console"
         alt: "SDK BE Console"
       }
       links: {
         text: "dart.dev"
-        url: "/console/dart/dev"
+        url: "/p/dart/g/dev/console"
         alt: "SDK Dev Console"
       }
       links: {
         text: "dart.stable"
-        url: "/console/dart/stable"
+        url: "/p/dart/g/stable/console"
         alt: "SDK Stable Console"
       }
       links: {
         text: "dart.fyi"
-        url: "/console/dart/fyi"
+        url: "/p/dart/g/fyi/console"
         alt: "SDK FYI Console"
       }
     }
@@ -825,22 +825,22 @@ consoles: {
       name: "Consoles"
       links: {
         text: "dart.be"
-        url: "/console/dart/be"
+        url: "/p/dart/g/be/console"
         alt: "SDK BE Console"
       }
       links: {
         text: "dart.dev"
-        url: "/console/dart/dev"
+        url: "/p/dart/g/dev/console"
         alt: "SDK Dev Console"
       }
       links: {
         text: "dart.stable"
-        url: "/console/dart/stable"
+        url: "/p/dart/g/stable/console"
         alt: "SDK Stable Console"
       }
       links: {
         text: "dart.fyi"
-        url: "/console/dart/fyi"
+        url: "/p/dart/g/fyi/console"
         alt: "SDK FYI Console"
       }
     }
@@ -1249,22 +1249,22 @@ consoles: {
       name: "Consoles"
       links: {
         text: "dart.be"
-        url: "/console/dart/be"
+        url: "/p/dart/g/be/console"
         alt: "SDK BE Console"
       }
       links: {
         text: "dart.dev"
-        url: "/console/dart/dev"
+        url: "/p/dart/g/dev/console"
         alt: "SDK Dev Console"
       }
       links: {
         text: "dart.stable"
-        url: "/console/dart/stable"
+        url: "/p/dart/g/stable/console"
         alt: "SDK Stable Console"
       }
       links: {
         text: "dart.fyi"
-        url: "/console/dart/fyi"
+        url: "/p/dart/g/fyi/console"
         alt: "SDK FYI Console"
       }
     }
@@ -1333,22 +1333,22 @@ consoles: {
       name: "Consoles"
       links: {
         text: "dart.be"
-        url: "/console/dart/be"
+        url: "/p/dart/g/be/console"
         alt: "SDK BE Console"
       }
       links: {
         text: "dart.dev"
-        url: "/console/dart/dev"
+        url: "/p/dart/g/dev/console"
         alt: "SDK Dev Console"
       }
       links: {
         text: "dart.stable"
-        url: "/console/dart/stable"
+        url: "/p/dart/g/stable/console"
         alt: "SDK Stable Console"
       }
       links: {
         text: "dart.fyi"
-        url: "/console/dart/fyi"
+        url: "/p/dart/g/fyi/console"
         alt: "SDK FYI Console"
       }
     }

From 7501b94274a75f8b51ac81ee2f3717d94563ed9b Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 11 Dec 2017 17:57:12 +0000
Subject: [PATCH 054/826] [Infra] Fix heading in README.md

Change-Id: I1750910ce6f8e8ea47554c5606f91c38a119503b
Reviewed-on: https://dart-review.googlesource.com/28307
Reviewed-by: Alexander Thomas <athom@google.com>
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2093d83760ec..5afbe757c40b 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ commit queue.
 It is recommended to have a separate checkout for this branch, so switching
 to/from this branch does not populate/delete all files in the master branch.
 
-### Initial setup:
+## Initial setup:
 
 ```console
 mkdir config
@@ -28,4 +28,4 @@ git new-branch add-new-builder
 git commit -a
 
 git cl upload
-```
\ No newline at end of file
+```

From 7c26cc76b042a2f5cc0098c4856830416b98dac6 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 12 Dec 2017 08:11:12 +0000
Subject: [PATCH 055/826] [Infra] Add runtime to DDC buildernames

Change-Id: I42f160e0280b3db6601dac8adfe29b02a012ada8
Reviewed-on: https://dart-review.googlesource.com/27941
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg |  8 ++++----
 luci-milo.cfg      | 18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 2a58d6987d32..5ad401e13708 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -120,9 +120,9 @@ buckets {
     builders { name: "dart2js-win-x64-edge" dimensions: "os:Windows" }
     builders { name: "dart2js-win-x64-ff" dimensions: "os:Windows" }
     builders { name: "dart2js-win-x64-ie11" dimensions: "os:Windows" }
-    builders { name: "ddc-linux-release" }
-    builders { name: "ddc-mac-release" dimensions: "os:Mac" }
-    builders { name: "ddc-win-release" dimensions: "os:Windows" }
+    builders { name: "ddc-linux-release-chrome" }
+    builders { name: "ddc-mac-release-chrome" dimensions: "os:Mac" }
+    builders { name: "ddc-win-release-chrome" dimensions: "os:Windows" }
     builders { name: "debianpackage-linux" mixins: "debianpackage" }
     builders { name: "pkg-linux-release" }
     builders { name: "pkg-mac-release" dimensions: "os:Mac" }
@@ -323,7 +323,7 @@ buckets {
       }
     }
     builders {
-      name: "ddc-linux-release-try"
+      name: "ddc-linux-release-chrome-try"
       dimensions: "kvm:0"
       recipe {
         name: "dart/neo"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 6a8bd166f370..caf990b3bc82 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -307,17 +307,17 @@ consoles: {
     short_name: "w"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/ddc-linux-release"
+    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/ddc-mac-release"
+    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/ddc-win-release"
+    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
   }
@@ -731,17 +731,17 @@ consoles: {
     short_name: "w"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/ddc-linux-release"
+    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/ddc-mac-release"
+    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/ddc-win-release"
+    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
   }
@@ -1155,17 +1155,17 @@ consoles: {
     short_name: "w"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/ddc-linux-release"
+    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/ddc-mac-release"
+    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/ddc-win-release"
+    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
   }

From e695776508674148bf8ed35c28ac98c720245ecd Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 14 Dec 2017 12:11:15 +0000
Subject: [PATCH 056/826] [Infra] Remove trailing slash from repo_urls

Change-Id: Ifc05f5acaa7a3dca67e06da4d317b0ff3752ad3b
Reviewed-on: https://dart-review.googlesource.com/28681
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-milo.cfg | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index caf990b3bc82..db4b17d744fe 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -3,7 +3,7 @@ logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png"
 consoles: {
   id: "be"
   name: "SDK Bleeding Edge Console"
-  repo_url: "https://dart.googlesource.com/sdk/"
+  repo_url: "https://dart.googlesource.com/sdk"
   ref: "master"
   manifest_name: "REVISION"
   builders: {
@@ -427,7 +427,7 @@ consoles: {
 consoles: {
   id: "dev"
   name: "SDK Dev Console"
-  repo_url: "https://dart.googlesource.com/sdk/"
+  repo_url: "https://dart.googlesource.com/sdk"
   ref: "dev"
   manifest_name: "REVISION"
   builders: {
@@ -851,7 +851,7 @@ consoles: {
 consoles: {
   id: "stable"
   name: "SDK Stable Console"
-  repo_url: "https://dart.googlesource.com/sdk/"
+  repo_url: "https://dart.googlesource.com/sdk"
   ref: "stable"
   manifest_name: "REVISION"
   builders: {
@@ -1275,7 +1275,7 @@ consoles: {
 consoles: {
   id: "fyi"
   name: "SDK FYI Console"
-  repo_url: "https://dart.googlesource.com/sdk/"
+  repo_url: "https://dart.googlesource.com/sdk"
   ref: "master"
   manifest_name: "REVISION"
   builders {

From 58328398d137d3824616133c68569bc879ef0e3f Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 14 Dec 2017 12:35:22 +0000
Subject: [PATCH 057/826] [Infra] Move VM kernel precomp from FYI main Milo
 consoles

Change-Id: Ib49297c2409d75aa4835fc8b81ad82ce6eb2e9ca
Reviewed-on: https://dart-review.googlesource.com/28880
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-milo.cfg | 40 ++++++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index db4b17d744fe..caf9c98cffbd 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -121,6 +121,16 @@ consoles: {
     category: "vm|kernel"
     short_name: "md"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64"
+    category: "vm|kernel"
+    short_name: "pd"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "pr"
+  }
   builders: {
     name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64"
     category: "vm|kernel"
@@ -550,6 +560,16 @@ consoles: {
     category: "vm|kernel"
     short_name: "mr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64"
+    category: "vm|kernel"
+    short_name: "pd"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "pr"
+  }
   builders: {
     name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
     category: "vm|misc"
@@ -974,6 +994,16 @@ consoles: {
     category: "vm|kernel"
     short_name: "mr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64"
+    category: "vm|kernel"
+    short_name: "pd"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "pr"
+  }
   builders: {
     name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
     category: "vm|misc"
@@ -1278,16 +1308,6 @@ consoles: {
   repo_url: "https://dart.googlesource.com/sdk"
   ref: "master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64"
-    category: "vm-kernel"
-    short_name: "pd"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64"
-    category: "vm-kernel"
-    short_name: "pr"
-  }
   builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-checked-linux-release-x64"
     category: "vm-kernel"

From 57676de746b085c4ce6f6abc98480f135a7b4396 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 14 Dec 2017 13:57:46 +0000
Subject: [PATCH 058/826] [Infra] Add transition console showing both buildbot
 and Luci builders

This console will replace the Buildbot console. Builders will be
migrated builder per builder. When it is identical to the LUCI Preview
console, the migration is complete and the LUCI Preview can be deleted.

Change-Id: Id76c235c18a0813e58af0f04855bb972adccda52
Reviewed-on: https://dart-review.googlesource.com/29301
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-milo.cfg | 768 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 767 insertions(+), 1 deletion(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index caf9c98cffbd..ca9be64501ee 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2,10 +2,776 @@ logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png"
 
 consoles: {
   id: "be"
-  name: "SDK Bleeding Edge Console"
+  name: "SDK Bleeding Edge Console (migration)"
   repo_url: "https://dart.googlesource.com/sdk"
   ref: "master"
   manifest_name: "REVISION"
+  builders: {
+    # migrating to vm-linux-debug-ia32
+    name: "buildbot/client.dart/vm-linux-debug-ia32-be"
+    category: "vm|debug"
+    short_name: "32"
+  }
+  builders: {
+    # migrating to vm-linux-debug-simarm
+    name: "buildbot/client.dart/vm-linux-debug-simarm-be"
+    category: "vm|simarm"
+    short_name: "d"
+  }
+  builders: {
+    # migrating to vm-linux-debug-x64
+    name: "buildbot/client.dart/vm-linux-debug-x64-be"
+    category: "vm|debug"
+    short_name: "64"
+  }
+  builders: {
+    # migrating to vm-linux-release-ia32
+    name: "buildbot/client.dart/vm-linux-release-ia32-be"
+    category: "vm|release"
+    short_name: "32"
+  }
+  builders: {
+    # migrating to vm-linux-release-simarm
+    name: "buildbot/client.dart/vm-linux-release-simarm-be"
+    category: "vm|simarm"
+    short_name: "r"
+  }
+  builders: {
+    # migrating to vm-linux-release-simarm64
+    name: "buildbot/client.dart/vm-linux-release-simarm64-be"
+    category: "vm|simarm"
+    short_name: "r64"
+  }
+  builders: {
+    # migrating to vm-linux-release-x64
+    name: "buildbot/client.dart/vm-linux-release-x64-be"
+    category: "vm|release"
+    short_name: "64"
+  }
+  builders: {
+    # migrating to vm-mac-debug-ia32
+    name: "buildbot/client.dart/vm-mac-debug-ia32-be"
+    category: "vm|debug"
+    short_name: "m32"
+  }
+  builders: {
+    # migrating to vm-mac-debug-simdbc64
+    name: "buildbot/client.dart/vm-mac-debug-simdbc64-be"
+    category: "vm|debug"
+    short_name: "msi"
+  }
+  builders: {
+    # migrating to vm-mac-debug-x64
+    name: "buildbot/client.dart/vm-mac-debug-x64-be"
+    category: "vm|debug"
+    short_name: "m64"
+  }
+  builders: {
+    # migrating to vm-mac-release-ia32
+    name: "buildbot/client.dart/vm-mac-release-ia32-be"
+    category: "vm|release"
+    short_name: "m32"
+  }
+  builders: {
+    # migrating to vm-mac-release-simdbc64
+    name: "buildbot/client.dart/vm-mac-release-simdbc64-be"
+    category: "vm|release"
+    short_name: "msi"
+  }
+  builders: {
+    # migrating to vm-mac-release-x64
+    name: "buildbot/client.dart/vm-mac-release-x64-be"
+    category: "vm|release"
+    short_name: "m64"
+  }
+  builders: {
+    # migrating to vm-win-debug-ia32
+    name: "buildbot/client.dart/vm-win-debug-ia32-be"
+    category: "vm|debug"
+    short_name: "w32"
+  }
+  builders: {
+    # migrating to vm-win-debug-x64
+    name: "buildbot/client.dart/vm-win-debug-x64-be"
+    category: "vm|debug"
+    short_name: "w64"
+  }
+  builders: {
+    # migrating to vm-win-release-ia32
+    name: "buildbot/client.dart/vm-win-release-ia32-be"
+    category: "vm|release"
+    short_name: "w32"
+  }
+  builders: {
+    # migrating to vm-win-release-x64
+    name: "buildbot/client.dart/vm-win-release-x64-be"
+    category: "vm|release"
+    short_name: "w64"
+  }
+  builders: {
+    # migrating to app-linux-debug-x64
+    name: "buildbot/client.dart/app-linux-debug-x64-be"
+    category: "vm|app"
+    short_name: "d64"
+  }
+  builders: {
+    # migrating to app-linux-product-x64
+    name: "buildbot/client.dart/app-linux-product-x64-be"
+    category: "vm|app"
+    short_name: "p64"
+  }
+  builders: {
+    # migrating to app-linux-release-x64
+    name: "buildbot/client.dart/app-linux-release-x64-be"
+    category: "vm|app"
+    short_name: "r64"
+  }
+  builders: {
+    # migrating to vm-kernel-linux-debug-x64
+    name: "buildbot/client.dart/vm-kernel-linux-debug-x64-be"
+    category: "vm|kernel"
+    short_name: "d"
+  }
+  builders: {
+    # migrating to vm-kernel-linux-release-x64
+    name: "buildbot/client.dart/vm-kernel-linux-release-x64-be"
+    category: "vm|kernel"
+    short_name: "r"
+  }
+  builders: {
+    # migrating to vm-kernel-mac-debug-x64
+    name: "buildbot/client.dart/vm-kernel-mac-debug-x64-be"
+    category: "vm|kernel"
+    short_name: "md"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-debug-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-1-8-x64"
+    category: "vm|kernel"
+    short_name: "1pd"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-debug-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-2-8-x64"
+    category: "vm|kernel"
+    short_name: "2pd"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-debug-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-3-8-x64"
+    category: "vm|kernel"
+    short_name: "3pd"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-debug-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-4-8-x64"
+    category: "vm|kernel"
+    short_name: "4pd"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-debug-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-5-8-x64"
+    category: "vm|kernel"
+    short_name: "5pd"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-debug-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-6-8-x64"
+    category: "vm|kernel"
+    short_name: "6pd"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-debug-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-7-8-x64"
+    category: "vm|kernel"
+    short_name: "7pd"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-debug-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-8-8-x64"
+    category: "vm|kernel"
+    short_name: "8pd"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-release-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-1-6-x64"
+    category: "vm|kernel"
+    short_name: "1pr"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-release-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-2-6-x64"
+    category: "vm|kernel"
+    short_name: "2pr"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-release-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-3-6-x64"
+    category: "vm|kernel"
+    short_name: "3pr"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-release-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-4-6-x64"
+    category: "vm|kernel"
+    short_name: "4pr"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-release-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-5-6-x64"
+    category: "vm|kernel"
+    short_name: "5pr"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-release-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-6-6-x64"
+    category: "vm|kernel"
+    short_name: "6pr"
+  }
+  builders: {
+    # migrating to vm-kernel-mac-release-x64
+    name: "buildbot/client.dart/vm-kernel-mac-release-x64-be"
+    category: "vm|kernel"
+    short_name: "mr"
+  }
+  builders: {
+    # migrating to cross-vm-linux-release-arm64
+    name: "buildbot/client.dart/cross-arm64-vm-linux-release-be"
+    category: "vm|misc"
+    short_name: "cra"
+  }
+  builders: {
+    # migrating to target-vm-linux-release-arm64
+    name: "buildbot/client.dart/target-arm64-vm-linux-release-be"
+    category: "vm|misc"
+    short_name: "tra"
+  }
+  builders: {
+    # migrating to vm-asan-linux-release-ia32
+    name: "buildbot/client.dart/vm-linux-release-ia32-asan-be"
+    category: "vm|misc"
+    short_name: "a32"
+  }
+  builders: {
+    # migrating to vm-asan-linux-release-x64
+    name: "buildbot/client.dart/vm-linux-release-x64-asan-be"
+    category: "vm|misc"
+    short_name: "a64"
+  }
+  builders: {
+    # migrating to vm-optcounter-threshold-linux-release-ia32
+    name: "buildbot/client.dart/vm-linux-release-ia32-optcounter-threshold-be"
+    category: "vm|misc"
+    short_name: "o32"
+  }
+  builders: {
+    # migrating to vm-optcounter-threshold-linux-release-x64
+    name: "buildbot/client.dart/vm-linux-release-x64-optcounter-threshold-be"
+    category: "vm|misc"
+    short_name: "o64"
+  }
+  builders: {
+    # migrating to vm-russian-win-debug-ia32
+    name: "buildbot/client.dart/vm-win-debug-ia32-russian-be"
+    category: "vm|misc"
+    short_name: "ru"
+  }
+  builders: {
+    # migrating to precomp-linux-debug-x64
+    name: "buildbot/client.dart/precomp-linux-debug-x64-1-3-be"
+    category: "vm|precomp"
+    short_name: "1d64"
+  }
+  builders: {
+    # migrating to precomp-linux-debug-x64
+    name: "buildbot/client.dart/precomp-linux-debug-x64-2-3-be"
+    category: "vm|precomp"
+    short_name: "2d64"
+  }
+  builders: {
+    # migrating to precomp-linux-debug-x64
+    name: "buildbot/client.dart/precomp-linux-debug-x64-3-3-be"
+    category: "vm|precomp"
+    short_name: "3d64"
+  }
+  builders: {
+    # migrating to precomp-linux-product-x64
+    name: "buildbot/client.dart/precomp-linux-product-x64-be"
+    category: "vm|precomp"
+    short_name: "p64"
+  }
+  builders: {
+    # migrating to vm-noopt-mac-simarm64
+    name: "buildbot/client.dart/vm-noopt-simarm64-mac-be"
+    category: "vm|precomp"
+    short_name: "no"
+  }
+  builders: {
+    # migrating to vm-precomp-android-release
+    name: "buildbot/client.dart/vm-precomp-android-release-1-3-be"
+    category: "vm|precomp"
+    short_name: "1and"
+  }
+  builders: {
+    # migrating to vm-precomp-android-release
+    name: "buildbot/client.dart/vm-precomp-android-release-2-3-be"
+    category: "vm|precomp"
+    short_name: "2and"
+  }
+  builders: {
+    # migrating to vm-precomp-android-release
+    name: "buildbot/client.dart/vm-precomp-android-release-3-3-be"
+    category: "vm|precomp"
+    short_name: "3and"
+  }
+  builders: {
+    # migrating to vm-precomp-win-simarm64
+    name: "buildbot/client.dart/vm-precomp-win-simarm64-1-4-be"
+    category: "vm|precomp"
+    short_name: "1wsi"
+  }
+  builders: {
+    # migrating to vm-precomp-win-simarm64
+    name: "buildbot/client.dart/vm-precomp-win-simarm64-2-4-be"
+    category: "vm|precomp"
+    short_name: "2wsi"
+  }
+  builders: {
+    # migrating to vm-precomp-win-simarm64
+    name: "buildbot/client.dart/vm-precomp-win-simarm64-3-4-be"
+    category: "vm|precomp"
+    short_name: "3wsi"
+  }
+  builders: {
+    # migrating to vm-precomp-win-simarm64
+    name: "buildbot/client.dart/vm-precomp-win-simarm64-4-4-be"
+    category: "vm|precomp"
+    short_name: "4wsi"
+  }
+  builders: {
+    # migrating to vm-linux-product-x64
+    name: "buildbot/client.dart/vm-linux-product-x64-be"
+    category: "vm|product"
+    short_name: "64"
+  }
+  builders: {
+    # migrating to vm-mac-product-x64
+    name: "buildbot/client.dart/vm-mac-product-x64-be"
+    category: "vm|product"
+    short_name: "m64"
+  }
+  builders: {
+    # migrating to vm-win-product-x64
+    name: "buildbot/client.dart/vm-win-product-x64-be"
+    category: "vm|product"
+    short_name: "w64"
+  }
+  builders: {
+    # migrating to vm-reload-linux-debug-x64
+    name: "buildbot/client.dart/vm-linux-debug-x64-reload-be"
+    category: "vm|reload"
+    short_name: "d"
+  }
+  builders: {
+    # migrating to vm-reload-linux-release-x64
+    name: "buildbot/client.dart/vm-linux-release-x64-reload-be"
+    category: "vm|reload"
+    short_name: "r"
+  }
+  builders: {
+    # migrating to vm-reload-mac-debug-simdbc64
+    name: "buildbot/client.dart/vm-mac-debug-simdbc64-reload-be"
+    category: "vm|reload"
+    short_name: "mds"
+  }
+  builders: {
+    # migrating to vm-reload-mac-release-simdbc64
+    name: "buildbot/client.dart/vm-mac-release-simdbc64-reload-be"
+    category: "vm|reload"
+    short_name: "mrs"
+  }
+  builders: {
+    # migrating to vm-reload-rollback-linux-debug-x64
+    name: "buildbot/client.dart/vm-linux-debug-x64-reload-rollback-be"
+    category: "vm|reload"
+    short_name: "dro"
+  }
+  builders: {
+    # migrating to vm-reload-rollback-linux-release-x64
+    name: "buildbot/client.dart/vm-linux-release-x64-reload-rollback-be"
+    category: "vm|reload"
+    short_name: "rro"
+  }
+  builders: {
+    # migrating to dart2js-hostchecked-linux-ia32-d8
+    name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-1-5-be"
+    category: "dart2js|d8"
+    short_name: "1hc"
+  }
+  builders: {
+    # migrating to dart2js-hostchecked-linux-ia32-d8
+    name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-2-5-be"
+    category: "dart2js|d8"
+    short_name: "2hc"
+  }
+  builders: {
+    # migrating to dart2js-hostchecked-linux-ia32-d8
+    name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-3-5-be"
+    category: "dart2js|d8"
+    short_name: "3hc"
+  }
+  builders: {
+    # migrating to dart2js-hostchecked-linux-ia32-d8
+    name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-4-5-be"
+    category: "dart2js|d8"
+    short_name: "4hc"
+  }
+  builders: {
+    # migrating to dart2js-hostchecked-linux-ia32-d8
+    name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-5-5-be"
+    category: "dart2js|d8"
+    short_name: "5hc"
+  }
+  builders: {
+    # migrating to dart2js-minified-linux-x64-d8
+    name: "buildbot/client.dart/dart2js-linux-d8-minified-1-5-be"
+    category: "dart2js|d8"
+    short_name: "1mi"
+  }
+  builders: {
+    # migrating to dart2js-minified-linux-x64-d8
+    name: "buildbot/client.dart/dart2js-linux-d8-minified-2-5-be"
+    category: "dart2js|d8"
+    short_name: "2mi"
+  }
+  builders: {
+    # migrating to dart2js-minified-linux-x64-d8
+    name: "buildbot/client.dart/dart2js-linux-d8-minified-3-5-be"
+    category: "dart2js|d8"
+    short_name: "3mi"
+  }
+  builders: {
+    # migrating to dart2js-minified-linux-x64-d8
+    name: "buildbot/client.dart/dart2js-linux-d8-minified-4-5-be"
+    category: "dart2js|d8"
+    short_name: "4mi"
+  }
+  builders: {
+    # migrating to dart2js-minified-linux-x64-d8
+    name: "buildbot/client.dart/dart2js-linux-d8-minified-5-5-be"
+    category: "dart2js|d8"
+    short_name: "5mi"
+  }
+# doesn't exist on buildbot, maybe migrate immediately?
+#  builders: {
+#    # migrating to dart2js-only-unittest-linux-ia32-none
+#    name: "buildbot/client.dart/dart2js-only-unittest-linux-ia32-none-be"
+#    category: "dart2js|misc"
+#    short_name: "ut"
+#  }
+  builders: {
+    # migrating to dart2js-dumpinfo-linux-ia32-none
+    name: "buildbot/client.dart/dart2jsdumpinfo-linux-be"
+    category: "dart2js|misc"
+    short_name: "dp"
+  }
+  builders: {
+    # migrating to dart2js-linux-x64-jsshell
+    name: "buildbot/client.dart/dart2js-linux-jsshell-1-4-be"
+    category: "dart2js|misc"
+    short_name: "1jsh"
+  }
+  builders: {
+    # migrating to dart2js-linux-x64-jsshell
+    name: "buildbot/client.dart/dart2js-linux-jsshell-2-4-be"
+    category: "dart2js|misc"
+    short_name: "2jsh"
+  }
+  builders: {
+    # migrating to dart2js-linux-x64-jsshell
+    name: "buildbot/client.dart/dart2js-linux-jsshell-3-4-be"
+    category: "dart2js|misc"
+    short_name: "3jsh"
+  }
+  builders: {
+    # migrating to dart2js-linux-x64-jsshell
+    name: "buildbot/client.dart/dart2js-linux-jsshell-4-4-be"
+    category: "dart2js|misc"
+    short_name: "4jsh"
+  }
+# doesn't exist on buildbot, maybe migrate immediately?
+#  builders: {
+#    # migrating to analyzer-analysis-server-linux
+#    name: "buildbot/client.dart/analyzer-analysis-server-linux-be"
+#    category: "analyzer"
+#    short_name: "aas"
+#  }
+  builders: {
+    # migrating to analyzer-linux-release
+    name: "buildbot/client.dart/analyzer-linux-release-be"
+    category: "analyzer"
+    short_name: "r"
+  }
+  builders: {
+    # migrating to analyzer-mac-release
+    name: "buildbot/client.dart/analyzer-mac10.11-release-be"
+    category: "analyzer"
+    short_name: "mr"
+  }
+  builders: {
+    # migrating to analyzer-strong-linux-release
+    name: "buildbot/client.dart/analyzer-linux-release-strong-be"
+    category: "analyzer"
+    short_name: "sr"
+  }
+  builders: {
+    # migrating to analyzer-strong-mac-release
+    name: "buildbot/client.dart/analyze-mac10.11-release-strong-be"
+    category: "analyzer"
+    short_name: "smr"
+  }
+  builders: {
+    # migrating to analyzer-strong-win-release
+    name: "buildbot/client.dart/analyzer-win7-release-strong-be"
+    category: "analyzer"
+    short_name: "swr"
+  }
+  builders: {
+    # migrating to analyzer-win-release
+    name: "buildbot/client.dart/analyzer-win7-release-be"
+    category: "analyzer"
+    short_name: "awr"
+  }
+  builders: {
+    # migrating to dart-sdk-linux
+    name: "buildbot/client.dart/dart-sdk-linux-be"
+    category: "sdk"
+    short_name: "l"
+  }
+  builders: {
+    # migrating to dart-sdk-mac
+    name: "buildbot/client.dart/dart-sdk-mac-be"
+    category: "sdk"
+    short_name: "m"
+  }
+  builders: {
+    # migrating to dart-sdk-win
+    name: "buildbot/client.dart/dart-sdk-windows-be"
+    category: "sdk"
+    short_name: "w"
+  }
+  builders: {
+    # migrating to ddc-linux-release-chrome
+    name: "buildbot/client.dart/ddc-linux-release-be"
+    category: "ddc"
+    short_name: "l"
+  }
+  builders: {
+    # migrating to ddc-mac-release-chrome
+    name: "buildbot/client.dart/ddc-mac-release-be"
+    category: "ddc"
+    short_name: "m"
+  }
+  builders: {
+    # migrating to ddc-win-release-chrome
+    name: "buildbot/client.dart/ddc-win-release-be"
+    category: "ddc"
+    short_name: "w"
+  }
+  builders: {
+    # migrating to dart2js-linux-x64-chrome
+    name: "buildbot/client.dart/dart2js-linux-chromeff-1-4-be"
+    category: "dart2js|chrome"
+    short_name: "1l"
+  }
+  builders: {
+    # migrating to dart2js-linux-x64-chrome
+    name: "buildbot/client.dart/dart2js-linux-chromeff-2-4-be"
+    category: "dart2js|chrome"
+    short_name: "2l"
+  }
+  builders: {
+    # migrating to dart2js-linux-x64-chrome
+    name: "buildbot/client.dart/dart2js-linux-chromeff-3-4-be"
+    category: "dart2js|chrome"
+    short_name: "3l"
+  }
+  builders: {
+    # migrating to dart2js-linux-x64-chrome
+    name: "buildbot/client.dart/dart2js-linux-chromeff-4-4-be"
+    category: "dart2js|chrome"
+    short_name: "4l"
+  }
+# doesn't exist on buildbot, included in chromeff builder
+#  builders: {
+#    # migrating to dart2js-linux-x64-ff
+#    name: "buildbot/client.dart/dart2js-linux-x64-ff-be"
+#    category: "dart2js|ff"
+#    short_name: "l"
+#  }
+  builders: {
+    # migrating to dart2js-csp-minified-linux-x64-drt
+    name: "buildbot/client.dart/dart2js-linux-drt-csp-minified-be"
+    category: "dart2js|chrome"
+    short_name: "csp"
+  }
+  builders: {
+    # migrating to dart2js-linux-x64-drt
+    name: "buildbot/client.dart/dart2js-linux-drt-1-2-be"
+    category: "dart2js|chrome"
+    short_name: "1drt"
+  }
+  builders: {
+    # migrating to dart2js-linux-x64-drt
+    name: "buildbot/client.dart/dart2js-linux-drt-2-2-be"
+    category: "dart2js|chrome"
+    short_name: "2drt"
+  }
+  builders: {
+    # migrating to dart2js-mac-x64-chrome
+    name: "buildbot/client.dart/dart2js-mac10.11-chrome-be"
+    category: "dart2js|chrome"
+    short_name: "m"
+  }
+  builders: {
+    # migrating to dart2js-mac-x64-safari
+    name: "buildbot/client.dart/dart2js-mac10.11-safari-1-3-be"
+    category: "dart2js|safari"
+    short_name: "1m"
+  }
+  builders: {
+    # migrating to dart2js-mac-x64-safari
+    name: "buildbot/client.dart/dart2js-mac10.11-safari-2-3-be"
+    category: "dart2js|safari"
+    short_name: "2m"
+  }
+  builders: {
+    # migrating to dart2js-mac-x64-safari
+    name: "buildbot/client.dart/dart2js-mac10.11-safari-3-3-be"
+    category: "dart2js|safari"
+    short_name: "3m"
+  }
+  builders: {
+    # migrating to dart2js-win-x64-chrome
+    name: "buildbot/client.dart/dart2js-win7-chrome-1-4-be"
+    category: "dart2js|chrome"
+    short_name: "1w"
+  }
+  builders: {
+    # migrating to dart2js-win-x64-chrome
+    name: "buildbot/client.dart/dart2js-win7-chrome-2-4-be"
+    category: "dart2js|chrome"
+    short_name: "2w"
+  }
+  builders: {
+    # migrating to dart2js-win-x64-chrome
+    name: "buildbot/client.dart/dart2js-win7-chrome-3-4-be"
+    category: "dart2js|chrome"
+    short_name: "3w"
+  }
+  builders: {
+    # migrating to dart2js-win-x64-chrome
+    name: "buildbot/client.dart/dart2js-win7-chrome-4-4-be"
+    category: "dart2js|chrome"
+    short_name: "4w"
+  }
+# doesn't exist on buildbot, new builder
+#  builders: {
+#    # migrating to dart2js-win-x64-edge
+#    name: "buildbot/client.dart/dart2js-win-x64-edge-be"
+#    category: "dart2js|ms"
+#    short_name: "ed"
+#  }
+  builders: {
+    # migrating to dart2js-win-x64-ff
+    name: "buildbot/client.dart/dart2js-win7-ie11ff-1-4-be"
+    category: "dart2js|ff"
+    short_name: "1w"
+  }
+  builders: {
+    # migrating to dart2js-win-x64-ff
+    name: "buildbot/client.dart/dart2js-win7-ie11ff-2-4-be"
+    category: "dart2js|ff"
+    short_name: "2w"
+  }
+  builders: {
+    # migrating to dart2js-win-x64-ff
+    name: "buildbot/client.dart/dart2js-win7-ie11ff-3-4-be"
+    category: "dart2js|ff"
+    short_name: "3w"
+  }
+  builders: {
+    # migrating to dart2js-win-x64-ff
+    name: "buildbot/client.dart/dart2js-win7-ie11ff-4-4-be"
+    category: "dart2js|ff"
+    short_name: "4w"
+  }
+# doesn't exist on buildbot, included in ie11ff builder
+#  builders: {
+#    # migrating to dart2js-win-x64-ie11
+#    name: "buildbot/client.dart/dart2js-win-x64-ie11-be"
+#    category: "dart2js|ms"
+#    short_name: "ie"
+#  }
+  builders: {
+    # migrating to pkg-linux-release
+    name: "buildbot/client.dart/pkg-linux-release-be"
+    category: "pkg"
+    short_name: "l"
+  }
+  builders: {
+    # migrating to pkg-mac-release
+    name: "buildbot/client.dart/pkg-mac10.11-release-be"
+    category: "pkg"
+    short_name: "m"
+  }
+  builders: {
+    # migrating to pkg-win-release
+    name: "buildbot/client.dart/pkg-win7-release-be"
+    category: "pkg"
+    short_name: "w"
+  }
+  builders: {
+    # migrating to debianpackage-linux
+    name: "buildbot/client.dart/debianpackage-linux-be"
+    category: "misc"
+    short_name: "dp"
+  }
+  builders: {
+    # migrating to versionchecker-linux
+    name: "buildbot/client.dart/versionchecker-linux-be"
+    category: "misc"
+    short_name: "vc"
+  }
+  header: {
+    links: {
+      name: "Consoles"
+      links: {
+        text: "LUCI console"
+        url: "/p/dart/g/luci/console"
+        alt: "SDK BE Console (LUCI Preview)"
+      }
+      links: {
+        text: "Buildbot console"
+        url: "https://uberchromegw.corp.google.com/i/client.dart/console"
+        alt: "Buildbot Console"
+      }
+      links: {
+        text: "FYI console"
+        url: "https://build.chromium.org/p/client.dart.fyi/console"
+        alt: "SDK FYI Console"
+      }
+    }
+    tree_status_host: "dart-status.appspot.com"
+  }
+}
+
+consoles: {
+  id: "luci"
+  name: "SDK Bleeding Edge Console (LUCI Preview)"
+  repo_url: "https://dart.googlesource.com/sdk/"
+  ref: "master"
+  manifest_name: "REVISION"
   builders: {
     name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
     category: "vm|debug"

From 17b932b34b17bfc367b309b7e16682d610ba022f Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 14 Dec 2017 17:07:03 +0000
Subject: [PATCH 059/826] [Infra] Fix incorrect buildbot paths on migration
 console

TBR=whesse@google.com

Change-Id: I24de28f1188dfbd173622d7ebdbfaa6bbade00bb
Reviewed-on: https://dart-review.googlesource.com/29590
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-milo.cfg | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index ca9be64501ee..f51ee2fd3fd9 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -146,85 +146,85 @@ consoles: {
   }
   builders {
     # migrating to vm-kernel-precomp-linux-debug-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-1-8-x64"
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-1-8-be"
     category: "vm|kernel"
     short_name: "1pd"
   }
   builders {
     # migrating to vm-kernel-precomp-linux-debug-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-2-8-x64"
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-2-8-be"
     category: "vm|kernel"
     short_name: "2pd"
   }
   builders {
     # migrating to vm-kernel-precomp-linux-debug-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-3-8-x64"
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-3-8-be"
     category: "vm|kernel"
     short_name: "3pd"
   }
   builders {
     # migrating to vm-kernel-precomp-linux-debug-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-4-8-x64"
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-4-8-be"
     category: "vm|kernel"
     short_name: "4pd"
   }
   builders {
     # migrating to vm-kernel-precomp-linux-debug-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-5-8-x64"
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-5-8-be"
     category: "vm|kernel"
     short_name: "5pd"
   }
   builders {
     # migrating to vm-kernel-precomp-linux-debug-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-6-8-x64"
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-6-8-be"
     category: "vm|kernel"
     short_name: "6pd"
   }
   builders {
     # migrating to vm-kernel-precomp-linux-debug-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-7-8-x64"
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-7-8-be"
     category: "vm|kernel"
     short_name: "7pd"
   }
   builders {
     # migrating to vm-kernel-precomp-linux-debug-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-8-8-x64"
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-8-8-be"
     category: "vm|kernel"
     short_name: "8pd"
   }
   builders {
     # migrating to vm-kernel-precomp-linux-release-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-1-6-x64"
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-1-6-be"
     category: "vm|kernel"
     short_name: "1pr"
   }
   builders {
     # migrating to vm-kernel-precomp-linux-release-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-2-6-x64"
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-2-6-be"
     category: "vm|kernel"
     short_name: "2pr"
   }
   builders {
     # migrating to vm-kernel-precomp-linux-release-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-3-6-x64"
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-3-6-be"
     category: "vm|kernel"
     short_name: "3pr"
   }
   builders {
     # migrating to vm-kernel-precomp-linux-release-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-4-6-x64"
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-4-6-be"
     category: "vm|kernel"
     short_name: "4pr"
   }
   builders {
     # migrating to vm-kernel-precomp-linux-release-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-5-6-x64"
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-5-6-be"
     category: "vm|kernel"
     short_name: "5pr"
   }
   builders {
     # migrating to vm-kernel-precomp-linux-release-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-6-6-x64"
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-6-6-be"
     category: "vm|kernel"
     short_name: "6pr"
   }
@@ -471,7 +471,7 @@ consoles: {
 #  }
   builders: {
     # migrating to dart2js-dumpinfo-linux-ia32-none
-    name: "buildbot/client.dart/dart2jsdumpinfo-linux-be"
+    name: "buildbot/client.dart.fyi/dart2jsdumpinfo-linux-be"
     category: "dart2js|misc"
     short_name: "dp"
   }
@@ -526,7 +526,7 @@ consoles: {
   }
   builders: {
     # migrating to analyzer-strong-mac-release
-    name: "buildbot/client.dart/analyze-mac10.11-release-strong-be"
+    name: "buildbot/client.dart/analyzer-mac10.11-release-strong-be"
     category: "analyzer"
     short_name: "smr"
   }

From eb2136d800108df2626757df35b48f1b1f0c9856 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 15 Dec 2017 10:35:48 +0000
Subject: [PATCH 060/826] [Infra] Add VM Kernel simarm/simdbc builder
 configurations

Bug:
Change-Id: I00045caa96e58126756f467ffb8d4e6c46e6a56b
Reviewed-on: https://dart-review.googlesource.com/29595
Reviewed-by: Martin Kustermann <kustermann@google.com>
---
 cr-buildbucket.cfg |  10 +-
 luci-milo.cfg      | 230 ++++++++++++++++++++++++++++++++++-----------
 luci-scheduler.cfg |  78 +++++++++++++++
 3 files changed, 261 insertions(+), 57 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 5ad401e13708..9ec63657c6cb 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -138,11 +138,17 @@ buckets {
     builders { name: "vm-asan-linux-release-x64" }
     builders { name: "vm-kernel-checked-linux-release-x64" }
     builders { name: "vm-kernel-linux-debug-x64" }
+    builders { name: "vm-kernel-linux-debug-simdbc64" }
+    builders { name: "vm-kernel-linux-release-simarm" }
+    builders { name: "vm-kernel-linux-release-simarm64" }
+    builders { name: "vm-kernel-linux-release-simdbc64" }
     builders { name: "vm-kernel-linux-release-x64" }
-    builders { name: "vm-kernel-precomp-linux-debug-x64" }
-    builders { name: "vm-kernel-precomp-linux-release-x64" }
     builders { name: "vm-kernel-mac-debug-x64" dimensions: "os:Mac" }
     builders { name: "vm-kernel-mac-release-x64" dimensions: "os:Mac" }
+    builders { name: "vm-kernel-precomp-linux-debug-x64" }
+    builders { name: "vm-kernel-precomp-linux-release-x64" }
+    builders { name: "vm-kernel-precomp-linux-release-simarm" }
+    builders { name: "vm-kernel-precomp-linux-release-simarm64" }
     builders { name: "vm-linux-debug-ia32" }
     builders { name: "vm-linux-debug-simarm" }
     builders { name: "vm-linux-debug-x64" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index f51ee2fd3fd9..e6b45b7e4ac5 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -132,6 +132,26 @@ consoles: {
     category: "vm|kernel"
     short_name: "d"
   }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64"
+    category: "vm|kernel"
+    short_name: "dbc"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm"
+    category: "vm|kernel"
+    short_name: "a32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64"
+    category: "vm|kernel"
+    short_name: "a64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64"
+    category: "vm|kernel"
+    short_name: "rbc"
+  }
   builders: {
     # migrating to vm-kernel-linux-release-x64
     name: "buildbot/client.dart/vm-kernel-linux-release-x64-be"
@@ -144,95 +164,105 @@ consoles: {
     category: "vm|kernel"
     short_name: "md"
   }
+  builders: {
+    # migrating to vm-kernel-mac-release-x64
+    name: "buildbot/client.dart/vm-kernel-mac-release-x64-be"
+    category: "vm|kernel"
+    short_name: "mr"
+  }
   builders {
     # migrating to vm-kernel-precomp-linux-debug-x64
     name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-1-8-be"
-    category: "vm|kernel"
-    short_name: "1pd"
+    category: "vm|kernel-precomp"
+    short_name: "1d"
   }
   builders {
     # migrating to vm-kernel-precomp-linux-debug-x64
     name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-2-8-be"
-    category: "vm|kernel"
-    short_name: "2pd"
+    category: "vm|kernel-precomp"
+    short_name: "2d"
   }
   builders {
     # migrating to vm-kernel-precomp-linux-debug-x64
     name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-3-8-be"
-    category: "vm|kernel"
-    short_name: "3pd"
+    category: "vm|kernel-precomp"
+    short_name: "3d"
   }
   builders {
     # migrating to vm-kernel-precomp-linux-debug-x64
     name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-4-8-be"
-    category: "vm|kernel"
-    short_name: "4pd"
+    category: "vm|kernel-precomp"
+    short_name: "4d"
   }
   builders {
     # migrating to vm-kernel-precomp-linux-debug-x64
     name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-5-8-be"
-    category: "vm|kernel"
-    short_name: "5pd"
+    category: "vm|kernel-precomp"
+    short_name: "5d"
   }
   builders {
     # migrating to vm-kernel-precomp-linux-debug-x64
     name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-6-8-be"
-    category: "vm|kernel"
-    short_name: "6pd"
+    category: "vm|kernel-precomp"
+    short_name: "6d"
   }
   builders {
     # migrating to vm-kernel-precomp-linux-debug-x64
     name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-7-8-be"
-    category: "vm|kernel"
-    short_name: "7pd"
+    category: "vm|kernel-precomp"
+    short_name: "7d"
   }
   builders {
     # migrating to vm-kernel-precomp-linux-debug-x64
     name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-8-8-be"
-    category: "vm|kernel"
-    short_name: "8pd"
+    category: "vm|kernel-precomp"
+    short_name: "8d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm"
+    category: "vm|kernel-precomp"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "a64"
   }
   builders {
     # migrating to vm-kernel-precomp-linux-release-x64
     name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-1-6-be"
-    category: "vm|kernel"
-    short_name: "1pr"
+    category: "vm|kernel-precomp"
+    short_name: "1r"
   }
   builders {
     # migrating to vm-kernel-precomp-linux-release-x64
     name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-2-6-be"
-    category: "vm|kernel"
-    short_name: "2pr"
+    category: "vm|kernel-precomp"
+    short_name: "2r"
   }
   builders {
     # migrating to vm-kernel-precomp-linux-release-x64
     name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-3-6-be"
-    category: "vm|kernel"
-    short_name: "3pr"
+    category: "vm|kernel-precomp"
+    short_name: "3r"
   }
   builders {
     # migrating to vm-kernel-precomp-linux-release-x64
     name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-4-6-be"
-    category: "vm|kernel"
-    short_name: "4pr"
+    category: "vm|kernel-precomp"
+    short_name: "4r"
   }
   builders {
     # migrating to vm-kernel-precomp-linux-release-x64
     name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-5-6-be"
-    category: "vm|kernel"
-    short_name: "5pr"
+    category: "vm|kernel-precomp"
+    short_name: "5r"
   }
   builders {
     # migrating to vm-kernel-precomp-linux-release-x64
     name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-6-6-be"
-    category: "vm|kernel"
-    short_name: "6pr"
-  }
-  builders: {
-    # migrating to vm-kernel-mac-release-x64
-    name: "buildbot/client.dart/vm-kernel-mac-release-x64-be"
-    category: "vm|kernel"
-    short_name: "mr"
+    category: "vm|kernel-precomp"
+    short_name: "6r"
   }
   builders: {
     # migrating to cross-vm-linux-release-arm64
@@ -877,6 +907,26 @@ consoles: {
     category: "vm|kernel"
     short_name: "d"
   }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64"
+    category: "vm|kernel"
+    short_name: "dbc"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm"
+    category: "vm|kernel"
+    short_name: "a32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64"
+    category: "vm|kernel"
+    short_name: "a64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64"
+    category: "vm|kernel"
+    short_name: "rbc"
+  }
   builders: {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64"
     category: "vm|kernel"
@@ -887,20 +937,30 @@ consoles: {
     category: "vm|kernel"
     short_name: "md"
   }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64"
+    category: "vm|kernel"
+    short_name: "mr"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64"
-    category: "vm|kernel"
-    short_name: "pd"
+    category: "vm|kernel-precomp"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64"
-    category: "vm|kernel"
-    short_name: "pr"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm"
+    category: "vm|kernel-precomp"
+    short_name: "a32"
   }
-  builders: {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64"
-    category: "vm|kernel"
-    short_name: "mr"
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "a64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64"
+    category: "vm|kernel-precomp"
+    short_name: "r"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
@@ -1311,6 +1371,26 @@ consoles: {
     category: "vm|kernel"
     short_name: "d"
   }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64"
+    category: "vm|kernel"
+    short_name: "dbc"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm"
+    category: "vm|kernel"
+    short_name: "a32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64"
+    category: "vm|kernel"
+    short_name: "a64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64"
+    category: "vm|kernel"
+    short_name: "rbc"
+  }
   builders: {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64"
     category: "vm|kernel"
@@ -1328,13 +1408,23 @@ consoles: {
   }
   builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64"
-    category: "vm|kernel"
-    short_name: "pd"
+    category: "vm|kernel-precomp"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm"
+    category: "vm|kernel-precomp"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "a64"
   }
   builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64"
-    category: "vm|kernel"
-    short_name: "pr"
+    category: "vm|kernel-precomp"
+    short_name: "r"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
@@ -1467,9 +1557,9 @@ consoles: {
     short_name: "jsh"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/analyzer-linux-debug"
+    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
     category: "analyzer"
-    short_name: "d"
+    short_name: "aas"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/analyzer-linux-release"
@@ -1745,6 +1835,26 @@ consoles: {
     category: "vm|kernel"
     short_name: "d"
   }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64"
+    category: "vm|kernel"
+    short_name: "dbc"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm"
+    category: "vm|kernel"
+    short_name: "a32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64"
+    category: "vm|kernel"
+    short_name: "a64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64"
+    category: "vm|kernel"
+    short_name: "rbc"
+  }
   builders: {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64"
     category: "vm|kernel"
@@ -1762,13 +1872,23 @@ consoles: {
   }
   builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64"
-    category: "vm|kernel"
-    short_name: "pd"
+    category: "vm|kernel-precomp"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm"
+    category: "vm|kernel-precomp"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "a64"
   }
   builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64"
-    category: "vm|kernel"
-    short_name: "pr"
+    category: "vm|kernel-precomp"
+    short_name: "r"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
@@ -1901,9 +2021,9 @@ consoles: {
     short_name: "jsh"
   }
   builders: {
-    name: "buildbucket/luci.dart.ci/analyzer-linux-debug"
+    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
     category: "analyzer"
-    short_name: "d"
+    short_name: "aas"
   }
   builders: {
     name: "buildbucket/luci.dart.ci/analyzer-linux-release"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 6206e8aca49e..8737f8b6ea99 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -26,6 +26,12 @@ trigger {
   triggers: "dart-sdk-linux"
   triggers: "dart-sdk-mac"
   triggers: "dart-sdk-win"
+  triggers: "vm-kernel-linux-debug-simdbc64"
+  triggers: "vm-kernel-linux-release-simarm"
+  triggers: "vm-kernel-linux-release-simarm64"
+  triggers: "vm-kernel-linux-release-simdbc64"
+  triggers: "vm-kernel-precomp-linux-release-simarm"
+  triggers: "vm-kernel-precomp-linux-release-simarm64"
 }
 
 job {
@@ -61,3 +67,75 @@ job {
     builder: "dart-sdk-win"
   }
 }
+
+job {
+  id: "vm-kernel-linux-debug-simdbc64"
+  acl_sets: "default"
+  schedule: "triggered"
+  disabled: true,
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-linux-debug-simdbc64"
+  }
+}
+
+job {
+  id: "vm-kernel-linux-release-simarm"
+  acl_sets: "default"
+  schedule: "triggered"
+  disabled: true,
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-linux-release-simarm"
+  }
+}
+
+job {
+  id: "vm-kernel-linux-release-simarm64"
+  acl_sets: "default"
+  schedule: "triggered"
+  disabled: true,
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-linux-release-simarm64"
+  }
+}
+
+job {
+  id: "vm-kernel-linux-release-simdbc64"
+  acl_sets: "default"
+  schedule: "triggered"
+  disabled: true,
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-linux-release-simdbc64"
+  }
+}
+
+job {
+  id: "vm-kernel-precomp-linux-release-simarm"
+  acl_sets: "default"
+  schedule: "triggered"
+  disabled: true,
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-precomp-linux-release-simarm"
+  }
+}
+
+job {
+  id: "vm-kernel-precomp-linux-release-simarm64"
+  acl_sets: "default"
+  schedule: "triggered"
+  disabled: true,
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-precomp-linux-release-simarm64"
+  }
+}

From 07d1ab9cafd7c9684c568f92fd15f74826f7d3be Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 18 Dec 2017 07:17:06 +0000
Subject: [PATCH 061/826] [Infra] Enable non-precomp sim arm/dbc builders

TBR=kustermann@google.com

Change-Id: I8e67765a2fa970a033afb797f13be3cfb9752b73
Reviewed-on: https://dart-review.googlesource.com/30180
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-scheduler.cfg | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 8737f8b6ea99..85bda19f8947 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -72,7 +72,6 @@ job {
   id: "vm-kernel-linux-debug-simdbc64"
   acl_sets: "default"
   schedule: "triggered"
-  disabled: true,
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
@@ -84,7 +83,6 @@ job {
   id: "vm-kernel-linux-release-simarm"
   acl_sets: "default"
   schedule: "triggered"
-  disabled: true,
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
@@ -96,7 +94,6 @@ job {
   id: "vm-kernel-linux-release-simarm64"
   acl_sets: "default"
   schedule: "triggered"
-  disabled: true,
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
@@ -108,7 +105,6 @@ job {
   id: "vm-kernel-linux-release-simdbc64"
   acl_sets: "default"
   schedule: "triggered"
-  disabled: true,
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"

From 68ce4635c80080df3748945a852052a96b75ff83 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 19 Dec 2017 15:24:22 +0000
Subject: [PATCH 062/826] [Infra] Create alternative console with VM builders
 at the end

TBR=whesse@google.com

Change-Id: Iec8ddadc8357857bbee4d966d0777fb0c2334c67
Reviewed-on: https://dart-review.googlesource.com/30454
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-milo.cfg | 806 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 806 insertions(+)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index e6b45b7e4ac5..30cf0c6e65bc 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -776,6 +776,812 @@ consoles: {
   header: {
     links: {
       name: "Consoles"
+      links: {
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (migration, alternative)"
+      }
+      links: {
+        text: "LUCI console"
+        url: "/p/dart/g/luci/console"
+        alt: "SDK BE Console (LUCI Preview)"
+      }
+      links: {
+        text: "Buildbot console"
+        url: "https://uberchromegw.corp.google.com/i/client.dart/console"
+        alt: "Buildbot Console"
+      }
+      links: {
+        text: "FYI console"
+        url: "https://build.chromium.org/p/client.dart.fyi/console"
+        alt: "SDK FYI Console"
+      }
+    }
+    tree_status_host: "dart-status.appspot.com"
+  }
+}
+
+consoles: {
+  id: "alt"
+  name: "SDK Bleeding Edge Console (alternative, migration)"
+  repo_url: "https://dart.googlesource.com/sdk"
+  ref: "master"
+  manifest_name: "REVISION"
+  builders: {
+    # migrating to dart2js-hostchecked-linux-ia32-d8
+    name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-1-5-be"
+    category: "dart2js|d8"
+    short_name: "1hc"
+  }
+  builders: {
+    # migrating to dart2js-hostchecked-linux-ia32-d8
+    name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-2-5-be"
+    category: "dart2js|d8"
+    short_name: "2hc"
+  }
+  builders: {
+    # migrating to dart2js-hostchecked-linux-ia32-d8
+    name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-3-5-be"
+    category: "dart2js|d8"
+    short_name: "3hc"
+  }
+  builders: {
+    # migrating to dart2js-hostchecked-linux-ia32-d8
+    name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-4-5-be"
+    category: "dart2js|d8"
+    short_name: "4hc"
+  }
+  builders: {
+    # migrating to dart2js-hostchecked-linux-ia32-d8
+    name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-5-5-be"
+    category: "dart2js|d8"
+    short_name: "5hc"
+  }
+  builders: {
+    # migrating to dart2js-minified-linux-x64-d8
+    name: "buildbot/client.dart/dart2js-linux-d8-minified-1-5-be"
+    category: "dart2js|d8"
+    short_name: "1mi"
+  }
+  builders: {
+    # migrating to dart2js-minified-linux-x64-d8
+    name: "buildbot/client.dart/dart2js-linux-d8-minified-2-5-be"
+    category: "dart2js|d8"
+    short_name: "2mi"
+  }
+  builders: {
+    # migrating to dart2js-minified-linux-x64-d8
+    name: "buildbot/client.dart/dart2js-linux-d8-minified-3-5-be"
+    category: "dart2js|d8"
+    short_name: "3mi"
+  }
+  builders: {
+    # migrating to dart2js-minified-linux-x64-d8
+    name: "buildbot/client.dart/dart2js-linux-d8-minified-4-5-be"
+    category: "dart2js|d8"
+    short_name: "4mi"
+  }
+  builders: {
+    # migrating to dart2js-minified-linux-x64-d8
+    name: "buildbot/client.dart/dart2js-linux-d8-minified-5-5-be"
+    category: "dart2js|d8"
+    short_name: "5mi"
+  }
+# doesn't exist on buildbot, maybe migrate immediately?
+#  builders: {
+#    # migrating to dart2js-only-unittest-linux-ia32-none
+#    name: "buildbot/client.dart/dart2js-only-unittest-linux-ia32-none-be"
+#    category: "dart2js|misc"
+#    short_name: "ut"
+#  }
+  builders: {
+    # migrating to dart2js-dumpinfo-linux-ia32-none
+    name: "buildbot/client.dart.fyi/dart2jsdumpinfo-linux-be"
+    category: "dart2js|misc"
+    short_name: "dp"
+  }
+  builders: {
+    # migrating to dart2js-linux-x64-jsshell
+    name: "buildbot/client.dart/dart2js-linux-jsshell-1-4-be"
+    category: "dart2js|misc"
+    short_name: "1jsh"
+  }
+  builders: {
+    # migrating to dart2js-linux-x64-jsshell
+    name: "buildbot/client.dart/dart2js-linux-jsshell-2-4-be"
+    category: "dart2js|misc"
+    short_name: "2jsh"
+  }
+  builders: {
+    # migrating to dart2js-linux-x64-jsshell
+    name: "buildbot/client.dart/dart2js-linux-jsshell-3-4-be"
+    category: "dart2js|misc"
+    short_name: "3jsh"
+  }
+  builders: {
+    # migrating to dart2js-linux-x64-jsshell
+    name: "buildbot/client.dart/dart2js-linux-jsshell-4-4-be"
+    category: "dart2js|misc"
+    short_name: "4jsh"
+  }
+# doesn't exist on buildbot, maybe migrate immediately?
+#  builders: {
+#    # migrating to analyzer-analysis-server-linux
+#    name: "buildbot/client.dart/analyzer-analysis-server-linux-be"
+#    category: "analyzer"
+#    short_name: "aas"
+#  }
+  builders: {
+    # migrating to analyzer-linux-release
+    name: "buildbot/client.dart/analyzer-linux-release-be"
+    category: "analyzer"
+    short_name: "r"
+  }
+  builders: {
+    # migrating to analyzer-mac-release
+    name: "buildbot/client.dart/analyzer-mac10.11-release-be"
+    category: "analyzer"
+    short_name: "mr"
+  }
+  builders: {
+    # migrating to analyzer-strong-linux-release
+    name: "buildbot/client.dart/analyzer-linux-release-strong-be"
+    category: "analyzer"
+    short_name: "sr"
+  }
+  builders: {
+    # migrating to analyzer-strong-mac-release
+    name: "buildbot/client.dart/analyzer-mac10.11-release-strong-be"
+    category: "analyzer"
+    short_name: "smr"
+  }
+  builders: {
+    # migrating to analyzer-strong-win-release
+    name: "buildbot/client.dart/analyzer-win7-release-strong-be"
+    category: "analyzer"
+    short_name: "swr"
+  }
+  builders: {
+    # migrating to analyzer-win-release
+    name: "buildbot/client.dart/analyzer-win7-release-be"
+    category: "analyzer"
+    short_name: "awr"
+  }
+  builders: {
+    # migrating to dart-sdk-linux
+    name: "buildbot/client.dart/dart-sdk-linux-be"
+    category: "sdk"
+    short_name: "l"
+  }
+  builders: {
+    # migrating to dart-sdk-mac
+    name: "buildbot/client.dart/dart-sdk-mac-be"
+    category: "sdk"
+    short_name: "m"
+  }
+  builders: {
+    # migrating to dart-sdk-win
+    name: "buildbot/client.dart/dart-sdk-windows-be"
+    category: "sdk"
+    short_name: "w"
+  }
+  builders: {
+    # migrating to ddc-linux-release-chrome
+    name: "buildbot/client.dart/ddc-linux-release-be"
+    category: "ddc"
+    short_name: "l"
+  }
+  builders: {
+    # migrating to ddc-mac-release-chrome
+    name: "buildbot/client.dart/ddc-mac-release-be"
+    category: "ddc"
+    short_name: "m"
+  }
+  builders: {
+    # migrating to ddc-win-release-chrome
+    name: "buildbot/client.dart/ddc-win-release-be"
+    category: "ddc"
+    short_name: "w"
+  }
+  builders: {
+    # migrating to dart2js-linux-x64-chrome
+    name: "buildbot/client.dart/dart2js-linux-chromeff-1-4-be"
+    category: "dart2js|chrome"
+    short_name: "1l"
+  }
+  builders: {
+    # migrating to dart2js-linux-x64-chrome
+    name: "buildbot/client.dart/dart2js-linux-chromeff-2-4-be"
+    category: "dart2js|chrome"
+    short_name: "2l"
+  }
+  builders: {
+    # migrating to dart2js-linux-x64-chrome
+    name: "buildbot/client.dart/dart2js-linux-chromeff-3-4-be"
+    category: "dart2js|chrome"
+    short_name: "3l"
+  }
+  builders: {
+    # migrating to dart2js-linux-x64-chrome
+    name: "buildbot/client.dart/dart2js-linux-chromeff-4-4-be"
+    category: "dart2js|chrome"
+    short_name: "4l"
+  }
+# doesn't exist on buildbot, included in chromeff builder
+#  builders: {
+#    # migrating to dart2js-linux-x64-ff
+#    name: "buildbot/client.dart/dart2js-linux-x64-ff-be"
+#    category: "dart2js|ff"
+#    short_name: "l"
+#  }
+  builders: {
+    # migrating to dart2js-csp-minified-linux-x64-drt
+    name: "buildbot/client.dart/dart2js-linux-drt-csp-minified-be"
+    category: "dart2js|chrome"
+    short_name: "csp"
+  }
+  builders: {
+    # migrating to dart2js-linux-x64-drt
+    name: "buildbot/client.dart/dart2js-linux-drt-1-2-be"
+    category: "dart2js|chrome"
+    short_name: "1drt"
+  }
+  builders: {
+    # migrating to dart2js-linux-x64-drt
+    name: "buildbot/client.dart/dart2js-linux-drt-2-2-be"
+    category: "dart2js|chrome"
+    short_name: "2drt"
+  }
+  builders: {
+    # migrating to dart2js-mac-x64-chrome
+    name: "buildbot/client.dart/dart2js-mac10.11-chrome-be"
+    category: "dart2js|chrome"
+    short_name: "m"
+  }
+  builders: {
+    # migrating to dart2js-mac-x64-safari
+    name: "buildbot/client.dart/dart2js-mac10.11-safari-1-3-be"
+    category: "dart2js|safari"
+    short_name: "1m"
+  }
+  builders: {
+    # migrating to dart2js-mac-x64-safari
+    name: "buildbot/client.dart/dart2js-mac10.11-safari-2-3-be"
+    category: "dart2js|safari"
+    short_name: "2m"
+  }
+  builders: {
+    # migrating to dart2js-mac-x64-safari
+    name: "buildbot/client.dart/dart2js-mac10.11-safari-3-3-be"
+    category: "dart2js|safari"
+    short_name: "3m"
+  }
+  builders: {
+    # migrating to dart2js-win-x64-chrome
+    name: "buildbot/client.dart/dart2js-win7-chrome-1-4-be"
+    category: "dart2js|chrome"
+    short_name: "1w"
+  }
+  builders: {
+    # migrating to dart2js-win-x64-chrome
+    name: "buildbot/client.dart/dart2js-win7-chrome-2-4-be"
+    category: "dart2js|chrome"
+    short_name: "2w"
+  }
+  builders: {
+    # migrating to dart2js-win-x64-chrome
+    name: "buildbot/client.dart/dart2js-win7-chrome-3-4-be"
+    category: "dart2js|chrome"
+    short_name: "3w"
+  }
+  builders: {
+    # migrating to dart2js-win-x64-chrome
+    name: "buildbot/client.dart/dart2js-win7-chrome-4-4-be"
+    category: "dart2js|chrome"
+    short_name: "4w"
+  }
+# doesn't exist on buildbot, new builder
+#  builders: {
+#    # migrating to dart2js-win-x64-edge
+#    name: "buildbot/client.dart/dart2js-win-x64-edge-be"
+#    category: "dart2js|ms"
+#    short_name: "ed"
+#  }
+  builders: {
+    # migrating to dart2js-win-x64-ff
+    name: "buildbot/client.dart/dart2js-win7-ie11ff-1-4-be"
+    category: "dart2js|ff"
+    short_name: "1w"
+  }
+  builders: {
+    # migrating to dart2js-win-x64-ff
+    name: "buildbot/client.dart/dart2js-win7-ie11ff-2-4-be"
+    category: "dart2js|ff"
+    short_name: "2w"
+  }
+  builders: {
+    # migrating to dart2js-win-x64-ff
+    name: "buildbot/client.dart/dart2js-win7-ie11ff-3-4-be"
+    category: "dart2js|ff"
+    short_name: "3w"
+  }
+  builders: {
+    # migrating to dart2js-win-x64-ff
+    name: "buildbot/client.dart/dart2js-win7-ie11ff-4-4-be"
+    category: "dart2js|ff"
+    short_name: "4w"
+  }
+# doesn't exist on buildbot, included in ie11ff builder
+#  builders: {
+#    # migrating to dart2js-win-x64-ie11
+#    name: "buildbot/client.dart/dart2js-win-x64-ie11-be"
+#    category: "dart2js|ms"
+#    short_name: "ie"
+#  }
+  builders: {
+    # migrating to pkg-linux-release
+    name: "buildbot/client.dart/pkg-linux-release-be"
+    category: "pkg"
+    short_name: "l"
+  }
+  builders: {
+    # migrating to pkg-mac-release
+    name: "buildbot/client.dart/pkg-mac10.11-release-be"
+    category: "pkg"
+    short_name: "m"
+  }
+  builders: {
+    # migrating to pkg-win-release
+    name: "buildbot/client.dart/pkg-win7-release-be"
+    category: "pkg"
+    short_name: "w"
+  }
+  builders: {
+    # migrating to debianpackage-linux
+    name: "buildbot/client.dart/debianpackage-linux-be"
+    category: "misc"
+    short_name: "dp"
+  }
+  builders: {
+    # migrating to versionchecker-linux
+    name: "buildbot/client.dart/versionchecker-linux-be"
+    category: "misc"
+    short_name: "vc"
+  }
+  builders: {
+    # migrating to vm-linux-debug-ia32
+    name: "buildbot/client.dart/vm-linux-debug-ia32-be"
+    category: "vm|debug"
+    short_name: "32"
+  }
+  builders: {
+    # migrating to vm-linux-debug-simarm
+    name: "buildbot/client.dart/vm-linux-debug-simarm-be"
+    category: "vm|simarm"
+    short_name: "d"
+  }
+  builders: {
+    # migrating to vm-linux-debug-x64
+    name: "buildbot/client.dart/vm-linux-debug-x64-be"
+    category: "vm|debug"
+    short_name: "64"
+  }
+  builders: {
+    # migrating to vm-linux-release-ia32
+    name: "buildbot/client.dart/vm-linux-release-ia32-be"
+    category: "vm|release"
+    short_name: "32"
+  }
+  builders: {
+    # migrating to vm-linux-release-simarm
+    name: "buildbot/client.dart/vm-linux-release-simarm-be"
+    category: "vm|simarm"
+    short_name: "r"
+  }
+  builders: {
+    # migrating to vm-linux-release-simarm64
+    name: "buildbot/client.dart/vm-linux-release-simarm64-be"
+    category: "vm|simarm"
+    short_name: "r64"
+  }
+  builders: {
+    # migrating to vm-linux-release-x64
+    name: "buildbot/client.dart/vm-linux-release-x64-be"
+    category: "vm|release"
+    short_name: "64"
+  }
+  builders: {
+    # migrating to vm-mac-debug-ia32
+    name: "buildbot/client.dart/vm-mac-debug-ia32-be"
+    category: "vm|debug"
+    short_name: "m32"
+  }
+  builders: {
+    # migrating to vm-mac-debug-simdbc64
+    name: "buildbot/client.dart/vm-mac-debug-simdbc64-be"
+    category: "vm|debug"
+    short_name: "msi"
+  }
+  builders: {
+    # migrating to vm-mac-debug-x64
+    name: "buildbot/client.dart/vm-mac-debug-x64-be"
+    category: "vm|debug"
+    short_name: "m64"
+  }
+  builders: {
+    # migrating to vm-mac-release-ia32
+    name: "buildbot/client.dart/vm-mac-release-ia32-be"
+    category: "vm|release"
+    short_name: "m32"
+  }
+  builders: {
+    # migrating to vm-mac-release-simdbc64
+    name: "buildbot/client.dart/vm-mac-release-simdbc64-be"
+    category: "vm|release"
+    short_name: "msi"
+  }
+  builders: {
+    # migrating to vm-mac-release-x64
+    name: "buildbot/client.dart/vm-mac-release-x64-be"
+    category: "vm|release"
+    short_name: "m64"
+  }
+  builders: {
+    # migrating to vm-win-debug-ia32
+    name: "buildbot/client.dart/vm-win-debug-ia32-be"
+    category: "vm|debug"
+    short_name: "w32"
+  }
+  builders: {
+    # migrating to vm-win-debug-x64
+    name: "buildbot/client.dart/vm-win-debug-x64-be"
+    category: "vm|debug"
+    short_name: "w64"
+  }
+  builders: {
+    # migrating to vm-win-release-ia32
+    name: "buildbot/client.dart/vm-win-release-ia32-be"
+    category: "vm|release"
+    short_name: "w32"
+  }
+  builders: {
+    # migrating to vm-win-release-x64
+    name: "buildbot/client.dart/vm-win-release-x64-be"
+    category: "vm|release"
+    short_name: "w64"
+  }
+  builders: {
+    # migrating to app-linux-debug-x64
+    name: "buildbot/client.dart/app-linux-debug-x64-be"
+    category: "vm|app"
+    short_name: "d64"
+  }
+  builders: {
+    # migrating to app-linux-product-x64
+    name: "buildbot/client.dart/app-linux-product-x64-be"
+    category: "vm|app"
+    short_name: "p64"
+  }
+  builders: {
+    # migrating to app-linux-release-x64
+    name: "buildbot/client.dart/app-linux-release-x64-be"
+    category: "vm|app"
+    short_name: "r64"
+  }
+  builders: {
+    # migrating to vm-kernel-linux-debug-x64
+    name: "buildbot/client.dart/vm-kernel-linux-debug-x64-be"
+    category: "vm|kernel"
+    short_name: "d"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64"
+    category: "vm|kernel"
+    short_name: "dbc"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm"
+    category: "vm|kernel"
+    short_name: "a32"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64"
+    category: "vm|kernel"
+    short_name: "a64"
+  }
+  builders: {
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64"
+    category: "vm|kernel"
+    short_name: "rbc"
+  }
+  builders: {
+    # migrating to vm-kernel-linux-release-x64
+    name: "buildbot/client.dart/vm-kernel-linux-release-x64-be"
+    category: "vm|kernel"
+    short_name: "r"
+  }
+  builders: {
+    # migrating to vm-kernel-mac-debug-x64
+    name: "buildbot/client.dart/vm-kernel-mac-debug-x64-be"
+    category: "vm|kernel"
+    short_name: "md"
+  }
+  builders: {
+    # migrating to vm-kernel-mac-release-x64
+    name: "buildbot/client.dart/vm-kernel-mac-release-x64-be"
+    category: "vm|kernel"
+    short_name: "mr"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-debug-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-1-8-be"
+    category: "vm|kernel-precomp"
+    short_name: "1d"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-debug-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-2-8-be"
+    category: "vm|kernel-precomp"
+    short_name: "2d"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-debug-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-3-8-be"
+    category: "vm|kernel-precomp"
+    short_name: "3d"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-debug-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-4-8-be"
+    category: "vm|kernel-precomp"
+    short_name: "4d"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-debug-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-5-8-be"
+    category: "vm|kernel-precomp"
+    short_name: "5d"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-debug-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-6-8-be"
+    category: "vm|kernel-precomp"
+    short_name: "6d"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-debug-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-7-8-be"
+    category: "vm|kernel-precomp"
+    short_name: "7d"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-debug-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-8-8-be"
+    category: "vm|kernel-precomp"
+    short_name: "8d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm"
+    category: "vm|kernel-precomp"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "a64"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-release-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-1-6-be"
+    category: "vm|kernel-precomp"
+    short_name: "1r"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-release-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-2-6-be"
+    category: "vm|kernel-precomp"
+    short_name: "2r"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-release-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-3-6-be"
+    category: "vm|kernel-precomp"
+    short_name: "3r"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-release-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-4-6-be"
+    category: "vm|kernel-precomp"
+    short_name: "4r"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-release-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-5-6-be"
+    category: "vm|kernel-precomp"
+    short_name: "5r"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-linux-release-x64
+    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-6-6-be"
+    category: "vm|kernel-precomp"
+    short_name: "6r"
+  }
+  builders: {
+    # migrating to cross-vm-linux-release-arm64
+    name: "buildbot/client.dart/cross-arm64-vm-linux-release-be"
+    category: "vm|misc"
+    short_name: "cra"
+  }
+  builders: {
+    # migrating to target-vm-linux-release-arm64
+    name: "buildbot/client.dart/target-arm64-vm-linux-release-be"
+    category: "vm|misc"
+    short_name: "tra"
+  }
+  builders: {
+    # migrating to vm-asan-linux-release-ia32
+    name: "buildbot/client.dart/vm-linux-release-ia32-asan-be"
+    category: "vm|misc"
+    short_name: "a32"
+  }
+  builders: {
+    # migrating to vm-asan-linux-release-x64
+    name: "buildbot/client.dart/vm-linux-release-x64-asan-be"
+    category: "vm|misc"
+    short_name: "a64"
+  }
+  builders: {
+    # migrating to vm-optcounter-threshold-linux-release-ia32
+    name: "buildbot/client.dart/vm-linux-release-ia32-optcounter-threshold-be"
+    category: "vm|misc"
+    short_name: "o32"
+  }
+  builders: {
+    # migrating to vm-optcounter-threshold-linux-release-x64
+    name: "buildbot/client.dart/vm-linux-release-x64-optcounter-threshold-be"
+    category: "vm|misc"
+    short_name: "o64"
+  }
+  builders: {
+    # migrating to vm-russian-win-debug-ia32
+    name: "buildbot/client.dart/vm-win-debug-ia32-russian-be"
+    category: "vm|misc"
+    short_name: "ru"
+  }
+  builders: {
+    # migrating to precomp-linux-debug-x64
+    name: "buildbot/client.dart/precomp-linux-debug-x64-1-3-be"
+    category: "vm|precomp"
+    short_name: "1d64"
+  }
+  builders: {
+    # migrating to precomp-linux-debug-x64
+    name: "buildbot/client.dart/precomp-linux-debug-x64-2-3-be"
+    category: "vm|precomp"
+    short_name: "2d64"
+  }
+  builders: {
+    # migrating to precomp-linux-debug-x64
+    name: "buildbot/client.dart/precomp-linux-debug-x64-3-3-be"
+    category: "vm|precomp"
+    short_name: "3d64"
+  }
+  builders: {
+    # migrating to precomp-linux-product-x64
+    name: "buildbot/client.dart/precomp-linux-product-x64-be"
+    category: "vm|precomp"
+    short_name: "p64"
+  }
+  builders: {
+    # migrating to vm-noopt-mac-simarm64
+    name: "buildbot/client.dart/vm-noopt-simarm64-mac-be"
+    category: "vm|precomp"
+    short_name: "no"
+  }
+  builders: {
+    # migrating to vm-precomp-android-release
+    name: "buildbot/client.dart/vm-precomp-android-release-1-3-be"
+    category: "vm|precomp"
+    short_name: "1and"
+  }
+  builders: {
+    # migrating to vm-precomp-android-release
+    name: "buildbot/client.dart/vm-precomp-android-release-2-3-be"
+    category: "vm|precomp"
+    short_name: "2and"
+  }
+  builders: {
+    # migrating to vm-precomp-android-release
+    name: "buildbot/client.dart/vm-precomp-android-release-3-3-be"
+    category: "vm|precomp"
+    short_name: "3and"
+  }
+  builders: {
+    # migrating to vm-precomp-win-simarm64
+    name: "buildbot/client.dart/vm-precomp-win-simarm64-1-4-be"
+    category: "vm|precomp"
+    short_name: "1wsi"
+  }
+  builders: {
+    # migrating to vm-precomp-win-simarm64
+    name: "buildbot/client.dart/vm-precomp-win-simarm64-2-4-be"
+    category: "vm|precomp"
+    short_name: "2wsi"
+  }
+  builders: {
+    # migrating to vm-precomp-win-simarm64
+    name: "buildbot/client.dart/vm-precomp-win-simarm64-3-4-be"
+    category: "vm|precomp"
+    short_name: "3wsi"
+  }
+  builders: {
+    # migrating to vm-precomp-win-simarm64
+    name: "buildbot/client.dart/vm-precomp-win-simarm64-4-4-be"
+    category: "vm|precomp"
+    short_name: "4wsi"
+  }
+  builders: {
+    # migrating to vm-linux-product-x64
+    name: "buildbot/client.dart/vm-linux-product-x64-be"
+    category: "vm|product"
+    short_name: "64"
+  }
+  builders: {
+    # migrating to vm-mac-product-x64
+    name: "buildbot/client.dart/vm-mac-product-x64-be"
+    category: "vm|product"
+    short_name: "m64"
+  }
+  builders: {
+    # migrating to vm-win-product-x64
+    name: "buildbot/client.dart/vm-win-product-x64-be"
+    category: "vm|product"
+    short_name: "w64"
+  }
+  builders: {
+    # migrating to vm-reload-linux-debug-x64
+    name: "buildbot/client.dart/vm-linux-debug-x64-reload-be"
+    category: "vm|reload"
+    short_name: "d"
+  }
+  builders: {
+    # migrating to vm-reload-linux-release-x64
+    name: "buildbot/client.dart/vm-linux-release-x64-reload-be"
+    category: "vm|reload"
+    short_name: "r"
+  }
+  builders: {
+    # migrating to vm-reload-mac-debug-simdbc64
+    name: "buildbot/client.dart/vm-mac-debug-simdbc64-reload-be"
+    category: "vm|reload"
+    short_name: "mds"
+  }
+  builders: {
+    # migrating to vm-reload-mac-release-simdbc64
+    name: "buildbot/client.dart/vm-mac-release-simdbc64-reload-be"
+    category: "vm|reload"
+    short_name: "mrs"
+  }
+  builders: {
+    # migrating to vm-reload-rollback-linux-debug-x64
+    name: "buildbot/client.dart/vm-linux-debug-x64-reload-rollback-be"
+    category: "vm|reload"
+    short_name: "dro"
+  }
+  builders: {
+    # migrating to vm-reload-rollback-linux-release-x64
+    name: "buildbot/client.dart/vm-linux-release-x64-reload-rollback-be"
+    category: "vm|reload"
+    short_name: "rro"
+  }
+  header: {
+    links: {
+      name: "Consoles"
+      links: {
+        text: "Bleeding Edge console"
+        url: "/p/dart/g/be/console"
+        alt: "SDK BE Console (migration)"
+      }
       links: {
         text: "LUCI console"
         url: "/p/dart/g/luci/console"

From 317a6a11ef2d14e2bd8a2ba2821cebbac0598494 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 20 Dec 2017 12:14:05 +0000
Subject: [PATCH 063/826] [Infra] Remove pool dimensions to use bucket name as
 pool

Change-Id: Idba746ab5a0258f67099617ad3067fe8bed23f4a
Reviewed-on: https://dart-review.googlesource.com/28881
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 2 --
 1 file changed, 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 9ec63657c6cb..ef2e9d9ca969 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -77,7 +77,6 @@ buckets {
     builder_defaults {
       category: "Dart CI"
       dimensions: "cpu:x86-64"
-      dimensions: "pool:Dart.LUCI"
       dimensions: "os:Linux"
       priority: 50
       recipe {
@@ -198,7 +197,6 @@ buckets {
     builder_defaults {
       category: "Dart CQ"
       dimensions: "cpu:x86-64"
-      dimensions: "pool:Dart.LUCI"
       dimensions: "os:Linux"
       priority: 30
       recipe {

From eed5d15afaffcf5cef363afe6b8e5aa2d18aa94b Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 20 Dec 2017 12:53:30 +0000
Subject: [PATCH 064/826] [Infra] Add basic luci-notify config

Change-Id: I73f7d89db5e8ab0cf7a4213f2a24ea5f8979ea60
Reviewed-on: https://dart-review.googlesource.com/29584
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-notify.cfg | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 luci-notify.cfg

diff --git a/luci-notify.cfg b/luci-notify.cfg
new file mode 100644
index 000000000000..a57955e84db4
--- /dev/null
+++ b/luci-notify.cfg
@@ -0,0 +1,29 @@
+# Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file
+# for details. All rights reserved. Use of this source code is governed by a
+# BSD-style license that can be found in the LICENSE file.
+
+# Defines notifiers on luci-notify.appspot.com.
+# See https://github.com/luci/luci-go/blob/master/luci_notify/api/config/notify.proto
+
+# Please keep this list sorted by name or layer.
+
+# on_change  = Whenever the build status changes.
+# on_success = On every build success.
+# on_failure = On every build failure.
+
+notifiers {
+  name: "dart-ci-notifier"
+  notifications {
+    on_change: true
+    on_success: true
+    on_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
+  }
+
+  builders {
+    bucket: "luci.dart.ci"
+    name: "dart-sdk-win"
+  }
+}
\ No newline at end of file

From 39816ca834996752131694adc347d172ab043827 Mon Sep 17 00:00:00 2001
From: Robert Iannucci <iannucci@google.com>
Date: Wed, 20 Dec 2017 18:34:49 +0000
Subject: [PATCH 065/826] [luci-milo] Use absolute git refs instead of
 shorthand values.

Since these shorthand values can change with the introduction of other
refs (e.g. 'dev' could resolve to 'refs/heads/foo/dev'), it's always
better to use absolute refs (i.e. starting with 'refs/').

Bug:
Change-Id: Iaf42f2ce70fc6a433560e2dcf9cef52dc326f4ec
Reviewed-on: https://dart-review.googlesource.com/30702
Reviewed-by: William Hesse <whesse@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-milo.cfg | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 30cf0c6e65bc..5f74ccc8716e 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -4,7 +4,7 @@ consoles: {
   id: "be"
   name: "SDK Bleeding Edge Console (migration)"
   repo_url: "https://dart.googlesource.com/sdk"
-  ref: "master"
+  ref: "refs/heads/master"
   manifest_name: "REVISION"
   builders: {
     # migrating to vm-linux-debug-ia32
@@ -805,7 +805,7 @@ consoles: {
   id: "alt"
   name: "SDK Bleeding Edge Console (alternative, migration)"
   repo_url: "https://dart.googlesource.com/sdk"
-  ref: "master"
+  ref: "refs/heads/master"
   manifest_name: "REVISION"
   builders: {
     # migrating to dart2js-hostchecked-linux-ia32-d8
@@ -1606,7 +1606,7 @@ consoles: {
   id: "luci"
   name: "SDK Bleeding Edge Console (LUCI Preview)"
   repo_url: "https://dart.googlesource.com/sdk/"
-  ref: "master"
+  ref: "refs/heads/master"
   manifest_name: "REVISION"
   builders: {
     name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
@@ -2070,7 +2070,7 @@ consoles: {
   id: "dev"
   name: "SDK Dev Console"
   repo_url: "https://dart.googlesource.com/sdk"
-  ref: "dev"
+  ref: "refs/heads/dev"
   manifest_name: "REVISION"
   builders: {
     name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
@@ -2534,7 +2534,7 @@ consoles: {
   id: "stable"
   name: "SDK Stable Console"
   repo_url: "https://dart.googlesource.com/sdk"
-  ref: "stable"
+  ref: "refs/heads/stable"
   manifest_name: "REVISION"
   builders: {
     name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
@@ -2998,7 +2998,7 @@ consoles: {
   id: "fyi"
   name: "SDK FYI Console"
   repo_url: "https://dart.googlesource.com/sdk"
-  ref: "master"
+  ref: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-checked-linux-release-x64"

From 3d7ef403ffbb568aca7e73ec73cd8bf5a22175de Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 21 Dec 2017 10:06:16 +0000
Subject: [PATCH 066/826] [Infra] Add email notifications for VM kernel sim
 arm/dbc builders

Bug: 31573
Change-Id: I293a99ec487dab5424ab0cbccd2f9e8d0058455b
Reviewed-on: https://dart-review.googlesource.com/30821
Reviewed-by: Martin Kustermann <kustermann@google.com>
---
 luci-notify.cfg | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/luci-notify.cfg b/luci-notify.cfg
index a57955e84db4..0b596b5c903a 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -15,15 +15,40 @@ notifiers {
   name: "dart-ci-notifier"
   notifications {
     on_change: true
-    on_success: true
+    on_success: false
     on_failure: true
     email {
       recipients: "athom@google.com"
     }
   }
 
+  notifications {
+    on_change: true
+    on_success: false
+    on_failure: false
+    email {
+      recipients: "dart-vm-team+botfailures@google.com"
+    }
+  }
+
+  builders {
+    bucket: "luci.dart.ci"
+    name: "vm-kernel-linux-debug-simdbc64"
+  }
+
   builders {
     bucket: "luci.dart.ci"
-    name: "dart-sdk-win"
+    name: "vm-kernel-linux-release-simarm"
   }
+
+  builders {
+    bucket: "luci.dart.ci"
+    name: "vm-kernel-linux-release-simarm64"
+  }
+
+  builders {
+    bucket: "luci.dart.ci"
+    name: "vm-kernel-linux-release-simdbc64"
+  }
+
 }
\ No newline at end of file

From 15f608b748338675439cb664439540bb4274bffe Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 3 Jan 2018 10:31:00 +0100
Subject: [PATCH 067/826] [Infra] Remove asan ia32 builder from LUCI config

Bug: 31749
Change-Id: I55d15d90578b3f241f5a8637b68e51b8637cab2d
Reviewed-on: https://dart-review.googlesource.com/31983
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg |  1 -
 luci-milo.cfg      | 27 ---------------------------
 2 files changed, 28 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index ef2e9d9ca969..69c6696f50a7 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -133,7 +133,6 @@ buckets {
     builders { name: "precomp-linux-product-x64" }
     builders { name: "target-vm-linux-release-arm64" dimensions: "cpu:arm64" }
     builders { name: "versionchecker-linux" }
-    builders { name: "vm-asan-linux-release-ia32" }
     builders { name: "vm-asan-linux-release-x64" }
     builders { name: "vm-kernel-checked-linux-release-x64" }
     builders { name: "vm-kernel-linux-debug-x64" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 5f74ccc8716e..ed306bffb11f 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -276,12 +276,6 @@ consoles: {
     category: "vm|misc"
     short_name: "tra"
   }
-  builders: {
-    # migrating to vm-asan-linux-release-ia32
-    name: "buildbot/client.dart/vm-linux-release-ia32-asan-be"
-    category: "vm|misc"
-    short_name: "a32"
-  }
   builders: {
     # migrating to vm-asan-linux-release-x64
     name: "buildbot/client.dart/vm-linux-release-x64-asan-be"
@@ -1418,12 +1412,6 @@ consoles: {
     category: "vm|misc"
     short_name: "tra"
   }
-  builders: {
-    # migrating to vm-asan-linux-release-ia32
-    name: "buildbot/client.dart/vm-linux-release-ia32-asan-be"
-    category: "vm|misc"
-    short_name: "a32"
-  }
   builders: {
     # migrating to vm-asan-linux-release-x64
     name: "buildbot/client.dart/vm-linux-release-x64-asan-be"
@@ -1778,11 +1766,6 @@ consoles: {
     category: "vm|misc"
     short_name: "tra"
   }
-  builders: {
-    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-ia32"
-    category: "vm|misc"
-    short_name: "a32"
-  }
   builders: {
     name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64"
     category: "vm|misc"
@@ -2242,11 +2225,6 @@ consoles: {
     category: "vm|misc"
     short_name: "tra"
   }
-  builders: {
-    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-ia32"
-    category: "vm|misc"
-    short_name: "a32"
-  }
   builders: {
     name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64"
     category: "vm|misc"
@@ -2706,11 +2684,6 @@ consoles: {
     category: "vm|misc"
     short_name: "tra"
   }
-  builders: {
-    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-ia32"
-    category: "vm|misc"
-    short_name: "a32"
-  }
   builders: {
     name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64"
     category: "vm|misc"

From 84beb68839581cbaf5bf4bbda2ec7052236de661 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 9 Jan 2018 18:28:03 +0100
Subject: [PATCH 068/826] [infra] Remove +botfailures to ensure mails get sent

Change-Id: I0b78223f3f5b1a42d59643d1008e4e81a49d271a
Reviewed-on: https://dart-review.googlesource.com/33463
Reviewed-by: Martin Kustermann <kustermann@google.com>
---
 luci-notify.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/luci-notify.cfg b/luci-notify.cfg
index 0b596b5c903a..ff7ef24b0298 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -27,7 +27,7 @@ notifiers {
     on_success: false
     on_failure: false
     email {
-      recipients: "dart-vm-team+botfailures@google.com"
+      recipients: "dart-vm-team@google.com"
     }
   }
 

From e66ac93ab54c70698d5f35d3a9f5bba37b5f2ce1 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 10 Jan 2018 17:39:43 +0100
Subject: [PATCH 069/826] [infra] Add LUCI config for
 vm-kernel-optcounter-threshold builder

Change-Id: I28cfe82888d0e39bf33391e629c6472ea0452c03
Reviewed-on: https://dart-review.googlesource.com/32321
Reviewed-by: Martin Kustermann <kustermann@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg |  1 +
 luci-milo.cfg      | 25 +++++++++++++++++++++++++
 luci-notify.cfg    | 15 ++++++---------
 luci-scheduler.cfg | 12 ++++++++++++
 4 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 69c6696f50a7..dade90b85d3d 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -143,6 +143,7 @@ buckets {
     builders { name: "vm-kernel-linux-release-x64" }
     builders { name: "vm-kernel-mac-debug-x64" dimensions: "os:Mac" }
     builders { name: "vm-kernel-mac-release-x64" dimensions: "os:Mac" }
+    builders { name: "vm-kernel-optcounter-threshold-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-debug-x64" }
     builders { name: "vm-kernel-precomp-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-release-simarm" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index ed306bffb11f..9bbcbe4e410a 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -170,6 +170,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "mr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "oc"
+  }
   builders {
     # migrating to vm-kernel-precomp-linux-debug-x64
     name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-1-8-be"
@@ -1306,6 +1311,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "mr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "oc"
+  }
   builders {
     # migrating to vm-kernel-precomp-linux-debug-x64
     name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-1-8-be"
@@ -1736,6 +1746,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "mr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "oc"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64"
     category: "vm|kernel-precomp"
@@ -2195,6 +2210,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "mr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "oc"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64"
     category: "vm|kernel-precomp"
@@ -2654,6 +2674,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "mr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "oc"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64"
     category: "vm|kernel-precomp"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index ff7ef24b0298..dffd53225e05 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -13,21 +13,13 @@
 
 notifiers {
   name: "dart-ci-notifier"
-  notifications {
-    on_change: true
-    on_success: false
-    on_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
-  }
 
   notifications {
     on_change: true
     on_success: false
     on_failure: false
     email {
-      recipients: "dart-vm-team@google.com"
+      recipients: "dart-sdk-build-notifications@google.com"
     }
   }
 
@@ -51,4 +43,9 @@ notifiers {
     name: "vm-kernel-linux-release-simdbc64"
   }
 
+  builders {
+    bucket: "luci.dart.ci"
+    name: "vm-kernel-optcounter-threshold-linux-release-x64"
+  }
+
 }
\ No newline at end of file
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 85bda19f8947..d85457f1207e 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -30,6 +30,7 @@ trigger {
   triggers: "vm-kernel-linux-release-simarm"
   triggers: "vm-kernel-linux-release-simarm64"
   triggers: "vm-kernel-linux-release-simdbc64"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
   triggers: "vm-kernel-precomp-linux-release-simarm"
   triggers: "vm-kernel-precomp-linux-release-simarm64"
 }
@@ -112,6 +113,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-optcounter-threshold-linux-release-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-optcounter-threshold-linux-release-x64"
+  }
+}
+
 job {
   id: "vm-kernel-precomp-linux-release-simarm"
   acl_sets: "default"

From 8a0f09d42c505307e1307edf9d6f732729ab0008 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 16 Jan 2018 15:39:49 +0000
Subject: [PATCH 070/826] [infra] Add LUCI config for VM Kernel Windows
 builders

Bug: https://github.com/dart-lang/sdk/issues/31707
Change-Id: I313d904c754cc5854b5efe76f47e5772e98043c3
Reviewed-on: https://dart-review.googlesource.com/34620
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg |  2 ++
 luci-milo.cfg      | 50 ++++++++++++++++++++++++++++++++++++++++++++++
 luci-notify.cfg    | 20 +++++++++++++++++++
 luci-scheduler.cfg | 25 +++++++++++++++++++++++
 4 files changed, 97 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index dade90b85d3d..b9eb5e6bcead 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -143,11 +143,13 @@ buckets {
     builders { name: "vm-kernel-linux-release-x64" }
     builders { name: "vm-kernel-mac-debug-x64" dimensions: "os:Mac" }
     builders { name: "vm-kernel-mac-release-x64" dimensions: "os:Mac" }
+    builders { name: "vm-kernel-win-release-x64" dimensions: "os:Windows" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-debug-x64" }
     builders { name: "vm-kernel-precomp-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-release-simarm" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64" }
+    builders { name: "vm-kernel-precomp-win-release-x64" dimensions: "os:Windows" }
     builders { name: "vm-linux-debug-ia32" }
     builders { name: "vm-linux-debug-simarm" }
     builders { name: "vm-linux-debug-x64" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 9bbcbe4e410a..24b24e585429 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -175,6 +175,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "oc"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64"
+    category: "vm|kernel"
+    short_name: "wr"
+  }
   builders {
     # migrating to vm-kernel-precomp-linux-debug-x64
     name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-1-8-be"
@@ -269,6 +274,11 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "6r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64"
+    category: "vm|kernel-precomp"
+    short_name: "wr"
+  }
   builders: {
     # migrating to cross-vm-linux-release-arm64
     name: "buildbot/client.dart/cross-arm64-vm-linux-release-be"
@@ -1316,6 +1326,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "oc"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64"
+    category: "vm|kernel"
+    short_name: "wr"
+  }
   builders {
     # migrating to vm-kernel-precomp-linux-debug-x64
     name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-1-8-be"
@@ -1410,6 +1425,11 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "6r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64"
+    category: "vm|kernel-precomp"
+    short_name: "wr"
+  }
   builders: {
     # migrating to cross-vm-linux-release-arm64
     name: "buildbot/client.dart/cross-arm64-vm-linux-release-be"
@@ -1751,6 +1771,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "oc"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64"
+    category: "vm|kernel"
+    short_name: "wr"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64"
     category: "vm|kernel-precomp"
@@ -1771,6 +1796,11 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64"
+    category: "vm|kernel-precomp"
+    short_name: "wr"
+  }
   builders: {
     name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
     category: "vm|misc"
@@ -2215,6 +2245,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "oc"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64"
+    category: "vm|kernel"
+    short_name: "wr"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64"
     category: "vm|kernel-precomp"
@@ -2235,6 +2270,11 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64"
+    category: "vm|kernel-precomp"
+    short_name: "wr"
+  }
   builders: {
     name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
     category: "vm|misc"
@@ -2679,6 +2719,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "oc"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64"
+    category: "vm|kernel"
+    short_name: "wr"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64"
     category: "vm|kernel-precomp"
@@ -2699,6 +2744,11 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64"
+    category: "vm|kernel-precomp"
+    short_name: "wr"
+  }
   builders: {
     name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
     category: "vm|misc"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index dffd53225e05..c229254755d1 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -48,4 +48,24 @@ notifiers {
     name: "vm-kernel-optcounter-threshold-linux-release-x64"
   }
 
+  builders {
+    bucket: "luci.dart.ci"
+    name: "vm-kernel-win-release-x64"
+  }
+
+  builders {
+    bucket: "luci.dart.ci"
+    name: "vm-kernel-precomp-linux-release-simarm"
+  }
+
+  builders {
+    bucket: "luci.dart.ci"
+    name: "vm-kernel-precomp-linux-release-simarm64"
+  }
+
+  builders {
+    bucket: "luci.dart.ci"
+    name: "vm-kernel-precomp-win-release-x64"
+  }
+
 }
\ No newline at end of file
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index d85457f1207e..95ce0f348f5f 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -31,8 +31,10 @@ trigger {
   triggers: "vm-kernel-linux-release-simarm64"
   triggers: "vm-kernel-linux-release-simdbc64"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
+  triggers: "vm-kernel-win-release-x64"
   triggers: "vm-kernel-precomp-linux-release-simarm"
   triggers: "vm-kernel-precomp-linux-release-simarm64"
+  triggers: "vm-kernel-precomp-win-release-x64"
 }
 
 job {
@@ -124,6 +126,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-win-release-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-win-release-x64"
+  }
+}
+
 job {
   id: "vm-kernel-precomp-linux-release-simarm"
   acl_sets: "default"
@@ -147,3 +160,15 @@ job {
     builder: "vm-kernel-precomp-linux-release-simarm64"
   }
 }
+
+job {
+  id: "vm-kernel-precomp-win-release-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  disabled: true,
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-precomp-win-release-x64"
+  }
+}

From e713c756b8bfb0f9bc92e15fb4c27a813c16d502 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 18 Jan 2018 09:48:43 +0000
Subject: [PATCH 071/826] [infra] Use the client.dart as master name for
 luci.dart.ci builds

Change-Id: I1f90d3c44819203600e24f8f77919bcd160cbc4c
Reviewed-on: https://dart-review.googlesource.com/34980
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index b9eb5e6bcead..4e5bb51bd5c5 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -81,7 +81,7 @@ buckets {
       priority: 50
       recipe {
         repository: "https://chromium.googlesource.com/chromium/tools/build.git"
-        properties: "mastername:dart"
+        properties: "mastername:client.dart"
         name: "dart/neo"
       }
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"

From 156445f13232b92ba2eabb570e51cf5935f5c417 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 26 Jan 2018 00:16:30 +0000
Subject: [PATCH 072/826] [infra] Remove unnecessary colons

Change-Id: Ibb963e769b07b44198df51ef05c00e5f893be0f5
Reviewed-on: https://dart-review.googlesource.com/36485
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-milo.cfg | 934 +++++++++++++++++++++++++-------------------------
 1 file changed, 467 insertions(+), 467 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 24b24e585429..efd85d79946a 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -6,165 +6,165 @@ consoles: {
   repo_url: "https://dart.googlesource.com/sdk"
   ref: "refs/heads/master"
   manifest_name: "REVISION"
-  builders: {
+  builders {
     # migrating to vm-linux-debug-ia32
     name: "buildbot/client.dart/vm-linux-debug-ia32-be"
     category: "vm|debug"
     short_name: "32"
   }
-  builders: {
+  builders {
     # migrating to vm-linux-debug-simarm
     name: "buildbot/client.dart/vm-linux-debug-simarm-be"
     category: "vm|simarm"
     short_name: "d"
   }
-  builders: {
+  builders {
     # migrating to vm-linux-debug-x64
     name: "buildbot/client.dart/vm-linux-debug-x64-be"
     category: "vm|debug"
     short_name: "64"
   }
-  builders: {
+  builders {
     # migrating to vm-linux-release-ia32
     name: "buildbot/client.dart/vm-linux-release-ia32-be"
     category: "vm|release"
     short_name: "32"
   }
-  builders: {
+  builders {
     # migrating to vm-linux-release-simarm
     name: "buildbot/client.dart/vm-linux-release-simarm-be"
     category: "vm|simarm"
     short_name: "r"
   }
-  builders: {
+  builders {
     # migrating to vm-linux-release-simarm64
     name: "buildbot/client.dart/vm-linux-release-simarm64-be"
     category: "vm|simarm"
     short_name: "r64"
   }
-  builders: {
+  builders {
     # migrating to vm-linux-release-x64
     name: "buildbot/client.dart/vm-linux-release-x64-be"
     category: "vm|release"
     short_name: "64"
   }
-  builders: {
+  builders {
     # migrating to vm-mac-debug-ia32
     name: "buildbot/client.dart/vm-mac-debug-ia32-be"
     category: "vm|debug"
     short_name: "m32"
   }
-  builders: {
+  builders {
     # migrating to vm-mac-debug-simdbc64
     name: "buildbot/client.dart/vm-mac-debug-simdbc64-be"
     category: "vm|debug"
     short_name: "msi"
   }
-  builders: {
+  builders {
     # migrating to vm-mac-debug-x64
     name: "buildbot/client.dart/vm-mac-debug-x64-be"
     category: "vm|debug"
     short_name: "m64"
   }
-  builders: {
+  builders {
     # migrating to vm-mac-release-ia32
     name: "buildbot/client.dart/vm-mac-release-ia32-be"
     category: "vm|release"
     short_name: "m32"
   }
-  builders: {
+  builders {
     # migrating to vm-mac-release-simdbc64
     name: "buildbot/client.dart/vm-mac-release-simdbc64-be"
     category: "vm|release"
     short_name: "msi"
   }
-  builders: {
+  builders {
     # migrating to vm-mac-release-x64
     name: "buildbot/client.dart/vm-mac-release-x64-be"
     category: "vm|release"
     short_name: "m64"
   }
-  builders: {
+  builders {
     # migrating to vm-win-debug-ia32
     name: "buildbot/client.dart/vm-win-debug-ia32-be"
     category: "vm|debug"
     short_name: "w32"
   }
-  builders: {
+  builders {
     # migrating to vm-win-debug-x64
     name: "buildbot/client.dart/vm-win-debug-x64-be"
     category: "vm|debug"
     short_name: "w64"
   }
-  builders: {
+  builders {
     # migrating to vm-win-release-ia32
     name: "buildbot/client.dart/vm-win-release-ia32-be"
     category: "vm|release"
     short_name: "w32"
   }
-  builders: {
+  builders {
     # migrating to vm-win-release-x64
     name: "buildbot/client.dart/vm-win-release-x64-be"
     category: "vm|release"
     short_name: "w64"
   }
-  builders: {
+  builders {
     # migrating to app-linux-debug-x64
     name: "buildbot/client.dart/app-linux-debug-x64-be"
     category: "vm|app"
     short_name: "d64"
   }
-  builders: {
+  builders {
     # migrating to app-linux-product-x64
     name: "buildbot/client.dart/app-linux-product-x64-be"
     category: "vm|app"
     short_name: "p64"
   }
-  builders: {
+  builders {
     # migrating to app-linux-release-x64
     name: "buildbot/client.dart/app-linux-release-x64-be"
     category: "vm|app"
     short_name: "r64"
   }
-  builders: {
+  builders {
     # migrating to vm-kernel-linux-debug-x64
     name: "buildbot/client.dart/vm-kernel-linux-debug-x64-be"
     category: "vm|kernel"
     short_name: "d"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64"
     category: "vm|kernel"
     short_name: "dbc"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
     short_name: "a32"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64"
     category: "vm|kernel"
     short_name: "a64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64"
     category: "vm|kernel"
     short_name: "rbc"
   }
-  builders: {
+  builders {
     # migrating to vm-kernel-linux-release-x64
     name: "buildbot/client.dart/vm-kernel-linux-release-x64-be"
     category: "vm|kernel"
     short_name: "r"
   }
-  builders: {
+  builders {
     # migrating to vm-kernel-mac-debug-x64
     name: "buildbot/client.dart/vm-kernel-mac-debug-x64-be"
     category: "vm|kernel"
     short_name: "md"
   }
-  builders: {
+  builders {
     # migrating to vm-kernel-mac-release-x64
     name: "buildbot/client.dart/vm-kernel-mac-release-x64-be"
     category: "vm|kernel"
@@ -279,504 +279,504 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
-  builders: {
+  builders {
     # migrating to cross-vm-linux-release-arm64
     name: "buildbot/client.dart/cross-arm64-vm-linux-release-be"
     category: "vm|misc"
     short_name: "cra"
   }
-  builders: {
+  builders {
     # migrating to target-vm-linux-release-arm64
     name: "buildbot/client.dart/target-arm64-vm-linux-release-be"
     category: "vm|misc"
     short_name: "tra"
   }
-  builders: {
+  builders {
     # migrating to vm-asan-linux-release-x64
     name: "buildbot/client.dart/vm-linux-release-x64-asan-be"
     category: "vm|misc"
     short_name: "a64"
   }
-  builders: {
+  builders {
     # migrating to vm-optcounter-threshold-linux-release-ia32
     name: "buildbot/client.dart/vm-linux-release-ia32-optcounter-threshold-be"
     category: "vm|misc"
     short_name: "o32"
   }
-  builders: {
+  builders {
     # migrating to vm-optcounter-threshold-linux-release-x64
     name: "buildbot/client.dart/vm-linux-release-x64-optcounter-threshold-be"
     category: "vm|misc"
     short_name: "o64"
   }
-  builders: {
+  builders {
     # migrating to vm-russian-win-debug-ia32
     name: "buildbot/client.dart/vm-win-debug-ia32-russian-be"
     category: "vm|misc"
     short_name: "ru"
   }
-  builders: {
+  builders {
     # migrating to precomp-linux-debug-x64
     name: "buildbot/client.dart/precomp-linux-debug-x64-1-3-be"
     category: "vm|precomp"
     short_name: "1d64"
   }
-  builders: {
+  builders {
     # migrating to precomp-linux-debug-x64
     name: "buildbot/client.dart/precomp-linux-debug-x64-2-3-be"
     category: "vm|precomp"
     short_name: "2d64"
   }
-  builders: {
+  builders {
     # migrating to precomp-linux-debug-x64
     name: "buildbot/client.dart/precomp-linux-debug-x64-3-3-be"
     category: "vm|precomp"
     short_name: "3d64"
   }
-  builders: {
+  builders {
     # migrating to precomp-linux-product-x64
     name: "buildbot/client.dart/precomp-linux-product-x64-be"
     category: "vm|precomp"
     short_name: "p64"
   }
-  builders: {
+  builders {
     # migrating to vm-noopt-mac-simarm64
     name: "buildbot/client.dart/vm-noopt-simarm64-mac-be"
     category: "vm|precomp"
     short_name: "no"
   }
-  builders: {
+  builders {
     # migrating to vm-precomp-android-release
     name: "buildbot/client.dart/vm-precomp-android-release-1-3-be"
     category: "vm|precomp"
     short_name: "1and"
   }
-  builders: {
+  builders {
     # migrating to vm-precomp-android-release
     name: "buildbot/client.dart/vm-precomp-android-release-2-3-be"
     category: "vm|precomp"
     short_name: "2and"
   }
-  builders: {
+  builders {
     # migrating to vm-precomp-android-release
     name: "buildbot/client.dart/vm-precomp-android-release-3-3-be"
     category: "vm|precomp"
     short_name: "3and"
   }
-  builders: {
+  builders {
     # migrating to vm-precomp-win-simarm64
     name: "buildbot/client.dart/vm-precomp-win-simarm64-1-4-be"
     category: "vm|precomp"
     short_name: "1wsi"
   }
-  builders: {
+  builders {
     # migrating to vm-precomp-win-simarm64
     name: "buildbot/client.dart/vm-precomp-win-simarm64-2-4-be"
     category: "vm|precomp"
     short_name: "2wsi"
   }
-  builders: {
+  builders {
     # migrating to vm-precomp-win-simarm64
     name: "buildbot/client.dart/vm-precomp-win-simarm64-3-4-be"
     category: "vm|precomp"
     short_name: "3wsi"
   }
-  builders: {
+  builders {
     # migrating to vm-precomp-win-simarm64
     name: "buildbot/client.dart/vm-precomp-win-simarm64-4-4-be"
     category: "vm|precomp"
     short_name: "4wsi"
   }
-  builders: {
+  builders {
     # migrating to vm-linux-product-x64
     name: "buildbot/client.dart/vm-linux-product-x64-be"
     category: "vm|product"
     short_name: "64"
   }
-  builders: {
+  builders {
     # migrating to vm-mac-product-x64
     name: "buildbot/client.dart/vm-mac-product-x64-be"
     category: "vm|product"
     short_name: "m64"
   }
-  builders: {
+  builders {
     # migrating to vm-win-product-x64
     name: "buildbot/client.dart/vm-win-product-x64-be"
     category: "vm|product"
     short_name: "w64"
   }
-  builders: {
+  builders {
     # migrating to vm-reload-linux-debug-x64
     name: "buildbot/client.dart/vm-linux-debug-x64-reload-be"
     category: "vm|reload"
     short_name: "d"
   }
-  builders: {
+  builders {
     # migrating to vm-reload-linux-release-x64
     name: "buildbot/client.dart/vm-linux-release-x64-reload-be"
     category: "vm|reload"
     short_name: "r"
   }
-  builders: {
+  builders {
     # migrating to vm-reload-mac-debug-simdbc64
     name: "buildbot/client.dart/vm-mac-debug-simdbc64-reload-be"
     category: "vm|reload"
     short_name: "mds"
   }
-  builders: {
+  builders {
     # migrating to vm-reload-mac-release-simdbc64
     name: "buildbot/client.dart/vm-mac-release-simdbc64-reload-be"
     category: "vm|reload"
     short_name: "mrs"
   }
-  builders: {
+  builders {
     # migrating to vm-reload-rollback-linux-debug-x64
     name: "buildbot/client.dart/vm-linux-debug-x64-reload-rollback-be"
     category: "vm|reload"
     short_name: "dro"
   }
-  builders: {
+  builders {
     # migrating to vm-reload-rollback-linux-release-x64
     name: "buildbot/client.dart/vm-linux-release-x64-reload-rollback-be"
     category: "vm|reload"
     short_name: "rro"
   }
-  builders: {
+  builders {
     # migrating to dart2js-hostchecked-linux-ia32-d8
     name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-1-5-be"
     category: "dart2js|d8"
     short_name: "1hc"
   }
-  builders: {
+  builders {
     # migrating to dart2js-hostchecked-linux-ia32-d8
     name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-2-5-be"
     category: "dart2js|d8"
     short_name: "2hc"
   }
-  builders: {
+  builders {
     # migrating to dart2js-hostchecked-linux-ia32-d8
     name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-3-5-be"
     category: "dart2js|d8"
     short_name: "3hc"
   }
-  builders: {
+  builders {
     # migrating to dart2js-hostchecked-linux-ia32-d8
     name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-4-5-be"
     category: "dart2js|d8"
     short_name: "4hc"
   }
-  builders: {
+  builders {
     # migrating to dart2js-hostchecked-linux-ia32-d8
     name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-5-5-be"
     category: "dart2js|d8"
     short_name: "5hc"
   }
-  builders: {
+  builders {
     # migrating to dart2js-minified-linux-x64-d8
     name: "buildbot/client.dart/dart2js-linux-d8-minified-1-5-be"
     category: "dart2js|d8"
     short_name: "1mi"
   }
-  builders: {
+  builders {
     # migrating to dart2js-minified-linux-x64-d8
     name: "buildbot/client.dart/dart2js-linux-d8-minified-2-5-be"
     category: "dart2js|d8"
     short_name: "2mi"
   }
-  builders: {
+  builders {
     # migrating to dart2js-minified-linux-x64-d8
     name: "buildbot/client.dart/dart2js-linux-d8-minified-3-5-be"
     category: "dart2js|d8"
     short_name: "3mi"
   }
-  builders: {
+  builders {
     # migrating to dart2js-minified-linux-x64-d8
     name: "buildbot/client.dart/dart2js-linux-d8-minified-4-5-be"
     category: "dart2js|d8"
     short_name: "4mi"
   }
-  builders: {
+  builders {
     # migrating to dart2js-minified-linux-x64-d8
     name: "buildbot/client.dart/dart2js-linux-d8-minified-5-5-be"
     category: "dart2js|d8"
     short_name: "5mi"
   }
 # doesn't exist on buildbot, maybe migrate immediately?
-#  builders: {
+#  builders {
 #    # migrating to dart2js-only-unittest-linux-ia32-none
 #    name: "buildbot/client.dart/dart2js-only-unittest-linux-ia32-none-be"
 #    category: "dart2js|misc"
 #    short_name: "ut"
 #  }
-  builders: {
+  builders {
     # migrating to dart2js-dumpinfo-linux-ia32-none
     name: "buildbot/client.dart.fyi/dart2jsdumpinfo-linux-be"
     category: "dart2js|misc"
     short_name: "dp"
   }
-  builders: {
+  builders {
     # migrating to dart2js-linux-x64-jsshell
     name: "buildbot/client.dart/dart2js-linux-jsshell-1-4-be"
     category: "dart2js|misc"
     short_name: "1jsh"
   }
-  builders: {
+  builders {
     # migrating to dart2js-linux-x64-jsshell
     name: "buildbot/client.dart/dart2js-linux-jsshell-2-4-be"
     category: "dart2js|misc"
     short_name: "2jsh"
   }
-  builders: {
+  builders {
     # migrating to dart2js-linux-x64-jsshell
     name: "buildbot/client.dart/dart2js-linux-jsshell-3-4-be"
     category: "dart2js|misc"
     short_name: "3jsh"
   }
-  builders: {
+  builders {
     # migrating to dart2js-linux-x64-jsshell
     name: "buildbot/client.dart/dart2js-linux-jsshell-4-4-be"
     category: "dart2js|misc"
     short_name: "4jsh"
   }
 # doesn't exist on buildbot, maybe migrate immediately?
-#  builders: {
+#  builders {
 #    # migrating to analyzer-analysis-server-linux
 #    name: "buildbot/client.dart/analyzer-analysis-server-linux-be"
 #    category: "analyzer"
 #    short_name: "aas"
 #  }
-  builders: {
+  builders {
     # migrating to analyzer-linux-release
     name: "buildbot/client.dart/analyzer-linux-release-be"
     category: "analyzer"
     short_name: "r"
   }
-  builders: {
+  builders {
     # migrating to analyzer-mac-release
     name: "buildbot/client.dart/analyzer-mac10.11-release-be"
     category: "analyzer"
     short_name: "mr"
   }
-  builders: {
+  builders {
     # migrating to analyzer-strong-linux-release
     name: "buildbot/client.dart/analyzer-linux-release-strong-be"
     category: "analyzer"
     short_name: "sr"
   }
-  builders: {
+  builders {
     # migrating to analyzer-strong-mac-release
     name: "buildbot/client.dart/analyzer-mac10.11-release-strong-be"
     category: "analyzer"
     short_name: "smr"
   }
-  builders: {
+  builders {
     # migrating to analyzer-strong-win-release
     name: "buildbot/client.dart/analyzer-win7-release-strong-be"
     category: "analyzer"
     short_name: "swr"
   }
-  builders: {
+  builders {
     # migrating to analyzer-win-release
     name: "buildbot/client.dart/analyzer-win7-release-be"
     category: "analyzer"
     short_name: "awr"
   }
-  builders: {
+  builders {
     # migrating to dart-sdk-linux
     name: "buildbot/client.dart/dart-sdk-linux-be"
     category: "sdk"
     short_name: "l"
   }
-  builders: {
+  builders {
     # migrating to dart-sdk-mac
     name: "buildbot/client.dart/dart-sdk-mac-be"
     category: "sdk"
     short_name: "m"
   }
-  builders: {
+  builders {
     # migrating to dart-sdk-win
     name: "buildbot/client.dart/dart-sdk-windows-be"
     category: "sdk"
     short_name: "w"
   }
-  builders: {
+  builders {
     # migrating to ddc-linux-release-chrome
     name: "buildbot/client.dart/ddc-linux-release-be"
     category: "ddc"
     short_name: "l"
   }
-  builders: {
+  builders {
     # migrating to ddc-mac-release-chrome
     name: "buildbot/client.dart/ddc-mac-release-be"
     category: "ddc"
     short_name: "m"
   }
-  builders: {
+  builders {
     # migrating to ddc-win-release-chrome
     name: "buildbot/client.dart/ddc-win-release-be"
     category: "ddc"
     short_name: "w"
   }
-  builders: {
+  builders {
     # migrating to dart2js-linux-x64-chrome
     name: "buildbot/client.dart/dart2js-linux-chromeff-1-4-be"
     category: "dart2js|chrome"
     short_name: "1l"
   }
-  builders: {
+  builders {
     # migrating to dart2js-linux-x64-chrome
     name: "buildbot/client.dart/dart2js-linux-chromeff-2-4-be"
     category: "dart2js|chrome"
     short_name: "2l"
   }
-  builders: {
+  builders {
     # migrating to dart2js-linux-x64-chrome
     name: "buildbot/client.dart/dart2js-linux-chromeff-3-4-be"
     category: "dart2js|chrome"
     short_name: "3l"
   }
-  builders: {
+  builders {
     # migrating to dart2js-linux-x64-chrome
     name: "buildbot/client.dart/dart2js-linux-chromeff-4-4-be"
     category: "dart2js|chrome"
     short_name: "4l"
   }
 # doesn't exist on buildbot, included in chromeff builder
-#  builders: {
+#  builders {
 #    # migrating to dart2js-linux-x64-ff
 #    name: "buildbot/client.dart/dart2js-linux-x64-ff-be"
 #    category: "dart2js|ff"
 #    short_name: "l"
 #  }
-  builders: {
+  builders {
     # migrating to dart2js-csp-minified-linux-x64-drt
     name: "buildbot/client.dart/dart2js-linux-drt-csp-minified-be"
     category: "dart2js|chrome"
     short_name: "csp"
   }
-  builders: {
+  builders {
     # migrating to dart2js-linux-x64-drt
     name: "buildbot/client.dart/dart2js-linux-drt-1-2-be"
     category: "dart2js|chrome"
     short_name: "1drt"
   }
-  builders: {
+  builders {
     # migrating to dart2js-linux-x64-drt
     name: "buildbot/client.dart/dart2js-linux-drt-2-2-be"
     category: "dart2js|chrome"
     short_name: "2drt"
   }
-  builders: {
+  builders {
     # migrating to dart2js-mac-x64-chrome
     name: "buildbot/client.dart/dart2js-mac10.11-chrome-be"
     category: "dart2js|chrome"
     short_name: "m"
   }
-  builders: {
+  builders {
     # migrating to dart2js-mac-x64-safari
     name: "buildbot/client.dart/dart2js-mac10.11-safari-1-3-be"
     category: "dart2js|safari"
     short_name: "1m"
   }
-  builders: {
+  builders {
     # migrating to dart2js-mac-x64-safari
     name: "buildbot/client.dart/dart2js-mac10.11-safari-2-3-be"
     category: "dart2js|safari"
     short_name: "2m"
   }
-  builders: {
+  builders {
     # migrating to dart2js-mac-x64-safari
     name: "buildbot/client.dart/dart2js-mac10.11-safari-3-3-be"
     category: "dart2js|safari"
     short_name: "3m"
   }
-  builders: {
+  builders {
     # migrating to dart2js-win-x64-chrome
     name: "buildbot/client.dart/dart2js-win7-chrome-1-4-be"
     category: "dart2js|chrome"
     short_name: "1w"
   }
-  builders: {
+  builders {
     # migrating to dart2js-win-x64-chrome
     name: "buildbot/client.dart/dart2js-win7-chrome-2-4-be"
     category: "dart2js|chrome"
     short_name: "2w"
   }
-  builders: {
+  builders {
     # migrating to dart2js-win-x64-chrome
     name: "buildbot/client.dart/dart2js-win7-chrome-3-4-be"
     category: "dart2js|chrome"
     short_name: "3w"
   }
-  builders: {
+  builders {
     # migrating to dart2js-win-x64-chrome
     name: "buildbot/client.dart/dart2js-win7-chrome-4-4-be"
     category: "dart2js|chrome"
     short_name: "4w"
   }
 # doesn't exist on buildbot, new builder
-#  builders: {
+#  builders {
 #    # migrating to dart2js-win-x64-edge
 #    name: "buildbot/client.dart/dart2js-win-x64-edge-be"
 #    category: "dart2js|ms"
 #    short_name: "ed"
 #  }
-  builders: {
+  builders {
     # migrating to dart2js-win-x64-ff
     name: "buildbot/client.dart/dart2js-win7-ie11ff-1-4-be"
     category: "dart2js|ff"
     short_name: "1w"
   }
-  builders: {
+  builders {
     # migrating to dart2js-win-x64-ff
     name: "buildbot/client.dart/dart2js-win7-ie11ff-2-4-be"
     category: "dart2js|ff"
     short_name: "2w"
   }
-  builders: {
+  builders {
     # migrating to dart2js-win-x64-ff
     name: "buildbot/client.dart/dart2js-win7-ie11ff-3-4-be"
     category: "dart2js|ff"
     short_name: "3w"
   }
-  builders: {
+  builders {
     # migrating to dart2js-win-x64-ff
     name: "buildbot/client.dart/dart2js-win7-ie11ff-4-4-be"
     category: "dart2js|ff"
     short_name: "4w"
   }
 # doesn't exist on buildbot, included in ie11ff builder
-#  builders: {
+#  builders {
 #    # migrating to dart2js-win-x64-ie11
 #    name: "buildbot/client.dart/dart2js-win-x64-ie11-be"
 #    category: "dart2js|ms"
 #    short_name: "ie"
 #  }
-  builders: {
+  builders {
     # migrating to pkg-linux-release
     name: "buildbot/client.dart/pkg-linux-release-be"
     category: "pkg"
     short_name: "l"
   }
-  builders: {
+  builders {
     # migrating to pkg-mac-release
     name: "buildbot/client.dart/pkg-mac10.11-release-be"
     category: "pkg"
     short_name: "m"
   }
-  builders: {
+  builders {
     # migrating to pkg-win-release
     name: "buildbot/client.dart/pkg-win7-release-be"
     category: "pkg"
     short_name: "w"
   }
-  builders: {
+  builders {
     # migrating to debianpackage-linux
     name: "buildbot/client.dart/debianpackage-linux-be"
     category: "misc"
     short_name: "dp"
   }
-  builders: {
+  builders {
     # migrating to versionchecker-linux
     name: "buildbot/client.dart/versionchecker-linux-be"
     category: "misc"
@@ -816,506 +816,506 @@ consoles: {
   repo_url: "https://dart.googlesource.com/sdk"
   ref: "refs/heads/master"
   manifest_name: "REVISION"
-  builders: {
+  builders {
     # migrating to dart2js-hostchecked-linux-ia32-d8
     name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-1-5-be"
     category: "dart2js|d8"
     short_name: "1hc"
   }
-  builders: {
+  builders {
     # migrating to dart2js-hostchecked-linux-ia32-d8
     name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-2-5-be"
     category: "dart2js|d8"
     short_name: "2hc"
   }
-  builders: {
+  builders {
     # migrating to dart2js-hostchecked-linux-ia32-d8
     name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-3-5-be"
     category: "dart2js|d8"
     short_name: "3hc"
   }
-  builders: {
+  builders {
     # migrating to dart2js-hostchecked-linux-ia32-d8
     name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-4-5-be"
     category: "dart2js|d8"
     short_name: "4hc"
   }
-  builders: {
+  builders {
     # migrating to dart2js-hostchecked-linux-ia32-d8
     name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-5-5-be"
     category: "dart2js|d8"
     short_name: "5hc"
   }
-  builders: {
+  builders {
     # migrating to dart2js-minified-linux-x64-d8
     name: "buildbot/client.dart/dart2js-linux-d8-minified-1-5-be"
     category: "dart2js|d8"
     short_name: "1mi"
   }
-  builders: {
+  builders {
     # migrating to dart2js-minified-linux-x64-d8
     name: "buildbot/client.dart/dart2js-linux-d8-minified-2-5-be"
     category: "dart2js|d8"
     short_name: "2mi"
   }
-  builders: {
+  builders {
     # migrating to dart2js-minified-linux-x64-d8
     name: "buildbot/client.dart/dart2js-linux-d8-minified-3-5-be"
     category: "dart2js|d8"
     short_name: "3mi"
   }
-  builders: {
+  builders {
     # migrating to dart2js-minified-linux-x64-d8
     name: "buildbot/client.dart/dart2js-linux-d8-minified-4-5-be"
     category: "dart2js|d8"
     short_name: "4mi"
   }
-  builders: {
+  builders {
     # migrating to dart2js-minified-linux-x64-d8
     name: "buildbot/client.dart/dart2js-linux-d8-minified-5-5-be"
     category: "dart2js|d8"
     short_name: "5mi"
   }
 # doesn't exist on buildbot, maybe migrate immediately?
-#  builders: {
+#  builders {
 #    # migrating to dart2js-only-unittest-linux-ia32-none
 #    name: "buildbot/client.dart/dart2js-only-unittest-linux-ia32-none-be"
 #    category: "dart2js|misc"
 #    short_name: "ut"
 #  }
-  builders: {
+  builders {
     # migrating to dart2js-dumpinfo-linux-ia32-none
     name: "buildbot/client.dart.fyi/dart2jsdumpinfo-linux-be"
     category: "dart2js|misc"
     short_name: "dp"
   }
-  builders: {
+  builders {
     # migrating to dart2js-linux-x64-jsshell
     name: "buildbot/client.dart/dart2js-linux-jsshell-1-4-be"
     category: "dart2js|misc"
     short_name: "1jsh"
   }
-  builders: {
+  builders {
     # migrating to dart2js-linux-x64-jsshell
     name: "buildbot/client.dart/dart2js-linux-jsshell-2-4-be"
     category: "dart2js|misc"
     short_name: "2jsh"
   }
-  builders: {
+  builders {
     # migrating to dart2js-linux-x64-jsshell
     name: "buildbot/client.dart/dart2js-linux-jsshell-3-4-be"
     category: "dart2js|misc"
     short_name: "3jsh"
   }
-  builders: {
+  builders {
     # migrating to dart2js-linux-x64-jsshell
     name: "buildbot/client.dart/dart2js-linux-jsshell-4-4-be"
     category: "dart2js|misc"
     short_name: "4jsh"
   }
 # doesn't exist on buildbot, maybe migrate immediately?
-#  builders: {
+#  builders {
 #    # migrating to analyzer-analysis-server-linux
 #    name: "buildbot/client.dart/analyzer-analysis-server-linux-be"
 #    category: "analyzer"
 #    short_name: "aas"
 #  }
-  builders: {
+  builders {
     # migrating to analyzer-linux-release
     name: "buildbot/client.dart/analyzer-linux-release-be"
     category: "analyzer"
     short_name: "r"
   }
-  builders: {
+  builders {
     # migrating to analyzer-mac-release
     name: "buildbot/client.dart/analyzer-mac10.11-release-be"
     category: "analyzer"
     short_name: "mr"
   }
-  builders: {
+  builders {
     # migrating to analyzer-strong-linux-release
     name: "buildbot/client.dart/analyzer-linux-release-strong-be"
     category: "analyzer"
     short_name: "sr"
   }
-  builders: {
+  builders {
     # migrating to analyzer-strong-mac-release
     name: "buildbot/client.dart/analyzer-mac10.11-release-strong-be"
     category: "analyzer"
     short_name: "smr"
   }
-  builders: {
+  builders {
     # migrating to analyzer-strong-win-release
     name: "buildbot/client.dart/analyzer-win7-release-strong-be"
     category: "analyzer"
     short_name: "swr"
   }
-  builders: {
+  builders {
     # migrating to analyzer-win-release
     name: "buildbot/client.dart/analyzer-win7-release-be"
     category: "analyzer"
     short_name: "awr"
   }
-  builders: {
+  builders {
     # migrating to dart-sdk-linux
     name: "buildbot/client.dart/dart-sdk-linux-be"
     category: "sdk"
     short_name: "l"
   }
-  builders: {
+  builders {
     # migrating to dart-sdk-mac
     name: "buildbot/client.dart/dart-sdk-mac-be"
     category: "sdk"
     short_name: "m"
   }
-  builders: {
+  builders {
     # migrating to dart-sdk-win
     name: "buildbot/client.dart/dart-sdk-windows-be"
     category: "sdk"
     short_name: "w"
   }
-  builders: {
+  builders {
     # migrating to ddc-linux-release-chrome
     name: "buildbot/client.dart/ddc-linux-release-be"
     category: "ddc"
     short_name: "l"
   }
-  builders: {
+  builders {
     # migrating to ddc-mac-release-chrome
     name: "buildbot/client.dart/ddc-mac-release-be"
     category: "ddc"
     short_name: "m"
   }
-  builders: {
+  builders {
     # migrating to ddc-win-release-chrome
     name: "buildbot/client.dart/ddc-win-release-be"
     category: "ddc"
     short_name: "w"
   }
-  builders: {
+  builders {
     # migrating to dart2js-linux-x64-chrome
     name: "buildbot/client.dart/dart2js-linux-chromeff-1-4-be"
     category: "dart2js|chrome"
     short_name: "1l"
   }
-  builders: {
+  builders {
     # migrating to dart2js-linux-x64-chrome
     name: "buildbot/client.dart/dart2js-linux-chromeff-2-4-be"
     category: "dart2js|chrome"
     short_name: "2l"
   }
-  builders: {
+  builders {
     # migrating to dart2js-linux-x64-chrome
     name: "buildbot/client.dart/dart2js-linux-chromeff-3-4-be"
     category: "dart2js|chrome"
     short_name: "3l"
   }
-  builders: {
+  builders {
     # migrating to dart2js-linux-x64-chrome
     name: "buildbot/client.dart/dart2js-linux-chromeff-4-4-be"
     category: "dart2js|chrome"
     short_name: "4l"
   }
 # doesn't exist on buildbot, included in chromeff builder
-#  builders: {
+#  builders {
 #    # migrating to dart2js-linux-x64-ff
 #    name: "buildbot/client.dart/dart2js-linux-x64-ff-be"
 #    category: "dart2js|ff"
 #    short_name: "l"
 #  }
-  builders: {
+  builders {
     # migrating to dart2js-csp-minified-linux-x64-drt
     name: "buildbot/client.dart/dart2js-linux-drt-csp-minified-be"
     category: "dart2js|chrome"
     short_name: "csp"
   }
-  builders: {
+  builders {
     # migrating to dart2js-linux-x64-drt
     name: "buildbot/client.dart/dart2js-linux-drt-1-2-be"
     category: "dart2js|chrome"
     short_name: "1drt"
   }
-  builders: {
+  builders {
     # migrating to dart2js-linux-x64-drt
     name: "buildbot/client.dart/dart2js-linux-drt-2-2-be"
     category: "dart2js|chrome"
     short_name: "2drt"
   }
-  builders: {
+  builders {
     # migrating to dart2js-mac-x64-chrome
     name: "buildbot/client.dart/dart2js-mac10.11-chrome-be"
     category: "dart2js|chrome"
     short_name: "m"
   }
-  builders: {
+  builders {
     # migrating to dart2js-mac-x64-safari
     name: "buildbot/client.dart/dart2js-mac10.11-safari-1-3-be"
     category: "dart2js|safari"
     short_name: "1m"
   }
-  builders: {
+  builders {
     # migrating to dart2js-mac-x64-safari
     name: "buildbot/client.dart/dart2js-mac10.11-safari-2-3-be"
     category: "dart2js|safari"
     short_name: "2m"
   }
-  builders: {
+  builders {
     # migrating to dart2js-mac-x64-safari
     name: "buildbot/client.dart/dart2js-mac10.11-safari-3-3-be"
     category: "dart2js|safari"
     short_name: "3m"
   }
-  builders: {
+  builders {
     # migrating to dart2js-win-x64-chrome
     name: "buildbot/client.dart/dart2js-win7-chrome-1-4-be"
     category: "dart2js|chrome"
     short_name: "1w"
   }
-  builders: {
+  builders {
     # migrating to dart2js-win-x64-chrome
     name: "buildbot/client.dart/dart2js-win7-chrome-2-4-be"
     category: "dart2js|chrome"
     short_name: "2w"
   }
-  builders: {
+  builders {
     # migrating to dart2js-win-x64-chrome
     name: "buildbot/client.dart/dart2js-win7-chrome-3-4-be"
     category: "dart2js|chrome"
     short_name: "3w"
   }
-  builders: {
+  builders {
     # migrating to dart2js-win-x64-chrome
     name: "buildbot/client.dart/dart2js-win7-chrome-4-4-be"
     category: "dart2js|chrome"
     short_name: "4w"
   }
 # doesn't exist on buildbot, new builder
-#  builders: {
+#  builders {
 #    # migrating to dart2js-win-x64-edge
 #    name: "buildbot/client.dart/dart2js-win-x64-edge-be"
 #    category: "dart2js|ms"
 #    short_name: "ed"
 #  }
-  builders: {
+  builders {
     # migrating to dart2js-win-x64-ff
     name: "buildbot/client.dart/dart2js-win7-ie11ff-1-4-be"
     category: "dart2js|ff"
     short_name: "1w"
   }
-  builders: {
+  builders {
     # migrating to dart2js-win-x64-ff
     name: "buildbot/client.dart/dart2js-win7-ie11ff-2-4-be"
     category: "dart2js|ff"
     short_name: "2w"
   }
-  builders: {
+  builders {
     # migrating to dart2js-win-x64-ff
     name: "buildbot/client.dart/dart2js-win7-ie11ff-3-4-be"
     category: "dart2js|ff"
     short_name: "3w"
   }
-  builders: {
+  builders {
     # migrating to dart2js-win-x64-ff
     name: "buildbot/client.dart/dart2js-win7-ie11ff-4-4-be"
     category: "dart2js|ff"
     short_name: "4w"
   }
 # doesn't exist on buildbot, included in ie11ff builder
-#  builders: {
+#  builders {
 #    # migrating to dart2js-win-x64-ie11
 #    name: "buildbot/client.dart/dart2js-win-x64-ie11-be"
 #    category: "dart2js|ms"
 #    short_name: "ie"
 #  }
-  builders: {
+  builders {
     # migrating to pkg-linux-release
     name: "buildbot/client.dart/pkg-linux-release-be"
     category: "pkg"
     short_name: "l"
   }
-  builders: {
+  builders {
     # migrating to pkg-mac-release
     name: "buildbot/client.dart/pkg-mac10.11-release-be"
     category: "pkg"
     short_name: "m"
   }
-  builders: {
+  builders {
     # migrating to pkg-win-release
     name: "buildbot/client.dart/pkg-win7-release-be"
     category: "pkg"
     short_name: "w"
   }
-  builders: {
+  builders {
     # migrating to debianpackage-linux
     name: "buildbot/client.dart/debianpackage-linux-be"
     category: "misc"
     short_name: "dp"
   }
-  builders: {
+  builders {
     # migrating to versionchecker-linux
     name: "buildbot/client.dart/versionchecker-linux-be"
     category: "misc"
     short_name: "vc"
   }
-  builders: {
+  builders {
     # migrating to vm-linux-debug-ia32
     name: "buildbot/client.dart/vm-linux-debug-ia32-be"
     category: "vm|debug"
     short_name: "32"
   }
-  builders: {
+  builders {
     # migrating to vm-linux-debug-simarm
     name: "buildbot/client.dart/vm-linux-debug-simarm-be"
     category: "vm|simarm"
     short_name: "d"
   }
-  builders: {
+  builders {
     # migrating to vm-linux-debug-x64
     name: "buildbot/client.dart/vm-linux-debug-x64-be"
     category: "vm|debug"
     short_name: "64"
   }
-  builders: {
+  builders {
     # migrating to vm-linux-release-ia32
     name: "buildbot/client.dart/vm-linux-release-ia32-be"
     category: "vm|release"
     short_name: "32"
   }
-  builders: {
+  builders {
     # migrating to vm-linux-release-simarm
     name: "buildbot/client.dart/vm-linux-release-simarm-be"
     category: "vm|simarm"
     short_name: "r"
   }
-  builders: {
+  builders {
     # migrating to vm-linux-release-simarm64
     name: "buildbot/client.dart/vm-linux-release-simarm64-be"
     category: "vm|simarm"
     short_name: "r64"
   }
-  builders: {
+  builders {
     # migrating to vm-linux-release-x64
     name: "buildbot/client.dart/vm-linux-release-x64-be"
     category: "vm|release"
     short_name: "64"
   }
-  builders: {
+  builders {
     # migrating to vm-mac-debug-ia32
     name: "buildbot/client.dart/vm-mac-debug-ia32-be"
     category: "vm|debug"
     short_name: "m32"
   }
-  builders: {
+  builders {
     # migrating to vm-mac-debug-simdbc64
     name: "buildbot/client.dart/vm-mac-debug-simdbc64-be"
     category: "vm|debug"
     short_name: "msi"
   }
-  builders: {
+  builders {
     # migrating to vm-mac-debug-x64
     name: "buildbot/client.dart/vm-mac-debug-x64-be"
     category: "vm|debug"
     short_name: "m64"
   }
-  builders: {
+  builders {
     # migrating to vm-mac-release-ia32
     name: "buildbot/client.dart/vm-mac-release-ia32-be"
     category: "vm|release"
     short_name: "m32"
   }
-  builders: {
+  builders {
     # migrating to vm-mac-release-simdbc64
     name: "buildbot/client.dart/vm-mac-release-simdbc64-be"
     category: "vm|release"
     short_name: "msi"
   }
-  builders: {
+  builders {
     # migrating to vm-mac-release-x64
     name: "buildbot/client.dart/vm-mac-release-x64-be"
     category: "vm|release"
     short_name: "m64"
   }
-  builders: {
+  builders {
     # migrating to vm-win-debug-ia32
     name: "buildbot/client.dart/vm-win-debug-ia32-be"
     category: "vm|debug"
     short_name: "w32"
   }
-  builders: {
+  builders {
     # migrating to vm-win-debug-x64
     name: "buildbot/client.dart/vm-win-debug-x64-be"
     category: "vm|debug"
     short_name: "w64"
   }
-  builders: {
+  builders {
     # migrating to vm-win-release-ia32
     name: "buildbot/client.dart/vm-win-release-ia32-be"
     category: "vm|release"
     short_name: "w32"
   }
-  builders: {
+  builders {
     # migrating to vm-win-release-x64
     name: "buildbot/client.dart/vm-win-release-x64-be"
     category: "vm|release"
     short_name: "w64"
   }
-  builders: {
+  builders {
     # migrating to app-linux-debug-x64
     name: "buildbot/client.dart/app-linux-debug-x64-be"
     category: "vm|app"
     short_name: "d64"
   }
-  builders: {
+  builders {
     # migrating to app-linux-product-x64
     name: "buildbot/client.dart/app-linux-product-x64-be"
     category: "vm|app"
     short_name: "p64"
   }
-  builders: {
+  builders {
     # migrating to app-linux-release-x64
     name: "buildbot/client.dart/app-linux-release-x64-be"
     category: "vm|app"
     short_name: "r64"
   }
-  builders: {
+  builders {
     # migrating to vm-kernel-linux-debug-x64
     name: "buildbot/client.dart/vm-kernel-linux-debug-x64-be"
     category: "vm|kernel"
     short_name: "d"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64"
     category: "vm|kernel"
     short_name: "dbc"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
     short_name: "a32"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64"
     category: "vm|kernel"
     short_name: "a64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64"
     category: "vm|kernel"
     short_name: "rbc"
   }
-  builders: {
+  builders {
     # migrating to vm-kernel-linux-release-x64
     name: "buildbot/client.dart/vm-kernel-linux-release-x64-be"
     category: "vm|kernel"
     short_name: "r"
   }
-  builders: {
+  builders {
     # migrating to vm-kernel-mac-debug-x64
     name: "buildbot/client.dart/vm-kernel-mac-debug-x64-be"
     category: "vm|kernel"
     short_name: "md"
   }
-  builders: {
+  builders {
     # migrating to vm-kernel-mac-release-x64
     name: "buildbot/client.dart/vm-kernel-mac-release-x64-be"
     category: "vm|kernel"
@@ -1430,163 +1430,163 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
-  builders: {
+  builders {
     # migrating to cross-vm-linux-release-arm64
     name: "buildbot/client.dart/cross-arm64-vm-linux-release-be"
     category: "vm|misc"
     short_name: "cra"
   }
-  builders: {
+  builders {
     # migrating to target-vm-linux-release-arm64
     name: "buildbot/client.dart/target-arm64-vm-linux-release-be"
     category: "vm|misc"
     short_name: "tra"
   }
-  builders: {
+  builders {
     # migrating to vm-asan-linux-release-x64
     name: "buildbot/client.dart/vm-linux-release-x64-asan-be"
     category: "vm|misc"
     short_name: "a64"
   }
-  builders: {
+  builders {
     # migrating to vm-optcounter-threshold-linux-release-ia32
     name: "buildbot/client.dart/vm-linux-release-ia32-optcounter-threshold-be"
     category: "vm|misc"
     short_name: "o32"
   }
-  builders: {
+  builders {
     # migrating to vm-optcounter-threshold-linux-release-x64
     name: "buildbot/client.dart/vm-linux-release-x64-optcounter-threshold-be"
     category: "vm|misc"
     short_name: "o64"
   }
-  builders: {
+  builders {
     # migrating to vm-russian-win-debug-ia32
     name: "buildbot/client.dart/vm-win-debug-ia32-russian-be"
     category: "vm|misc"
     short_name: "ru"
   }
-  builders: {
+  builders {
     # migrating to precomp-linux-debug-x64
     name: "buildbot/client.dart/precomp-linux-debug-x64-1-3-be"
     category: "vm|precomp"
     short_name: "1d64"
   }
-  builders: {
+  builders {
     # migrating to precomp-linux-debug-x64
     name: "buildbot/client.dart/precomp-linux-debug-x64-2-3-be"
     category: "vm|precomp"
     short_name: "2d64"
   }
-  builders: {
+  builders {
     # migrating to precomp-linux-debug-x64
     name: "buildbot/client.dart/precomp-linux-debug-x64-3-3-be"
     category: "vm|precomp"
     short_name: "3d64"
   }
-  builders: {
+  builders {
     # migrating to precomp-linux-product-x64
     name: "buildbot/client.dart/precomp-linux-product-x64-be"
     category: "vm|precomp"
     short_name: "p64"
   }
-  builders: {
+  builders {
     # migrating to vm-noopt-mac-simarm64
     name: "buildbot/client.dart/vm-noopt-simarm64-mac-be"
     category: "vm|precomp"
     short_name: "no"
   }
-  builders: {
+  builders {
     # migrating to vm-precomp-android-release
     name: "buildbot/client.dart/vm-precomp-android-release-1-3-be"
     category: "vm|precomp"
     short_name: "1and"
   }
-  builders: {
+  builders {
     # migrating to vm-precomp-android-release
     name: "buildbot/client.dart/vm-precomp-android-release-2-3-be"
     category: "vm|precomp"
     short_name: "2and"
   }
-  builders: {
+  builders {
     # migrating to vm-precomp-android-release
     name: "buildbot/client.dart/vm-precomp-android-release-3-3-be"
     category: "vm|precomp"
     short_name: "3and"
   }
-  builders: {
+  builders {
     # migrating to vm-precomp-win-simarm64
     name: "buildbot/client.dart/vm-precomp-win-simarm64-1-4-be"
     category: "vm|precomp"
     short_name: "1wsi"
   }
-  builders: {
+  builders {
     # migrating to vm-precomp-win-simarm64
     name: "buildbot/client.dart/vm-precomp-win-simarm64-2-4-be"
     category: "vm|precomp"
     short_name: "2wsi"
   }
-  builders: {
+  builders {
     # migrating to vm-precomp-win-simarm64
     name: "buildbot/client.dart/vm-precomp-win-simarm64-3-4-be"
     category: "vm|precomp"
     short_name: "3wsi"
   }
-  builders: {
+  builders {
     # migrating to vm-precomp-win-simarm64
     name: "buildbot/client.dart/vm-precomp-win-simarm64-4-4-be"
     category: "vm|precomp"
     short_name: "4wsi"
   }
-  builders: {
+  builders {
     # migrating to vm-linux-product-x64
     name: "buildbot/client.dart/vm-linux-product-x64-be"
     category: "vm|product"
     short_name: "64"
   }
-  builders: {
+  builders {
     # migrating to vm-mac-product-x64
     name: "buildbot/client.dart/vm-mac-product-x64-be"
     category: "vm|product"
     short_name: "m64"
   }
-  builders: {
+  builders {
     # migrating to vm-win-product-x64
     name: "buildbot/client.dart/vm-win-product-x64-be"
     category: "vm|product"
     short_name: "w64"
   }
-  builders: {
+  builders {
     # migrating to vm-reload-linux-debug-x64
     name: "buildbot/client.dart/vm-linux-debug-x64-reload-be"
     category: "vm|reload"
     short_name: "d"
   }
-  builders: {
+  builders {
     # migrating to vm-reload-linux-release-x64
     name: "buildbot/client.dart/vm-linux-release-x64-reload-be"
     category: "vm|reload"
     short_name: "r"
   }
-  builders: {
+  builders {
     # migrating to vm-reload-mac-debug-simdbc64
     name: "buildbot/client.dart/vm-mac-debug-simdbc64-reload-be"
     category: "vm|reload"
     short_name: "mds"
   }
-  builders: {
+  builders {
     # migrating to vm-reload-mac-release-simdbc64
     name: "buildbot/client.dart/vm-mac-release-simdbc64-reload-be"
     category: "vm|reload"
     short_name: "mrs"
   }
-  builders: {
+  builders {
     # migrating to vm-reload-rollback-linux-debug-x64
     name: "buildbot/client.dart/vm-linux-debug-x64-reload-rollback-be"
     category: "vm|reload"
     short_name: "dro"
   }
-  builders: {
+  builders {
     # migrating to vm-reload-rollback-linux-release-x64
     name: "buildbot/client.dart/vm-linux-release-x64-reload-rollback-be"
     category: "vm|reload"
@@ -1626,142 +1626,142 @@ consoles: {
   repo_url: "https://dart.googlesource.com/sdk/"
   ref: "refs/heads/master"
   manifest_name: "REVISION"
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
     category: "vm|debug"
     short_name: "32"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm"
     category: "vm|simarm"
     short_name: "d"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-linux-debug-x64"
     category: "vm|debug"
     short_name: "64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-linux-release-ia32"
     category: "vm|release"
     short_name: "32"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-linux-release-simarm"
     category: "vm|simarm"
     short_name: "r"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64"
     category: "vm|simarm"
     short_name: "r64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-linux-release-x64"
     category: "vm|release"
     short_name: "64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32"
     category: "vm|debug"
     short_name: "m32"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64"
     category: "vm|debug"
     short_name: "msi"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-mac-debug-x64"
     category: "vm|debug"
     short_name: "m64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-mac-release-ia32"
     category: "vm|release"
     short_name: "m32"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64"
     category: "vm|release"
     short_name: "msi"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-mac-release-x64"
     category: "vm|release"
     short_name: "m64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-win-debug-ia32"
     category: "vm|debug"
     short_name: "w32"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-win-debug-x64"
     category: "vm|debug"
     short_name: "w64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-win-release-ia32"
     category: "vm|release"
     short_name: "w32"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-win-release-x64"
     category: "vm|release"
     short_name: "w64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/app-linux-debug-x64"
     category: "vm|app"
     short_name: "d64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/app-linux-product-x64"
     category: "vm|app"
     short_name: "p64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/app-linux-release-x64"
     category: "vm|app"
     short_name: "r64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64"
     category: "vm|kernel"
     short_name: "d"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64"
     category: "vm|kernel"
     short_name: "dbc"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
     short_name: "a32"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64"
     category: "vm|kernel"
     short_name: "a64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64"
     category: "vm|kernel"
     short_name: "rbc"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64"
     category: "vm|kernel"
     short_name: "r"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64"
     category: "vm|kernel"
     short_name: "md"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64"
     category: "vm|kernel"
     short_name: "mr"
@@ -1801,267 +1801,267 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
     category: "vm|misc"
     short_name: "cra"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64"
     category: "vm|misc"
     short_name: "tra"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64"
     category: "vm|misc"
     short_name: "a64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32"
     category: "vm|misc"
     short_name: "o32"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64"
     category: "vm|misc"
     short_name: "o64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-russian-win-debug-ia32"
     category: "vm|misc"
     short_name: "ru"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64"
     category: "vm|precomp"
     short_name: "d64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/precomp-linux-product-x64"
     category: "vm|precomp"
     short_name: "p64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64"
     category: "vm|precomp"
     short_name: "no"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-precomp-android-release"
     category: "vm|precomp"
     short_name: "and"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64"
     category: "vm|precomp"
     short_name: "wsi"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-linux-product-x64"
     category: "vm|product"
     short_name: "64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-mac-product-x64"
     category: "vm|product"
     short_name: "m64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-win-product-x64"
     category: "vm|product"
     short_name: "w64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64"
     category: "vm|reload"
     short_name: "d"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64"
     category: "vm|reload"
     short_name: "r"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64"
     category: "vm|reload"
     short_name: "mds"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64"
     category: "vm|reload"
     short_name: "mrs"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64"
     category: "vm|reload"
     short_name: "dro"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64"
     category: "vm|reload"
     short_name: "rro"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8"
     category: "dart2js|d8"
     short_name: "hc"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-minified-linux-x64-d8"
     category: "dart2js|d8"
     short_name: "mi"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none"
     category: "dart2js|misc"
     short_name: "ut"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-dumpinfo-linux-ia32-none"
     category: "dart2js|misc"
     short_name: "dp"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-linux-x64-jsshell"
     category: "dart2js|misc"
     short_name: "jsh"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
     category: "analyzer"
     short_name: "aas"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/analyzer-linux-release"
     category: "analyzer"
     short_name: "r"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/analyzer-mac-release"
     category: "analyzer"
     short_name: "mr"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
     category: "analyzer"
     short_name: "sr"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
     category: "analyzer"
     short_name: "smr"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
     category: "analyzer"
     short_name: "swr"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/analyzer-win-release"
     category: "analyzer"
     short_name: "awr"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-linux"
     category: "sdk"
     short_name: "l"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-mac"
     category: "sdk"
     short_name: "m"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-win"
     category: "sdk"
     short_name: "w"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff"
     category: "dart2js|ff"
     short_name: "l"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-drt"
     category: "dart2js|chrome"
     short_name: "csp"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-linux-x64-drt"
     category: "dart2js|chrome"
     short_name: "drt"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-mac-x64-safari"
     category: "dart2js|safari"
     short_name: "m"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-win-x64-edge"
     category: "dart2js|ms"
     short_name: "ed"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-win-x64-ff"
     category: "dart2js|ff"
     short_name: "w"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-win-x64-ie11"
     category: "dart2js|ms"
     short_name: "ie"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/pkg-linux-release"
     category: "pkg"
     short_name: "l"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/pkg-mac-release"
     category: "pkg"
     short_name: "m"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/pkg-win-release"
     category: "pkg"
     short_name: "w"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/debianpackage-linux"
     category: "misc"
     short_name: "dp"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/versionchecker-linux"
     category: "misc"
     short_name: "vc"
@@ -2100,142 +2100,142 @@ consoles: {
   repo_url: "https://dart.googlesource.com/sdk"
   ref: "refs/heads/dev"
   manifest_name: "REVISION"
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
     category: "vm|debug"
     short_name: "32"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm"
     category: "vm|simarm"
     short_name: "d"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-linux-debug-x64"
     category: "vm|debug"
     short_name: "64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-linux-release-ia32"
     category: "vm|release"
     short_name: "32"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-linux-release-simarm"
     category: "vm|simarm"
     short_name: "r"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64"
     category: "vm|simarm"
     short_name: "r64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-linux-release-x64"
     category: "vm|release"
     short_name: "64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32"
     category: "vm|debug"
     short_name: "m32"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64"
     category: "vm|debug"
     short_name: "msi"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-mac-debug-x64"
     category: "vm|debug"
     short_name: "m64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-mac-release-ia32"
     category: "vm|release"
     short_name: "m32"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64"
     category: "vm|release"
     short_name: "msi"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-mac-release-x64"
     category: "vm|release"
     short_name: "m64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-win-debug-ia32"
     category: "vm|debug"
     short_name: "w32"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-win-debug-x64"
     category: "vm|debug"
     short_name: "w64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-win-release-ia32"
     category: "vm|release"
     short_name: "w32"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-win-release-x64"
     category: "vm|release"
     short_name: "w64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/app-linux-debug-x64"
     category: "vm|app"
     short_name: "d64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/app-linux-product-x64"
     category: "vm|app"
     short_name: "p64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/app-linux-release-x64"
     category: "vm|app"
     short_name: "r64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64"
     category: "vm|kernel"
     short_name: "d"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64"
     category: "vm|kernel"
     short_name: "dbc"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
     short_name: "a32"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64"
     category: "vm|kernel"
     short_name: "a64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64"
     category: "vm|kernel"
     short_name: "rbc"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64"
     category: "vm|kernel"
     short_name: "r"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64"
     category: "vm|kernel"
     short_name: "md"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64"
     category: "vm|kernel"
     short_name: "mr"
@@ -2275,267 +2275,267 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
     category: "vm|misc"
     short_name: "cra"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64"
     category: "vm|misc"
     short_name: "tra"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64"
     category: "vm|misc"
     short_name: "a64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32"
     category: "vm|misc"
     short_name: "o32"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64"
     category: "vm|misc"
     short_name: "o64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-russian-win-debug-ia32"
     category: "vm|misc"
     short_name: "ru"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64"
     category: "vm|precomp"
     short_name: "d64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/precomp-linux-product-x64"
     category: "vm|precomp"
     short_name: "p64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64"
     category: "vm|precomp"
     short_name: "no"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-precomp-android-release"
     category: "vm|precomp"
     short_name: "and"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64"
     category: "vm|precomp"
     short_name: "wsi"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-linux-product-x64"
     category: "vm|product"
     short_name: "64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-mac-product-x64"
     category: "vm|product"
     short_name: "m64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-win-product-x64"
     category: "vm|product"
     short_name: "w64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64"
     category: "vm|reload"
     short_name: "d"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64"
     category: "vm|reload"
     short_name: "r"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64"
     category: "vm|reload"
     short_name: "mds"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64"
     category: "vm|reload"
     short_name: "mrs"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64"
     category: "vm|reload"
     short_name: "dro"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64"
     category: "vm|reload"
     short_name: "rro"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8"
     category: "dart2js|d8"
     short_name: "hc"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-minified-linux-x64-d8"
     category: "dart2js|d8"
     short_name: "mi"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none"
     category: "dart2js|misc"
     short_name: "ut"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-dumpinfo-linux-ia32-none"
     category: "dart2js|misc"
     short_name: "dp"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-linux-x64-jsshell"
     category: "dart2js|misc"
     short_name: "jsh"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
     category: "analyzer"
     short_name: "aas"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/analyzer-linux-release"
     category: "analyzer"
     short_name: "r"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/analyzer-mac-release"
     category: "analyzer"
     short_name: "mr"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
     category: "analyzer"
     short_name: "sr"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
     category: "analyzer"
     short_name: "smr"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
     category: "analyzer"
     short_name: "swr"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/analyzer-win-release"
     category: "analyzer"
     short_name: "awr"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-linux"
     category: "sdk"
     short_name: "l"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-mac"
     category: "sdk"
     short_name: "m"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-win"
     category: "sdk"
     short_name: "w"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff"
     category: "dart2js|ff"
     short_name: "l"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-drt"
     category: "dart2js|chrome"
     short_name: "csp"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-linux-x64-drt"
     category: "dart2js|chrome"
     short_name: "drt"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-mac-x64-safari"
     category: "dart2js|safari"
     short_name: "m"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-win-x64-edge"
     category: "dart2js|ms"
     short_name: "ed"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-win-x64-ff"
     category: "dart2js|ff"
     short_name: "w"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-win-x64-ie11"
     category: "dart2js|ms"
     short_name: "ie"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/pkg-linux-release"
     category: "pkg"
     short_name: "l"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/pkg-mac-release"
     category: "pkg"
     short_name: "m"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/pkg-win-release"
     category: "pkg"
     short_name: "w"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/debianpackage-linux"
     category: "misc"
     short_name: "dp"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/versionchecker-linux"
     category: "misc"
     short_name: "vc"
@@ -2574,142 +2574,142 @@ consoles: {
   repo_url: "https://dart.googlesource.com/sdk"
   ref: "refs/heads/stable"
   manifest_name: "REVISION"
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
     category: "vm|debug"
     short_name: "32"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm"
     category: "vm|simarm"
     short_name: "d"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-linux-debug-x64"
     category: "vm|debug"
     short_name: "64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-linux-release-ia32"
     category: "vm|release"
     short_name: "32"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-linux-release-simarm"
     category: "vm|simarm"
     short_name: "r"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64"
     category: "vm|simarm"
     short_name: "r64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-linux-release-x64"
     category: "vm|release"
     short_name: "64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32"
     category: "vm|debug"
     short_name: "m32"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64"
     category: "vm|debug"
     short_name: "msi"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-mac-debug-x64"
     category: "vm|debug"
     short_name: "m64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-mac-release-ia32"
     category: "vm|release"
     short_name: "m32"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64"
     category: "vm|release"
     short_name: "msi"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-mac-release-x64"
     category: "vm|release"
     short_name: "m64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-win-debug-ia32"
     category: "vm|debug"
     short_name: "w32"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-win-debug-x64"
     category: "vm|debug"
     short_name: "w64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-win-release-ia32"
     category: "vm|release"
     short_name: "w32"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-win-release-x64"
     category: "vm|release"
     short_name: "w64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/app-linux-debug-x64"
     category: "vm|app"
     short_name: "d64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/app-linux-product-x64"
     category: "vm|app"
     short_name: "p64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/app-linux-release-x64"
     category: "vm|app"
     short_name: "r64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64"
     category: "vm|kernel"
     short_name: "d"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64"
     category: "vm|kernel"
     short_name: "dbc"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
     short_name: "a32"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64"
     category: "vm|kernel"
     short_name: "a64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64"
     category: "vm|kernel"
     short_name: "rbc"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64"
     category: "vm|kernel"
     short_name: "r"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64"
     category: "vm|kernel"
     short_name: "md"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64"
     category: "vm|kernel"
     short_name: "mr"
@@ -2749,267 +2749,267 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
     category: "vm|misc"
     short_name: "cra"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64"
     category: "vm|misc"
     short_name: "tra"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64"
     category: "vm|misc"
     short_name: "a64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32"
     category: "vm|misc"
     short_name: "o32"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64"
     category: "vm|misc"
     short_name: "o64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-russian-win-debug-ia32"
     category: "vm|misc"
     short_name: "ru"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64"
     category: "vm|precomp"
     short_name: "d64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/precomp-linux-product-x64"
     category: "vm|precomp"
     short_name: "p64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64"
     category: "vm|precomp"
     short_name: "no"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-precomp-android-release"
     category: "vm|precomp"
     short_name: "and"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64"
     category: "vm|precomp"
     short_name: "wsi"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-linux-product-x64"
     category: "vm|product"
     short_name: "64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-mac-product-x64"
     category: "vm|product"
     short_name: "m64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-win-product-x64"
     category: "vm|product"
     short_name: "w64"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64"
     category: "vm|reload"
     short_name: "d"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64"
     category: "vm|reload"
     short_name: "r"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64"
     category: "vm|reload"
     short_name: "mds"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64"
     category: "vm|reload"
     short_name: "mrs"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64"
     category: "vm|reload"
     short_name: "dro"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64"
     category: "vm|reload"
     short_name: "rro"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8"
     category: "dart2js|d8"
     short_name: "hc"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-minified-linux-x64-d8"
     category: "dart2js|d8"
     short_name: "mi"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none"
     category: "dart2js|misc"
     short_name: "ut"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-dumpinfo-linux-ia32-none"
     category: "dart2js|misc"
     short_name: "dp"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-linux-x64-jsshell"
     category: "dart2js|misc"
     short_name: "jsh"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
     category: "analyzer"
     short_name: "aas"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/analyzer-linux-release"
     category: "analyzer"
     short_name: "r"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/analyzer-mac-release"
     category: "analyzer"
     short_name: "mr"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
     category: "analyzer"
     short_name: "sr"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
     category: "analyzer"
     short_name: "smr"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
     category: "analyzer"
     short_name: "swr"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/analyzer-win-release"
     category: "analyzer"
     short_name: "awr"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-linux"
     category: "sdk"
     short_name: "l"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-mac"
     category: "sdk"
     short_name: "m"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-win"
     category: "sdk"
     short_name: "w"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff"
     category: "dart2js|ff"
     short_name: "l"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-drt"
     category: "dart2js|chrome"
     short_name: "csp"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-linux-x64-drt"
     category: "dart2js|chrome"
     short_name: "drt"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-mac-x64-safari"
     category: "dart2js|safari"
     short_name: "m"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-win-x64-edge"
     category: "dart2js|ms"
     short_name: "ed"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-win-x64-ff"
     category: "dart2js|ff"
     short_name: "w"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/dart2js-win-x64-ie11"
     category: "dart2js|ms"
     short_name: "ie"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/pkg-linux-release"
     category: "pkg"
     short_name: "l"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/pkg-mac-release"
     category: "pkg"
     short_name: "m"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/pkg-win-release"
     category: "pkg"
     short_name: "w"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/debianpackage-linux"
     category: "misc"
     short_name: "dp"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/versionchecker-linux"
     category: "misc"
     short_name: "vc"
@@ -3068,12 +3068,12 @@ consoles: {
     category: "dart2js"
     short_name: "sim"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/pub-linux-release"
     category: "pub"
     short_name: "l"
   }
-  builders: {
+  builders {
     name: "buildbucket/luci.dart.ci/pub-mac-release"
     category: "pub"
     short_name: "m"

From d24af8880bceaa6c8d6e5b42c4375865bb9ad4a0 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 7 Feb 2018 08:32:08 +0000
Subject: [PATCH 073/826] [infra] Enable vm-kernel-precomp builders on
 simarm/windows

Change-Id: I84a6de36fe104016b7c49cfd335dca21b78b3187
Reviewed-on: https://dart-review.googlesource.com/39522
Reviewed-by: Vyacheslav Egorov <vegorov@google.com>
---
 luci-scheduler.cfg | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 95ce0f348f5f..5742421053a5 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -141,7 +141,6 @@ job {
   id: "vm-kernel-precomp-linux-release-simarm"
   acl_sets: "default"
   schedule: "triggered"
-  disabled: true,
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
@@ -153,7 +152,6 @@ job {
   id: "vm-kernel-precomp-linux-release-simarm64"
   acl_sets: "default"
   schedule: "triggered"
-  disabled: true,
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
@@ -165,7 +163,6 @@ job {
   id: "vm-kernel-precomp-win-release-x64"
   acl_sets: "default"
   schedule: "triggered"
-  disabled: true,
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"

From 1cfa1a70000e780f1a8eeda0142f277e80363f60 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 7 Feb 2018 09:33:32 +0000
Subject: [PATCH 074/826] Revert "[infra] Enable vm-kernel-precomp builders on
 simarm/windows"

This reverts commit d24af8880bceaa6c8d6e5b42c4375865bb9ad4a0.

Reason for revert: incomplete sharding configuration in the test matrix.

Original change's description:
> [infra] Enable vm-kernel-precomp builders on simarm/windows
>
> Change-Id: I84a6de36fe104016b7c49cfd335dca21b78b3187
> Reviewed-on: https://dart-review.googlesource.com/39522
> Reviewed-by: Vyacheslav Egorov <vegorov@google.com>

TBR=whesse@google.com,vegorov@google.com,athom@google.com

Change-Id: Iec9b9c8725b73d9f2b0f5f4bcb8b6315f0fbd14c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/39523
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 luci-scheduler.cfg | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 5742421053a5..95ce0f348f5f 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -141,6 +141,7 @@ job {
   id: "vm-kernel-precomp-linux-release-simarm"
   acl_sets: "default"
   schedule: "triggered"
+  disabled: true,
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
@@ -152,6 +153,7 @@ job {
   id: "vm-kernel-precomp-linux-release-simarm64"
   acl_sets: "default"
   schedule: "triggered"
+  disabled: true,
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
@@ -163,6 +165,7 @@ job {
   id: "vm-kernel-precomp-win-release-x64"
   acl_sets: "default"
   schedule: "triggered"
+  disabled: true,
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"

From a7f790d64ba90a83ac20f38cadbc638fff83b32b Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 7 Feb 2018 14:39:54 +0000
Subject: [PATCH 075/826] Reland "[infra] Enable vm-kernel-precomp builders on
 simarm/windows"

This is a reland of d24af8880bceaa6c8d6e5b42c4375865bb9ad4a0.

Original change's description:
> [infra] Enable vm-kernel-precomp builders on simarm/windows
>
> Change-Id: I84a6de36fe104016b7c49cfd335dca21b78b3187
> Reviewed-on: https://dart-review.googlesource.com/39522
> Reviewed-by: Vyacheslav Egorov <vegorov@google.com>

Change-Id: I9a951ea05d43e239f4bc05538661492e97b0d4f6
Reviewed-on: https://dart-review.googlesource.com/39720
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-scheduler.cfg | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 95ce0f348f5f..5742421053a5 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -141,7 +141,6 @@ job {
   id: "vm-kernel-precomp-linux-release-simarm"
   acl_sets: "default"
   schedule: "triggered"
-  disabled: true,
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
@@ -153,7 +152,6 @@ job {
   id: "vm-kernel-precomp-linux-release-simarm64"
   acl_sets: "default"
   schedule: "triggered"
-  disabled: true,
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
@@ -165,7 +163,6 @@ job {
   id: "vm-kernel-precomp-win-release-x64"
   acl_sets: "default"
   schedule: "triggered"
-  disabled: true,
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"

From a87206348e8e0288202b3fdc25f3e5cc67d8942c Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 7 Feb 2018 14:41:46 +0000
Subject: [PATCH 076/826] [infra] Switch VM debug and release builders to use
 the test matrix

Change-Id: I0802f2f0cf368bea2293aa46b2f3a810f599747d
Reviewed-on: https://dart-review.googlesource.com/39621
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 4e5bb51bd5c5..4ce10734d5fd 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -221,25 +221,43 @@ buckets {
     }
     builders {
       name: "vm-linux-release-x64-try"
+      recipe {
+        name: "dart/neo"
+      }
     }
     builders {
       name: "vm-linux-debug-x64-try"
+      recipe {
+        name: "dart/neo"
+      }
     }
     builders {
       name: "vm-mac-release-x64-try"
       dimensions: "os:Mac"
+      recipe {
+        name: "dart/neo"
+      }
     }
     builders {
       name: "vm-mac-debug-x64-try"
       dimensions: "os:Mac"
+      recipe {
+        name: "dart/neo"
+      }
     }
     builders {
       name: "vm-win-release-x64-try"
       dimensions: "os:Windows"
+      recipe {
+        name: "dart/neo"
+      }
     }
     builders {
       name: "vm-win-debug-x64-try"
       dimensions: "os:Windows"
+      recipe {
+        name: "dart/neo"
+      }
     }
     builders {
       name: "precomp-linux-release-x64-try"

From 6de42166976d35b6877697a25ed002e466c9dba4 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 7 Feb 2018 16:16:54 +0000
Subject: [PATCH 077/826] [infra] Disable vm-kernel windows builders
 temporarily

TBR=whesse@google.com

Change-Id: I923c041d94b4905717824dd5dd17159168bbaeb2
Reviewed-on: https://dart-review.googlesource.com/39761
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-scheduler.cfg | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 5742421053a5..370bf1df613f 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -41,7 +41,7 @@ job {
   id: "dart-sdk-linux"
   acl_sets: "default"
   schedule: "triggered"
-  disabled: true,
+  disabled: true
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
@@ -130,6 +130,7 @@ job {
   id: "vm-kernel-win-release-x64"
   acl_sets: "default"
   schedule: "triggered"
+  disabled: true
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
@@ -163,6 +164,7 @@ job {
   id: "vm-kernel-precomp-win-release-x64"
   acl_sets: "default"
   schedule: "triggered"
+  disabled: true
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"

From b69fd5db3e44c37f11b0101aa7c42e5bd991ac8f Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 7 Feb 2018 17:34:30 +0000
Subject: [PATCH 078/826] [infra] Re-enable VM Kernel Windows builder

Change-Id: I32330298f683d59b01345a4f9ac8efd4bc6d10d7
Reviewed-on: https://dart-review.googlesource.com/39763
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-scheduler.cfg | 1 -
 1 file changed, 1 deletion(-)

diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 370bf1df613f..e929bcb500d0 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -130,7 +130,6 @@ job {
   id: "vm-kernel-win-release-x64"
   acl_sets: "default"
   schedule: "triggered"
-  disabled: true
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"

From 1cb69ebe75975b6c4d37b41d596587b1aa995826 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Fri, 9 Feb 2018 14:51:09 +0000
Subject: [PATCH 079/826] Remove drt, russian, and safarimobilesim builders
 from luci/milo

This is a follow-up to the CL
https://chromium-review.googlesource.com/c/chromium/tools/build/+/904163
which removed these builders from legacy buildbot.

Change-Id: I90586d6c0eca25b33a13237702dbaa6a53556b96
Reviewed-on: https://dart-review.googlesource.com/40283
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 luci-milo.cfg | 85 +++++----------------------------------------------
 1 file changed, 7 insertions(+), 78 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index efd85d79946a..dd0852388f66 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -309,12 +309,6 @@ consoles: {
     category: "vm|misc"
     short_name: "o64"
   }
-  builders {
-    # migrating to vm-russian-win-debug-ia32
-    name: "buildbot/client.dart/vm-win-debug-ia32-russian-be"
-    category: "vm|misc"
-    short_name: "ru"
-  }
   builders {
     # migrating to precomp-linux-debug-x64
     name: "buildbot/client.dart/precomp-linux-debug-x64-1-3-be"
@@ -649,23 +643,11 @@ consoles: {
 #    short_name: "l"
 #  }
   builders {
-    # migrating to dart2js-csp-minified-linux-x64-drt
-    name: "buildbot/client.dart/dart2js-linux-drt-csp-minified-be"
+    # migrating to dart2js-csp-minified-linux-x64-chrome
+    name: "buildbot/client.dart/dart2js-linux-chrome-csp-minified-be"
     category: "dart2js|chrome"
     short_name: "csp"
   }
-  builders {
-    # migrating to dart2js-linux-x64-drt
-    name: "buildbot/client.dart/dart2js-linux-drt-1-2-be"
-    category: "dart2js|chrome"
-    short_name: "1drt"
-  }
-  builders {
-    # migrating to dart2js-linux-x64-drt
-    name: "buildbot/client.dart/dart2js-linux-drt-2-2-be"
-    category: "dart2js|chrome"
-    short_name: "2drt"
-  }
   builders {
     # migrating to dart2js-mac-x64-chrome
     name: "buildbot/client.dart/dart2js-mac10.11-chrome-be"
@@ -1024,23 +1006,11 @@ consoles: {
 #    short_name: "l"
 #  }
   builders {
-    # migrating to dart2js-csp-minified-linux-x64-drt
-    name: "buildbot/client.dart/dart2js-linux-drt-csp-minified-be"
+    # migrating to dart2js-csp-minified-linux-x64-chrome
+    name: "buildbot/client.dart/dart2js-linux-chrome-csp-minified-be"
     category: "dart2js|chrome"
     short_name: "csp"
   }
-  builders {
-    # migrating to dart2js-linux-x64-drt
-    name: "buildbot/client.dart/dart2js-linux-drt-1-2-be"
-    category: "dart2js|chrome"
-    short_name: "1drt"
-  }
-  builders {
-    # migrating to dart2js-linux-x64-drt
-    name: "buildbot/client.dart/dart2js-linux-drt-2-2-be"
-    category: "dart2js|chrome"
-    short_name: "2drt"
-  }
   builders {
     # migrating to dart2js-mac-x64-chrome
     name: "buildbot/client.dart/dart2js-mac10.11-chrome-be"
@@ -1460,12 +1430,6 @@ consoles: {
     category: "vm|misc"
     short_name: "o64"
   }
-  builders {
-    # migrating to vm-russian-win-debug-ia32
-    name: "buildbot/client.dart/vm-win-debug-ia32-russian-be"
-    category: "vm|misc"
-    short_name: "ru"
-  }
   builders {
     # migrating to precomp-linux-debug-x64
     name: "buildbot/client.dart/precomp-linux-debug-x64-1-3-be"
@@ -1826,11 +1790,6 @@ consoles: {
     category: "vm|misc"
     short_name: "o64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/vm-russian-win-debug-ia32"
-    category: "vm|misc"
-    short_name: "ru"
-  }
   builders {
     name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64"
     category: "vm|precomp"
@@ -2002,15 +1961,10 @@ consoles: {
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-drt"
+    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "csp"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-drt"
-    category: "dart2js|chrome"
-    short_name: "drt"
-  }
   builders {
     name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
     category: "dart2js|chrome"
@@ -2300,11 +2254,6 @@ consoles: {
     category: "vm|misc"
     short_name: "o64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/vm-russian-win-debug-ia32"
-    category: "vm|misc"
-    short_name: "ru"
-  }
   builders {
     name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64"
     category: "vm|precomp"
@@ -2476,15 +2425,10 @@ consoles: {
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-drt"
+    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "csp"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-drt"
-    category: "dart2js|chrome"
-    short_name: "drt"
-  }
   builders {
     name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
     category: "dart2js|chrome"
@@ -2774,11 +2718,6 @@ consoles: {
     category: "vm|misc"
     short_name: "o64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/vm-russian-win-debug-ia32"
-    category: "vm|misc"
-    short_name: "ru"
-  }
   builders {
     name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64"
     category: "vm|precomp"
@@ -2950,15 +2889,10 @@ consoles: {
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-drt"
+    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "csp"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-drt"
-    category: "dart2js|chrome"
-    short_name: "drt"
-  }
   builders {
     name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
     category: "dart2js|chrome"
@@ -3063,11 +2997,6 @@ consoles: {
     category: "dart2js"
     short_name: "d"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-safarimobilesim"
-    category: "dart2js"
-    short_name: "sim"
-  }
   builders {
     name: "buildbucket/luci.dart.ci/pub-linux-release"
     category: "pub"

From 0330e0f9113b8c98f6c9ead1c76eeb978c263fab Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 16 Feb 2018 11:17:08 +0000
Subject: [PATCH 080/826] [infra] Re-activate vm-kernel-precomp-win-release
 builder

TBR=whesse@google.com

Change-Id: Ib4cd9eea8053c67b0187378150c2c370f91c0356
Reviewed-on: https://dart-review.googlesource.com/41982
Reviewed-by: William Hesse <whesse@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-scheduler.cfg | 1 -
 1 file changed, 1 deletion(-)

diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index e929bcb500d0..7f682f648f46 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -163,7 +163,6 @@ job {
   id: "vm-kernel-precomp-win-release-x64"
   acl_sets: "default"
   schedule: "triggered"
-  disabled: true
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"

From c048d183959aca2f70cdf48282660aba8c8ef2e9 Mon Sep 17 00:00:00 2001
From: Stephen Martinis <martiniss@google.com>
Date: Fri, 16 Feb 2018 18:04:21 +0000
Subject: [PATCH 081/826] Revert "[infra] Re-activate
 vm-kernel-precomp-win-release builder"

This reverts commit 0330e0f9113b8c98f6c9ead1c76eeb978c263fab.

Reason for revert: Speculative revert, see https://crbug.com/813114

Original change's description:
> [infra] Re-activate vm-kernel-precomp-win-release builder
>
> TBR=whesse@google.com
>
> Change-Id: Ib4cd9eea8053c67b0187378150c2c370f91c0356
> Reviewed-on: https://dart-review.googlesource.com/41982
> Reviewed-by: William Hesse <whesse@google.com>
> Reviewed-by: Alexander Thomas <athom@google.com>

TBR=whesse@google.com,athom@google.com

Change-Id: I9382d9e5c27121294dbd390baca0df54fbf66020
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/42040
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-scheduler.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 7f682f648f46..e929bcb500d0 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -163,6 +163,7 @@ job {
   id: "vm-kernel-precomp-win-release-x64"
   acl_sets: "default"
   schedule: "triggered"
+  disabled: true
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"

From 4d3d1e1864418a0332fabeb3a3da3a6bd5d21f43 Mon Sep 17 00:00:00 2001
From: Sigmund Cherem <sigmund@google.com>
Date: Fri, 16 Feb 2018 18:32:18 +0000
Subject: [PATCH 082/826] Add kernel-minified config to cr-buildbucket.cfg

R=athom@google.com,whesse@google.com

Change-Id: Ibf228b73b3a5e04350f467d1ac363551860e5a75
Reviewed-on: https://dart-review.googlesource.com/41906
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Sigmund Cherem <sigmund@google.com>
---
 cr-buildbucket.cfg | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 4ce10734d5fd..cf6512bf48ef 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -330,6 +330,13 @@ buckets {
         name: "dart/dart2js_swarming"
       }
     }
+    builders {
+      name: "dart2js-linux-d8-kernel-minified-try"
+      recipe {
+        name: "dart/dart2js_swarming"
+        properties_j: "shards:6"
+      }
+    }
     builders {
       name: "dart2js-win10-ie11-try"
       dimensions: "os:Windows-10"

From ed8927c451d231c1a22610684bf416eab99ef2de Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 16 Feb 2018 19:36:58 +0000
Subject: [PATCH 083/826] Reland "[infra] Re-activate
 vm-kernel-precomp-win-release builder"

This is a reland of 0330e0f9113b8c98f6c9ead1c76eeb978c263fab.

LUCI Scheduler should be able to handle it now, see
https://crbug.com/813114#c6.

Original change's description:
> [infra] Re-activate vm-kernel-precomp-win-release builder
>
> TBR=whesse@google.com
>
> Change-Id: Ib4cd9eea8053c67b0187378150c2c370f91c0356
> Reviewed-on: https://dart-review.googlesource.com/41982
> Reviewed-by: William Hesse <whesse@google.com>
> Reviewed-by: Alexander Thomas <athom@google.com>

Change-Id: Ic7d60307c05672c700ac92e89e87a5b4bf72fd5c
Reviewed-on: https://dart-review.googlesource.com/42080
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-scheduler.cfg | 1 -
 1 file changed, 1 deletion(-)

diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index e929bcb500d0..7f682f648f46 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -163,7 +163,6 @@ job {
   id: "vm-kernel-precomp-win-release-x64"
   acl_sets: "default"
   schedule: "triggered"
-  disabled: true
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"

From 0d655ac92a80b47c7f53ecc7ed083dcf79671578 Mon Sep 17 00:00:00 2001
From: Vadim Shtayura <vadimsh@google.com>
Date: Thu, 1 Mar 2018 04:18:42 +0000
Subject: [PATCH 084/826] Explicitly specify that Swarming based git and gsutil
 auth are not used.

Soon they will be used by default, and this will likely break these builders,
since they are not using the service account for git and gsutil currently.

R=athom@google.com, whesse@google.com, tandrii@google.com
BUG=776035

Change-Id: Ie9ada348c1b7ff3e54bde74b35809e5996cd18ab
Reviewed-on: https://dart-review.googlesource.com/44404
Reviewed-by: Andrii Shyshkalov <tandrii@google.com>
---
 cr-buildbucket.cfg | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index cf6512bf48ef..1166f2e7859d 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -83,6 +83,9 @@ buckets {
         repository: "https://chromium.googlesource.com/chromium/tools/build.git"
         properties: "mastername:client.dart"
         name: "dart/neo"
+        # TODO(vadimsh): make sure the service account has all necessary Git and
+        # GS permissions and remove this line, see https://crbug.com/776035
+        properties_j: "$kitchen:{\"git_auth\": false, \"devshell\": false}"
       }
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     }
@@ -205,6 +208,9 @@ buckets {
         repository: "https://chromium.googlesource.com/chromium/tools/build.git"
         properties: "mastername:dart.try"
         name: "dart/dart_vm"
+        # TODO(vadimsh): setup a service account and remove this line,
+        # see https://crbug.com/776035
+        properties_j: "$kitchen:{\"git_auth\": false, \"devshell\": false}"
       }
     }
     builders {

From e9bedc8e57c7786db1fb7c4fec2c0a513cb80eb5 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 1 Mar 2018 09:59:02 +0000
Subject: [PATCH 085/826] [infra] Switch analyzer CQ bot to the test matrix

Change-Id: I690a6b44e6a9e2cb8a78b618a00d4b6c3eb65e98
Reviewed-on: https://dart-review.googlesource.com/44423
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 cr-buildbucket.cfg | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 1166f2e7859d..7ecca279bdf5 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -367,16 +367,10 @@ buckets {
         properties: "clobber:true"
       }
     }
-    builders {
-      name: "analyzer-linux-release-strong-try"
-      recipe {
-        name: "dart/analyzer_swarming"
-      }
-    }
     builders {
       name: "analyzer-linux-release-strong-hostchecked-try"
       recipe {
-        name: "dart/analyzer_swarming"
+        name: "dart/neo"
       }
     }
     builders {

From 5e03aba8e65ddbe1fd7978b12286c6f90d9bf74a Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 1 Mar 2018 11:57:38 +0000
Subject: [PATCH 086/826] [infra] Remove dart2js jsshell builders from Luci
 configuration

Change-Id: I57c18e5e97ed824d6fe2d3b4f99d33a512ae9c3b
Reviewed-on: https://dart-review.googlesource.com/44432
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg |  1 -
 luci-milo.cfg      | 63 ----------------------------------------------
 2 files changed, 64 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 7ecca279bdf5..a5f686f0e03e 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -112,7 +112,6 @@ buckets {
     builders { name: "dart2js-linux-x64-ff" }
     builders { name: "dart2js-linux-debug-ia32-none" }
     builders { name: "dart2js-linux-x64-drt" }
-    builders { name: "dart2js-linux-x64-jsshell" }
     builders { name: "dart2js-mac-x64-chrome" dimensions: "os:Mac" }
     builders { name: "dart2js-mac-x64-safari" dimensions: "os:Mac" }
     builders { name: "dart2js-mac-x64-safarimobilesim" mixins: "safarimobilesim" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index dd0852388f66..eca4bbd28f19 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -508,30 +508,6 @@ consoles: {
     category: "dart2js|misc"
     short_name: "dp"
   }
-  builders {
-    # migrating to dart2js-linux-x64-jsshell
-    name: "buildbot/client.dart/dart2js-linux-jsshell-1-4-be"
-    category: "dart2js|misc"
-    short_name: "1jsh"
-  }
-  builders {
-    # migrating to dart2js-linux-x64-jsshell
-    name: "buildbot/client.dart/dart2js-linux-jsshell-2-4-be"
-    category: "dart2js|misc"
-    short_name: "2jsh"
-  }
-  builders {
-    # migrating to dart2js-linux-x64-jsshell
-    name: "buildbot/client.dart/dart2js-linux-jsshell-3-4-be"
-    category: "dart2js|misc"
-    short_name: "3jsh"
-  }
-  builders {
-    # migrating to dart2js-linux-x64-jsshell
-    name: "buildbot/client.dart/dart2js-linux-jsshell-4-4-be"
-    category: "dart2js|misc"
-    short_name: "4jsh"
-  }
 # doesn't exist on buildbot, maybe migrate immediately?
 #  builders {
 #    # migrating to analyzer-analysis-server-linux
@@ -871,30 +847,6 @@ consoles: {
     category: "dart2js|misc"
     short_name: "dp"
   }
-  builders {
-    # migrating to dart2js-linux-x64-jsshell
-    name: "buildbot/client.dart/dart2js-linux-jsshell-1-4-be"
-    category: "dart2js|misc"
-    short_name: "1jsh"
-  }
-  builders {
-    # migrating to dart2js-linux-x64-jsshell
-    name: "buildbot/client.dart/dart2js-linux-jsshell-2-4-be"
-    category: "dart2js|misc"
-    short_name: "2jsh"
-  }
-  builders {
-    # migrating to dart2js-linux-x64-jsshell
-    name: "buildbot/client.dart/dart2js-linux-jsshell-3-4-be"
-    category: "dart2js|misc"
-    short_name: "3jsh"
-  }
-  builders {
-    # migrating to dart2js-linux-x64-jsshell
-    name: "buildbot/client.dart/dart2js-linux-jsshell-4-4-be"
-    category: "dart2js|misc"
-    short_name: "4jsh"
-  }
 # doesn't exist on buildbot, maybe migrate immediately?
 #  builders {
 #    # migrating to analyzer-analysis-server-linux
@@ -1880,11 +1832,6 @@ consoles: {
     category: "dart2js|misc"
     short_name: "dp"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-jsshell"
-    category: "dart2js|misc"
-    short_name: "jsh"
-  }
   builders {
     name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
     category: "analyzer"
@@ -2344,11 +2291,6 @@ consoles: {
     category: "dart2js|misc"
     short_name: "dp"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-jsshell"
-    category: "dart2js|misc"
-    short_name: "jsh"
-  }
   builders {
     name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
     category: "analyzer"
@@ -2808,11 +2750,6 @@ consoles: {
     category: "dart2js|misc"
     short_name: "dp"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-jsshell"
-    category: "dart2js|misc"
-    short_name: "jsh"
-  }
   builders {
     name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
     category: "analyzer"

From e3b05c79e54e2d4c6e67cfb50319c9970221f6ca Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 1 Mar 2018 13:45:59 +0000
Subject: [PATCH 087/826] [infra] Add missing analyzer bot to the migration
 consoles

Change-Id: I49cb6ce64f60a0045beaea82b4119b1c5546ed05
Reviewed-on: https://dart-review.googlesource.com/44464
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-milo.cfg | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index eca4bbd28f19..908dd3f1fb55 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -508,13 +508,12 @@ consoles: {
     category: "dart2js|misc"
     short_name: "dp"
   }
-# doesn't exist on buildbot, maybe migrate immediately?
-#  builders {
-#    # migrating to analyzer-analysis-server-linux
-#    name: "buildbot/client.dart/analyzer-analysis-server-linux-be"
-#    category: "analyzer"
-#    short_name: "aas"
-#  }
+  builders {
+    # migrating to analyzer-analysis-server-linux
+    name: "buildbot/client.dart/analyze-linux-be"
+    category: "analyzer"
+    short_name: "as"
+  }
   builders {
     # migrating to analyzer-linux-release
     name: "buildbot/client.dart/analyzer-linux-release-be"
@@ -847,13 +846,12 @@ consoles: {
     category: "dart2js|misc"
     short_name: "dp"
   }
-# doesn't exist on buildbot, maybe migrate immediately?
-#  builders {
-#    # migrating to analyzer-analysis-server-linux
-#    name: "buildbot/client.dart/analyzer-analysis-server-linux-be"
-#    category: "analyzer"
-#    short_name: "aas"
-#  }
+  builders {
+    # migrating to analyzer-analysis-server-linux
+    name: "buildbot/client.dart/analyze-linux-be"
+    category: "analyzer"
+    short_name: "as"
+  }
   builders {
     # migrating to analyzer-linux-release
     name: "buildbot/client.dart/analyzer-linux-release-be"

From fbe6cf853f4795f038d336e05eaa624177f0e969 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 5 Mar 2018 14:57:54 +0000
Subject: [PATCH 088/826] [infra] Add Front-end builders to Luci config

#32123

Change-Id: I971184b6530663d9e01e1f6e8d7297a91902d966
Reviewed-on: https://dart-review.googlesource.com/44067
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 26 ++++++----------
 luci-milo.cfg      | 75 ++++++++++++++++++++++++++++++++++++++++++++++
 luci-scheduler.cfg | 36 ++++++++++++++++++++++
 3 files changed, 120 insertions(+), 17 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index a5f686f0e03e..e1cfe2d5cbba 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -48,17 +48,6 @@ builder_mixins {
   # todo(athom): how should this machine be defined?
 }
 
-builder_mixins {
-  name: "russian"
-  # todo(athom): how should this machine be defined?
-}
-
-builder_mixins {
-  name: "safarimobilesim"
-  dimensions: "os:Mac"
-  # todo(athom): how should this machine be defined?
-}
-
 builder_mixins {
   name: "vm-kernel"
   recipe {
@@ -114,7 +103,6 @@ buckets {
     builders { name: "dart2js-linux-x64-drt" }
     builders { name: "dart2js-mac-x64-chrome" dimensions: "os:Mac" }
     builders { name: "dart2js-mac-x64-safari" dimensions: "os:Mac" }
-    builders { name: "dart2js-mac-x64-safarimobilesim" mixins: "safarimobilesim" }
     builders { name: "dart2js-minified-linux-x64-d8" }
     builders { name: "dart2js-only-unittest-linux-ia32-none" }
     builders { name: "dart2js-win-x64-chrome" dimensions: "os:Windows" }
@@ -125,6 +113,9 @@ buckets {
     builders { name: "ddc-mac-release-chrome" dimensions: "os:Mac" }
     builders { name: "ddc-win-release-chrome" dimensions: "os:Windows" }
     builders { name: "debianpackage-linux" mixins: "debianpackage" }
+    builders { name: "front-end-mac-release-x64" }
+    builders { name: "front-end-linux-release-x64" }
+    builders { name: "front-end-win-release-x64" }
     builders { name: "pkg-linux-release" }
     builders { name: "pkg-mac-release" dimensions: "os:Mac" }
     builders { name: "pkg-win-release" dimensions: "os:Windows" }
@@ -178,11 +169,6 @@ buckets {
     builders { name: "vm-reload-mac-release-simdbc64" dimensions: "os:Mac" }
     builders { name: "vm-reload-rollback-linux-debug-x64" }
     builders { name: "vm-reload-rollback-linux-release-x64" }
-    builders {
-      name: "vm-russian-win-debug-ia32"
-      mixins: "russian"
-      dimensions: "os:Windows"
-    }
     builders { name: "vm-win-debug-ia32" dimensions: "os:Windows" }
     builders { name: "vm-win-debug-x64" dimensions: "os:Windows" }
     builders { name: "vm-win-product-x64" dimensions: "os:Windows" }
@@ -218,6 +204,12 @@ buckets {
         name: "dart/neo"
       }
     }
+    builders {
+      name: "front-end-linux-release-x64-try"
+      recipe {
+        name: "dart/neo"
+      }
+    }
     builders {
       name: "vm-canary-linux-debug-try"
       recipe {
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 908dd3f1fb55..f05581a99b6e 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -739,6 +739,21 @@ consoles: {
     category: "misc"
     short_name: "vc"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
+    category: "fasta"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
+    category: "fasta"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
+    category: "fasta"
+    short_name: "w"
+  }
   header: {
     links: {
       name: "Consoles"
@@ -1506,6 +1521,21 @@ consoles: {
     category: "vm|reload"
     short_name: "rro"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
+    category: "fasta"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
+    category: "fasta"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
+    category: "fasta"
+    short_name: "w"
+  }
   header: {
     links: {
       name: "Consoles"
@@ -1965,6 +1995,21 @@ consoles: {
     category: "misc"
     short_name: "vc"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
+    category: "fasta"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
+    category: "fasta"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
+    category: "fasta"
+    short_name: "w"
+  }
   header: {
     links: {
       name: "Consoles"
@@ -2424,6 +2469,21 @@ consoles: {
     category: "misc"
     short_name: "vc"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
+    category: "fasta"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
+    category: "fasta"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
+    category: "fasta"
+    short_name: "w"
+  }
   header: {
     links: {
       name: "Consoles"
@@ -2883,6 +2943,21 @@ consoles: {
     category: "misc"
     short_name: "vc"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
+    category: "fasta"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
+    category: "fasta"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
+    category: "fasta"
+    short_name: "w"
+  }
   header: {
     links: {
       name: "Consoles"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 7f682f648f46..ffbd1e9a1688 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -26,6 +26,9 @@ trigger {
   triggers: "dart-sdk-linux"
   triggers: "dart-sdk-mac"
   triggers: "dart-sdk-win"
+  triggers: "front-end-mac-release-x64"
+  triggers: "front-end-linux-release-x64"
+  triggers: "front-end-win-release-x64"
   triggers: "vm-kernel-linux-debug-simdbc64"
   triggers: "vm-kernel-linux-release-simarm"
   triggers: "vm-kernel-linux-release-simarm64"
@@ -71,6 +74,39 @@ job {
   }
 }
 
+job {
+  id: "front-end-mac-release-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "front-end-linux-release-x64"
+  }
+}
+
+job {
+  id: "front-end-linux-release-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "front-end-linux-release-x64"
+  }
+}
+
+job {
+  id: "front-end-win-release-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "front-end-linux-release-x64"
+  }
+}
+
 job {
   id: "vm-kernel-linux-debug-simdbc64"
   acl_sets: "default"

From 2965d1282fc9799adb932e471839c4bd4655170c Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 5 Mar 2018 15:04:44 +0000
Subject: [PATCH 089/826] [infra] Add correct dimensions for front-end Mac and
 Windows builders

TBR=whesse@google.com

Change-Id: I6c45079d46f0843fb95ca0cebffdd37633e84c85
Reviewed-on: https://dart-review.googlesource.com/45001
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index e1cfe2d5cbba..fac950c98779 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -113,9 +113,9 @@ buckets {
     builders { name: "ddc-mac-release-chrome" dimensions: "os:Mac" }
     builders { name: "ddc-win-release-chrome" dimensions: "os:Windows" }
     builders { name: "debianpackage-linux" mixins: "debianpackage" }
-    builders { name: "front-end-mac-release-x64" }
+    builders { name: "front-end-mac-release-x64" dimensions: "os:Mac" }
     builders { name: "front-end-linux-release-x64" }
-    builders { name: "front-end-win-release-x64" }
+    builders { name: "front-end-win-release-x64" dimensions: "os:Windows" }
     builders { name: "pkg-linux-release" }
     builders { name: "pkg-mac-release" dimensions: "os:Mac" }
     builders { name: "pkg-win-release" dimensions: "os:Windows" }

From 4583b42aa87d31427a2d1940967e985544ac71b4 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 5 Mar 2018 15:32:05 +0000
Subject: [PATCH 090/826] [infra] Make neo the default recipe for the
 luci.dart.try bucket

Remove defunct precomp-linux-release-x64-try builder

Change-Id: Ifad77320764681bc7b8548f416e9bd15e5e4e507
Reviewed-on: https://dart-review.googlesource.com/44201
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 48 ++++------------------------------------------
 1 file changed, 4 insertions(+), 44 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index fac950c98779..27d68d31b0b7 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -192,7 +192,7 @@ buckets {
       recipe {
         repository: "https://chromium.googlesource.com/chromium/tools/build.git"
         properties: "mastername:dart.try"
-        name: "dart/dart_vm"
+        name: "dart/neo"
         # TODO(vadimsh): setup a service account and remove this line,
         # see https://crbug.com/776035
         properties_j: "$kitchen:{\"git_auth\": false, \"devshell\": false}"
@@ -200,67 +200,40 @@ buckets {
     }
     builders {
       name: "benchmark-linux-try"
-      recipe {
-        name: "dart/neo"
-      }
     }
     builders {
       name: "front-end-linux-release-x64-try"
-      recipe {
-        name: "dart/neo"
-      }
     }
     builders {
       name: "vm-canary-linux-debug-try"
-      recipe {
-        name: "dart/neo"
-      }
     }
     builders {
       name: "vm-linux-release-x64-try"
-      recipe {
-        name: "dart/neo"
-      }
     }
     builders {
       name: "vm-linux-debug-x64-try"
-      recipe {
-        name: "dart/neo"
-      }
     }
     builders {
       name: "vm-mac-release-x64-try"
       dimensions: "os:Mac"
-      recipe {
-        name: "dart/neo"
-      }
     }
     builders {
       name: "vm-mac-debug-x64-try"
       dimensions: "os:Mac"
-      recipe {
-        name: "dart/neo"
-      }
     }
     builders {
       name: "vm-win-release-x64-try"
       dimensions: "os:Windows"
-      recipe {
-        name: "dart/neo"
-      }
     }
     builders {
       name: "vm-win-debug-x64-try"
       dimensions: "os:Windows"
-      recipe {
-        name: "dart/neo"
-      }
-    }
-    builders {
-      name: "precomp-linux-release-x64-try"
     }
     builders {
       name: "vm-linux-product-x64-try"
+      recipe {
+        name: "dart/dart_vm"
+      }
     }
     builders {
       name: "vm-kernel-linux-release-x64-try"
@@ -354,15 +327,11 @@ buckets {
       name: "ddc-linux-release-chrome-try"
       dimensions: "kvm:0"
       recipe {
-        name: "dart/neo"
         properties: "clobber:true"
       }
     }
     builders {
       name: "analyzer-linux-release-strong-hostchecked-try"
-      recipe {
-        name: "dart/neo"
-      }
     }
     builders {
       name: "pkg-linux-release-try"
@@ -372,23 +341,14 @@ buckets {
     }
     builders {
       name: "cl-linux-try"
-      recipe {
-        name: "dart/neo"
-      }
     }
     builders {
       name: "cl-win-try"
       dimensions: "os:Windows-10"
-      recipe {
-        name: "dart/neo"
-      }
     }
     builders {
       name: "cl-mac-try"
       dimensions: "os:Mac"
-      recipe {
-        name: "dart/neo"
-      }
     }
   }
 }

From 89a49683ef007cc15b01245b628231327fc310f7 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 5 Mar 2018 15:35:18 +0000
Subject: [PATCH 091/826] [infra] Trigger the correct front-end builders

TBR=whesse@google.com

Change-Id: I3c5cd9c5a753a4aa96c54e87d2cab09c799a38d4
Reviewed-on: https://dart-review.googlesource.com/45020
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-scheduler.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index ffbd1e9a1688..f240786269eb 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -81,7 +81,7 @@ job {
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
-    builder: "front-end-linux-release-x64"
+    builder: "front-end-mac-release-x64"
   }
 }
 
@@ -103,7 +103,7 @@ job {
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
-    builder: "front-end-linux-release-x64"
+    builder: "front-end-win-release-x64"
   }
 }
 

From 5fdbac8ed380cc6a0b0cb4d1b665f751ebf452e6 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 6 Mar 2018 17:12:21 +0000
Subject: [PATCH 092/826] [infra] Enable build numbers

Change-Id: Ideffa91f8bf9531dacecb9aef371f75149df460d
Reviewed-on: https://dart-review.googlesource.com/45324
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 27d68d31b0b7..57c70818060a 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -67,6 +67,7 @@ buckets {
       category: "Dart CI"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
+      build_numbers: true
       priority: 50
       recipe {
         repository: "https://chromium.googlesource.com/chromium/tools/build.git"
@@ -188,6 +189,7 @@ buckets {
       category: "Dart CQ"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
+      build_numbers: true
       priority: 30
       recipe {
         repository: "https://chromium.googlesource.com/chromium/tools/build.git"

From e2904a7b4dacbfb6cca29ee130abae9bd1439dd2 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Tue, 6 Mar 2018 18:06:33 +0000
Subject: [PATCH 093/826] Revert "[infra] Enable build numbers"

This reverts commit 5fdbac8ed380cc6a0b0cb4d1b665f751ebf452e6.

Reason for revert: The value of build_number should be YES, not true.

Original change's description:
> [infra] Enable build numbers
>
> Change-Id: Ideffa91f8bf9531dacecb9aef371f75149df460d
> Reviewed-on: https://dart-review.googlesource.com/45324
> Reviewed-by: William Hesse <whesse@google.com>

TBR=whesse@google.com,athom@google.com

Change-Id: I4c44283e9f4030d7dd4305fcacdb3665cb5d8cdf
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/45420
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 57c70818060a..c3b9ff521b33 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -67,7 +67,7 @@ buckets {
       category: "Dart CI"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
-      build_numbers: true
+      build_numbers: YES
       priority: 50
       recipe {
         repository: "https://chromium.googlesource.com/chromium/tools/build.git"
@@ -189,7 +189,7 @@ buckets {
       category: "Dart CQ"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
-      build_numbers: true
+      build_numbers: YES
       priority: 30
       recipe {
         repository: "https://chromium.googlesource.com/chromium/tools/build.git"

From 618906c6905229f980cf39a1e79c749ea7d8ffeb Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 8 Mar 2018 15:05:01 +0000
Subject: [PATCH 094/826] [infra] Run Luci presubmit checks in infra/config

Change-Id: Ic544f3aff20d39ba2e3ee07891c7390c98d2a0df
Reviewed-on: https://dart-review.googlesource.com/45680
Reviewed-by: William Hesse <whesse@google.com>
---
 PRESUBMIT.py | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 PRESUBMIT.py

diff --git a/PRESUBMIT.py b/PRESUBMIT.py
new file mode 100644
index 000000000000..51b514c08fc1
--- /dev/null
+++ b/PRESUBMIT.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file
+# for details. All rights reserved. Use of this source code is governed by a
+# BSD-style license that can be found in the LICENSE file.
+
+def CheckChangeOnUpload(input_api, output_api):
+  return input_api.canned_checks.CheckChangedLUCIConfigs(input_api, output_api)
+
+def CheckChangeOnCommit(input_api, output_api):
+  return input_api.canned_checks.CheckChangedLUCIConfigs(input_api, output_api)

From 5975c183b96d7e4ef2a345fd9b2cd52b2dd462ac Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 13 Mar 2018 08:24:42 +0000
Subject: [PATCH 095/826] [infra] Move fasta/front-end builders to the front of
 the console
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rationale: once all tools use fasta, they will all be downstream.

Change-Id: Id9c4b681ce49efbc8642fb30966c65b82131fba4
Reviewed-on: https://dart-review.googlesource.com/46040
Reviewed-by: William Hesse <whesse@google.com>
Reviewed-by: Peter von der Ahé <ahe@google.com>
---
 luci-milo.cfg | 150 +++++++++++++++++++++++++-------------------------
 1 file changed, 75 insertions(+), 75 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index f05581a99b6e..bdd9fff624cb 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -6,6 +6,21 @@ consoles: {
   repo_url: "https://dart.googlesource.com/sdk"
   ref: "refs/heads/master"
   manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
+    category: "fasta"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
+    category: "fasta"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
+    category: "fasta"
+    short_name: "w"
+  }
   builders {
     # migrating to vm-linux-debug-ia32
     name: "buildbot/client.dart/vm-linux-debug-ia32-be"
@@ -739,21 +754,6 @@ consoles: {
     category: "misc"
     short_name: "vc"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
-    category: "fasta"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
-    category: "fasta"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
-    category: "fasta"
-    short_name: "w"
-  }
   header: {
     links: {
       name: "Consoles"
@@ -788,6 +788,21 @@ consoles: {
   repo_url: "https://dart.googlesource.com/sdk"
   ref: "refs/heads/master"
   manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
+    category: "fasta"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
+    category: "fasta"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
+    category: "fasta"
+    short_name: "w"
+  }
   builders {
     # migrating to dart2js-hostchecked-linux-ia32-d8
     name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-1-5-be"
@@ -1521,21 +1536,6 @@ consoles: {
     category: "vm|reload"
     short_name: "rro"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
-    category: "fasta"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
-    category: "fasta"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
-    category: "fasta"
-    short_name: "w"
-  }
   header: {
     links: {
       name: "Consoles"
@@ -1570,6 +1570,21 @@ consoles: {
   repo_url: "https://dart.googlesource.com/sdk/"
   ref: "refs/heads/master"
   manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
+    category: "fasta"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
+    category: "fasta"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
+    category: "fasta"
+    short_name: "w"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
     category: "vm|debug"
@@ -1995,21 +2010,6 @@ consoles: {
     category: "misc"
     short_name: "vc"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
-    category: "fasta"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
-    category: "fasta"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
-    category: "fasta"
-    short_name: "w"
-  }
   header: {
     links: {
       name: "Consoles"
@@ -2044,6 +2044,21 @@ consoles: {
   repo_url: "https://dart.googlesource.com/sdk"
   ref: "refs/heads/dev"
   manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
+    category: "fasta"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
+    category: "fasta"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
+    category: "fasta"
+    short_name: "w"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
     category: "vm|debug"
@@ -2469,21 +2484,6 @@ consoles: {
     category: "misc"
     short_name: "vc"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
-    category: "fasta"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
-    category: "fasta"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
-    category: "fasta"
-    short_name: "w"
-  }
   header: {
     links: {
       name: "Consoles"
@@ -2518,6 +2518,21 @@ consoles: {
   repo_url: "https://dart.googlesource.com/sdk"
   ref: "refs/heads/stable"
   manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
+    category: "fasta"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
+    category: "fasta"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
+    category: "fasta"
+    short_name: "w"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
     category: "vm|debug"
@@ -2943,21 +2958,6 @@ consoles: {
     category: "misc"
     short_name: "vc"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
-    category: "fasta"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
-    category: "fasta"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
-    category: "fasta"
-    short_name: "w"
-  }
   header: {
     links: {
       name: "Consoles"

From d8e6a243562dab42c44f5d0b67f707765213937b Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 15 Mar 2018 15:49:58 +0000
Subject: [PATCH 096/826] [infra] Add vm-kernel-legacy builder
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/dart-lang/sdk/issues/32499

Change-Id: I953ba797e0e06925c6db0b0745021477f38d59c9
Reviewed-on: https://dart-review.googlesource.com/46740
Reviewed-by: Peter von der Ahé <ahe@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg |  4 ++++
 luci-milo.cfg      | 25 +++++++++++++++++++++++++
 luci-scheduler.cfg | 12 ++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index c3b9ff521b33..046ff1ff9b9c 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -129,6 +129,7 @@ buckets {
     builders { name: "versionchecker-linux" }
     builders { name: "vm-asan-linux-release-x64" }
     builders { name: "vm-kernel-checked-linux-release-x64" }
+    builders { name: "vm-kernel-legacy-linux-release-x64" }
     builders { name: "vm-kernel-linux-debug-x64" }
     builders { name: "vm-kernel-linux-debug-simdbc64" }
     builders { name: "vm-kernel-linux-release-simarm" }
@@ -237,6 +238,9 @@ buckets {
         name: "dart/dart_vm"
       }
     }
+    builders {
+      name: "vm-kernel-legacy-linux-release-x64-try"
+    }
     builders {
       name: "vm-kernel-linux-release-x64-try"
       mixins: "vm-kernel"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index bdd9fff624cb..d4e847f4f5ef 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -21,6 +21,11 @@ consoles: {
     category: "fasta"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64"
+    category: "fasta"
+    short_name: "vm"
+  }
   builders {
     # migrating to vm-linux-debug-ia32
     name: "buildbot/client.dart/vm-linux-debug-ia32-be"
@@ -803,6 +808,11 @@ consoles: {
     category: "fasta"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64"
+    category: "fasta"
+    short_name: "vm"
+  }
   builders {
     # migrating to dart2js-hostchecked-linux-ia32-d8
     name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-1-5-be"
@@ -1585,6 +1595,11 @@ consoles: {
     category: "fasta"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64"
+    category: "fasta"
+    short_name: "vm"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
     category: "vm|debug"
@@ -2059,6 +2074,11 @@ consoles: {
     category: "fasta"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64"
+    category: "fasta"
+    short_name: "vm"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
     category: "vm|debug"
@@ -2533,6 +2553,11 @@ consoles: {
     category: "fasta"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64"
+    category: "fasta"
+    short_name: "vm"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
     category: "vm|debug"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index f240786269eb..fce2a23e6f86 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -29,6 +29,7 @@ trigger {
   triggers: "front-end-mac-release-x64"
   triggers: "front-end-linux-release-x64"
   triggers: "front-end-win-release-x64"
+  triggers: "vm-kernel-legacy-linux-release-x64"
   triggers: "vm-kernel-linux-debug-simdbc64"
   triggers: "vm-kernel-linux-release-simarm"
   triggers: "vm-kernel-linux-release-simarm64"
@@ -107,6 +108,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-legacy-linux-release-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-legacy-linux-release-x64"
+  }
+}
+
 job {
   id: "vm-kernel-linux-debug-simdbc64"
   acl_sets: "default"

From 22d62a13aab9f6800003517d58ae0d4bbafbcb6b Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Fri, 16 Mar 2018 10:37:50 +0000
Subject: [PATCH 097/826] Add a browser cache to machines in the Dart swarming
 pools

Change-Id: I7af98148bf391acc85f9361420dbe8fae33db44e
Reviewed-on: https://dart-review.googlesource.com/45781
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 046ff1ff9b9c..dd38cfe27cd6 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -69,6 +69,10 @@ buckets {
       dimensions: "os:Linux"
       build_numbers: YES
       priority: 50
+      caches {
+        path: "browsers"
+        name: "browsers"
+      }
       recipe {
         repository: "https://chromium.googlesource.com/chromium/tools/build.git"
         properties: "mastername:client.dart"
@@ -192,6 +196,10 @@ buckets {
       dimensions: "os:Linux"
       build_numbers: YES
       priority: 30
+      caches {
+        path: "browsers"
+        name: "browsers"
+      }
       recipe {
         repository: "https://chromium.googlesource.com/chromium/tools/build.git"
         properties: "mastername:dart.try"

From 5740f54589634e89b41dd1347b80d8605f656f31 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 20 Mar 2018 08:49:49 +0000
Subject: [PATCH 098/826] [infra] Remove luci-notify config

Use gatekeeper instead to send out emails.

Change-Id: Ia98c15a4f425955a877334d73af521aefe11cdd9
Reviewed-on: https://dart-review.googlesource.com/36484
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-notify.cfg | 71 -------------------------------------------------
 1 file changed, 71 deletions(-)
 delete mode 100644 luci-notify.cfg

diff --git a/luci-notify.cfg b/luci-notify.cfg
deleted file mode 100644
index c229254755d1..000000000000
--- a/luci-notify.cfg
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file
-# for details. All rights reserved. Use of this source code is governed by a
-# BSD-style license that can be found in the LICENSE file.
-
-# Defines notifiers on luci-notify.appspot.com.
-# See https://github.com/luci/luci-go/blob/master/luci_notify/api/config/notify.proto
-
-# Please keep this list sorted by name or layer.
-
-# on_change  = Whenever the build status changes.
-# on_success = On every build success.
-# on_failure = On every build failure.
-
-notifiers {
-  name: "dart-ci-notifier"
-
-  notifications {
-    on_change: true
-    on_success: false
-    on_failure: false
-    email {
-      recipients: "dart-sdk-build-notifications@google.com"
-    }
-  }
-
-  builders {
-    bucket: "luci.dart.ci"
-    name: "vm-kernel-linux-debug-simdbc64"
-  }
-
-  builders {
-    bucket: "luci.dart.ci"
-    name: "vm-kernel-linux-release-simarm"
-  }
-
-  builders {
-    bucket: "luci.dart.ci"
-    name: "vm-kernel-linux-release-simarm64"
-  }
-
-  builders {
-    bucket: "luci.dart.ci"
-    name: "vm-kernel-linux-release-simdbc64"
-  }
-
-  builders {
-    bucket: "luci.dart.ci"
-    name: "vm-kernel-optcounter-threshold-linux-release-x64"
-  }
-
-  builders {
-    bucket: "luci.dart.ci"
-    name: "vm-kernel-win-release-x64"
-  }
-
-  builders {
-    bucket: "luci.dart.ci"
-    name: "vm-kernel-precomp-linux-release-simarm"
-  }
-
-  builders {
-    bucket: "luci.dart.ci"
-    name: "vm-kernel-precomp-linux-release-simarm64"
-  }
-
-  builders {
-    bucket: "luci.dart.ci"
-    name: "vm-kernel-precomp-win-release-x64"
-  }
-
-}
\ No newline at end of file

From e63835697e39a0ba5cc353bd9493a6ee25f0db37 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 20 Mar 2018 11:08:38 +0000
Subject: [PATCH 099/826] [infra] Enable VPython on try and ci builders

TBR=whesse@google.com

Change-Id: I31224a009636fe3312eea31fc335abf2d39e4737
Reviewed-on: https://dart-review.googlesource.com/47221
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index dd38cfe27cd6..ea5b46e6fdb7 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -69,6 +69,7 @@ buckets {
       dimensions: "os:Linux"
       build_numbers: YES
       priority: 50
+      swarming_tags: "vpython:native-python-wrapper"
       caches {
         path: "browsers"
         name: "browsers"
@@ -196,6 +197,7 @@ buckets {
       dimensions: "os:Linux"
       build_numbers: YES
       priority: 30
+      swarming_tags: "vpython:native-python-wrapper"
       caches {
         path: "browsers"
         name: "browsers"

From 3d3dec2e0d3de0d5530aebfcd057fb1673d7a087 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 20 Mar 2018 11:27:47 +0000
Subject: [PATCH 100/826] [infra] Increase execution timeout on
 vm-kernel-precomp-linux-debug builder

https://github.com/dart-lang/sdk/issues/32499

TBR=whesse@google.com

Change-Id: I7fc6ef00cc3dc1afe338c2e3720aaa0f4aa11472
Reviewed-on: https://dart-review.googlesource.com/47220
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index ea5b46e6fdb7..b0cd4367c913 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -48,6 +48,14 @@ builder_mixins {
   # todo(athom): how should this machine be defined?
 }
 
+builder_mixins {
+  name: "slow"
+  execution_timeout_secs: 21600 # 6h
+  recipe {
+    properties_j: "shard_timeout:21600"
+  }
+}
+
 builder_mixins {
   name: "vm-kernel"
   recipe {
@@ -145,7 +153,7 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64" dimensions: "os:Mac" }
     builders { name: "vm-kernel-win-release-x64" dimensions: "os:Windows" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64" }
-    builders { name: "vm-kernel-precomp-linux-debug-x64" }
+    builders { name: "vm-kernel-precomp-linux-debug-x64" mixins: "slow" }
     builders { name: "vm-kernel-precomp-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-release-simarm" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64" }

From ed8462840522d1fef6450fd6d68486f470245016 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 21 Mar 2018 17:08:48 +0000
Subject: [PATCH 101/826] [infra] Add service account for try builders

Change-Id: Ida5c83ac3cc0bf87a8c75dddb9f07ba22f05a41f
Reviewed-on: https://dart-review.googlesource.com/47340
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index b0cd4367c913..11bbf5e2bef0 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -214,10 +214,11 @@ buckets {
         repository: "https://chromium.googlesource.com/chromium/tools/build.git"
         properties: "mastername:dart.try"
         name: "dart/neo"
-        # TODO(vadimsh): setup a service account and remove this line,
-        # see https://crbug.com/776035
+        # TODO(vadimsh): make sure the service account has all necessary Git and
+        # GS permissions and remove this line, see https://crbug.com/776035
         properties_j: "$kitchen:{\"git_auth\": false, \"devshell\": false}"
       }
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
       name: "benchmark-linux-try"

From 8b2aa98e038e7137708d1b12bbd8186743630102 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 4 Apr 2018 13:33:47 +0000
Subject: [PATCH 102/826] [infra] Remove kvm:0 dimension from chrome builders

TBR=whesse@google.com

Change-Id: I9779da9879188278c87fcd1022a1debed09c3429
Reviewed-on: https://dart-review.googlesource.com/49501
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 2 --
 1 file changed, 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 11bbf5e2bef0..80ef4d8df408 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -279,7 +279,6 @@ buckets {
     }
     builders {
       name: "dart2js-linux-chrome-try"
-      dimensions: "kvm:0"
       recipe {
         name: "dart/dart2js_swarming"
         properties_j: "shards:6"
@@ -350,7 +349,6 @@ buckets {
     }
     builders {
       name: "ddc-linux-release-chrome-try"
-      dimensions: "kvm:0"
       recipe {
         properties: "clobber:true"
       }

From 1fa3f87bb1a4897ee9d630d218dde3cb4be295c9 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 4 Apr 2018 15:22:57 +0000
Subject: [PATCH 103/826] [infra] Switch dart2js-chrome to be based on the test
 matrix

TBR=whesse@google.com

Change-Id: Ida495d9ea5b40c23bc546db8ac838f6d9b45b7fa
Reviewed-on: https://dart-review.googlesource.com/49504
Reviewed-by: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 80ef4d8df408..1af403c65df2 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -278,11 +278,7 @@ buckets {
       mixins: "vm-kernel"
     }
     builders {
-      name: "dart2js-linux-chrome-try"
-      recipe {
-        name: "dart/dart2js_swarming"
-        properties_j: "shards:6"
-      }
+      name: "dart2js-linux-x64-chrome-try"
     }
     builders {
       name: "dart-sdk-linux-try"

From a553645f96458965870daaa5830e6a3ce1fdad93 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Fri, 6 Apr 2018 07:59:00 +0000
Subject: [PATCH 104/826] Add dart2js-faststartup-linux-chrome-x64 builder to
 ci buildbucket and milo consoles

Change-Id: Idc303a918db14e75190466c4750d1d62873cecc5
Reviewed-on: https://dart-review.googlesource.com/49722
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg |  1 +
 luci-milo.cfg      | 29 ++++++++++++++++++++++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 1af403c65df2..31524f7303be 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -109,6 +109,7 @@ buckets {
     builders { name: "dart-sdk-win" dimensions: "os:Windows" }
     builders { name: "dart2js-csp-minified-linux-x64-drt" }
     builders { name: "dart2js-dumpinfo-linux-ia32-none" }
+    builders { name: "dart2js-faststartup-linux-x64-chrome" }
     builders { name: "dart2js-hostchecked-linux-ia32-d8" }
     builders { name: "dart2js-hostchecked-linux-debug-ia32-none" }
     builders { name: "dart2js-linux-x64-chrome" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index d4e847f4f5ef..42355f1c8bbf 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -988,10 +988,18 @@ consoles: {
     category: "dart2js|chrome"
     short_name: "4l"
   }
-# doesn't exist on buildbot, included in chromeff builder
 #  builders {
-#    # migrating to dart2js-linux-x64-ff
-#    name: "buildbot/client.dart/dart2js-linux-x64-ff-be"
+#    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome"
+#    category: "dart2js|chrome"
+#    short_name: "l"
+#  }
+#  builders {
+#    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome"
+#    category: "dart2js|chrome"
+#    short_name: "fs"
+#  }
+#  builders {
+#    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff"
 #    category: "dart2js|ff"
 #    short_name: "l"
 #  }
@@ -1960,6 +1968,11 @@ consoles: {
     category: "dart2js|chrome"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "fs"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff"
     category: "dart2js|ff"
@@ -2439,6 +2452,11 @@ consoles: {
     category: "dart2js|chrome"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "fs"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff"
     category: "dart2js|ff"
@@ -2918,6 +2936,11 @@ consoles: {
     category: "dart2js|chrome"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "fs"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff"
     category: "dart2js|ff"

From ac7eeeb0e4bdd718a98b5bacc8c97328a991cfa2 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Fri, 6 Apr 2018 10:45:37 +0000
Subject: [PATCH 105/826] Start running LUCI dart2js and ddc chrome builders

Change-Id: I3b3f103742da90fb50dc9698cb4038592e66666b
Reviewed-on: https://dart-review.googlesource.com/49480
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-milo.cfg      | 146 +++++++++++++++++----------------------------
 luci-scheduler.cfg |  84 ++++++++++++++++++++++++++
 2 files changed, 139 insertions(+), 91 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 42355f1c8bbf..c826cb561b92 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -589,45 +589,52 @@ consoles: {
     short_name: "w"
   }
   builders {
-    # migrating to ddc-linux-release-chrome
-    name: "buildbot/client.dart/ddc-linux-release-be"
+    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    # migrating to ddc-mac-release-chrome
-    name: "buildbot/client.dart/ddc-mac-release-be"
+    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    # migrating to ddc-win-release-chrome
-    name: "buildbot/client.dart/ddc-win-release-be"
+    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    # migrating to dart2js-linux-x64-chrome
-    name: "buildbot/client.dart/dart2js-linux-chromeff-1-4-be"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome"
     category: "dart2js|chrome"
-    short_name: "1l"
+    short_name: "l"
   }
   builders {
-    # migrating to dart2js-linux-x64-chrome
-    name: "buildbot/client.dart/dart2js-linux-chromeff-2-4-be"
+    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome"
     category: "dart2js|chrome"
+    short_name: "fs"
+  }
+  builders {
+    # migrating to dart2js-linux-x64-ff
+    name: "buildbot/client.dart/dart2js-linux-ff-1-4-be"
+    category: "dart2js|ff"
+    short_name: "1l"
+  }
+  builders {
+    # migrating to dart2js-linux-x64-ff
+    name: "buildbot/client.dart/dart2js-linux-ff-2-4-be"
+    category: "dart2js|ff"
     short_name: "2l"
   }
   builders {
-    # migrating to dart2js-linux-x64-chrome
-    name: "buildbot/client.dart/dart2js-linux-chromeff-3-4-be"
-    category: "dart2js|chrome"
+    # migrating to dart2js-linux-x64-ff
+    name: "buildbot/client.dart/dart2js-linux-ff-3-4-be"
+    category: "dart2js|ff"
     short_name: "3l"
   }
   builders {
-    # migrating to dart2js-linux-x64-chrome
-    name: "buildbot/client.dart/dart2js-linux-chromeff-4-4-be"
-    category: "dart2js|chrome"
+    # migrating to dart2js-linux-x64-ff
+    name: "buildbot/client.dart/dart2js-linux-ff-4-4-be"
+    category: "dart2js|ff"
     short_name: "4l"
   }
 # doesn't exist on buildbot, included in chromeff builder
@@ -644,8 +651,7 @@ consoles: {
     short_name: "csp"
   }
   builders {
-    # migrating to dart2js-mac-x64-chrome
-    name: "buildbot/client.dart/dart2js-mac10.11-chrome-be"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
@@ -668,28 +674,9 @@ consoles: {
     short_name: "3m"
   }
   builders {
-    # migrating to dart2js-win-x64-chrome
-    name: "buildbot/client.dart/dart2js-win7-chrome-1-4-be"
-    category: "dart2js|chrome"
-    short_name: "1w"
-  }
-  builders {
-    # migrating to dart2js-win-x64-chrome
-    name: "buildbot/client.dart/dart2js-win7-chrome-2-4-be"
-    category: "dart2js|chrome"
-    short_name: "2w"
-  }
-  builders {
-    # migrating to dart2js-win-x64-chrome
-    name: "buildbot/client.dart/dart2js-win7-chrome-3-4-be"
-    category: "dart2js|chrome"
-    short_name: "3w"
-  }
-  builders {
-    # migrating to dart2js-win-x64-chrome
-    name: "buildbot/client.dart/dart2js-win7-chrome-4-4-be"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome"
     category: "dart2js|chrome"
-    short_name: "4w"
+    short_name: "w"
   }
 # doesn't exist on buildbot, new builder
 #  builders {
@@ -947,57 +934,54 @@ consoles: {
     short_name: "w"
   }
   builders {
-    # migrating to ddc-linux-release-chrome
-    name: "buildbot/client.dart/ddc-linux-release-be"
+    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    # migrating to ddc-mac-release-chrome
-    name: "buildbot/client.dart/ddc-mac-release-be"
+    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    # migrating to ddc-win-release-chrome
-    name: "buildbot/client.dart/ddc-win-release-be"
+    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    # migrating to dart2js-linux-x64-chrome
-    name: "buildbot/client.dart/dart2js-linux-chromeff-1-4-be"
-    category: "dart2js|chrome"
+    # migrating to dart2js-linux-x64-ff
+    name: "buildbot/client.dart/dart2js-linux-ff-1-4-be"
+    category: "dart2js|ff"
     short_name: "1l"
   }
   builders {
-    # migrating to dart2js-linux-x64-chrome
-    name: "buildbot/client.dart/dart2js-linux-chromeff-2-4-be"
-    category: "dart2js|chrome"
+    # migrating to dart2js-linux-x64-ff
+    name: "buildbot/client.dart/dart2js-linux-ff-2-4-be"
+    category: "dart2js|ff"
     short_name: "2l"
   }
   builders {
-    # migrating to dart2js-linux-x64-chrome
-    name: "buildbot/client.dart/dart2js-linux-chromeff-3-4-be"
-    category: "dart2js|chrome"
+    # migrating to dart2js-linux-x64-ff
+    name: "buildbot/client.dart/dart2js-linux-ff-3-4-be"
+    category: "dart2js|ff"
     short_name: "3l"
   }
   builders {
-    # migrating to dart2js-linux-x64-chrome
-    name: "buildbot/client.dart/dart2js-linux-chromeff-4-4-be"
-    category: "dart2js|chrome"
+    # migrating to dart2js-linux-x64-ff
+    name: "buildbot/client.dart/dart2js-linux-ff-4-4-be"
+    category: "dart2js|ff"
     short_name: "4l"
   }
-#  builders {
-#    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome"
-#    category: "dart2js|chrome"
-#    short_name: "l"
-#  }
-#  builders {
-#    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome"
-#    category: "dart2js|chrome"
-#    short_name: "fs"
-#  }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "fs"
+  }
 #  builders {
 #    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff"
 #    category: "dart2js|ff"
@@ -1010,8 +994,7 @@ consoles: {
     short_name: "csp"
   }
   builders {
-    # migrating to dart2js-mac-x64-chrome
-    name: "buildbot/client.dart/dart2js-mac10.11-chrome-be"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
@@ -1034,28 +1017,9 @@ consoles: {
     short_name: "3m"
   }
   builders {
-    # migrating to dart2js-win-x64-chrome
-    name: "buildbot/client.dart/dart2js-win7-chrome-1-4-be"
-    category: "dart2js|chrome"
-    short_name: "1w"
-  }
-  builders {
-    # migrating to dart2js-win-x64-chrome
-    name: "buildbot/client.dart/dart2js-win7-chrome-2-4-be"
-    category: "dart2js|chrome"
-    short_name: "2w"
-  }
-  builders {
-    # migrating to dart2js-win-x64-chrome
-    name: "buildbot/client.dart/dart2js-win7-chrome-3-4-be"
-    category: "dart2js|chrome"
-    short_name: "3w"
-  }
-  builders {
-    # migrating to dart2js-win-x64-chrome
-    name: "buildbot/client.dart/dart2js-win7-chrome-4-4-be"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome"
     category: "dart2js|chrome"
-    short_name: "4w"
+    short_name: "w"
   }
 # doesn't exist on buildbot, new builder
 #  builders {
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index fce2a23e6f86..3c8e33c96fd7 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -26,6 +26,13 @@ trigger {
   triggers: "dart-sdk-linux"
   triggers: "dart-sdk-mac"
   triggers: "dart-sdk-win"
+  triggers: "dart2js-faststartup-linux-x64-chrome"
+  triggers: "dart2js-linux-x64-chrome"
+  triggers: "dart2js-mac-x64-chrome"
+  triggers: "dart2js-win-x64-chrome"
+  triggers: "ddc-linux-release-chrome"
+  triggers: "ddc-mac-release-chrome"
+  triggers: "ddc-win-release-chrome"
   triggers: "front-end-mac-release-x64"
   triggers: "front-end-linux-release-x64"
   triggers: "front-end-win-release-x64"
@@ -75,6 +82,83 @@ job {
   }
 }
 
+job {
+  id: "dart2js-faststartup-linux-x64-chrome"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart2js-faststartup-linux-x64-chrome"
+  }
+}
+
+job {
+  id: "dart2js-linux-x64-chrome"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart2js-linux-x64-chrome"
+  }
+}
+
+job {
+  id: "dart2js-mac-x64-chrome"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart2js-mac-x64-chrome"
+  }
+}
+
+job {
+  id: "dart2js-win-x64-chrome"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart2js-win-x64-chrome"
+  }
+}
+
+job {
+  id: "ddc-linux-release-chrome"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "ddc-linux-release-chrome"
+  }
+}
+
+job {
+  id: "ddc-mac-release-chrome"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "ddc-mac-release-chrome"
+  }
+}
+
+job {
+  id: "ddc-win-release-chrome"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "ddc-win-release-chrome"
+  }
+}
+
 job {
   id: "front-end-mac-release-x64"
   acl_sets: "default"

From 74167d717e0008aa1fda6ed2bcdd59642a48b9ff Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 9 Apr 2018 07:32:25 +0000
Subject: [PATCH 106/826] [infra] Separate builders for dev and stable branches

This mitigates bugs in Luci:
https://crbug.com/829423
https://crbug.com/778337

Disable SDK builders that currently don't provide any value.

TBR=whesse@google.com

Change-Id: I0f4b08561ea276d02fb93dbabd945a0510e0ac93
Reviewed-on: https://dart-review.googlesource.com/50140
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 196 +++++++++++++++
 luci-milo.cfg      | 360 ++++++++++++++--------------
 luci-scheduler.cfg | 582 ++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 955 insertions(+), 183 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 31524f7303be..09de2c8f24d7 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -190,6 +190,202 @@ buckets {
     builders { name: "vm-win-product-x64" dimensions: "os:Windows" }
     builders { name: "vm-win-release-ia32" dimensions: "os:Windows" }
     builders { name: "vm-win-release-x64" dimensions: "os:Windows" }
+    builders { name: "analyzer-analysis-server-linux-dev" }
+    builders { name: "analyzer-linux-release-dev" }
+    builders { name: "analyzer-mac-release-dev" dimensions: "os:Mac" }
+    builders { name: "analyzer-strong-linux-release-dev" }
+    builders { name: "analyzer-strong-mac-release-dev" dimensions: "os:Mac" }
+    builders { name: "analyzer-strong-win-release-dev" dimensions: "os:Windows" }
+    builders { name: "analyzer-win-release-dev" dimensions: "os:Windows" }
+    builders { name: "androidvm-linux-release-x64-dev" mixins: "android" }
+    builders { name: "app-linux-debug-x64-dev" }
+    builders { name: "app-linux-product-x64-dev" }
+    builders { name: "app-linux-release-x64-dev" }
+    builders { name: "cross-vm-linux-release-arm64-dev" }
+    builders { name: "dart-sdk-linux-dev" }
+    builders { name: "dart-sdk-mac-dev" dimensions: "os:Mac" }
+    builders { name: "dart-sdk-win-dev" dimensions: "os:Windows" }
+    builders { name: "dart2js-csp-minified-linux-x64-drt-dev" }
+    builders { name: "dart2js-dumpinfo-linux-ia32-none-dev" }
+    builders { name: "dart2js-faststartup-linux-x64-chrome-dev" }
+    builders { name: "dart2js-hostchecked-linux-ia32-d8-dev" }
+    builders { name: "dart2js-hostchecked-linux-debug-ia32-none-dev" }
+    builders { name: "dart2js-linux-x64-chrome-dev" }
+    builders { name: "dart2js-linux-x64-ff-dev" }
+    builders { name: "dart2js-linux-debug-ia32-none-dev" }
+    builders { name: "dart2js-linux-x64-drt-dev" }
+    builders { name: "dart2js-mac-x64-chrome-dev" dimensions: "os:Mac" }
+    builders { name: "dart2js-mac-x64-safari-dev" dimensions: "os:Mac" }
+    builders { name: "dart2js-minified-linux-x64-d8-dev" }
+    builders { name: "dart2js-only-unittest-linux-ia32-none-dev" }
+    builders { name: "dart2js-win-x64-chrome-dev" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-edge-dev" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-ff-dev" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-ie11-dev" dimensions: "os:Windows" }
+    builders { name: "ddc-linux-release-chrome-dev" }
+    builders { name: "ddc-mac-release-chrome-dev" dimensions: "os:Mac" }
+    builders { name: "ddc-win-release-chrome-dev" dimensions: "os:Windows" }
+    builders { name: "debianpackage-linux-dev" mixins: "debianpackage" }
+    builders { name: "front-end-mac-release-x64-dev" dimensions: "os:Mac" }
+    builders { name: "front-end-linux-release-x64-dev" }
+    builders { name: "front-end-win-release-x64-dev" dimensions: "os:Windows" }
+    builders { name: "pkg-linux-release-dev" }
+    builders { name: "pkg-mac-release-dev" dimensions: "os:Mac" }
+    builders { name: "pkg-win-release-dev" dimensions: "os:Windows" }
+    builders { name: "pub-linux-release-dev" }
+    builders { name: "pub-mac-release-dev" dimensions: "os:Mac" }
+    builders { name: "pub-win-release-dev" dimensions: "os:Windows" }
+    builders { name: "precomp-linux-debug-x64-dev" }
+    builders { name: "precomp-linux-product-x64-dev" }
+    builders { name: "target-vm-linux-release-arm64-dev" dimensions: "cpu:arm64" }
+    builders { name: "versionchecker-linux-dev" }
+    builders { name: "vm-asan-linux-release-x64-dev" }
+    builders { name: "vm-kernel-checked-linux-release-x64-dev" }
+    builders { name: "vm-kernel-legacy-linux-release-x64-dev" }
+    builders { name: "vm-kernel-linux-debug-x64-dev" }
+    builders { name: "vm-kernel-linux-debug-simdbc64-dev" }
+    builders { name: "vm-kernel-linux-release-simarm-dev" }
+    builders { name: "vm-kernel-linux-release-simarm64-dev" }
+    builders { name: "vm-kernel-linux-release-simdbc64-dev" }
+    builders { name: "vm-kernel-linux-release-x64-dev" }
+    builders { name: "vm-kernel-mac-debug-x64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-kernel-mac-release-x64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-kernel-win-release-x64-dev" dimensions: "os:Windows" }
+    builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-dev" }
+    builders { name: "vm-kernel-precomp-linux-debug-x64-dev" mixins: "slow" }
+    builders { name: "vm-kernel-precomp-linux-release-x64-dev" }
+    builders { name: "vm-kernel-precomp-linux-release-simarm-dev" }
+    builders { name: "vm-kernel-precomp-linux-release-simarm64-dev" }
+    builders { name: "vm-kernel-precomp-win-release-x64-dev" dimensions: "os:Windows" }
+    builders { name: "vm-linux-debug-ia32-dev" }
+    builders { name: "vm-linux-debug-simarm-dev" }
+    builders { name: "vm-linux-debug-x64-dev" }
+    builders { name: "vm-linux-product-x64-dev" }
+    builders { name: "vm-linux-release-ia32-dev" }
+    builders { name: "vm-linux-release-simarm-dev" }
+    builders { name: "vm-linux-release-simarm64-dev" }
+    builders { name: "vm-linux-release-x64-dev" }
+    builders { name: "vm-mac-debug-ia32-dev" dimensions: "os:Mac" }
+    builders { name: "vm-mac-debug-simdbc64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-mac-debug-x64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-mac-product-x64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-mac-release-ia32-dev" dimensions: "os:Mac" }
+    builders { name: "vm-mac-release-simdbc64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-mac-release-x64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-noopt-mac-simarm64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-optcounter-threshold-linux-release-ia32-dev" }
+    builders { name: "vm-optcounter-threshold-linux-release-x64-dev" }
+    builders { name: "vm-precomp-android-release-dev" }
+    builders { name: "vm-precomp-win-simarm64-dev" dimensions: "os:Windows" }
+    builders { name: "vm-reload-linux-debug-x64-dev" }
+    builders { name: "vm-reload-linux-release-x64-dev" }
+    builders { name: "vm-reload-mac-debug-simdbc64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-reload-mac-release-simdbc64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-reload-rollback-linux-debug-x64-dev" }
+    builders { name: "vm-reload-rollback-linux-release-x64-dev" }
+    builders { name: "vm-win-debug-ia32-dev" dimensions: "os:Windows" }
+    builders { name: "vm-win-debug-x64-dev" dimensions: "os:Windows" }
+    builders { name: "vm-win-product-x64-dev" dimensions: "os:Windows" }
+    builders { name: "vm-win-release-ia32-dev" dimensions: "os:Windows" }
+    builders { name: "vm-win-release-x64-dev" dimensions: "os:Windows" }
+    builders { name: "analyzer-analysis-server-linux-stable" }
+    builders { name: "analyzer-linux-release-stable" }
+    builders { name: "analyzer-mac-release-stable" dimensions: "os:Mac" }
+    builders { name: "analyzer-strong-linux-release-stable" }
+    builders { name: "analyzer-strong-mac-release-stable" dimensions: "os:Mac" }
+    builders { name: "analyzer-strong-win-release-stable" dimensions: "os:Windows" }
+    builders { name: "analyzer-win-release-stable" dimensions: "os:Windows" }
+    builders { name: "androidvm-linux-release-x64-stable" mixins: "android" }
+    builders { name: "app-linux-debug-x64-stable" }
+    builders { name: "app-linux-product-x64-stable" }
+    builders { name: "app-linux-release-x64-stable" }
+    builders { name: "cross-vm-linux-release-arm64-stable" }
+    builders { name: "dart-sdk-linux-stable" }
+    builders { name: "dart-sdk-mac-stable" dimensions: "os:Mac" }
+    builders { name: "dart-sdk-win-stable" dimensions: "os:Windows" }
+    builders { name: "dart2js-csp-minified-linux-x64-drt-stable" }
+    builders { name: "dart2js-dumpinfo-linux-ia32-none-stable" }
+    builders { name: "dart2js-faststartup-linux-x64-chrome-stable" }
+    builders { name: "dart2js-hostchecked-linux-ia32-d8-stable" }
+    builders { name: "dart2js-hostchecked-linux-debug-ia32-none-stable" }
+    builders { name: "dart2js-linux-x64-chrome-stable" }
+    builders { name: "dart2js-linux-x64-ff-stable" }
+    builders { name: "dart2js-linux-debug-ia32-none-stable" }
+    builders { name: "dart2js-linux-x64-drt-stable" }
+    builders { name: "dart2js-mac-x64-chrome-stable" dimensions: "os:Mac" }
+    builders { name: "dart2js-mac-x64-safari-stable" dimensions: "os:Mac" }
+    builders { name: "dart2js-minified-linux-x64-d8-stable" }
+    builders { name: "dart2js-only-unittest-linux-ia32-none-stable" }
+    builders { name: "dart2js-win-x64-chrome-stable" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-edge-stable" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-ff-stable" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-ie11-stable" dimensions: "os:Windows" }
+    builders { name: "ddc-linux-release-chrome-stable" }
+    builders { name: "ddc-mac-release-chrome-stable" dimensions: "os:Mac" }
+    builders { name: "ddc-win-release-chrome-stable" dimensions: "os:Windows" }
+    builders { name: "debianpackage-linux-stable" mixins: "debianpackage" }
+    builders { name: "front-end-mac-release-x64-stable" dimensions: "os:Mac" }
+    builders { name: "front-end-linux-release-x64-stable" }
+    builders { name: "front-end-win-release-x64-stable" dimensions: "os:Windows" }
+    builders { name: "pkg-linux-release-stable" }
+    builders { name: "pkg-mac-release-stable" dimensions: "os:Mac" }
+    builders { name: "pkg-win-release-stable" dimensions: "os:Windows" }
+    builders { name: "pub-linux-release-stable" }
+    builders { name: "pub-mac-release-stable" dimensions: "os:Mac" }
+    builders { name: "pub-win-release-stable" dimensions: "os:Windows" }
+    builders { name: "precomp-linux-debug-x64-stable" }
+    builders { name: "precomp-linux-product-x64-stable" }
+    builders { name: "target-vm-linux-release-arm64-stable" dimensions: "cpu:arm64" }
+    builders { name: "versionchecker-linux-stable" }
+    builders { name: "vm-asan-linux-release-x64-stable" }
+    builders { name: "vm-kernel-checked-linux-release-x64-stable" }
+    builders { name: "vm-kernel-legacy-linux-release-x64-stable" }
+    builders { name: "vm-kernel-linux-debug-x64-stable" }
+    builders { name: "vm-kernel-linux-debug-simdbc64-stable" }
+    builders { name: "vm-kernel-linux-release-simarm-stable" }
+    builders { name: "vm-kernel-linux-release-simarm64-stable" }
+    builders { name: "vm-kernel-linux-release-simdbc64-stable" }
+    builders { name: "vm-kernel-linux-release-x64-stable" }
+    builders { name: "vm-kernel-mac-debug-x64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-kernel-mac-release-x64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-kernel-win-release-x64-stable" dimensions: "os:Windows" }
+    builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-stable" }
+    builders { name: "vm-kernel-precomp-linux-debug-x64-stable" mixins: "slow" }
+    builders { name: "vm-kernel-precomp-linux-release-x64-stable" }
+    builders { name: "vm-kernel-precomp-linux-release-simarm-stable" }
+    builders { name: "vm-kernel-precomp-linux-release-simarm64-stable" }
+    builders { name: "vm-kernel-precomp-win-release-x64-stable" dimensions: "os:Windows" }
+    builders { name: "vm-linux-debug-ia32-stable" }
+    builders { name: "vm-linux-debug-simarm-stable" }
+    builders { name: "vm-linux-debug-x64-stable" }
+    builders { name: "vm-linux-product-x64-stable" }
+    builders { name: "vm-linux-release-ia32-stable" }
+    builders { name: "vm-linux-release-simarm-stable" }
+    builders { name: "vm-linux-release-simarm64-stable" }
+    builders { name: "vm-linux-release-x64-stable" }
+    builders { name: "vm-mac-debug-ia32-stable" dimensions: "os:Mac" }
+    builders { name: "vm-mac-debug-simdbc64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-mac-debug-x64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-mac-product-x64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-mac-release-ia32-stable" dimensions: "os:Mac" }
+    builders { name: "vm-mac-release-simdbc64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-mac-release-x64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-noopt-mac-simarm64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-optcounter-threshold-linux-release-ia32-stable" }
+    builders { name: "vm-optcounter-threshold-linux-release-x64-stable" }
+    builders { name: "vm-precomp-android-release-stable" }
+    builders { name: "vm-precomp-win-simarm64-stable" dimensions: "os:Windows" }
+    builders { name: "vm-reload-linux-debug-x64-stable" }
+    builders { name: "vm-reload-linux-release-x64-stable" }
+    builders { name: "vm-reload-mac-debug-simdbc64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-reload-mac-release-simdbc64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-reload-rollback-linux-debug-x64-stable" }
+    builders { name: "vm-reload-rollback-linux-release-x64-stable" }
+    builders { name: "vm-win-debug-ia32-stable" dimensions: "os:Windows" }
+    builders { name: "vm-win-debug-x64-stable" dimensions: "os:Windows" }
+    builders { name: "vm-win-product-x64-stable" dimensions: "os:Windows" }
+    builders { name: "vm-win-release-ia32-stable" dimensions: "os:Windows" }
+    builders { name: "vm-win-release-x64-stable" dimensions: "os:Windows" }
   }
 }
 
diff --git a/luci-milo.cfg b/luci-milo.cfg
index c826cb561b92..2fd1d80e771a 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2037,452 +2037,452 @@ consoles: {
   ref: "refs/heads/dev"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
+    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64-dev"
     category: "fasta"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64-dev"
     category: "fasta"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
+    name: "buildbucket/luci.dart.ci/front-end-win-release-x64-dev"
     category: "fasta"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64-dev"
     category: "fasta"
     short_name: "vm"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32-dev"
     category: "vm|debug"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm-dev"
     category: "vm|simarm"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64-dev"
     category: "vm|debug"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32-dev"
     category: "vm|release"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm-dev"
     category: "vm|simarm"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64-dev"
     category: "vm|simarm"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-x64-dev"
     category: "vm|release"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32-dev"
     category: "vm|debug"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64-dev"
     category: "vm|debug"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64-dev"
     category: "vm|debug"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32-dev"
     category: "vm|release"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64-dev"
     category: "vm|release"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-x64-dev"
     category: "vm|release"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32"
+    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32-dev"
     category: "vm|debug"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-win-debug-x64-dev"
     category: "vm|debug"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-release-ia32"
+    name: "buildbucket/luci.dart.ci/vm-win-release-ia32-dev"
     category: "vm|release"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-win-release-x64-dev"
     category: "vm|release"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/app-linux-debug-x64-dev"
     category: "vm|app"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-product-x64"
+    name: "buildbucket/luci.dart.ci/app-linux-product-x64-dev"
     category: "vm|app"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/app-linux-release-x64-dev"
     category: "vm|app"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64-dev"
     category: "vm|kernel"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64-dev"
     category: "vm|kernel"
     short_name: "dbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm-dev"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64-dev"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64-dev"
     category: "vm|kernel"
     short_name: "rbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64-dev"
     category: "vm|kernel"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64-dev"
     category: "vm|kernel"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64-dev"
     category: "vm|kernel"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64-dev"
     category: "vm|kernel"
     short_name: "oc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64-dev"
     category: "vm|kernel"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm-dev"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64-dev"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
+    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64-dev"
     category: "vm|misc"
     short_name: "cra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64"
+    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64-dev"
     category: "vm|misc"
     short_name: "tra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64-dev"
     category: "vm|misc"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32"
+    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32-dev"
     category: "vm|misc"
     short_name: "o32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64-dev"
     category: "vm|misc"
     short_name: "o64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64-dev"
     category: "vm|precomp"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64"
+    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64-dev"
     category: "vm|precomp"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64-dev"
     category: "vm|precomp"
     short_name: "no"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-precomp-android-release"
+    name: "buildbucket/luci.dart.ci/vm-precomp-android-release-dev"
     category: "vm|precomp"
     short_name: "and"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64-dev"
     category: "vm|precomp"
     short_name: "wsi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-product-x64"
+    name: "buildbucket/luci.dart.ci/vm-linux-product-x64-dev"
     category: "vm|product"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-product-x64"
+    name: "buildbucket/luci.dart.ci/vm-mac-product-x64-dev"
     category: "vm|product"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-product-x64"
+    name: "buildbucket/luci.dart.ci/vm-win-product-x64-dev"
     category: "vm|product"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64-dev"
     category: "vm|reload"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64-dev"
     category: "vm|reload"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64-dev"
     category: "vm|reload"
     short_name: "mds"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64-dev"
     category: "vm|reload"
     short_name: "mrs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64-dev"
     category: "vm|reload"
     short_name: "dro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64-dev"
     category: "vm|reload"
     short_name: "rro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8"
+    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8-dev"
     category: "dart2js|d8"
     short_name: "hc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-x64-d8"
+    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-x64-d8-dev"
     category: "dart2js|d8"
     short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none"
+    name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none-dev"
     category: "dart2js|misc"
     short_name: "ut"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-dumpinfo-linux-ia32-none"
+    name: "buildbucket/luci.dart.ci/dart2js-dumpinfo-linux-ia32-none-dev"
     category: "dart2js|misc"
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
+    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux-dev"
     category: "analyzer"
     short_name: "aas"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-linux-release"
+    name: "buildbucket/luci.dart.ci/analyzer-linux-release-dev"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-mac-release"
+    name: "buildbucket/luci.dart.ci/analyzer-mac-release-dev"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release-dev"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release-dev"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release-dev"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-win-release"
+    name: "buildbucket/luci.dart.ci/analyzer-win-release-dev"
     category: "analyzer"
     short_name: "awr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-linux"
+    name: "buildbucket/luci.dart.ci/dart-sdk-linux-dev"
     category: "sdk"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac"
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-dev"
     category: "sdk"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-win"
+    name: "buildbucket/luci.dart.ci/dart-sdk-win-dev"
     category: "sdk"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome"
+    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome-dev"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome"
+    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome-dev"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome"
+    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome-dev"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "fs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff-dev"
     category: "dart2js|ff"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-safari"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-safari-dev"
     category: "dart2js|safari"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-edge"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-edge-dev"
     category: "dart2js|ms"
     short_name: "ed"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ff"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ff-dev"
     category: "dart2js|ff"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ie11"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ie11-dev"
     category: "dart2js|ms"
     short_name: "ie"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-linux-release"
+    name: "buildbucket/luci.dart.ci/pkg-linux-release-dev"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-mac-release"
+    name: "buildbucket/luci.dart.ci/pkg-mac-release-dev"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-win-release"
+    name: "buildbucket/luci.dart.ci/pkg-win-release-dev"
     category: "pkg"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux"
+    name: "buildbucket/luci.dart.ci/debianpackage-linux-dev"
     category: "misc"
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/versionchecker-linux"
+    name: "buildbucket/luci.dart.ci/versionchecker-linux-dev"
     category: "misc"
     short_name: "vc"
   }
@@ -2521,452 +2521,452 @@ consoles: {
   ref: "refs/heads/stable"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
+    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64-stable"
     category: "fasta"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64-stable"
     category: "fasta"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
+    name: "buildbucket/luci.dart.ci/front-end-win-release-x64-stable"
     category: "fasta"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64-stable"
     category: "fasta"
     short_name: "vm"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32-stable"
     category: "vm|debug"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm-stable"
     category: "vm|simarm"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64-stable"
     category: "vm|debug"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32-stable"
     category: "vm|release"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm-stable"
     category: "vm|simarm"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64-stable"
     category: "vm|simarm"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-x64-stable"
     category: "vm|release"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32-stable"
     category: "vm|debug"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64-stable"
     category: "vm|debug"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64-stable"
     category: "vm|debug"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32-stable"
     category: "vm|release"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64-stable"
     category: "vm|release"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-x64-stable"
     category: "vm|release"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32"
+    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32-stable"
     category: "vm|debug"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-win-debug-x64-stable"
     category: "vm|debug"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-release-ia32"
+    name: "buildbucket/luci.dart.ci/vm-win-release-ia32-stable"
     category: "vm|release"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-win-release-x64-stable"
     category: "vm|release"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/app-linux-debug-x64-stable"
     category: "vm|app"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-product-x64"
+    name: "buildbucket/luci.dart.ci/app-linux-product-x64-stable"
     category: "vm|app"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/app-linux-release-x64-stable"
     category: "vm|app"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64-stable"
     category: "vm|kernel"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64-stable"
     category: "vm|kernel"
     short_name: "dbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm-stable"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64-stable"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64-stable"
     category: "vm|kernel"
     short_name: "rbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64-stable"
     category: "vm|kernel"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64-stable"
     category: "vm|kernel"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64-stable"
     category: "vm|kernel"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64-stable"
     category: "vm|kernel"
     short_name: "oc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64-stable"
     category: "vm|kernel"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm-stable"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64-stable"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
+    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64-stable"
     category: "vm|misc"
     short_name: "cra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64"
+    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64-stable"
     category: "vm|misc"
     short_name: "tra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64-stable"
     category: "vm|misc"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32"
+    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32-stable"
     category: "vm|misc"
     short_name: "o32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64-stable"
     category: "vm|misc"
     short_name: "o64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64-stable"
     category: "vm|precomp"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64"
+    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64-stable"
     category: "vm|precomp"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64-stable"
     category: "vm|precomp"
     short_name: "no"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-precomp-android-release"
+    name: "buildbucket/luci.dart.ci/vm-precomp-android-release-stable"
     category: "vm|precomp"
     short_name: "and"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64-stable"
     category: "vm|precomp"
     short_name: "wsi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-product-x64"
+    name: "buildbucket/luci.dart.ci/vm-linux-product-x64-stable"
     category: "vm|product"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-product-x64"
+    name: "buildbucket/luci.dart.ci/vm-mac-product-x64-stable"
     category: "vm|product"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-product-x64"
+    name: "buildbucket/luci.dart.ci/vm-win-product-x64-stable"
     category: "vm|product"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64-stable"
     category: "vm|reload"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64-stable"
     category: "vm|reload"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64-stable"
     category: "vm|reload"
     short_name: "mds"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64-stable"
     category: "vm|reload"
     short_name: "mrs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64-stable"
     category: "vm|reload"
     short_name: "dro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64-stable"
     category: "vm|reload"
     short_name: "rro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8"
+    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8-stable"
     category: "dart2js|d8"
     short_name: "hc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-x64-d8"
+    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-x64-d8-stable"
     category: "dart2js|d8"
     short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none"
+    name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none-stable"
     category: "dart2js|misc"
     short_name: "ut"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-dumpinfo-linux-ia32-none"
+    name: "buildbucket/luci.dart.ci/dart2js-dumpinfo-linux-ia32-none-stable"
     category: "dart2js|misc"
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
+    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux-stable"
     category: "analyzer"
     short_name: "aas"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-linux-release"
+    name: "buildbucket/luci.dart.ci/analyzer-linux-release-stable"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-mac-release"
+    name: "buildbucket/luci.dart.ci/analyzer-mac-release-stable"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release-stable"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release-stable"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release-stable"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-win-release"
+    name: "buildbucket/luci.dart.ci/analyzer-win-release-stable"
     category: "analyzer"
     short_name: "awr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-linux"
+    name: "buildbucket/luci.dart.ci/dart-sdk-linux-stable"
     category: "sdk"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac"
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-stable"
     category: "sdk"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-win"
+    name: "buildbucket/luci.dart.ci/dart-sdk-win-stable"
     category: "sdk"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome"
+    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome-stable"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome"
+    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome-stable"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome"
+    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome-stable"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "fs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff-stable"
     category: "dart2js|ff"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-safari"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-safari-stable"
     category: "dart2js|safari"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-edge"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-edge-stable"
     category: "dart2js|ms"
     short_name: "ed"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ff"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ff-stable"
     category: "dart2js|ff"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ie11"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ie11-stable"
     category: "dart2js|ms"
     short_name: "ie"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-linux-release"
+    name: "buildbucket/luci.dart.ci/pkg-linux-release-stable"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-mac-release"
+    name: "buildbucket/luci.dart.ci/pkg-mac-release-stable"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-win-release"
+    name: "buildbucket/luci.dart.ci/pkg-win-release-stable"
     category: "pkg"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux"
+    name: "buildbucket/luci.dart.ci/debianpackage-linux-stable"
     category: "misc"
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/versionchecker-linux"
+    name: "buildbucket/luci.dart.ci/versionchecker-linux-stable"
     category: "misc"
     short_name: "vc"
   }
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 3c8e33c96fd7..303781bc03da 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -15,13 +15,11 @@ acl_sets {
 }
 
 trigger {
-  id: "dart-gitiles-trigger"
+  id: "dart-gitiles-trigger-master"
   acl_sets: "default"
   gitiles: {
     repo: "https://dart.googlesource.com/sdk/"
     refs: "refs/heads/master"
-    refs: "refs/heads/dev"
-    refs: "refs/heads/stable"
   }
   triggers: "dart-sdk-linux"
   triggers: "dart-sdk-mac"
@@ -48,6 +46,70 @@ trigger {
   triggers: "vm-kernel-precomp-win-release-x64"
 }
 
+trigger {
+  id: "dart-gitiles-trigger-dev"
+  acl_sets: "default"
+  gitiles: {
+    repo: "https://dart.googlesource.com/sdk/"
+    refs: "refs/heads/dev"
+  }
+  triggers: "dart-sdk-linux-dev"
+  triggers: "dart-sdk-mac-dev"
+  triggers: "dart-sdk-win-dev"
+  triggers: "dart2js-faststartup-linux-x64-chrome-dev"
+  triggers: "dart2js-linux-x64-chrome-dev"
+  triggers: "dart2js-mac-x64-chrome-dev"
+  triggers: "dart2js-win-x64-chrome-dev"
+  triggers: "ddc-linux-release-chrome-dev"
+  triggers: "ddc-mac-release-chrome-dev"
+  triggers: "ddc-win-release-chrome-dev"
+  triggers: "front-end-mac-release-x64-dev"
+  triggers: "front-end-linux-release-x64-dev"
+  triggers: "front-end-win-release-x64-dev"
+  triggers: "vm-kernel-legacy-linux-release-x64-dev"
+  triggers: "vm-kernel-linux-debug-simdbc64-dev"
+  triggers: "vm-kernel-linux-release-simarm-dev"
+  triggers: "vm-kernel-linux-release-simarm64-dev"
+  triggers: "vm-kernel-linux-release-simdbc64-dev"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
+  triggers: "vm-kernel-win-release-x64-dev"
+  triggers: "vm-kernel-precomp-linux-release-simarm-dev"
+  triggers: "vm-kernel-precomp-linux-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-win-release-x64-dev"
+}
+
+trigger {
+  id: "dart-gitiles-trigger-stable"
+  acl_sets: "default"
+  gitiles: {
+    repo: "https://dart.googlesource.com/sdk/"
+    refs: "refs/heads/stable"
+  }
+  triggers: "dart-sdk-linux-stable"
+  triggers: "dart-sdk-mac-stable"
+  triggers: "dart-sdk-win-stable"
+  triggers: "dart2js-faststartup-linux-x64-chrome-stable"
+  triggers: "dart2js-linux-x64-chrome-stable"
+  triggers: "dart2js-mac-x64-chrome-stable"
+  triggers: "dart2js-win-x64-chrome-stable"
+  triggers: "ddc-linux-release-chrome-stable"
+  triggers: "ddc-mac-release-chrome-stable"
+  triggers: "ddc-win-release-chrome-stable"
+  triggers: "front-end-mac-release-x64-stable"
+  triggers: "front-end-linux-release-x64-stable"
+  triggers: "front-end-win-release-x64-stable"
+  triggers: "vm-kernel-legacy-linux-release-x64-stable"
+  triggers: "vm-kernel-linux-debug-simdbc64-stable"
+  triggers: "vm-kernel-linux-release-simarm-stable"
+  triggers: "vm-kernel-linux-release-simarm64-stable"
+  triggers: "vm-kernel-linux-release-simdbc64-stable"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
+  triggers: "vm-kernel-win-release-x64-stable"
+  triggers: "vm-kernel-precomp-linux-release-simarm-stable"
+  triggers: "vm-kernel-precomp-linux-release-simarm64-stable"
+  triggers: "vm-kernel-precomp-win-release-x64-stable"
+}
+
 job {
   id: "dart-sdk-linux"
   acl_sets: "default"
@@ -64,6 +126,7 @@ job {
   id: "dart-sdk-mac"
   acl_sets: "default"
   schedule: "triggered"
+  disabled: true
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
@@ -75,6 +138,7 @@ job {
   id: "dart-sdk-win"
   acl_sets: "default"
   schedule: "triggered"
+  disabled: true
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
@@ -301,3 +365,515 @@ job {
     builder: "vm-kernel-precomp-win-release-x64"
   }
 }
+
+job {
+  id: "dart-sdk-linux-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  disabled: true
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-linux-dev"
+  }
+}
+
+job {
+  id: "dart-sdk-mac-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  disabled: true
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-mac-dev"
+  }
+}
+
+job {
+  id: "dart-sdk-win-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  disabled: true
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-win-dev"
+  }
+}
+
+job {
+  id: "dart2js-faststartup-linux-x64-chrome-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart2js-faststartup-linux-x64-chrome-dev"
+  }
+}
+
+job {
+  id: "dart2js-linux-x64-chrome-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart2js-linux-x64-chrome-dev"
+  }
+}
+
+job {
+  id: "dart2js-mac-x64-chrome-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart2js-mac-x64-chrome-dev"
+  }
+}
+
+job {
+  id: "dart2js-win-x64-chrome-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart2js-win-x64-chrome-dev"
+  }
+}
+
+job {
+  id: "ddc-linux-release-chrome-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "ddc-linux-release-chrome-dev"
+  }
+}
+
+job {
+  id: "ddc-mac-release-chrome-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "ddc-mac-release-chrome-dev"
+  }
+}
+
+job {
+  id: "ddc-win-release-chrome-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "ddc-win-release-chrome-dev"
+  }
+}
+
+job {
+  id: "front-end-mac-release-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "front-end-mac-release-x64-dev"
+  }
+}
+
+job {
+  id: "front-end-linux-release-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "front-end-linux-release-x64-dev"
+  }
+}
+
+job {
+  id: "front-end-win-release-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "front-end-win-release-x64-dev"
+  }
+}
+
+job {
+  id: "vm-kernel-legacy-linux-release-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-legacy-linux-release-x64-dev"
+  }
+}
+
+job {
+  id: "vm-kernel-linux-debug-simdbc64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-linux-debug-simdbc64-dev"
+  }
+}
+
+job {
+  id: "vm-kernel-linux-release-simarm-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-linux-release-simarm-dev"
+  }
+}
+
+job {
+  id: "vm-kernel-linux-release-simarm64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-linux-release-simarm64-dev"
+  }
+}
+
+job {
+  id: "vm-kernel-linux-release-simdbc64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-linux-release-simdbc64-dev"
+  }
+}
+
+job {
+  id: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
+  }
+}
+
+job {
+  id: "vm-kernel-win-release-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-win-release-x64-dev"
+  }
+}
+
+job {
+  id: "vm-kernel-precomp-linux-release-simarm-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-precomp-linux-release-simarm-dev"
+  }
+}
+
+job {
+  id: "vm-kernel-precomp-linux-release-simarm64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-precomp-linux-release-simarm64-dev"
+  }
+}
+
+job {
+  id: "vm-kernel-precomp-win-release-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-precomp-win-release-x64-dev"
+  }
+}
+
+job {
+  id: "dart-sdk-linux-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  disabled: true
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-linux-stable"
+  }
+}
+
+job {
+  id: "dart-sdk-mac-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  disabled: true
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-mac-stable"
+  }
+}
+
+job {
+  id: "dart-sdk-win-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  disabled: true
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-win-stable"
+  }
+}
+
+job {
+  id: "dart2js-faststartup-linux-x64-chrome-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart2js-faststartup-linux-x64-chrome-stable"
+  }
+}
+
+job {
+  id: "dart2js-linux-x64-chrome-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart2js-linux-x64-chrome-stable"
+  }
+}
+
+job {
+  id: "dart2js-mac-x64-chrome-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart2js-mac-x64-chrome-stable"
+  }
+}
+
+job {
+  id: "dart2js-win-x64-chrome-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart2js-win-x64-chrome-stable"
+  }
+}
+
+job {
+  id: "ddc-linux-release-chrome-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "ddc-linux-release-chrome-stable"
+  }
+}
+
+job {
+  id: "ddc-mac-release-chrome-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "ddc-mac-release-chrome-stable"
+  }
+}
+
+job {
+  id: "ddc-win-release-chrome-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "ddc-win-release-chrome-stable"
+  }
+}
+
+job {
+  id: "front-end-mac-release-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "front-end-mac-release-x64-stable"
+  }
+}
+
+job {
+  id: "front-end-linux-release-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "front-end-linux-release-x64-stable"
+  }
+}
+
+job {
+  id: "front-end-win-release-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "front-end-win-release-x64-stable"
+  }
+}
+
+job {
+  id: "vm-kernel-legacy-linux-release-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-legacy-linux-release-x64-stable"
+  }
+}
+
+job {
+  id: "vm-kernel-linux-debug-simdbc64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-linux-debug-simdbc64-stable"
+  }
+}
+
+job {
+  id: "vm-kernel-linux-release-simarm-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-linux-release-simarm-stable"
+  }
+}
+
+job {
+  id: "vm-kernel-linux-release-simarm64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-linux-release-simarm64-stable"
+  }
+}
+
+job {
+  id: "vm-kernel-linux-release-simdbc64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-linux-release-simdbc64-stable"
+  }
+}
+
+job {
+  id: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
+  }
+}
+
+job {
+  id: "vm-kernel-win-release-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-win-release-x64-stable"
+  }
+}
+
+job {
+  id: "vm-kernel-precomp-linux-release-simarm-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-precomp-linux-release-simarm-stable"
+  }
+}
+
+job {
+  id: "vm-kernel-precomp-linux-release-simarm64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-precomp-linux-release-simarm64-stable"
+  }
+}
+
+job {
+  id: "vm-kernel-precomp-win-release-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "vm-kernel-precomp-win-release-x64-stable"
+  }
+}

From 157732048cdeab77c20fe3c7ce972c6d7aafb977 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 11 Apr 2018 08:08:36 +0000
Subject: [PATCH 107/826] [infra] Migrate analyzer builders to Luci

https://github.com/dart-lang/sdk/issues/32609

TBR=whesse@google.com

Change-Id: I6d2559a67a511a53169aa53099108130efe17940
Reviewed-on: https://dart-review.googlesource.com/50502
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-milo.cfg      |  42 +++-----
 luci-scheduler.cfg | 252 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 266 insertions(+), 28 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 2fd1d80e771a..8cc5b14b34df 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -529,44 +529,37 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    # migrating to analyzer-analysis-server-linux
-    name: "buildbot/client.dart/analyze-linux-be"
+    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
     category: "analyzer"
     short_name: "as"
   }
   builders {
-    # migrating to analyzer-linux-release
-    name: "buildbot/client.dart/analyzer-linux-release-be"
+    name: "buildbucket/luci.dart.ci/analyzer-linux-release"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    # migrating to analyzer-mac-release
-    name: "buildbot/client.dart/analyzer-mac10.11-release-be"
+    name: "buildbucket/luci.dart.ci/analyzer-mac-release"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    # migrating to analyzer-strong-linux-release
-    name: "buildbot/client.dart/analyzer-linux-release-strong-be"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    # migrating to analyzer-strong-mac-release
-    name: "buildbot/client.dart/analyzer-mac10.11-release-strong-be"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    # migrating to analyzer-strong-win-release
-    name: "buildbot/client.dart/analyzer-win7-release-strong-be"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    # migrating to analyzer-win-release
-    name: "buildbot/client.dart/analyzer-win7-release-be"
+    name: "buildbucket/luci.dart.ci/analyzer-win-release"
     category: "analyzer"
     short_name: "awr"
   }
@@ -874,44 +867,37 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    # migrating to analyzer-analysis-server-linux
-    name: "buildbot/client.dart/analyze-linux-be"
+    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
     category: "analyzer"
     short_name: "as"
   }
   builders {
-    # migrating to analyzer-linux-release
-    name: "buildbot/client.dart/analyzer-linux-release-be"
+    name: "buildbucket/luci.dart.ci/analyzer-linux-release"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    # migrating to analyzer-mac-release
-    name: "buildbot/client.dart/analyzer-mac10.11-release-be"
+    name: "buildbucket/luci.dart.ci/analyzer-mac-release"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    # migrating to analyzer-strong-linux-release
-    name: "buildbot/client.dart/analyzer-linux-release-strong-be"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    # migrating to analyzer-strong-mac-release
-    name: "buildbot/client.dart/analyzer-mac10.11-release-strong-be"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    # migrating to analyzer-strong-win-release
-    name: "buildbot/client.dart/analyzer-win7-release-strong-be"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    # migrating to analyzer-win-release
-    name: "buildbot/client.dart/analyzer-win7-release-be"
+    name: "buildbucket/luci.dart.ci/analyzer-win-release"
     category: "analyzer"
     short_name: "awr"
   }
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 303781bc03da..065a403cdf51 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -21,6 +21,13 @@ trigger {
     repo: "https://dart.googlesource.com/sdk/"
     refs: "refs/heads/master"
   }
+  triggers: "analyzer-analysis-server-linux"
+  triggers: "analyzer-linux-release"
+  triggers: "analyzer-mac-release"
+  triggers: "analyzer-strong-linux-release"
+  triggers: "analyzer-strong-mac-release"
+  triggers: "analyzer-strong-win-release"
+  triggers: "analyzer-win-release"
   triggers: "dart-sdk-linux"
   triggers: "dart-sdk-mac"
   triggers: "dart-sdk-win"
@@ -53,6 +60,13 @@ trigger {
     repo: "https://dart.googlesource.com/sdk/"
     refs: "refs/heads/dev"
   }
+  triggers: "analyzer-analysis-server-linux-dev"
+  triggers: "analyzer-linux-release-dev"
+  triggers: "analyzer-mac-release-dev"
+  triggers: "analyzer-strong-linux-release-dev"
+  triggers: "analyzer-strong-mac-release-dev"
+  triggers: "analyzer-strong-win-release-dev"
+  triggers: "analyzer-win-release-dev"
   triggers: "dart-sdk-linux-dev"
   triggers: "dart-sdk-mac-dev"
   triggers: "dart-sdk-win-dev"
@@ -85,6 +99,13 @@ trigger {
     repo: "https://dart.googlesource.com/sdk/"
     refs: "refs/heads/stable"
   }
+  triggers: "analyzer-analysis-server-linux-stable"
+  triggers: "analyzer-linux-release-stable"
+  triggers: "analyzer-mac-release-stable"
+  triggers: "analyzer-strong-linux-release-stable"
+  triggers: "analyzer-strong-mac-release-stable"
+  triggers: "analyzer-strong-win-release-stable"
+  triggers: "analyzer-win-release-stable"
   triggers: "dart-sdk-linux-stable"
   triggers: "dart-sdk-mac-stable"
   triggers: "dart-sdk-win-stable"
@@ -110,6 +131,83 @@ trigger {
   triggers: "vm-kernel-precomp-win-release-x64-stable"
 }
 
+job {
+  id: "analyzer-analysis-server-linux"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "analyzer-analysis-server-linux"
+  }
+}
+
+job {
+  id: "analyzer-linux-release"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "analyzer-linux-release"
+  }
+}
+
+job {
+  id: "analyzer-mac-release"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "analyzer-mac-release"
+  }
+}
+
+job {
+  id: "analyzer-strong-linux-release"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "analyzer-strong-linux-release"
+  }
+}
+
+job {
+  id: "analyzer-strong-mac-release"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "analyzer-strong-mac-release"
+  }
+}
+
+job {
+  id: "analyzer-strong-win-release"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "analyzer-strong-win-release"
+  }
+}
+
+job {
+  id: "analyzer-win-release"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "analyzer-win-release"
+  }
+}
+
 job {
   id: "dart-sdk-linux"
   acl_sets: "default"
@@ -366,6 +464,83 @@ job {
   }
 }
 
+job {
+  id: "analyzer-analysis-server-linux-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "analyzer-analysis-server-linux-dev"
+  }
+}
+
+job {
+  id: "analyzer-linux-release-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "analyzer-linux-release-dev"
+  }
+}
+
+job {
+  id: "analyzer-mac-release-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "analyzer-mac-release-dev"
+  }
+}
+
+job {
+  id: "analyzer-strong-linux-release-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "analyzer-strong-linux-release-dev"
+  }
+}
+
+job {
+  id: "analyzer-strong-mac-release-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "analyzer-strong-mac-release-dev"
+  }
+}
+
+job {
+  id: "analyzer-strong-win-release-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "analyzer-strong-win-release-dev"
+  }
+}
+
+job {
+  id: "analyzer-win-release-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "analyzer-win-release-dev"
+  }
+}
+
 job {
   id: "dart-sdk-linux-dev"
   acl_sets: "default"
@@ -622,6 +797,83 @@ job {
   }
 }
 
+job {
+  id: "analyzer-analysis-server-linux-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "analyzer-analysis-server-linux-stable"
+  }
+}
+
+job {
+  id: "analyzer-linux-release-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "analyzer-linux-release-stable"
+  }
+}
+
+job {
+  id: "analyzer-mac-release-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "analyzer-mac-release-stable"
+  }
+}
+
+job {
+  id: "analyzer-strong-linux-release-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "analyzer-strong-linux-release-stable"
+  }
+}
+
+job {
+  id: "analyzer-strong-mac-release-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "analyzer-strong-mac-release-stable"
+  }
+}
+
+job {
+  id: "analyzer-strong-win-release-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "analyzer-strong-win-release-stable"
+  }
+}
+
+job {
+  id: "analyzer-win-release-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "analyzer-win-release-stable"
+  }
+}
+
 job {
   id: "dart-sdk-linux-stable"
   acl_sets: "default"

From 99170ca6a5ba45731b2bebf2a3ae3fc9fe3dae16 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 17 Apr 2018 13:39:34 +0000
Subject: [PATCH 108/826] [infra] Add CQ console

Change-Id: Ia69b80bf94f92dc040c5b10ab3dada59a1da0dc5
Reviewed-on: https://dart-review.googlesource.com/51463
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 luci-milo.cfg | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 8cc5b14b34df..542d592d44d4 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -3052,3 +3052,27 @@ consoles: {
     tree_status_host: "dart-status.appspot.com"
   }
 }
+
+consoles: {
+  id: "cq"
+  name: "SDK CQ Console"
+  repo_url: "https://dart.googlesource.com/sdk"
+  ref: "refs/heads/master"
+  manifest_name: "PATCHED"
+  builders { name: "buildbucket/luci.dart.try/analyzer-linux-release-strong-hostchecked-try" }
+  builders { name: "buildbucket/luci.dart.try/benchmark-linux-try" }
+  builders { name: "buildbucket/luci.dart.try/dart-sdk-windows-try" }
+  builders { name: "buildbucket/luci.dart.try/dart2js-linux-d8-hostchecked-try" }
+  builders { name: "buildbucket/luci.dart.try/dart2js-linux-d8-kernel-minified-try" }
+  builders { name: "buildbucket/luci.dart.try/dart2js-linux-none-only-unittest-try" }
+  builders { name: "buildbucket/luci.dart.try/dart2js-linux-x64-chrome-try" }
+  builders { name: "buildbucket/luci.dart.try/ddc-linux-release-chrome-try" }
+  builders { name: "buildbucket/luci.dart.try/front-end-linux-release-x64-try" }
+  builders { name: "buildbucket/luci.dart.try/pkg-linux-release-try" }
+  builders { name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try" }
+  builders { name: "buildbucket/luci.dart.try/vm-kernel-legacy-linux-release-x64-try" }
+  builders { name: "buildbucket/luci.dart.try/vm-kernel-mac-release-x64-try" }
+  builders { name: "buildbucket/luci.dart.try/vm-linux-product-x64-try" }
+  builders { name: "buildbucket/luci.dart.try/vm-linux-release-x64-try" }
+  builders { name: "buildbucket/luci.dart.try/vm-mac-release-x64-try" }
+}

From 09af50cb200092147699fbc22ff7c6b4b5fb7d49 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 17 Apr 2018 13:58:24 +0000
Subject: [PATCH 109/826] [infra] Migrate pkg builders to Luci

* Switch CQ builder to neo.py.

https://github.com/dart-lang/sdk/issues/32656

Change-Id: I0e4b3e7e1427dd87eeabb7662129083edc2678b5
Reviewed-on: https://dart-review.googlesource.com/51461
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 cr-buildbucket.cfg |   3 --
 luci-milo.cfg      |  18 +++----
 luci-scheduler.cfg | 132 ++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 126 insertions(+), 27 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 09de2c8f24d7..791492a3a943 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -551,9 +551,6 @@ buckets {
     }
     builders {
       name: "pkg-linux-release-try"
-      recipe {
-        name: "dart/analyzer_swarming"
-      }
     }
     builders {
       name: "cl-linux-try"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 542d592d44d4..1295ba7e4585 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -710,20 +710,17 @@ consoles: {
 #    short_name: "ie"
 #  }
   builders {
-    # migrating to pkg-linux-release
-    name: "buildbot/client.dart/pkg-linux-release-be"
+    name: "buildbucket/luci.dart.ci/pkg-linux-release"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    # migrating to pkg-mac-release
-    name: "buildbot/client.dart/pkg-mac10.11-release-be"
+    name: "buildbucket/luci.dart.ci/pkg-mac-release"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    # migrating to pkg-win-release
-    name: "buildbot/client.dart/pkg-win7-release-be"
+    name: "buildbucket/luci.dart.ci/pkg-win-release"
     category: "pkg"
     short_name: "w"
   }
@@ -1046,20 +1043,17 @@ consoles: {
 #    short_name: "ie"
 #  }
   builders {
-    # migrating to pkg-linux-release
-    name: "buildbot/client.dart/pkg-linux-release-be"
+    name: "buildbucket/luci.dart.ci/pkg-linux-release"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    # migrating to pkg-mac-release
-    name: "buildbot/client.dart/pkg-mac10.11-release-be"
+    name: "buildbucket/luci.dart.ci/pkg-mac-release"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    # migrating to pkg-win-release
-    name: "buildbot/client.dart/pkg-win7-release-be"
+    name: "buildbucket/luci.dart.ci/pkg-win-release"
     category: "pkg"
     short_name: "w"
   }
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 065a403cdf51..e9e542510a9a 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -41,6 +41,9 @@ trigger {
   triggers: "front-end-mac-release-x64"
   triggers: "front-end-linux-release-x64"
   triggers: "front-end-win-release-x64"
+  triggers: "pkg-linux-release"
+  triggers: "pkg-mac-release"
+  triggers: "pkg-win-release"
   triggers: "vm-kernel-legacy-linux-release-x64"
   triggers: "vm-kernel-linux-debug-simdbc64"
   triggers: "vm-kernel-linux-release-simarm"
@@ -80,6 +83,9 @@ trigger {
   triggers: "front-end-mac-release-x64-dev"
   triggers: "front-end-linux-release-x64-dev"
   triggers: "front-end-win-release-x64-dev"
+  triggers: "pkg-linux-release-dev"
+  triggers: "pkg-mac-release-dev"
+  triggers: "pkg-win-release-dev"
   triggers: "vm-kernel-legacy-linux-release-x64-dev"
   triggers: "vm-kernel-linux-debug-simdbc64-dev"
   triggers: "vm-kernel-linux-release-simarm-dev"
@@ -119,6 +125,9 @@ trigger {
   triggers: "front-end-mac-release-x64-stable"
   triggers: "front-end-linux-release-x64-stable"
   triggers: "front-end-win-release-x64-stable"
+  triggers: "pkg-linux-release-stable"
+  triggers: "pkg-mac-release-stable"
+  triggers: "pkg-win-release-stable"
   triggers: "vm-kernel-legacy-linux-release-x64-stable"
   triggers: "vm-kernel-linux-debug-simdbc64-stable"
   triggers: "vm-kernel-linux-release-simarm-stable"
@@ -322,24 +331,24 @@ job {
 }
 
 job {
-  id: "front-end-mac-release-x64"
+  id: "front-end-linux-release-x64"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
-    builder: "front-end-mac-release-x64"
+    builder: "front-end-linux-release-x64"
   }
 }
 
 job {
-  id: "front-end-linux-release-x64"
+  id: "front-end-mac-release-x64"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
-    builder: "front-end-linux-release-x64"
+    builder: "front-end-mac-release-x64"
   }
 }
 
@@ -354,6 +363,39 @@ job {
   }
 }
 
+job {
+  id: "pkg-linux-release"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "pkg-linux-release"
+  }
+}
+
+job {
+  id: "pkg-mac-release"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "pkg-mac-release"
+  }
+}
+
+job {
+  id: "pkg-win-release"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "pkg-win-release"
+  }
+}
+
 job {
   id: "vm-kernel-legacy-linux-release-x64"
   acl_sets: "default"
@@ -655,24 +697,24 @@ job {
 }
 
 job {
-  id: "front-end-mac-release-x64-dev"
+  id: "front-end-linux-release-x64-dev"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
-    builder: "front-end-mac-release-x64-dev"
+    builder: "front-end-linux-release-x64-dev"
   }
 }
 
 job {
-  id: "front-end-linux-release-x64-dev"
+  id: "front-end-mac-release-x64-dev"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
-    builder: "front-end-linux-release-x64-dev"
+    builder: "front-end-mac-release-x64-dev"
   }
 }
 
@@ -687,6 +729,39 @@ job {
   }
 }
 
+job {
+  id: "pkg-linux-release-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "pkg-linux-release-dev"
+  }
+}
+
+job {
+  id: "pkg-mac-release-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "pkg-mac-release-dev"
+  }
+}
+
+job {
+  id: "pkg-win-release-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "pkg-win-release-dev"
+  }
+}
+
 job {
   id: "vm-kernel-legacy-linux-release-x64-dev"
   acl_sets: "default"
@@ -988,24 +1063,24 @@ job {
 }
 
 job {
-  id: "front-end-mac-release-x64-stable"
+  id: "front-end-linux-release-x64-stable"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
-    builder: "front-end-mac-release-x64-stable"
+    builder: "front-end-linux-release-x64-stable"
   }
 }
 
 job {
-  id: "front-end-linux-release-x64-stable"
+  id: "front-end-mac-release-x64-stable"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
-    builder: "front-end-linux-release-x64-stable"
+    builder: "front-end-mac-release-x64-stable"
   }
 }
 
@@ -1020,6 +1095,39 @@ job {
   }
 }
 
+job {
+  id: "pkg-linux-release-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "pkg-linux-release-stable"
+  }
+}
+
+job {
+  id: "pkg-mac-release-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "pkg-mac-release-stable"
+  }
+}
+
+job {
+  id: "pkg-win-release-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "pkg-win-release-stable"
+  }
+}
+
 job {
   id: "vm-kernel-legacy-linux-release-x64-stable"
   acl_sets: "default"

From 493e36998b22801fe0973e160c76d2312bb352ef Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 19 Apr 2018 11:53:27 +0000
Subject: [PATCH 110/826] [infra] Add links to the CQ console and update some
 link texts

TBR=whesse@google.com

Change-Id: I0e0e295a24c206513b31b6299f1ed811fae9df25
Reviewed-on: https://dart-review.googlesource.com/51842
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-milo.cfg | 60 ++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 45 insertions(+), 15 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 1295ba7e4585..505ee02781ac 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -759,6 +759,11 @@ consoles: {
         url: "https://build.chromium.org/p/client.dart.fyi/console"
         alt: "SDK FYI Console"
       }
+      links: {
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      }
     }
     tree_status_host: "dart-status.appspot.com"
   }
@@ -1521,6 +1526,11 @@ consoles: {
         url: "https://build.chromium.org/p/client.dart.fyi/console"
         alt: "SDK FYI Console"
       }
+      links: {
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      }
     }
     tree_status_host: "dart-status.appspot.com"
   }
@@ -1986,25 +1996,30 @@ consoles: {
     links: {
       name: "Consoles"
       links: {
-        text: "dart.be"
+        text: "SDK BE Console"
         url: "/p/dart/g/be/console"
         alt: "SDK BE Console"
       }
       links: {
-        text: "dart.dev"
+        text: "SDK Dev Console"
         url: "/p/dart/g/dev/console"
         alt: "SDK Dev Console"
       }
       links: {
-        text: "dart.stable"
+        text: "SDK Stable Console"
         url: "/p/dart/g/stable/console"
         alt: "SDK Stable Console"
       }
       links: {
-        text: "dart.fyi"
+        text: "SDK FYI Console"
         url: "/p/dart/g/fyi/console"
         alt: "SDK FYI Console"
       }
+      links: {
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      }
     }
     tree_status_host: "dart-status.appspot.com"
   }
@@ -2470,12 +2485,12 @@ consoles: {
     links: {
       name: "Consoles"
       links: {
-        text: "dart.be"
+        text: "SDK BE Console"
         url: "/p/dart/g/be/console"
         alt: "SDK BE Console"
       }
       links: {
-        text: "dart.dev"
+        text: "SDK Dev Console"
         url: "/p/dart/g/dev/console"
         alt: "SDK Dev Console"
       }
@@ -2485,10 +2500,15 @@ consoles: {
         alt: "SDK Stable Console"
       }
       links: {
-        text: "dart.fyi"
+        text: "SDK FYI Console"
         url: "/p/dart/g/fyi/console"
         alt: "SDK FYI Console"
       }
+      links: {
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      }
     }
     tree_status_host: "dart-status.appspot.com"
   }
@@ -2954,25 +2974,30 @@ consoles: {
     links: {
       name: "Consoles"
       links: {
-        text: "dart.be"
+        text: "SDK BE Console"
         url: "/p/dart/g/be/console"
         alt: "SDK BE Console"
       }
       links: {
-        text: "dart.dev"
+        text: "SDK Dev Console"
         url: "/p/dart/g/dev/console"
         alt: "SDK Dev Console"
       }
       links: {
-        text: "dart.stable"
+        text: "SDK Stable Console"
         url: "/p/dart/g/stable/console"
         alt: "SDK Stable Console"
       }
       links: {
-        text: "dart.fyi"
+        text: "SDK FYI Console"
         url: "/p/dart/g/fyi/console"
         alt: "SDK FYI Console"
       }
+      links: {
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      }
     }
     tree_status_host: "dart-status.appspot.com"
   }
@@ -3023,25 +3048,30 @@ consoles: {
     links: {
       name: "Consoles"
       links: {
-        text: "dart.be"
+        text: "SDK BE Console"
         url: "/p/dart/g/be/console"
         alt: "SDK BE Console"
       }
       links: {
-        text: "dart.dev"
+        text: "SDK Dev Console"
         url: "/p/dart/g/dev/console"
         alt: "SDK Dev Console"
       }
       links: {
-        text: "dart.stable"
+        text: "SDK Stable Console"
         url: "/p/dart/g/stable/console"
         alt: "SDK Stable Console"
       }
       links: {
-        text: "dart.fyi"
+        text: "SDK FYI Console"
         url: "/p/dart/g/fyi/console"
         alt: "SDK FYI Console"
       }
+      links: {
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      }
     }
     tree_status_host: "dart-status.appspot.com"
   }

From a18e6bb1a3e0390d2b219b3da44d8463209b7c17 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 1 May 2018 11:04:42 +0000
Subject: [PATCH 111/826] [infra] Switch vm-kernel-linux CQ builder to test
 matrix

TBR=sortie@google.com

Change-Id: I8335830602753978e6756434970fcc13d0f1cca2
Reviewed-on: https://dart-review.googlesource.com/53207
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 791492a3a943..bbd1fb136ad6 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -457,10 +457,7 @@ buckets {
     builders {
       name: "vm-kernel-legacy-linux-release-x64-try"
     }
-    builders {
-      name: "vm-kernel-linux-release-x64-try"
-      mixins: "vm-kernel"
-    }
+    builders { name: "vm-kernel-linux-release-x64-try" }
     builders {
       name: "vm-kernel-linux-debug-x64-try"
       mixins: "vm-kernel"

From a8bb29dfb0f3493336a1a791e6aaa23eedc119bd Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 3 May 2018 10:13:40 +0000
Subject: [PATCH 112/826] [infra] Refactor cr-buildbucket.cfg

This is part 2 of 3 CLs to create a separate pool of bots for luci.dart.ci.

* Add luci.dart.ci.sandbox bucket.
* Move CI builders that don't require privileged access to their own bucket.
* Use mixins to make it easier to change common builder properties.
* Sort CQ builders.
* Removed some unused CQ builders.

Change-Id: I0e5fd2a616bbed86dfc01e1fb32c4fc924a2ac74
Reviewed-on: https://dart-review.googlesource.com/53101
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 cr-buildbucket.cfg | 507 ++++++++++++++++-------------------
 luci-milo.cfg      | 654 ++++++++++++++++++++++-----------------------
 luci-scheduler.cfg | 180 ++++++-------
 3 files changed, 651 insertions(+), 690 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index bbd1fb136ad6..38a6073c64ea 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -7,7 +7,7 @@
 # Please keep this list sorted by bucket name.
 
 acl_sets {
-  name: "waterfall"
+  name: "ci"
   acls {
     role: READER
     group: "all"
@@ -23,7 +23,7 @@ acl_sets {
 }
 
 acl_sets {
-  name: "tryserver"
+  name: "try"
   acls {
     role: READER
     group: "all"
@@ -43,11 +43,38 @@ builder_mixins {
   # todo(athom): how should this machine be defined?
 }
 
+builder_mixins {
+  name: "clobber"
+  recipe {
+    properties: "clobber:true"
+  }
+}
+
+builder_mixins {
+  name: "dart2js"
+  recipe {
+    name: "dart/dart2js_swarming"
+    properties_j: "shards:6"
+  }
+}
+
 builder_mixins {
   name: "debianpackage"
   # todo(athom): how should this machine be defined?
 }
 
+builder_mixins {
+  name: "mac"
+  dimensions: "os:Mac"
+}
+
+builder_mixins {
+  name: "sdk"
+  recipe {
+    name: "dart/sdk_swarming"
+  }
+}
+
 builder_mixins {
   name: "slow"
   execution_timeout_secs: 21600 # 6h
@@ -56,6 +83,13 @@ builder_mixins {
   }
 }
 
+builder_mixins {
+  name: "vm"
+  recipe {
+    name: "dart/dart_vm"
+  }
+}
+
 builder_mixins {
   name: "vm-kernel"
   recipe {
@@ -64,9 +98,15 @@ builder_mixins {
   }
 }
 
+builder_mixins {
+  name: "win"
+  dimensions: "os:Windows"
+}
+
 buckets {
+  # CI Builders that require special permissions
   name: "luci.dart.ci"
-  acl_sets: "waterfall"
+  acl_sets: "ci"
 
   swarming {
     hostname: "chromium-swarm.appspot.com"
@@ -92,21 +132,66 @@ buckets {
       }
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     }
+
+    # CI Builders that require privileged access
+    builders { name: "dart-sdk-linux" }
+    builders { name: "dart-sdk-mac" mixins: "mac" }
+    builders { name: "dart-sdk-win" mixins: "win" }
+    builders { name: "debianpackage-linux" mixins: "debianpackage" }
+    builders { name: "dart-sdk-linux-dev" }
+    builders { name: "dart-sdk-mac-dev" mixins: "mac" }
+    builders { name: "dart-sdk-win-dev" mixins: "win" }
+    builders { name: "debianpackage-linux-dev" mixins: "debianpackage" }
+    builders { name: "dart-sdk-linux-stable" }
+    builders { name: "dart-sdk-mac-stable" mixins: "mac" }
+    builders { name: "dart-sdk-win-stable" mixins: "win" }
+    builders { name: "debianpackage-linux-stable" mixins: "debianpackage" }
+  }
+}
+
+buckets {
+  # CI Builders that only require try permissions
+  name: "luci.dart.ci.sandbox"
+  acl_sets: "ci"
+
+  swarming {
+    hostname: "chromium-swarm.appspot.com"
+    url_format: "https://ci.chromium.org/swarming/task/{task_id}"
+    builder_defaults {
+      category: "Dart CI (Sandboxed)"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      build_numbers: YES
+      priority: 50
+      swarming_tags: "vpython:native-python-wrapper"
+      caches {
+        path: "browsers"
+        name: "browsers"
+      }
+      recipe {
+        repository: "https://chromium.googlesource.com/chromium/tools/build.git"
+        properties: "mastername:client.dart"
+        name: "dart/neo"
+        # TODO(vadimsh): make sure the service account has all necessary Git and
+        # GS permissions and remove this line, see https://crbug.com/776035
+        properties_j: "$kitchen:{\"git_auth\": false, \"devshell\": false}"
+      }
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+
+    # CI Builders for the master branch
     builders { name: "analyzer-analysis-server-linux" }
     builders { name: "analyzer-linux-release" }
-    builders { name: "analyzer-mac-release" dimensions: "os:Mac" }
+    builders { name: "analyzer-mac-release" mixins: "mac" }
     builders { name: "analyzer-strong-linux-release" }
-    builders { name: "analyzer-strong-mac-release" dimensions: "os:Mac" }
-    builders { name: "analyzer-strong-win-release" dimensions: "os:Windows" }
-    builders { name: "analyzer-win-release" dimensions: "os:Windows" }
+    builders { name: "analyzer-strong-mac-release" mixins: "mac" }
+    builders { name: "analyzer-strong-win-release" mixins: "win" }
+    builders { name: "analyzer-win-release" mixins: "win" }
     builders { name: "androidvm-linux-release-x64" mixins: "android" }
     builders { name: "app-linux-debug-x64" }
     builders { name: "app-linux-product-x64" }
     builders { name: "app-linux-release-x64" }
     builders { name: "cross-vm-linux-release-arm64" }
-    builders { name: "dart-sdk-linux" }
-    builders { name: "dart-sdk-mac" dimensions: "os:Mac" }
-    builders { name: "dart-sdk-win" dimensions: "os:Windows" }
     builders { name: "dart2js-csp-minified-linux-x64-drt" }
     builders { name: "dart2js-dumpinfo-linux-ia32-none" }
     builders { name: "dart2js-faststartup-linux-x64-chrome" }
@@ -116,27 +201,26 @@ buckets {
     builders { name: "dart2js-linux-x64-ff" }
     builders { name: "dart2js-linux-debug-ia32-none" }
     builders { name: "dart2js-linux-x64-drt" }
-    builders { name: "dart2js-mac-x64-chrome" dimensions: "os:Mac" }
-    builders { name: "dart2js-mac-x64-safari" dimensions: "os:Mac" }
+    builders { name: "dart2js-mac-x64-chrome" mixins: "mac" }
+    builders { name: "dart2js-mac-x64-safari" mixins: "mac" }
     builders { name: "dart2js-minified-linux-x64-d8" }
     builders { name: "dart2js-only-unittest-linux-ia32-none" }
-    builders { name: "dart2js-win-x64-chrome" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-x64-edge" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-x64-ff" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-x64-ie11" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-chrome" mixins: "win" }
+    builders { name: "dart2js-win-x64-edge" mixins: "win" }
+    builders { name: "dart2js-win-x64-ff" mixins: "win" }
+    builders { name: "dart2js-win-x64-ie11" mixins: "win" }
     builders { name: "ddc-linux-release-chrome" }
-    builders { name: "ddc-mac-release-chrome" dimensions: "os:Mac" }
-    builders { name: "ddc-win-release-chrome" dimensions: "os:Windows" }
-    builders { name: "debianpackage-linux" mixins: "debianpackage" }
-    builders { name: "front-end-mac-release-x64" dimensions: "os:Mac" }
+    builders { name: "ddc-mac-release-chrome" mixins: "mac" }
+    builders { name: "ddc-win-release-chrome" mixins: "win" }
+    builders { name: "front-end-mac-release-x64" mixins: "mac" }
     builders { name: "front-end-linux-release-x64" }
-    builders { name: "front-end-win-release-x64" dimensions: "os:Windows" }
+    builders { name: "front-end-win-release-x64" mixins: "win" }
     builders { name: "pkg-linux-release" }
-    builders { name: "pkg-mac-release" dimensions: "os:Mac" }
-    builders { name: "pkg-win-release" dimensions: "os:Windows" }
+    builders { name: "pkg-mac-release" mixins: "mac" }
+    builders { name: "pkg-win-release" mixins: "win" }
     builders { name: "pub-linux-release" }
-    builders { name: "pub-mac-release" dimensions: "os:Mac" }
-    builders { name: "pub-win-release" dimensions: "os:Windows" }
+    builders { name: "pub-mac-release" mixins: "mac" }
+    builders { name: "pub-win-release" mixins: "win" }
     builders { name: "precomp-linux-debug-x64" }
     builders { name: "precomp-linux-product-x64" }
     builders { name: "target-vm-linux-release-arm64" dimensions: "cpu:arm64" }
@@ -150,15 +234,15 @@ buckets {
     builders { name: "vm-kernel-linux-release-simarm64" }
     builders { name: "vm-kernel-linux-release-simdbc64" }
     builders { name: "vm-kernel-linux-release-x64" }
-    builders { name: "vm-kernel-mac-debug-x64" dimensions: "os:Mac" }
-    builders { name: "vm-kernel-mac-release-x64" dimensions: "os:Mac" }
-    builders { name: "vm-kernel-win-release-x64" dimensions: "os:Windows" }
+    builders { name: "vm-kernel-mac-debug-x64" mixins: "mac" }
+    builders { name: "vm-kernel-mac-release-x64" mixins: "mac" }
+    builders { name: "vm-kernel-win-release-x64" mixins: "win" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-debug-x64" mixins: "slow" }
     builders { name: "vm-kernel-precomp-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-release-simarm" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64" }
-    builders { name: "vm-kernel-precomp-win-release-x64" dimensions: "os:Windows" }
+    builders { name: "vm-kernel-precomp-win-release-x64" mixins: "win" }
     builders { name: "vm-linux-debug-ia32" }
     builders { name: "vm-linux-debug-simarm" }
     builders { name: "vm-linux-debug-x64" }
@@ -167,44 +251,43 @@ buckets {
     builders { name: "vm-linux-release-simarm" }
     builders { name: "vm-linux-release-simarm64" }
     builders { name: "vm-linux-release-x64" }
-    builders { name: "vm-mac-debug-ia32" dimensions: "os:Mac" }
-    builders { name: "vm-mac-debug-simdbc64" dimensions: "os:Mac" }
-    builders { name: "vm-mac-debug-x64" dimensions: "os:Mac" }
-    builders { name: "vm-mac-product-x64" dimensions: "os:Mac" }
-    builders { name: "vm-mac-release-ia32" dimensions: "os:Mac" }
-    builders { name: "vm-mac-release-simdbc64" dimensions: "os:Mac" }
-    builders { name: "vm-mac-release-x64" dimensions: "os:Mac" }
-    builders { name: "vm-noopt-mac-simarm64" dimensions: "os:Mac" }
+    builders { name: "vm-mac-debug-ia32" mixins: "mac" }
+    builders { name: "vm-mac-debug-simdbc64" mixins: "mac" }
+    builders { name: "vm-mac-debug-x64" mixins: "mac" }
+    builders { name: "vm-mac-product-x64" mixins: "mac" }
+    builders { name: "vm-mac-release-ia32" mixins: "mac" }
+    builders { name: "vm-mac-release-simdbc64" mixins: "mac" }
+    builders { name: "vm-mac-release-x64" mixins: "mac" }
+    builders { name: "vm-noopt-mac-simarm64" mixins: "mac" }
     builders { name: "vm-optcounter-threshold-linux-release-ia32" }
     builders { name: "vm-optcounter-threshold-linux-release-x64" }
     builders { name: "vm-precomp-android-release" }
-    builders { name: "vm-precomp-win-simarm64" dimensions: "os:Windows" }
+    builders { name: "vm-precomp-win-simarm64" mixins: "win" }
     builders { name: "vm-reload-linux-debug-x64" }
     builders { name: "vm-reload-linux-release-x64" }
-    builders { name: "vm-reload-mac-debug-simdbc64" dimensions: "os:Mac" }
-    builders { name: "vm-reload-mac-release-simdbc64" dimensions: "os:Mac" }
+    builders { name: "vm-reload-mac-debug-simdbc64" mixins: "mac" }
+    builders { name: "vm-reload-mac-release-simdbc64" mixins: "mac" }
     builders { name: "vm-reload-rollback-linux-debug-x64" }
     builders { name: "vm-reload-rollback-linux-release-x64" }
-    builders { name: "vm-win-debug-ia32" dimensions: "os:Windows" }
-    builders { name: "vm-win-debug-x64" dimensions: "os:Windows" }
-    builders { name: "vm-win-product-x64" dimensions: "os:Windows" }
-    builders { name: "vm-win-release-ia32" dimensions: "os:Windows" }
-    builders { name: "vm-win-release-x64" dimensions: "os:Windows" }
+    builders { name: "vm-win-debug-ia32" mixins: "win" }
+    builders { name: "vm-win-debug-x64" mixins: "win" }
+    builders { name: "vm-win-product-x64" mixins: "win" }
+    builders { name: "vm-win-release-ia32" mixins: "win" }
+    builders { name: "vm-win-release-x64" mixins: "win" }
+
+    # CI Builders for the dev branch
     builders { name: "analyzer-analysis-server-linux-dev" }
     builders { name: "analyzer-linux-release-dev" }
-    builders { name: "analyzer-mac-release-dev" dimensions: "os:Mac" }
+    builders { name: "analyzer-mac-release-dev" mixins: "mac" }
     builders { name: "analyzer-strong-linux-release-dev" }
-    builders { name: "analyzer-strong-mac-release-dev" dimensions: "os:Mac" }
-    builders { name: "analyzer-strong-win-release-dev" dimensions: "os:Windows" }
-    builders { name: "analyzer-win-release-dev" dimensions: "os:Windows" }
+    builders { name: "analyzer-strong-mac-release-dev" mixins: "mac" }
+    builders { name: "analyzer-strong-win-release-dev" mixins: "win" }
+    builders { name: "analyzer-win-release-dev" mixins: "win" }
     builders { name: "androidvm-linux-release-x64-dev" mixins: "android" }
     builders { name: "app-linux-debug-x64-dev" }
     builders { name: "app-linux-product-x64-dev" }
     builders { name: "app-linux-release-x64-dev" }
     builders { name: "cross-vm-linux-release-arm64-dev" }
-    builders { name: "dart-sdk-linux-dev" }
-    builders { name: "dart-sdk-mac-dev" dimensions: "os:Mac" }
-    builders { name: "dart-sdk-win-dev" dimensions: "os:Windows" }
     builders { name: "dart2js-csp-minified-linux-x64-drt-dev" }
     builders { name: "dart2js-dumpinfo-linux-ia32-none-dev" }
     builders { name: "dart2js-faststartup-linux-x64-chrome-dev" }
@@ -214,27 +297,26 @@ buckets {
     builders { name: "dart2js-linux-x64-ff-dev" }
     builders { name: "dart2js-linux-debug-ia32-none-dev" }
     builders { name: "dart2js-linux-x64-drt-dev" }
-    builders { name: "dart2js-mac-x64-chrome-dev" dimensions: "os:Mac" }
-    builders { name: "dart2js-mac-x64-safari-dev" dimensions: "os:Mac" }
+    builders { name: "dart2js-mac-x64-chrome-dev" mixins: "mac" }
+    builders { name: "dart2js-mac-x64-safari-dev" mixins: "mac" }
     builders { name: "dart2js-minified-linux-x64-d8-dev" }
     builders { name: "dart2js-only-unittest-linux-ia32-none-dev" }
-    builders { name: "dart2js-win-x64-chrome-dev" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-x64-edge-dev" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-x64-ff-dev" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-x64-ie11-dev" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-chrome-dev" mixins: "win" }
+    builders { name: "dart2js-win-x64-edge-dev" mixins: "win" }
+    builders { name: "dart2js-win-x64-ff-dev" mixins: "win" }
+    builders { name: "dart2js-win-x64-ie11-dev" mixins: "win" }
     builders { name: "ddc-linux-release-chrome-dev" }
-    builders { name: "ddc-mac-release-chrome-dev" dimensions: "os:Mac" }
-    builders { name: "ddc-win-release-chrome-dev" dimensions: "os:Windows" }
-    builders { name: "debianpackage-linux-dev" mixins: "debianpackage" }
-    builders { name: "front-end-mac-release-x64-dev" dimensions: "os:Mac" }
+    builders { name: "ddc-mac-release-chrome-dev" mixins: "mac" }
+    builders { name: "ddc-win-release-chrome-dev" mixins: "win" }
+    builders { name: "front-end-mac-release-x64-dev" mixins: "mac" }
     builders { name: "front-end-linux-release-x64-dev" }
-    builders { name: "front-end-win-release-x64-dev" dimensions: "os:Windows" }
+    builders { name: "front-end-win-release-x64-dev" mixins: "win" }
     builders { name: "pkg-linux-release-dev" }
-    builders { name: "pkg-mac-release-dev" dimensions: "os:Mac" }
-    builders { name: "pkg-win-release-dev" dimensions: "os:Windows" }
+    builders { name: "pkg-mac-release-dev" mixins: "mac" }
+    builders { name: "pkg-win-release-dev" mixins: "win" }
     builders { name: "pub-linux-release-dev" }
-    builders { name: "pub-mac-release-dev" dimensions: "os:Mac" }
-    builders { name: "pub-win-release-dev" dimensions: "os:Windows" }
+    builders { name: "pub-mac-release-dev" mixins: "mac" }
+    builders { name: "pub-win-release-dev" mixins: "win" }
     builders { name: "precomp-linux-debug-x64-dev" }
     builders { name: "precomp-linux-product-x64-dev" }
     builders { name: "target-vm-linux-release-arm64-dev" dimensions: "cpu:arm64" }
@@ -248,15 +330,15 @@ buckets {
     builders { name: "vm-kernel-linux-release-simarm64-dev" }
     builders { name: "vm-kernel-linux-release-simdbc64-dev" }
     builders { name: "vm-kernel-linux-release-x64-dev" }
-    builders { name: "vm-kernel-mac-debug-x64-dev" dimensions: "os:Mac" }
-    builders { name: "vm-kernel-mac-release-x64-dev" dimensions: "os:Mac" }
-    builders { name: "vm-kernel-win-release-x64-dev" dimensions: "os:Windows" }
+    builders { name: "vm-kernel-mac-debug-x64-dev" mixins: "mac" }
+    builders { name: "vm-kernel-mac-release-x64-dev" mixins: "mac" }
+    builders { name: "vm-kernel-win-release-x64-dev" mixins: "win" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-dev" mixins: "slow" }
     builders { name: "vm-kernel-precomp-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-dev" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-dev" }
-    builders { name: "vm-kernel-precomp-win-release-x64-dev" dimensions: "os:Windows" }
+    builders { name: "vm-kernel-precomp-win-release-x64-dev" mixins: "win" }
     builders { name: "vm-linux-debug-ia32-dev" }
     builders { name: "vm-linux-debug-simarm-dev" }
     builders { name: "vm-linux-debug-x64-dev" }
@@ -265,44 +347,43 @@ buckets {
     builders { name: "vm-linux-release-simarm-dev" }
     builders { name: "vm-linux-release-simarm64-dev" }
     builders { name: "vm-linux-release-x64-dev" }
-    builders { name: "vm-mac-debug-ia32-dev" dimensions: "os:Mac" }
-    builders { name: "vm-mac-debug-simdbc64-dev" dimensions: "os:Mac" }
-    builders { name: "vm-mac-debug-x64-dev" dimensions: "os:Mac" }
-    builders { name: "vm-mac-product-x64-dev" dimensions: "os:Mac" }
-    builders { name: "vm-mac-release-ia32-dev" dimensions: "os:Mac" }
-    builders { name: "vm-mac-release-simdbc64-dev" dimensions: "os:Mac" }
-    builders { name: "vm-mac-release-x64-dev" dimensions: "os:Mac" }
-    builders { name: "vm-noopt-mac-simarm64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-mac-debug-ia32-dev" mixins: "mac" }
+    builders { name: "vm-mac-debug-simdbc64-dev" mixins: "mac" }
+    builders { name: "vm-mac-debug-x64-dev" mixins: "mac" }
+    builders { name: "vm-mac-product-x64-dev" mixins: "mac" }
+    builders { name: "vm-mac-release-ia32-dev" mixins: "mac" }
+    builders { name: "vm-mac-release-simdbc64-dev" mixins: "mac" }
+    builders { name: "vm-mac-release-x64-dev" mixins: "mac" }
+    builders { name: "vm-noopt-mac-simarm64-dev" mixins: "mac" }
     builders { name: "vm-optcounter-threshold-linux-release-ia32-dev" }
     builders { name: "vm-optcounter-threshold-linux-release-x64-dev" }
     builders { name: "vm-precomp-android-release-dev" }
-    builders { name: "vm-precomp-win-simarm64-dev" dimensions: "os:Windows" }
+    builders { name: "vm-precomp-win-simarm64-dev" mixins: "win" }
     builders { name: "vm-reload-linux-debug-x64-dev" }
     builders { name: "vm-reload-linux-release-x64-dev" }
-    builders { name: "vm-reload-mac-debug-simdbc64-dev" dimensions: "os:Mac" }
-    builders { name: "vm-reload-mac-release-simdbc64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-reload-mac-debug-simdbc64-dev" mixins: "mac" }
+    builders { name: "vm-reload-mac-release-simdbc64-dev" mixins: "mac" }
     builders { name: "vm-reload-rollback-linux-debug-x64-dev" }
     builders { name: "vm-reload-rollback-linux-release-x64-dev" }
-    builders { name: "vm-win-debug-ia32-dev" dimensions: "os:Windows" }
-    builders { name: "vm-win-debug-x64-dev" dimensions: "os:Windows" }
-    builders { name: "vm-win-product-x64-dev" dimensions: "os:Windows" }
-    builders { name: "vm-win-release-ia32-dev" dimensions: "os:Windows" }
-    builders { name: "vm-win-release-x64-dev" dimensions: "os:Windows" }
+    builders { name: "vm-win-debug-ia32-dev" mixins: "win" }
+    builders { name: "vm-win-debug-x64-dev" mixins: "win" }
+    builders { name: "vm-win-product-x64-dev" mixins: "win" }
+    builders { name: "vm-win-release-ia32-dev" mixins: "win" }
+    builders { name: "vm-win-release-x64-dev" mixins: "win" }
+
+    # CI Builders for the stable branch
     builders { name: "analyzer-analysis-server-linux-stable" }
     builders { name: "analyzer-linux-release-stable" }
-    builders { name: "analyzer-mac-release-stable" dimensions: "os:Mac" }
+    builders { name: "analyzer-mac-release-stable" mixins: "mac" }
     builders { name: "analyzer-strong-linux-release-stable" }
-    builders { name: "analyzer-strong-mac-release-stable" dimensions: "os:Mac" }
-    builders { name: "analyzer-strong-win-release-stable" dimensions: "os:Windows" }
-    builders { name: "analyzer-win-release-stable" dimensions: "os:Windows" }
+    builders { name: "analyzer-strong-mac-release-stable" mixins: "mac" }
+    builders { name: "analyzer-strong-win-release-stable" mixins: "win" }
+    builders { name: "analyzer-win-release-stable" mixins: "win" }
     builders { name: "androidvm-linux-release-x64-stable" mixins: "android" }
     builders { name: "app-linux-debug-x64-stable" }
     builders { name: "app-linux-product-x64-stable" }
     builders { name: "app-linux-release-x64-stable" }
     builders { name: "cross-vm-linux-release-arm64-stable" }
-    builders { name: "dart-sdk-linux-stable" }
-    builders { name: "dart-sdk-mac-stable" dimensions: "os:Mac" }
-    builders { name: "dart-sdk-win-stable" dimensions: "os:Windows" }
     builders { name: "dart2js-csp-minified-linux-x64-drt-stable" }
     builders { name: "dart2js-dumpinfo-linux-ia32-none-stable" }
     builders { name: "dart2js-faststartup-linux-x64-chrome-stable" }
@@ -312,27 +393,26 @@ buckets {
     builders { name: "dart2js-linux-x64-ff-stable" }
     builders { name: "dart2js-linux-debug-ia32-none-stable" }
     builders { name: "dart2js-linux-x64-drt-stable" }
-    builders { name: "dart2js-mac-x64-chrome-stable" dimensions: "os:Mac" }
-    builders { name: "dart2js-mac-x64-safari-stable" dimensions: "os:Mac" }
+    builders { name: "dart2js-mac-x64-chrome-stable" mixins: "mac" }
+    builders { name: "dart2js-mac-x64-safari-stable" mixins: "mac" }
     builders { name: "dart2js-minified-linux-x64-d8-stable" }
     builders { name: "dart2js-only-unittest-linux-ia32-none-stable" }
-    builders { name: "dart2js-win-x64-chrome-stable" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-x64-edge-stable" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-x64-ff-stable" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-x64-ie11-stable" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-chrome-stable" mixins: "win" }
+    builders { name: "dart2js-win-x64-edge-stable" mixins: "win" }
+    builders { name: "dart2js-win-x64-ff-stable" mixins: "win" }
+    builders { name: "dart2js-win-x64-ie11-stable" mixins: "win" }
     builders { name: "ddc-linux-release-chrome-stable" }
-    builders { name: "ddc-mac-release-chrome-stable" dimensions: "os:Mac" }
-    builders { name: "ddc-win-release-chrome-stable" dimensions: "os:Windows" }
-    builders { name: "debianpackage-linux-stable" mixins: "debianpackage" }
-    builders { name: "front-end-mac-release-x64-stable" dimensions: "os:Mac" }
+    builders { name: "ddc-mac-release-chrome-stable" mixins: "mac" }
+    builders { name: "ddc-win-release-chrome-stable" mixins: "win" }
+    builders { name: "front-end-mac-release-x64-stable" mixins: "mac" }
     builders { name: "front-end-linux-release-x64-stable" }
-    builders { name: "front-end-win-release-x64-stable" dimensions: "os:Windows" }
+    builders { name: "front-end-win-release-x64-stable" mixins: "win" }
     builders { name: "pkg-linux-release-stable" }
-    builders { name: "pkg-mac-release-stable" dimensions: "os:Mac" }
-    builders { name: "pkg-win-release-stable" dimensions: "os:Windows" }
+    builders { name: "pkg-mac-release-stable" mixins: "mac" }
+    builders { name: "pkg-win-release-stable" mixins: "win" }
     builders { name: "pub-linux-release-stable" }
-    builders { name: "pub-mac-release-stable" dimensions: "os:Mac" }
-    builders { name: "pub-win-release-stable" dimensions: "os:Windows" }
+    builders { name: "pub-mac-release-stable" mixins: "mac" }
+    builders { name: "pub-win-release-stable" mixins: "win" }
     builders { name: "precomp-linux-debug-x64-stable" }
     builders { name: "precomp-linux-product-x64-stable" }
     builders { name: "target-vm-linux-release-arm64-stable" dimensions: "cpu:arm64" }
@@ -346,15 +426,15 @@ buckets {
     builders { name: "vm-kernel-linux-release-simarm64-stable" }
     builders { name: "vm-kernel-linux-release-simdbc64-stable" }
     builders { name: "vm-kernel-linux-release-x64-stable" }
-    builders { name: "vm-kernel-mac-debug-x64-stable" dimensions: "os:Mac" }
-    builders { name: "vm-kernel-mac-release-x64-stable" dimensions: "os:Mac" }
-    builders { name: "vm-kernel-win-release-x64-stable" dimensions: "os:Windows" }
+    builders { name: "vm-kernel-mac-debug-x64-stable" mixins: "mac" }
+    builders { name: "vm-kernel-mac-release-x64-stable" mixins: "mac" }
+    builders { name: "vm-kernel-win-release-x64-stable" mixins: "win" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-stable" mixins: "slow" }
     builders { name: "vm-kernel-precomp-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-stable" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-stable" }
-    builders { name: "vm-kernel-precomp-win-release-x64-stable" dimensions: "os:Windows" }
+    builders { name: "vm-kernel-precomp-win-release-x64-stable" mixins: "win" }
     builders { name: "vm-linux-debug-ia32-stable" }
     builders { name: "vm-linux-debug-simarm-stable" }
     builders { name: "vm-linux-debug-x64-stable" }
@@ -363,41 +443,41 @@ buckets {
     builders { name: "vm-linux-release-simarm-stable" }
     builders { name: "vm-linux-release-simarm64-stable" }
     builders { name: "vm-linux-release-x64-stable" }
-    builders { name: "vm-mac-debug-ia32-stable" dimensions: "os:Mac" }
-    builders { name: "vm-mac-debug-simdbc64-stable" dimensions: "os:Mac" }
-    builders { name: "vm-mac-debug-x64-stable" dimensions: "os:Mac" }
-    builders { name: "vm-mac-product-x64-stable" dimensions: "os:Mac" }
-    builders { name: "vm-mac-release-ia32-stable" dimensions: "os:Mac" }
-    builders { name: "vm-mac-release-simdbc64-stable" dimensions: "os:Mac" }
-    builders { name: "vm-mac-release-x64-stable" dimensions: "os:Mac" }
-    builders { name: "vm-noopt-mac-simarm64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-mac-debug-ia32-stable" mixins: "mac" }
+    builders { name: "vm-mac-debug-simdbc64-stable" mixins: "mac" }
+    builders { name: "vm-mac-debug-x64-stable" mixins: "mac" }
+    builders { name: "vm-mac-product-x64-stable" mixins: "mac" }
+    builders { name: "vm-mac-release-ia32-stable" mixins: "mac" }
+    builders { name: "vm-mac-release-simdbc64-stable" mixins: "mac" }
+    builders { name: "vm-mac-release-x64-stable" mixins: "mac" }
+    builders { name: "vm-noopt-mac-simarm64-stable" mixins: "mac" }
     builders { name: "vm-optcounter-threshold-linux-release-ia32-stable" }
     builders { name: "vm-optcounter-threshold-linux-release-x64-stable" }
     builders { name: "vm-precomp-android-release-stable" }
-    builders { name: "vm-precomp-win-simarm64-stable" dimensions: "os:Windows" }
+    builders { name: "vm-precomp-win-simarm64-stable" mixins: "win" }
     builders { name: "vm-reload-linux-debug-x64-stable" }
     builders { name: "vm-reload-linux-release-x64-stable" }
-    builders { name: "vm-reload-mac-debug-simdbc64-stable" dimensions: "os:Mac" }
-    builders { name: "vm-reload-mac-release-simdbc64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-reload-mac-debug-simdbc64-stable" mixins: "mac" }
+    builders { name: "vm-reload-mac-release-simdbc64-stable" mixins: "mac" }
     builders { name: "vm-reload-rollback-linux-debug-x64-stable" }
     builders { name: "vm-reload-rollback-linux-release-x64-stable" }
-    builders { name: "vm-win-debug-ia32-stable" dimensions: "os:Windows" }
-    builders { name: "vm-win-debug-x64-stable" dimensions: "os:Windows" }
-    builders { name: "vm-win-product-x64-stable" dimensions: "os:Windows" }
-    builders { name: "vm-win-release-ia32-stable" dimensions: "os:Windows" }
-    builders { name: "vm-win-release-x64-stable" dimensions: "os:Windows" }
+    builders { name: "vm-win-debug-ia32-stable" mixins: "win" }
+    builders { name: "vm-win-debug-x64-stable" mixins: "win" }
+    builders { name: "vm-win-product-x64-stable" mixins: "win" }
+    builders { name: "vm-win-release-ia32-stable" mixins: "win" }
+    builders { name: "vm-win-release-x64-stable" mixins: "win" }
   }
 }
 
 buckets {
   name: "luci.dart.try"
-  acl_sets: "tryserver"
+  acl_sets: "try"
 
   swarming {
     hostname: "chromium-swarm.appspot.com"
     url_format: "https://ci.chromium.org/swarming/task/{task_id}"
     builder_defaults {
-      category: "Dart CQ"
+      category: "Dart Try"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       build_numbers: YES
@@ -417,148 +497,29 @@ buckets {
       }
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
-    builders {
-      name: "benchmark-linux-try"
-    }
-    builders {
-      name: "front-end-linux-release-x64-try"
-    }
-    builders {
-      name: "vm-canary-linux-debug-try"
-    }
-    builders {
-      name: "vm-linux-release-x64-try"
-    }
-    builders {
-      name: "vm-linux-debug-x64-try"
-    }
-    builders {
-      name: "vm-mac-release-x64-try"
-      dimensions: "os:Mac"
-    }
-    builders {
-      name: "vm-mac-debug-x64-try"
-      dimensions: "os:Mac"
-    }
-    builders {
-      name: "vm-win-release-x64-try"
-      dimensions: "os:Windows"
-    }
-    builders {
-      name: "vm-win-debug-x64-try"
-      dimensions: "os:Windows"
-    }
-    builders {
-      name: "vm-linux-product-x64-try"
-      recipe {
-        name: "dart/dart_vm"
-      }
-    }
-    builders {
-      name: "vm-kernel-legacy-linux-release-x64-try"
-    }
+
+    # git cl try builders
+    builders { name: "cl-linux-try" }
+    builders { name: "cl-mac-try" mixins: "mac" }
+    builders { name: "cl-win-try" mixins: "win" }
+
+    # CQ builders
+    builders { name: "analyzer-linux-release-strong-hostchecked-try" }
+    builders { name: "benchmark-linux-try" }
+    builders { name: "dart-sdk-windows-try" mixins: "sdk" mixins: "win" }
+    builders { name: "dart2js-linux-d8-hostchecked-try" mixins: "dart2js" }
+    builders { name: "dart2js-linux-d8-kernel-minified-try" mixins: "dart2js" }
+    builders { name: "dart2js-linux-none-only-unittest-try" mixins: "dart2js" }
+    builders { name: "dart2js-linux-x64-chrome-try" }
+    builders { name: "ddc-linux-release-chrome-try" mixins: "clobber" }
+    builders { name: "front-end-linux-release-x64-try" }
+    builders { name: "pkg-linux-release-try" }
+    builders { name: "vm-canary-linux-debug-try" }
+    builders { name: "vm-kernel-legacy-linux-release-x64-try" }
     builders { name: "vm-kernel-linux-release-x64-try" }
-    builders {
-      name: "vm-kernel-linux-debug-x64-try"
-      mixins: "vm-kernel"
-    }
-    builders {
-      name: "vm-kernel-mac-release-x64-try"
-      dimensions: "os:Mac"
-      mixins: "vm-kernel"
-    }
-    builders {
-      name: "vm-kernel-mac-debug-x64-try"
-      mixins: "vm-kernel"
-    }
-    builders {
-      name: "dart2js-linux-x64-chrome-try"
-    }
-    builders {
-      name: "dart-sdk-linux-try"
-      recipe {
-        name: "dart/sdk_swarming"
-      }
-    }
-    builders {
-      name: "dart-sdk-mac-try"
-      dimensions: "os:Mac"
-      recipe {
-        name: "dart/sdk_swarming"
-      }
-    }
-    builders {
-      name: "dart-sdk-windows-try"
-      dimensions: "os:Windows"
-      recipe {
-        name: "dart/sdk_swarming"
-      }
-    }
-    builders {
-      name: "dart2js-linux-d8-hostchecked-unittest-try"
-      recipe {
-        name: "dart/dart2js_swarming"
-        properties_j: "shards:6"
-      }
-    }
-    builders {
-      name: "dart2js-linux-d8-hostchecked-try"
-      recipe {
-        name: "dart/dart2js_swarming"
-        properties_j: "shards:6"
-      }
-    }
-    builders {
-      name: "dart2js-linux-none-only-unittest-try"
-      recipe {
-        name: "dart/dart2js_swarming"
-      }
-    }
-    builders {
-      name: "dart2js-linux-d8-kernel-minified-try"
-      recipe {
-        name: "dart/dart2js_swarming"
-        properties_j: "shards:6"
-      }
-    }
-    builders {
-      name: "dart2js-win10-ie11-try"
-      dimensions: "os:Windows-10"
-      recipe {
-        name: "dart/dart2js_swarming"
-        properties_j: "shards:6"
-      }
-    }
-    builders {
-      name: "dart2js-win10-edge-try"
-      dimensions: "os:Windows-10"
-      recipe {
-        name: "dart/dart2js_swarming"
-        properties_j: "shards:6"
-      }
-    }
-    builders {
-      name: "ddc-linux-release-chrome-try"
-      recipe {
-        properties: "clobber:true"
-      }
-    }
-    builders {
-      name: "analyzer-linux-release-strong-hostchecked-try"
-    }
-    builders {
-      name: "pkg-linux-release-try"
-    }
-    builders {
-      name: "cl-linux-try"
-    }
-    builders {
-      name: "cl-win-try"
-      dimensions: "os:Windows-10"
-    }
-    builders {
-      name: "cl-mac-try"
-      dimensions: "os:Mac"
-    }
+    builders { name: "vm-kernel-mac-release-x64-try" mixins: "mac" mixins: "vm-kernel" }
+    builders { name: "vm-linux-product-x64-try" mixins: "vm" }
+    builders { name: "vm-linux-release-x64-try" }
+    builders { name: "vm-mac-release-x64-try" mixins: "mac" }
   }
 }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 505ee02781ac..819df8e7c636 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -7,22 +7,22 @@ consoles: {
   ref: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
     category: "fasta"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
     category: "fasta"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
     category: "fasta"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64"
     category: "fasta"
     short_name: "vm"
   }
@@ -153,22 +153,22 @@ consoles: {
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64"
     category: "vm|kernel"
     short_name: "dbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64"
     category: "vm|kernel"
     short_name: "rbc"
   }
@@ -191,12 +191,12 @@ consoles: {
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
     category: "vm|kernel"
     short_name: "oc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
     category: "vm|kernel"
     short_name: "wr"
   }
@@ -249,12 +249,12 @@ consoles: {
     short_name: "8d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
@@ -295,7 +295,7 @@ consoles: {
     short_name: "6r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
@@ -529,37 +529,37 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
     category: "analyzer"
     short_name: "as"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
     category: "analyzer"
     short_name: "awr"
   }
@@ -582,27 +582,27 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "fs"
   }
@@ -644,7 +644,7 @@ consoles: {
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
@@ -667,7 +667,7 @@ consoles: {
     short_name: "3m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
@@ -710,17 +710,17 @@ consoles: {
 #    short_name: "ie"
 #  }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
     category: "pkg"
     short_name: "w"
   }
@@ -776,22 +776,22 @@ consoles: {
   ref: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
     category: "fasta"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
     category: "fasta"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
     category: "fasta"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64"
     category: "fasta"
     short_name: "vm"
   }
@@ -869,37 +869,37 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
     category: "analyzer"
     short_name: "as"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
     category: "analyzer"
     short_name: "awr"
   }
@@ -922,17 +922,17 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
   }
@@ -961,17 +961,17 @@ consoles: {
     short_name: "4l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "fs"
   }
 #  builders {
-#    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff"
+#    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-ff"
 #    category: "dart2js|ff"
 #    short_name: "l"
 #  }
@@ -982,7 +982,7 @@ consoles: {
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
@@ -1005,7 +1005,7 @@ consoles: {
     short_name: "3m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
@@ -1048,17 +1048,17 @@ consoles: {
 #    short_name: "ie"
 #  }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
     category: "pkg"
     short_name: "w"
   }
@@ -1201,22 +1201,22 @@ consoles: {
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64"
     category: "vm|kernel"
     short_name: "dbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64"
     category: "vm|kernel"
     short_name: "rbc"
   }
@@ -1239,12 +1239,12 @@ consoles: {
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
     category: "vm|kernel"
     short_name: "oc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
     category: "vm|kernel"
     short_name: "wr"
   }
@@ -1297,12 +1297,12 @@ consoles: {
     short_name: "8d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
@@ -1343,7 +1343,7 @@ consoles: {
     short_name: "6r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
@@ -1543,347 +1543,347 @@ consoles: {
   ref: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
     category: "fasta"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
     category: "fasta"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
     category: "fasta"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64"
     category: "fasta"
     short_name: "vm"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-ia32"
     category: "vm|debug"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simarm"
     category: "vm|simarm"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64"
     category: "vm|debug"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-ia32"
     category: "vm|release"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm"
     category: "vm|simarm"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64"
     category: "vm|simarm"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-x64"
     category: "vm|release"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-ia32"
     category: "vm|debug"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-simdbc64"
     category: "vm|debug"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64"
     category: "vm|debug"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-ia32"
     category: "vm|release"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-simdbc64"
     category: "vm|release"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64"
     category: "vm|release"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-ia32"
     category: "vm|debug"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64"
     category: "vm|debug"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-release-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-ia32"
     category: "vm|release"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-x64"
     category: "vm|release"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/app-linux-debug-x64"
     category: "vm|app"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/app-linux-product-x64"
     category: "vm|app"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/app-linux-release-x64"
     category: "vm|app"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
     category: "vm|kernel"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64"
     category: "vm|kernel"
     short_name: "dbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64"
     category: "vm|kernel"
     short_name: "rbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
     category: "vm|kernel"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
     category: "vm|kernel"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
     category: "vm|kernel"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
     category: "vm|kernel"
     short_name: "oc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
     category: "vm|kernel"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
     category: "vm|kernel-precomp"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
     category: "vm|kernel-precomp"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
     category: "vm|misc"
     short_name: "cra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64"
     category: "vm|misc"
     short_name: "tra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-linux-release-x64"
     category: "vm|misc"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-ia32"
     category: "vm|misc"
     short_name: "o32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-x64"
     category: "vm|misc"
     short_name: "o64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-debug-x64"
     category: "vm|precomp"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-product-x64"
     category: "vm|precomp"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-noopt-mac-simarm64"
     category: "vm|precomp"
     short_name: "no"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-precomp-android-release"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-android-release"
     category: "vm|precomp"
     short_name: "and"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-win-simarm64"
     category: "vm|precomp"
     short_name: "wsi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-product-x64"
     category: "vm|product"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-product-x64"
     category: "vm|product"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-product-x64"
     category: "vm|product"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-debug-x64"
     category: "vm|reload"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-release-x64"
     category: "vm|reload"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-debug-simdbc64"
     category: "vm|reload"
     short_name: "mds"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-release-simdbc64"
     category: "vm|reload"
     short_name: "mrs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-debug-x64"
     category: "vm|reload"
     short_name: "dro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-release-x64"
     category: "vm|reload"
     short_name: "rro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-ia32-d8"
     category: "dart2js|d8"
     short_name: "hc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-x64-d8"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-linux-x64-d8"
     category: "dart2js|d8"
     short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-only-unittest-linux-ia32-none"
     category: "dart2js|misc"
     short_name: "ut"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-dumpinfo-linux-ia32-none"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-dumpinfo-linux-ia32-none"
     category: "dart2js|misc"
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
     category: "analyzer"
     short_name: "aas"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
     category: "analyzer"
     short_name: "awr"
   }
@@ -1903,82 +1903,82 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "fs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-ff"
     category: "dart2js|ff"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-safari"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-safari"
     category: "dart2js|safari"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-edge"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-edge"
     category: "dart2js|ms"
     short_name: "ed"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ff"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ff"
     category: "dart2js|ff"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ie11"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ie11"
     category: "dart2js|ms"
     short_name: "ie"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
     category: "pkg"
     short_name: "w"
   }
@@ -1988,7 +1988,7 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/versionchecker-linux"
+    name: "buildbucket/luci.dart.ci.sandbox/versionchecker-linux"
     category: "misc"
     short_name: "vc"
   }
@@ -2032,347 +2032,347 @@ consoles: {
   ref: "refs/heads/dev"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-dev"
     category: "fasta"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-dev"
     category: "fasta"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-win-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-dev"
     category: "fasta"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64-dev"
     category: "fasta"
     short_name: "vm"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-ia32-dev"
     category: "vm|debug"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simarm-dev"
     category: "vm|simarm"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64-dev"
     category: "vm|debug"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-ia32-dev"
     category: "vm|release"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm-dev"
     category: "vm|simarm"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64-dev"
     category: "vm|simarm"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-x64-dev"
     category: "vm|release"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-ia32-dev"
     category: "vm|debug"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-simdbc64-dev"
     category: "vm|debug"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64-dev"
     category: "vm|debug"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-ia32-dev"
     category: "vm|release"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-simdbc64-dev"
     category: "vm|release"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64-dev"
     category: "vm|release"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-ia32-dev"
     category: "vm|debug"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64-dev"
     category: "vm|debug"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-release-ia32-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-ia32-dev"
     category: "vm|release"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-x64-dev"
     category: "vm|release"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/app-linux-debug-x64-dev"
     category: "vm|app"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-product-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/app-linux-product-x64-dev"
     category: "vm|app"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/app-linux-release-x64-dev"
     category: "vm|app"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-dev"
     category: "vm|kernel"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64-dev"
     category: "vm|kernel"
     short_name: "dbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-dev"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-dev"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64-dev"
     category: "vm|kernel"
     short_name: "rbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-dev"
     category: "vm|kernel"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-dev"
     category: "vm|kernel"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-dev"
     category: "vm|kernel"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-dev"
     category: "vm|kernel"
     short_name: "oc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-dev"
     category: "vm|kernel"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-dev"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-dev"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-dev"
     category: "vm|misc"
     short_name: "cra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64-dev"
     category: "vm|misc"
     short_name: "tra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-linux-release-x64-dev"
     category: "vm|misc"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-ia32-dev"
     category: "vm|misc"
     short_name: "o32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-x64-dev"
     category: "vm|misc"
     short_name: "o64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-debug-x64-dev"
     category: "vm|precomp"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-product-x64-dev"
     category: "vm|precomp"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-noopt-mac-simarm64-dev"
     category: "vm|precomp"
     short_name: "no"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-precomp-android-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-android-release-dev"
     category: "vm|precomp"
     short_name: "and"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-win-simarm64-dev"
     category: "vm|precomp"
     short_name: "wsi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-product-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-product-x64-dev"
     category: "vm|product"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-product-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-product-x64-dev"
     category: "vm|product"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-product-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-product-x64-dev"
     category: "vm|product"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-debug-x64-dev"
     category: "vm|reload"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-release-x64-dev"
     category: "vm|reload"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-debug-simdbc64-dev"
     category: "vm|reload"
     short_name: "mds"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-release-simdbc64-dev"
     category: "vm|reload"
     short_name: "mrs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-debug-x64-dev"
     category: "vm|reload"
     short_name: "dro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-release-x64-dev"
     category: "vm|reload"
     short_name: "rro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-ia32-d8-dev"
     category: "dart2js|d8"
     short_name: "hc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-x64-d8-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-linux-x64-d8-dev"
     category: "dart2js|d8"
     short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-only-unittest-linux-ia32-none-dev"
     category: "dart2js|misc"
     short_name: "ut"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-dumpinfo-linux-ia32-none-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-dumpinfo-linux-ia32-none-dev"
     category: "dart2js|misc"
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-dev"
     category: "analyzer"
     short_name: "aas"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-linux-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-dev"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-mac-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-dev"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release-dev"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release-dev"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release-dev"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-win-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-dev"
     category: "analyzer"
     short_name: "awr"
   }
@@ -2392,82 +2392,82 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-dev"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-dev"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-dev"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "fs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-ff-dev"
     category: "dart2js|ff"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-safari-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-safari-dev"
     category: "dart2js|safari"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-edge-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-edge-dev"
     category: "dart2js|ms"
     short_name: "ed"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ff-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ff-dev"
     category: "dart2js|ff"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ie11-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ie11-dev"
     category: "dart2js|ms"
     short_name: "ie"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-linux-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-mac-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-dev"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-win-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-dev"
     category: "pkg"
     short_name: "w"
   }
@@ -2477,7 +2477,7 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/versionchecker-linux-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/versionchecker-linux-dev"
     category: "misc"
     short_name: "vc"
   }
@@ -2521,347 +2521,347 @@ consoles: {
   ref: "refs/heads/stable"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-stable"
     category: "fasta"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-stable"
     category: "fasta"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-stable"
     category: "fasta"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64-stable"
     category: "fasta"
     short_name: "vm"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-ia32-stable"
     category: "vm|debug"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simarm-stable"
     category: "vm|simarm"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64-stable"
     category: "vm|debug"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-ia32-stable"
     category: "vm|release"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm-stable"
     category: "vm|simarm"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64-stable"
     category: "vm|simarm"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-x64-stable"
     category: "vm|release"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-ia32-stable"
     category: "vm|debug"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-simdbc64-stable"
     category: "vm|debug"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64-stable"
     category: "vm|debug"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-ia32-stable"
     category: "vm|release"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-simdbc64-stable"
     category: "vm|release"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64-stable"
     category: "vm|release"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-ia32-stable"
     category: "vm|debug"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64-stable"
     category: "vm|debug"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-release-ia32-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-ia32-stable"
     category: "vm|release"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-x64-stable"
     category: "vm|release"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/app-linux-debug-x64-stable"
     category: "vm|app"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-product-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/app-linux-product-x64-stable"
     category: "vm|app"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/app-linux-release-x64-stable"
     category: "vm|app"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-stable"
     category: "vm|kernel"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64-stable"
     category: "vm|kernel"
     short_name: "dbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-stable"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-stable"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64-stable"
     category: "vm|kernel"
     short_name: "rbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-stable"
     category: "vm|kernel"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-stable"
     category: "vm|kernel"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-stable"
     category: "vm|kernel"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-stable"
     category: "vm|kernel"
     short_name: "oc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-stable"
     category: "vm|kernel"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-stable"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-stable"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-stable"
     category: "vm|misc"
     short_name: "cra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64-stable"
     category: "vm|misc"
     short_name: "tra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-linux-release-x64-stable"
     category: "vm|misc"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-ia32-stable"
     category: "vm|misc"
     short_name: "o32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-x64-stable"
     category: "vm|misc"
     short_name: "o64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-debug-x64-stable"
     category: "vm|precomp"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-product-x64-stable"
     category: "vm|precomp"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-noopt-mac-simarm64-stable"
     category: "vm|precomp"
     short_name: "no"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-precomp-android-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-android-release-stable"
     category: "vm|precomp"
     short_name: "and"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-win-simarm64-stable"
     category: "vm|precomp"
     short_name: "wsi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-product-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-product-x64-stable"
     category: "vm|product"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-product-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-product-x64-stable"
     category: "vm|product"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-product-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-product-x64-stable"
     category: "vm|product"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-debug-x64-stable"
     category: "vm|reload"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-release-x64-stable"
     category: "vm|reload"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-debug-simdbc64-stable"
     category: "vm|reload"
     short_name: "mds"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-release-simdbc64-stable"
     category: "vm|reload"
     short_name: "mrs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-debug-x64-stable"
     category: "vm|reload"
     short_name: "dro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-release-x64-stable"
     category: "vm|reload"
     short_name: "rro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-ia32-d8-stable"
     category: "dart2js|d8"
     short_name: "hc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-x64-d8-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-linux-x64-d8-stable"
     category: "dart2js|d8"
     short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-only-unittest-linux-ia32-none-stable"
     category: "dart2js|misc"
     short_name: "ut"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-dumpinfo-linux-ia32-none-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-dumpinfo-linux-ia32-none-stable"
     category: "dart2js|misc"
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-stable"
     category: "analyzer"
     short_name: "aas"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-linux-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-stable"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-mac-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-stable"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release-stable"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release-stable"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release-stable"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-win-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-stable"
     category: "analyzer"
     short_name: "awr"
   }
@@ -2881,82 +2881,82 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-stable"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-stable"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-stable"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "fs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-ff-stable"
     category: "dart2js|ff"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-safari-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-safari-stable"
     category: "dart2js|safari"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-edge-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-edge-stable"
     category: "dart2js|ms"
     short_name: "ed"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ff-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ff-stable"
     category: "dart2js|ff"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ie11-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ie11-stable"
     category: "dart2js|ms"
     short_name: "ie"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-linux-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-mac-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-stable"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-win-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-stable"
     category: "pkg"
     short_name: "w"
   }
@@ -2966,7 +2966,7 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/versionchecker-linux-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/versionchecker-linux-stable"
     category: "misc"
     short_name: "vc"
   }
@@ -3010,37 +3010,37 @@ consoles: {
   ref: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-checked-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
     category: "vm-kernel"
     short_name: "cr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-debug-ia32-none"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-debug-ia32-none"
     category: "dart2js"
     short_name: "hcd"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-debug-ia32-none"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-debug-ia32-none"
     category: "dart2js"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pub-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pub-linux-release"
     category: "pub"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pub-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pub-mac-release"
     category: "pub"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pub-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pub-win-release"
     category: "pub"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/androidvm-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/androidvm-linux-release-x64"
     category: "android"
     short_name: "vm"
   }
@@ -3095,7 +3095,7 @@ consoles: {
   builders { name: "buildbucket/luci.dart.try/pkg-linux-release-try" }
   builders { name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try" }
   builders { name: "buildbucket/luci.dart.try/vm-kernel-legacy-linux-release-x64-try" }
-  builders { name: "buildbucket/luci.dart.try/vm-kernel-mac-release-x64-try" }
+  builders { name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try" }
   builders { name: "buildbucket/luci.dart.try/vm-linux-product-x64-try" }
   builders { name: "buildbucket/luci.dart.try/vm-linux-release-x64-try" }
   builders { name: "buildbucket/luci.dart.try/vm-mac-release-x64-try" }
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index e9e542510a9a..be358aab47de 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -146,7 +146,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-analysis-server-linux"
   }
 }
@@ -157,7 +157,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-linux-release"
   }
 }
@@ -168,7 +168,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-mac-release"
   }
 }
@@ -179,7 +179,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-strong-linux-release"
   }
 }
@@ -190,7 +190,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-strong-mac-release"
   }
 }
@@ -201,7 +201,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-strong-win-release"
   }
 }
@@ -212,7 +212,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-win-release"
   }
 }
@@ -259,7 +259,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-faststartup-linux-x64-chrome"
   }
 }
@@ -270,7 +270,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-linux-x64-chrome"
   }
 }
@@ -281,7 +281,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-mac-x64-chrome"
   }
 }
@@ -292,7 +292,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-win-x64-chrome"
   }
 }
@@ -303,7 +303,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "ddc-linux-release-chrome"
   }
 }
@@ -314,7 +314,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "ddc-mac-release-chrome"
   }
 }
@@ -325,7 +325,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "ddc-win-release-chrome"
   }
 }
@@ -336,7 +336,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "front-end-linux-release-x64"
   }
 }
@@ -347,7 +347,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "front-end-mac-release-x64"
   }
 }
@@ -358,7 +358,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "front-end-win-release-x64"
   }
 }
@@ -369,7 +369,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "pkg-linux-release"
   }
 }
@@ -380,7 +380,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "pkg-mac-release"
   }
 }
@@ -391,7 +391,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "pkg-win-release"
   }
 }
@@ -402,7 +402,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-legacy-linux-release-x64"
   }
 }
@@ -413,7 +413,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-debug-simdbc64"
   }
 }
@@ -424,7 +424,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simarm"
   }
 }
@@ -435,7 +435,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simarm64"
   }
 }
@@ -446,7 +446,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simdbc64"
   }
 }
@@ -457,7 +457,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-optcounter-threshold-linux-release-x64"
   }
 }
@@ -468,7 +468,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-release-x64"
   }
 }
@@ -479,7 +479,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm"
   }
 }
@@ -490,7 +490,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm64"
   }
 }
@@ -501,7 +501,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-win-release-x64"
   }
 }
@@ -512,7 +512,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-analysis-server-linux-dev"
   }
 }
@@ -523,7 +523,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-linux-release-dev"
   }
 }
@@ -534,7 +534,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-mac-release-dev"
   }
 }
@@ -545,7 +545,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-strong-linux-release-dev"
   }
 }
@@ -556,7 +556,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-strong-mac-release-dev"
   }
 }
@@ -567,7 +567,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-strong-win-release-dev"
   }
 }
@@ -578,7 +578,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-win-release-dev"
   }
 }
@@ -625,7 +625,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-faststartup-linux-x64-chrome-dev"
   }
 }
@@ -636,7 +636,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-linux-x64-chrome-dev"
   }
 }
@@ -647,7 +647,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-mac-x64-chrome-dev"
   }
 }
@@ -658,7 +658,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-win-x64-chrome-dev"
   }
 }
@@ -669,7 +669,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "ddc-linux-release-chrome-dev"
   }
 }
@@ -680,7 +680,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "ddc-mac-release-chrome-dev"
   }
 }
@@ -691,7 +691,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "ddc-win-release-chrome-dev"
   }
 }
@@ -702,7 +702,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "front-end-linux-release-x64-dev"
   }
 }
@@ -713,7 +713,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "front-end-mac-release-x64-dev"
   }
 }
@@ -724,7 +724,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "front-end-win-release-x64-dev"
   }
 }
@@ -735,7 +735,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "pkg-linux-release-dev"
   }
 }
@@ -746,7 +746,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "pkg-mac-release-dev"
   }
 }
@@ -757,7 +757,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "pkg-win-release-dev"
   }
 }
@@ -768,7 +768,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-legacy-linux-release-x64-dev"
   }
 }
@@ -779,7 +779,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-debug-simdbc64-dev"
   }
 }
@@ -790,7 +790,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simarm-dev"
   }
 }
@@ -801,7 +801,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simarm64-dev"
   }
 }
@@ -812,7 +812,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simdbc64-dev"
   }
 }
@@ -823,7 +823,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
   }
 }
@@ -834,7 +834,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-release-x64-dev"
   }
 }
@@ -845,7 +845,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm-dev"
   }
 }
@@ -856,7 +856,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm64-dev"
   }
 }
@@ -867,7 +867,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-win-release-x64-dev"
   }
 }
@@ -878,7 +878,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-analysis-server-linux-stable"
   }
 }
@@ -889,7 +889,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-linux-release-stable"
   }
 }
@@ -900,7 +900,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-mac-release-stable"
   }
 }
@@ -911,7 +911,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-strong-linux-release-stable"
   }
 }
@@ -922,7 +922,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-strong-mac-release-stable"
   }
 }
@@ -933,7 +933,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-strong-win-release-stable"
   }
 }
@@ -944,7 +944,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-win-release-stable"
   }
 }
@@ -991,7 +991,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-faststartup-linux-x64-chrome-stable"
   }
 }
@@ -1002,7 +1002,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-linux-x64-chrome-stable"
   }
 }
@@ -1013,7 +1013,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-mac-x64-chrome-stable"
   }
 }
@@ -1024,7 +1024,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-win-x64-chrome-stable"
   }
 }
@@ -1035,7 +1035,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "ddc-linux-release-chrome-stable"
   }
 }
@@ -1046,7 +1046,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "ddc-mac-release-chrome-stable"
   }
 }
@@ -1057,7 +1057,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "ddc-win-release-chrome-stable"
   }
 }
@@ -1068,7 +1068,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "front-end-linux-release-x64-stable"
   }
 }
@@ -1079,7 +1079,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "front-end-mac-release-x64-stable"
   }
 }
@@ -1090,7 +1090,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "front-end-win-release-x64-stable"
   }
 }
@@ -1101,7 +1101,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "pkg-linux-release-stable"
   }
 }
@@ -1112,7 +1112,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "pkg-mac-release-stable"
   }
 }
@@ -1123,7 +1123,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "pkg-win-release-stable"
   }
 }
@@ -1134,7 +1134,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-legacy-linux-release-x64-stable"
   }
 }
@@ -1145,7 +1145,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-debug-simdbc64-stable"
   }
 }
@@ -1156,7 +1156,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simarm-stable"
   }
 }
@@ -1167,7 +1167,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simarm64-stable"
   }
 }
@@ -1178,7 +1178,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simdbc64-stable"
   }
 }
@@ -1189,7 +1189,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
   }
 }
@@ -1200,7 +1200,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-release-x64-stable"
   }
 }
@@ -1211,7 +1211,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm-stable"
   }
 }
@@ -1222,7 +1222,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm64-stable"
   }
 }
@@ -1233,7 +1233,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-win-release-x64-stable"
   }
 }

From c6a28cd8ef51fbfc1d151358f76762e19efcae85 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 3 May 2018 10:19:24 +0000
Subject: [PATCH 113/826] Revert "[infra] Refactor cr-buildbucket.cfg"

This reverts commit a8bb29dfb0f3493336a1a791e6aaa23eedc119bd.

Reason for revert: Swarming hasn't picket up the new pools.cfg changes.

Original change's description:
> [infra] Refactor cr-buildbucket.cfg
>
> This is part 2 of 3 CLs to create a separate pool of bots for luci.dart.ci.
>
> * Add luci.dart.ci.sandbox bucket.
> * Move CI builders that don't require privileged access to their own bucket.
> * Use mixins to make it easier to change common builder properties.
> * Sort CQ builders.
> * Removed some unused CQ builders.
>
> Change-Id: I0e5fd2a616bbed86dfc01e1fb32c4fc924a2ac74
> Reviewed-on: https://dart-review.googlesource.com/53101
> Reviewed-by: Jonas Termansen <sortie@google.com>

TBR=sortie@google.com,athom@google.com

Change-Id: I5f5f292bd08ca136e98f3ff64ee96f20e5b05096
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/53620
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 507 +++++++++++++++++++----------------
 luci-milo.cfg      | 654 ++++++++++++++++++++++-----------------------
 luci-scheduler.cfg | 180 ++++++-------
 3 files changed, 690 insertions(+), 651 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 38a6073c64ea..bbd1fb136ad6 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -7,7 +7,7 @@
 # Please keep this list sorted by bucket name.
 
 acl_sets {
-  name: "ci"
+  name: "waterfall"
   acls {
     role: READER
     group: "all"
@@ -23,7 +23,7 @@ acl_sets {
 }
 
 acl_sets {
-  name: "try"
+  name: "tryserver"
   acls {
     role: READER
     group: "all"
@@ -43,38 +43,11 @@ builder_mixins {
   # todo(athom): how should this machine be defined?
 }
 
-builder_mixins {
-  name: "clobber"
-  recipe {
-    properties: "clobber:true"
-  }
-}
-
-builder_mixins {
-  name: "dart2js"
-  recipe {
-    name: "dart/dart2js_swarming"
-    properties_j: "shards:6"
-  }
-}
-
 builder_mixins {
   name: "debianpackage"
   # todo(athom): how should this machine be defined?
 }
 
-builder_mixins {
-  name: "mac"
-  dimensions: "os:Mac"
-}
-
-builder_mixins {
-  name: "sdk"
-  recipe {
-    name: "dart/sdk_swarming"
-  }
-}
-
 builder_mixins {
   name: "slow"
   execution_timeout_secs: 21600 # 6h
@@ -83,13 +56,6 @@ builder_mixins {
   }
 }
 
-builder_mixins {
-  name: "vm"
-  recipe {
-    name: "dart/dart_vm"
-  }
-}
-
 builder_mixins {
   name: "vm-kernel"
   recipe {
@@ -98,15 +64,9 @@ builder_mixins {
   }
 }
 
-builder_mixins {
-  name: "win"
-  dimensions: "os:Windows"
-}
-
 buckets {
-  # CI Builders that require special permissions
   name: "luci.dart.ci"
-  acl_sets: "ci"
+  acl_sets: "waterfall"
 
   swarming {
     hostname: "chromium-swarm.appspot.com"
@@ -132,66 +92,21 @@ buckets {
       }
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     }
-
-    # CI Builders that require privileged access
-    builders { name: "dart-sdk-linux" }
-    builders { name: "dart-sdk-mac" mixins: "mac" }
-    builders { name: "dart-sdk-win" mixins: "win" }
-    builders { name: "debianpackage-linux" mixins: "debianpackage" }
-    builders { name: "dart-sdk-linux-dev" }
-    builders { name: "dart-sdk-mac-dev" mixins: "mac" }
-    builders { name: "dart-sdk-win-dev" mixins: "win" }
-    builders { name: "debianpackage-linux-dev" mixins: "debianpackage" }
-    builders { name: "dart-sdk-linux-stable" }
-    builders { name: "dart-sdk-mac-stable" mixins: "mac" }
-    builders { name: "dart-sdk-win-stable" mixins: "win" }
-    builders { name: "debianpackage-linux-stable" mixins: "debianpackage" }
-  }
-}
-
-buckets {
-  # CI Builders that only require try permissions
-  name: "luci.dart.ci.sandbox"
-  acl_sets: "ci"
-
-  swarming {
-    hostname: "chromium-swarm.appspot.com"
-    url_format: "https://ci.chromium.org/swarming/task/{task_id}"
-    builder_defaults {
-      category: "Dart CI (Sandboxed)"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      build_numbers: YES
-      priority: 50
-      swarming_tags: "vpython:native-python-wrapper"
-      caches {
-        path: "browsers"
-        name: "browsers"
-      }
-      recipe {
-        repository: "https://chromium.googlesource.com/chromium/tools/build.git"
-        properties: "mastername:client.dart"
-        name: "dart/neo"
-        # TODO(vadimsh): make sure the service account has all necessary Git and
-        # GS permissions and remove this line, see https://crbug.com/776035
-        properties_j: "$kitchen:{\"git_auth\": false, \"devshell\": false}"
-      }
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-
-    # CI Builders for the master branch
     builders { name: "analyzer-analysis-server-linux" }
     builders { name: "analyzer-linux-release" }
-    builders { name: "analyzer-mac-release" mixins: "mac" }
+    builders { name: "analyzer-mac-release" dimensions: "os:Mac" }
     builders { name: "analyzer-strong-linux-release" }
-    builders { name: "analyzer-strong-mac-release" mixins: "mac" }
-    builders { name: "analyzer-strong-win-release" mixins: "win" }
-    builders { name: "analyzer-win-release" mixins: "win" }
+    builders { name: "analyzer-strong-mac-release" dimensions: "os:Mac" }
+    builders { name: "analyzer-strong-win-release" dimensions: "os:Windows" }
+    builders { name: "analyzer-win-release" dimensions: "os:Windows" }
     builders { name: "androidvm-linux-release-x64" mixins: "android" }
     builders { name: "app-linux-debug-x64" }
     builders { name: "app-linux-product-x64" }
     builders { name: "app-linux-release-x64" }
     builders { name: "cross-vm-linux-release-arm64" }
+    builders { name: "dart-sdk-linux" }
+    builders { name: "dart-sdk-mac" dimensions: "os:Mac" }
+    builders { name: "dart-sdk-win" dimensions: "os:Windows" }
     builders { name: "dart2js-csp-minified-linux-x64-drt" }
     builders { name: "dart2js-dumpinfo-linux-ia32-none" }
     builders { name: "dart2js-faststartup-linux-x64-chrome" }
@@ -201,26 +116,27 @@ buckets {
     builders { name: "dart2js-linux-x64-ff" }
     builders { name: "dart2js-linux-debug-ia32-none" }
     builders { name: "dart2js-linux-x64-drt" }
-    builders { name: "dart2js-mac-x64-chrome" mixins: "mac" }
-    builders { name: "dart2js-mac-x64-safari" mixins: "mac" }
+    builders { name: "dart2js-mac-x64-chrome" dimensions: "os:Mac" }
+    builders { name: "dart2js-mac-x64-safari" dimensions: "os:Mac" }
     builders { name: "dart2js-minified-linux-x64-d8" }
     builders { name: "dart2js-only-unittest-linux-ia32-none" }
-    builders { name: "dart2js-win-x64-chrome" mixins: "win" }
-    builders { name: "dart2js-win-x64-edge" mixins: "win" }
-    builders { name: "dart2js-win-x64-ff" mixins: "win" }
-    builders { name: "dart2js-win-x64-ie11" mixins: "win" }
+    builders { name: "dart2js-win-x64-chrome" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-edge" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-ff" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-ie11" dimensions: "os:Windows" }
     builders { name: "ddc-linux-release-chrome" }
-    builders { name: "ddc-mac-release-chrome" mixins: "mac" }
-    builders { name: "ddc-win-release-chrome" mixins: "win" }
-    builders { name: "front-end-mac-release-x64" mixins: "mac" }
+    builders { name: "ddc-mac-release-chrome" dimensions: "os:Mac" }
+    builders { name: "ddc-win-release-chrome" dimensions: "os:Windows" }
+    builders { name: "debianpackage-linux" mixins: "debianpackage" }
+    builders { name: "front-end-mac-release-x64" dimensions: "os:Mac" }
     builders { name: "front-end-linux-release-x64" }
-    builders { name: "front-end-win-release-x64" mixins: "win" }
+    builders { name: "front-end-win-release-x64" dimensions: "os:Windows" }
     builders { name: "pkg-linux-release" }
-    builders { name: "pkg-mac-release" mixins: "mac" }
-    builders { name: "pkg-win-release" mixins: "win" }
+    builders { name: "pkg-mac-release" dimensions: "os:Mac" }
+    builders { name: "pkg-win-release" dimensions: "os:Windows" }
     builders { name: "pub-linux-release" }
-    builders { name: "pub-mac-release" mixins: "mac" }
-    builders { name: "pub-win-release" mixins: "win" }
+    builders { name: "pub-mac-release" dimensions: "os:Mac" }
+    builders { name: "pub-win-release" dimensions: "os:Windows" }
     builders { name: "precomp-linux-debug-x64" }
     builders { name: "precomp-linux-product-x64" }
     builders { name: "target-vm-linux-release-arm64" dimensions: "cpu:arm64" }
@@ -234,15 +150,15 @@ buckets {
     builders { name: "vm-kernel-linux-release-simarm64" }
     builders { name: "vm-kernel-linux-release-simdbc64" }
     builders { name: "vm-kernel-linux-release-x64" }
-    builders { name: "vm-kernel-mac-debug-x64" mixins: "mac" }
-    builders { name: "vm-kernel-mac-release-x64" mixins: "mac" }
-    builders { name: "vm-kernel-win-release-x64" mixins: "win" }
+    builders { name: "vm-kernel-mac-debug-x64" dimensions: "os:Mac" }
+    builders { name: "vm-kernel-mac-release-x64" dimensions: "os:Mac" }
+    builders { name: "vm-kernel-win-release-x64" dimensions: "os:Windows" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-debug-x64" mixins: "slow" }
     builders { name: "vm-kernel-precomp-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-release-simarm" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64" }
-    builders { name: "vm-kernel-precomp-win-release-x64" mixins: "win" }
+    builders { name: "vm-kernel-precomp-win-release-x64" dimensions: "os:Windows" }
     builders { name: "vm-linux-debug-ia32" }
     builders { name: "vm-linux-debug-simarm" }
     builders { name: "vm-linux-debug-x64" }
@@ -251,43 +167,44 @@ buckets {
     builders { name: "vm-linux-release-simarm" }
     builders { name: "vm-linux-release-simarm64" }
     builders { name: "vm-linux-release-x64" }
-    builders { name: "vm-mac-debug-ia32" mixins: "mac" }
-    builders { name: "vm-mac-debug-simdbc64" mixins: "mac" }
-    builders { name: "vm-mac-debug-x64" mixins: "mac" }
-    builders { name: "vm-mac-product-x64" mixins: "mac" }
-    builders { name: "vm-mac-release-ia32" mixins: "mac" }
-    builders { name: "vm-mac-release-simdbc64" mixins: "mac" }
-    builders { name: "vm-mac-release-x64" mixins: "mac" }
-    builders { name: "vm-noopt-mac-simarm64" mixins: "mac" }
+    builders { name: "vm-mac-debug-ia32" dimensions: "os:Mac" }
+    builders { name: "vm-mac-debug-simdbc64" dimensions: "os:Mac" }
+    builders { name: "vm-mac-debug-x64" dimensions: "os:Mac" }
+    builders { name: "vm-mac-product-x64" dimensions: "os:Mac" }
+    builders { name: "vm-mac-release-ia32" dimensions: "os:Mac" }
+    builders { name: "vm-mac-release-simdbc64" dimensions: "os:Mac" }
+    builders { name: "vm-mac-release-x64" dimensions: "os:Mac" }
+    builders { name: "vm-noopt-mac-simarm64" dimensions: "os:Mac" }
     builders { name: "vm-optcounter-threshold-linux-release-ia32" }
     builders { name: "vm-optcounter-threshold-linux-release-x64" }
     builders { name: "vm-precomp-android-release" }
-    builders { name: "vm-precomp-win-simarm64" mixins: "win" }
+    builders { name: "vm-precomp-win-simarm64" dimensions: "os:Windows" }
     builders { name: "vm-reload-linux-debug-x64" }
     builders { name: "vm-reload-linux-release-x64" }
-    builders { name: "vm-reload-mac-debug-simdbc64" mixins: "mac" }
-    builders { name: "vm-reload-mac-release-simdbc64" mixins: "mac" }
+    builders { name: "vm-reload-mac-debug-simdbc64" dimensions: "os:Mac" }
+    builders { name: "vm-reload-mac-release-simdbc64" dimensions: "os:Mac" }
     builders { name: "vm-reload-rollback-linux-debug-x64" }
     builders { name: "vm-reload-rollback-linux-release-x64" }
-    builders { name: "vm-win-debug-ia32" mixins: "win" }
-    builders { name: "vm-win-debug-x64" mixins: "win" }
-    builders { name: "vm-win-product-x64" mixins: "win" }
-    builders { name: "vm-win-release-ia32" mixins: "win" }
-    builders { name: "vm-win-release-x64" mixins: "win" }
-
-    # CI Builders for the dev branch
+    builders { name: "vm-win-debug-ia32" dimensions: "os:Windows" }
+    builders { name: "vm-win-debug-x64" dimensions: "os:Windows" }
+    builders { name: "vm-win-product-x64" dimensions: "os:Windows" }
+    builders { name: "vm-win-release-ia32" dimensions: "os:Windows" }
+    builders { name: "vm-win-release-x64" dimensions: "os:Windows" }
     builders { name: "analyzer-analysis-server-linux-dev" }
     builders { name: "analyzer-linux-release-dev" }
-    builders { name: "analyzer-mac-release-dev" mixins: "mac" }
+    builders { name: "analyzer-mac-release-dev" dimensions: "os:Mac" }
     builders { name: "analyzer-strong-linux-release-dev" }
-    builders { name: "analyzer-strong-mac-release-dev" mixins: "mac" }
-    builders { name: "analyzer-strong-win-release-dev" mixins: "win" }
-    builders { name: "analyzer-win-release-dev" mixins: "win" }
+    builders { name: "analyzer-strong-mac-release-dev" dimensions: "os:Mac" }
+    builders { name: "analyzer-strong-win-release-dev" dimensions: "os:Windows" }
+    builders { name: "analyzer-win-release-dev" dimensions: "os:Windows" }
     builders { name: "androidvm-linux-release-x64-dev" mixins: "android" }
     builders { name: "app-linux-debug-x64-dev" }
     builders { name: "app-linux-product-x64-dev" }
     builders { name: "app-linux-release-x64-dev" }
     builders { name: "cross-vm-linux-release-arm64-dev" }
+    builders { name: "dart-sdk-linux-dev" }
+    builders { name: "dart-sdk-mac-dev" dimensions: "os:Mac" }
+    builders { name: "dart-sdk-win-dev" dimensions: "os:Windows" }
     builders { name: "dart2js-csp-minified-linux-x64-drt-dev" }
     builders { name: "dart2js-dumpinfo-linux-ia32-none-dev" }
     builders { name: "dart2js-faststartup-linux-x64-chrome-dev" }
@@ -297,26 +214,27 @@ buckets {
     builders { name: "dart2js-linux-x64-ff-dev" }
     builders { name: "dart2js-linux-debug-ia32-none-dev" }
     builders { name: "dart2js-linux-x64-drt-dev" }
-    builders { name: "dart2js-mac-x64-chrome-dev" mixins: "mac" }
-    builders { name: "dart2js-mac-x64-safari-dev" mixins: "mac" }
+    builders { name: "dart2js-mac-x64-chrome-dev" dimensions: "os:Mac" }
+    builders { name: "dart2js-mac-x64-safari-dev" dimensions: "os:Mac" }
     builders { name: "dart2js-minified-linux-x64-d8-dev" }
     builders { name: "dart2js-only-unittest-linux-ia32-none-dev" }
-    builders { name: "dart2js-win-x64-chrome-dev" mixins: "win" }
-    builders { name: "dart2js-win-x64-edge-dev" mixins: "win" }
-    builders { name: "dart2js-win-x64-ff-dev" mixins: "win" }
-    builders { name: "dart2js-win-x64-ie11-dev" mixins: "win" }
+    builders { name: "dart2js-win-x64-chrome-dev" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-edge-dev" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-ff-dev" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-ie11-dev" dimensions: "os:Windows" }
     builders { name: "ddc-linux-release-chrome-dev" }
-    builders { name: "ddc-mac-release-chrome-dev" mixins: "mac" }
-    builders { name: "ddc-win-release-chrome-dev" mixins: "win" }
-    builders { name: "front-end-mac-release-x64-dev" mixins: "mac" }
+    builders { name: "ddc-mac-release-chrome-dev" dimensions: "os:Mac" }
+    builders { name: "ddc-win-release-chrome-dev" dimensions: "os:Windows" }
+    builders { name: "debianpackage-linux-dev" mixins: "debianpackage" }
+    builders { name: "front-end-mac-release-x64-dev" dimensions: "os:Mac" }
     builders { name: "front-end-linux-release-x64-dev" }
-    builders { name: "front-end-win-release-x64-dev" mixins: "win" }
+    builders { name: "front-end-win-release-x64-dev" dimensions: "os:Windows" }
     builders { name: "pkg-linux-release-dev" }
-    builders { name: "pkg-mac-release-dev" mixins: "mac" }
-    builders { name: "pkg-win-release-dev" mixins: "win" }
+    builders { name: "pkg-mac-release-dev" dimensions: "os:Mac" }
+    builders { name: "pkg-win-release-dev" dimensions: "os:Windows" }
     builders { name: "pub-linux-release-dev" }
-    builders { name: "pub-mac-release-dev" mixins: "mac" }
-    builders { name: "pub-win-release-dev" mixins: "win" }
+    builders { name: "pub-mac-release-dev" dimensions: "os:Mac" }
+    builders { name: "pub-win-release-dev" dimensions: "os:Windows" }
     builders { name: "precomp-linux-debug-x64-dev" }
     builders { name: "precomp-linux-product-x64-dev" }
     builders { name: "target-vm-linux-release-arm64-dev" dimensions: "cpu:arm64" }
@@ -330,15 +248,15 @@ buckets {
     builders { name: "vm-kernel-linux-release-simarm64-dev" }
     builders { name: "vm-kernel-linux-release-simdbc64-dev" }
     builders { name: "vm-kernel-linux-release-x64-dev" }
-    builders { name: "vm-kernel-mac-debug-x64-dev" mixins: "mac" }
-    builders { name: "vm-kernel-mac-release-x64-dev" mixins: "mac" }
-    builders { name: "vm-kernel-win-release-x64-dev" mixins: "win" }
+    builders { name: "vm-kernel-mac-debug-x64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-kernel-mac-release-x64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-kernel-win-release-x64-dev" dimensions: "os:Windows" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-dev" mixins: "slow" }
     builders { name: "vm-kernel-precomp-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-dev" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-dev" }
-    builders { name: "vm-kernel-precomp-win-release-x64-dev" mixins: "win" }
+    builders { name: "vm-kernel-precomp-win-release-x64-dev" dimensions: "os:Windows" }
     builders { name: "vm-linux-debug-ia32-dev" }
     builders { name: "vm-linux-debug-simarm-dev" }
     builders { name: "vm-linux-debug-x64-dev" }
@@ -347,43 +265,44 @@ buckets {
     builders { name: "vm-linux-release-simarm-dev" }
     builders { name: "vm-linux-release-simarm64-dev" }
     builders { name: "vm-linux-release-x64-dev" }
-    builders { name: "vm-mac-debug-ia32-dev" mixins: "mac" }
-    builders { name: "vm-mac-debug-simdbc64-dev" mixins: "mac" }
-    builders { name: "vm-mac-debug-x64-dev" mixins: "mac" }
-    builders { name: "vm-mac-product-x64-dev" mixins: "mac" }
-    builders { name: "vm-mac-release-ia32-dev" mixins: "mac" }
-    builders { name: "vm-mac-release-simdbc64-dev" mixins: "mac" }
-    builders { name: "vm-mac-release-x64-dev" mixins: "mac" }
-    builders { name: "vm-noopt-mac-simarm64-dev" mixins: "mac" }
+    builders { name: "vm-mac-debug-ia32-dev" dimensions: "os:Mac" }
+    builders { name: "vm-mac-debug-simdbc64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-mac-debug-x64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-mac-product-x64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-mac-release-ia32-dev" dimensions: "os:Mac" }
+    builders { name: "vm-mac-release-simdbc64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-mac-release-x64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-noopt-mac-simarm64-dev" dimensions: "os:Mac" }
     builders { name: "vm-optcounter-threshold-linux-release-ia32-dev" }
     builders { name: "vm-optcounter-threshold-linux-release-x64-dev" }
     builders { name: "vm-precomp-android-release-dev" }
-    builders { name: "vm-precomp-win-simarm64-dev" mixins: "win" }
+    builders { name: "vm-precomp-win-simarm64-dev" dimensions: "os:Windows" }
     builders { name: "vm-reload-linux-debug-x64-dev" }
     builders { name: "vm-reload-linux-release-x64-dev" }
-    builders { name: "vm-reload-mac-debug-simdbc64-dev" mixins: "mac" }
-    builders { name: "vm-reload-mac-release-simdbc64-dev" mixins: "mac" }
+    builders { name: "vm-reload-mac-debug-simdbc64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-reload-mac-release-simdbc64-dev" dimensions: "os:Mac" }
     builders { name: "vm-reload-rollback-linux-debug-x64-dev" }
     builders { name: "vm-reload-rollback-linux-release-x64-dev" }
-    builders { name: "vm-win-debug-ia32-dev" mixins: "win" }
-    builders { name: "vm-win-debug-x64-dev" mixins: "win" }
-    builders { name: "vm-win-product-x64-dev" mixins: "win" }
-    builders { name: "vm-win-release-ia32-dev" mixins: "win" }
-    builders { name: "vm-win-release-x64-dev" mixins: "win" }
-
-    # CI Builders for the stable branch
+    builders { name: "vm-win-debug-ia32-dev" dimensions: "os:Windows" }
+    builders { name: "vm-win-debug-x64-dev" dimensions: "os:Windows" }
+    builders { name: "vm-win-product-x64-dev" dimensions: "os:Windows" }
+    builders { name: "vm-win-release-ia32-dev" dimensions: "os:Windows" }
+    builders { name: "vm-win-release-x64-dev" dimensions: "os:Windows" }
     builders { name: "analyzer-analysis-server-linux-stable" }
     builders { name: "analyzer-linux-release-stable" }
-    builders { name: "analyzer-mac-release-stable" mixins: "mac" }
+    builders { name: "analyzer-mac-release-stable" dimensions: "os:Mac" }
     builders { name: "analyzer-strong-linux-release-stable" }
-    builders { name: "analyzer-strong-mac-release-stable" mixins: "mac" }
-    builders { name: "analyzer-strong-win-release-stable" mixins: "win" }
-    builders { name: "analyzer-win-release-stable" mixins: "win" }
+    builders { name: "analyzer-strong-mac-release-stable" dimensions: "os:Mac" }
+    builders { name: "analyzer-strong-win-release-stable" dimensions: "os:Windows" }
+    builders { name: "analyzer-win-release-stable" dimensions: "os:Windows" }
     builders { name: "androidvm-linux-release-x64-stable" mixins: "android" }
     builders { name: "app-linux-debug-x64-stable" }
     builders { name: "app-linux-product-x64-stable" }
     builders { name: "app-linux-release-x64-stable" }
     builders { name: "cross-vm-linux-release-arm64-stable" }
+    builders { name: "dart-sdk-linux-stable" }
+    builders { name: "dart-sdk-mac-stable" dimensions: "os:Mac" }
+    builders { name: "dart-sdk-win-stable" dimensions: "os:Windows" }
     builders { name: "dart2js-csp-minified-linux-x64-drt-stable" }
     builders { name: "dart2js-dumpinfo-linux-ia32-none-stable" }
     builders { name: "dart2js-faststartup-linux-x64-chrome-stable" }
@@ -393,26 +312,27 @@ buckets {
     builders { name: "dart2js-linux-x64-ff-stable" }
     builders { name: "dart2js-linux-debug-ia32-none-stable" }
     builders { name: "dart2js-linux-x64-drt-stable" }
-    builders { name: "dart2js-mac-x64-chrome-stable" mixins: "mac" }
-    builders { name: "dart2js-mac-x64-safari-stable" mixins: "mac" }
+    builders { name: "dart2js-mac-x64-chrome-stable" dimensions: "os:Mac" }
+    builders { name: "dart2js-mac-x64-safari-stable" dimensions: "os:Mac" }
     builders { name: "dart2js-minified-linux-x64-d8-stable" }
     builders { name: "dart2js-only-unittest-linux-ia32-none-stable" }
-    builders { name: "dart2js-win-x64-chrome-stable" mixins: "win" }
-    builders { name: "dart2js-win-x64-edge-stable" mixins: "win" }
-    builders { name: "dart2js-win-x64-ff-stable" mixins: "win" }
-    builders { name: "dart2js-win-x64-ie11-stable" mixins: "win" }
+    builders { name: "dart2js-win-x64-chrome-stable" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-edge-stable" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-ff-stable" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-ie11-stable" dimensions: "os:Windows" }
     builders { name: "ddc-linux-release-chrome-stable" }
-    builders { name: "ddc-mac-release-chrome-stable" mixins: "mac" }
-    builders { name: "ddc-win-release-chrome-stable" mixins: "win" }
-    builders { name: "front-end-mac-release-x64-stable" mixins: "mac" }
+    builders { name: "ddc-mac-release-chrome-stable" dimensions: "os:Mac" }
+    builders { name: "ddc-win-release-chrome-stable" dimensions: "os:Windows" }
+    builders { name: "debianpackage-linux-stable" mixins: "debianpackage" }
+    builders { name: "front-end-mac-release-x64-stable" dimensions: "os:Mac" }
     builders { name: "front-end-linux-release-x64-stable" }
-    builders { name: "front-end-win-release-x64-stable" mixins: "win" }
+    builders { name: "front-end-win-release-x64-stable" dimensions: "os:Windows" }
     builders { name: "pkg-linux-release-stable" }
-    builders { name: "pkg-mac-release-stable" mixins: "mac" }
-    builders { name: "pkg-win-release-stable" mixins: "win" }
+    builders { name: "pkg-mac-release-stable" dimensions: "os:Mac" }
+    builders { name: "pkg-win-release-stable" dimensions: "os:Windows" }
     builders { name: "pub-linux-release-stable" }
-    builders { name: "pub-mac-release-stable" mixins: "mac" }
-    builders { name: "pub-win-release-stable" mixins: "win" }
+    builders { name: "pub-mac-release-stable" dimensions: "os:Mac" }
+    builders { name: "pub-win-release-stable" dimensions: "os:Windows" }
     builders { name: "precomp-linux-debug-x64-stable" }
     builders { name: "precomp-linux-product-x64-stable" }
     builders { name: "target-vm-linux-release-arm64-stable" dimensions: "cpu:arm64" }
@@ -426,15 +346,15 @@ buckets {
     builders { name: "vm-kernel-linux-release-simarm64-stable" }
     builders { name: "vm-kernel-linux-release-simdbc64-stable" }
     builders { name: "vm-kernel-linux-release-x64-stable" }
-    builders { name: "vm-kernel-mac-debug-x64-stable" mixins: "mac" }
-    builders { name: "vm-kernel-mac-release-x64-stable" mixins: "mac" }
-    builders { name: "vm-kernel-win-release-x64-stable" mixins: "win" }
+    builders { name: "vm-kernel-mac-debug-x64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-kernel-mac-release-x64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-kernel-win-release-x64-stable" dimensions: "os:Windows" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-stable" mixins: "slow" }
     builders { name: "vm-kernel-precomp-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-stable" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-stable" }
-    builders { name: "vm-kernel-precomp-win-release-x64-stable" mixins: "win" }
+    builders { name: "vm-kernel-precomp-win-release-x64-stable" dimensions: "os:Windows" }
     builders { name: "vm-linux-debug-ia32-stable" }
     builders { name: "vm-linux-debug-simarm-stable" }
     builders { name: "vm-linux-debug-x64-stable" }
@@ -443,41 +363,41 @@ buckets {
     builders { name: "vm-linux-release-simarm-stable" }
     builders { name: "vm-linux-release-simarm64-stable" }
     builders { name: "vm-linux-release-x64-stable" }
-    builders { name: "vm-mac-debug-ia32-stable" mixins: "mac" }
-    builders { name: "vm-mac-debug-simdbc64-stable" mixins: "mac" }
-    builders { name: "vm-mac-debug-x64-stable" mixins: "mac" }
-    builders { name: "vm-mac-product-x64-stable" mixins: "mac" }
-    builders { name: "vm-mac-release-ia32-stable" mixins: "mac" }
-    builders { name: "vm-mac-release-simdbc64-stable" mixins: "mac" }
-    builders { name: "vm-mac-release-x64-stable" mixins: "mac" }
-    builders { name: "vm-noopt-mac-simarm64-stable" mixins: "mac" }
+    builders { name: "vm-mac-debug-ia32-stable" dimensions: "os:Mac" }
+    builders { name: "vm-mac-debug-simdbc64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-mac-debug-x64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-mac-product-x64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-mac-release-ia32-stable" dimensions: "os:Mac" }
+    builders { name: "vm-mac-release-simdbc64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-mac-release-x64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-noopt-mac-simarm64-stable" dimensions: "os:Mac" }
     builders { name: "vm-optcounter-threshold-linux-release-ia32-stable" }
     builders { name: "vm-optcounter-threshold-linux-release-x64-stable" }
     builders { name: "vm-precomp-android-release-stable" }
-    builders { name: "vm-precomp-win-simarm64-stable" mixins: "win" }
+    builders { name: "vm-precomp-win-simarm64-stable" dimensions: "os:Windows" }
     builders { name: "vm-reload-linux-debug-x64-stable" }
     builders { name: "vm-reload-linux-release-x64-stable" }
-    builders { name: "vm-reload-mac-debug-simdbc64-stable" mixins: "mac" }
-    builders { name: "vm-reload-mac-release-simdbc64-stable" mixins: "mac" }
+    builders { name: "vm-reload-mac-debug-simdbc64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-reload-mac-release-simdbc64-stable" dimensions: "os:Mac" }
     builders { name: "vm-reload-rollback-linux-debug-x64-stable" }
     builders { name: "vm-reload-rollback-linux-release-x64-stable" }
-    builders { name: "vm-win-debug-ia32-stable" mixins: "win" }
-    builders { name: "vm-win-debug-x64-stable" mixins: "win" }
-    builders { name: "vm-win-product-x64-stable" mixins: "win" }
-    builders { name: "vm-win-release-ia32-stable" mixins: "win" }
-    builders { name: "vm-win-release-x64-stable" mixins: "win" }
+    builders { name: "vm-win-debug-ia32-stable" dimensions: "os:Windows" }
+    builders { name: "vm-win-debug-x64-stable" dimensions: "os:Windows" }
+    builders { name: "vm-win-product-x64-stable" dimensions: "os:Windows" }
+    builders { name: "vm-win-release-ia32-stable" dimensions: "os:Windows" }
+    builders { name: "vm-win-release-x64-stable" dimensions: "os:Windows" }
   }
 }
 
 buckets {
   name: "luci.dart.try"
-  acl_sets: "try"
+  acl_sets: "tryserver"
 
   swarming {
     hostname: "chromium-swarm.appspot.com"
     url_format: "https://ci.chromium.org/swarming/task/{task_id}"
     builder_defaults {
-      category: "Dart Try"
+      category: "Dart CQ"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       build_numbers: YES
@@ -497,29 +417,148 @@ buckets {
       }
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
-
-    # git cl try builders
-    builders { name: "cl-linux-try" }
-    builders { name: "cl-mac-try" mixins: "mac" }
-    builders { name: "cl-win-try" mixins: "win" }
-
-    # CQ builders
-    builders { name: "analyzer-linux-release-strong-hostchecked-try" }
-    builders { name: "benchmark-linux-try" }
-    builders { name: "dart-sdk-windows-try" mixins: "sdk" mixins: "win" }
-    builders { name: "dart2js-linux-d8-hostchecked-try" mixins: "dart2js" }
-    builders { name: "dart2js-linux-d8-kernel-minified-try" mixins: "dart2js" }
-    builders { name: "dart2js-linux-none-only-unittest-try" mixins: "dart2js" }
-    builders { name: "dart2js-linux-x64-chrome-try" }
-    builders { name: "ddc-linux-release-chrome-try" mixins: "clobber" }
-    builders { name: "front-end-linux-release-x64-try" }
-    builders { name: "pkg-linux-release-try" }
-    builders { name: "vm-canary-linux-debug-try" }
-    builders { name: "vm-kernel-legacy-linux-release-x64-try" }
+    builders {
+      name: "benchmark-linux-try"
+    }
+    builders {
+      name: "front-end-linux-release-x64-try"
+    }
+    builders {
+      name: "vm-canary-linux-debug-try"
+    }
+    builders {
+      name: "vm-linux-release-x64-try"
+    }
+    builders {
+      name: "vm-linux-debug-x64-try"
+    }
+    builders {
+      name: "vm-mac-release-x64-try"
+      dimensions: "os:Mac"
+    }
+    builders {
+      name: "vm-mac-debug-x64-try"
+      dimensions: "os:Mac"
+    }
+    builders {
+      name: "vm-win-release-x64-try"
+      dimensions: "os:Windows"
+    }
+    builders {
+      name: "vm-win-debug-x64-try"
+      dimensions: "os:Windows"
+    }
+    builders {
+      name: "vm-linux-product-x64-try"
+      recipe {
+        name: "dart/dart_vm"
+      }
+    }
+    builders {
+      name: "vm-kernel-legacy-linux-release-x64-try"
+    }
     builders { name: "vm-kernel-linux-release-x64-try" }
-    builders { name: "vm-kernel-mac-release-x64-try" mixins: "mac" mixins: "vm-kernel" }
-    builders { name: "vm-linux-product-x64-try" mixins: "vm" }
-    builders { name: "vm-linux-release-x64-try" }
-    builders { name: "vm-mac-release-x64-try" mixins: "mac" }
+    builders {
+      name: "vm-kernel-linux-debug-x64-try"
+      mixins: "vm-kernel"
+    }
+    builders {
+      name: "vm-kernel-mac-release-x64-try"
+      dimensions: "os:Mac"
+      mixins: "vm-kernel"
+    }
+    builders {
+      name: "vm-kernel-mac-debug-x64-try"
+      mixins: "vm-kernel"
+    }
+    builders {
+      name: "dart2js-linux-x64-chrome-try"
+    }
+    builders {
+      name: "dart-sdk-linux-try"
+      recipe {
+        name: "dart/sdk_swarming"
+      }
+    }
+    builders {
+      name: "dart-sdk-mac-try"
+      dimensions: "os:Mac"
+      recipe {
+        name: "dart/sdk_swarming"
+      }
+    }
+    builders {
+      name: "dart-sdk-windows-try"
+      dimensions: "os:Windows"
+      recipe {
+        name: "dart/sdk_swarming"
+      }
+    }
+    builders {
+      name: "dart2js-linux-d8-hostchecked-unittest-try"
+      recipe {
+        name: "dart/dart2js_swarming"
+        properties_j: "shards:6"
+      }
+    }
+    builders {
+      name: "dart2js-linux-d8-hostchecked-try"
+      recipe {
+        name: "dart/dart2js_swarming"
+        properties_j: "shards:6"
+      }
+    }
+    builders {
+      name: "dart2js-linux-none-only-unittest-try"
+      recipe {
+        name: "dart/dart2js_swarming"
+      }
+    }
+    builders {
+      name: "dart2js-linux-d8-kernel-minified-try"
+      recipe {
+        name: "dart/dart2js_swarming"
+        properties_j: "shards:6"
+      }
+    }
+    builders {
+      name: "dart2js-win10-ie11-try"
+      dimensions: "os:Windows-10"
+      recipe {
+        name: "dart/dart2js_swarming"
+        properties_j: "shards:6"
+      }
+    }
+    builders {
+      name: "dart2js-win10-edge-try"
+      dimensions: "os:Windows-10"
+      recipe {
+        name: "dart/dart2js_swarming"
+        properties_j: "shards:6"
+      }
+    }
+    builders {
+      name: "ddc-linux-release-chrome-try"
+      recipe {
+        properties: "clobber:true"
+      }
+    }
+    builders {
+      name: "analyzer-linux-release-strong-hostchecked-try"
+    }
+    builders {
+      name: "pkg-linux-release-try"
+    }
+    builders {
+      name: "cl-linux-try"
+    }
+    builders {
+      name: "cl-win-try"
+      dimensions: "os:Windows-10"
+    }
+    builders {
+      name: "cl-mac-try"
+      dimensions: "os:Mac"
+    }
   }
 }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 819df8e7c636..505ee02781ac 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -7,22 +7,22 @@ consoles: {
   ref: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
+    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
     category: "fasta"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
     category: "fasta"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
+    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
     category: "fasta"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64"
     category: "fasta"
     short_name: "vm"
   }
@@ -153,22 +153,22 @@ consoles: {
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64"
     category: "vm|kernel"
     short_name: "dbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64"
     category: "vm|kernel"
     short_name: "rbc"
   }
@@ -191,12 +191,12 @@ consoles: {
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64"
     category: "vm|kernel"
     short_name: "oc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64"
     category: "vm|kernel"
     short_name: "wr"
   }
@@ -249,12 +249,12 @@ consoles: {
     short_name: "8d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
@@ -295,7 +295,7 @@ consoles: {
     short_name: "6r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
@@ -529,37 +529,37 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
+    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
     category: "analyzer"
     short_name: "as"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
+    name: "buildbucket/luci.dart.ci/analyzer-linux-release"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
+    name: "buildbucket/luci.dart.ci/analyzer-mac-release"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
+    name: "buildbucket/luci.dart.ci/analyzer-win-release"
     category: "analyzer"
     short_name: "awr"
   }
@@ -582,27 +582,27 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
+    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
+    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
+    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "fs"
   }
@@ -644,7 +644,7 @@ consoles: {
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
@@ -667,7 +667,7 @@ consoles: {
     short_name: "3m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
@@ -710,17 +710,17 @@ consoles: {
 #    short_name: "ie"
 #  }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
+    name: "buildbucket/luci.dart.ci/pkg-linux-release"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
+    name: "buildbucket/luci.dart.ci/pkg-mac-release"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
+    name: "buildbucket/luci.dart.ci/pkg-win-release"
     category: "pkg"
     short_name: "w"
   }
@@ -776,22 +776,22 @@ consoles: {
   ref: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
+    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
     category: "fasta"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
     category: "fasta"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
+    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
     category: "fasta"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64"
     category: "fasta"
     short_name: "vm"
   }
@@ -869,37 +869,37 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
+    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
     category: "analyzer"
     short_name: "as"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
+    name: "buildbucket/luci.dart.ci/analyzer-linux-release"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
+    name: "buildbucket/luci.dart.ci/analyzer-mac-release"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
+    name: "buildbucket/luci.dart.ci/analyzer-win-release"
     category: "analyzer"
     short_name: "awr"
   }
@@ -922,17 +922,17 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
+    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
+    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
+    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
   }
@@ -961,17 +961,17 @@ consoles: {
     short_name: "4l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "fs"
   }
 #  builders {
-#    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-ff"
+#    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff"
 #    category: "dart2js|ff"
 #    short_name: "l"
 #  }
@@ -982,7 +982,7 @@ consoles: {
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
@@ -1005,7 +1005,7 @@ consoles: {
     short_name: "3m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
@@ -1048,17 +1048,17 @@ consoles: {
 #    short_name: "ie"
 #  }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
+    name: "buildbucket/luci.dart.ci/pkg-linux-release"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
+    name: "buildbucket/luci.dart.ci/pkg-mac-release"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
+    name: "buildbucket/luci.dart.ci/pkg-win-release"
     category: "pkg"
     short_name: "w"
   }
@@ -1201,22 +1201,22 @@ consoles: {
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64"
     category: "vm|kernel"
     short_name: "dbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64"
     category: "vm|kernel"
     short_name: "rbc"
   }
@@ -1239,12 +1239,12 @@ consoles: {
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64"
     category: "vm|kernel"
     short_name: "oc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64"
     category: "vm|kernel"
     short_name: "wr"
   }
@@ -1297,12 +1297,12 @@ consoles: {
     short_name: "8d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
@@ -1343,7 +1343,7 @@ consoles: {
     short_name: "6r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
@@ -1543,347 +1543,347 @@ consoles: {
   ref: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
+    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
     category: "fasta"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
     category: "fasta"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
+    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
     category: "fasta"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64"
     category: "fasta"
     short_name: "vm"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-ia32"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
     category: "vm|debug"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simarm"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm"
     category: "vm|simarm"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64"
     category: "vm|debug"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-ia32"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32"
     category: "vm|release"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm"
     category: "vm|simarm"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64"
     category: "vm|simarm"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-x64"
     category: "vm|release"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-ia32"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32"
     category: "vm|debug"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64"
     category: "vm|debug"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64"
     category: "vm|debug"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-ia32"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32"
     category: "vm|release"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64"
     category: "vm|release"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-x64"
     category: "vm|release"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-ia32"
+    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32"
     category: "vm|debug"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-win-debug-x64"
     category: "vm|debug"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-ia32"
+    name: "buildbucket/luci.dart.ci/vm-win-release-ia32"
     category: "vm|release"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-win-release-x64"
     category: "vm|release"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/app-linux-debug-x64"
     category: "vm|app"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-linux-product-x64"
+    name: "buildbucket/luci.dart.ci/app-linux-product-x64"
     category: "vm|app"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/app-linux-release-x64"
     category: "vm|app"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64"
     category: "vm|kernel"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64"
     category: "vm|kernel"
     short_name: "dbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64"
     category: "vm|kernel"
     short_name: "rbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64"
     category: "vm|kernel"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64"
     category: "vm|kernel"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64"
     category: "vm|kernel"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64"
     category: "vm|kernel"
     short_name: "oc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64"
     category: "vm|kernel"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64"
     category: "vm|kernel-precomp"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64"
     category: "vm|kernel-precomp"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
+    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
     category: "vm|misc"
     short_name: "cra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64"
+    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64"
     category: "vm|misc"
     short_name: "tra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64"
     category: "vm|misc"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-ia32"
+    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32"
     category: "vm|misc"
     short_name: "o32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64"
     category: "vm|misc"
     short_name: "o64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64"
     category: "vm|precomp"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-product-x64"
+    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64"
     category: "vm|precomp"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-noopt-mac-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64"
     category: "vm|precomp"
     short_name: "no"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-android-release"
+    name: "buildbucket/luci.dart.ci/vm-precomp-android-release"
     category: "vm|precomp"
     short_name: "and"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-win-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64"
     category: "vm|precomp"
     short_name: "wsi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-product-x64"
+    name: "buildbucket/luci.dart.ci/vm-linux-product-x64"
     category: "vm|product"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-product-x64"
+    name: "buildbucket/luci.dart.ci/vm-mac-product-x64"
     category: "vm|product"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-product-x64"
+    name: "buildbucket/luci.dart.ci/vm-win-product-x64"
     category: "vm|product"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64"
     category: "vm|reload"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64"
     category: "vm|reload"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64"
     category: "vm|reload"
     short_name: "mds"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-release-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64"
     category: "vm|reload"
     short_name: "mrs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64"
     category: "vm|reload"
     short_name: "dro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64"
     category: "vm|reload"
     short_name: "rro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-ia32-d8"
+    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8"
     category: "dart2js|d8"
     short_name: "hc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-linux-x64-d8"
+    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-x64-d8"
     category: "dart2js|d8"
     short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-only-unittest-linux-ia32-none"
+    name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none"
     category: "dart2js|misc"
     short_name: "ut"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-dumpinfo-linux-ia32-none"
+    name: "buildbucket/luci.dart.ci/dart2js-dumpinfo-linux-ia32-none"
     category: "dart2js|misc"
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
+    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
     category: "analyzer"
     short_name: "aas"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
+    name: "buildbucket/luci.dart.ci/analyzer-linux-release"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
+    name: "buildbucket/luci.dart.ci/analyzer-mac-release"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
+    name: "buildbucket/luci.dart.ci/analyzer-win-release"
     category: "analyzer"
     short_name: "awr"
   }
@@ -1903,82 +1903,82 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
+    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
+    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
+    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "fs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-ff"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff"
     category: "dart2js|ff"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-safari"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-safari"
     category: "dart2js|safari"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-edge"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-edge"
     category: "dart2js|ms"
     short_name: "ed"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ff"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ff"
     category: "dart2js|ff"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ie11"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ie11"
     category: "dart2js|ms"
     short_name: "ie"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
+    name: "buildbucket/luci.dart.ci/pkg-linux-release"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
+    name: "buildbucket/luci.dart.ci/pkg-mac-release"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
+    name: "buildbucket/luci.dart.ci/pkg-win-release"
     category: "pkg"
     short_name: "w"
   }
@@ -1988,7 +1988,7 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/versionchecker-linux"
+    name: "buildbucket/luci.dart.ci/versionchecker-linux"
     category: "misc"
     short_name: "vc"
   }
@@ -2032,347 +2032,347 @@ consoles: {
   ref: "refs/heads/dev"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64-dev"
     category: "fasta"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64-dev"
     category: "fasta"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/front-end-win-release-x64-dev"
     category: "fasta"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64-dev"
     category: "fasta"
     short_name: "vm"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-ia32-dev"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32-dev"
     category: "vm|debug"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simarm-dev"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm-dev"
     category: "vm|simarm"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64-dev"
     category: "vm|debug"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-ia32-dev"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32-dev"
     category: "vm|release"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm-dev"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm-dev"
     category: "vm|simarm"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64-dev"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64-dev"
     category: "vm|simarm"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-x64-dev"
     category: "vm|release"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-ia32-dev"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32-dev"
     category: "vm|debug"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64-dev"
     category: "vm|debug"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64-dev"
     category: "vm|debug"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-ia32-dev"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32-dev"
     category: "vm|release"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64-dev"
     category: "vm|release"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-x64-dev"
     category: "vm|release"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-ia32-dev"
+    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32-dev"
     category: "vm|debug"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-win-debug-x64-dev"
     category: "vm|debug"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-ia32-dev"
+    name: "buildbucket/luci.dart.ci/vm-win-release-ia32-dev"
     category: "vm|release"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-win-release-x64-dev"
     category: "vm|release"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci/app-linux-debug-x64-dev"
     category: "vm|app"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-linux-product-x64-dev"
+    name: "buildbucket/luci.dart.ci/app-linux-product-x64-dev"
     category: "vm|app"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/app-linux-release-x64-dev"
     category: "vm|app"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64-dev"
     category: "vm|kernel"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64-dev"
     category: "vm|kernel"
     short_name: "dbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm-dev"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64-dev"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64-dev"
     category: "vm|kernel"
     short_name: "rbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64-dev"
     category: "vm|kernel"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64-dev"
     category: "vm|kernel"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64-dev"
     category: "vm|kernel"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64-dev"
     category: "vm|kernel"
     short_name: "oc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64-dev"
     category: "vm|kernel"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm-dev"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64-dev"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-dev"
+    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64-dev"
     category: "vm|misc"
     short_name: "cra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64-dev"
+    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64-dev"
     category: "vm|misc"
     short_name: "tra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64-dev"
     category: "vm|misc"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-ia32-dev"
+    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32-dev"
     category: "vm|misc"
     short_name: "o32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64-dev"
     category: "vm|misc"
     short_name: "o64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64-dev"
     category: "vm|precomp"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-product-x64-dev"
+    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64-dev"
     category: "vm|precomp"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-noopt-mac-simarm64-dev"
+    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64-dev"
     category: "vm|precomp"
     short_name: "no"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-android-release-dev"
+    name: "buildbucket/luci.dart.ci/vm-precomp-android-release-dev"
     category: "vm|precomp"
     short_name: "and"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-win-simarm64-dev"
+    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64-dev"
     category: "vm|precomp"
     short_name: "wsi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-product-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-linux-product-x64-dev"
     category: "vm|product"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-product-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-mac-product-x64-dev"
     category: "vm|product"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-product-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-win-product-x64-dev"
     category: "vm|product"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64-dev"
     category: "vm|reload"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64-dev"
     category: "vm|reload"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-debug-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64-dev"
     category: "vm|reload"
     short_name: "mds"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-release-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64-dev"
     category: "vm|reload"
     short_name: "mrs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64-dev"
     category: "vm|reload"
     short_name: "dro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64-dev"
     category: "vm|reload"
     short_name: "rro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-ia32-d8-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8-dev"
     category: "dart2js|d8"
     short_name: "hc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-linux-x64-d8-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-x64-d8-dev"
     category: "dart2js|d8"
     short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-only-unittest-linux-ia32-none-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none-dev"
     category: "dart2js|misc"
     short_name: "ut"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-dumpinfo-linux-ia32-none-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-dumpinfo-linux-ia32-none-dev"
     category: "dart2js|misc"
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-dev"
+    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux-dev"
     category: "analyzer"
     short_name: "aas"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-dev"
+    name: "buildbucket/luci.dart.ci/analyzer-linux-release-dev"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-dev"
+    name: "buildbucket/luci.dart.ci/analyzer-mac-release-dev"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release-dev"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release-dev"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release-dev"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release-dev"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release-dev"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release-dev"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-dev"
+    name: "buildbucket/luci.dart.ci/analyzer-win-release-dev"
     category: "analyzer"
     short_name: "awr"
   }
@@ -2392,82 +2392,82 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-dev"
+    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome-dev"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-dev"
+    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome-dev"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-dev"
+    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome-dev"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "fs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-ff-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff-dev"
     category: "dart2js|ff"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-safari-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-safari-dev"
     category: "dart2js|safari"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-edge-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-edge-dev"
     category: "dart2js|ms"
     short_name: "ed"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ff-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ff-dev"
     category: "dart2js|ff"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ie11-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ie11-dev"
     category: "dart2js|ms"
     short_name: "ie"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
+    name: "buildbucket/luci.dart.ci/pkg-linux-release-dev"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-dev"
+    name: "buildbucket/luci.dart.ci/pkg-mac-release-dev"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-dev"
+    name: "buildbucket/luci.dart.ci/pkg-win-release-dev"
     category: "pkg"
     short_name: "w"
   }
@@ -2477,7 +2477,7 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/versionchecker-linux-dev"
+    name: "buildbucket/luci.dart.ci/versionchecker-linux-dev"
     category: "misc"
     short_name: "vc"
   }
@@ -2521,347 +2521,347 @@ consoles: {
   ref: "refs/heads/stable"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64-stable"
     category: "fasta"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64-stable"
     category: "fasta"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/front-end-win-release-x64-stable"
     category: "fasta"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64-stable"
     category: "fasta"
     short_name: "vm"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-ia32-stable"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32-stable"
     category: "vm|debug"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simarm-stable"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm-stable"
     category: "vm|simarm"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64-stable"
     category: "vm|debug"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-ia32-stable"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32-stable"
     category: "vm|release"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm-stable"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm-stable"
     category: "vm|simarm"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64-stable"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64-stable"
     category: "vm|simarm"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-x64-stable"
     category: "vm|release"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-ia32-stable"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32-stable"
     category: "vm|debug"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64-stable"
     category: "vm|debug"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64-stable"
     category: "vm|debug"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-ia32-stable"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32-stable"
     category: "vm|release"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64-stable"
     category: "vm|release"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-x64-stable"
     category: "vm|release"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-ia32-stable"
+    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32-stable"
     category: "vm|debug"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-win-debug-x64-stable"
     category: "vm|debug"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-ia32-stable"
+    name: "buildbucket/luci.dart.ci/vm-win-release-ia32-stable"
     category: "vm|release"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-win-release-x64-stable"
     category: "vm|release"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci/app-linux-debug-x64-stable"
     category: "vm|app"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-linux-product-x64-stable"
+    name: "buildbucket/luci.dart.ci/app-linux-product-x64-stable"
     category: "vm|app"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/app-linux-release-x64-stable"
     category: "vm|app"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64-stable"
     category: "vm|kernel"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64-stable"
     category: "vm|kernel"
     short_name: "dbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm-stable"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64-stable"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64-stable"
     category: "vm|kernel"
     short_name: "rbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64-stable"
     category: "vm|kernel"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64-stable"
     category: "vm|kernel"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64-stable"
     category: "vm|kernel"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64-stable"
     category: "vm|kernel"
     short_name: "oc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64-stable"
     category: "vm|kernel"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm-stable"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64-stable"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-stable"
+    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64-stable"
     category: "vm|misc"
     short_name: "cra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64-stable"
+    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64-stable"
     category: "vm|misc"
     short_name: "tra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64-stable"
     category: "vm|misc"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-ia32-stable"
+    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32-stable"
     category: "vm|misc"
     short_name: "o32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64-stable"
     category: "vm|misc"
     short_name: "o64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64-stable"
     category: "vm|precomp"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-product-x64-stable"
+    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64-stable"
     category: "vm|precomp"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-noopt-mac-simarm64-stable"
+    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64-stable"
     category: "vm|precomp"
     short_name: "no"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-android-release-stable"
+    name: "buildbucket/luci.dart.ci/vm-precomp-android-release-stable"
     category: "vm|precomp"
     short_name: "and"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-win-simarm64-stable"
+    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64-stable"
     category: "vm|precomp"
     short_name: "wsi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-product-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-linux-product-x64-stable"
     category: "vm|product"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-product-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-mac-product-x64-stable"
     category: "vm|product"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-product-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-win-product-x64-stable"
     category: "vm|product"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64-stable"
     category: "vm|reload"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64-stable"
     category: "vm|reload"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-debug-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64-stable"
     category: "vm|reload"
     short_name: "mds"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-release-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64-stable"
     category: "vm|reload"
     short_name: "mrs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64-stable"
     category: "vm|reload"
     short_name: "dro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64-stable"
     category: "vm|reload"
     short_name: "rro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-ia32-d8-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8-stable"
     category: "dart2js|d8"
     short_name: "hc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-linux-x64-d8-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-x64-d8-stable"
     category: "dart2js|d8"
     short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-only-unittest-linux-ia32-none-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none-stable"
     category: "dart2js|misc"
     short_name: "ut"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-dumpinfo-linux-ia32-none-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-dumpinfo-linux-ia32-none-stable"
     category: "dart2js|misc"
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-stable"
+    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux-stable"
     category: "analyzer"
     short_name: "aas"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-stable"
+    name: "buildbucket/luci.dart.ci/analyzer-linux-release-stable"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-stable"
+    name: "buildbucket/luci.dart.ci/analyzer-mac-release-stable"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release-stable"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release-stable"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release-stable"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release-stable"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release-stable"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release-stable"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-stable"
+    name: "buildbucket/luci.dart.ci/analyzer-win-release-stable"
     category: "analyzer"
     short_name: "awr"
   }
@@ -2881,82 +2881,82 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-stable"
+    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome-stable"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-stable"
+    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome-stable"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-stable"
+    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome-stable"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "fs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-ff-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff-stable"
     category: "dart2js|ff"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-safari-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-safari-stable"
     category: "dart2js|safari"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-edge-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-edge-stable"
     category: "dart2js|ms"
     short_name: "ed"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ff-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ff-stable"
     category: "dart2js|ff"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ie11-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ie11-stable"
     category: "dart2js|ms"
     short_name: "ie"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
+    name: "buildbucket/luci.dart.ci/pkg-linux-release-stable"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-stable"
+    name: "buildbucket/luci.dart.ci/pkg-mac-release-stable"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-stable"
+    name: "buildbucket/luci.dart.ci/pkg-win-release-stable"
     category: "pkg"
     short_name: "w"
   }
@@ -2966,7 +2966,7 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/versionchecker-linux-stable"
+    name: "buildbucket/luci.dart.ci/versionchecker-linux-stable"
     category: "misc"
     short_name: "vc"
   }
@@ -3010,37 +3010,37 @@ consoles: {
   ref: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-checked-linux-release-x64"
     category: "vm-kernel"
     short_name: "cr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-debug-ia32-none"
+    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-debug-ia32-none"
     category: "dart2js"
     short_name: "hcd"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-debug-ia32-none"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-debug-ia32-none"
     category: "dart2js"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pub-linux-release"
+    name: "buildbucket/luci.dart.ci/pub-linux-release"
     category: "pub"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pub-mac-release"
+    name: "buildbucket/luci.dart.ci/pub-mac-release"
     category: "pub"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pub-win-release"
+    name: "buildbucket/luci.dart.ci/pub-win-release"
     category: "pub"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/androidvm-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/androidvm-linux-release-x64"
     category: "android"
     short_name: "vm"
   }
@@ -3095,7 +3095,7 @@ consoles: {
   builders { name: "buildbucket/luci.dart.try/pkg-linux-release-try" }
   builders { name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try" }
   builders { name: "buildbucket/luci.dart.try/vm-kernel-legacy-linux-release-x64-try" }
-  builders { name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try" }
+  builders { name: "buildbucket/luci.dart.try/vm-kernel-mac-release-x64-try" }
   builders { name: "buildbucket/luci.dart.try/vm-linux-product-x64-try" }
   builders { name: "buildbucket/luci.dart.try/vm-linux-release-x64-try" }
   builders { name: "buildbucket/luci.dart.try/vm-mac-release-x64-try" }
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index be358aab47de..e9e542510a9a 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -146,7 +146,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-analysis-server-linux"
   }
 }
@@ -157,7 +157,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-linux-release"
   }
 }
@@ -168,7 +168,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-mac-release"
   }
 }
@@ -179,7 +179,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-strong-linux-release"
   }
 }
@@ -190,7 +190,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-strong-mac-release"
   }
 }
@@ -201,7 +201,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-strong-win-release"
   }
 }
@@ -212,7 +212,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-win-release"
   }
 }
@@ -259,7 +259,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "dart2js-faststartup-linux-x64-chrome"
   }
 }
@@ -270,7 +270,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "dart2js-linux-x64-chrome"
   }
 }
@@ -281,7 +281,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "dart2js-mac-x64-chrome"
   }
 }
@@ -292,7 +292,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "dart2js-win-x64-chrome"
   }
 }
@@ -303,7 +303,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "ddc-linux-release-chrome"
   }
 }
@@ -314,7 +314,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "ddc-mac-release-chrome"
   }
 }
@@ -325,7 +325,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "ddc-win-release-chrome"
   }
 }
@@ -336,7 +336,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "front-end-linux-release-x64"
   }
 }
@@ -347,7 +347,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "front-end-mac-release-x64"
   }
 }
@@ -358,7 +358,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "front-end-win-release-x64"
   }
 }
@@ -369,7 +369,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "pkg-linux-release"
   }
 }
@@ -380,7 +380,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "pkg-mac-release"
   }
 }
@@ -391,7 +391,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "pkg-win-release"
   }
 }
@@ -402,7 +402,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-legacy-linux-release-x64"
   }
 }
@@ -413,7 +413,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-linux-debug-simdbc64"
   }
 }
@@ -424,7 +424,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-linux-release-simarm"
   }
 }
@@ -435,7 +435,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-linux-release-simarm64"
   }
 }
@@ -446,7 +446,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-linux-release-simdbc64"
   }
 }
@@ -457,7 +457,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-optcounter-threshold-linux-release-x64"
   }
 }
@@ -468,7 +468,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-win-release-x64"
   }
 }
@@ -479,7 +479,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-precomp-linux-release-simarm"
   }
 }
@@ -490,7 +490,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-precomp-linux-release-simarm64"
   }
 }
@@ -501,7 +501,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-precomp-win-release-x64"
   }
 }
@@ -512,7 +512,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-analysis-server-linux-dev"
   }
 }
@@ -523,7 +523,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-linux-release-dev"
   }
 }
@@ -534,7 +534,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-mac-release-dev"
   }
 }
@@ -545,7 +545,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-strong-linux-release-dev"
   }
 }
@@ -556,7 +556,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-strong-mac-release-dev"
   }
 }
@@ -567,7 +567,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-strong-win-release-dev"
   }
 }
@@ -578,7 +578,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-win-release-dev"
   }
 }
@@ -625,7 +625,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "dart2js-faststartup-linux-x64-chrome-dev"
   }
 }
@@ -636,7 +636,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "dart2js-linux-x64-chrome-dev"
   }
 }
@@ -647,7 +647,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "dart2js-mac-x64-chrome-dev"
   }
 }
@@ -658,7 +658,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "dart2js-win-x64-chrome-dev"
   }
 }
@@ -669,7 +669,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "ddc-linux-release-chrome-dev"
   }
 }
@@ -680,7 +680,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "ddc-mac-release-chrome-dev"
   }
 }
@@ -691,7 +691,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "ddc-win-release-chrome-dev"
   }
 }
@@ -702,7 +702,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "front-end-linux-release-x64-dev"
   }
 }
@@ -713,7 +713,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "front-end-mac-release-x64-dev"
   }
 }
@@ -724,7 +724,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "front-end-win-release-x64-dev"
   }
 }
@@ -735,7 +735,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "pkg-linux-release-dev"
   }
 }
@@ -746,7 +746,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "pkg-mac-release-dev"
   }
 }
@@ -757,7 +757,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "pkg-win-release-dev"
   }
 }
@@ -768,7 +768,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-legacy-linux-release-x64-dev"
   }
 }
@@ -779,7 +779,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-linux-debug-simdbc64-dev"
   }
 }
@@ -790,7 +790,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-linux-release-simarm-dev"
   }
 }
@@ -801,7 +801,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-linux-release-simarm64-dev"
   }
 }
@@ -812,7 +812,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-linux-release-simdbc64-dev"
   }
 }
@@ -823,7 +823,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
   }
 }
@@ -834,7 +834,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-win-release-x64-dev"
   }
 }
@@ -845,7 +845,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-precomp-linux-release-simarm-dev"
   }
 }
@@ -856,7 +856,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-precomp-linux-release-simarm64-dev"
   }
 }
@@ -867,7 +867,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-precomp-win-release-x64-dev"
   }
 }
@@ -878,7 +878,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-analysis-server-linux-stable"
   }
 }
@@ -889,7 +889,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-linux-release-stable"
   }
 }
@@ -900,7 +900,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-mac-release-stable"
   }
 }
@@ -911,7 +911,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-strong-linux-release-stable"
   }
 }
@@ -922,7 +922,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-strong-mac-release-stable"
   }
 }
@@ -933,7 +933,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-strong-win-release-stable"
   }
 }
@@ -944,7 +944,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-win-release-stable"
   }
 }
@@ -991,7 +991,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "dart2js-faststartup-linux-x64-chrome-stable"
   }
 }
@@ -1002,7 +1002,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "dart2js-linux-x64-chrome-stable"
   }
 }
@@ -1013,7 +1013,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "dart2js-mac-x64-chrome-stable"
   }
 }
@@ -1024,7 +1024,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "dart2js-win-x64-chrome-stable"
   }
 }
@@ -1035,7 +1035,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "ddc-linux-release-chrome-stable"
   }
 }
@@ -1046,7 +1046,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "ddc-mac-release-chrome-stable"
   }
 }
@@ -1057,7 +1057,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "ddc-win-release-chrome-stable"
   }
 }
@@ -1068,7 +1068,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "front-end-linux-release-x64-stable"
   }
 }
@@ -1079,7 +1079,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "front-end-mac-release-x64-stable"
   }
 }
@@ -1090,7 +1090,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "front-end-win-release-x64-stable"
   }
 }
@@ -1101,7 +1101,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "pkg-linux-release-stable"
   }
 }
@@ -1112,7 +1112,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "pkg-mac-release-stable"
   }
 }
@@ -1123,7 +1123,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "pkg-win-release-stable"
   }
 }
@@ -1134,7 +1134,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-legacy-linux-release-x64-stable"
   }
 }
@@ -1145,7 +1145,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-linux-debug-simdbc64-stable"
   }
 }
@@ -1156,7 +1156,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-linux-release-simarm-stable"
   }
 }
@@ -1167,7 +1167,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-linux-release-simarm64-stable"
   }
 }
@@ -1178,7 +1178,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-linux-release-simdbc64-stable"
   }
 }
@@ -1189,7 +1189,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
   }
 }
@@ -1200,7 +1200,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-win-release-x64-stable"
   }
 }
@@ -1211,7 +1211,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-precomp-linux-release-simarm-stable"
   }
 }
@@ -1222,7 +1222,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-precomp-linux-release-simarm64-stable"
   }
 }
@@ -1233,7 +1233,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-precomp-win-release-x64-stable"
   }
 }

From 627615b6caeaf66c7b0550db020d3cfff3a21f2f Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 7 May 2018 07:39:22 +0000
Subject: [PATCH 114/826] Reland "[infra] Refactor cr-buildbucket.cfg"

This reverts commit c6a28cd8ef51fbfc1d151358f76762e19efcae85.

Reason for revert: pools.cfg should be updated by now.

Original change's description:
> Revert "[infra] Refactor cr-buildbucket.cfg"
>
> This reverts commit a8bb29dfb0f3493336a1a791e6aaa23eedc119bd.
>
> Reason for revert: Swarming hasn't picket up the new pools.cfg changes.
>
> Original change's description:
> > [infra] Refactor cr-buildbucket.cfg
> >
> > This is part 2 of 3 CLs to create a separate pool of bots for luci.dart.ci.
> >
> > * Add luci.dart.ci.sandbox bucket.
> > * Move CI builders that don't require privileged access to their own bucket.
> > * Use mixins to make it easier to change common builder properties.
> > * Sort CQ builders.
> > * Removed some unused CQ builders.
> >
> > Change-Id: I0e5fd2a616bbed86dfc01e1fb32c4fc924a2ac74
> > Reviewed-on: https://dart-review.googlesource.com/53101
> > Reviewed-by: Jonas Termansen <sortie@google.com>
>
> TBR=sortie@google.com,athom@google.com
>
> Change-Id: I5f5f292bd08ca136e98f3ff64ee96f20e5b05096
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://dart-review.googlesource.com/53620
> Reviewed-by: Alexander Thomas <athom@google.com>
> Commit-Queue: Alexander Thomas <athom@google.com>

TBR=sortie@google.com,athom@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: I3a86751105cc64effe62929a7ebd4e6f2e6fe9d0
Reviewed-on: https://dart-review.googlesource.com/53900
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 507 ++++++++++++++++-------------------
 luci-milo.cfg      | 654 ++++++++++++++++++++++-----------------------
 luci-scheduler.cfg | 180 ++++++-------
 3 files changed, 651 insertions(+), 690 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index bbd1fb136ad6..38a6073c64ea 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -7,7 +7,7 @@
 # Please keep this list sorted by bucket name.
 
 acl_sets {
-  name: "waterfall"
+  name: "ci"
   acls {
     role: READER
     group: "all"
@@ -23,7 +23,7 @@ acl_sets {
 }
 
 acl_sets {
-  name: "tryserver"
+  name: "try"
   acls {
     role: READER
     group: "all"
@@ -43,11 +43,38 @@ builder_mixins {
   # todo(athom): how should this machine be defined?
 }
 
+builder_mixins {
+  name: "clobber"
+  recipe {
+    properties: "clobber:true"
+  }
+}
+
+builder_mixins {
+  name: "dart2js"
+  recipe {
+    name: "dart/dart2js_swarming"
+    properties_j: "shards:6"
+  }
+}
+
 builder_mixins {
   name: "debianpackage"
   # todo(athom): how should this machine be defined?
 }
 
+builder_mixins {
+  name: "mac"
+  dimensions: "os:Mac"
+}
+
+builder_mixins {
+  name: "sdk"
+  recipe {
+    name: "dart/sdk_swarming"
+  }
+}
+
 builder_mixins {
   name: "slow"
   execution_timeout_secs: 21600 # 6h
@@ -56,6 +83,13 @@ builder_mixins {
   }
 }
 
+builder_mixins {
+  name: "vm"
+  recipe {
+    name: "dart/dart_vm"
+  }
+}
+
 builder_mixins {
   name: "vm-kernel"
   recipe {
@@ -64,9 +98,15 @@ builder_mixins {
   }
 }
 
+builder_mixins {
+  name: "win"
+  dimensions: "os:Windows"
+}
+
 buckets {
+  # CI Builders that require special permissions
   name: "luci.dart.ci"
-  acl_sets: "waterfall"
+  acl_sets: "ci"
 
   swarming {
     hostname: "chromium-swarm.appspot.com"
@@ -92,21 +132,66 @@ buckets {
       }
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     }
+
+    # CI Builders that require privileged access
+    builders { name: "dart-sdk-linux" }
+    builders { name: "dart-sdk-mac" mixins: "mac" }
+    builders { name: "dart-sdk-win" mixins: "win" }
+    builders { name: "debianpackage-linux" mixins: "debianpackage" }
+    builders { name: "dart-sdk-linux-dev" }
+    builders { name: "dart-sdk-mac-dev" mixins: "mac" }
+    builders { name: "dart-sdk-win-dev" mixins: "win" }
+    builders { name: "debianpackage-linux-dev" mixins: "debianpackage" }
+    builders { name: "dart-sdk-linux-stable" }
+    builders { name: "dart-sdk-mac-stable" mixins: "mac" }
+    builders { name: "dart-sdk-win-stable" mixins: "win" }
+    builders { name: "debianpackage-linux-stable" mixins: "debianpackage" }
+  }
+}
+
+buckets {
+  # CI Builders that only require try permissions
+  name: "luci.dart.ci.sandbox"
+  acl_sets: "ci"
+
+  swarming {
+    hostname: "chromium-swarm.appspot.com"
+    url_format: "https://ci.chromium.org/swarming/task/{task_id}"
+    builder_defaults {
+      category: "Dart CI (Sandboxed)"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      build_numbers: YES
+      priority: 50
+      swarming_tags: "vpython:native-python-wrapper"
+      caches {
+        path: "browsers"
+        name: "browsers"
+      }
+      recipe {
+        repository: "https://chromium.googlesource.com/chromium/tools/build.git"
+        properties: "mastername:client.dart"
+        name: "dart/neo"
+        # TODO(vadimsh): make sure the service account has all necessary Git and
+        # GS permissions and remove this line, see https://crbug.com/776035
+        properties_j: "$kitchen:{\"git_auth\": false, \"devshell\": false}"
+      }
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+
+    # CI Builders for the master branch
     builders { name: "analyzer-analysis-server-linux" }
     builders { name: "analyzer-linux-release" }
-    builders { name: "analyzer-mac-release" dimensions: "os:Mac" }
+    builders { name: "analyzer-mac-release" mixins: "mac" }
     builders { name: "analyzer-strong-linux-release" }
-    builders { name: "analyzer-strong-mac-release" dimensions: "os:Mac" }
-    builders { name: "analyzer-strong-win-release" dimensions: "os:Windows" }
-    builders { name: "analyzer-win-release" dimensions: "os:Windows" }
+    builders { name: "analyzer-strong-mac-release" mixins: "mac" }
+    builders { name: "analyzer-strong-win-release" mixins: "win" }
+    builders { name: "analyzer-win-release" mixins: "win" }
     builders { name: "androidvm-linux-release-x64" mixins: "android" }
     builders { name: "app-linux-debug-x64" }
     builders { name: "app-linux-product-x64" }
     builders { name: "app-linux-release-x64" }
     builders { name: "cross-vm-linux-release-arm64" }
-    builders { name: "dart-sdk-linux" }
-    builders { name: "dart-sdk-mac" dimensions: "os:Mac" }
-    builders { name: "dart-sdk-win" dimensions: "os:Windows" }
     builders { name: "dart2js-csp-minified-linux-x64-drt" }
     builders { name: "dart2js-dumpinfo-linux-ia32-none" }
     builders { name: "dart2js-faststartup-linux-x64-chrome" }
@@ -116,27 +201,26 @@ buckets {
     builders { name: "dart2js-linux-x64-ff" }
     builders { name: "dart2js-linux-debug-ia32-none" }
     builders { name: "dart2js-linux-x64-drt" }
-    builders { name: "dart2js-mac-x64-chrome" dimensions: "os:Mac" }
-    builders { name: "dart2js-mac-x64-safari" dimensions: "os:Mac" }
+    builders { name: "dart2js-mac-x64-chrome" mixins: "mac" }
+    builders { name: "dart2js-mac-x64-safari" mixins: "mac" }
     builders { name: "dart2js-minified-linux-x64-d8" }
     builders { name: "dart2js-only-unittest-linux-ia32-none" }
-    builders { name: "dart2js-win-x64-chrome" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-x64-edge" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-x64-ff" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-x64-ie11" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-chrome" mixins: "win" }
+    builders { name: "dart2js-win-x64-edge" mixins: "win" }
+    builders { name: "dart2js-win-x64-ff" mixins: "win" }
+    builders { name: "dart2js-win-x64-ie11" mixins: "win" }
     builders { name: "ddc-linux-release-chrome" }
-    builders { name: "ddc-mac-release-chrome" dimensions: "os:Mac" }
-    builders { name: "ddc-win-release-chrome" dimensions: "os:Windows" }
-    builders { name: "debianpackage-linux" mixins: "debianpackage" }
-    builders { name: "front-end-mac-release-x64" dimensions: "os:Mac" }
+    builders { name: "ddc-mac-release-chrome" mixins: "mac" }
+    builders { name: "ddc-win-release-chrome" mixins: "win" }
+    builders { name: "front-end-mac-release-x64" mixins: "mac" }
     builders { name: "front-end-linux-release-x64" }
-    builders { name: "front-end-win-release-x64" dimensions: "os:Windows" }
+    builders { name: "front-end-win-release-x64" mixins: "win" }
     builders { name: "pkg-linux-release" }
-    builders { name: "pkg-mac-release" dimensions: "os:Mac" }
-    builders { name: "pkg-win-release" dimensions: "os:Windows" }
+    builders { name: "pkg-mac-release" mixins: "mac" }
+    builders { name: "pkg-win-release" mixins: "win" }
     builders { name: "pub-linux-release" }
-    builders { name: "pub-mac-release" dimensions: "os:Mac" }
-    builders { name: "pub-win-release" dimensions: "os:Windows" }
+    builders { name: "pub-mac-release" mixins: "mac" }
+    builders { name: "pub-win-release" mixins: "win" }
     builders { name: "precomp-linux-debug-x64" }
     builders { name: "precomp-linux-product-x64" }
     builders { name: "target-vm-linux-release-arm64" dimensions: "cpu:arm64" }
@@ -150,15 +234,15 @@ buckets {
     builders { name: "vm-kernel-linux-release-simarm64" }
     builders { name: "vm-kernel-linux-release-simdbc64" }
     builders { name: "vm-kernel-linux-release-x64" }
-    builders { name: "vm-kernel-mac-debug-x64" dimensions: "os:Mac" }
-    builders { name: "vm-kernel-mac-release-x64" dimensions: "os:Mac" }
-    builders { name: "vm-kernel-win-release-x64" dimensions: "os:Windows" }
+    builders { name: "vm-kernel-mac-debug-x64" mixins: "mac" }
+    builders { name: "vm-kernel-mac-release-x64" mixins: "mac" }
+    builders { name: "vm-kernel-win-release-x64" mixins: "win" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-debug-x64" mixins: "slow" }
     builders { name: "vm-kernel-precomp-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-release-simarm" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64" }
-    builders { name: "vm-kernel-precomp-win-release-x64" dimensions: "os:Windows" }
+    builders { name: "vm-kernel-precomp-win-release-x64" mixins: "win" }
     builders { name: "vm-linux-debug-ia32" }
     builders { name: "vm-linux-debug-simarm" }
     builders { name: "vm-linux-debug-x64" }
@@ -167,44 +251,43 @@ buckets {
     builders { name: "vm-linux-release-simarm" }
     builders { name: "vm-linux-release-simarm64" }
     builders { name: "vm-linux-release-x64" }
-    builders { name: "vm-mac-debug-ia32" dimensions: "os:Mac" }
-    builders { name: "vm-mac-debug-simdbc64" dimensions: "os:Mac" }
-    builders { name: "vm-mac-debug-x64" dimensions: "os:Mac" }
-    builders { name: "vm-mac-product-x64" dimensions: "os:Mac" }
-    builders { name: "vm-mac-release-ia32" dimensions: "os:Mac" }
-    builders { name: "vm-mac-release-simdbc64" dimensions: "os:Mac" }
-    builders { name: "vm-mac-release-x64" dimensions: "os:Mac" }
-    builders { name: "vm-noopt-mac-simarm64" dimensions: "os:Mac" }
+    builders { name: "vm-mac-debug-ia32" mixins: "mac" }
+    builders { name: "vm-mac-debug-simdbc64" mixins: "mac" }
+    builders { name: "vm-mac-debug-x64" mixins: "mac" }
+    builders { name: "vm-mac-product-x64" mixins: "mac" }
+    builders { name: "vm-mac-release-ia32" mixins: "mac" }
+    builders { name: "vm-mac-release-simdbc64" mixins: "mac" }
+    builders { name: "vm-mac-release-x64" mixins: "mac" }
+    builders { name: "vm-noopt-mac-simarm64" mixins: "mac" }
     builders { name: "vm-optcounter-threshold-linux-release-ia32" }
     builders { name: "vm-optcounter-threshold-linux-release-x64" }
     builders { name: "vm-precomp-android-release" }
-    builders { name: "vm-precomp-win-simarm64" dimensions: "os:Windows" }
+    builders { name: "vm-precomp-win-simarm64" mixins: "win" }
     builders { name: "vm-reload-linux-debug-x64" }
     builders { name: "vm-reload-linux-release-x64" }
-    builders { name: "vm-reload-mac-debug-simdbc64" dimensions: "os:Mac" }
-    builders { name: "vm-reload-mac-release-simdbc64" dimensions: "os:Mac" }
+    builders { name: "vm-reload-mac-debug-simdbc64" mixins: "mac" }
+    builders { name: "vm-reload-mac-release-simdbc64" mixins: "mac" }
     builders { name: "vm-reload-rollback-linux-debug-x64" }
     builders { name: "vm-reload-rollback-linux-release-x64" }
-    builders { name: "vm-win-debug-ia32" dimensions: "os:Windows" }
-    builders { name: "vm-win-debug-x64" dimensions: "os:Windows" }
-    builders { name: "vm-win-product-x64" dimensions: "os:Windows" }
-    builders { name: "vm-win-release-ia32" dimensions: "os:Windows" }
-    builders { name: "vm-win-release-x64" dimensions: "os:Windows" }
+    builders { name: "vm-win-debug-ia32" mixins: "win" }
+    builders { name: "vm-win-debug-x64" mixins: "win" }
+    builders { name: "vm-win-product-x64" mixins: "win" }
+    builders { name: "vm-win-release-ia32" mixins: "win" }
+    builders { name: "vm-win-release-x64" mixins: "win" }
+
+    # CI Builders for the dev branch
     builders { name: "analyzer-analysis-server-linux-dev" }
     builders { name: "analyzer-linux-release-dev" }
-    builders { name: "analyzer-mac-release-dev" dimensions: "os:Mac" }
+    builders { name: "analyzer-mac-release-dev" mixins: "mac" }
     builders { name: "analyzer-strong-linux-release-dev" }
-    builders { name: "analyzer-strong-mac-release-dev" dimensions: "os:Mac" }
-    builders { name: "analyzer-strong-win-release-dev" dimensions: "os:Windows" }
-    builders { name: "analyzer-win-release-dev" dimensions: "os:Windows" }
+    builders { name: "analyzer-strong-mac-release-dev" mixins: "mac" }
+    builders { name: "analyzer-strong-win-release-dev" mixins: "win" }
+    builders { name: "analyzer-win-release-dev" mixins: "win" }
     builders { name: "androidvm-linux-release-x64-dev" mixins: "android" }
     builders { name: "app-linux-debug-x64-dev" }
     builders { name: "app-linux-product-x64-dev" }
     builders { name: "app-linux-release-x64-dev" }
     builders { name: "cross-vm-linux-release-arm64-dev" }
-    builders { name: "dart-sdk-linux-dev" }
-    builders { name: "dart-sdk-mac-dev" dimensions: "os:Mac" }
-    builders { name: "dart-sdk-win-dev" dimensions: "os:Windows" }
     builders { name: "dart2js-csp-minified-linux-x64-drt-dev" }
     builders { name: "dart2js-dumpinfo-linux-ia32-none-dev" }
     builders { name: "dart2js-faststartup-linux-x64-chrome-dev" }
@@ -214,27 +297,26 @@ buckets {
     builders { name: "dart2js-linux-x64-ff-dev" }
     builders { name: "dart2js-linux-debug-ia32-none-dev" }
     builders { name: "dart2js-linux-x64-drt-dev" }
-    builders { name: "dart2js-mac-x64-chrome-dev" dimensions: "os:Mac" }
-    builders { name: "dart2js-mac-x64-safari-dev" dimensions: "os:Mac" }
+    builders { name: "dart2js-mac-x64-chrome-dev" mixins: "mac" }
+    builders { name: "dart2js-mac-x64-safari-dev" mixins: "mac" }
     builders { name: "dart2js-minified-linux-x64-d8-dev" }
     builders { name: "dart2js-only-unittest-linux-ia32-none-dev" }
-    builders { name: "dart2js-win-x64-chrome-dev" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-x64-edge-dev" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-x64-ff-dev" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-x64-ie11-dev" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-chrome-dev" mixins: "win" }
+    builders { name: "dart2js-win-x64-edge-dev" mixins: "win" }
+    builders { name: "dart2js-win-x64-ff-dev" mixins: "win" }
+    builders { name: "dart2js-win-x64-ie11-dev" mixins: "win" }
     builders { name: "ddc-linux-release-chrome-dev" }
-    builders { name: "ddc-mac-release-chrome-dev" dimensions: "os:Mac" }
-    builders { name: "ddc-win-release-chrome-dev" dimensions: "os:Windows" }
-    builders { name: "debianpackage-linux-dev" mixins: "debianpackage" }
-    builders { name: "front-end-mac-release-x64-dev" dimensions: "os:Mac" }
+    builders { name: "ddc-mac-release-chrome-dev" mixins: "mac" }
+    builders { name: "ddc-win-release-chrome-dev" mixins: "win" }
+    builders { name: "front-end-mac-release-x64-dev" mixins: "mac" }
     builders { name: "front-end-linux-release-x64-dev" }
-    builders { name: "front-end-win-release-x64-dev" dimensions: "os:Windows" }
+    builders { name: "front-end-win-release-x64-dev" mixins: "win" }
     builders { name: "pkg-linux-release-dev" }
-    builders { name: "pkg-mac-release-dev" dimensions: "os:Mac" }
-    builders { name: "pkg-win-release-dev" dimensions: "os:Windows" }
+    builders { name: "pkg-mac-release-dev" mixins: "mac" }
+    builders { name: "pkg-win-release-dev" mixins: "win" }
     builders { name: "pub-linux-release-dev" }
-    builders { name: "pub-mac-release-dev" dimensions: "os:Mac" }
-    builders { name: "pub-win-release-dev" dimensions: "os:Windows" }
+    builders { name: "pub-mac-release-dev" mixins: "mac" }
+    builders { name: "pub-win-release-dev" mixins: "win" }
     builders { name: "precomp-linux-debug-x64-dev" }
     builders { name: "precomp-linux-product-x64-dev" }
     builders { name: "target-vm-linux-release-arm64-dev" dimensions: "cpu:arm64" }
@@ -248,15 +330,15 @@ buckets {
     builders { name: "vm-kernel-linux-release-simarm64-dev" }
     builders { name: "vm-kernel-linux-release-simdbc64-dev" }
     builders { name: "vm-kernel-linux-release-x64-dev" }
-    builders { name: "vm-kernel-mac-debug-x64-dev" dimensions: "os:Mac" }
-    builders { name: "vm-kernel-mac-release-x64-dev" dimensions: "os:Mac" }
-    builders { name: "vm-kernel-win-release-x64-dev" dimensions: "os:Windows" }
+    builders { name: "vm-kernel-mac-debug-x64-dev" mixins: "mac" }
+    builders { name: "vm-kernel-mac-release-x64-dev" mixins: "mac" }
+    builders { name: "vm-kernel-win-release-x64-dev" mixins: "win" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-dev" mixins: "slow" }
     builders { name: "vm-kernel-precomp-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-dev" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-dev" }
-    builders { name: "vm-kernel-precomp-win-release-x64-dev" dimensions: "os:Windows" }
+    builders { name: "vm-kernel-precomp-win-release-x64-dev" mixins: "win" }
     builders { name: "vm-linux-debug-ia32-dev" }
     builders { name: "vm-linux-debug-simarm-dev" }
     builders { name: "vm-linux-debug-x64-dev" }
@@ -265,44 +347,43 @@ buckets {
     builders { name: "vm-linux-release-simarm-dev" }
     builders { name: "vm-linux-release-simarm64-dev" }
     builders { name: "vm-linux-release-x64-dev" }
-    builders { name: "vm-mac-debug-ia32-dev" dimensions: "os:Mac" }
-    builders { name: "vm-mac-debug-simdbc64-dev" dimensions: "os:Mac" }
-    builders { name: "vm-mac-debug-x64-dev" dimensions: "os:Mac" }
-    builders { name: "vm-mac-product-x64-dev" dimensions: "os:Mac" }
-    builders { name: "vm-mac-release-ia32-dev" dimensions: "os:Mac" }
-    builders { name: "vm-mac-release-simdbc64-dev" dimensions: "os:Mac" }
-    builders { name: "vm-mac-release-x64-dev" dimensions: "os:Mac" }
-    builders { name: "vm-noopt-mac-simarm64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-mac-debug-ia32-dev" mixins: "mac" }
+    builders { name: "vm-mac-debug-simdbc64-dev" mixins: "mac" }
+    builders { name: "vm-mac-debug-x64-dev" mixins: "mac" }
+    builders { name: "vm-mac-product-x64-dev" mixins: "mac" }
+    builders { name: "vm-mac-release-ia32-dev" mixins: "mac" }
+    builders { name: "vm-mac-release-simdbc64-dev" mixins: "mac" }
+    builders { name: "vm-mac-release-x64-dev" mixins: "mac" }
+    builders { name: "vm-noopt-mac-simarm64-dev" mixins: "mac" }
     builders { name: "vm-optcounter-threshold-linux-release-ia32-dev" }
     builders { name: "vm-optcounter-threshold-linux-release-x64-dev" }
     builders { name: "vm-precomp-android-release-dev" }
-    builders { name: "vm-precomp-win-simarm64-dev" dimensions: "os:Windows" }
+    builders { name: "vm-precomp-win-simarm64-dev" mixins: "win" }
     builders { name: "vm-reload-linux-debug-x64-dev" }
     builders { name: "vm-reload-linux-release-x64-dev" }
-    builders { name: "vm-reload-mac-debug-simdbc64-dev" dimensions: "os:Mac" }
-    builders { name: "vm-reload-mac-release-simdbc64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-reload-mac-debug-simdbc64-dev" mixins: "mac" }
+    builders { name: "vm-reload-mac-release-simdbc64-dev" mixins: "mac" }
     builders { name: "vm-reload-rollback-linux-debug-x64-dev" }
     builders { name: "vm-reload-rollback-linux-release-x64-dev" }
-    builders { name: "vm-win-debug-ia32-dev" dimensions: "os:Windows" }
-    builders { name: "vm-win-debug-x64-dev" dimensions: "os:Windows" }
-    builders { name: "vm-win-product-x64-dev" dimensions: "os:Windows" }
-    builders { name: "vm-win-release-ia32-dev" dimensions: "os:Windows" }
-    builders { name: "vm-win-release-x64-dev" dimensions: "os:Windows" }
+    builders { name: "vm-win-debug-ia32-dev" mixins: "win" }
+    builders { name: "vm-win-debug-x64-dev" mixins: "win" }
+    builders { name: "vm-win-product-x64-dev" mixins: "win" }
+    builders { name: "vm-win-release-ia32-dev" mixins: "win" }
+    builders { name: "vm-win-release-x64-dev" mixins: "win" }
+
+    # CI Builders for the stable branch
     builders { name: "analyzer-analysis-server-linux-stable" }
     builders { name: "analyzer-linux-release-stable" }
-    builders { name: "analyzer-mac-release-stable" dimensions: "os:Mac" }
+    builders { name: "analyzer-mac-release-stable" mixins: "mac" }
     builders { name: "analyzer-strong-linux-release-stable" }
-    builders { name: "analyzer-strong-mac-release-stable" dimensions: "os:Mac" }
-    builders { name: "analyzer-strong-win-release-stable" dimensions: "os:Windows" }
-    builders { name: "analyzer-win-release-stable" dimensions: "os:Windows" }
+    builders { name: "analyzer-strong-mac-release-stable" mixins: "mac" }
+    builders { name: "analyzer-strong-win-release-stable" mixins: "win" }
+    builders { name: "analyzer-win-release-stable" mixins: "win" }
     builders { name: "androidvm-linux-release-x64-stable" mixins: "android" }
     builders { name: "app-linux-debug-x64-stable" }
     builders { name: "app-linux-product-x64-stable" }
     builders { name: "app-linux-release-x64-stable" }
     builders { name: "cross-vm-linux-release-arm64-stable" }
-    builders { name: "dart-sdk-linux-stable" }
-    builders { name: "dart-sdk-mac-stable" dimensions: "os:Mac" }
-    builders { name: "dart-sdk-win-stable" dimensions: "os:Windows" }
     builders { name: "dart2js-csp-minified-linux-x64-drt-stable" }
     builders { name: "dart2js-dumpinfo-linux-ia32-none-stable" }
     builders { name: "dart2js-faststartup-linux-x64-chrome-stable" }
@@ -312,27 +393,26 @@ buckets {
     builders { name: "dart2js-linux-x64-ff-stable" }
     builders { name: "dart2js-linux-debug-ia32-none-stable" }
     builders { name: "dart2js-linux-x64-drt-stable" }
-    builders { name: "dart2js-mac-x64-chrome-stable" dimensions: "os:Mac" }
-    builders { name: "dart2js-mac-x64-safari-stable" dimensions: "os:Mac" }
+    builders { name: "dart2js-mac-x64-chrome-stable" mixins: "mac" }
+    builders { name: "dart2js-mac-x64-safari-stable" mixins: "mac" }
     builders { name: "dart2js-minified-linux-x64-d8-stable" }
     builders { name: "dart2js-only-unittest-linux-ia32-none-stable" }
-    builders { name: "dart2js-win-x64-chrome-stable" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-x64-edge-stable" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-x64-ff-stable" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-x64-ie11-stable" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-chrome-stable" mixins: "win" }
+    builders { name: "dart2js-win-x64-edge-stable" mixins: "win" }
+    builders { name: "dart2js-win-x64-ff-stable" mixins: "win" }
+    builders { name: "dart2js-win-x64-ie11-stable" mixins: "win" }
     builders { name: "ddc-linux-release-chrome-stable" }
-    builders { name: "ddc-mac-release-chrome-stable" dimensions: "os:Mac" }
-    builders { name: "ddc-win-release-chrome-stable" dimensions: "os:Windows" }
-    builders { name: "debianpackage-linux-stable" mixins: "debianpackage" }
-    builders { name: "front-end-mac-release-x64-stable" dimensions: "os:Mac" }
+    builders { name: "ddc-mac-release-chrome-stable" mixins: "mac" }
+    builders { name: "ddc-win-release-chrome-stable" mixins: "win" }
+    builders { name: "front-end-mac-release-x64-stable" mixins: "mac" }
     builders { name: "front-end-linux-release-x64-stable" }
-    builders { name: "front-end-win-release-x64-stable" dimensions: "os:Windows" }
+    builders { name: "front-end-win-release-x64-stable" mixins: "win" }
     builders { name: "pkg-linux-release-stable" }
-    builders { name: "pkg-mac-release-stable" dimensions: "os:Mac" }
-    builders { name: "pkg-win-release-stable" dimensions: "os:Windows" }
+    builders { name: "pkg-mac-release-stable" mixins: "mac" }
+    builders { name: "pkg-win-release-stable" mixins: "win" }
     builders { name: "pub-linux-release-stable" }
-    builders { name: "pub-mac-release-stable" dimensions: "os:Mac" }
-    builders { name: "pub-win-release-stable" dimensions: "os:Windows" }
+    builders { name: "pub-mac-release-stable" mixins: "mac" }
+    builders { name: "pub-win-release-stable" mixins: "win" }
     builders { name: "precomp-linux-debug-x64-stable" }
     builders { name: "precomp-linux-product-x64-stable" }
     builders { name: "target-vm-linux-release-arm64-stable" dimensions: "cpu:arm64" }
@@ -346,15 +426,15 @@ buckets {
     builders { name: "vm-kernel-linux-release-simarm64-stable" }
     builders { name: "vm-kernel-linux-release-simdbc64-stable" }
     builders { name: "vm-kernel-linux-release-x64-stable" }
-    builders { name: "vm-kernel-mac-debug-x64-stable" dimensions: "os:Mac" }
-    builders { name: "vm-kernel-mac-release-x64-stable" dimensions: "os:Mac" }
-    builders { name: "vm-kernel-win-release-x64-stable" dimensions: "os:Windows" }
+    builders { name: "vm-kernel-mac-debug-x64-stable" mixins: "mac" }
+    builders { name: "vm-kernel-mac-release-x64-stable" mixins: "mac" }
+    builders { name: "vm-kernel-win-release-x64-stable" mixins: "win" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-stable" mixins: "slow" }
     builders { name: "vm-kernel-precomp-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-stable" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-stable" }
-    builders { name: "vm-kernel-precomp-win-release-x64-stable" dimensions: "os:Windows" }
+    builders { name: "vm-kernel-precomp-win-release-x64-stable" mixins: "win" }
     builders { name: "vm-linux-debug-ia32-stable" }
     builders { name: "vm-linux-debug-simarm-stable" }
     builders { name: "vm-linux-debug-x64-stable" }
@@ -363,41 +443,41 @@ buckets {
     builders { name: "vm-linux-release-simarm-stable" }
     builders { name: "vm-linux-release-simarm64-stable" }
     builders { name: "vm-linux-release-x64-stable" }
-    builders { name: "vm-mac-debug-ia32-stable" dimensions: "os:Mac" }
-    builders { name: "vm-mac-debug-simdbc64-stable" dimensions: "os:Mac" }
-    builders { name: "vm-mac-debug-x64-stable" dimensions: "os:Mac" }
-    builders { name: "vm-mac-product-x64-stable" dimensions: "os:Mac" }
-    builders { name: "vm-mac-release-ia32-stable" dimensions: "os:Mac" }
-    builders { name: "vm-mac-release-simdbc64-stable" dimensions: "os:Mac" }
-    builders { name: "vm-mac-release-x64-stable" dimensions: "os:Mac" }
-    builders { name: "vm-noopt-mac-simarm64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-mac-debug-ia32-stable" mixins: "mac" }
+    builders { name: "vm-mac-debug-simdbc64-stable" mixins: "mac" }
+    builders { name: "vm-mac-debug-x64-stable" mixins: "mac" }
+    builders { name: "vm-mac-product-x64-stable" mixins: "mac" }
+    builders { name: "vm-mac-release-ia32-stable" mixins: "mac" }
+    builders { name: "vm-mac-release-simdbc64-stable" mixins: "mac" }
+    builders { name: "vm-mac-release-x64-stable" mixins: "mac" }
+    builders { name: "vm-noopt-mac-simarm64-stable" mixins: "mac" }
     builders { name: "vm-optcounter-threshold-linux-release-ia32-stable" }
     builders { name: "vm-optcounter-threshold-linux-release-x64-stable" }
     builders { name: "vm-precomp-android-release-stable" }
-    builders { name: "vm-precomp-win-simarm64-stable" dimensions: "os:Windows" }
+    builders { name: "vm-precomp-win-simarm64-stable" mixins: "win" }
     builders { name: "vm-reload-linux-debug-x64-stable" }
     builders { name: "vm-reload-linux-release-x64-stable" }
-    builders { name: "vm-reload-mac-debug-simdbc64-stable" dimensions: "os:Mac" }
-    builders { name: "vm-reload-mac-release-simdbc64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-reload-mac-debug-simdbc64-stable" mixins: "mac" }
+    builders { name: "vm-reload-mac-release-simdbc64-stable" mixins: "mac" }
     builders { name: "vm-reload-rollback-linux-debug-x64-stable" }
     builders { name: "vm-reload-rollback-linux-release-x64-stable" }
-    builders { name: "vm-win-debug-ia32-stable" dimensions: "os:Windows" }
-    builders { name: "vm-win-debug-x64-stable" dimensions: "os:Windows" }
-    builders { name: "vm-win-product-x64-stable" dimensions: "os:Windows" }
-    builders { name: "vm-win-release-ia32-stable" dimensions: "os:Windows" }
-    builders { name: "vm-win-release-x64-stable" dimensions: "os:Windows" }
+    builders { name: "vm-win-debug-ia32-stable" mixins: "win" }
+    builders { name: "vm-win-debug-x64-stable" mixins: "win" }
+    builders { name: "vm-win-product-x64-stable" mixins: "win" }
+    builders { name: "vm-win-release-ia32-stable" mixins: "win" }
+    builders { name: "vm-win-release-x64-stable" mixins: "win" }
   }
 }
 
 buckets {
   name: "luci.dart.try"
-  acl_sets: "tryserver"
+  acl_sets: "try"
 
   swarming {
     hostname: "chromium-swarm.appspot.com"
     url_format: "https://ci.chromium.org/swarming/task/{task_id}"
     builder_defaults {
-      category: "Dart CQ"
+      category: "Dart Try"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       build_numbers: YES
@@ -417,148 +497,29 @@ buckets {
       }
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
-    builders {
-      name: "benchmark-linux-try"
-    }
-    builders {
-      name: "front-end-linux-release-x64-try"
-    }
-    builders {
-      name: "vm-canary-linux-debug-try"
-    }
-    builders {
-      name: "vm-linux-release-x64-try"
-    }
-    builders {
-      name: "vm-linux-debug-x64-try"
-    }
-    builders {
-      name: "vm-mac-release-x64-try"
-      dimensions: "os:Mac"
-    }
-    builders {
-      name: "vm-mac-debug-x64-try"
-      dimensions: "os:Mac"
-    }
-    builders {
-      name: "vm-win-release-x64-try"
-      dimensions: "os:Windows"
-    }
-    builders {
-      name: "vm-win-debug-x64-try"
-      dimensions: "os:Windows"
-    }
-    builders {
-      name: "vm-linux-product-x64-try"
-      recipe {
-        name: "dart/dart_vm"
-      }
-    }
-    builders {
-      name: "vm-kernel-legacy-linux-release-x64-try"
-    }
+
+    # git cl try builders
+    builders { name: "cl-linux-try" }
+    builders { name: "cl-mac-try" mixins: "mac" }
+    builders { name: "cl-win-try" mixins: "win" }
+
+    # CQ builders
+    builders { name: "analyzer-linux-release-strong-hostchecked-try" }
+    builders { name: "benchmark-linux-try" }
+    builders { name: "dart-sdk-windows-try" mixins: "sdk" mixins: "win" }
+    builders { name: "dart2js-linux-d8-hostchecked-try" mixins: "dart2js" }
+    builders { name: "dart2js-linux-d8-kernel-minified-try" mixins: "dart2js" }
+    builders { name: "dart2js-linux-none-only-unittest-try" mixins: "dart2js" }
+    builders { name: "dart2js-linux-x64-chrome-try" }
+    builders { name: "ddc-linux-release-chrome-try" mixins: "clobber" }
+    builders { name: "front-end-linux-release-x64-try" }
+    builders { name: "pkg-linux-release-try" }
+    builders { name: "vm-canary-linux-debug-try" }
+    builders { name: "vm-kernel-legacy-linux-release-x64-try" }
     builders { name: "vm-kernel-linux-release-x64-try" }
-    builders {
-      name: "vm-kernel-linux-debug-x64-try"
-      mixins: "vm-kernel"
-    }
-    builders {
-      name: "vm-kernel-mac-release-x64-try"
-      dimensions: "os:Mac"
-      mixins: "vm-kernel"
-    }
-    builders {
-      name: "vm-kernel-mac-debug-x64-try"
-      mixins: "vm-kernel"
-    }
-    builders {
-      name: "dart2js-linux-x64-chrome-try"
-    }
-    builders {
-      name: "dart-sdk-linux-try"
-      recipe {
-        name: "dart/sdk_swarming"
-      }
-    }
-    builders {
-      name: "dart-sdk-mac-try"
-      dimensions: "os:Mac"
-      recipe {
-        name: "dart/sdk_swarming"
-      }
-    }
-    builders {
-      name: "dart-sdk-windows-try"
-      dimensions: "os:Windows"
-      recipe {
-        name: "dart/sdk_swarming"
-      }
-    }
-    builders {
-      name: "dart2js-linux-d8-hostchecked-unittest-try"
-      recipe {
-        name: "dart/dart2js_swarming"
-        properties_j: "shards:6"
-      }
-    }
-    builders {
-      name: "dart2js-linux-d8-hostchecked-try"
-      recipe {
-        name: "dart/dart2js_swarming"
-        properties_j: "shards:6"
-      }
-    }
-    builders {
-      name: "dart2js-linux-none-only-unittest-try"
-      recipe {
-        name: "dart/dart2js_swarming"
-      }
-    }
-    builders {
-      name: "dart2js-linux-d8-kernel-minified-try"
-      recipe {
-        name: "dart/dart2js_swarming"
-        properties_j: "shards:6"
-      }
-    }
-    builders {
-      name: "dart2js-win10-ie11-try"
-      dimensions: "os:Windows-10"
-      recipe {
-        name: "dart/dart2js_swarming"
-        properties_j: "shards:6"
-      }
-    }
-    builders {
-      name: "dart2js-win10-edge-try"
-      dimensions: "os:Windows-10"
-      recipe {
-        name: "dart/dart2js_swarming"
-        properties_j: "shards:6"
-      }
-    }
-    builders {
-      name: "ddc-linux-release-chrome-try"
-      recipe {
-        properties: "clobber:true"
-      }
-    }
-    builders {
-      name: "analyzer-linux-release-strong-hostchecked-try"
-    }
-    builders {
-      name: "pkg-linux-release-try"
-    }
-    builders {
-      name: "cl-linux-try"
-    }
-    builders {
-      name: "cl-win-try"
-      dimensions: "os:Windows-10"
-    }
-    builders {
-      name: "cl-mac-try"
-      dimensions: "os:Mac"
-    }
+    builders { name: "vm-kernel-mac-release-x64-try" mixins: "mac" mixins: "vm-kernel" }
+    builders { name: "vm-linux-product-x64-try" mixins: "vm" }
+    builders { name: "vm-linux-release-x64-try" }
+    builders { name: "vm-mac-release-x64-try" mixins: "mac" }
   }
 }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 505ee02781ac..819df8e7c636 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -7,22 +7,22 @@ consoles: {
   ref: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
     category: "fasta"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
     category: "fasta"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
     category: "fasta"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64"
     category: "fasta"
     short_name: "vm"
   }
@@ -153,22 +153,22 @@ consoles: {
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64"
     category: "vm|kernel"
     short_name: "dbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64"
     category: "vm|kernel"
     short_name: "rbc"
   }
@@ -191,12 +191,12 @@ consoles: {
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
     category: "vm|kernel"
     short_name: "oc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
     category: "vm|kernel"
     short_name: "wr"
   }
@@ -249,12 +249,12 @@ consoles: {
     short_name: "8d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
@@ -295,7 +295,7 @@ consoles: {
     short_name: "6r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
@@ -529,37 +529,37 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
     category: "analyzer"
     short_name: "as"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
     category: "analyzer"
     short_name: "awr"
   }
@@ -582,27 +582,27 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "fs"
   }
@@ -644,7 +644,7 @@ consoles: {
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
@@ -667,7 +667,7 @@ consoles: {
     short_name: "3m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
@@ -710,17 +710,17 @@ consoles: {
 #    short_name: "ie"
 #  }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
     category: "pkg"
     short_name: "w"
   }
@@ -776,22 +776,22 @@ consoles: {
   ref: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
     category: "fasta"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
     category: "fasta"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
     category: "fasta"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64"
     category: "fasta"
     short_name: "vm"
   }
@@ -869,37 +869,37 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
     category: "analyzer"
     short_name: "as"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
     category: "analyzer"
     short_name: "awr"
   }
@@ -922,17 +922,17 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
   }
@@ -961,17 +961,17 @@ consoles: {
     short_name: "4l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "fs"
   }
 #  builders {
-#    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff"
+#    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-ff"
 #    category: "dart2js|ff"
 #    short_name: "l"
 #  }
@@ -982,7 +982,7 @@ consoles: {
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
@@ -1005,7 +1005,7 @@ consoles: {
     short_name: "3m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
@@ -1048,17 +1048,17 @@ consoles: {
 #    short_name: "ie"
 #  }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
     category: "pkg"
     short_name: "w"
   }
@@ -1201,22 +1201,22 @@ consoles: {
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64"
     category: "vm|kernel"
     short_name: "dbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64"
     category: "vm|kernel"
     short_name: "rbc"
   }
@@ -1239,12 +1239,12 @@ consoles: {
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
     category: "vm|kernel"
     short_name: "oc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
     category: "vm|kernel"
     short_name: "wr"
   }
@@ -1297,12 +1297,12 @@ consoles: {
     short_name: "8d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
@@ -1343,7 +1343,7 @@ consoles: {
     short_name: "6r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
@@ -1543,347 +1543,347 @@ consoles: {
   ref: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
     category: "fasta"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
     category: "fasta"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
     category: "fasta"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64"
     category: "fasta"
     short_name: "vm"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-ia32"
     category: "vm|debug"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simarm"
     category: "vm|simarm"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64"
     category: "vm|debug"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-ia32"
     category: "vm|release"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm"
     category: "vm|simarm"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64"
     category: "vm|simarm"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-x64"
     category: "vm|release"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-ia32"
     category: "vm|debug"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-simdbc64"
     category: "vm|debug"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64"
     category: "vm|debug"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-ia32"
     category: "vm|release"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-simdbc64"
     category: "vm|release"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64"
     category: "vm|release"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-ia32"
     category: "vm|debug"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64"
     category: "vm|debug"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-release-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-ia32"
     category: "vm|release"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-x64"
     category: "vm|release"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/app-linux-debug-x64"
     category: "vm|app"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/app-linux-product-x64"
     category: "vm|app"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/app-linux-release-x64"
     category: "vm|app"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
     category: "vm|kernel"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64"
     category: "vm|kernel"
     short_name: "dbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64"
     category: "vm|kernel"
     short_name: "rbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
     category: "vm|kernel"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
     category: "vm|kernel"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
     category: "vm|kernel"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
     category: "vm|kernel"
     short_name: "oc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
     category: "vm|kernel"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
     category: "vm|kernel-precomp"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
     category: "vm|kernel-precomp"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
     category: "vm|misc"
     short_name: "cra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64"
     category: "vm|misc"
     short_name: "tra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-linux-release-x64"
     category: "vm|misc"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-ia32"
     category: "vm|misc"
     short_name: "o32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-x64"
     category: "vm|misc"
     short_name: "o64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-debug-x64"
     category: "vm|precomp"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-product-x64"
     category: "vm|precomp"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-noopt-mac-simarm64"
     category: "vm|precomp"
     short_name: "no"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-precomp-android-release"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-android-release"
     category: "vm|precomp"
     short_name: "and"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-win-simarm64"
     category: "vm|precomp"
     short_name: "wsi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-product-x64"
     category: "vm|product"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-product-x64"
     category: "vm|product"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-product-x64"
     category: "vm|product"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-debug-x64"
     category: "vm|reload"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-release-x64"
     category: "vm|reload"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-debug-simdbc64"
     category: "vm|reload"
     short_name: "mds"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-release-simdbc64"
     category: "vm|reload"
     short_name: "mrs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-debug-x64"
     category: "vm|reload"
     short_name: "dro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-release-x64"
     category: "vm|reload"
     short_name: "rro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-ia32-d8"
     category: "dart2js|d8"
     short_name: "hc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-x64-d8"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-linux-x64-d8"
     category: "dart2js|d8"
     short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-only-unittest-linux-ia32-none"
     category: "dart2js|misc"
     short_name: "ut"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-dumpinfo-linux-ia32-none"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-dumpinfo-linux-ia32-none"
     category: "dart2js|misc"
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
     category: "analyzer"
     short_name: "aas"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
     category: "analyzer"
     short_name: "awr"
   }
@@ -1903,82 +1903,82 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "fs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-ff"
     category: "dart2js|ff"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-safari"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-safari"
     category: "dart2js|safari"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-edge"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-edge"
     category: "dart2js|ms"
     short_name: "ed"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ff"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ff"
     category: "dart2js|ff"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ie11"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ie11"
     category: "dart2js|ms"
     short_name: "ie"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
     category: "pkg"
     short_name: "w"
   }
@@ -1988,7 +1988,7 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/versionchecker-linux"
+    name: "buildbucket/luci.dart.ci.sandbox/versionchecker-linux"
     category: "misc"
     short_name: "vc"
   }
@@ -2032,347 +2032,347 @@ consoles: {
   ref: "refs/heads/dev"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-dev"
     category: "fasta"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-dev"
     category: "fasta"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-win-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-dev"
     category: "fasta"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64-dev"
     category: "fasta"
     short_name: "vm"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-ia32-dev"
     category: "vm|debug"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simarm-dev"
     category: "vm|simarm"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64-dev"
     category: "vm|debug"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-ia32-dev"
     category: "vm|release"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm-dev"
     category: "vm|simarm"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64-dev"
     category: "vm|simarm"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-x64-dev"
     category: "vm|release"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-ia32-dev"
     category: "vm|debug"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-simdbc64-dev"
     category: "vm|debug"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64-dev"
     category: "vm|debug"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-ia32-dev"
     category: "vm|release"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-simdbc64-dev"
     category: "vm|release"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64-dev"
     category: "vm|release"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-ia32-dev"
     category: "vm|debug"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64-dev"
     category: "vm|debug"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-release-ia32-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-ia32-dev"
     category: "vm|release"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-x64-dev"
     category: "vm|release"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/app-linux-debug-x64-dev"
     category: "vm|app"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-product-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/app-linux-product-x64-dev"
     category: "vm|app"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/app-linux-release-x64-dev"
     category: "vm|app"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-dev"
     category: "vm|kernel"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64-dev"
     category: "vm|kernel"
     short_name: "dbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-dev"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-dev"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64-dev"
     category: "vm|kernel"
     short_name: "rbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-dev"
     category: "vm|kernel"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-dev"
     category: "vm|kernel"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-dev"
     category: "vm|kernel"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-dev"
     category: "vm|kernel"
     short_name: "oc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-dev"
     category: "vm|kernel"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-dev"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-dev"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-dev"
     category: "vm|misc"
     short_name: "cra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64-dev"
     category: "vm|misc"
     short_name: "tra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-linux-release-x64-dev"
     category: "vm|misc"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-ia32-dev"
     category: "vm|misc"
     short_name: "o32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-x64-dev"
     category: "vm|misc"
     short_name: "o64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-debug-x64-dev"
     category: "vm|precomp"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-product-x64-dev"
     category: "vm|precomp"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-noopt-mac-simarm64-dev"
     category: "vm|precomp"
     short_name: "no"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-precomp-android-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-android-release-dev"
     category: "vm|precomp"
     short_name: "and"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-win-simarm64-dev"
     category: "vm|precomp"
     short_name: "wsi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-product-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-product-x64-dev"
     category: "vm|product"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-product-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-product-x64-dev"
     category: "vm|product"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-product-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-product-x64-dev"
     category: "vm|product"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-debug-x64-dev"
     category: "vm|reload"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-release-x64-dev"
     category: "vm|reload"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-debug-simdbc64-dev"
     category: "vm|reload"
     short_name: "mds"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-release-simdbc64-dev"
     category: "vm|reload"
     short_name: "mrs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-debug-x64-dev"
     category: "vm|reload"
     short_name: "dro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-release-x64-dev"
     category: "vm|reload"
     short_name: "rro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-ia32-d8-dev"
     category: "dart2js|d8"
     short_name: "hc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-x64-d8-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-linux-x64-d8-dev"
     category: "dart2js|d8"
     short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-only-unittest-linux-ia32-none-dev"
     category: "dart2js|misc"
     short_name: "ut"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-dumpinfo-linux-ia32-none-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-dumpinfo-linux-ia32-none-dev"
     category: "dart2js|misc"
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-dev"
     category: "analyzer"
     short_name: "aas"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-linux-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-dev"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-mac-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-dev"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release-dev"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release-dev"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release-dev"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-win-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-dev"
     category: "analyzer"
     short_name: "awr"
   }
@@ -2392,82 +2392,82 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-dev"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-dev"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-dev"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "fs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-ff-dev"
     category: "dart2js|ff"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-safari-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-safari-dev"
     category: "dart2js|safari"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-edge-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-edge-dev"
     category: "dart2js|ms"
     short_name: "ed"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ff-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ff-dev"
     category: "dart2js|ff"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ie11-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ie11-dev"
     category: "dart2js|ms"
     short_name: "ie"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-linux-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-mac-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-dev"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-win-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-dev"
     category: "pkg"
     short_name: "w"
   }
@@ -2477,7 +2477,7 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/versionchecker-linux-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/versionchecker-linux-dev"
     category: "misc"
     short_name: "vc"
   }
@@ -2521,347 +2521,347 @@ consoles: {
   ref: "refs/heads/stable"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-stable"
     category: "fasta"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-stable"
     category: "fasta"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-stable"
     category: "fasta"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64-stable"
     category: "fasta"
     short_name: "vm"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-ia32-stable"
     category: "vm|debug"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simarm-stable"
     category: "vm|simarm"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64-stable"
     category: "vm|debug"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-ia32-stable"
     category: "vm|release"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm-stable"
     category: "vm|simarm"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64-stable"
     category: "vm|simarm"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-x64-stable"
     category: "vm|release"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-ia32-stable"
     category: "vm|debug"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-simdbc64-stable"
     category: "vm|debug"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64-stable"
     category: "vm|debug"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-ia32-stable"
     category: "vm|release"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-simdbc64-stable"
     category: "vm|release"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64-stable"
     category: "vm|release"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-ia32-stable"
     category: "vm|debug"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64-stable"
     category: "vm|debug"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-release-ia32-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-ia32-stable"
     category: "vm|release"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-x64-stable"
     category: "vm|release"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/app-linux-debug-x64-stable"
     category: "vm|app"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-product-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/app-linux-product-x64-stable"
     category: "vm|app"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/app-linux-release-x64-stable"
     category: "vm|app"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-stable"
     category: "vm|kernel"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64-stable"
     category: "vm|kernel"
     short_name: "dbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-stable"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-stable"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64-stable"
     category: "vm|kernel"
     short_name: "rbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-stable"
     category: "vm|kernel"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-stable"
     category: "vm|kernel"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-stable"
     category: "vm|kernel"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-stable"
     category: "vm|kernel"
     short_name: "oc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-stable"
     category: "vm|kernel"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-stable"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-stable"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-stable"
     category: "vm|misc"
     short_name: "cra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64-stable"
     category: "vm|misc"
     short_name: "tra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-linux-release-x64-stable"
     category: "vm|misc"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-ia32-stable"
     category: "vm|misc"
     short_name: "o32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-x64-stable"
     category: "vm|misc"
     short_name: "o64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-debug-x64-stable"
     category: "vm|precomp"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-product-x64-stable"
     category: "vm|precomp"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-noopt-mac-simarm64-stable"
     category: "vm|precomp"
     short_name: "no"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-precomp-android-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-android-release-stable"
     category: "vm|precomp"
     short_name: "and"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-win-simarm64-stable"
     category: "vm|precomp"
     short_name: "wsi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-product-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-product-x64-stable"
     category: "vm|product"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-product-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-product-x64-stable"
     category: "vm|product"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-product-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-product-x64-stable"
     category: "vm|product"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-debug-x64-stable"
     category: "vm|reload"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-release-x64-stable"
     category: "vm|reload"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-debug-simdbc64-stable"
     category: "vm|reload"
     short_name: "mds"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-release-simdbc64-stable"
     category: "vm|reload"
     short_name: "mrs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-debug-x64-stable"
     category: "vm|reload"
     short_name: "dro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-release-x64-stable"
     category: "vm|reload"
     short_name: "rro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-ia32-d8-stable"
     category: "dart2js|d8"
     short_name: "hc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-x64-d8-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-linux-x64-d8-stable"
     category: "dart2js|d8"
     short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-only-unittest-linux-ia32-none-stable"
     category: "dart2js|misc"
     short_name: "ut"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-dumpinfo-linux-ia32-none-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-dumpinfo-linux-ia32-none-stable"
     category: "dart2js|misc"
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-stable"
     category: "analyzer"
     short_name: "aas"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-linux-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-stable"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-mac-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-stable"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release-stable"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release-stable"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release-stable"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-win-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-stable"
     category: "analyzer"
     short_name: "awr"
   }
@@ -2881,82 +2881,82 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-stable"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-stable"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-stable"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "fs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-ff-stable"
     category: "dart2js|ff"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-safari-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-safari-stable"
     category: "dart2js|safari"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-edge-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-edge-stable"
     category: "dart2js|ms"
     short_name: "ed"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ff-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ff-stable"
     category: "dart2js|ff"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ie11-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ie11-stable"
     category: "dart2js|ms"
     short_name: "ie"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-linux-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-mac-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-stable"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-win-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-stable"
     category: "pkg"
     short_name: "w"
   }
@@ -2966,7 +2966,7 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/versionchecker-linux-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/versionchecker-linux-stable"
     category: "misc"
     short_name: "vc"
   }
@@ -3010,37 +3010,37 @@ consoles: {
   ref: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-checked-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
     category: "vm-kernel"
     short_name: "cr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-debug-ia32-none"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-debug-ia32-none"
     category: "dart2js"
     short_name: "hcd"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-debug-ia32-none"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-debug-ia32-none"
     category: "dart2js"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pub-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pub-linux-release"
     category: "pub"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pub-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pub-mac-release"
     category: "pub"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pub-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pub-win-release"
     category: "pub"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/androidvm-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/androidvm-linux-release-x64"
     category: "android"
     short_name: "vm"
   }
@@ -3095,7 +3095,7 @@ consoles: {
   builders { name: "buildbucket/luci.dart.try/pkg-linux-release-try" }
   builders { name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try" }
   builders { name: "buildbucket/luci.dart.try/vm-kernel-legacy-linux-release-x64-try" }
-  builders { name: "buildbucket/luci.dart.try/vm-kernel-mac-release-x64-try" }
+  builders { name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try" }
   builders { name: "buildbucket/luci.dart.try/vm-linux-product-x64-try" }
   builders { name: "buildbucket/luci.dart.try/vm-linux-release-x64-try" }
   builders { name: "buildbucket/luci.dart.try/vm-mac-release-x64-try" }
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index e9e542510a9a..be358aab47de 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -146,7 +146,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-analysis-server-linux"
   }
 }
@@ -157,7 +157,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-linux-release"
   }
 }
@@ -168,7 +168,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-mac-release"
   }
 }
@@ -179,7 +179,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-strong-linux-release"
   }
 }
@@ -190,7 +190,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-strong-mac-release"
   }
 }
@@ -201,7 +201,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-strong-win-release"
   }
 }
@@ -212,7 +212,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-win-release"
   }
 }
@@ -259,7 +259,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-faststartup-linux-x64-chrome"
   }
 }
@@ -270,7 +270,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-linux-x64-chrome"
   }
 }
@@ -281,7 +281,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-mac-x64-chrome"
   }
 }
@@ -292,7 +292,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-win-x64-chrome"
   }
 }
@@ -303,7 +303,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "ddc-linux-release-chrome"
   }
 }
@@ -314,7 +314,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "ddc-mac-release-chrome"
   }
 }
@@ -325,7 +325,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "ddc-win-release-chrome"
   }
 }
@@ -336,7 +336,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "front-end-linux-release-x64"
   }
 }
@@ -347,7 +347,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "front-end-mac-release-x64"
   }
 }
@@ -358,7 +358,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "front-end-win-release-x64"
   }
 }
@@ -369,7 +369,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "pkg-linux-release"
   }
 }
@@ -380,7 +380,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "pkg-mac-release"
   }
 }
@@ -391,7 +391,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "pkg-win-release"
   }
 }
@@ -402,7 +402,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-legacy-linux-release-x64"
   }
 }
@@ -413,7 +413,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-debug-simdbc64"
   }
 }
@@ -424,7 +424,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simarm"
   }
 }
@@ -435,7 +435,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simarm64"
   }
 }
@@ -446,7 +446,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simdbc64"
   }
 }
@@ -457,7 +457,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-optcounter-threshold-linux-release-x64"
   }
 }
@@ -468,7 +468,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-release-x64"
   }
 }
@@ -479,7 +479,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm"
   }
 }
@@ -490,7 +490,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm64"
   }
 }
@@ -501,7 +501,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-win-release-x64"
   }
 }
@@ -512,7 +512,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-analysis-server-linux-dev"
   }
 }
@@ -523,7 +523,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-linux-release-dev"
   }
 }
@@ -534,7 +534,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-mac-release-dev"
   }
 }
@@ -545,7 +545,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-strong-linux-release-dev"
   }
 }
@@ -556,7 +556,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-strong-mac-release-dev"
   }
 }
@@ -567,7 +567,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-strong-win-release-dev"
   }
 }
@@ -578,7 +578,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-win-release-dev"
   }
 }
@@ -625,7 +625,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-faststartup-linux-x64-chrome-dev"
   }
 }
@@ -636,7 +636,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-linux-x64-chrome-dev"
   }
 }
@@ -647,7 +647,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-mac-x64-chrome-dev"
   }
 }
@@ -658,7 +658,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-win-x64-chrome-dev"
   }
 }
@@ -669,7 +669,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "ddc-linux-release-chrome-dev"
   }
 }
@@ -680,7 +680,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "ddc-mac-release-chrome-dev"
   }
 }
@@ -691,7 +691,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "ddc-win-release-chrome-dev"
   }
 }
@@ -702,7 +702,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "front-end-linux-release-x64-dev"
   }
 }
@@ -713,7 +713,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "front-end-mac-release-x64-dev"
   }
 }
@@ -724,7 +724,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "front-end-win-release-x64-dev"
   }
 }
@@ -735,7 +735,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "pkg-linux-release-dev"
   }
 }
@@ -746,7 +746,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "pkg-mac-release-dev"
   }
 }
@@ -757,7 +757,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "pkg-win-release-dev"
   }
 }
@@ -768,7 +768,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-legacy-linux-release-x64-dev"
   }
 }
@@ -779,7 +779,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-debug-simdbc64-dev"
   }
 }
@@ -790,7 +790,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simarm-dev"
   }
 }
@@ -801,7 +801,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simarm64-dev"
   }
 }
@@ -812,7 +812,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simdbc64-dev"
   }
 }
@@ -823,7 +823,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
   }
 }
@@ -834,7 +834,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-release-x64-dev"
   }
 }
@@ -845,7 +845,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm-dev"
   }
 }
@@ -856,7 +856,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm64-dev"
   }
 }
@@ -867,7 +867,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-win-release-x64-dev"
   }
 }
@@ -878,7 +878,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-analysis-server-linux-stable"
   }
 }
@@ -889,7 +889,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-linux-release-stable"
   }
 }
@@ -900,7 +900,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-mac-release-stable"
   }
 }
@@ -911,7 +911,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-strong-linux-release-stable"
   }
 }
@@ -922,7 +922,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-strong-mac-release-stable"
   }
 }
@@ -933,7 +933,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-strong-win-release-stable"
   }
 }
@@ -944,7 +944,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-win-release-stable"
   }
 }
@@ -991,7 +991,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-faststartup-linux-x64-chrome-stable"
   }
 }
@@ -1002,7 +1002,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-linux-x64-chrome-stable"
   }
 }
@@ -1013,7 +1013,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-mac-x64-chrome-stable"
   }
 }
@@ -1024,7 +1024,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-win-x64-chrome-stable"
   }
 }
@@ -1035,7 +1035,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "ddc-linux-release-chrome-stable"
   }
 }
@@ -1046,7 +1046,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "ddc-mac-release-chrome-stable"
   }
 }
@@ -1057,7 +1057,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "ddc-win-release-chrome-stable"
   }
 }
@@ -1068,7 +1068,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "front-end-linux-release-x64-stable"
   }
 }
@@ -1079,7 +1079,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "front-end-mac-release-x64-stable"
   }
 }
@@ -1090,7 +1090,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "front-end-win-release-x64-stable"
   }
 }
@@ -1101,7 +1101,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "pkg-linux-release-stable"
   }
 }
@@ -1112,7 +1112,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "pkg-mac-release-stable"
   }
 }
@@ -1123,7 +1123,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "pkg-win-release-stable"
   }
 }
@@ -1134,7 +1134,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-legacy-linux-release-x64-stable"
   }
 }
@@ -1145,7 +1145,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-debug-simdbc64-stable"
   }
 }
@@ -1156,7 +1156,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simarm-stable"
   }
 }
@@ -1167,7 +1167,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simarm64-stable"
   }
 }
@@ -1178,7 +1178,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simdbc64-stable"
   }
 }
@@ -1189,7 +1189,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
   }
 }
@@ -1200,7 +1200,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-release-x64-stable"
   }
 }
@@ -1211,7 +1211,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm-stable"
   }
 }
@@ -1222,7 +1222,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm64-stable"
   }
 }
@@ -1233,7 +1233,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-win-release-x64-stable"
   }
 }

From 4d9e1dbca5ad3b69e9f99a24d2f42f5951912530 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 7 May 2018 07:44:31 +0000
Subject: [PATCH 115/826] Revert "Reland "[infra] Refactor cr-buildbucket.cfg""

This reverts commit 627615b6caeaf66c7b0550db020d3cfff3a21f2f.

Reason for revert: Tries to schedule builds in the wrong pool.

Original change's description:
> Reland "[infra] Refactor cr-buildbucket.cfg"
>
> This reverts commit c6a28cd8ef51fbfc1d151358f76762e19efcae85.
>
> Reason for revert: pools.cfg should be updated by now.
>
> Original change's description:
> > Revert "[infra] Refactor cr-buildbucket.cfg"
> >
> > This reverts commit a8bb29dfb0f3493336a1a791e6aaa23eedc119bd.
> >
> > Reason for revert: Swarming hasn't picket up the new pools.cfg changes.
> >
> > Original change's description:
> > > [infra] Refactor cr-buildbucket.cfg
> > >
> > > This is part 2 of 3 CLs to create a separate pool of bots for luci.dart.ci.
> > >
> > > * Add luci.dart.ci.sandbox bucket.
> > > * Move CI builders that don't require privileged access to their own bucket.
> > > * Use mixins to make it easier to change common builder properties.
> > > * Sort CQ builders.
> > > * Removed some unused CQ builders.
> > >
> > > Change-Id: I0e5fd2a616bbed86dfc01e1fb32c4fc924a2ac74
> > > Reviewed-on: https://dart-review.googlesource.com/53101
> > > Reviewed-by: Jonas Termansen <sortie@google.com>
> >
> > TBR=sortie@google.com,athom@google.com
> >
> > Change-Id: I5f5f292bd08ca136e98f3ff64ee96f20e5b05096
> > No-Presubmit: true
> > No-Tree-Checks: true
> > No-Try: true
> > Reviewed-on: https://dart-review.googlesource.com/53620
> > Reviewed-by: Alexander Thomas <athom@google.com>
> > Commit-Queue: Alexander Thomas <athom@google.com>
>
> TBR=sortie@google.com,athom@google.com
>
> # Not skipping CQ checks because original CL landed > 1 day ago.
>
> Change-Id: I3a86751105cc64effe62929a7ebd4e6f2e6fe9d0
> Reviewed-on: https://dart-review.googlesource.com/53900
> Reviewed-by: Alexander Thomas <athom@google.com>

TBR=sortie@google.com,athom@google.com

Change-Id: I72e2e734001fcb07eae4c578a276136e913fc93c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/53901
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 507 +++++++++++++++++++----------------
 luci-milo.cfg      | 654 ++++++++++++++++++++++-----------------------
 luci-scheduler.cfg | 180 ++++++-------
 3 files changed, 690 insertions(+), 651 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 38a6073c64ea..bbd1fb136ad6 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -7,7 +7,7 @@
 # Please keep this list sorted by bucket name.
 
 acl_sets {
-  name: "ci"
+  name: "waterfall"
   acls {
     role: READER
     group: "all"
@@ -23,7 +23,7 @@ acl_sets {
 }
 
 acl_sets {
-  name: "try"
+  name: "tryserver"
   acls {
     role: READER
     group: "all"
@@ -43,38 +43,11 @@ builder_mixins {
   # todo(athom): how should this machine be defined?
 }
 
-builder_mixins {
-  name: "clobber"
-  recipe {
-    properties: "clobber:true"
-  }
-}
-
-builder_mixins {
-  name: "dart2js"
-  recipe {
-    name: "dart/dart2js_swarming"
-    properties_j: "shards:6"
-  }
-}
-
 builder_mixins {
   name: "debianpackage"
   # todo(athom): how should this machine be defined?
 }
 
-builder_mixins {
-  name: "mac"
-  dimensions: "os:Mac"
-}
-
-builder_mixins {
-  name: "sdk"
-  recipe {
-    name: "dart/sdk_swarming"
-  }
-}
-
 builder_mixins {
   name: "slow"
   execution_timeout_secs: 21600 # 6h
@@ -83,13 +56,6 @@ builder_mixins {
   }
 }
 
-builder_mixins {
-  name: "vm"
-  recipe {
-    name: "dart/dart_vm"
-  }
-}
-
 builder_mixins {
   name: "vm-kernel"
   recipe {
@@ -98,15 +64,9 @@ builder_mixins {
   }
 }
 
-builder_mixins {
-  name: "win"
-  dimensions: "os:Windows"
-}
-
 buckets {
-  # CI Builders that require special permissions
   name: "luci.dart.ci"
-  acl_sets: "ci"
+  acl_sets: "waterfall"
 
   swarming {
     hostname: "chromium-swarm.appspot.com"
@@ -132,66 +92,21 @@ buckets {
       }
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     }
-
-    # CI Builders that require privileged access
-    builders { name: "dart-sdk-linux" }
-    builders { name: "dart-sdk-mac" mixins: "mac" }
-    builders { name: "dart-sdk-win" mixins: "win" }
-    builders { name: "debianpackage-linux" mixins: "debianpackage" }
-    builders { name: "dart-sdk-linux-dev" }
-    builders { name: "dart-sdk-mac-dev" mixins: "mac" }
-    builders { name: "dart-sdk-win-dev" mixins: "win" }
-    builders { name: "debianpackage-linux-dev" mixins: "debianpackage" }
-    builders { name: "dart-sdk-linux-stable" }
-    builders { name: "dart-sdk-mac-stable" mixins: "mac" }
-    builders { name: "dart-sdk-win-stable" mixins: "win" }
-    builders { name: "debianpackage-linux-stable" mixins: "debianpackage" }
-  }
-}
-
-buckets {
-  # CI Builders that only require try permissions
-  name: "luci.dart.ci.sandbox"
-  acl_sets: "ci"
-
-  swarming {
-    hostname: "chromium-swarm.appspot.com"
-    url_format: "https://ci.chromium.org/swarming/task/{task_id}"
-    builder_defaults {
-      category: "Dart CI (Sandboxed)"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      build_numbers: YES
-      priority: 50
-      swarming_tags: "vpython:native-python-wrapper"
-      caches {
-        path: "browsers"
-        name: "browsers"
-      }
-      recipe {
-        repository: "https://chromium.googlesource.com/chromium/tools/build.git"
-        properties: "mastername:client.dart"
-        name: "dart/neo"
-        # TODO(vadimsh): make sure the service account has all necessary Git and
-        # GS permissions and remove this line, see https://crbug.com/776035
-        properties_j: "$kitchen:{\"git_auth\": false, \"devshell\": false}"
-      }
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-
-    # CI Builders for the master branch
     builders { name: "analyzer-analysis-server-linux" }
     builders { name: "analyzer-linux-release" }
-    builders { name: "analyzer-mac-release" mixins: "mac" }
+    builders { name: "analyzer-mac-release" dimensions: "os:Mac" }
     builders { name: "analyzer-strong-linux-release" }
-    builders { name: "analyzer-strong-mac-release" mixins: "mac" }
-    builders { name: "analyzer-strong-win-release" mixins: "win" }
-    builders { name: "analyzer-win-release" mixins: "win" }
+    builders { name: "analyzer-strong-mac-release" dimensions: "os:Mac" }
+    builders { name: "analyzer-strong-win-release" dimensions: "os:Windows" }
+    builders { name: "analyzer-win-release" dimensions: "os:Windows" }
     builders { name: "androidvm-linux-release-x64" mixins: "android" }
     builders { name: "app-linux-debug-x64" }
     builders { name: "app-linux-product-x64" }
     builders { name: "app-linux-release-x64" }
     builders { name: "cross-vm-linux-release-arm64" }
+    builders { name: "dart-sdk-linux" }
+    builders { name: "dart-sdk-mac" dimensions: "os:Mac" }
+    builders { name: "dart-sdk-win" dimensions: "os:Windows" }
     builders { name: "dart2js-csp-minified-linux-x64-drt" }
     builders { name: "dart2js-dumpinfo-linux-ia32-none" }
     builders { name: "dart2js-faststartup-linux-x64-chrome" }
@@ -201,26 +116,27 @@ buckets {
     builders { name: "dart2js-linux-x64-ff" }
     builders { name: "dart2js-linux-debug-ia32-none" }
     builders { name: "dart2js-linux-x64-drt" }
-    builders { name: "dart2js-mac-x64-chrome" mixins: "mac" }
-    builders { name: "dart2js-mac-x64-safari" mixins: "mac" }
+    builders { name: "dart2js-mac-x64-chrome" dimensions: "os:Mac" }
+    builders { name: "dart2js-mac-x64-safari" dimensions: "os:Mac" }
     builders { name: "dart2js-minified-linux-x64-d8" }
     builders { name: "dart2js-only-unittest-linux-ia32-none" }
-    builders { name: "dart2js-win-x64-chrome" mixins: "win" }
-    builders { name: "dart2js-win-x64-edge" mixins: "win" }
-    builders { name: "dart2js-win-x64-ff" mixins: "win" }
-    builders { name: "dart2js-win-x64-ie11" mixins: "win" }
+    builders { name: "dart2js-win-x64-chrome" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-edge" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-ff" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-ie11" dimensions: "os:Windows" }
     builders { name: "ddc-linux-release-chrome" }
-    builders { name: "ddc-mac-release-chrome" mixins: "mac" }
-    builders { name: "ddc-win-release-chrome" mixins: "win" }
-    builders { name: "front-end-mac-release-x64" mixins: "mac" }
+    builders { name: "ddc-mac-release-chrome" dimensions: "os:Mac" }
+    builders { name: "ddc-win-release-chrome" dimensions: "os:Windows" }
+    builders { name: "debianpackage-linux" mixins: "debianpackage" }
+    builders { name: "front-end-mac-release-x64" dimensions: "os:Mac" }
     builders { name: "front-end-linux-release-x64" }
-    builders { name: "front-end-win-release-x64" mixins: "win" }
+    builders { name: "front-end-win-release-x64" dimensions: "os:Windows" }
     builders { name: "pkg-linux-release" }
-    builders { name: "pkg-mac-release" mixins: "mac" }
-    builders { name: "pkg-win-release" mixins: "win" }
+    builders { name: "pkg-mac-release" dimensions: "os:Mac" }
+    builders { name: "pkg-win-release" dimensions: "os:Windows" }
     builders { name: "pub-linux-release" }
-    builders { name: "pub-mac-release" mixins: "mac" }
-    builders { name: "pub-win-release" mixins: "win" }
+    builders { name: "pub-mac-release" dimensions: "os:Mac" }
+    builders { name: "pub-win-release" dimensions: "os:Windows" }
     builders { name: "precomp-linux-debug-x64" }
     builders { name: "precomp-linux-product-x64" }
     builders { name: "target-vm-linux-release-arm64" dimensions: "cpu:arm64" }
@@ -234,15 +150,15 @@ buckets {
     builders { name: "vm-kernel-linux-release-simarm64" }
     builders { name: "vm-kernel-linux-release-simdbc64" }
     builders { name: "vm-kernel-linux-release-x64" }
-    builders { name: "vm-kernel-mac-debug-x64" mixins: "mac" }
-    builders { name: "vm-kernel-mac-release-x64" mixins: "mac" }
-    builders { name: "vm-kernel-win-release-x64" mixins: "win" }
+    builders { name: "vm-kernel-mac-debug-x64" dimensions: "os:Mac" }
+    builders { name: "vm-kernel-mac-release-x64" dimensions: "os:Mac" }
+    builders { name: "vm-kernel-win-release-x64" dimensions: "os:Windows" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-debug-x64" mixins: "slow" }
     builders { name: "vm-kernel-precomp-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-release-simarm" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64" }
-    builders { name: "vm-kernel-precomp-win-release-x64" mixins: "win" }
+    builders { name: "vm-kernel-precomp-win-release-x64" dimensions: "os:Windows" }
     builders { name: "vm-linux-debug-ia32" }
     builders { name: "vm-linux-debug-simarm" }
     builders { name: "vm-linux-debug-x64" }
@@ -251,43 +167,44 @@ buckets {
     builders { name: "vm-linux-release-simarm" }
     builders { name: "vm-linux-release-simarm64" }
     builders { name: "vm-linux-release-x64" }
-    builders { name: "vm-mac-debug-ia32" mixins: "mac" }
-    builders { name: "vm-mac-debug-simdbc64" mixins: "mac" }
-    builders { name: "vm-mac-debug-x64" mixins: "mac" }
-    builders { name: "vm-mac-product-x64" mixins: "mac" }
-    builders { name: "vm-mac-release-ia32" mixins: "mac" }
-    builders { name: "vm-mac-release-simdbc64" mixins: "mac" }
-    builders { name: "vm-mac-release-x64" mixins: "mac" }
-    builders { name: "vm-noopt-mac-simarm64" mixins: "mac" }
+    builders { name: "vm-mac-debug-ia32" dimensions: "os:Mac" }
+    builders { name: "vm-mac-debug-simdbc64" dimensions: "os:Mac" }
+    builders { name: "vm-mac-debug-x64" dimensions: "os:Mac" }
+    builders { name: "vm-mac-product-x64" dimensions: "os:Mac" }
+    builders { name: "vm-mac-release-ia32" dimensions: "os:Mac" }
+    builders { name: "vm-mac-release-simdbc64" dimensions: "os:Mac" }
+    builders { name: "vm-mac-release-x64" dimensions: "os:Mac" }
+    builders { name: "vm-noopt-mac-simarm64" dimensions: "os:Mac" }
     builders { name: "vm-optcounter-threshold-linux-release-ia32" }
     builders { name: "vm-optcounter-threshold-linux-release-x64" }
     builders { name: "vm-precomp-android-release" }
-    builders { name: "vm-precomp-win-simarm64" mixins: "win" }
+    builders { name: "vm-precomp-win-simarm64" dimensions: "os:Windows" }
     builders { name: "vm-reload-linux-debug-x64" }
     builders { name: "vm-reload-linux-release-x64" }
-    builders { name: "vm-reload-mac-debug-simdbc64" mixins: "mac" }
-    builders { name: "vm-reload-mac-release-simdbc64" mixins: "mac" }
+    builders { name: "vm-reload-mac-debug-simdbc64" dimensions: "os:Mac" }
+    builders { name: "vm-reload-mac-release-simdbc64" dimensions: "os:Mac" }
     builders { name: "vm-reload-rollback-linux-debug-x64" }
     builders { name: "vm-reload-rollback-linux-release-x64" }
-    builders { name: "vm-win-debug-ia32" mixins: "win" }
-    builders { name: "vm-win-debug-x64" mixins: "win" }
-    builders { name: "vm-win-product-x64" mixins: "win" }
-    builders { name: "vm-win-release-ia32" mixins: "win" }
-    builders { name: "vm-win-release-x64" mixins: "win" }
-
-    # CI Builders for the dev branch
+    builders { name: "vm-win-debug-ia32" dimensions: "os:Windows" }
+    builders { name: "vm-win-debug-x64" dimensions: "os:Windows" }
+    builders { name: "vm-win-product-x64" dimensions: "os:Windows" }
+    builders { name: "vm-win-release-ia32" dimensions: "os:Windows" }
+    builders { name: "vm-win-release-x64" dimensions: "os:Windows" }
     builders { name: "analyzer-analysis-server-linux-dev" }
     builders { name: "analyzer-linux-release-dev" }
-    builders { name: "analyzer-mac-release-dev" mixins: "mac" }
+    builders { name: "analyzer-mac-release-dev" dimensions: "os:Mac" }
     builders { name: "analyzer-strong-linux-release-dev" }
-    builders { name: "analyzer-strong-mac-release-dev" mixins: "mac" }
-    builders { name: "analyzer-strong-win-release-dev" mixins: "win" }
-    builders { name: "analyzer-win-release-dev" mixins: "win" }
+    builders { name: "analyzer-strong-mac-release-dev" dimensions: "os:Mac" }
+    builders { name: "analyzer-strong-win-release-dev" dimensions: "os:Windows" }
+    builders { name: "analyzer-win-release-dev" dimensions: "os:Windows" }
     builders { name: "androidvm-linux-release-x64-dev" mixins: "android" }
     builders { name: "app-linux-debug-x64-dev" }
     builders { name: "app-linux-product-x64-dev" }
     builders { name: "app-linux-release-x64-dev" }
     builders { name: "cross-vm-linux-release-arm64-dev" }
+    builders { name: "dart-sdk-linux-dev" }
+    builders { name: "dart-sdk-mac-dev" dimensions: "os:Mac" }
+    builders { name: "dart-sdk-win-dev" dimensions: "os:Windows" }
     builders { name: "dart2js-csp-minified-linux-x64-drt-dev" }
     builders { name: "dart2js-dumpinfo-linux-ia32-none-dev" }
     builders { name: "dart2js-faststartup-linux-x64-chrome-dev" }
@@ -297,26 +214,27 @@ buckets {
     builders { name: "dart2js-linux-x64-ff-dev" }
     builders { name: "dart2js-linux-debug-ia32-none-dev" }
     builders { name: "dart2js-linux-x64-drt-dev" }
-    builders { name: "dart2js-mac-x64-chrome-dev" mixins: "mac" }
-    builders { name: "dart2js-mac-x64-safari-dev" mixins: "mac" }
+    builders { name: "dart2js-mac-x64-chrome-dev" dimensions: "os:Mac" }
+    builders { name: "dart2js-mac-x64-safari-dev" dimensions: "os:Mac" }
     builders { name: "dart2js-minified-linux-x64-d8-dev" }
     builders { name: "dart2js-only-unittest-linux-ia32-none-dev" }
-    builders { name: "dart2js-win-x64-chrome-dev" mixins: "win" }
-    builders { name: "dart2js-win-x64-edge-dev" mixins: "win" }
-    builders { name: "dart2js-win-x64-ff-dev" mixins: "win" }
-    builders { name: "dart2js-win-x64-ie11-dev" mixins: "win" }
+    builders { name: "dart2js-win-x64-chrome-dev" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-edge-dev" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-ff-dev" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-ie11-dev" dimensions: "os:Windows" }
     builders { name: "ddc-linux-release-chrome-dev" }
-    builders { name: "ddc-mac-release-chrome-dev" mixins: "mac" }
-    builders { name: "ddc-win-release-chrome-dev" mixins: "win" }
-    builders { name: "front-end-mac-release-x64-dev" mixins: "mac" }
+    builders { name: "ddc-mac-release-chrome-dev" dimensions: "os:Mac" }
+    builders { name: "ddc-win-release-chrome-dev" dimensions: "os:Windows" }
+    builders { name: "debianpackage-linux-dev" mixins: "debianpackage" }
+    builders { name: "front-end-mac-release-x64-dev" dimensions: "os:Mac" }
     builders { name: "front-end-linux-release-x64-dev" }
-    builders { name: "front-end-win-release-x64-dev" mixins: "win" }
+    builders { name: "front-end-win-release-x64-dev" dimensions: "os:Windows" }
     builders { name: "pkg-linux-release-dev" }
-    builders { name: "pkg-mac-release-dev" mixins: "mac" }
-    builders { name: "pkg-win-release-dev" mixins: "win" }
+    builders { name: "pkg-mac-release-dev" dimensions: "os:Mac" }
+    builders { name: "pkg-win-release-dev" dimensions: "os:Windows" }
     builders { name: "pub-linux-release-dev" }
-    builders { name: "pub-mac-release-dev" mixins: "mac" }
-    builders { name: "pub-win-release-dev" mixins: "win" }
+    builders { name: "pub-mac-release-dev" dimensions: "os:Mac" }
+    builders { name: "pub-win-release-dev" dimensions: "os:Windows" }
     builders { name: "precomp-linux-debug-x64-dev" }
     builders { name: "precomp-linux-product-x64-dev" }
     builders { name: "target-vm-linux-release-arm64-dev" dimensions: "cpu:arm64" }
@@ -330,15 +248,15 @@ buckets {
     builders { name: "vm-kernel-linux-release-simarm64-dev" }
     builders { name: "vm-kernel-linux-release-simdbc64-dev" }
     builders { name: "vm-kernel-linux-release-x64-dev" }
-    builders { name: "vm-kernel-mac-debug-x64-dev" mixins: "mac" }
-    builders { name: "vm-kernel-mac-release-x64-dev" mixins: "mac" }
-    builders { name: "vm-kernel-win-release-x64-dev" mixins: "win" }
+    builders { name: "vm-kernel-mac-debug-x64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-kernel-mac-release-x64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-kernel-win-release-x64-dev" dimensions: "os:Windows" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-dev" mixins: "slow" }
     builders { name: "vm-kernel-precomp-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-dev" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-dev" }
-    builders { name: "vm-kernel-precomp-win-release-x64-dev" mixins: "win" }
+    builders { name: "vm-kernel-precomp-win-release-x64-dev" dimensions: "os:Windows" }
     builders { name: "vm-linux-debug-ia32-dev" }
     builders { name: "vm-linux-debug-simarm-dev" }
     builders { name: "vm-linux-debug-x64-dev" }
@@ -347,43 +265,44 @@ buckets {
     builders { name: "vm-linux-release-simarm-dev" }
     builders { name: "vm-linux-release-simarm64-dev" }
     builders { name: "vm-linux-release-x64-dev" }
-    builders { name: "vm-mac-debug-ia32-dev" mixins: "mac" }
-    builders { name: "vm-mac-debug-simdbc64-dev" mixins: "mac" }
-    builders { name: "vm-mac-debug-x64-dev" mixins: "mac" }
-    builders { name: "vm-mac-product-x64-dev" mixins: "mac" }
-    builders { name: "vm-mac-release-ia32-dev" mixins: "mac" }
-    builders { name: "vm-mac-release-simdbc64-dev" mixins: "mac" }
-    builders { name: "vm-mac-release-x64-dev" mixins: "mac" }
-    builders { name: "vm-noopt-mac-simarm64-dev" mixins: "mac" }
+    builders { name: "vm-mac-debug-ia32-dev" dimensions: "os:Mac" }
+    builders { name: "vm-mac-debug-simdbc64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-mac-debug-x64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-mac-product-x64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-mac-release-ia32-dev" dimensions: "os:Mac" }
+    builders { name: "vm-mac-release-simdbc64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-mac-release-x64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-noopt-mac-simarm64-dev" dimensions: "os:Mac" }
     builders { name: "vm-optcounter-threshold-linux-release-ia32-dev" }
     builders { name: "vm-optcounter-threshold-linux-release-x64-dev" }
     builders { name: "vm-precomp-android-release-dev" }
-    builders { name: "vm-precomp-win-simarm64-dev" mixins: "win" }
+    builders { name: "vm-precomp-win-simarm64-dev" dimensions: "os:Windows" }
     builders { name: "vm-reload-linux-debug-x64-dev" }
     builders { name: "vm-reload-linux-release-x64-dev" }
-    builders { name: "vm-reload-mac-debug-simdbc64-dev" mixins: "mac" }
-    builders { name: "vm-reload-mac-release-simdbc64-dev" mixins: "mac" }
+    builders { name: "vm-reload-mac-debug-simdbc64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-reload-mac-release-simdbc64-dev" dimensions: "os:Mac" }
     builders { name: "vm-reload-rollback-linux-debug-x64-dev" }
     builders { name: "vm-reload-rollback-linux-release-x64-dev" }
-    builders { name: "vm-win-debug-ia32-dev" mixins: "win" }
-    builders { name: "vm-win-debug-x64-dev" mixins: "win" }
-    builders { name: "vm-win-product-x64-dev" mixins: "win" }
-    builders { name: "vm-win-release-ia32-dev" mixins: "win" }
-    builders { name: "vm-win-release-x64-dev" mixins: "win" }
-
-    # CI Builders for the stable branch
+    builders { name: "vm-win-debug-ia32-dev" dimensions: "os:Windows" }
+    builders { name: "vm-win-debug-x64-dev" dimensions: "os:Windows" }
+    builders { name: "vm-win-product-x64-dev" dimensions: "os:Windows" }
+    builders { name: "vm-win-release-ia32-dev" dimensions: "os:Windows" }
+    builders { name: "vm-win-release-x64-dev" dimensions: "os:Windows" }
     builders { name: "analyzer-analysis-server-linux-stable" }
     builders { name: "analyzer-linux-release-stable" }
-    builders { name: "analyzer-mac-release-stable" mixins: "mac" }
+    builders { name: "analyzer-mac-release-stable" dimensions: "os:Mac" }
     builders { name: "analyzer-strong-linux-release-stable" }
-    builders { name: "analyzer-strong-mac-release-stable" mixins: "mac" }
-    builders { name: "analyzer-strong-win-release-stable" mixins: "win" }
-    builders { name: "analyzer-win-release-stable" mixins: "win" }
+    builders { name: "analyzer-strong-mac-release-stable" dimensions: "os:Mac" }
+    builders { name: "analyzer-strong-win-release-stable" dimensions: "os:Windows" }
+    builders { name: "analyzer-win-release-stable" dimensions: "os:Windows" }
     builders { name: "androidvm-linux-release-x64-stable" mixins: "android" }
     builders { name: "app-linux-debug-x64-stable" }
     builders { name: "app-linux-product-x64-stable" }
     builders { name: "app-linux-release-x64-stable" }
     builders { name: "cross-vm-linux-release-arm64-stable" }
+    builders { name: "dart-sdk-linux-stable" }
+    builders { name: "dart-sdk-mac-stable" dimensions: "os:Mac" }
+    builders { name: "dart-sdk-win-stable" dimensions: "os:Windows" }
     builders { name: "dart2js-csp-minified-linux-x64-drt-stable" }
     builders { name: "dart2js-dumpinfo-linux-ia32-none-stable" }
     builders { name: "dart2js-faststartup-linux-x64-chrome-stable" }
@@ -393,26 +312,27 @@ buckets {
     builders { name: "dart2js-linux-x64-ff-stable" }
     builders { name: "dart2js-linux-debug-ia32-none-stable" }
     builders { name: "dart2js-linux-x64-drt-stable" }
-    builders { name: "dart2js-mac-x64-chrome-stable" mixins: "mac" }
-    builders { name: "dart2js-mac-x64-safari-stable" mixins: "mac" }
+    builders { name: "dart2js-mac-x64-chrome-stable" dimensions: "os:Mac" }
+    builders { name: "dart2js-mac-x64-safari-stable" dimensions: "os:Mac" }
     builders { name: "dart2js-minified-linux-x64-d8-stable" }
     builders { name: "dart2js-only-unittest-linux-ia32-none-stable" }
-    builders { name: "dart2js-win-x64-chrome-stable" mixins: "win" }
-    builders { name: "dart2js-win-x64-edge-stable" mixins: "win" }
-    builders { name: "dart2js-win-x64-ff-stable" mixins: "win" }
-    builders { name: "dart2js-win-x64-ie11-stable" mixins: "win" }
+    builders { name: "dart2js-win-x64-chrome-stable" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-edge-stable" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-ff-stable" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-ie11-stable" dimensions: "os:Windows" }
     builders { name: "ddc-linux-release-chrome-stable" }
-    builders { name: "ddc-mac-release-chrome-stable" mixins: "mac" }
-    builders { name: "ddc-win-release-chrome-stable" mixins: "win" }
-    builders { name: "front-end-mac-release-x64-stable" mixins: "mac" }
+    builders { name: "ddc-mac-release-chrome-stable" dimensions: "os:Mac" }
+    builders { name: "ddc-win-release-chrome-stable" dimensions: "os:Windows" }
+    builders { name: "debianpackage-linux-stable" mixins: "debianpackage" }
+    builders { name: "front-end-mac-release-x64-stable" dimensions: "os:Mac" }
     builders { name: "front-end-linux-release-x64-stable" }
-    builders { name: "front-end-win-release-x64-stable" mixins: "win" }
+    builders { name: "front-end-win-release-x64-stable" dimensions: "os:Windows" }
     builders { name: "pkg-linux-release-stable" }
-    builders { name: "pkg-mac-release-stable" mixins: "mac" }
-    builders { name: "pkg-win-release-stable" mixins: "win" }
+    builders { name: "pkg-mac-release-stable" dimensions: "os:Mac" }
+    builders { name: "pkg-win-release-stable" dimensions: "os:Windows" }
     builders { name: "pub-linux-release-stable" }
-    builders { name: "pub-mac-release-stable" mixins: "mac" }
-    builders { name: "pub-win-release-stable" mixins: "win" }
+    builders { name: "pub-mac-release-stable" dimensions: "os:Mac" }
+    builders { name: "pub-win-release-stable" dimensions: "os:Windows" }
     builders { name: "precomp-linux-debug-x64-stable" }
     builders { name: "precomp-linux-product-x64-stable" }
     builders { name: "target-vm-linux-release-arm64-stable" dimensions: "cpu:arm64" }
@@ -426,15 +346,15 @@ buckets {
     builders { name: "vm-kernel-linux-release-simarm64-stable" }
     builders { name: "vm-kernel-linux-release-simdbc64-stable" }
     builders { name: "vm-kernel-linux-release-x64-stable" }
-    builders { name: "vm-kernel-mac-debug-x64-stable" mixins: "mac" }
-    builders { name: "vm-kernel-mac-release-x64-stable" mixins: "mac" }
-    builders { name: "vm-kernel-win-release-x64-stable" mixins: "win" }
+    builders { name: "vm-kernel-mac-debug-x64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-kernel-mac-release-x64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-kernel-win-release-x64-stable" dimensions: "os:Windows" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-stable" mixins: "slow" }
     builders { name: "vm-kernel-precomp-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-stable" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-stable" }
-    builders { name: "vm-kernel-precomp-win-release-x64-stable" mixins: "win" }
+    builders { name: "vm-kernel-precomp-win-release-x64-stable" dimensions: "os:Windows" }
     builders { name: "vm-linux-debug-ia32-stable" }
     builders { name: "vm-linux-debug-simarm-stable" }
     builders { name: "vm-linux-debug-x64-stable" }
@@ -443,41 +363,41 @@ buckets {
     builders { name: "vm-linux-release-simarm-stable" }
     builders { name: "vm-linux-release-simarm64-stable" }
     builders { name: "vm-linux-release-x64-stable" }
-    builders { name: "vm-mac-debug-ia32-stable" mixins: "mac" }
-    builders { name: "vm-mac-debug-simdbc64-stable" mixins: "mac" }
-    builders { name: "vm-mac-debug-x64-stable" mixins: "mac" }
-    builders { name: "vm-mac-product-x64-stable" mixins: "mac" }
-    builders { name: "vm-mac-release-ia32-stable" mixins: "mac" }
-    builders { name: "vm-mac-release-simdbc64-stable" mixins: "mac" }
-    builders { name: "vm-mac-release-x64-stable" mixins: "mac" }
-    builders { name: "vm-noopt-mac-simarm64-stable" mixins: "mac" }
+    builders { name: "vm-mac-debug-ia32-stable" dimensions: "os:Mac" }
+    builders { name: "vm-mac-debug-simdbc64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-mac-debug-x64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-mac-product-x64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-mac-release-ia32-stable" dimensions: "os:Mac" }
+    builders { name: "vm-mac-release-simdbc64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-mac-release-x64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-noopt-mac-simarm64-stable" dimensions: "os:Mac" }
     builders { name: "vm-optcounter-threshold-linux-release-ia32-stable" }
     builders { name: "vm-optcounter-threshold-linux-release-x64-stable" }
     builders { name: "vm-precomp-android-release-stable" }
-    builders { name: "vm-precomp-win-simarm64-stable" mixins: "win" }
+    builders { name: "vm-precomp-win-simarm64-stable" dimensions: "os:Windows" }
     builders { name: "vm-reload-linux-debug-x64-stable" }
     builders { name: "vm-reload-linux-release-x64-stable" }
-    builders { name: "vm-reload-mac-debug-simdbc64-stable" mixins: "mac" }
-    builders { name: "vm-reload-mac-release-simdbc64-stable" mixins: "mac" }
+    builders { name: "vm-reload-mac-debug-simdbc64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-reload-mac-release-simdbc64-stable" dimensions: "os:Mac" }
     builders { name: "vm-reload-rollback-linux-debug-x64-stable" }
     builders { name: "vm-reload-rollback-linux-release-x64-stable" }
-    builders { name: "vm-win-debug-ia32-stable" mixins: "win" }
-    builders { name: "vm-win-debug-x64-stable" mixins: "win" }
-    builders { name: "vm-win-product-x64-stable" mixins: "win" }
-    builders { name: "vm-win-release-ia32-stable" mixins: "win" }
-    builders { name: "vm-win-release-x64-stable" mixins: "win" }
+    builders { name: "vm-win-debug-ia32-stable" dimensions: "os:Windows" }
+    builders { name: "vm-win-debug-x64-stable" dimensions: "os:Windows" }
+    builders { name: "vm-win-product-x64-stable" dimensions: "os:Windows" }
+    builders { name: "vm-win-release-ia32-stable" dimensions: "os:Windows" }
+    builders { name: "vm-win-release-x64-stable" dimensions: "os:Windows" }
   }
 }
 
 buckets {
   name: "luci.dart.try"
-  acl_sets: "try"
+  acl_sets: "tryserver"
 
   swarming {
     hostname: "chromium-swarm.appspot.com"
     url_format: "https://ci.chromium.org/swarming/task/{task_id}"
     builder_defaults {
-      category: "Dart Try"
+      category: "Dart CQ"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       build_numbers: YES
@@ -497,29 +417,148 @@ buckets {
       }
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
-
-    # git cl try builders
-    builders { name: "cl-linux-try" }
-    builders { name: "cl-mac-try" mixins: "mac" }
-    builders { name: "cl-win-try" mixins: "win" }
-
-    # CQ builders
-    builders { name: "analyzer-linux-release-strong-hostchecked-try" }
-    builders { name: "benchmark-linux-try" }
-    builders { name: "dart-sdk-windows-try" mixins: "sdk" mixins: "win" }
-    builders { name: "dart2js-linux-d8-hostchecked-try" mixins: "dart2js" }
-    builders { name: "dart2js-linux-d8-kernel-minified-try" mixins: "dart2js" }
-    builders { name: "dart2js-linux-none-only-unittest-try" mixins: "dart2js" }
-    builders { name: "dart2js-linux-x64-chrome-try" }
-    builders { name: "ddc-linux-release-chrome-try" mixins: "clobber" }
-    builders { name: "front-end-linux-release-x64-try" }
-    builders { name: "pkg-linux-release-try" }
-    builders { name: "vm-canary-linux-debug-try" }
-    builders { name: "vm-kernel-legacy-linux-release-x64-try" }
+    builders {
+      name: "benchmark-linux-try"
+    }
+    builders {
+      name: "front-end-linux-release-x64-try"
+    }
+    builders {
+      name: "vm-canary-linux-debug-try"
+    }
+    builders {
+      name: "vm-linux-release-x64-try"
+    }
+    builders {
+      name: "vm-linux-debug-x64-try"
+    }
+    builders {
+      name: "vm-mac-release-x64-try"
+      dimensions: "os:Mac"
+    }
+    builders {
+      name: "vm-mac-debug-x64-try"
+      dimensions: "os:Mac"
+    }
+    builders {
+      name: "vm-win-release-x64-try"
+      dimensions: "os:Windows"
+    }
+    builders {
+      name: "vm-win-debug-x64-try"
+      dimensions: "os:Windows"
+    }
+    builders {
+      name: "vm-linux-product-x64-try"
+      recipe {
+        name: "dart/dart_vm"
+      }
+    }
+    builders {
+      name: "vm-kernel-legacy-linux-release-x64-try"
+    }
     builders { name: "vm-kernel-linux-release-x64-try" }
-    builders { name: "vm-kernel-mac-release-x64-try" mixins: "mac" mixins: "vm-kernel" }
-    builders { name: "vm-linux-product-x64-try" mixins: "vm" }
-    builders { name: "vm-linux-release-x64-try" }
-    builders { name: "vm-mac-release-x64-try" mixins: "mac" }
+    builders {
+      name: "vm-kernel-linux-debug-x64-try"
+      mixins: "vm-kernel"
+    }
+    builders {
+      name: "vm-kernel-mac-release-x64-try"
+      dimensions: "os:Mac"
+      mixins: "vm-kernel"
+    }
+    builders {
+      name: "vm-kernel-mac-debug-x64-try"
+      mixins: "vm-kernel"
+    }
+    builders {
+      name: "dart2js-linux-x64-chrome-try"
+    }
+    builders {
+      name: "dart-sdk-linux-try"
+      recipe {
+        name: "dart/sdk_swarming"
+      }
+    }
+    builders {
+      name: "dart-sdk-mac-try"
+      dimensions: "os:Mac"
+      recipe {
+        name: "dart/sdk_swarming"
+      }
+    }
+    builders {
+      name: "dart-sdk-windows-try"
+      dimensions: "os:Windows"
+      recipe {
+        name: "dart/sdk_swarming"
+      }
+    }
+    builders {
+      name: "dart2js-linux-d8-hostchecked-unittest-try"
+      recipe {
+        name: "dart/dart2js_swarming"
+        properties_j: "shards:6"
+      }
+    }
+    builders {
+      name: "dart2js-linux-d8-hostchecked-try"
+      recipe {
+        name: "dart/dart2js_swarming"
+        properties_j: "shards:6"
+      }
+    }
+    builders {
+      name: "dart2js-linux-none-only-unittest-try"
+      recipe {
+        name: "dart/dart2js_swarming"
+      }
+    }
+    builders {
+      name: "dart2js-linux-d8-kernel-minified-try"
+      recipe {
+        name: "dart/dart2js_swarming"
+        properties_j: "shards:6"
+      }
+    }
+    builders {
+      name: "dart2js-win10-ie11-try"
+      dimensions: "os:Windows-10"
+      recipe {
+        name: "dart/dart2js_swarming"
+        properties_j: "shards:6"
+      }
+    }
+    builders {
+      name: "dart2js-win10-edge-try"
+      dimensions: "os:Windows-10"
+      recipe {
+        name: "dart/dart2js_swarming"
+        properties_j: "shards:6"
+      }
+    }
+    builders {
+      name: "ddc-linux-release-chrome-try"
+      recipe {
+        properties: "clobber:true"
+      }
+    }
+    builders {
+      name: "analyzer-linux-release-strong-hostchecked-try"
+    }
+    builders {
+      name: "pkg-linux-release-try"
+    }
+    builders {
+      name: "cl-linux-try"
+    }
+    builders {
+      name: "cl-win-try"
+      dimensions: "os:Windows-10"
+    }
+    builders {
+      name: "cl-mac-try"
+      dimensions: "os:Mac"
+    }
   }
 }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 819df8e7c636..505ee02781ac 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -7,22 +7,22 @@ consoles: {
   ref: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
+    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
     category: "fasta"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
     category: "fasta"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
+    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
     category: "fasta"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64"
     category: "fasta"
     short_name: "vm"
   }
@@ -153,22 +153,22 @@ consoles: {
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64"
     category: "vm|kernel"
     short_name: "dbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64"
     category: "vm|kernel"
     short_name: "rbc"
   }
@@ -191,12 +191,12 @@ consoles: {
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64"
     category: "vm|kernel"
     short_name: "oc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64"
     category: "vm|kernel"
     short_name: "wr"
   }
@@ -249,12 +249,12 @@ consoles: {
     short_name: "8d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
@@ -295,7 +295,7 @@ consoles: {
     short_name: "6r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
@@ -529,37 +529,37 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
+    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
     category: "analyzer"
     short_name: "as"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
+    name: "buildbucket/luci.dart.ci/analyzer-linux-release"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
+    name: "buildbucket/luci.dart.ci/analyzer-mac-release"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
+    name: "buildbucket/luci.dart.ci/analyzer-win-release"
     category: "analyzer"
     short_name: "awr"
   }
@@ -582,27 +582,27 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
+    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
+    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
+    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "fs"
   }
@@ -644,7 +644,7 @@ consoles: {
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
@@ -667,7 +667,7 @@ consoles: {
     short_name: "3m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
@@ -710,17 +710,17 @@ consoles: {
 #    short_name: "ie"
 #  }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
+    name: "buildbucket/luci.dart.ci/pkg-linux-release"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
+    name: "buildbucket/luci.dart.ci/pkg-mac-release"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
+    name: "buildbucket/luci.dart.ci/pkg-win-release"
     category: "pkg"
     short_name: "w"
   }
@@ -776,22 +776,22 @@ consoles: {
   ref: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
+    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
     category: "fasta"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
     category: "fasta"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
+    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
     category: "fasta"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64"
     category: "fasta"
     short_name: "vm"
   }
@@ -869,37 +869,37 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
+    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
     category: "analyzer"
     short_name: "as"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
+    name: "buildbucket/luci.dart.ci/analyzer-linux-release"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
+    name: "buildbucket/luci.dart.ci/analyzer-mac-release"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
+    name: "buildbucket/luci.dart.ci/analyzer-win-release"
     category: "analyzer"
     short_name: "awr"
   }
@@ -922,17 +922,17 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
+    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
+    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
+    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
   }
@@ -961,17 +961,17 @@ consoles: {
     short_name: "4l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "fs"
   }
 #  builders {
-#    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-ff"
+#    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff"
 #    category: "dart2js|ff"
 #    short_name: "l"
 #  }
@@ -982,7 +982,7 @@ consoles: {
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
@@ -1005,7 +1005,7 @@ consoles: {
     short_name: "3m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
@@ -1048,17 +1048,17 @@ consoles: {
 #    short_name: "ie"
 #  }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
+    name: "buildbucket/luci.dart.ci/pkg-linux-release"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
+    name: "buildbucket/luci.dart.ci/pkg-mac-release"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
+    name: "buildbucket/luci.dart.ci/pkg-win-release"
     category: "pkg"
     short_name: "w"
   }
@@ -1201,22 +1201,22 @@ consoles: {
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64"
     category: "vm|kernel"
     short_name: "dbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64"
     category: "vm|kernel"
     short_name: "rbc"
   }
@@ -1239,12 +1239,12 @@ consoles: {
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64"
     category: "vm|kernel"
     short_name: "oc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64"
     category: "vm|kernel"
     short_name: "wr"
   }
@@ -1297,12 +1297,12 @@ consoles: {
     short_name: "8d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
@@ -1343,7 +1343,7 @@ consoles: {
     short_name: "6r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
@@ -1543,347 +1543,347 @@ consoles: {
   ref: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
+    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
     category: "fasta"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
     category: "fasta"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
+    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
     category: "fasta"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64"
     category: "fasta"
     short_name: "vm"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-ia32"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
     category: "vm|debug"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simarm"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm"
     category: "vm|simarm"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64"
     category: "vm|debug"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-ia32"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32"
     category: "vm|release"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm"
     category: "vm|simarm"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64"
     category: "vm|simarm"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-x64"
     category: "vm|release"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-ia32"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32"
     category: "vm|debug"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64"
     category: "vm|debug"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64"
     category: "vm|debug"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-ia32"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32"
     category: "vm|release"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64"
     category: "vm|release"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-x64"
     category: "vm|release"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-ia32"
+    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32"
     category: "vm|debug"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-win-debug-x64"
     category: "vm|debug"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-ia32"
+    name: "buildbucket/luci.dart.ci/vm-win-release-ia32"
     category: "vm|release"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-win-release-x64"
     category: "vm|release"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/app-linux-debug-x64"
     category: "vm|app"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-linux-product-x64"
+    name: "buildbucket/luci.dart.ci/app-linux-product-x64"
     category: "vm|app"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/app-linux-release-x64"
     category: "vm|app"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64"
     category: "vm|kernel"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64"
     category: "vm|kernel"
     short_name: "dbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64"
     category: "vm|kernel"
     short_name: "rbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64"
     category: "vm|kernel"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64"
     category: "vm|kernel"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64"
     category: "vm|kernel"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64"
     category: "vm|kernel"
     short_name: "oc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64"
     category: "vm|kernel"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64"
     category: "vm|kernel-precomp"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64"
     category: "vm|kernel-precomp"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
+    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
     category: "vm|misc"
     short_name: "cra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64"
+    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64"
     category: "vm|misc"
     short_name: "tra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64"
     category: "vm|misc"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-ia32"
+    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32"
     category: "vm|misc"
     short_name: "o32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64"
     category: "vm|misc"
     short_name: "o64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64"
     category: "vm|precomp"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-product-x64"
+    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64"
     category: "vm|precomp"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-noopt-mac-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64"
     category: "vm|precomp"
     short_name: "no"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-android-release"
+    name: "buildbucket/luci.dart.ci/vm-precomp-android-release"
     category: "vm|precomp"
     short_name: "and"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-win-simarm64"
+    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64"
     category: "vm|precomp"
     short_name: "wsi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-product-x64"
+    name: "buildbucket/luci.dart.ci/vm-linux-product-x64"
     category: "vm|product"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-product-x64"
+    name: "buildbucket/luci.dart.ci/vm-mac-product-x64"
     category: "vm|product"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-product-x64"
+    name: "buildbucket/luci.dart.ci/vm-win-product-x64"
     category: "vm|product"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64"
     category: "vm|reload"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64"
     category: "vm|reload"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64"
     category: "vm|reload"
     short_name: "mds"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-release-simdbc64"
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64"
     category: "vm|reload"
     short_name: "mrs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64"
     category: "vm|reload"
     short_name: "dro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64"
     category: "vm|reload"
     short_name: "rro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-ia32-d8"
+    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8"
     category: "dart2js|d8"
     short_name: "hc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-linux-x64-d8"
+    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-x64-d8"
     category: "dart2js|d8"
     short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-only-unittest-linux-ia32-none"
+    name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none"
     category: "dart2js|misc"
     short_name: "ut"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-dumpinfo-linux-ia32-none"
+    name: "buildbucket/luci.dart.ci/dart2js-dumpinfo-linux-ia32-none"
     category: "dart2js|misc"
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
+    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
     category: "analyzer"
     short_name: "aas"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
+    name: "buildbucket/luci.dart.ci/analyzer-linux-release"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
+    name: "buildbucket/luci.dart.ci/analyzer-mac-release"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
+    name: "buildbucket/luci.dart.ci/analyzer-win-release"
     category: "analyzer"
     short_name: "awr"
   }
@@ -1903,82 +1903,82 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
+    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
+    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
+    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "fs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-ff"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff"
     category: "dart2js|ff"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-safari"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-safari"
     category: "dart2js|safari"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-edge"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-edge"
     category: "dart2js|ms"
     short_name: "ed"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ff"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ff"
     category: "dart2js|ff"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ie11"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ie11"
     category: "dart2js|ms"
     short_name: "ie"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
+    name: "buildbucket/luci.dart.ci/pkg-linux-release"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
+    name: "buildbucket/luci.dart.ci/pkg-mac-release"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
+    name: "buildbucket/luci.dart.ci/pkg-win-release"
     category: "pkg"
     short_name: "w"
   }
@@ -1988,7 +1988,7 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/versionchecker-linux"
+    name: "buildbucket/luci.dart.ci/versionchecker-linux"
     category: "misc"
     short_name: "vc"
   }
@@ -2032,347 +2032,347 @@ consoles: {
   ref: "refs/heads/dev"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64-dev"
     category: "fasta"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64-dev"
     category: "fasta"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/front-end-win-release-x64-dev"
     category: "fasta"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64-dev"
     category: "fasta"
     short_name: "vm"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-ia32-dev"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32-dev"
     category: "vm|debug"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simarm-dev"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm-dev"
     category: "vm|simarm"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64-dev"
     category: "vm|debug"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-ia32-dev"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32-dev"
     category: "vm|release"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm-dev"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm-dev"
     category: "vm|simarm"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64-dev"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64-dev"
     category: "vm|simarm"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-x64-dev"
     category: "vm|release"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-ia32-dev"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32-dev"
     category: "vm|debug"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64-dev"
     category: "vm|debug"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64-dev"
     category: "vm|debug"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-ia32-dev"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32-dev"
     category: "vm|release"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64-dev"
     category: "vm|release"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-x64-dev"
     category: "vm|release"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-ia32-dev"
+    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32-dev"
     category: "vm|debug"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-win-debug-x64-dev"
     category: "vm|debug"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-ia32-dev"
+    name: "buildbucket/luci.dart.ci/vm-win-release-ia32-dev"
     category: "vm|release"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-win-release-x64-dev"
     category: "vm|release"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci/app-linux-debug-x64-dev"
     category: "vm|app"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-linux-product-x64-dev"
+    name: "buildbucket/luci.dart.ci/app-linux-product-x64-dev"
     category: "vm|app"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/app-linux-release-x64-dev"
     category: "vm|app"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64-dev"
     category: "vm|kernel"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64-dev"
     category: "vm|kernel"
     short_name: "dbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm-dev"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64-dev"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64-dev"
     category: "vm|kernel"
     short_name: "rbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64-dev"
     category: "vm|kernel"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64-dev"
     category: "vm|kernel"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64-dev"
     category: "vm|kernel"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64-dev"
     category: "vm|kernel"
     short_name: "oc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64-dev"
     category: "vm|kernel"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm-dev"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64-dev"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-dev"
+    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64-dev"
     category: "vm|misc"
     short_name: "cra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64-dev"
+    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64-dev"
     category: "vm|misc"
     short_name: "tra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64-dev"
     category: "vm|misc"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-ia32-dev"
+    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32-dev"
     category: "vm|misc"
     short_name: "o32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64-dev"
     category: "vm|misc"
     short_name: "o64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64-dev"
     category: "vm|precomp"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-product-x64-dev"
+    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64-dev"
     category: "vm|precomp"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-noopt-mac-simarm64-dev"
+    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64-dev"
     category: "vm|precomp"
     short_name: "no"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-android-release-dev"
+    name: "buildbucket/luci.dart.ci/vm-precomp-android-release-dev"
     category: "vm|precomp"
     short_name: "and"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-win-simarm64-dev"
+    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64-dev"
     category: "vm|precomp"
     short_name: "wsi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-product-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-linux-product-x64-dev"
     category: "vm|product"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-product-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-mac-product-x64-dev"
     category: "vm|product"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-product-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-win-product-x64-dev"
     category: "vm|product"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64-dev"
     category: "vm|reload"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64-dev"
     category: "vm|reload"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-debug-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64-dev"
     category: "vm|reload"
     short_name: "mds"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-release-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64-dev"
     category: "vm|reload"
     short_name: "mrs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64-dev"
     category: "vm|reload"
     short_name: "dro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64-dev"
     category: "vm|reload"
     short_name: "rro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-ia32-d8-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8-dev"
     category: "dart2js|d8"
     short_name: "hc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-linux-x64-d8-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-x64-d8-dev"
     category: "dart2js|d8"
     short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-only-unittest-linux-ia32-none-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none-dev"
     category: "dart2js|misc"
     short_name: "ut"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-dumpinfo-linux-ia32-none-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-dumpinfo-linux-ia32-none-dev"
     category: "dart2js|misc"
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-dev"
+    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux-dev"
     category: "analyzer"
     short_name: "aas"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-dev"
+    name: "buildbucket/luci.dart.ci/analyzer-linux-release-dev"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-dev"
+    name: "buildbucket/luci.dart.ci/analyzer-mac-release-dev"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release-dev"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release-dev"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release-dev"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release-dev"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release-dev"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release-dev"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-dev"
+    name: "buildbucket/luci.dart.ci/analyzer-win-release-dev"
     category: "analyzer"
     short_name: "awr"
   }
@@ -2392,82 +2392,82 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-dev"
+    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome-dev"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-dev"
+    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome-dev"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-dev"
+    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome-dev"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "fs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-ff-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff-dev"
     category: "dart2js|ff"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-safari-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-safari-dev"
     category: "dart2js|safari"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-edge-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-edge-dev"
     category: "dart2js|ms"
     short_name: "ed"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ff-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ff-dev"
     category: "dart2js|ff"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ie11-dev"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ie11-dev"
     category: "dart2js|ms"
     short_name: "ie"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
+    name: "buildbucket/luci.dart.ci/pkg-linux-release-dev"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-dev"
+    name: "buildbucket/luci.dart.ci/pkg-mac-release-dev"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-dev"
+    name: "buildbucket/luci.dart.ci/pkg-win-release-dev"
     category: "pkg"
     short_name: "w"
   }
@@ -2477,7 +2477,7 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/versionchecker-linux-dev"
+    name: "buildbucket/luci.dart.ci/versionchecker-linux-dev"
     category: "misc"
     short_name: "vc"
   }
@@ -2521,347 +2521,347 @@ consoles: {
   ref: "refs/heads/stable"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64-stable"
     category: "fasta"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64-stable"
     category: "fasta"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/front-end-win-release-x64-stable"
     category: "fasta"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64-stable"
     category: "fasta"
     short_name: "vm"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-ia32-stable"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32-stable"
     category: "vm|debug"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simarm-stable"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm-stable"
     category: "vm|simarm"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64-stable"
     category: "vm|debug"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-ia32-stable"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32-stable"
     category: "vm|release"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm-stable"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm-stable"
     category: "vm|simarm"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64-stable"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64-stable"
     category: "vm|simarm"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-linux-release-x64-stable"
     category: "vm|release"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-ia32-stable"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32-stable"
     category: "vm|debug"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64-stable"
     category: "vm|debug"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64-stable"
     category: "vm|debug"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-ia32-stable"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32-stable"
     category: "vm|release"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64-stable"
     category: "vm|release"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-mac-release-x64-stable"
     category: "vm|release"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-ia32-stable"
+    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32-stable"
     category: "vm|debug"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-win-debug-x64-stable"
     category: "vm|debug"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-ia32-stable"
+    name: "buildbucket/luci.dart.ci/vm-win-release-ia32-stable"
     category: "vm|release"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-win-release-x64-stable"
     category: "vm|release"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci/app-linux-debug-x64-stable"
     category: "vm|app"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-linux-product-x64-stable"
+    name: "buildbucket/luci.dart.ci/app-linux-product-x64-stable"
     category: "vm|app"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/app-linux-release-x64-stable"
     category: "vm|app"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64-stable"
     category: "vm|kernel"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64-stable"
     category: "vm|kernel"
     short_name: "dbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm-stable"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64-stable"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64-stable"
     category: "vm|kernel"
     short_name: "rbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64-stable"
     category: "vm|kernel"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64-stable"
     category: "vm|kernel"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64-stable"
     category: "vm|kernel"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64-stable"
     category: "vm|kernel"
     short_name: "oc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64-stable"
     category: "vm|kernel"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm-stable"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64-stable"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-stable"
+    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64-stable"
     category: "vm|misc"
     short_name: "cra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64-stable"
+    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64-stable"
     category: "vm|misc"
     short_name: "tra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64-stable"
     category: "vm|misc"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-ia32-stable"
+    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32-stable"
     category: "vm|misc"
     short_name: "o32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64-stable"
     category: "vm|misc"
     short_name: "o64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64-stable"
     category: "vm|precomp"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-product-x64-stable"
+    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64-stable"
     category: "vm|precomp"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-noopt-mac-simarm64-stable"
+    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64-stable"
     category: "vm|precomp"
     short_name: "no"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-android-release-stable"
+    name: "buildbucket/luci.dart.ci/vm-precomp-android-release-stable"
     category: "vm|precomp"
     short_name: "and"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-win-simarm64-stable"
+    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64-stable"
     category: "vm|precomp"
     short_name: "wsi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-product-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-linux-product-x64-stable"
     category: "vm|product"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-product-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-mac-product-x64-stable"
     category: "vm|product"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-product-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-win-product-x64-stable"
     category: "vm|product"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64-stable"
     category: "vm|reload"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64-stable"
     category: "vm|reload"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-debug-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64-stable"
     category: "vm|reload"
     short_name: "mds"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-release-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64-stable"
     category: "vm|reload"
     short_name: "mrs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64-stable"
     category: "vm|reload"
     short_name: "dro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64-stable"
     category: "vm|reload"
     short_name: "rro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-ia32-d8-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8-stable"
     category: "dart2js|d8"
     short_name: "hc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-linux-x64-d8-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-x64-d8-stable"
     category: "dart2js|d8"
     short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-only-unittest-linux-ia32-none-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none-stable"
     category: "dart2js|misc"
     short_name: "ut"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-dumpinfo-linux-ia32-none-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-dumpinfo-linux-ia32-none-stable"
     category: "dart2js|misc"
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-stable"
+    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux-stable"
     category: "analyzer"
     short_name: "aas"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-stable"
+    name: "buildbucket/luci.dart.ci/analyzer-linux-release-stable"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-stable"
+    name: "buildbucket/luci.dart.ci/analyzer-mac-release-stable"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release-stable"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release-stable"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release-stable"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release-stable"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release-stable"
+    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release-stable"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-stable"
+    name: "buildbucket/luci.dart.ci/analyzer-win-release-stable"
     category: "analyzer"
     short_name: "awr"
   }
@@ -2881,82 +2881,82 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-stable"
+    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome-stable"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-stable"
+    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome-stable"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-stable"
+    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome-stable"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "fs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-ff-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff-stable"
     category: "dart2js|ff"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-safari-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-safari-stable"
     category: "dart2js|safari"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-edge-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-edge-stable"
     category: "dart2js|ms"
     short_name: "ed"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ff-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ff-stable"
     category: "dart2js|ff"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ie11-stable"
+    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ie11-stable"
     category: "dart2js|ms"
     short_name: "ie"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
+    name: "buildbucket/luci.dart.ci/pkg-linux-release-stable"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-stable"
+    name: "buildbucket/luci.dart.ci/pkg-mac-release-stable"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-stable"
+    name: "buildbucket/luci.dart.ci/pkg-win-release-stable"
     category: "pkg"
     short_name: "w"
   }
@@ -2966,7 +2966,7 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/versionchecker-linux-stable"
+    name: "buildbucket/luci.dart.ci/versionchecker-linux-stable"
     category: "misc"
     short_name: "vc"
   }
@@ -3010,37 +3010,37 @@ consoles: {
   ref: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/vm-kernel-checked-linux-release-x64"
     category: "vm-kernel"
     short_name: "cr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-debug-ia32-none"
+    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-debug-ia32-none"
     category: "dart2js"
     short_name: "hcd"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-debug-ia32-none"
+    name: "buildbucket/luci.dart.ci/dart2js-linux-debug-ia32-none"
     category: "dart2js"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pub-linux-release"
+    name: "buildbucket/luci.dart.ci/pub-linux-release"
     category: "pub"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pub-mac-release"
+    name: "buildbucket/luci.dart.ci/pub-mac-release"
     category: "pub"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pub-win-release"
+    name: "buildbucket/luci.dart.ci/pub-win-release"
     category: "pub"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/androidvm-linux-release-x64"
+    name: "buildbucket/luci.dart.ci/androidvm-linux-release-x64"
     category: "android"
     short_name: "vm"
   }
@@ -3095,7 +3095,7 @@ consoles: {
   builders { name: "buildbucket/luci.dart.try/pkg-linux-release-try" }
   builders { name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try" }
   builders { name: "buildbucket/luci.dart.try/vm-kernel-legacy-linux-release-x64-try" }
-  builders { name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try" }
+  builders { name: "buildbucket/luci.dart.try/vm-kernel-mac-release-x64-try" }
   builders { name: "buildbucket/luci.dart.try/vm-linux-product-x64-try" }
   builders { name: "buildbucket/luci.dart.try/vm-linux-release-x64-try" }
   builders { name: "buildbucket/luci.dart.try/vm-mac-release-x64-try" }
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index be358aab47de..e9e542510a9a 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -146,7 +146,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-analysis-server-linux"
   }
 }
@@ -157,7 +157,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-linux-release"
   }
 }
@@ -168,7 +168,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-mac-release"
   }
 }
@@ -179,7 +179,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-strong-linux-release"
   }
 }
@@ -190,7 +190,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-strong-mac-release"
   }
 }
@@ -201,7 +201,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-strong-win-release"
   }
 }
@@ -212,7 +212,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-win-release"
   }
 }
@@ -259,7 +259,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "dart2js-faststartup-linux-x64-chrome"
   }
 }
@@ -270,7 +270,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "dart2js-linux-x64-chrome"
   }
 }
@@ -281,7 +281,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "dart2js-mac-x64-chrome"
   }
 }
@@ -292,7 +292,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "dart2js-win-x64-chrome"
   }
 }
@@ -303,7 +303,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "ddc-linux-release-chrome"
   }
 }
@@ -314,7 +314,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "ddc-mac-release-chrome"
   }
 }
@@ -325,7 +325,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "ddc-win-release-chrome"
   }
 }
@@ -336,7 +336,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "front-end-linux-release-x64"
   }
 }
@@ -347,7 +347,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "front-end-mac-release-x64"
   }
 }
@@ -358,7 +358,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "front-end-win-release-x64"
   }
 }
@@ -369,7 +369,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "pkg-linux-release"
   }
 }
@@ -380,7 +380,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "pkg-mac-release"
   }
 }
@@ -391,7 +391,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "pkg-win-release"
   }
 }
@@ -402,7 +402,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-legacy-linux-release-x64"
   }
 }
@@ -413,7 +413,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-linux-debug-simdbc64"
   }
 }
@@ -424,7 +424,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-linux-release-simarm"
   }
 }
@@ -435,7 +435,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-linux-release-simarm64"
   }
 }
@@ -446,7 +446,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-linux-release-simdbc64"
   }
 }
@@ -457,7 +457,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-optcounter-threshold-linux-release-x64"
   }
 }
@@ -468,7 +468,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-win-release-x64"
   }
 }
@@ -479,7 +479,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-precomp-linux-release-simarm"
   }
 }
@@ -490,7 +490,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-precomp-linux-release-simarm64"
   }
 }
@@ -501,7 +501,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-precomp-win-release-x64"
   }
 }
@@ -512,7 +512,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-analysis-server-linux-dev"
   }
 }
@@ -523,7 +523,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-linux-release-dev"
   }
 }
@@ -534,7 +534,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-mac-release-dev"
   }
 }
@@ -545,7 +545,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-strong-linux-release-dev"
   }
 }
@@ -556,7 +556,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-strong-mac-release-dev"
   }
 }
@@ -567,7 +567,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-strong-win-release-dev"
   }
 }
@@ -578,7 +578,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-win-release-dev"
   }
 }
@@ -625,7 +625,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "dart2js-faststartup-linux-x64-chrome-dev"
   }
 }
@@ -636,7 +636,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "dart2js-linux-x64-chrome-dev"
   }
 }
@@ -647,7 +647,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "dart2js-mac-x64-chrome-dev"
   }
 }
@@ -658,7 +658,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "dart2js-win-x64-chrome-dev"
   }
 }
@@ -669,7 +669,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "ddc-linux-release-chrome-dev"
   }
 }
@@ -680,7 +680,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "ddc-mac-release-chrome-dev"
   }
 }
@@ -691,7 +691,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "ddc-win-release-chrome-dev"
   }
 }
@@ -702,7 +702,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "front-end-linux-release-x64-dev"
   }
 }
@@ -713,7 +713,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "front-end-mac-release-x64-dev"
   }
 }
@@ -724,7 +724,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "front-end-win-release-x64-dev"
   }
 }
@@ -735,7 +735,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "pkg-linux-release-dev"
   }
 }
@@ -746,7 +746,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "pkg-mac-release-dev"
   }
 }
@@ -757,7 +757,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "pkg-win-release-dev"
   }
 }
@@ -768,7 +768,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-legacy-linux-release-x64-dev"
   }
 }
@@ -779,7 +779,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-linux-debug-simdbc64-dev"
   }
 }
@@ -790,7 +790,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-linux-release-simarm-dev"
   }
 }
@@ -801,7 +801,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-linux-release-simarm64-dev"
   }
 }
@@ -812,7 +812,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-linux-release-simdbc64-dev"
   }
 }
@@ -823,7 +823,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
   }
 }
@@ -834,7 +834,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-win-release-x64-dev"
   }
 }
@@ -845,7 +845,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-precomp-linux-release-simarm-dev"
   }
 }
@@ -856,7 +856,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-precomp-linux-release-simarm64-dev"
   }
 }
@@ -867,7 +867,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-precomp-win-release-x64-dev"
   }
 }
@@ -878,7 +878,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-analysis-server-linux-stable"
   }
 }
@@ -889,7 +889,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-linux-release-stable"
   }
 }
@@ -900,7 +900,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-mac-release-stable"
   }
 }
@@ -911,7 +911,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-strong-linux-release-stable"
   }
 }
@@ -922,7 +922,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-strong-mac-release-stable"
   }
 }
@@ -933,7 +933,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-strong-win-release-stable"
   }
 }
@@ -944,7 +944,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "analyzer-win-release-stable"
   }
 }
@@ -991,7 +991,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "dart2js-faststartup-linux-x64-chrome-stable"
   }
 }
@@ -1002,7 +1002,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "dart2js-linux-x64-chrome-stable"
   }
 }
@@ -1013,7 +1013,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "dart2js-mac-x64-chrome-stable"
   }
 }
@@ -1024,7 +1024,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "dart2js-win-x64-chrome-stable"
   }
 }
@@ -1035,7 +1035,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "ddc-linux-release-chrome-stable"
   }
 }
@@ -1046,7 +1046,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "ddc-mac-release-chrome-stable"
   }
 }
@@ -1057,7 +1057,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "ddc-win-release-chrome-stable"
   }
 }
@@ -1068,7 +1068,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "front-end-linux-release-x64-stable"
   }
 }
@@ -1079,7 +1079,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "front-end-mac-release-x64-stable"
   }
 }
@@ -1090,7 +1090,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "front-end-win-release-x64-stable"
   }
 }
@@ -1101,7 +1101,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "pkg-linux-release-stable"
   }
 }
@@ -1112,7 +1112,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "pkg-mac-release-stable"
   }
 }
@@ -1123,7 +1123,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "pkg-win-release-stable"
   }
 }
@@ -1134,7 +1134,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-legacy-linux-release-x64-stable"
   }
 }
@@ -1145,7 +1145,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-linux-debug-simdbc64-stable"
   }
 }
@@ -1156,7 +1156,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-linux-release-simarm-stable"
   }
 }
@@ -1167,7 +1167,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-linux-release-simarm64-stable"
   }
 }
@@ -1178,7 +1178,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-linux-release-simdbc64-stable"
   }
 }
@@ -1189,7 +1189,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
   }
 }
@@ -1200,7 +1200,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-win-release-x64-stable"
   }
 }
@@ -1211,7 +1211,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-precomp-linux-release-simarm-stable"
   }
 }
@@ -1222,7 +1222,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-precomp-linux-release-simarm64-stable"
   }
 }
@@ -1233,7 +1233,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "luci.dart.ci"
     builder: "vm-kernel-precomp-win-release-x64-stable"
   }
 }

From c7be3003dc183d1f18bcf23cc6bb27c2932d4ecb Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 7 May 2018 07:52:52 +0000
Subject: [PATCH 116/826] Reland "Reland "[infra] Refactor cr-buildbucket.cfg""

This reverts commit 4d9e1dbca5ad3b69e9f99a24d2f42f5951912530.

Reason for revert: Added missing pool dimension.

Original change's description:
> Revert "Reland "[infra] Refactor cr-buildbucket.cfg""
>
> This reverts commit 627615b6caeaf66c7b0550db020d3cfff3a21f2f.
>
> Reason for revert: Tries to schedule builds in the wrong pool.
>
> Original change's description:
> > Reland "[infra] Refactor cr-buildbucket.cfg"
> >
> > This reverts commit c6a28cd8ef51fbfc1d151358f76762e19efcae85.
> >
> > Reason for revert: pools.cfg should be updated by now.
> >
> > Original change's description:
> > > Revert "[infra] Refactor cr-buildbucket.cfg"
> > >
> > > This reverts commit a8bb29dfb0f3493336a1a791e6aaa23eedc119bd.
> > >
> > > Reason for revert: Swarming hasn't picket up the new pools.cfg changes.
> > >
> > > Original change's description:
> > > > [infra] Refactor cr-buildbucket.cfg
> > > >
> > > > This is part 2 of 3 CLs to create a separate pool of bots for luci.dart.ci.
> > > >
> > > > * Add luci.dart.ci.sandbox bucket.
> > > > * Move CI builders that don't require privileged access to their own bucket.
> > > > * Use mixins to make it easier to change common builder properties.
> > > > * Sort CQ builders.
> > > > * Removed some unused CQ builders.
> > > >
> > > > Change-Id: I0e5fd2a616bbed86dfc01e1fb32c4fc924a2ac74
> > > > Reviewed-on: https://dart-review.googlesource.com/53101
> > > > Reviewed-by: Jonas Termansen <sortie@google.com>
> > >
> > > TBR=sortie@google.com,athom@google.com
> > >
> > > Change-Id: I5f5f292bd08ca136e98f3ff64ee96f20e5b05096
> > > No-Presubmit: true
> > > No-Tree-Checks: true
> > > No-Try: true
> > > Reviewed-on: https://dart-review.googlesource.com/53620
> > > Reviewed-by: Alexander Thomas <athom@google.com>
> > > Commit-Queue: Alexander Thomas <athom@google.com>
> >
> > TBR=sortie@google.com,athom@google.com
> >
> > # Not skipping CQ checks because original CL landed > 1 day ago.
> >
> > Change-Id: I3a86751105cc64effe62929a7ebd4e6f2e6fe9d0
> > Reviewed-on: https://dart-review.googlesource.com/53900
> > Reviewed-by: Alexander Thomas <athom@google.com>
>
> TBR=sortie@google.com,athom@google.com
>
> Change-Id: I72e2e734001fcb07eae4c578a276136e913fc93c
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://dart-review.googlesource.com/53901
> Reviewed-by: Alexander Thomas <athom@google.com>

TBR=sortie@google.com,athom@google.com

Change-Id: I228a4007cea7fd38892bda51683ef09b2b207df2
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/53902
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 508 ++++++++++++++++-------------------
 luci-milo.cfg      | 654 ++++++++++++++++++++++-----------------------
 luci-scheduler.cfg | 180 ++++++-------
 3 files changed, 652 insertions(+), 690 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index bbd1fb136ad6..65db5a7619e7 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -7,7 +7,7 @@
 # Please keep this list sorted by bucket name.
 
 acl_sets {
-  name: "waterfall"
+  name: "ci"
   acls {
     role: READER
     group: "all"
@@ -23,7 +23,7 @@ acl_sets {
 }
 
 acl_sets {
-  name: "tryserver"
+  name: "try"
   acls {
     role: READER
     group: "all"
@@ -43,11 +43,38 @@ builder_mixins {
   # todo(athom): how should this machine be defined?
 }
 
+builder_mixins {
+  name: "clobber"
+  recipe {
+    properties: "clobber:true"
+  }
+}
+
+builder_mixins {
+  name: "dart2js"
+  recipe {
+    name: "dart/dart2js_swarming"
+    properties_j: "shards:6"
+  }
+}
+
 builder_mixins {
   name: "debianpackage"
   # todo(athom): how should this machine be defined?
 }
 
+builder_mixins {
+  name: "mac"
+  dimensions: "os:Mac"
+}
+
+builder_mixins {
+  name: "sdk"
+  recipe {
+    name: "dart/sdk_swarming"
+  }
+}
+
 builder_mixins {
   name: "slow"
   execution_timeout_secs: 21600 # 6h
@@ -56,6 +83,13 @@ builder_mixins {
   }
 }
 
+builder_mixins {
+  name: "vm"
+  recipe {
+    name: "dart/dart_vm"
+  }
+}
+
 builder_mixins {
   name: "vm-kernel"
   recipe {
@@ -64,9 +98,15 @@ builder_mixins {
   }
 }
 
+builder_mixins {
+  name: "win"
+  dimensions: "os:Windows"
+}
+
 buckets {
+  # CI Builders that require special permissions
   name: "luci.dart.ci"
-  acl_sets: "waterfall"
+  acl_sets: "ci"
 
   swarming {
     hostname: "chromium-swarm.appspot.com"
@@ -92,21 +132,67 @@ buckets {
       }
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     }
+
+    # CI Builders that require privileged access
+    builders { name: "dart-sdk-linux" }
+    builders { name: "dart-sdk-mac" mixins: "mac" }
+    builders { name: "dart-sdk-win" mixins: "win" }
+    builders { name: "debianpackage-linux" mixins: "debianpackage" }
+    builders { name: "dart-sdk-linux-dev" }
+    builders { name: "dart-sdk-mac-dev" mixins: "mac" }
+    builders { name: "dart-sdk-win-dev" mixins: "win" }
+    builders { name: "debianpackage-linux-dev" mixins: "debianpackage" }
+    builders { name: "dart-sdk-linux-stable" }
+    builders { name: "dart-sdk-mac-stable" mixins: "mac" }
+    builders { name: "dart-sdk-win-stable" mixins: "win" }
+    builders { name: "debianpackage-linux-stable" mixins: "debianpackage" }
+  }
+}
+
+buckets {
+  # CI Builders that only require try permissions
+  name: "luci.dart.ci.sandbox"
+  acl_sets: "ci"
+
+  swarming {
+    hostname: "chromium-swarm.appspot.com"
+    url_format: "https://ci.chromium.org/swarming/task/{task_id}"
+    builder_defaults {
+      category: "Dart CI (Sandboxed)"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      build_numbers: YES
+      priority: 50
+      swarming_tags: "vpython:native-python-wrapper"
+      caches {
+        path: "browsers"
+        name: "browsers"
+      }
+      recipe {
+        repository: "https://chromium.googlesource.com/chromium/tools/build.git"
+        properties: "mastername:client.dart"
+        name: "dart/neo"
+        # TODO(vadimsh): make sure the service account has all necessary Git and
+        # GS permissions and remove this line, see https://crbug.com/776035
+        properties_j: "$kitchen:{\"git_auth\": false, \"devshell\": false}"
+      }
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+
+    # CI Builders for the master branch
     builders { name: "analyzer-analysis-server-linux" }
     builders { name: "analyzer-linux-release" }
-    builders { name: "analyzer-mac-release" dimensions: "os:Mac" }
+    builders { name: "analyzer-mac-release" mixins: "mac" }
     builders { name: "analyzer-strong-linux-release" }
-    builders { name: "analyzer-strong-mac-release" dimensions: "os:Mac" }
-    builders { name: "analyzer-strong-win-release" dimensions: "os:Windows" }
-    builders { name: "analyzer-win-release" dimensions: "os:Windows" }
+    builders { name: "analyzer-strong-mac-release" mixins: "mac" }
+    builders { name: "analyzer-strong-win-release" mixins: "win" }
+    builders { name: "analyzer-win-release" mixins: "win" }
     builders { name: "androidvm-linux-release-x64" mixins: "android" }
     builders { name: "app-linux-debug-x64" }
     builders { name: "app-linux-product-x64" }
     builders { name: "app-linux-release-x64" }
     builders { name: "cross-vm-linux-release-arm64" }
-    builders { name: "dart-sdk-linux" }
-    builders { name: "dart-sdk-mac" dimensions: "os:Mac" }
-    builders { name: "dart-sdk-win" dimensions: "os:Windows" }
     builders { name: "dart2js-csp-minified-linux-x64-drt" }
     builders { name: "dart2js-dumpinfo-linux-ia32-none" }
     builders { name: "dart2js-faststartup-linux-x64-chrome" }
@@ -116,27 +202,26 @@ buckets {
     builders { name: "dart2js-linux-x64-ff" }
     builders { name: "dart2js-linux-debug-ia32-none" }
     builders { name: "dart2js-linux-x64-drt" }
-    builders { name: "dart2js-mac-x64-chrome" dimensions: "os:Mac" }
-    builders { name: "dart2js-mac-x64-safari" dimensions: "os:Mac" }
+    builders { name: "dart2js-mac-x64-chrome" mixins: "mac" }
+    builders { name: "dart2js-mac-x64-safari" mixins: "mac" }
     builders { name: "dart2js-minified-linux-x64-d8" }
     builders { name: "dart2js-only-unittest-linux-ia32-none" }
-    builders { name: "dart2js-win-x64-chrome" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-x64-edge" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-x64-ff" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-x64-ie11" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-chrome" mixins: "win" }
+    builders { name: "dart2js-win-x64-edge" mixins: "win" }
+    builders { name: "dart2js-win-x64-ff" mixins: "win" }
+    builders { name: "dart2js-win-x64-ie11" mixins: "win" }
     builders { name: "ddc-linux-release-chrome" }
-    builders { name: "ddc-mac-release-chrome" dimensions: "os:Mac" }
-    builders { name: "ddc-win-release-chrome" dimensions: "os:Windows" }
-    builders { name: "debianpackage-linux" mixins: "debianpackage" }
-    builders { name: "front-end-mac-release-x64" dimensions: "os:Mac" }
+    builders { name: "ddc-mac-release-chrome" mixins: "mac" }
+    builders { name: "ddc-win-release-chrome" mixins: "win" }
+    builders { name: "front-end-mac-release-x64" mixins: "mac" }
     builders { name: "front-end-linux-release-x64" }
-    builders { name: "front-end-win-release-x64" dimensions: "os:Windows" }
+    builders { name: "front-end-win-release-x64" mixins: "win" }
     builders { name: "pkg-linux-release" }
-    builders { name: "pkg-mac-release" dimensions: "os:Mac" }
-    builders { name: "pkg-win-release" dimensions: "os:Windows" }
+    builders { name: "pkg-mac-release" mixins: "mac" }
+    builders { name: "pkg-win-release" mixins: "win" }
     builders { name: "pub-linux-release" }
-    builders { name: "pub-mac-release" dimensions: "os:Mac" }
-    builders { name: "pub-win-release" dimensions: "os:Windows" }
+    builders { name: "pub-mac-release" mixins: "mac" }
+    builders { name: "pub-win-release" mixins: "win" }
     builders { name: "precomp-linux-debug-x64" }
     builders { name: "precomp-linux-product-x64" }
     builders { name: "target-vm-linux-release-arm64" dimensions: "cpu:arm64" }
@@ -150,15 +235,15 @@ buckets {
     builders { name: "vm-kernel-linux-release-simarm64" }
     builders { name: "vm-kernel-linux-release-simdbc64" }
     builders { name: "vm-kernel-linux-release-x64" }
-    builders { name: "vm-kernel-mac-debug-x64" dimensions: "os:Mac" }
-    builders { name: "vm-kernel-mac-release-x64" dimensions: "os:Mac" }
-    builders { name: "vm-kernel-win-release-x64" dimensions: "os:Windows" }
+    builders { name: "vm-kernel-mac-debug-x64" mixins: "mac" }
+    builders { name: "vm-kernel-mac-release-x64" mixins: "mac" }
+    builders { name: "vm-kernel-win-release-x64" mixins: "win" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-debug-x64" mixins: "slow" }
     builders { name: "vm-kernel-precomp-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-release-simarm" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64" }
-    builders { name: "vm-kernel-precomp-win-release-x64" dimensions: "os:Windows" }
+    builders { name: "vm-kernel-precomp-win-release-x64" mixins: "win" }
     builders { name: "vm-linux-debug-ia32" }
     builders { name: "vm-linux-debug-simarm" }
     builders { name: "vm-linux-debug-x64" }
@@ -167,44 +252,43 @@ buckets {
     builders { name: "vm-linux-release-simarm" }
     builders { name: "vm-linux-release-simarm64" }
     builders { name: "vm-linux-release-x64" }
-    builders { name: "vm-mac-debug-ia32" dimensions: "os:Mac" }
-    builders { name: "vm-mac-debug-simdbc64" dimensions: "os:Mac" }
-    builders { name: "vm-mac-debug-x64" dimensions: "os:Mac" }
-    builders { name: "vm-mac-product-x64" dimensions: "os:Mac" }
-    builders { name: "vm-mac-release-ia32" dimensions: "os:Mac" }
-    builders { name: "vm-mac-release-simdbc64" dimensions: "os:Mac" }
-    builders { name: "vm-mac-release-x64" dimensions: "os:Mac" }
-    builders { name: "vm-noopt-mac-simarm64" dimensions: "os:Mac" }
+    builders { name: "vm-mac-debug-ia32" mixins: "mac" }
+    builders { name: "vm-mac-debug-simdbc64" mixins: "mac" }
+    builders { name: "vm-mac-debug-x64" mixins: "mac" }
+    builders { name: "vm-mac-product-x64" mixins: "mac" }
+    builders { name: "vm-mac-release-ia32" mixins: "mac" }
+    builders { name: "vm-mac-release-simdbc64" mixins: "mac" }
+    builders { name: "vm-mac-release-x64" mixins: "mac" }
+    builders { name: "vm-noopt-mac-simarm64" mixins: "mac" }
     builders { name: "vm-optcounter-threshold-linux-release-ia32" }
     builders { name: "vm-optcounter-threshold-linux-release-x64" }
     builders { name: "vm-precomp-android-release" }
-    builders { name: "vm-precomp-win-simarm64" dimensions: "os:Windows" }
+    builders { name: "vm-precomp-win-simarm64" mixins: "win" }
     builders { name: "vm-reload-linux-debug-x64" }
     builders { name: "vm-reload-linux-release-x64" }
-    builders { name: "vm-reload-mac-debug-simdbc64" dimensions: "os:Mac" }
-    builders { name: "vm-reload-mac-release-simdbc64" dimensions: "os:Mac" }
+    builders { name: "vm-reload-mac-debug-simdbc64" mixins: "mac" }
+    builders { name: "vm-reload-mac-release-simdbc64" mixins: "mac" }
     builders { name: "vm-reload-rollback-linux-debug-x64" }
     builders { name: "vm-reload-rollback-linux-release-x64" }
-    builders { name: "vm-win-debug-ia32" dimensions: "os:Windows" }
-    builders { name: "vm-win-debug-x64" dimensions: "os:Windows" }
-    builders { name: "vm-win-product-x64" dimensions: "os:Windows" }
-    builders { name: "vm-win-release-ia32" dimensions: "os:Windows" }
-    builders { name: "vm-win-release-x64" dimensions: "os:Windows" }
+    builders { name: "vm-win-debug-ia32" mixins: "win" }
+    builders { name: "vm-win-debug-x64" mixins: "win" }
+    builders { name: "vm-win-product-x64" mixins: "win" }
+    builders { name: "vm-win-release-ia32" mixins: "win" }
+    builders { name: "vm-win-release-x64" mixins: "win" }
+
+    # CI Builders for the dev branch
     builders { name: "analyzer-analysis-server-linux-dev" }
     builders { name: "analyzer-linux-release-dev" }
-    builders { name: "analyzer-mac-release-dev" dimensions: "os:Mac" }
+    builders { name: "analyzer-mac-release-dev" mixins: "mac" }
     builders { name: "analyzer-strong-linux-release-dev" }
-    builders { name: "analyzer-strong-mac-release-dev" dimensions: "os:Mac" }
-    builders { name: "analyzer-strong-win-release-dev" dimensions: "os:Windows" }
-    builders { name: "analyzer-win-release-dev" dimensions: "os:Windows" }
+    builders { name: "analyzer-strong-mac-release-dev" mixins: "mac" }
+    builders { name: "analyzer-strong-win-release-dev" mixins: "win" }
+    builders { name: "analyzer-win-release-dev" mixins: "win" }
     builders { name: "androidvm-linux-release-x64-dev" mixins: "android" }
     builders { name: "app-linux-debug-x64-dev" }
     builders { name: "app-linux-product-x64-dev" }
     builders { name: "app-linux-release-x64-dev" }
     builders { name: "cross-vm-linux-release-arm64-dev" }
-    builders { name: "dart-sdk-linux-dev" }
-    builders { name: "dart-sdk-mac-dev" dimensions: "os:Mac" }
-    builders { name: "dart-sdk-win-dev" dimensions: "os:Windows" }
     builders { name: "dart2js-csp-minified-linux-x64-drt-dev" }
     builders { name: "dart2js-dumpinfo-linux-ia32-none-dev" }
     builders { name: "dart2js-faststartup-linux-x64-chrome-dev" }
@@ -214,27 +298,26 @@ buckets {
     builders { name: "dart2js-linux-x64-ff-dev" }
     builders { name: "dart2js-linux-debug-ia32-none-dev" }
     builders { name: "dart2js-linux-x64-drt-dev" }
-    builders { name: "dart2js-mac-x64-chrome-dev" dimensions: "os:Mac" }
-    builders { name: "dart2js-mac-x64-safari-dev" dimensions: "os:Mac" }
+    builders { name: "dart2js-mac-x64-chrome-dev" mixins: "mac" }
+    builders { name: "dart2js-mac-x64-safari-dev" mixins: "mac" }
     builders { name: "dart2js-minified-linux-x64-d8-dev" }
     builders { name: "dart2js-only-unittest-linux-ia32-none-dev" }
-    builders { name: "dart2js-win-x64-chrome-dev" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-x64-edge-dev" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-x64-ff-dev" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-x64-ie11-dev" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-chrome-dev" mixins: "win" }
+    builders { name: "dart2js-win-x64-edge-dev" mixins: "win" }
+    builders { name: "dart2js-win-x64-ff-dev" mixins: "win" }
+    builders { name: "dart2js-win-x64-ie11-dev" mixins: "win" }
     builders { name: "ddc-linux-release-chrome-dev" }
-    builders { name: "ddc-mac-release-chrome-dev" dimensions: "os:Mac" }
-    builders { name: "ddc-win-release-chrome-dev" dimensions: "os:Windows" }
-    builders { name: "debianpackage-linux-dev" mixins: "debianpackage" }
-    builders { name: "front-end-mac-release-x64-dev" dimensions: "os:Mac" }
+    builders { name: "ddc-mac-release-chrome-dev" mixins: "mac" }
+    builders { name: "ddc-win-release-chrome-dev" mixins: "win" }
+    builders { name: "front-end-mac-release-x64-dev" mixins: "mac" }
     builders { name: "front-end-linux-release-x64-dev" }
-    builders { name: "front-end-win-release-x64-dev" dimensions: "os:Windows" }
+    builders { name: "front-end-win-release-x64-dev" mixins: "win" }
     builders { name: "pkg-linux-release-dev" }
-    builders { name: "pkg-mac-release-dev" dimensions: "os:Mac" }
-    builders { name: "pkg-win-release-dev" dimensions: "os:Windows" }
+    builders { name: "pkg-mac-release-dev" mixins: "mac" }
+    builders { name: "pkg-win-release-dev" mixins: "win" }
     builders { name: "pub-linux-release-dev" }
-    builders { name: "pub-mac-release-dev" dimensions: "os:Mac" }
-    builders { name: "pub-win-release-dev" dimensions: "os:Windows" }
+    builders { name: "pub-mac-release-dev" mixins: "mac" }
+    builders { name: "pub-win-release-dev" mixins: "win" }
     builders { name: "precomp-linux-debug-x64-dev" }
     builders { name: "precomp-linux-product-x64-dev" }
     builders { name: "target-vm-linux-release-arm64-dev" dimensions: "cpu:arm64" }
@@ -248,15 +331,15 @@ buckets {
     builders { name: "vm-kernel-linux-release-simarm64-dev" }
     builders { name: "vm-kernel-linux-release-simdbc64-dev" }
     builders { name: "vm-kernel-linux-release-x64-dev" }
-    builders { name: "vm-kernel-mac-debug-x64-dev" dimensions: "os:Mac" }
-    builders { name: "vm-kernel-mac-release-x64-dev" dimensions: "os:Mac" }
-    builders { name: "vm-kernel-win-release-x64-dev" dimensions: "os:Windows" }
+    builders { name: "vm-kernel-mac-debug-x64-dev" mixins: "mac" }
+    builders { name: "vm-kernel-mac-release-x64-dev" mixins: "mac" }
+    builders { name: "vm-kernel-win-release-x64-dev" mixins: "win" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-dev" mixins: "slow" }
     builders { name: "vm-kernel-precomp-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-dev" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-dev" }
-    builders { name: "vm-kernel-precomp-win-release-x64-dev" dimensions: "os:Windows" }
+    builders { name: "vm-kernel-precomp-win-release-x64-dev" mixins: "win" }
     builders { name: "vm-linux-debug-ia32-dev" }
     builders { name: "vm-linux-debug-simarm-dev" }
     builders { name: "vm-linux-debug-x64-dev" }
@@ -265,44 +348,43 @@ buckets {
     builders { name: "vm-linux-release-simarm-dev" }
     builders { name: "vm-linux-release-simarm64-dev" }
     builders { name: "vm-linux-release-x64-dev" }
-    builders { name: "vm-mac-debug-ia32-dev" dimensions: "os:Mac" }
-    builders { name: "vm-mac-debug-simdbc64-dev" dimensions: "os:Mac" }
-    builders { name: "vm-mac-debug-x64-dev" dimensions: "os:Mac" }
-    builders { name: "vm-mac-product-x64-dev" dimensions: "os:Mac" }
-    builders { name: "vm-mac-release-ia32-dev" dimensions: "os:Mac" }
-    builders { name: "vm-mac-release-simdbc64-dev" dimensions: "os:Mac" }
-    builders { name: "vm-mac-release-x64-dev" dimensions: "os:Mac" }
-    builders { name: "vm-noopt-mac-simarm64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-mac-debug-ia32-dev" mixins: "mac" }
+    builders { name: "vm-mac-debug-simdbc64-dev" mixins: "mac" }
+    builders { name: "vm-mac-debug-x64-dev" mixins: "mac" }
+    builders { name: "vm-mac-product-x64-dev" mixins: "mac" }
+    builders { name: "vm-mac-release-ia32-dev" mixins: "mac" }
+    builders { name: "vm-mac-release-simdbc64-dev" mixins: "mac" }
+    builders { name: "vm-mac-release-x64-dev" mixins: "mac" }
+    builders { name: "vm-noopt-mac-simarm64-dev" mixins: "mac" }
     builders { name: "vm-optcounter-threshold-linux-release-ia32-dev" }
     builders { name: "vm-optcounter-threshold-linux-release-x64-dev" }
     builders { name: "vm-precomp-android-release-dev" }
-    builders { name: "vm-precomp-win-simarm64-dev" dimensions: "os:Windows" }
+    builders { name: "vm-precomp-win-simarm64-dev" mixins: "win" }
     builders { name: "vm-reload-linux-debug-x64-dev" }
     builders { name: "vm-reload-linux-release-x64-dev" }
-    builders { name: "vm-reload-mac-debug-simdbc64-dev" dimensions: "os:Mac" }
-    builders { name: "vm-reload-mac-release-simdbc64-dev" dimensions: "os:Mac" }
+    builders { name: "vm-reload-mac-debug-simdbc64-dev" mixins: "mac" }
+    builders { name: "vm-reload-mac-release-simdbc64-dev" mixins: "mac" }
     builders { name: "vm-reload-rollback-linux-debug-x64-dev" }
     builders { name: "vm-reload-rollback-linux-release-x64-dev" }
-    builders { name: "vm-win-debug-ia32-dev" dimensions: "os:Windows" }
-    builders { name: "vm-win-debug-x64-dev" dimensions: "os:Windows" }
-    builders { name: "vm-win-product-x64-dev" dimensions: "os:Windows" }
-    builders { name: "vm-win-release-ia32-dev" dimensions: "os:Windows" }
-    builders { name: "vm-win-release-x64-dev" dimensions: "os:Windows" }
+    builders { name: "vm-win-debug-ia32-dev" mixins: "win" }
+    builders { name: "vm-win-debug-x64-dev" mixins: "win" }
+    builders { name: "vm-win-product-x64-dev" mixins: "win" }
+    builders { name: "vm-win-release-ia32-dev" mixins: "win" }
+    builders { name: "vm-win-release-x64-dev" mixins: "win" }
+
+    # CI Builders for the stable branch
     builders { name: "analyzer-analysis-server-linux-stable" }
     builders { name: "analyzer-linux-release-stable" }
-    builders { name: "analyzer-mac-release-stable" dimensions: "os:Mac" }
+    builders { name: "analyzer-mac-release-stable" mixins: "mac" }
     builders { name: "analyzer-strong-linux-release-stable" }
-    builders { name: "analyzer-strong-mac-release-stable" dimensions: "os:Mac" }
-    builders { name: "analyzer-strong-win-release-stable" dimensions: "os:Windows" }
-    builders { name: "analyzer-win-release-stable" dimensions: "os:Windows" }
+    builders { name: "analyzer-strong-mac-release-stable" mixins: "mac" }
+    builders { name: "analyzer-strong-win-release-stable" mixins: "win" }
+    builders { name: "analyzer-win-release-stable" mixins: "win" }
     builders { name: "androidvm-linux-release-x64-stable" mixins: "android" }
     builders { name: "app-linux-debug-x64-stable" }
     builders { name: "app-linux-product-x64-stable" }
     builders { name: "app-linux-release-x64-stable" }
     builders { name: "cross-vm-linux-release-arm64-stable" }
-    builders { name: "dart-sdk-linux-stable" }
-    builders { name: "dart-sdk-mac-stable" dimensions: "os:Mac" }
-    builders { name: "dart-sdk-win-stable" dimensions: "os:Windows" }
     builders { name: "dart2js-csp-minified-linux-x64-drt-stable" }
     builders { name: "dart2js-dumpinfo-linux-ia32-none-stable" }
     builders { name: "dart2js-faststartup-linux-x64-chrome-stable" }
@@ -312,27 +394,26 @@ buckets {
     builders { name: "dart2js-linux-x64-ff-stable" }
     builders { name: "dart2js-linux-debug-ia32-none-stable" }
     builders { name: "dart2js-linux-x64-drt-stable" }
-    builders { name: "dart2js-mac-x64-chrome-stable" dimensions: "os:Mac" }
-    builders { name: "dart2js-mac-x64-safari-stable" dimensions: "os:Mac" }
+    builders { name: "dart2js-mac-x64-chrome-stable" mixins: "mac" }
+    builders { name: "dart2js-mac-x64-safari-stable" mixins: "mac" }
     builders { name: "dart2js-minified-linux-x64-d8-stable" }
     builders { name: "dart2js-only-unittest-linux-ia32-none-stable" }
-    builders { name: "dart2js-win-x64-chrome-stable" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-x64-edge-stable" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-x64-ff-stable" dimensions: "os:Windows" }
-    builders { name: "dart2js-win-x64-ie11-stable" dimensions: "os:Windows" }
+    builders { name: "dart2js-win-x64-chrome-stable" mixins: "win" }
+    builders { name: "dart2js-win-x64-edge-stable" mixins: "win" }
+    builders { name: "dart2js-win-x64-ff-stable" mixins: "win" }
+    builders { name: "dart2js-win-x64-ie11-stable" mixins: "win" }
     builders { name: "ddc-linux-release-chrome-stable" }
-    builders { name: "ddc-mac-release-chrome-stable" dimensions: "os:Mac" }
-    builders { name: "ddc-win-release-chrome-stable" dimensions: "os:Windows" }
-    builders { name: "debianpackage-linux-stable" mixins: "debianpackage" }
-    builders { name: "front-end-mac-release-x64-stable" dimensions: "os:Mac" }
+    builders { name: "ddc-mac-release-chrome-stable" mixins: "mac" }
+    builders { name: "ddc-win-release-chrome-stable" mixins: "win" }
+    builders { name: "front-end-mac-release-x64-stable" mixins: "mac" }
     builders { name: "front-end-linux-release-x64-stable" }
-    builders { name: "front-end-win-release-x64-stable" dimensions: "os:Windows" }
+    builders { name: "front-end-win-release-x64-stable" mixins: "win" }
     builders { name: "pkg-linux-release-stable" }
-    builders { name: "pkg-mac-release-stable" dimensions: "os:Mac" }
-    builders { name: "pkg-win-release-stable" dimensions: "os:Windows" }
+    builders { name: "pkg-mac-release-stable" mixins: "mac" }
+    builders { name: "pkg-win-release-stable" mixins: "win" }
     builders { name: "pub-linux-release-stable" }
-    builders { name: "pub-mac-release-stable" dimensions: "os:Mac" }
-    builders { name: "pub-win-release-stable" dimensions: "os:Windows" }
+    builders { name: "pub-mac-release-stable" mixins: "mac" }
+    builders { name: "pub-win-release-stable" mixins: "win" }
     builders { name: "precomp-linux-debug-x64-stable" }
     builders { name: "precomp-linux-product-x64-stable" }
     builders { name: "target-vm-linux-release-arm64-stable" dimensions: "cpu:arm64" }
@@ -346,15 +427,15 @@ buckets {
     builders { name: "vm-kernel-linux-release-simarm64-stable" }
     builders { name: "vm-kernel-linux-release-simdbc64-stable" }
     builders { name: "vm-kernel-linux-release-x64-stable" }
-    builders { name: "vm-kernel-mac-debug-x64-stable" dimensions: "os:Mac" }
-    builders { name: "vm-kernel-mac-release-x64-stable" dimensions: "os:Mac" }
-    builders { name: "vm-kernel-win-release-x64-stable" dimensions: "os:Windows" }
+    builders { name: "vm-kernel-mac-debug-x64-stable" mixins: "mac" }
+    builders { name: "vm-kernel-mac-release-x64-stable" mixins: "mac" }
+    builders { name: "vm-kernel-win-release-x64-stable" mixins: "win" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-stable" mixins: "slow" }
     builders { name: "vm-kernel-precomp-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-stable" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-stable" }
-    builders { name: "vm-kernel-precomp-win-release-x64-stable" dimensions: "os:Windows" }
+    builders { name: "vm-kernel-precomp-win-release-x64-stable" mixins: "win" }
     builders { name: "vm-linux-debug-ia32-stable" }
     builders { name: "vm-linux-debug-simarm-stable" }
     builders { name: "vm-linux-debug-x64-stable" }
@@ -363,41 +444,41 @@ buckets {
     builders { name: "vm-linux-release-simarm-stable" }
     builders { name: "vm-linux-release-simarm64-stable" }
     builders { name: "vm-linux-release-x64-stable" }
-    builders { name: "vm-mac-debug-ia32-stable" dimensions: "os:Mac" }
-    builders { name: "vm-mac-debug-simdbc64-stable" dimensions: "os:Mac" }
-    builders { name: "vm-mac-debug-x64-stable" dimensions: "os:Mac" }
-    builders { name: "vm-mac-product-x64-stable" dimensions: "os:Mac" }
-    builders { name: "vm-mac-release-ia32-stable" dimensions: "os:Mac" }
-    builders { name: "vm-mac-release-simdbc64-stable" dimensions: "os:Mac" }
-    builders { name: "vm-mac-release-x64-stable" dimensions: "os:Mac" }
-    builders { name: "vm-noopt-mac-simarm64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-mac-debug-ia32-stable" mixins: "mac" }
+    builders { name: "vm-mac-debug-simdbc64-stable" mixins: "mac" }
+    builders { name: "vm-mac-debug-x64-stable" mixins: "mac" }
+    builders { name: "vm-mac-product-x64-stable" mixins: "mac" }
+    builders { name: "vm-mac-release-ia32-stable" mixins: "mac" }
+    builders { name: "vm-mac-release-simdbc64-stable" mixins: "mac" }
+    builders { name: "vm-mac-release-x64-stable" mixins: "mac" }
+    builders { name: "vm-noopt-mac-simarm64-stable" mixins: "mac" }
     builders { name: "vm-optcounter-threshold-linux-release-ia32-stable" }
     builders { name: "vm-optcounter-threshold-linux-release-x64-stable" }
     builders { name: "vm-precomp-android-release-stable" }
-    builders { name: "vm-precomp-win-simarm64-stable" dimensions: "os:Windows" }
+    builders { name: "vm-precomp-win-simarm64-stable" mixins: "win" }
     builders { name: "vm-reload-linux-debug-x64-stable" }
     builders { name: "vm-reload-linux-release-x64-stable" }
-    builders { name: "vm-reload-mac-debug-simdbc64-stable" dimensions: "os:Mac" }
-    builders { name: "vm-reload-mac-release-simdbc64-stable" dimensions: "os:Mac" }
+    builders { name: "vm-reload-mac-debug-simdbc64-stable" mixins: "mac" }
+    builders { name: "vm-reload-mac-release-simdbc64-stable" mixins: "mac" }
     builders { name: "vm-reload-rollback-linux-debug-x64-stable" }
     builders { name: "vm-reload-rollback-linux-release-x64-stable" }
-    builders { name: "vm-win-debug-ia32-stable" dimensions: "os:Windows" }
-    builders { name: "vm-win-debug-x64-stable" dimensions: "os:Windows" }
-    builders { name: "vm-win-product-x64-stable" dimensions: "os:Windows" }
-    builders { name: "vm-win-release-ia32-stable" dimensions: "os:Windows" }
-    builders { name: "vm-win-release-x64-stable" dimensions: "os:Windows" }
+    builders { name: "vm-win-debug-ia32-stable" mixins: "win" }
+    builders { name: "vm-win-debug-x64-stable" mixins: "win" }
+    builders { name: "vm-win-product-x64-stable" mixins: "win" }
+    builders { name: "vm-win-release-ia32-stable" mixins: "win" }
+    builders { name: "vm-win-release-x64-stable" mixins: "win" }
   }
 }
 
 buckets {
   name: "luci.dart.try"
-  acl_sets: "tryserver"
+  acl_sets: "try"
 
   swarming {
     hostname: "chromium-swarm.appspot.com"
     url_format: "https://ci.chromium.org/swarming/task/{task_id}"
     builder_defaults {
-      category: "Dart CQ"
+      category: "Dart Try"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       build_numbers: YES
@@ -417,148 +498,29 @@ buckets {
       }
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
-    builders {
-      name: "benchmark-linux-try"
-    }
-    builders {
-      name: "front-end-linux-release-x64-try"
-    }
-    builders {
-      name: "vm-canary-linux-debug-try"
-    }
-    builders {
-      name: "vm-linux-release-x64-try"
-    }
-    builders {
-      name: "vm-linux-debug-x64-try"
-    }
-    builders {
-      name: "vm-mac-release-x64-try"
-      dimensions: "os:Mac"
-    }
-    builders {
-      name: "vm-mac-debug-x64-try"
-      dimensions: "os:Mac"
-    }
-    builders {
-      name: "vm-win-release-x64-try"
-      dimensions: "os:Windows"
-    }
-    builders {
-      name: "vm-win-debug-x64-try"
-      dimensions: "os:Windows"
-    }
-    builders {
-      name: "vm-linux-product-x64-try"
-      recipe {
-        name: "dart/dart_vm"
-      }
-    }
-    builders {
-      name: "vm-kernel-legacy-linux-release-x64-try"
-    }
+
+    # git cl try builders
+    builders { name: "cl-linux-try" }
+    builders { name: "cl-mac-try" mixins: "mac" }
+    builders { name: "cl-win-try" mixins: "win" }
+
+    # CQ builders
+    builders { name: "analyzer-linux-release-strong-hostchecked-try" }
+    builders { name: "benchmark-linux-try" }
+    builders { name: "dart-sdk-windows-try" mixins: "sdk" mixins: "win" }
+    builders { name: "dart2js-linux-d8-hostchecked-try" mixins: "dart2js" }
+    builders { name: "dart2js-linux-d8-kernel-minified-try" mixins: "dart2js" }
+    builders { name: "dart2js-linux-none-only-unittest-try" mixins: "dart2js" }
+    builders { name: "dart2js-linux-x64-chrome-try" }
+    builders { name: "ddc-linux-release-chrome-try" mixins: "clobber" }
+    builders { name: "front-end-linux-release-x64-try" }
+    builders { name: "pkg-linux-release-try" }
+    builders { name: "vm-canary-linux-debug-try" }
+    builders { name: "vm-kernel-legacy-linux-release-x64-try" }
     builders { name: "vm-kernel-linux-release-x64-try" }
-    builders {
-      name: "vm-kernel-linux-debug-x64-try"
-      mixins: "vm-kernel"
-    }
-    builders {
-      name: "vm-kernel-mac-release-x64-try"
-      dimensions: "os:Mac"
-      mixins: "vm-kernel"
-    }
-    builders {
-      name: "vm-kernel-mac-debug-x64-try"
-      mixins: "vm-kernel"
-    }
-    builders {
-      name: "dart2js-linux-x64-chrome-try"
-    }
-    builders {
-      name: "dart-sdk-linux-try"
-      recipe {
-        name: "dart/sdk_swarming"
-      }
-    }
-    builders {
-      name: "dart-sdk-mac-try"
-      dimensions: "os:Mac"
-      recipe {
-        name: "dart/sdk_swarming"
-      }
-    }
-    builders {
-      name: "dart-sdk-windows-try"
-      dimensions: "os:Windows"
-      recipe {
-        name: "dart/sdk_swarming"
-      }
-    }
-    builders {
-      name: "dart2js-linux-d8-hostchecked-unittest-try"
-      recipe {
-        name: "dart/dart2js_swarming"
-        properties_j: "shards:6"
-      }
-    }
-    builders {
-      name: "dart2js-linux-d8-hostchecked-try"
-      recipe {
-        name: "dart/dart2js_swarming"
-        properties_j: "shards:6"
-      }
-    }
-    builders {
-      name: "dart2js-linux-none-only-unittest-try"
-      recipe {
-        name: "dart/dart2js_swarming"
-      }
-    }
-    builders {
-      name: "dart2js-linux-d8-kernel-minified-try"
-      recipe {
-        name: "dart/dart2js_swarming"
-        properties_j: "shards:6"
-      }
-    }
-    builders {
-      name: "dart2js-win10-ie11-try"
-      dimensions: "os:Windows-10"
-      recipe {
-        name: "dart/dart2js_swarming"
-        properties_j: "shards:6"
-      }
-    }
-    builders {
-      name: "dart2js-win10-edge-try"
-      dimensions: "os:Windows-10"
-      recipe {
-        name: "dart/dart2js_swarming"
-        properties_j: "shards:6"
-      }
-    }
-    builders {
-      name: "ddc-linux-release-chrome-try"
-      recipe {
-        properties: "clobber:true"
-      }
-    }
-    builders {
-      name: "analyzer-linux-release-strong-hostchecked-try"
-    }
-    builders {
-      name: "pkg-linux-release-try"
-    }
-    builders {
-      name: "cl-linux-try"
-    }
-    builders {
-      name: "cl-win-try"
-      dimensions: "os:Windows-10"
-    }
-    builders {
-      name: "cl-mac-try"
-      dimensions: "os:Mac"
-    }
+    builders { name: "vm-kernel-mac-release-x64-try" mixins: "mac" mixins: "vm-kernel" }
+    builders { name: "vm-linux-product-x64-try" mixins: "vm" }
+    builders { name: "vm-linux-release-x64-try" }
+    builders { name: "vm-mac-release-x64-try" mixins: "mac" }
   }
 }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 505ee02781ac..819df8e7c636 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -7,22 +7,22 @@ consoles: {
   ref: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
     category: "fasta"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
     category: "fasta"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
     category: "fasta"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64"
     category: "fasta"
     short_name: "vm"
   }
@@ -153,22 +153,22 @@ consoles: {
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64"
     category: "vm|kernel"
     short_name: "dbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64"
     category: "vm|kernel"
     short_name: "rbc"
   }
@@ -191,12 +191,12 @@ consoles: {
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
     category: "vm|kernel"
     short_name: "oc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
     category: "vm|kernel"
     short_name: "wr"
   }
@@ -249,12 +249,12 @@ consoles: {
     short_name: "8d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
@@ -295,7 +295,7 @@ consoles: {
     short_name: "6r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
@@ -529,37 +529,37 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
     category: "analyzer"
     short_name: "as"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
     category: "analyzer"
     short_name: "awr"
   }
@@ -582,27 +582,27 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "fs"
   }
@@ -644,7 +644,7 @@ consoles: {
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
@@ -667,7 +667,7 @@ consoles: {
     short_name: "3m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
@@ -710,17 +710,17 @@ consoles: {
 #    short_name: "ie"
 #  }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
     category: "pkg"
     short_name: "w"
   }
@@ -776,22 +776,22 @@ consoles: {
   ref: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
     category: "fasta"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
     category: "fasta"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
     category: "fasta"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64"
     category: "fasta"
     short_name: "vm"
   }
@@ -869,37 +869,37 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
     category: "analyzer"
     short_name: "as"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
     category: "analyzer"
     short_name: "awr"
   }
@@ -922,17 +922,17 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
   }
@@ -961,17 +961,17 @@ consoles: {
     short_name: "4l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "fs"
   }
 #  builders {
-#    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff"
+#    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-ff"
 #    category: "dart2js|ff"
 #    short_name: "l"
 #  }
@@ -982,7 +982,7 @@ consoles: {
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
@@ -1005,7 +1005,7 @@ consoles: {
     short_name: "3m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
@@ -1048,17 +1048,17 @@ consoles: {
 #    short_name: "ie"
 #  }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
     category: "pkg"
     short_name: "w"
   }
@@ -1201,22 +1201,22 @@ consoles: {
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64"
     category: "vm|kernel"
     short_name: "dbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64"
     category: "vm|kernel"
     short_name: "rbc"
   }
@@ -1239,12 +1239,12 @@ consoles: {
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
     category: "vm|kernel"
     short_name: "oc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
     category: "vm|kernel"
     short_name: "wr"
   }
@@ -1297,12 +1297,12 @@ consoles: {
     short_name: "8d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
@@ -1343,7 +1343,7 @@ consoles: {
     short_name: "6r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
@@ -1543,347 +1543,347 @@ consoles: {
   ref: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
     category: "fasta"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
     category: "fasta"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
     category: "fasta"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64"
     category: "fasta"
     short_name: "vm"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-ia32"
     category: "vm|debug"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simarm"
     category: "vm|simarm"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64"
     category: "vm|debug"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-ia32"
     category: "vm|release"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm"
     category: "vm|simarm"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64"
     category: "vm|simarm"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-x64"
     category: "vm|release"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-ia32"
     category: "vm|debug"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-simdbc64"
     category: "vm|debug"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64"
     category: "vm|debug"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-ia32"
     category: "vm|release"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-simdbc64"
     category: "vm|release"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64"
     category: "vm|release"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-ia32"
     category: "vm|debug"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64"
     category: "vm|debug"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-release-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-ia32"
     category: "vm|release"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-x64"
     category: "vm|release"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/app-linux-debug-x64"
     category: "vm|app"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/app-linux-product-x64"
     category: "vm|app"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/app-linux-release-x64"
     category: "vm|app"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
     category: "vm|kernel"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64"
     category: "vm|kernel"
     short_name: "dbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64"
     category: "vm|kernel"
     short_name: "rbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
     category: "vm|kernel"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
     category: "vm|kernel"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
     category: "vm|kernel"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
     category: "vm|kernel"
     short_name: "oc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
     category: "vm|kernel"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
     category: "vm|kernel-precomp"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
     category: "vm|kernel-precomp"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
     category: "vm|misc"
     short_name: "cra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64"
     category: "vm|misc"
     short_name: "tra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-linux-release-x64"
     category: "vm|misc"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-ia32"
     category: "vm|misc"
     short_name: "o32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-x64"
     category: "vm|misc"
     short_name: "o64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-debug-x64"
     category: "vm|precomp"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-product-x64"
     category: "vm|precomp"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-noopt-mac-simarm64"
     category: "vm|precomp"
     short_name: "no"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-precomp-android-release"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-android-release"
     category: "vm|precomp"
     short_name: "and"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-win-simarm64"
     category: "vm|precomp"
     short_name: "wsi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-product-x64"
     category: "vm|product"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-product-x64"
     category: "vm|product"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-product-x64"
     category: "vm|product"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-debug-x64"
     category: "vm|reload"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-release-x64"
     category: "vm|reload"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-debug-simdbc64"
     category: "vm|reload"
     short_name: "mds"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-release-simdbc64"
     category: "vm|reload"
     short_name: "mrs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-debug-x64"
     category: "vm|reload"
     short_name: "dro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-release-x64"
     category: "vm|reload"
     short_name: "rro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-ia32-d8"
     category: "dart2js|d8"
     short_name: "hc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-x64-d8"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-linux-x64-d8"
     category: "dart2js|d8"
     short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-only-unittest-linux-ia32-none"
     category: "dart2js|misc"
     short_name: "ut"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-dumpinfo-linux-ia32-none"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-dumpinfo-linux-ia32-none"
     category: "dart2js|misc"
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
     category: "analyzer"
     short_name: "aas"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
     category: "analyzer"
     short_name: "awr"
   }
@@ -1903,82 +1903,82 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "fs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-ff"
     category: "dart2js|ff"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-safari"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-safari"
     category: "dart2js|safari"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-edge"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-edge"
     category: "dart2js|ms"
     short_name: "ed"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ff"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ff"
     category: "dart2js|ff"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ie11"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ie11"
     category: "dart2js|ms"
     short_name: "ie"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
     category: "pkg"
     short_name: "w"
   }
@@ -1988,7 +1988,7 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/versionchecker-linux"
+    name: "buildbucket/luci.dart.ci.sandbox/versionchecker-linux"
     category: "misc"
     short_name: "vc"
   }
@@ -2032,347 +2032,347 @@ consoles: {
   ref: "refs/heads/dev"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-dev"
     category: "fasta"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-dev"
     category: "fasta"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-win-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-dev"
     category: "fasta"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64-dev"
     category: "fasta"
     short_name: "vm"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-ia32-dev"
     category: "vm|debug"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simarm-dev"
     category: "vm|simarm"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64-dev"
     category: "vm|debug"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-ia32-dev"
     category: "vm|release"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm-dev"
     category: "vm|simarm"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64-dev"
     category: "vm|simarm"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-x64-dev"
     category: "vm|release"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-ia32-dev"
     category: "vm|debug"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-simdbc64-dev"
     category: "vm|debug"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64-dev"
     category: "vm|debug"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-ia32-dev"
     category: "vm|release"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-simdbc64-dev"
     category: "vm|release"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64-dev"
     category: "vm|release"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-ia32-dev"
     category: "vm|debug"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64-dev"
     category: "vm|debug"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-release-ia32-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-ia32-dev"
     category: "vm|release"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-x64-dev"
     category: "vm|release"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/app-linux-debug-x64-dev"
     category: "vm|app"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-product-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/app-linux-product-x64-dev"
     category: "vm|app"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/app-linux-release-x64-dev"
     category: "vm|app"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-dev"
     category: "vm|kernel"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64-dev"
     category: "vm|kernel"
     short_name: "dbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-dev"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-dev"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64-dev"
     category: "vm|kernel"
     short_name: "rbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-dev"
     category: "vm|kernel"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-dev"
     category: "vm|kernel"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-dev"
     category: "vm|kernel"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-dev"
     category: "vm|kernel"
     short_name: "oc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-dev"
     category: "vm|kernel"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-dev"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-dev"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-dev"
     category: "vm|misc"
     short_name: "cra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64-dev"
     category: "vm|misc"
     short_name: "tra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-linux-release-x64-dev"
     category: "vm|misc"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-ia32-dev"
     category: "vm|misc"
     short_name: "o32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-x64-dev"
     category: "vm|misc"
     short_name: "o64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-debug-x64-dev"
     category: "vm|precomp"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-product-x64-dev"
     category: "vm|precomp"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-noopt-mac-simarm64-dev"
     category: "vm|precomp"
     short_name: "no"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-precomp-android-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-android-release-dev"
     category: "vm|precomp"
     short_name: "and"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-win-simarm64-dev"
     category: "vm|precomp"
     short_name: "wsi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-product-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-product-x64-dev"
     category: "vm|product"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-product-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-product-x64-dev"
     category: "vm|product"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-product-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-product-x64-dev"
     category: "vm|product"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-debug-x64-dev"
     category: "vm|reload"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-release-x64-dev"
     category: "vm|reload"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-debug-simdbc64-dev"
     category: "vm|reload"
     short_name: "mds"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-release-simdbc64-dev"
     category: "vm|reload"
     short_name: "mrs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-debug-x64-dev"
     category: "vm|reload"
     short_name: "dro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-release-x64-dev"
     category: "vm|reload"
     short_name: "rro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-ia32-d8-dev"
     category: "dart2js|d8"
     short_name: "hc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-x64-d8-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-linux-x64-d8-dev"
     category: "dart2js|d8"
     short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-only-unittest-linux-ia32-none-dev"
     category: "dart2js|misc"
     short_name: "ut"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-dumpinfo-linux-ia32-none-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-dumpinfo-linux-ia32-none-dev"
     category: "dart2js|misc"
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-dev"
     category: "analyzer"
     short_name: "aas"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-linux-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-dev"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-mac-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-dev"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release-dev"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release-dev"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release-dev"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-win-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-dev"
     category: "analyzer"
     short_name: "awr"
   }
@@ -2392,82 +2392,82 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-dev"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-dev"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-dev"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "fs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-ff-dev"
     category: "dart2js|ff"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-safari-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-safari-dev"
     category: "dart2js|safari"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-edge-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-edge-dev"
     category: "dart2js|ms"
     short_name: "ed"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ff-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ff-dev"
     category: "dart2js|ff"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ie11-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ie11-dev"
     category: "dart2js|ms"
     short_name: "ie"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-linux-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-mac-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-dev"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-win-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-dev"
     category: "pkg"
     short_name: "w"
   }
@@ -2477,7 +2477,7 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/versionchecker-linux-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/versionchecker-linux-dev"
     category: "misc"
     short_name: "vc"
   }
@@ -2521,347 +2521,347 @@ consoles: {
   ref: "refs/heads/stable"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-mac-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-stable"
     category: "fasta"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-stable"
     category: "fasta"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/front-end-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-stable"
     category: "fasta"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-legacy-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64-stable"
     category: "fasta"
     short_name: "vm"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-ia32-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-ia32-stable"
     category: "vm|debug"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-simarm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simarm-stable"
     category: "vm|simarm"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64-stable"
     category: "vm|debug"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-ia32-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-ia32-stable"
     category: "vm|release"
     short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm-stable"
     category: "vm|simarm"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-simarm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64-stable"
     category: "vm|simarm"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-x64-stable"
     category: "vm|release"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-ia32-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-ia32-stable"
     category: "vm|debug"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-simdbc64-stable"
     category: "vm|debug"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64-stable"
     category: "vm|debug"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-ia32-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-ia32-stable"
     category: "vm|release"
     short_name: "m32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-simdbc64-stable"
     category: "vm|release"
     short_name: "msi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64-stable"
     category: "vm|release"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-ia32-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-ia32-stable"
     category: "vm|debug"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64-stable"
     category: "vm|debug"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-release-ia32-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-ia32-stable"
     category: "vm|release"
     short_name: "w32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-x64-stable"
     category: "vm|release"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/app-linux-debug-x64-stable"
     category: "vm|app"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-product-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/app-linux-product-x64-stable"
     category: "vm|app"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/app-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/app-linux-release-x64-stable"
     category: "vm|app"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-stable"
     category: "vm|kernel"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-debug-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64-stable"
     category: "vm|kernel"
     short_name: "dbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-stable"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simarm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-stable"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64-stable"
     category: "vm|kernel"
     short_name: "rbc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-stable"
     category: "vm|kernel"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-stable"
     category: "vm|kernel"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-mac-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-stable"
     category: "vm|kernel"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-optcounter-threshold-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-stable"
     category: "vm|kernel"
     short_name: "oc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-stable"
     category: "vm|kernel"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-stable"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-simarm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-stable"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-precomp-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-stable"
     category: "vm|misc"
     short_name: "cra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/target-vm-linux-release-arm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64-stable"
     category: "vm|misc"
     short_name: "tra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-asan-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-linux-release-x64-stable"
     category: "vm|misc"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-ia32-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-ia32-stable"
     category: "vm|misc"
     short_name: "o32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-optcounter-threshold-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-x64-stable"
     category: "vm|misc"
     short_name: "o64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/precomp-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-debug-x64-stable"
     category: "vm|precomp"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/precomp-linux-product-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-product-x64-stable"
     category: "vm|precomp"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-noopt-mac-simarm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-noopt-mac-simarm64-stable"
     category: "vm|precomp"
     short_name: "no"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-precomp-android-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-android-release-stable"
     category: "vm|precomp"
     short_name: "and"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-precomp-win-simarm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-win-simarm64-stable"
     category: "vm|precomp"
     short_name: "wsi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-linux-product-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-product-x64-stable"
     category: "vm|product"
     short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-mac-product-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-product-x64-stable"
     category: "vm|product"
     short_name: "m64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-win-product-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-product-x64-stable"
     category: "vm|product"
     short_name: "w64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-debug-x64-stable"
     category: "vm|reload"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-release-x64-stable"
     category: "vm|reload"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-debug-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-debug-simdbc64-stable"
     category: "vm|reload"
     short_name: "mds"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-mac-release-simdbc64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-release-simdbc64-stable"
     category: "vm|reload"
     short_name: "mrs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-debug-x64-stable"
     category: "vm|reload"
     short_name: "dro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/vm-reload-rollback-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-release-x64-stable"
     category: "vm|reload"
     short_name: "rro"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-ia32-d8-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-ia32-d8-stable"
     category: "dart2js|d8"
     short_name: "hc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-minified-linux-x64-d8-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-linux-x64-d8-stable"
     category: "dart2js|d8"
     short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-only-unittest-linux-ia32-none-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-only-unittest-linux-ia32-none-stable"
     category: "dart2js|misc"
     short_name: "ut"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-dumpinfo-linux-ia32-none-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-dumpinfo-linux-ia32-none-stable"
     category: "dart2js|misc"
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-analysis-server-linux-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-stable"
     category: "analyzer"
     short_name: "aas"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-linux-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-stable"
     category: "analyzer"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-mac-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-stable"
     category: "analyzer"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-linux-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release-stable"
     category: "analyzer"
     short_name: "sr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-mac-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release-stable"
     category: "analyzer"
     short_name: "smr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-strong-win-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release-stable"
     category: "analyzer"
     short_name: "swr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/analyzer-win-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-stable"
     category: "analyzer"
     short_name: "awr"
   }
@@ -2881,82 +2881,82 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-linux-release-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-stable"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-mac-release-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-stable"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/ddc-win-release-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-stable"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-faststartup-linux-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "fs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-x64-ff-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-ff-stable"
     category: "dart2js|ff"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-csp-minified-linux-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-mac-x64-safari-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-safari-stable"
     category: "dart2js|safari"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-edge-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-edge-stable"
     category: "dart2js|ms"
     short_name: "ed"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ff-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ff-stable"
     category: "dart2js|ff"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-win-x64-ie11-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ie11-stable"
     category: "dart2js|ms"
     short_name: "ie"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-linux-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-mac-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-stable"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pkg-win-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-stable"
     category: "pkg"
     short_name: "w"
   }
@@ -2966,7 +2966,7 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/versionchecker-linux-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/versionchecker-linux-stable"
     category: "misc"
     short_name: "vc"
   }
@@ -3010,37 +3010,37 @@ consoles: {
   ref: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci/vm-kernel-checked-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
     category: "vm-kernel"
     short_name: "cr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-hostchecked-linux-debug-ia32-none"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-debug-ia32-none"
     category: "dart2js"
     short_name: "hcd"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart2js-linux-debug-ia32-none"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-debug-ia32-none"
     category: "dart2js"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pub-linux-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pub-linux-release"
     category: "pub"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pub-mac-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pub-mac-release"
     category: "pub"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/pub-win-release"
+    name: "buildbucket/luci.dart.ci.sandbox/pub-win-release"
     category: "pub"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/androidvm-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/androidvm-linux-release-x64"
     category: "android"
     short_name: "vm"
   }
@@ -3095,7 +3095,7 @@ consoles: {
   builders { name: "buildbucket/luci.dart.try/pkg-linux-release-try" }
   builders { name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try" }
   builders { name: "buildbucket/luci.dart.try/vm-kernel-legacy-linux-release-x64-try" }
-  builders { name: "buildbucket/luci.dart.try/vm-kernel-mac-release-x64-try" }
+  builders { name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try" }
   builders { name: "buildbucket/luci.dart.try/vm-linux-product-x64-try" }
   builders { name: "buildbucket/luci.dart.try/vm-linux-release-x64-try" }
   builders { name: "buildbucket/luci.dart.try/vm-mac-release-x64-try" }
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index e9e542510a9a..be358aab47de 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -146,7 +146,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-analysis-server-linux"
   }
 }
@@ -157,7 +157,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-linux-release"
   }
 }
@@ -168,7 +168,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-mac-release"
   }
 }
@@ -179,7 +179,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-strong-linux-release"
   }
 }
@@ -190,7 +190,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-strong-mac-release"
   }
 }
@@ -201,7 +201,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-strong-win-release"
   }
 }
@@ -212,7 +212,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-win-release"
   }
 }
@@ -259,7 +259,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-faststartup-linux-x64-chrome"
   }
 }
@@ -270,7 +270,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-linux-x64-chrome"
   }
 }
@@ -281,7 +281,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-mac-x64-chrome"
   }
 }
@@ -292,7 +292,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-win-x64-chrome"
   }
 }
@@ -303,7 +303,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "ddc-linux-release-chrome"
   }
 }
@@ -314,7 +314,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "ddc-mac-release-chrome"
   }
 }
@@ -325,7 +325,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "ddc-win-release-chrome"
   }
 }
@@ -336,7 +336,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "front-end-linux-release-x64"
   }
 }
@@ -347,7 +347,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "front-end-mac-release-x64"
   }
 }
@@ -358,7 +358,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "front-end-win-release-x64"
   }
 }
@@ -369,7 +369,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "pkg-linux-release"
   }
 }
@@ -380,7 +380,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "pkg-mac-release"
   }
 }
@@ -391,7 +391,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "pkg-win-release"
   }
 }
@@ -402,7 +402,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-legacy-linux-release-x64"
   }
 }
@@ -413,7 +413,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-debug-simdbc64"
   }
 }
@@ -424,7 +424,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simarm"
   }
 }
@@ -435,7 +435,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simarm64"
   }
 }
@@ -446,7 +446,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simdbc64"
   }
 }
@@ -457,7 +457,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-optcounter-threshold-linux-release-x64"
   }
 }
@@ -468,7 +468,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-release-x64"
   }
 }
@@ -479,7 +479,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm"
   }
 }
@@ -490,7 +490,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm64"
   }
 }
@@ -501,7 +501,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-win-release-x64"
   }
 }
@@ -512,7 +512,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-analysis-server-linux-dev"
   }
 }
@@ -523,7 +523,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-linux-release-dev"
   }
 }
@@ -534,7 +534,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-mac-release-dev"
   }
 }
@@ -545,7 +545,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-strong-linux-release-dev"
   }
 }
@@ -556,7 +556,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-strong-mac-release-dev"
   }
 }
@@ -567,7 +567,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-strong-win-release-dev"
   }
 }
@@ -578,7 +578,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-win-release-dev"
   }
 }
@@ -625,7 +625,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-faststartup-linux-x64-chrome-dev"
   }
 }
@@ -636,7 +636,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-linux-x64-chrome-dev"
   }
 }
@@ -647,7 +647,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-mac-x64-chrome-dev"
   }
 }
@@ -658,7 +658,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-win-x64-chrome-dev"
   }
 }
@@ -669,7 +669,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "ddc-linux-release-chrome-dev"
   }
 }
@@ -680,7 +680,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "ddc-mac-release-chrome-dev"
   }
 }
@@ -691,7 +691,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "ddc-win-release-chrome-dev"
   }
 }
@@ -702,7 +702,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "front-end-linux-release-x64-dev"
   }
 }
@@ -713,7 +713,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "front-end-mac-release-x64-dev"
   }
 }
@@ -724,7 +724,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "front-end-win-release-x64-dev"
   }
 }
@@ -735,7 +735,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "pkg-linux-release-dev"
   }
 }
@@ -746,7 +746,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "pkg-mac-release-dev"
   }
 }
@@ -757,7 +757,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "pkg-win-release-dev"
   }
 }
@@ -768,7 +768,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-legacy-linux-release-x64-dev"
   }
 }
@@ -779,7 +779,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-debug-simdbc64-dev"
   }
 }
@@ -790,7 +790,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simarm-dev"
   }
 }
@@ -801,7 +801,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simarm64-dev"
   }
 }
@@ -812,7 +812,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simdbc64-dev"
   }
 }
@@ -823,7 +823,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
   }
 }
@@ -834,7 +834,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-release-x64-dev"
   }
 }
@@ -845,7 +845,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm-dev"
   }
 }
@@ -856,7 +856,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm64-dev"
   }
 }
@@ -867,7 +867,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-win-release-x64-dev"
   }
 }
@@ -878,7 +878,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-analysis-server-linux-stable"
   }
 }
@@ -889,7 +889,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-linux-release-stable"
   }
 }
@@ -900,7 +900,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-mac-release-stable"
   }
 }
@@ -911,7 +911,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-strong-linux-release-stable"
   }
 }
@@ -922,7 +922,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-strong-mac-release-stable"
   }
 }
@@ -933,7 +933,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-strong-win-release-stable"
   }
 }
@@ -944,7 +944,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-win-release-stable"
   }
 }
@@ -991,7 +991,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-faststartup-linux-x64-chrome-stable"
   }
 }
@@ -1002,7 +1002,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-linux-x64-chrome-stable"
   }
 }
@@ -1013,7 +1013,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-mac-x64-chrome-stable"
   }
 }
@@ -1024,7 +1024,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-win-x64-chrome-stable"
   }
 }
@@ -1035,7 +1035,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "ddc-linux-release-chrome-stable"
   }
 }
@@ -1046,7 +1046,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "ddc-mac-release-chrome-stable"
   }
 }
@@ -1057,7 +1057,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "ddc-win-release-chrome-stable"
   }
 }
@@ -1068,7 +1068,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "front-end-linux-release-x64-stable"
   }
 }
@@ -1079,7 +1079,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "front-end-mac-release-x64-stable"
   }
 }
@@ -1090,7 +1090,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "front-end-win-release-x64-stable"
   }
 }
@@ -1101,7 +1101,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "pkg-linux-release-stable"
   }
 }
@@ -1112,7 +1112,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "pkg-mac-release-stable"
   }
 }
@@ -1123,7 +1123,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "pkg-win-release-stable"
   }
 }
@@ -1134,7 +1134,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-legacy-linux-release-x64-stable"
   }
 }
@@ -1145,7 +1145,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-debug-simdbc64-stable"
   }
 }
@@ -1156,7 +1156,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simarm-stable"
   }
 }
@@ -1167,7 +1167,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simarm64-stable"
   }
 }
@@ -1178,7 +1178,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simdbc64-stable"
   }
 }
@@ -1189,7 +1189,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
   }
 }
@@ -1200,7 +1200,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-release-x64-stable"
   }
 }
@@ -1211,7 +1211,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm-stable"
   }
 }
@@ -1222,7 +1222,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm64-stable"
   }
 }
@@ -1233,7 +1233,7 @@ job {
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-win-release-x64-stable"
   }
 }

From 1daf06bf23d83d72ba87a729b16705165651e887 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 8 May 2018 17:22:03 +0000
Subject: [PATCH 117/826] [infra] Enable swarming task service accounts for
 gsutil/git access

See https://crbug.com/840836

Change-Id: I83e7c156b73dfd6288a7b4dab45d5b47cbb28655
Reviewed-on: https://dart-review.googlesource.com/54320
Reviewed-by: Vadim Shtayura <vadimsh@google.com>
---
 cr-buildbucket.cfg | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 65db5a7619e7..a94882af179e 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -126,9 +126,6 @@ buckets {
         repository: "https://chromium.googlesource.com/chromium/tools/build.git"
         properties: "mastername:client.dart"
         name: "dart/neo"
-        # TODO(vadimsh): make sure the service account has all necessary Git and
-        # GS permissions and remove this line, see https://crbug.com/776035
-        properties_j: "$kitchen:{\"git_auth\": false, \"devshell\": false}"
       }
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     }
@@ -173,9 +170,6 @@ buckets {
         repository: "https://chromium.googlesource.com/chromium/tools/build.git"
         properties: "mastername:client.dart"
         name: "dart/neo"
-        # TODO(vadimsh): make sure the service account has all necessary Git and
-        # GS permissions and remove this line, see https://crbug.com/776035
-        properties_j: "$kitchen:{\"git_auth\": false, \"devshell\": false}"
       }
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
@@ -492,9 +486,6 @@ buckets {
         repository: "https://chromium.googlesource.com/chromium/tools/build.git"
         properties: "mastername:dart.try"
         name: "dart/neo"
-        # TODO(vadimsh): make sure the service account has all necessary Git and
-        # GS permissions and remove this line, see https://crbug.com/776035
-        properties_j: "$kitchen:{\"git_auth\": false, \"devshell\": false}"
       }
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }

From 31d76d3e9a6f003838ea31ff4bc276fda245f36d Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 15 May 2018 09:07:51 +0000
Subject: [PATCH 118/826] [infra] Create CQ builder for vm-kernel simdbc64

#33021

Change-Id: I0ecc3b78bba80308705b8a5cc97eb56b9d4c21d9
Reviewed-on: https://dart-review.googlesource.com/55140
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 1 +
 luci-milo.cfg      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index a94882af179e..0ce36cb09023 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -508,6 +508,7 @@ buckets {
     builders { name: "pkg-linux-release-try" }
     builders { name: "vm-canary-linux-debug-try" }
     builders { name: "vm-kernel-legacy-linux-release-x64-try" }
+    builders { name: "vm-kernel-linux-release-simdbc64-try" }
     builders { name: "vm-kernel-linux-release-x64-try" }
     builders { name: "vm-kernel-mac-release-x64-try" mixins: "mac" mixins: "vm-kernel" }
     builders { name: "vm-linux-product-x64-try" mixins: "vm" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 819df8e7c636..2d5195dba160 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -3095,6 +3095,7 @@ consoles: {
   builders { name: "buildbucket/luci.dart.try/pkg-linux-release-try" }
   builders { name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try" }
   builders { name: "buildbucket/luci.dart.try/vm-kernel-legacy-linux-release-x64-try" }
+  builders { name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simdbc64-try" }
   builders { name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try" }
   builders { name: "buildbucket/luci.dart.try/vm-linux-product-x64-try" }
   builders { name: "buildbucket/luci.dart.try/vm-linux-release-x64-try" }

From aeb1412ece3bf5d1d470e5c13e6f30cd161cefa3 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 22 May 2018 09:22:02 +0000
Subject: [PATCH 119/826] [infra] Combat flakiness on front-end bots by doing
 clean builds

Change-Id: I76adaf4c9c77e2ba0b8173cb33910fad1041f56e
Reviewed-on: https://dart-review.googlesource.com/56102
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 0ce36cb09023..9794c4ce5110 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -399,9 +399,9 @@ buckets {
     builders { name: "ddc-linux-release-chrome-stable" }
     builders { name: "ddc-mac-release-chrome-stable" mixins: "mac" }
     builders { name: "ddc-win-release-chrome-stable" mixins: "win" }
-    builders { name: "front-end-mac-release-x64-stable" mixins: "mac" }
-    builders { name: "front-end-linux-release-x64-stable" }
-    builders { name: "front-end-win-release-x64-stable" mixins: "win" }
+    builders { name: "front-end-mac-release-x64-stable" mixins: "clobber" mixins: "mac" }
+    builders { name: "front-end-linux-release-x64-stable" mixins: "clobber" }
+    builders { name: "front-end-win-release-x64-stable" mixins: "clobber" mixins: "win" }
     builders { name: "pkg-linux-release-stable" }
     builders { name: "pkg-mac-release-stable" mixins: "mac" }
     builders { name: "pkg-win-release-stable" mixins: "win" }
@@ -504,7 +504,7 @@ buckets {
     builders { name: "dart2js-linux-none-only-unittest-try" mixins: "dart2js" }
     builders { name: "dart2js-linux-x64-chrome-try" }
     builders { name: "ddc-linux-release-chrome-try" mixins: "clobber" }
-    builders { name: "front-end-linux-release-x64-try" }
+    builders { name: "front-end-linux-release-x64-try" mixins: "clobber" }
     builders { name: "pkg-linux-release-try" }
     builders { name: "vm-canary-linux-debug-try" }
     builders { name: "vm-kernel-legacy-linux-release-x64-try" }

From 4241f328f36dea1bdfae477b7fd93db483f88d0e Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 22 May 2018 10:04:28 +0000
Subject: [PATCH 120/826] [infra] Use clean builds for front-end on dev and be
 as well

TBR=whesse@google.com

Change-Id: Iccd6c2ff5dbe364aed6c545fb8ac6c9b8bb54d7a
Reviewed-on: https://dart-review.googlesource.com/56103
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 9794c4ce5110..f8e8387fa399 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -207,9 +207,9 @@ buckets {
     builders { name: "ddc-linux-release-chrome" }
     builders { name: "ddc-mac-release-chrome" mixins: "mac" }
     builders { name: "ddc-win-release-chrome" mixins: "win" }
-    builders { name: "front-end-mac-release-x64" mixins: "mac" }
-    builders { name: "front-end-linux-release-x64" }
-    builders { name: "front-end-win-release-x64" mixins: "win" }
+    builders { name: "front-end-mac-release-x64" mixins: "clobber" mixins: "mac" }
+    builders { name: "front-end-linux-release-x64" mixins: "clobber" }
+    builders { name: "front-end-win-release-x64" mixins: "clobber" mixins: "win" }
     builders { name: "pkg-linux-release" }
     builders { name: "pkg-mac-release" mixins: "mac" }
     builders { name: "pkg-win-release" mixins: "win" }
@@ -303,9 +303,9 @@ buckets {
     builders { name: "ddc-linux-release-chrome-dev" }
     builders { name: "ddc-mac-release-chrome-dev" mixins: "mac" }
     builders { name: "ddc-win-release-chrome-dev" mixins: "win" }
-    builders { name: "front-end-mac-release-x64-dev" mixins: "mac" }
-    builders { name: "front-end-linux-release-x64-dev" }
-    builders { name: "front-end-win-release-x64-dev" mixins: "win" }
+    builders { name: "front-end-mac-release-x64-dev" mixins: "clobber" mixins: "mac" }
+    builders { name: "front-end-linux-release-x64-dev" mixins: "clobber" }
+    builders { name: "front-end-win-release-x64-dev" mixins: "clobber" mixins: "win" }
     builders { name: "pkg-linux-release-dev" }
     builders { name: "pkg-mac-release-dev" mixins: "mac" }
     builders { name: "pkg-win-release-dev" mixins: "win" }

From a57209bd2269e93cb27c924a53bf94699adbb591 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 22 May 2018 13:59:13 +0000
Subject: [PATCH 121/826] [infra] Use builders view by default for CQ console

Change-Id: Ie0fd85fb27a724f3ae7478cae319796fa0ae3bbf
Reviewed-on: https://dart-review.googlesource.com/56104
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-milo.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 2d5195dba160..ba9a127fbdf7 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -3080,6 +3080,7 @@ consoles: {
 consoles: {
   id: "cq"
   name: "SDK CQ Console"
+  builder_view_only: true
   repo_url: "https://dart.googlesource.com/sdk"
   ref: "refs/heads/master"
   manifest_name: "PATCHED"

From 144175a552e148907213f815cec44e78d393d146 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 23 May 2018 15:28:06 +0000
Subject: [PATCH 122/826] [infra] Add chocolatey builder

Change-Id: I78ca0befe099dbc6ae642b153975edcc99d0ad18
Reviewed-on: https://dart-review.googlesource.com/56344
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index f8e8387fa399..8cbb4c22ef52 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -43,6 +43,13 @@ builder_mixins {
   # todo(athom): how should this machine be defined?
 }
 
+builder_mixins {
+  name: "chocolatey"
+  recipe {
+    name: "dart/chocolatey"
+  }
+}
+
 builder_mixins {
   name: "clobber"
   recipe {
@@ -131,6 +138,7 @@ buckets {
     }
 
     # CI Builders that require privileged access
+    builders { name: "chocolatey" mixins: "chocolatey" mixins: "win" }
     builders { name: "dart-sdk-linux" }
     builders { name: "dart-sdk-mac" mixins: "mac" }
     builders { name: "dart-sdk-win" mixins: "win" }

From 08efb118025f5de2093ca8053548f94a5f5134c1 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 29 May 2018 11:11:06 +0000
Subject: [PATCH 123/826] [infra] Make all migrated builders available in
 "choose tryjobs"

Change-Id: I06048062ca14ced086fb435a3e63c4ac80305e0c
Reviewed-on: https://dart-review.googlesource.com/56880
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 8cbb4c22ef52..63aba45ccc8a 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -503,22 +503,46 @@ buckets {
     builders { name: "cl-mac-try" mixins: "mac" }
     builders { name: "cl-win-try" mixins: "win" }
 
-    # CQ builders
+    # CQ / choose tryjobs builders
+    builders { name: "analyzer-analysis-server-linux-try" }
     builders { name: "analyzer-linux-release-strong-hostchecked-try" }
+    builders { name: "analyzer-linux-release-try" }
+    builders { name: "analyzer-mac-release-try" mixins: "mac" }
+    builders { name: "analyzer-strong-linux-release-try" }
+    builders { name: "analyzer-strong-mac-release-try" mixins: "mac" }
+    builders { name: "analyzer-strong-win-release-try" mixins: "win" }
+    builders { name: "analyzer-win-release-try" mixins: "win" }
     builders { name: "benchmark-linux-try" }
     builders { name: "dart-sdk-windows-try" mixins: "sdk" mixins: "win" }
+    builders { name: "dart2js-faststartup-linux-x64-chrome-try" }
     builders { name: "dart2js-linux-d8-hostchecked-try" mixins: "dart2js" }
     builders { name: "dart2js-linux-d8-kernel-minified-try" mixins: "dart2js" }
     builders { name: "dart2js-linux-none-only-unittest-try" mixins: "dart2js" }
     builders { name: "dart2js-linux-x64-chrome-try" }
+    builders { name: "dart2js-mac-x64-chrome-stable" mixins: "mac" }
+    builders { name: "dart2js-win-x64-chrome-stable" mixins: "win" }
     builders { name: "ddc-linux-release-chrome-try" mixins: "clobber" }
+    builders { name: "ddc-mac-release-chrome-try" mixins: "mac" }
+    builders { name: "ddc-win-release-chrome-try" mixins: "win" }
     builders { name: "front-end-linux-release-x64-try" mixins: "clobber" }
+    builders { name: "front-end-mac-release-x64-try" mixins: "clobber" mixins: "mac" }
+    builders { name: "front-end-win-release-x64-try" mixins: "clobber" mixins: "win" }
     builders { name: "pkg-linux-release-try" }
+    builders { name: "pkg-mac-release-try" mixins: "mac" }
+    builders { name: "pkg-win-release-try" mixins: "win" }
     builders { name: "vm-canary-linux-debug-try" }
     builders { name: "vm-kernel-legacy-linux-release-x64-try" }
+    builders { name: "vm-kernel-linux-debug-simdbc64-try" }
+    builders { name: "vm-kernel-linux-release-simarm-try" }
+    builders { name: "vm-kernel-linux-release-simarm64-try" }
     builders { name: "vm-kernel-linux-release-simdbc64-try" }
     builders { name: "vm-kernel-linux-release-x64-try" }
-    builders { name: "vm-kernel-mac-release-x64-try" mixins: "mac" mixins: "vm-kernel" }
+    builders { name: "vm-kernel-mac-release-x64-try" mixins: "clobber" mixins: "mac" mixins: "vm-kernel" }
+    builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-try" }
+    builders { name: "vm-kernel-win-release-x64-try" mixins: "win" }
+    builders { name: "vm-kernel-precomp-linux-release-simarm-try" }
+    builders { name: "vm-kernel-precomp-linux-release-simarm64-try" }
+    builders { name: "vm-kernel-precomp-win-release-x64-try" mixins: "win" }
     builders { name: "vm-linux-product-x64-try" mixins: "vm" }
     builders { name: "vm-linux-release-x64-try" }
     builders { name: "vm-mac-release-x64-try" mixins: "mac" }

From 5c731c57f6853bfbbdf4a8a27c3b6eb5bc069563 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 29 May 2018 11:49:09 +0000
Subject: [PATCH 124/826] [infra] Use correct builder name for some try
 builders

TBR=whesse@google.com

Change-Id: I4d7c35c76592d769725e967b296f1c0f4939cb26
Reviewed-on: https://dart-review.googlesource.com/56900
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 63aba45ccc8a..b6cef82ac0e7 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -519,8 +519,8 @@ buckets {
     builders { name: "dart2js-linux-d8-kernel-minified-try" mixins: "dart2js" }
     builders { name: "dart2js-linux-none-only-unittest-try" mixins: "dart2js" }
     builders { name: "dart2js-linux-x64-chrome-try" }
-    builders { name: "dart2js-mac-x64-chrome-stable" mixins: "mac" }
-    builders { name: "dart2js-win-x64-chrome-stable" mixins: "win" }
+    builders { name: "dart2js-mac-x64-chrome-try" mixins: "mac" }
+    builders { name: "dart2js-win-x64-chrome-try" mixins: "win" }
     builders { name: "ddc-linux-release-chrome-try" mixins: "clobber" }
     builders { name: "ddc-mac-release-chrome-try" mixins: "mac" }
     builders { name: "ddc-win-release-chrome-try" mixins: "win" }

From fbc5f5dbf8317e872cee0fcdd041a35cdd6cecd4 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 29 May 2018 12:02:32 +0000
Subject: [PATCH 125/826] [infra] Add app-kernel builders to luci config
 (#33126)

Change-Id: I0a9c42c21f9b33b5324ddc812f952112b4da1b2b
Reviewed-on: https://dart-review.googlesource.com/56343
Reviewed-by: Martin Kustermann <kustermann@google.com>
---
 cr-buildbucket.cfg |  12 +++++
 luci-milo.cfg      |  75 +++++++++++++++++++++++++++++++
 luci-scheduler.cfg | 108 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 195 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index b6cef82ac0e7..869d8f0c4c58 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -191,6 +191,9 @@ buckets {
     builders { name: "analyzer-strong-win-release" mixins: "win" }
     builders { name: "analyzer-win-release" mixins: "win" }
     builders { name: "androidvm-linux-release-x64" mixins: "android" }
+    builders { name: "app-kernel-linux-debug-x64" }
+    builders { name: "app-kernel-linux-product-x64" }
+    builders { name: "app-kernel-linux-release-x64" }
     builders { name: "app-linux-debug-x64" }
     builders { name: "app-linux-product-x64" }
     builders { name: "app-linux-release-x64" }
@@ -287,6 +290,9 @@ buckets {
     builders { name: "analyzer-strong-win-release-dev" mixins: "win" }
     builders { name: "analyzer-win-release-dev" mixins: "win" }
     builders { name: "androidvm-linux-release-x64-dev" mixins: "android" }
+    builders { name: "app-kernel-linux-debug-x64-dev" }
+    builders { name: "app-kernel-linux-product-x64-dev" }
+    builders { name: "app-kernel-linux-release-x64-dev" }
     builders { name: "app-linux-debug-x64-dev" }
     builders { name: "app-linux-product-x64-dev" }
     builders { name: "app-linux-release-x64-dev" }
@@ -383,6 +389,9 @@ buckets {
     builders { name: "analyzer-strong-win-release-stable" mixins: "win" }
     builders { name: "analyzer-win-release-stable" mixins: "win" }
     builders { name: "androidvm-linux-release-x64-stable" mixins: "android" }
+    builders { name: "app-kernel-linux-debug-x64-stable" }
+    builders { name: "app-kernel-linux-product-x64-stable" }
+    builders { name: "app-kernel-linux-release-x64-stable" }
     builders { name: "app-linux-debug-x64-stable" }
     builders { name: "app-linux-product-x64-stable" }
     builders { name: "app-linux-release-x64-stable" }
@@ -512,6 +521,9 @@ buckets {
     builders { name: "analyzer-strong-mac-release-try" mixins: "mac" }
     builders { name: "analyzer-strong-win-release-try" mixins: "win" }
     builders { name: "analyzer-win-release-try" mixins: "win" }
+    builders { name: "app-kernel-linux-debug-x64-try" }
+    builders { name: "app-kernel-linux-product-x64-try" }
+    builders { name: "app-kernel-linux-release-x64-try" }
     builders { name: "benchmark-linux-try" }
     builders { name: "dart-sdk-windows-try" mixins: "sdk" mixins: "win" }
     builders { name: "dart2js-faststartup-linux-x64-chrome-try" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index ba9a127fbdf7..f16592396f14 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -146,6 +146,21 @@ consoles: {
     category: "vm|app"
     short_name: "r64"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
+    category: "vm|app-kernel"
+    short_name: "d64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64"
+    category: "vm|app-kernel"
+    short_name: "p64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64"
+    category: "vm|app-kernel"
+    short_name: "r64"
+  }
   builders {
     # migrating to vm-kernel-linux-debug-x64
     name: "buildbot/client.dart/vm-kernel-linux-debug-x64-be"
@@ -1194,6 +1209,21 @@ consoles: {
     category: "vm|app"
     short_name: "r64"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
+    category: "vm|app-kernel"
+    short_name: "d64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64"
+    category: "vm|app-kernel"
+    short_name: "p64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64"
+    category: "vm|app-kernel"
+    short_name: "r64"
+  }
   builders {
     # migrating to vm-kernel-linux-debug-x64
     name: "buildbot/client.dart/vm-kernel-linux-debug-x64-be"
@@ -1662,6 +1692,21 @@ consoles: {
     category: "vm|app"
     short_name: "r64"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
+    category: "vm|app-kernel"
+    short_name: "d64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64"
+    category: "vm|app-kernel"
+    short_name: "p64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64"
+    category: "vm|app-kernel"
+    short_name: "r64"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
     category: "vm|kernel"
@@ -2151,6 +2196,21 @@ consoles: {
     category: "vm|app"
     short_name: "r64"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-dev"
+    category: "vm|app-kernel"
+    short_name: "d64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64-dev"
+    category: "vm|app-kernel"
+    short_name: "p64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-dev"
+    category: "vm|app-kernel"
+    short_name: "r64"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-dev"
     category: "vm|kernel"
@@ -2640,6 +2700,21 @@ consoles: {
     category: "vm|app"
     short_name: "r64"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-stable"
+    category: "vm|app-kernel"
+    short_name: "d64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64-stable"
+    category: "vm|app-kernel"
+    short_name: "p64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-stable"
+    category: "vm|app-kernel"
+    short_name: "r64"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-stable"
     category: "vm|kernel"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index be358aab47de..f14a8a323a9b 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -28,6 +28,9 @@ trigger {
   triggers: "analyzer-strong-mac-release"
   triggers: "analyzer-strong-win-release"
   triggers: "analyzer-win-release"
+  triggers: "app-kernel-linux-debug-x64"
+  triggers: "app-kernel-linux-product-x64"
+  triggers: "app-kernel-linux-release-x64"
   triggers: "dart-sdk-linux"
   triggers: "dart-sdk-mac"
   triggers: "dart-sdk-win"
@@ -70,6 +73,9 @@ trigger {
   triggers: "analyzer-strong-mac-release-dev"
   triggers: "analyzer-strong-win-release-dev"
   triggers: "analyzer-win-release-dev"
+  triggers: "app-kernel-linux-debug-x64-dev"
+  triggers: "app-kernel-linux-product-x64-dev"
+  triggers: "app-kernel-linux-release-x64-dev"
   triggers: "dart-sdk-linux-dev"
   triggers: "dart-sdk-mac-dev"
   triggers: "dart-sdk-win-dev"
@@ -112,6 +118,9 @@ trigger {
   triggers: "analyzer-strong-mac-release-stable"
   triggers: "analyzer-strong-win-release-stable"
   triggers: "analyzer-win-release-stable"
+  triggers: "app-kernel-linux-debug-x64-stable"
+  triggers: "app-kernel-linux-product-x64-stable"
+  triggers: "app-kernel-linux-release-x64-stable"
   triggers: "dart-sdk-linux-stable"
   triggers: "dart-sdk-mac-stable"
   triggers: "dart-sdk-win-stable"
@@ -217,6 +226,39 @@ job {
   }
 }
 
+job {
+  id: "app-kernel-linux-debug-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-debug-x64"
+  }
+}
+
+job {
+  id: "app-kernel-linux-product-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-product-x64"
+  }
+}
+
+job {
+  id: "app-kernel-linux-release-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-release-x64"
+  }
+}
+
 job {
   id: "dart-sdk-linux"
   acl_sets: "default"
@@ -583,6 +625,39 @@ job {
   }
 }
 
+job {
+  id: "app-kernel-linux-debug-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-debug-x64-dev"
+  }
+}
+
+job {
+  id: "app-kernel-linux-product-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-product-x64-dev"
+  }
+}
+
+job {
+  id: "app-kernel-linux-release-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-release-x64-dev"
+  }
+}
+
 job {
   id: "dart-sdk-linux-dev"
   acl_sets: "default"
@@ -949,6 +1024,39 @@ job {
   }
 }
 
+job {
+  id: "app-kernel-linux-debug-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-debug-x64-stable"
+  }
+}
+
+job {
+  id: "app-kernel-linux-product-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-product-x64-stable"
+  }
+}
+
+job {
+  id: "app-kernel-linux-release-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-release-x64-stable"
+  }
+}
+
 job {
   id: "dart-sdk-linux-stable"
   acl_sets: "default"

From a1367c8eaab94282aedc4174fde851fb023ac579 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 30 May 2018 12:54:22 +0000
Subject: [PATCH 126/826] [infra] Add kernel reload/rollback builders to luci
 config (#33126)

Change-Id: Ie5c96b5ffd2a86560c95de5fd81f408499a735c5
Reviewed-on: https://dart-review.googlesource.com/57260
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 869d8f0c4c58..285c6c33f0fe 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -242,13 +242,19 @@ buckets {
     builders { name: "vm-kernel-linux-release-x64" }
     builders { name: "vm-kernel-mac-debug-x64" mixins: "mac" }
     builders { name: "vm-kernel-mac-release-x64" mixins: "mac" }
-    builders { name: "vm-kernel-win-release-x64" mixins: "win" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-debug-x64" mixins: "slow" }
     builders { name: "vm-kernel-precomp-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-release-simarm" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64" }
     builders { name: "vm-kernel-precomp-win-release-x64" mixins: "win" }
+    builders { name: "vm-kernel-reload-linux-debug-x64" }
+    builders { name: "vm-kernel-reload-linux-release-x64" }
+    builders { name: "vm-kernel-reload-mac-debug-simdbc64" mixins: "mac" }
+    builders { name: "vm-kernel-reload-mac-release-simdbc64" mixins: "mac" }
+    builders { name: "vm-kernel-reload-rollback-linux-debug-x64" }
+    builders { name: "vm-kernel-reload-rollback-linux-release-x64" }
+    builders { name: "vm-kernel-win-release-x64" mixins: "win" }
     builders { name: "vm-linux-debug-ia32" }
     builders { name: "vm-linux-debug-simarm" }
     builders { name: "vm-linux-debug-x64" }
@@ -341,13 +347,19 @@ buckets {
     builders { name: "vm-kernel-linux-release-x64-dev" }
     builders { name: "vm-kernel-mac-debug-x64-dev" mixins: "mac" }
     builders { name: "vm-kernel-mac-release-x64-dev" mixins: "mac" }
-    builders { name: "vm-kernel-win-release-x64-dev" mixins: "win" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-dev" mixins: "slow" }
     builders { name: "vm-kernel-precomp-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-dev" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-dev" }
     builders { name: "vm-kernel-precomp-win-release-x64-dev" mixins: "win" }
+    builders { name: "vm-kernel-reload-linux-debug-x64-dev" }
+    builders { name: "vm-kernel-reload-linux-release-x64-dev" }
+    builders { name: "vm-kernel-reload-mac-debug-simdbc64-dev" mixins: "mac" }
+    builders { name: "vm-kernel-reload-mac-release-simdbc64-dev" mixins: "mac" }
+    builders { name: "vm-kernel-reload-rollback-linux-debug-x64-dev" }
+    builders { name: "vm-kernel-reload-rollback-linux-release-x64-dev" }
+    builders { name: "vm-kernel-win-release-x64-dev" mixins: "win" }
     builders { name: "vm-linux-debug-ia32-dev" }
     builders { name: "vm-linux-debug-simarm-dev" }
     builders { name: "vm-linux-debug-x64-dev" }
@@ -440,13 +452,19 @@ buckets {
     builders { name: "vm-kernel-linux-release-x64-stable" }
     builders { name: "vm-kernel-mac-debug-x64-stable" mixins: "mac" }
     builders { name: "vm-kernel-mac-release-x64-stable" mixins: "mac" }
-    builders { name: "vm-kernel-win-release-x64-stable" mixins: "win" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-stable" mixins: "slow" }
     builders { name: "vm-kernel-precomp-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-stable" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-stable" }
     builders { name: "vm-kernel-precomp-win-release-x64-stable" mixins: "win" }
+    builders { name: "vm-kernel-reload-linux-debug-x64-stable" }
+    builders { name: "vm-kernel-reload-linux-release-x64-stable" }
+    builders { name: "vm-kernel-reload-mac-debug-simdbc64-stable" mixins: "mac" }
+    builders { name: "vm-kernel-reload-mac-release-simdbc64-stable" mixins: "mac" }
+    builders { name: "vm-kernel-reload-rollback-linux-debug-x64-stable" }
+    builders { name: "vm-kernel-reload-rollback-linux-release-x64-stable" }
+    builders { name: "vm-kernel-win-release-x64-stable" mixins: "win" }
     builders { name: "vm-linux-debug-ia32-stable" }
     builders { name: "vm-linux-debug-simarm-stable" }
     builders { name: "vm-linux-debug-x64-stable" }
@@ -551,10 +569,16 @@ buckets {
     builders { name: "vm-kernel-linux-release-x64-try" }
     builders { name: "vm-kernel-mac-release-x64-try" mixins: "clobber" mixins: "mac" mixins: "vm-kernel" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-try" }
-    builders { name: "vm-kernel-win-release-x64-try" mixins: "win" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-try" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-try" }
     builders { name: "vm-kernel-precomp-win-release-x64-try" mixins: "win" }
+    builders { name: "vm-kernel-reload-linux-debug-x64-try" }
+    builders { name: "vm-kernel-reload-linux-release-x64-try" }
+    builders { name: "vm-kernel-reload-mac-debug-simdbc64-try" mixins: "mac" }
+    builders { name: "vm-kernel-reload-mac-release-simdbc64-try" mixins: "mac" }
+    builders { name: "vm-kernel-reload-rollback-linux-debug-x64-try" }
+    builders { name: "vm-kernel-reload-rollback-linux-release-x64-try" }
+    builders { name: "vm-kernel-win-release-x64-try" mixins: "win" }
     builders { name: "vm-linux-product-x64-try" mixins: "vm" }
     builders { name: "vm-linux-release-x64-try" }
     builders { name: "vm-mac-release-x64-try" mixins: "mac" }

From 62e8e32ce0f537cdd57da223024ac3828a54e0b2 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 30 May 2018 14:28:17 +0000
Subject: [PATCH 127/826] [infra] Fix non-breaking space in cr-buildbucket.cfg

TBR=whesse@google.com

Change-Id: I6f9517c493071fea3bb617fd08b8d885093a2c3e
Reviewed-on: https://dart-review.googlesource.com/57322
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 285c6c33f0fe..87ce01477179 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -250,7 +250,7 @@ buckets {
     builders { name: "vm-kernel-precomp-win-release-x64" mixins: "win" }
     builders { name: "vm-kernel-reload-linux-debug-x64" }
     builders { name: "vm-kernel-reload-linux-release-x64" }
-    builders { name: "vm-kernel-reload-mac-debug-simdbc64" mixins: "mac" }
+    builders { name: "vm-kernel-reload-mac-debug-simdbc64" mixins: "mac" }
     builders { name: "vm-kernel-reload-mac-release-simdbc64" mixins: "mac" }
     builders { name: "vm-kernel-reload-rollback-linux-debug-x64" }
     builders { name: "vm-kernel-reload-rollback-linux-release-x64" }
@@ -355,7 +355,7 @@ buckets {
     builders { name: "vm-kernel-precomp-win-release-x64-dev" mixins: "win" }
     builders { name: "vm-kernel-reload-linux-debug-x64-dev" }
     builders { name: "vm-kernel-reload-linux-release-x64-dev" }
-    builders { name: "vm-kernel-reload-mac-debug-simdbc64-dev" mixins: "mac" }
+    builders { name: "vm-kernel-reload-mac-debug-simdbc64-dev" mixins: "mac" }
     builders { name: "vm-kernel-reload-mac-release-simdbc64-dev" mixins: "mac" }
     builders { name: "vm-kernel-reload-rollback-linux-debug-x64-dev" }
     builders { name: "vm-kernel-reload-rollback-linux-release-x64-dev" }
@@ -460,7 +460,7 @@ buckets {
     builders { name: "vm-kernel-precomp-win-release-x64-stable" mixins: "win" }
     builders { name: "vm-kernel-reload-linux-debug-x64-stable" }
     builders { name: "vm-kernel-reload-linux-release-x64-stable" }
-    builders { name: "vm-kernel-reload-mac-debug-simdbc64-stable" mixins: "mac" }
+    builders { name: "vm-kernel-reload-mac-debug-simdbc64-stable" mixins: "mac" }
     builders { name: "vm-kernel-reload-mac-release-simdbc64-stable" mixins: "mac" }
     builders { name: "vm-kernel-reload-rollback-linux-debug-x64-stable" }
     builders { name: "vm-kernel-reload-rollback-linux-release-x64-stable" }
@@ -574,7 +574,7 @@ buckets {
     builders { name: "vm-kernel-precomp-win-release-x64-try" mixins: "win" }
     builders { name: "vm-kernel-reload-linux-debug-x64-try" }
     builders { name: "vm-kernel-reload-linux-release-x64-try" }
-    builders { name: "vm-kernel-reload-mac-debug-simdbc64-try" mixins: "mac" }
+    builders { name: "vm-kernel-reload-mac-debug-simdbc64-try" mixins: "mac" }
     builders { name: "vm-kernel-reload-mac-release-simdbc64-try" mixins: "mac" }
     builders { name: "vm-kernel-reload-rollback-linux-debug-x64-try" }
     builders { name: "vm-kernel-reload-rollback-linux-release-x64-try" }

From 9ae9366a7ceb1318c6678bf21ed6616ea34d8e1a Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 31 May 2018 10:46:46 +0000
Subject: [PATCH 128/826] [infra] Temporarily remove vm-kernel-reload-mac
 builders from "choose tryjobs" (#33291)

Change-Id: Ib6bb410fb2049bd16de0d50216db6753bb5930ed
Reviewed-on: https://dart-review.googlesource.com/57509
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 2 --
 1 file changed, 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 87ce01477179..d11c7817baba 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -574,8 +574,6 @@ buckets {
     builders { name: "vm-kernel-precomp-win-release-x64-try" mixins: "win" }
     builders { name: "vm-kernel-reload-linux-debug-x64-try" }
     builders { name: "vm-kernel-reload-linux-release-x64-try" }
-    builders { name: "vm-kernel-reload-mac-debug-simdbc64-try" mixins: "mac" }
-    builders { name: "vm-kernel-reload-mac-release-simdbc64-try" mixins: "mac" }
     builders { name: "vm-kernel-reload-rollback-linux-debug-x64-try" }
     builders { name: "vm-kernel-reload-rollback-linux-release-x64-try" }
     builders { name: "vm-kernel-win-release-x64-try" mixins: "win" }

From 3ab0a3fad52cacb0bdfe65ce12a81b577004cb17 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 4 Jun 2018 11:49:50 +0000
Subject: [PATCH 129/826] [infra] Add reload/rollback Linux builders to
 scheduler and consoles (#33126)

Change-Id: If13ff4e2b5ac8fe7fbd89222224091c4417e601a
Reviewed-on: https://dart-review.googlesource.com/58180
Reviewed-by: Martin Kustermann <kustermann@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-milo.cfg      | 100 +++++++++++++++++++++++
 luci-scheduler.cfg | 198 ++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 271 insertions(+), 27 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index f16592396f14..ae61ccc403c1 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -470,6 +470,26 @@ consoles: {
     category: "vm|reload"
     short_name: "rro"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
+    category: "vm|reload-kernel"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
+    category: "vm|reload-kernel"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
+    category: "vm|reload-kernel"
+    short_name: "drb"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64"
+    category: "vm|reload-kernel"
+    short_name: "rrb"
+  }
   builders {
     # migrating to dart2js-hostchecked-linux-ia32-d8
     name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-1-5-be"
@@ -1533,6 +1553,26 @@ consoles: {
     category: "vm|reload"
     short_name: "rro"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
+    category: "vm|reload-kernel"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
+    category: "vm|reload-kernel"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
+    category: "vm|reload-kernel"
+    short_name: "drb"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64"
+    category: "vm|reload-kernel"
+    short_name: "rrb"
+  }
   header: {
     links: {
       name: "Consoles"
@@ -1877,6 +1917,26 @@ consoles: {
     category: "vm|reload"
     short_name: "rro"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
+    category: "vm|reload-kernel"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
+    category: "vm|reload-kernel"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
+    category: "vm|reload-kernel"
+    short_name: "drb"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64"
+    category: "vm|reload-kernel"
+    short_name: "rrb"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-ia32-d8"
     category: "dart2js|d8"
@@ -2381,6 +2441,26 @@ consoles: {
     category: "vm|reload"
     short_name: "rro"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64-dev"
+    category: "vm|reload-kernel"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64-dev"
+    category: "vm|reload-kernel"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64-dev"
+    category: "vm|reload-kernel"
+    short_name: "drb"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64-dev"
+    category: "vm|reload-kernel"
+    short_name: "rrb"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-ia32-d8-dev"
     category: "dart2js|d8"
@@ -2885,6 +2965,26 @@ consoles: {
     category: "vm|reload"
     short_name: "rro"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64-stable"
+    category: "vm|reload-kernel"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64-stable"
+    category: "vm|reload-kernel"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64-stable"
+    category: "vm|reload-kernel"
+    short_name: "drb"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64-stable"
+    category: "vm|reload-kernel"
+    short_name: "rrb"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-ia32-d8-stable"
     category: "dart2js|d8"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index f14a8a323a9b..b82ab2bdc1aa 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -53,10 +53,14 @@ trigger {
   triggers: "vm-kernel-linux-release-simarm64"
   triggers: "vm-kernel-linux-release-simdbc64"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
-  triggers: "vm-kernel-win-release-x64"
   triggers: "vm-kernel-precomp-linux-release-simarm"
   triggers: "vm-kernel-precomp-linux-release-simarm64"
   triggers: "vm-kernel-precomp-win-release-x64"
+  triggers: "vm-kernel-reload-linux-debug-x64"
+  triggers: "vm-kernel-reload-linux-release-x64"
+  triggers: "vm-kernel-reload-rollback-linux-debug-x64"
+  triggers: "vm-kernel-reload-rollback-linux-release-x64"
+  triggers: "vm-kernel-win-release-x64"
 }
 
 trigger {
@@ -98,10 +102,14 @@ trigger {
   triggers: "vm-kernel-linux-release-simarm64-dev"
   triggers: "vm-kernel-linux-release-simdbc64-dev"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
-  triggers: "vm-kernel-win-release-x64-dev"
   triggers: "vm-kernel-precomp-linux-release-simarm-dev"
   triggers: "vm-kernel-precomp-linux-release-simarm64-dev"
   triggers: "vm-kernel-precomp-win-release-x64-dev"
+  triggers: "vm-kernel-reload-linux-debug-x64-dev"
+  triggers: "vm-kernel-reload-linux-release-x64-dev"
+  triggers: "vm-kernel-reload-rollback-linux-debug-x64-dev"
+  triggers: "vm-kernel-reload-rollback-linux-release-x64-dev"
+  triggers: "vm-kernel-win-release-x64-dev"
 }
 
 trigger {
@@ -143,10 +151,14 @@ trigger {
   triggers: "vm-kernel-linux-release-simarm64-stable"
   triggers: "vm-kernel-linux-release-simdbc64-stable"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
-  triggers: "vm-kernel-win-release-x64-stable"
   triggers: "vm-kernel-precomp-linux-release-simarm-stable"
   triggers: "vm-kernel-precomp-linux-release-simarm64-stable"
   triggers: "vm-kernel-precomp-win-release-x64-stable"
+  triggers: "vm-kernel-reload-linux-debug-x64-stable"
+  triggers: "vm-kernel-reload-linux-release-x64-stable"
+  triggers: "vm-kernel-reload-rollback-linux-debug-x64-stable"
+  triggers: "vm-kernel-reload-rollback-linux-release-x64-stable"
+  triggers: "vm-kernel-win-release-x64-stable"
 }
 
 job {
@@ -505,46 +517,90 @@ job {
 }
 
 job {
-  id: "vm-kernel-win-release-x64"
+  id: "vm-kernel-precomp-linux-release-simarm"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-release-x64"
+    builder: "vm-kernel-precomp-linux-release-simarm"
   }
 }
 
 job {
-  id: "vm-kernel-precomp-linux-release-simarm"
+  id: "vm-kernel-precomp-linux-release-simarm64"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm"
+    builder: "vm-kernel-precomp-linux-release-simarm64"
   }
 }
 
 job {
-  id: "vm-kernel-precomp-linux-release-simarm64"
+  id: "vm-kernel-precomp-win-release-x64"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm64"
+    builder: "vm-kernel-precomp-win-release-x64"
   }
 }
 
 job {
-  id: "vm-kernel-precomp-win-release-x64"
+  id: "vm-kernel-reload-linux-debug-x64"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-x64"
+    builder: "vm-kernel-reload-linux-debug-x64"
+  }
+}
+
+job {
+  id: "vm-kernel-reload-linux-release-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-linux-release-x64"
+  }
+}
+
+job {
+  id: "vm-kernel-reload-rollback-linux-debug-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-rollback-linux-debug-x64"
+  }
+}
+
+job {
+  id: "vm-kernel-reload-rollback-linux-release-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-rollback-linux-release-x64"
+  }
+}
+
+job {
+  id: "vm-kernel-win-release-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-release-x64"
   }
 }
 
@@ -904,46 +960,90 @@ job {
 }
 
 job {
-  id: "vm-kernel-win-release-x64-dev"
+  id: "vm-kernel-precomp-linux-release-simarm-dev"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-release-x64-dev"
+    builder: "vm-kernel-precomp-linux-release-simarm-dev"
   }
 }
 
 job {
-  id: "vm-kernel-precomp-linux-release-simarm-dev"
+  id: "vm-kernel-precomp-linux-release-simarm64-dev"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm-dev"
+    builder: "vm-kernel-precomp-linux-release-simarm64-dev"
   }
 }
 
 job {
-  id: "vm-kernel-precomp-linux-release-simarm64-dev"
+  id: "vm-kernel-precomp-win-release-x64-dev"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm64-dev"
+    builder: "vm-kernel-precomp-win-release-x64-dev"
   }
 }
 
 job {
-  id: "vm-kernel-precomp-win-release-x64-dev"
+  id: "vm-kernel-reload-linux-debug-x64-dev"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-x64-dev"
+    builder: "vm-kernel-reload-linux-debug-x64-dev"
+  }
+}
+
+job {
+  id: "vm-kernel-reload-linux-release-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-linux-release-x64-dev"
+  }
+}
+
+job {
+  id: "vm-kernel-reload-rollback-linux-debug-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-rollback-linux-debug-x64-dev"
+  }
+}
+
+job {
+  id: "vm-kernel-reload-rollback-linux-release-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-rollback-linux-release-x64-dev"
+  }
+}
+
+job {
+  id: "vm-kernel-win-release-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-release-x64-dev"
   }
 }
 
@@ -1303,45 +1403,89 @@ job {
 }
 
 job {
-  id: "vm-kernel-win-release-x64-stable"
+  id: "vm-kernel-precomp-linux-release-simarm-stable"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-release-x64-stable"
+    builder: "vm-kernel-precomp-linux-release-simarm-stable"
   }
 }
 
 job {
-  id: "vm-kernel-precomp-linux-release-simarm-stable"
+  id: "vm-kernel-precomp-linux-release-simarm64-stable"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm-stable"
+    builder: "vm-kernel-precomp-linux-release-simarm64-stable"
   }
 }
 
 job {
-  id: "vm-kernel-precomp-linux-release-simarm64-stable"
+  id: "vm-kernel-precomp-win-release-x64-stable"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm64-stable"
+    builder: "vm-kernel-precomp-win-release-x64-stable"
   }
 }
 
 job {
-  id: "vm-kernel-precomp-win-release-x64-stable"
+  id: "vm-kernel-reload-linux-debug-x64-stable"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-x64-stable"
+    builder: "vm-kernel-reload-linux-debug-x64-stable"
+  }
+}
+
+job {
+  id: "vm-kernel-reload-linux-release-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-linux-release-x64-stable"
+  }
+}
+
+job {
+  id: "vm-kernel-reload-rollback-linux-debug-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-rollback-linux-debug-x64-stable"
+  }
+}
+
+job {
+  id: "vm-kernel-reload-rollback-linux-release-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-rollback-linux-release-x64-stable"
+  }
+}
+
+job {
+  id: "vm-kernel-win-release-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-release-x64-stable"
   }
 }

From f023b84adf3ce99e3a1e595fed553daddafd6667 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 6 Jun 2018 18:37:56 +0000
Subject: [PATCH 130/826] [infra] Change runtime to chrome for
 dart2js-csp-minified builder

This was changed on buildbot in https://crrev.com/c/904163

TBR=whesse@google.com

Change-Id: Ie873d00da468a0121c4283a856a7dbae489b59c4
Reviewed-on: https://dart-review.googlesource.com/58860
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index d11c7817baba..729ca2a52cc2 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -198,7 +198,7 @@ buckets {
     builders { name: "app-linux-product-x64" }
     builders { name: "app-linux-release-x64" }
     builders { name: "cross-vm-linux-release-arm64" }
-    builders { name: "dart2js-csp-minified-linux-x64-drt" }
+    builders { name: "dart2js-csp-minified-linux-x64-chrome" }
     builders { name: "dart2js-dumpinfo-linux-ia32-none" }
     builders { name: "dart2js-faststartup-linux-x64-chrome" }
     builders { name: "dart2js-hostchecked-linux-ia32-d8" }
@@ -303,7 +303,7 @@ buckets {
     builders { name: "app-linux-product-x64-dev" }
     builders { name: "app-linux-release-x64-dev" }
     builders { name: "cross-vm-linux-release-arm64-dev" }
-    builders { name: "dart2js-csp-minified-linux-x64-drt-dev" }
+    builders { name: "dart2js-csp-minified-linux-x64-chrome-dev" }
     builders { name: "dart2js-dumpinfo-linux-ia32-none-dev" }
     builders { name: "dart2js-faststartup-linux-x64-chrome-dev" }
     builders { name: "dart2js-hostchecked-linux-ia32-d8-dev" }
@@ -408,7 +408,7 @@ buckets {
     builders { name: "app-linux-product-x64-stable" }
     builders { name: "app-linux-release-x64-stable" }
     builders { name: "cross-vm-linux-release-arm64-stable" }
-    builders { name: "dart2js-csp-minified-linux-x64-drt-stable" }
+    builders { name: "dart2js-csp-minified-linux-x64-chrome-stable" }
     builders { name: "dart2js-dumpinfo-linux-ia32-none-stable" }
     builders { name: "dart2js-faststartup-linux-x64-chrome-stable" }
     builders { name: "dart2js-hostchecked-linux-ia32-d8-stable" }

From 1e0d19cd0ea92e91cf8c06dfc978bb3f9f036f27 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 7 Jun 2018 07:05:20 +0000
Subject: [PATCH 131/826] [infra] Migrate dart2js-csp-minified builder to Luci

TBR=whesse@google.com

Change-Id: Ia98425940c81dd33bf01b6c42367ee1e2422b04d
Reviewed-on: https://dart-review.googlesource.com/59040
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg |  1 +
 luci-milo.cfg      |  6 ++----
 luci-scheduler.cfg | 36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 729ca2a52cc2..4c6273c6a46f 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -544,6 +544,7 @@ buckets {
     builders { name: "app-kernel-linux-release-x64-try" }
     builders { name: "benchmark-linux-try" }
     builders { name: "dart-sdk-windows-try" mixins: "sdk" mixins: "win" }
+    builders { name: "dart2js-csp-minified-linux-x64-chrome-try" }
     builders { name: "dart2js-faststartup-linux-x64-chrome-try" }
     builders { name: "dart2js-linux-d8-hostchecked-try" mixins: "dart2js" }
     builders { name: "dart2js-linux-d8-kernel-minified-try" mixins: "dart2js" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index ae61ccc403c1..55ee04dfdbf1 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -673,8 +673,7 @@ consoles: {
 #    short_name: "l"
 #  }
   builders {
-    # migrating to dart2js-csp-minified-linux-x64-chrome
-    name: "buildbot/client.dart/dart2js-linux-chrome-csp-minified-be"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "csp"
   }
@@ -1011,8 +1010,7 @@ consoles: {
 #    short_name: "l"
 #  }
   builders {
-    # migrating to dart2js-csp-minified-linux-x64-chrome
-    name: "buildbot/client.dart/dart2js-linux-chrome-csp-minified-be"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "csp"
   }
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index b82ab2bdc1aa..9dfa0db02261 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -34,6 +34,7 @@ trigger {
   triggers: "dart-sdk-linux"
   triggers: "dart-sdk-mac"
   triggers: "dart-sdk-win"
+  triggers: "dart2js-csp-minified-linux-x64-chrome"
   triggers: "dart2js-faststartup-linux-x64-chrome"
   triggers: "dart2js-linux-x64-chrome"
   triggers: "dart2js-mac-x64-chrome"
@@ -83,6 +84,7 @@ trigger {
   triggers: "dart-sdk-linux-dev"
   triggers: "dart-sdk-mac-dev"
   triggers: "dart-sdk-win-dev"
+  triggers: "dart2js-csp-minified-linux-x64-chrome-dev"
   triggers: "dart2js-faststartup-linux-x64-chrome-dev"
   triggers: "dart2js-linux-x64-chrome-dev"
   triggers: "dart2js-mac-x64-chrome-dev"
@@ -132,6 +134,7 @@ trigger {
   triggers: "dart-sdk-linux-stable"
   triggers: "dart-sdk-mac-stable"
   triggers: "dart-sdk-win-stable"
+  triggers: "dart2js-csp-minified-linux-x64-chrome-stable"
   triggers: "dart2js-faststartup-linux-x64-chrome-stable"
   triggers: "dart2js-linux-x64-chrome-stable"
   triggers: "dart2js-mac-x64-chrome-stable"
@@ -307,6 +310,17 @@ job {
   }
 }
 
+job {
+  id: "dart2js-csp-minified-linux-x64-chrome"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-csp-minified-linux-x64-chrome"
+  }
+}
+
 job {
   id: "dart2js-faststartup-linux-x64-chrome"
   acl_sets: "default"
@@ -750,6 +764,17 @@ job {
   }
 }
 
+job {
+  id: "dart2js-csp-minified-linux-x64-chrome-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-csp-minified-linux-x64-chrome-dev"
+  }
+}
+
 job {
   id: "dart2js-faststartup-linux-x64-chrome-dev"
   acl_sets: "default"
@@ -1193,6 +1218,17 @@ job {
   }
 }
 
+job {
+  id: "dart2js-csp-minified-linux-x64-chrome-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-csp-minified-linux-x64-chrome-stable"
+  }
+}
+
 job {
   id: "dart2js-faststartup-linux-x64-chrome-stable"
   acl_sets: "default"

From 5822d577ae05bb12d06aefc38a093a4b83390e31 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 7 Jun 2018 13:12:09 +0000
Subject: [PATCH 132/826] [infra] Use neo recipe for vm-linux-product-x64-try
 builder

TBR=whesse@google.com

Change-Id: I8dbe9c2b24d749542a310f21db9a05a67da22462
Reviewed-on: https://dart-review.googlesource.com/59083
Reviewed-by: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 4c6273c6a46f..179688f8165d 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -90,13 +90,6 @@ builder_mixins {
   }
 }
 
-builder_mixins {
-  name: "vm"
-  recipe {
-    name: "dart/dart_vm"
-  }
-}
-
 builder_mixins {
   name: "vm-kernel"
   recipe {
@@ -578,7 +571,7 @@ buckets {
     builders { name: "vm-kernel-reload-rollback-linux-debug-x64-try" }
     builders { name: "vm-kernel-reload-rollback-linux-release-x64-try" }
     builders { name: "vm-kernel-win-release-x64-try" mixins: "win" }
-    builders { name: "vm-linux-product-x64-try" mixins: "vm" }
+    builders { name: "vm-linux-product-x64-try" }
     builders { name: "vm-linux-release-x64-try" }
     builders { name: "vm-mac-release-x64-try" mixins: "mac" }
   }

From e07ab63365011b826a69c504993b6f3b72d5df4f Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 11 Jun 2018 21:00:49 +0000
Subject: [PATCH 133/826] [infra] Remove obsolete VM kernel legacy/checked
 builders

Change-Id: I25569721ebd44e846590e26cf8fb922c233b7225
Reviewed-on: https://dart-review.googlesource.com/59781
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg |  7 -------
 luci-milo.cfg      | 31 -------------------------------
 luci-scheduler.cfg | 36 ------------------------------------
 3 files changed, 74 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 179688f8165d..f4ebeea4ffd6 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -225,8 +225,6 @@ buckets {
     builders { name: "target-vm-linux-release-arm64" dimensions: "cpu:arm64" }
     builders { name: "versionchecker-linux" }
     builders { name: "vm-asan-linux-release-x64" }
-    builders { name: "vm-kernel-checked-linux-release-x64" }
-    builders { name: "vm-kernel-legacy-linux-release-x64" }
     builders { name: "vm-kernel-linux-debug-x64" }
     builders { name: "vm-kernel-linux-debug-simdbc64" }
     builders { name: "vm-kernel-linux-release-simarm" }
@@ -330,8 +328,6 @@ buckets {
     builders { name: "target-vm-linux-release-arm64-dev" dimensions: "cpu:arm64" }
     builders { name: "versionchecker-linux-dev" }
     builders { name: "vm-asan-linux-release-x64-dev" }
-    builders { name: "vm-kernel-checked-linux-release-x64-dev" }
-    builders { name: "vm-kernel-legacy-linux-release-x64-dev" }
     builders { name: "vm-kernel-linux-debug-x64-dev" }
     builders { name: "vm-kernel-linux-debug-simdbc64-dev" }
     builders { name: "vm-kernel-linux-release-simarm-dev" }
@@ -435,8 +431,6 @@ buckets {
     builders { name: "target-vm-linux-release-arm64-stable" dimensions: "cpu:arm64" }
     builders { name: "versionchecker-linux-stable" }
     builders { name: "vm-asan-linux-release-x64-stable" }
-    builders { name: "vm-kernel-checked-linux-release-x64-stable" }
-    builders { name: "vm-kernel-legacy-linux-release-x64-stable" }
     builders { name: "vm-kernel-linux-debug-x64-stable" }
     builders { name: "vm-kernel-linux-debug-simdbc64-stable" }
     builders { name: "vm-kernel-linux-release-simarm-stable" }
@@ -555,7 +549,6 @@ buckets {
     builders { name: "pkg-mac-release-try" mixins: "mac" }
     builders { name: "pkg-win-release-try" mixins: "win" }
     builders { name: "vm-canary-linux-debug-try" }
-    builders { name: "vm-kernel-legacy-linux-release-x64-try" }
     builders { name: "vm-kernel-linux-debug-simdbc64-try" }
     builders { name: "vm-kernel-linux-release-simarm-try" }
     builders { name: "vm-kernel-linux-release-simarm64-try" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 55ee04dfdbf1..c51c9911509e 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -21,11 +21,6 @@ consoles: {
     category: "fasta"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64"
-    category: "fasta"
-    short_name: "vm"
-  }
   builders {
     # migrating to vm-linux-debug-ia32
     name: "buildbot/client.dart/vm-linux-debug-ia32-be"
@@ -824,11 +819,6 @@ consoles: {
     category: "fasta"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64"
-    category: "fasta"
-    short_name: "vm"
-  }
   builders {
     # migrating to dart2js-hostchecked-linux-ia32-d8
     name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-1-5-be"
@@ -1625,11 +1615,6 @@ consoles: {
     category: "fasta"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64"
-    category: "fasta"
-    short_name: "vm"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-ia32"
     category: "vm|debug"
@@ -2149,11 +2134,6 @@ consoles: {
     category: "fasta"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64-dev"
-    category: "fasta"
-    short_name: "vm"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-ia32-dev"
     category: "vm|debug"
@@ -2673,11 +2653,6 @@ consoles: {
     category: "fasta"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-legacy-linux-release-x64-stable"
-    category: "fasta"
-    short_name: "vm"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-ia32-stable"
     category: "vm|debug"
@@ -3182,11 +3157,6 @@ consoles: {
   repo_url: "https://dart.googlesource.com/sdk"
   ref: "refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
-    category: "vm-kernel"
-    short_name: "cr"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-debug-ia32-none"
     category: "dart2js"
@@ -3268,7 +3238,6 @@ consoles: {
   builders { name: "buildbucket/luci.dart.try/front-end-linux-release-x64-try" }
   builders { name: "buildbucket/luci.dart.try/pkg-linux-release-try" }
   builders { name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try" }
-  builders { name: "buildbucket/luci.dart.try/vm-kernel-legacy-linux-release-x64-try" }
   builders { name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simdbc64-try" }
   builders { name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try" }
   builders { name: "buildbucket/luci.dart.try/vm-linux-product-x64-try" }
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 9dfa0db02261..72725a34b012 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -48,7 +48,6 @@ trigger {
   triggers: "pkg-linux-release"
   triggers: "pkg-mac-release"
   triggers: "pkg-win-release"
-  triggers: "vm-kernel-legacy-linux-release-x64"
   triggers: "vm-kernel-linux-debug-simdbc64"
   triggers: "vm-kernel-linux-release-simarm"
   triggers: "vm-kernel-linux-release-simarm64"
@@ -98,7 +97,6 @@ trigger {
   triggers: "pkg-linux-release-dev"
   triggers: "pkg-mac-release-dev"
   triggers: "pkg-win-release-dev"
-  triggers: "vm-kernel-legacy-linux-release-x64-dev"
   triggers: "vm-kernel-linux-debug-simdbc64-dev"
   triggers: "vm-kernel-linux-release-simarm-dev"
   triggers: "vm-kernel-linux-release-simarm64-dev"
@@ -148,7 +146,6 @@ trigger {
   triggers: "pkg-linux-release-stable"
   triggers: "pkg-mac-release-stable"
   triggers: "pkg-win-release-stable"
-  triggers: "vm-kernel-legacy-linux-release-x64-stable"
   triggers: "vm-kernel-linux-debug-simdbc64-stable"
   triggers: "vm-kernel-linux-release-simarm-stable"
   triggers: "vm-kernel-linux-release-simarm64-stable"
@@ -464,17 +461,6 @@ job {
   }
 }
 
-job {
-  id: "vm-kernel-legacy-linux-release-x64"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-legacy-linux-release-x64"
-  }
-}
-
 job {
   id: "vm-kernel-linux-debug-simdbc64"
   acl_sets: "default"
@@ -918,17 +904,6 @@ job {
   }
 }
 
-job {
-  id: "vm-kernel-legacy-linux-release-x64-dev"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-legacy-linux-release-x64-dev"
-  }
-}
-
 job {
   id: "vm-kernel-linux-debug-simdbc64-dev"
   acl_sets: "default"
@@ -1372,17 +1347,6 @@ job {
   }
 }
 
-job {
-  id: "vm-kernel-legacy-linux-release-x64-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-legacy-linux-release-x64-stable"
-  }
-}
-
 job {
   id: "vm-kernel-linux-debug-simdbc64-stable"
   acl_sets: "default"

From ee7556d716b21198274e3de9fe58a1f5724ba24e Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 13 Jun 2018 04:18:13 +0000
Subject: [PATCH 134/826] [infra] Remove obsolete analyzer builder

TBR=whesse@google.com

Change-Id: Ib14186316d4b39552326274801b8a2f17dbad396
Reviewed-on: https://dart-review.googlesource.com/60064
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 1 -
 luci-milo.cfg      | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index f4ebeea4ffd6..198658b44031 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -519,7 +519,6 @@ buckets {
 
     # CQ / choose tryjobs builders
     builders { name: "analyzer-analysis-server-linux-try" }
-    builders { name: "analyzer-linux-release-strong-hostchecked-try" }
     builders { name: "analyzer-linux-release-try" }
     builders { name: "analyzer-mac-release-try" mixins: "mac" }
     builders { name: "analyzer-strong-linux-release-try" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index c51c9911509e..71b8fb5660a3 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -3227,7 +3227,8 @@ consoles: {
   repo_url: "https://dart.googlesource.com/sdk"
   ref: "refs/heads/master"
   manifest_name: "PATCHED"
-  builders { name: "buildbucket/luci.dart.try/analyzer-linux-release-strong-hostchecked-try" }
+  builders { name: "buildbucket/luci.dart.try/analyzer-linux-release-try" }
+  builders { name: "buildbucket/luci.dart.try/analyzer-strong-linux-release-try" }
   builders { name: "buildbucket/luci.dart.try/benchmark-linux-try" }
   builders { name: "buildbucket/luci.dart.try/dart-sdk-windows-try" }
   builders { name: "buildbucket/luci.dart.try/dart2js-linux-d8-hostchecked-try" }

From d49d6090adc71c8cc41521888355e360e4b773a3 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Sat, 16 Jun 2018 05:49:11 +0000
Subject: [PATCH 135/826] [infra] Temporarily disable incremental builds

TBR=whesse@google.com

Change-Id: Ib86613fbbe4d301d182db98112f1b53a0e9c534c
Reviewed-on: https://dart-review.googlesource.com/60540
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 198658b44031..e05684514737 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -124,6 +124,7 @@ buckets {
       }
       recipe {
         repository: "https://chromium.googlesource.com/chromium/tools/build.git"
+        properties: "clobber:true"
         properties: "mastername:client.dart"
         name: "dart/neo"
       }
@@ -169,6 +170,7 @@ buckets {
       }
       recipe {
         repository: "https://chromium.googlesource.com/chromium/tools/build.git"
+        properties: "clobber:true"
         properties: "mastername:client.dart"
         name: "dart/neo"
       }
@@ -506,6 +508,7 @@ buckets {
       }
       recipe {
         repository: "https://chromium.googlesource.com/chromium/tools/build.git"
+        properties: "clobber:true"
         properties: "mastername:dart.try"
         name: "dart/neo"
       }

From 7ea3f8d30918530e13c71a8b50883fb26e312a94 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Sun, 17 Jun 2018 16:50:40 +0000
Subject: [PATCH 136/826] [infra] Add standard precomp builders to try bucket

TBR=whesse@google.com

Change-Id: I6652b2006e6d7e815122b57341466c9dca0e3e5f
Reviewed-on: https://dart-review.googlesource.com/60320
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index e05684514737..01aa1c917c44 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -558,8 +558,10 @@ buckets {
     builders { name: "vm-kernel-linux-release-x64-try" }
     builders { name: "vm-kernel-mac-release-x64-try" mixins: "clobber" mixins: "mac" mixins: "vm-kernel" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-try" }
+    builders { name: "vm-kernel-precomp-linux-debug-x64-try" mixins: "slow" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-try" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-try" }
+    builders { name: "vm-kernel-precomp-linux-release-x64-try" }
     builders { name: "vm-kernel-precomp-win-release-x64-try" mixins: "win" }
     builders { name: "vm-kernel-reload-linux-debug-x64-try" }
     builders { name: "vm-kernel-reload-linux-release-x64-try" }

From 41f02d79d33727505f55fc5edef63f6f580fa3f0 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Sun, 17 Jun 2018 18:46:10 +0000
Subject: [PATCH 137/826] [infra] Migrate remaining vm-kernel-linux builders to
 Luci

* This causes the vm-kernel builders to be based on the test matrix.
* The migrated vm-kernel builders will run without test selectors.

Related to https://github.com/dart-lang/sdk/issues/32499

Change-Id: Id7ebe7c83feccd34ae109bc7f56a3aad0c04fd3f
Reviewed-on: https://dart-review.googlesource.com/46980
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-milo.cfg      | 176 ++++-----------------------------------------
 luci-scheduler.cfg | 144 +++++++++++++++++++++++++++++++++++++
 2 files changed, 156 insertions(+), 164 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 71b8fb5660a3..3391eb979b43 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -157,8 +157,7 @@ consoles: {
     short_name: "r64"
   }
   builders {
-    # migrating to vm-kernel-linux-debug-x64
-    name: "buildbot/client.dart/vm-kernel-linux-debug-x64-be"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
     category: "vm|kernel"
     short_name: "d"
   }
@@ -183,8 +182,7 @@ consoles: {
     short_name: "rbc"
   }
   builders {
-    # migrating to vm-kernel-linux-release-x64
-    name: "buildbot/client.dart/vm-kernel-linux-release-x64-be"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
     category: "vm|kernel"
     short_name: "r"
   }
@@ -211,52 +209,9 @@ consoles: {
     short_name: "wr"
   }
   builders {
-    # migrating to vm-kernel-precomp-linux-debug-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-1-8-be"
-    category: "vm|kernel-precomp"
-    short_name: "1d"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-linux-debug-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-2-8-be"
-    category: "vm|kernel-precomp"
-    short_name: "2d"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-linux-debug-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-3-8-be"
-    category: "vm|kernel-precomp"
-    short_name: "3d"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-linux-debug-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-4-8-be"
-    category: "vm|kernel-precomp"
-    short_name: "4d"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-linux-debug-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-5-8-be"
-    category: "vm|kernel-precomp"
-    short_name: "5d"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-linux-debug-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-6-8-be"
-    category: "vm|kernel-precomp"
-    short_name: "6d"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-linux-debug-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-7-8-be"
-    category: "vm|kernel-precomp"
-    short_name: "7d"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-linux-debug-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-8-8-be"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
     category: "vm|kernel-precomp"
-    short_name: "8d"
+    short_name: "d"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
@@ -269,40 +224,9 @@ consoles: {
     short_name: "a64"
   }
   builders {
-    # migrating to vm-kernel-precomp-linux-release-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-1-6-be"
-    category: "vm|kernel-precomp"
-    short_name: "1r"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-linux-release-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-2-6-be"
-    category: "vm|kernel-precomp"
-    short_name: "2r"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-linux-release-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-3-6-be"
-    category: "vm|kernel-precomp"
-    short_name: "3r"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-linux-release-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-4-6-be"
-    category: "vm|kernel-precomp"
-    short_name: "4r"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-linux-release-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-5-6-be"
-    category: "vm|kernel-precomp"
-    short_name: "5r"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-linux-release-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-6-6-be"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
     category: "vm|kernel-precomp"
-    short_name: "6r"
+    short_name: "r"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
@@ -1233,8 +1157,7 @@ consoles: {
     short_name: "r64"
   }
   builders {
-    # migrating to vm-kernel-linux-debug-x64
-    name: "buildbot/client.dart/vm-kernel-linux-debug-x64-be"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
     category: "vm|kernel"
     short_name: "d"
   }
@@ -1259,8 +1182,7 @@ consoles: {
     short_name: "rbc"
   }
   builders {
-    # migrating to vm-kernel-linux-release-x64
-    name: "buildbot/client.dart/vm-kernel-linux-release-x64-be"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
     category: "vm|kernel"
     short_name: "r"
   }
@@ -1287,52 +1209,9 @@ consoles: {
     short_name: "wr"
   }
   builders {
-    # migrating to vm-kernel-precomp-linux-debug-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-1-8-be"
-    category: "vm|kernel-precomp"
-    short_name: "1d"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-linux-debug-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-2-8-be"
-    category: "vm|kernel-precomp"
-    short_name: "2d"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-linux-debug-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-3-8-be"
-    category: "vm|kernel-precomp"
-    short_name: "3d"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-linux-debug-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-4-8-be"
-    category: "vm|kernel-precomp"
-    short_name: "4d"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-linux-debug-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-5-8-be"
-    category: "vm|kernel-precomp"
-    short_name: "5d"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-linux-debug-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-6-8-be"
-    category: "vm|kernel-precomp"
-    short_name: "6d"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-linux-debug-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-7-8-be"
-    category: "vm|kernel-precomp"
-    short_name: "7d"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-linux-debug-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-debug-x64-8-8-be"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
     category: "vm|kernel-precomp"
-    short_name: "8d"
+    short_name: "d"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
@@ -1345,40 +1224,9 @@ consoles: {
     short_name: "a64"
   }
   builders {
-    # migrating to vm-kernel-precomp-linux-release-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-1-6-be"
-    category: "vm|kernel-precomp"
-    short_name: "1r"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-linux-release-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-2-6-be"
-    category: "vm|kernel-precomp"
-    short_name: "2r"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-linux-release-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-3-6-be"
-    category: "vm|kernel-precomp"
-    short_name: "3r"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-linux-release-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-4-6-be"
-    category: "vm|kernel-precomp"
-    short_name: "4r"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-linux-release-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-5-6-be"
-    category: "vm|kernel-precomp"
-    short_name: "5r"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-linux-release-x64
-    name: "buildbot/client.dart/vm-kernel-precomp-linux-release-x64-6-6-be"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
     category: "vm|kernel-precomp"
-    short_name: "6r"
+    short_name: "r"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 72725a34b012..9568fb811c3d 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -49,12 +49,16 @@ trigger {
   triggers: "pkg-mac-release"
   triggers: "pkg-win-release"
   triggers: "vm-kernel-linux-debug-simdbc64"
+  triggers: "vm-kernel-linux-debug-x64"
   triggers: "vm-kernel-linux-release-simarm"
   triggers: "vm-kernel-linux-release-simarm64"
   triggers: "vm-kernel-linux-release-simdbc64"
+  triggers: "vm-kernel-linux-release-x64"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
+  triggers: "vm-kernel-precomp-linux-debug-x64"
   triggers: "vm-kernel-precomp-linux-release-simarm"
   triggers: "vm-kernel-precomp-linux-release-simarm64"
+  triggers: "vm-kernel-precomp-linux-release-x64"
   triggers: "vm-kernel-precomp-win-release-x64"
   triggers: "vm-kernel-reload-linux-debug-x64"
   triggers: "vm-kernel-reload-linux-release-x64"
@@ -98,12 +102,16 @@ trigger {
   triggers: "pkg-mac-release-dev"
   triggers: "pkg-win-release-dev"
   triggers: "vm-kernel-linux-debug-simdbc64-dev"
+  triggers: "vm-kernel-linux-debug-x64-dev"
   triggers: "vm-kernel-linux-release-simarm-dev"
   triggers: "vm-kernel-linux-release-simarm64-dev"
   triggers: "vm-kernel-linux-release-simdbc64-dev"
+  triggers: "vm-kernel-linux-release-x64-dev"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-linux-debug-x64-dev"
   triggers: "vm-kernel-precomp-linux-release-simarm-dev"
   triggers: "vm-kernel-precomp-linux-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-win-release-x64-dev"
   triggers: "vm-kernel-reload-linux-debug-x64-dev"
   triggers: "vm-kernel-reload-linux-release-x64-dev"
@@ -147,12 +155,16 @@ trigger {
   triggers: "pkg-mac-release-stable"
   triggers: "pkg-win-release-stable"
   triggers: "vm-kernel-linux-debug-simdbc64-stable"
+  triggers: "vm-kernel-linux-debug-x64-stable"
   triggers: "vm-kernel-linux-release-simarm-stable"
   triggers: "vm-kernel-linux-release-simarm64-stable"
   triggers: "vm-kernel-linux-release-simdbc64-stable"
+  triggers: "vm-kernel-linux-release-x64-stable"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
+  triggers: "vm-kernel-precomp-linux-debug-x64-stable"
   triggers: "vm-kernel-precomp-linux-release-simarm-stable"
   triggers: "vm-kernel-precomp-linux-release-simarm64-stable"
+  triggers: "vm-kernel-precomp-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-win-release-x64-stable"
   triggers: "vm-kernel-reload-linux-debug-x64-stable"
   triggers: "vm-kernel-reload-linux-release-x64-stable"
@@ -472,6 +484,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-linux-debug-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-x64"
+  }
+}
+
 job {
   id: "vm-kernel-linux-release-simarm"
   acl_sets: "default"
@@ -505,6 +528,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-linux-release-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-x64"
+  }
+}
+
 job {
   id: "vm-kernel-optcounter-threshold-linux-release-x64"
   acl_sets: "default"
@@ -527,6 +561,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-precomp-linux-debug-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-debug-x64"
+  }
+}
+
 job {
   id: "vm-kernel-precomp-linux-release-simarm64"
   acl_sets: "default"
@@ -549,6 +594,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-precomp-linux-release-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-x64"
+  }
+}
+
 job {
   id: "vm-kernel-reload-linux-debug-x64"
   acl_sets: "default"
@@ -915,6 +971,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-linux-debug-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-x64-dev"
+  }
+}
+
 job {
   id: "vm-kernel-linux-release-simarm-dev"
   acl_sets: "default"
@@ -948,6 +1015,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-linux-release-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-x64-dev"
+  }
+}
+
 job {
   id: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
   acl_sets: "default"
@@ -970,6 +1048,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-precomp-linux-debug-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-debug-x64-dev"
+  }
+}
+
 job {
   id: "vm-kernel-precomp-linux-release-simarm64-dev"
   acl_sets: "default"
@@ -992,6 +1081,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-precomp-linux-release-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-x64-dev"
+  }
+}
+
 job {
   id: "vm-kernel-reload-linux-debug-x64-dev"
   acl_sets: "default"
@@ -1358,6 +1458,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-linux-debug-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-x64-stable"
+  }
+}
+
 job {
   id: "vm-kernel-linux-release-simarm-stable"
   acl_sets: "default"
@@ -1391,6 +1502,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-linux-release-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-x64-stable"
+  }
+}
+
 job {
   id: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
   acl_sets: "default"
@@ -1413,6 +1535,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-precomp-linux-debug-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-debug-x64-stable"
+  }
+}
+
 job {
   id: "vm-kernel-precomp-linux-release-simarm64-stable"
   acl_sets: "default"
@@ -1435,6 +1568,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-precomp-linux-release-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-x64-stable"
+  }
+}
+
 job {
   id: "vm-kernel-reload-linux-debug-x64-stable"
   acl_sets: "default"

From 66c115d5be52f8f5775559a9c46e43a1dc5625c1 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 18 Jun 2018 08:30:58 +0000
Subject: [PATCH 138/826] [infra] Add missing vm-kernel-debug builder to choose
 tryjobs

* Remove last use of vm-kernel-swarming
* Sort some builders

Change-Id: Id4743c8e92dc347f59b9f5aa84fb5d0328c1ad1e
Reviewed-on: https://dart-review.googlesource.com/60543
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 01aa1c917c44..27c382836816 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -90,14 +90,6 @@ builder_mixins {
   }
 }
 
-builder_mixins {
-  name: "vm-kernel"
-  recipe {
-    name: "dart/vm_kernel_swarming"
-    properties_j: "shards:6"
-  }
-}
-
 builder_mixins {
   name: "win"
   dimensions: "os:Windows"
@@ -227,8 +219,8 @@ buckets {
     builders { name: "target-vm-linux-release-arm64" dimensions: "cpu:arm64" }
     builders { name: "versionchecker-linux" }
     builders { name: "vm-asan-linux-release-x64" }
-    builders { name: "vm-kernel-linux-debug-x64" }
     builders { name: "vm-kernel-linux-debug-simdbc64" }
+    builders { name: "vm-kernel-linux-debug-x64" }
     builders { name: "vm-kernel-linux-release-simarm" }
     builders { name: "vm-kernel-linux-release-simarm64" }
     builders { name: "vm-kernel-linux-release-simdbc64" }
@@ -237,9 +229,9 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-debug-x64" mixins: "slow" }
-    builders { name: "vm-kernel-precomp-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-release-simarm" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64" }
+    builders { name: "vm-kernel-precomp-linux-release-x64" }
     builders { name: "vm-kernel-precomp-win-release-x64" mixins: "win" }
     builders { name: "vm-kernel-reload-linux-debug-x64" }
     builders { name: "vm-kernel-reload-linux-release-x64" }
@@ -330,8 +322,8 @@ buckets {
     builders { name: "target-vm-linux-release-arm64-dev" dimensions: "cpu:arm64" }
     builders { name: "versionchecker-linux-dev" }
     builders { name: "vm-asan-linux-release-x64-dev" }
-    builders { name: "vm-kernel-linux-debug-x64-dev" }
     builders { name: "vm-kernel-linux-debug-simdbc64-dev" }
+    builders { name: "vm-kernel-linux-debug-x64-dev" }
     builders { name: "vm-kernel-linux-release-simarm-dev" }
     builders { name: "vm-kernel-linux-release-simarm64-dev" }
     builders { name: "vm-kernel-linux-release-simdbc64-dev" }
@@ -340,9 +332,9 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-dev" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-dev" mixins: "slow" }
-    builders { name: "vm-kernel-precomp-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-dev" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-dev" }
+    builders { name: "vm-kernel-precomp-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-win-release-x64-dev" mixins: "win" }
     builders { name: "vm-kernel-reload-linux-debug-x64-dev" }
     builders { name: "vm-kernel-reload-linux-release-x64-dev" }
@@ -433,8 +425,8 @@ buckets {
     builders { name: "target-vm-linux-release-arm64-stable" dimensions: "cpu:arm64" }
     builders { name: "versionchecker-linux-stable" }
     builders { name: "vm-asan-linux-release-x64-stable" }
-    builders { name: "vm-kernel-linux-debug-x64-stable" }
     builders { name: "vm-kernel-linux-debug-simdbc64-stable" }
+    builders { name: "vm-kernel-linux-debug-x64-stable" }
     builders { name: "vm-kernel-linux-release-simarm-stable" }
     builders { name: "vm-kernel-linux-release-simarm64-stable" }
     builders { name: "vm-kernel-linux-release-simdbc64-stable" }
@@ -443,9 +435,9 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-stable" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-stable" mixins: "slow" }
-    builders { name: "vm-kernel-precomp-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-stable" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-stable" }
+    builders { name: "vm-kernel-precomp-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-win-release-x64-stable" mixins: "win" }
     builders { name: "vm-kernel-reload-linux-debug-x64-stable" }
     builders { name: "vm-kernel-reload-linux-release-x64-stable" }
@@ -552,11 +544,12 @@ buckets {
     builders { name: "pkg-win-release-try" mixins: "win" }
     builders { name: "vm-canary-linux-debug-try" }
     builders { name: "vm-kernel-linux-debug-simdbc64-try" }
+    builders { name: "vm-kernel-linux-debug-x64-try" }
     builders { name: "vm-kernel-linux-release-simarm-try" }
     builders { name: "vm-kernel-linux-release-simarm64-try" }
     builders { name: "vm-kernel-linux-release-simdbc64-try" }
     builders { name: "vm-kernel-linux-release-x64-try" }
-    builders { name: "vm-kernel-mac-release-x64-try" mixins: "clobber" mixins: "mac" mixins: "vm-kernel" }
+    builders { name: "vm-kernel-mac-release-x64-try" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-try" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-try" mixins: "slow" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-try" }

From 40e1e840cf90148f7d633439f17c6183bbd09a24 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 20 Jun 2018 18:38:28 +0000
Subject: [PATCH 139/826] [infra] Add dart2js Dart 2 builders to buildbucket

This enables testing of:
https://dart-review.googlesource.com/c/sdk/+/61086

Change-Id: I9274f137f7fea21df8ee9d7f8507510488ee627c
Reviewed-on: https://dart-review.googlesource.com/61341
Reviewed-by: Sigmund Cherem <sigmund@google.com>
---
 cr-buildbucket.cfg | 114 +++++++++++++++++++++++++++++++++++++++++----
 luci-milo.cfg      |  10 ++--
 2 files changed, 110 insertions(+), 14 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 27c382836816..b1bd43cf7e9f 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -186,18 +186,41 @@ buckets {
     builders { name: "app-linux-release-x64" }
     builders { name: "cross-vm-linux-release-arm64" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome" }
-    builders { name: "dart2js-dumpinfo-linux-ia32-none" }
+    builders { name: "dart2js-dump-info-x64-linux" }
     builders { name: "dart2js-faststartup-linux-x64-chrome" }
+    builders { name: "dart2js-faststartup-linux-x64-ff" }
+    builders { name: "dart2js-faststartup-mac-x64-chrome" mixins: "mac" }
+    builders { name: "dart2js-faststartup-mac-x64-safari" mixins: "mac" }
+    builders { name: "dart2js-faststartup-win-x64-chrome" mixins: "win" }
+    builders { name: "dart2js-faststartup-win-x64-edge" mixins: "win" }
+    builders { name: "dart2js-faststartup-win-x64-ff" mixins: "win" }
+    builders { name: "dart2js-faststartup-win-x64-ie11" mixins: "win" }
     builders { name: "dart2js-hostchecked-linux-ia32-d8" }
     builders { name: "dart2js-hostchecked-linux-debug-ia32-none" }
     builders { name: "dart2js-linux-x64-chrome" }
     builders { name: "dart2js-linux-x64-ff" }
     builders { name: "dart2js-linux-debug-ia32-none" }
-    builders { name: "dart2js-linux-x64-drt" }
     builders { name: "dart2js-mac-x64-chrome" mixins: "mac" }
     builders { name: "dart2js-mac-x64-safari" mixins: "mac" }
     builders { name: "dart2js-minified-linux-x64-d8" }
-    builders { name: "dart2js-only-unittest-linux-ia32-none" }
+    builders { name: "dart2js-minified-strong-linux-x64-d8" }
+    builders { name: "dart2js-strong-faststartup-linux-x64-chrome" }
+    builders { name: "dart2js-strong-faststartup-linux-x64-ff" }
+    builders { name: "dart2js-strong-faststartup-mac-x64-chrome" mixins: "mac" }
+    builders { name: "dart2js-strong-faststartup-mac-x64-safari" mixins: "mac" }
+    builders { name: "dart2js-strong-faststartup-win-x64-chrome" mixins: "win" }
+    builders { name: "dart2js-strong-faststartup-win-x64-edge" mixins: "win" }
+    builders { name: "dart2js-strong-faststartup-win-x64-ff" mixins: "win" }
+    builders { name: "dart2js-strong-faststartup-win-x64-ie11" mixins: "win" }
+    builders { name: "dart2js-strong-linux-x64-chrome" }
+    builders { name: "dart2js-strong-linux-x64-ff" }
+    builders { name: "dart2js-strong-mac-x64-chrome" mixins: "mac" }
+    builders { name: "dart2js-strong-mac-x64-safari" mixins: "mac" }
+    builders { name: "dart2js-strong-win-x64-chrome" mixins: "win" }
+    builders { name: "dart2js-strong-win-x64-edge" mixins: "win" }
+    builders { name: "dart2js-strong-win-x64-ff" mixins: "win" }
+    builders { name: "dart2js-strong-win-x64-ie11" mixins: "win" }
+    builders { name: "dart2js-unit-linux-x64-release" }
     builders { name: "dart2js-win-x64-chrome" mixins: "win" }
     builders { name: "dart2js-win-x64-edge" mixins: "win" }
     builders { name: "dart2js-win-x64-ff" mixins: "win" }
@@ -289,18 +312,41 @@ buckets {
     builders { name: "app-linux-release-x64-dev" }
     builders { name: "cross-vm-linux-release-arm64-dev" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome-dev" }
-    builders { name: "dart2js-dumpinfo-linux-ia32-none-dev" }
+    builders { name: "dart2js-dump-info-x64-linux-dev" }
     builders { name: "dart2js-faststartup-linux-x64-chrome-dev" }
+    builders { name: "dart2js-faststartup-linux-x64-ff-dev" }
+    builders { name: "dart2js-faststartup-mac-x64-chrome-dev" mixins: "mac" }
+    builders { name: "dart2js-faststartup-mac-x64-safari-dev" mixins: "mac" }
+    builders { name: "dart2js-faststartup-win-x64-chrome-dev" mixins: "win" }
+    builders { name: "dart2js-faststartup-win-x64-edge-dev" mixins: "win" }
+    builders { name: "dart2js-faststartup-win-x64-ff-dev" mixins: "win" }
+    builders { name: "dart2js-faststartup-win-x64-ie11-dev" mixins: "win" }
     builders { name: "dart2js-hostchecked-linux-ia32-d8-dev" }
     builders { name: "dart2js-hostchecked-linux-debug-ia32-none-dev" }
     builders { name: "dart2js-linux-x64-chrome-dev" }
     builders { name: "dart2js-linux-x64-ff-dev" }
     builders { name: "dart2js-linux-debug-ia32-none-dev" }
-    builders { name: "dart2js-linux-x64-drt-dev" }
     builders { name: "dart2js-mac-x64-chrome-dev" mixins: "mac" }
     builders { name: "dart2js-mac-x64-safari-dev" mixins: "mac" }
     builders { name: "dart2js-minified-linux-x64-d8-dev" }
-    builders { name: "dart2js-only-unittest-linux-ia32-none-dev" }
+    builders { name: "dart2js-minified-strong-linux-x64-d8-dev" }
+    builders { name: "dart2js-strong-faststartup-linux-x64-chrome-dev" }
+    builders { name: "dart2js-strong-faststartup-linux-x64-ff-dev" }
+    builders { name: "dart2js-strong-faststartup-mac-x64-chrome-dev" mixins: "mac" }
+    builders { name: "dart2js-strong-faststartup-mac-x64-safari-dev" mixins: "mac" }
+    builders { name: "dart2js-strong-faststartup-win-x64-chrome-dev" mixins: "win" }
+    builders { name: "dart2js-strong-faststartup-win-x64-edge-dev" mixins: "win" }
+    builders { name: "dart2js-strong-faststartup-win-x64-ff-dev" mixins: "win" }
+    builders { name: "dart2js-strong-faststartup-win-x64-ie11-dev" mixins: "win" }
+    builders { name: "dart2js-strong-linux-x64-chrome-dev" }
+    builders { name: "dart2js-strong-linux-x64-ff-dev" }
+    builders { name: "dart2js-strong-mac-x64-chrome-dev" mixins: "mac" }
+    builders { name: "dart2js-strong-mac-x64-safari-dev" mixins: "mac" }
+    builders { name: "dart2js-strong-win-x64-chrome-dev" mixins: "win" }
+    builders { name: "dart2js-strong-win-x64-edge-dev" mixins: "win" }
+    builders { name: "dart2js-strong-win-x64-ff-dev" mixins: "win" }
+    builders { name: "dart2js-strong-win-x64-ie11-dev" mixins: "win" }
+    builders { name: "dart2js-unit-linux-x64-release-dev" }
     builders { name: "dart2js-win-x64-chrome-dev" mixins: "win" }
     builders { name: "dart2js-win-x64-edge-dev" mixins: "win" }
     builders { name: "dart2js-win-x64-ff-dev" mixins: "win" }
@@ -392,18 +438,41 @@ buckets {
     builders { name: "app-linux-release-x64-stable" }
     builders { name: "cross-vm-linux-release-arm64-stable" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome-stable" }
-    builders { name: "dart2js-dumpinfo-linux-ia32-none-stable" }
+    builders { name: "dart2js-dump-info-x64-linux-stable" }
     builders { name: "dart2js-faststartup-linux-x64-chrome-stable" }
+    builders { name: "dart2js-faststartup-linux-x64-ff-stable" }
+    builders { name: "dart2js-faststartup-mac-x64-chrome-stable" mixins: "mac" }
+    builders { name: "dart2js-faststartup-mac-x64-safari-stable" mixins: "mac" }
+    builders { name: "dart2js-faststartup-win-x64-chrome-stable" mixins: "win" }
+    builders { name: "dart2js-faststartup-win-x64-edge-stable" mixins: "win" }
+    builders { name: "dart2js-faststartup-win-x64-ff-stable" mixins: "win" }
+    builders { name: "dart2js-faststartup-win-x64-ie11-stable" mixins: "win" }
     builders { name: "dart2js-hostchecked-linux-ia32-d8-stable" }
     builders { name: "dart2js-hostchecked-linux-debug-ia32-none-stable" }
     builders { name: "dart2js-linux-x64-chrome-stable" }
     builders { name: "dart2js-linux-x64-ff-stable" }
     builders { name: "dart2js-linux-debug-ia32-none-stable" }
-    builders { name: "dart2js-linux-x64-drt-stable" }
     builders { name: "dart2js-mac-x64-chrome-stable" mixins: "mac" }
     builders { name: "dart2js-mac-x64-safari-stable" mixins: "mac" }
     builders { name: "dart2js-minified-linux-x64-d8-stable" }
-    builders { name: "dart2js-only-unittest-linux-ia32-none-stable" }
+    builders { name: "dart2js-minified-strong-linux-x64-d8-stable" }
+    builders { name: "dart2js-strong-faststartup-linux-x64-chrome-stable" }
+    builders { name: "dart2js-strong-faststartup-linux-x64-ff-stable" }
+    builders { name: "dart2js-strong-faststartup-mac-x64-chrome-stable" mixins: "mac" }
+    builders { name: "dart2js-strong-faststartup-mac-x64-safari-stable" mixins: "mac" }
+    builders { name: "dart2js-strong-faststartup-win-x64-chrome-stable" mixins: "win" }
+    builders { name: "dart2js-strong-faststartup-win-x64-edge-stable" mixins: "win" }
+    builders { name: "dart2js-strong-faststartup-win-x64-ff-stable" mixins: "win" }
+    builders { name: "dart2js-strong-faststartup-win-x64-ie11-stable" mixins: "win" }
+    builders { name: "dart2js-strong-linux-x64-chrome-stable" }
+    builders { name: "dart2js-strong-linux-x64-ff-stable" }
+    builders { name: "dart2js-strong-mac-x64-chrome-stable" mixins: "mac" }
+    builders { name: "dart2js-strong-mac-x64-safari-stable" mixins: "mac" }
+    builders { name: "dart2js-strong-win-x64-chrome-stable" mixins: "win" }
+    builders { name: "dart2js-strong-win-x64-edge-stable" mixins: "win" }
+    builders { name: "dart2js-strong-win-x64-ff-stable" mixins: "win" }
+    builders { name: "dart2js-strong-win-x64-ie11-stable" mixins: "win" }
+    builders { name: "dart2js-unit-linux-x64-release-stable" }
     builders { name: "dart2js-win-x64-chrome-stable" mixins: "win" }
     builders { name: "dart2js-win-x64-edge-stable" mixins: "win" }
     builders { name: "dart2js-win-x64-ff-stable" mixins: "win" }
@@ -526,12 +595,39 @@ buckets {
     builders { name: "benchmark-linux-try" }
     builders { name: "dart-sdk-windows-try" mixins: "sdk" mixins: "win" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome-try" }
+    builders { name: "dart2js-dump-info-x64-linux-try" }
     builders { name: "dart2js-faststartup-linux-x64-chrome-try" }
+    builders { name: "dart2js-faststartup-linux-x64-ff-try" }
+    builders { name: "dart2js-faststartup-mac-x64-chrome-try" mixins: "mac" }
+    builders { name: "dart2js-faststartup-mac-x64-safari-try" mixins: "mac" }
+    builders { name: "dart2js-faststartup-win-x64-chrome-try" mixins: "win" }
+    builders { name: "dart2js-faststartup-win-x64-edge-try" mixins: "win" }
+    builders { name: "dart2js-faststartup-win-x64-ff-try" mixins: "win" }
+    builders { name: "dart2js-faststartup-win-x64-ie11-try" mixins: "win" }
     builders { name: "dart2js-linux-d8-hostchecked-try" mixins: "dart2js" }
     builders { name: "dart2js-linux-d8-kernel-minified-try" mixins: "dart2js" }
+    #TODO(athom): Remove when dart2js-unit-linux-x64-release-try is on the CQ.
     builders { name: "dart2js-linux-none-only-unittest-try" mixins: "dart2js" }
     builders { name: "dart2js-linux-x64-chrome-try" }
     builders { name: "dart2js-mac-x64-chrome-try" mixins: "mac" }
+    builders { name: "dart2js-minified-strong-linux-x64-d8-try" }
+    builders { name: "dart2js-strong-faststartup-linux-x64-chrome-try" }
+    builders { name: "dart2js-strong-faststartup-linux-x64-ff-try" }
+    builders { name: "dart2js-strong-faststartup-mac-x64-chrome-try" mixins: "mac" }
+    builders { name: "dart2js-strong-faststartup-mac-x64-safari-try" mixins: "mac" }
+    builders { name: "dart2js-strong-faststartup-win-x64-chrome-try" mixins: "win" }
+    builders { name: "dart2js-strong-faststartup-win-x64-edge-try" mixins: "win" }
+    builders { name: "dart2js-strong-faststartup-win-x64-ff-try" mixins: "win" }
+    builders { name: "dart2js-strong-faststartup-win-x64-ie11-try" mixins: "win" }
+    builders { name: "dart2js-strong-linux-x64-chrome-try" }
+    builders { name: "dart2js-strong-linux-x64-ff-try" }
+    builders { name: "dart2js-strong-mac-x64-chrome-try" mixins: "mac" }
+    builders { name: "dart2js-strong-mac-x64-safari-try" mixins: "mac" }
+    builders { name: "dart2js-strong-win-x64-chrome-try" mixins: "win" }
+    builders { name: "dart2js-strong-win-x64-edge-try" mixins: "win" }
+    builders { name: "dart2js-strong-win-x64-ff-try" mixins: "win" }
+    builders { name: "dart2js-strong-win-x64-ie11-try" mixins: "win" }
+    builders { name: "dart2js-unit-linux-x64-release-try" }
     builders { name: "dart2js-win-x64-chrome-try" mixins: "win" }
     builders { name: "ddc-linux-release-chrome-try" mixins: "clobber" }
     builders { name: "ddc-mac-release-chrome-try" mixins: "mac" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 3391eb979b43..7ac9afee8189 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -477,7 +477,7 @@ consoles: {
 #    short_name: "ut"
 #  }
   builders {
-    # migrating to dart2js-dumpinfo-linux-ia32-none
+    # migrating to dart2js-dump-info-x64-linux
     name: "buildbot/client.dart.fyi/dart2jsdumpinfo-linux-be"
     category: "dart2js|misc"
     short_name: "dp"
@@ -811,7 +811,7 @@ consoles: {
 #    short_name: "ut"
 #  }
   builders {
-    # migrating to dart2js-dumpinfo-linux-ia32-none
+    # migrating to dart2js-dump-info-x64-linux
     name: "buildbot/client.dart.fyi/dart2jsdumpinfo-linux-be"
     category: "dart2js|misc"
     short_name: "dp"
@@ -1784,7 +1784,7 @@ consoles: {
     short_name: "ut"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-dumpinfo-linux-ia32-none"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-dump-info-x64-linux"
     category: "dart2js|misc"
     short_name: "dp"
   }
@@ -2303,7 +2303,7 @@ consoles: {
     short_name: "ut"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-dumpinfo-linux-ia32-none-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-dump-info-x64-linux-dev"
     category: "dart2js|misc"
     short_name: "dp"
   }
@@ -2822,7 +2822,7 @@ consoles: {
     short_name: "ut"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-dumpinfo-linux-ia32-none-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-dump-info-x64-linux-stable"
     category: "dart2js|misc"
     short_name: "dp"
   }

From 00a49797b7c6f71b1d5a6c1609a736832a6c9d5f Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 21 Jun 2018 18:16:26 +0000
Subject: [PATCH 140/826] [infra] Add vm-kernel-reload-mac builders to "choose
 tryjobs"

TBR=whesse@google.com

Change-Id: I3b85e833cee711f11251f1067ce01d5d79017b8e
Reviewed-on: https://dart-review.googlesource.com/61563
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index b1bd43cf7e9f..85864650c833 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -654,6 +654,8 @@ buckets {
     builders { name: "vm-kernel-precomp-win-release-x64-try" mixins: "win" }
     builders { name: "vm-kernel-reload-linux-debug-x64-try" }
     builders { name: "vm-kernel-reload-linux-release-x64-try" }
+    builders { name: "vm-kernel-reload-mac-debug-simdbc64-try" mixins: "mac" }
+    builders { name: "vm-kernel-reload-mac-release-simdbc64-try" mixins: "mac" }
     builders { name: "vm-kernel-reload-rollback-linux-debug-x64-try" }
     builders { name: "vm-kernel-reload-rollback-linux-release-x64-try" }
     builders { name: "vm-kernel-win-release-x64-try" mixins: "win" }

From 299d2fd877504ba67190522befd209cf1865b733 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 26 Jun 2018 11:34:10 +0000
Subject: [PATCH 141/826] [infra] Add analyzer-use-fasta-parser-linux builder
 to buildbucket

TBR=whesse@google.com

Change-Id: I98fa91f82559f62e2494e5cd78c0a1359bc78e4f
Reviewed-on: https://dart-review.googlesource.com/62150
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 85864650c833..724d32bbf942 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -176,6 +176,7 @@ buckets {
     builders { name: "analyzer-strong-linux-release" }
     builders { name: "analyzer-strong-mac-release" mixins: "mac" }
     builders { name: "analyzer-strong-win-release" mixins: "win" }
+    builders { name: "analyzer-use-fasta-parser-linux" }
     builders { name: "analyzer-win-release" mixins: "win" }
     builders { name: "androidvm-linux-release-x64" mixins: "android" }
     builders { name: "app-kernel-linux-debug-x64" }
@@ -302,6 +303,7 @@ buckets {
     builders { name: "analyzer-strong-linux-release-dev" }
     builders { name: "analyzer-strong-mac-release-dev" mixins: "mac" }
     builders { name: "analyzer-strong-win-release-dev" mixins: "win" }
+    builders { name: "analyzer-use-fasta-parser-linux-dev" }
     builders { name: "analyzer-win-release-dev" mixins: "win" }
     builders { name: "androidvm-linux-release-x64-dev" mixins: "android" }
     builders { name: "app-kernel-linux-debug-x64-dev" }
@@ -428,6 +430,7 @@ buckets {
     builders { name: "analyzer-strong-linux-release-stable" }
     builders { name: "analyzer-strong-mac-release-stable" mixins: "mac" }
     builders { name: "analyzer-strong-win-release-stable" mixins: "win" }
+    builders { name: "analyzer-use-fasta-parser-linux-stable" }
     builders { name: "analyzer-win-release-stable" mixins: "win" }
     builders { name: "androidvm-linux-release-x64-stable" mixins: "android" }
     builders { name: "app-kernel-linux-debug-x64-stable" }
@@ -588,6 +591,7 @@ buckets {
     builders { name: "analyzer-strong-linux-release-try" }
     builders { name: "analyzer-strong-mac-release-try" mixins: "mac" }
     builders { name: "analyzer-strong-win-release-try" mixins: "win" }
+    builders { name: "analyzer-use-fasta-parser-linux-try" }
     builders { name: "analyzer-win-release-try" mixins: "win" }
     builders { name: "app-kernel-linux-debug-x64-try" }
     builders { name: "app-kernel-linux-product-x64-try" }

From 78762714295524c4d31e0a8b76c0d17698f0f0ea Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 28 Jun 2018 19:42:03 +0000
Subject: [PATCH 142/826] [infra] Add docker builder to luci.dart.ci

TBR=whesse@google.com

Change-Id: I6d45021339365154a0e3651196d6ffac7aa9a1c6
Reviewed-on: https://dart-review.googlesource.com/62500
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 724d32bbf942..4399af2c36e2 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -128,6 +128,7 @@ buckets {
     builders { name: "dart-sdk-linux" }
     builders { name: "dart-sdk-mac" mixins: "mac" }
     builders { name: "dart-sdk-win" mixins: "win" }
+    builders { name: "docker" }
     builders { name: "debianpackage-linux" mixins: "debianpackage" }
     builders { name: "dart-sdk-linux-dev" }
     builders { name: "dart-sdk-mac-dev" mixins: "mac" }

From cb8eeda7028c26a25ba839a3f764a230b457d1c0 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 28 Jun 2018 19:56:29 +0000
Subject: [PATCH 143/826] [infra] Add analyzer-use-fasta-parser to scheduler
 and consoles

TBR=whesse@google.com

Change-Id: Ifed289dcad072610eca08ea57f7c94bee737c3d7
Reviewed-on: https://dart-review.googlesource.com/62904
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-milo.cfg      | 25 +++++++++++++++++++++++++
 luci-scheduler.cfg | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 7ac9afee8189..01d6fb011652 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -487,6 +487,11 @@ consoles: {
     category: "analyzer"
     short_name: "as"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-fasta-parser-linux"
+    category: "analyzer"
+    short_name: "fl"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
     category: "analyzer"
@@ -821,6 +826,11 @@ consoles: {
     category: "analyzer"
     short_name: "as"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-fasta-parser-linux"
+    category: "analyzer"
+    short_name: "fl"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
     category: "analyzer"
@@ -1793,6 +1803,11 @@ consoles: {
     category: "analyzer"
     short_name: "aas"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-fasta-parser-linux"
+    category: "analyzer"
+    short_name: "fl"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
     category: "analyzer"
@@ -2312,6 +2327,11 @@ consoles: {
     category: "analyzer"
     short_name: "aas"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-fasta-parser-linux-dev"
+    category: "analyzer"
+    short_name: "fl"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-dev"
     category: "analyzer"
@@ -2831,6 +2851,11 @@ consoles: {
     category: "analyzer"
     short_name: "aas"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-fasta-parser-linux-stable"
+    category: "analyzer"
+    short_name: "fl"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-stable"
     category: "analyzer"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 9568fb811c3d..072a189f571e 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -27,6 +27,7 @@ trigger {
   triggers: "analyzer-strong-linux-release"
   triggers: "analyzer-strong-mac-release"
   triggers: "analyzer-strong-win-release"
+  triggers: "analyzer-use-fasta-parser-linux"
   triggers: "analyzer-win-release"
   triggers: "app-kernel-linux-debug-x64"
   triggers: "app-kernel-linux-product-x64"
@@ -80,6 +81,7 @@ trigger {
   triggers: "analyzer-strong-linux-release-dev"
   triggers: "analyzer-strong-mac-release-dev"
   triggers: "analyzer-strong-win-release-dev"
+  triggers: "analyzer-use-fasta-parser-linux-dev"
   triggers: "analyzer-win-release-dev"
   triggers: "app-kernel-linux-debug-x64-dev"
   triggers: "app-kernel-linux-product-x64-dev"
@@ -133,6 +135,7 @@ trigger {
   triggers: "analyzer-strong-linux-release-stable"
   triggers: "analyzer-strong-mac-release-stable"
   triggers: "analyzer-strong-win-release-stable"
+  triggers: "analyzer-use-fasta-parser-linux-stable"
   triggers: "analyzer-win-release-stable"
   triggers: "app-kernel-linux-debug-x64-stable"
   triggers: "app-kernel-linux-product-x64-stable"
@@ -239,6 +242,17 @@ job {
   }
 }
 
+job {
+  id: "analyzer-use-fasta-parser-linux"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-use-fasta-parser-linux"
+  }
+}
+
 job {
   id: "analyzer-win-release"
   acl_sets: "default"
@@ -726,6 +740,17 @@ job {
   }
 }
 
+job {
+  id: "analyzer-use-fasta-parser-linux-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-use-fasta-parser-linux-dev"
+  }
+}
+
 job {
   id: "analyzer-win-release-dev"
   acl_sets: "default"
@@ -1213,6 +1238,17 @@ job {
   }
 }
 
+job {
+  id: "analyzer-use-fasta-parser-linux-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-use-fasta-parser-linux-stable"
+  }
+}
+
 job {
   id: "analyzer-win-release-stable"
   acl_sets: "default"

From 146aaff5af84a8dd55196adf32d4388a0539ec2e Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 3 Jul 2018 16:01:19 +0000
Subject: [PATCH 144/826] [infra] Remove unfinished dart2js-edge builders from
 choose tryjobs

TBR=whesse@google.com

Change-Id: I94ebc33c3767352bba7beaf7013824b83d831ede
Reviewed-on: https://dart-review.googlesource.com/63620
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 4399af2c36e2..8f190ac6ef3e 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -606,7 +606,6 @@ buckets {
     builders { name: "dart2js-faststartup-mac-x64-chrome-try" mixins: "mac" }
     builders { name: "dart2js-faststartup-mac-x64-safari-try" mixins: "mac" }
     builders { name: "dart2js-faststartup-win-x64-chrome-try" mixins: "win" }
-    builders { name: "dart2js-faststartup-win-x64-edge-try" mixins: "win" }
     builders { name: "dart2js-faststartup-win-x64-ff-try" mixins: "win" }
     builders { name: "dart2js-faststartup-win-x64-ie11-try" mixins: "win" }
     builders { name: "dart2js-linux-d8-hostchecked-try" mixins: "dart2js" }
@@ -621,7 +620,6 @@ buckets {
     builders { name: "dart2js-strong-faststartup-mac-x64-chrome-try" mixins: "mac" }
     builders { name: "dart2js-strong-faststartup-mac-x64-safari-try" mixins: "mac" }
     builders { name: "dart2js-strong-faststartup-win-x64-chrome-try" mixins: "win" }
-    builders { name: "dart2js-strong-faststartup-win-x64-edge-try" mixins: "win" }
     builders { name: "dart2js-strong-faststartup-win-x64-ff-try" mixins: "win" }
     builders { name: "dart2js-strong-faststartup-win-x64-ie11-try" mixins: "win" }
     builders { name: "dart2js-strong-linux-x64-chrome-try" }
@@ -629,7 +627,6 @@ buckets {
     builders { name: "dart2js-strong-mac-x64-chrome-try" mixins: "mac" }
     builders { name: "dart2js-strong-mac-x64-safari-try" mixins: "mac" }
     builders { name: "dart2js-strong-win-x64-chrome-try" mixins: "win" }
-    builders { name: "dart2js-strong-win-x64-edge-try" mixins: "win" }
     builders { name: "dart2js-strong-win-x64-ff-try" mixins: "win" }
     builders { name: "dart2js-strong-win-x64-ie11-try" mixins: "win" }
     builders { name: "dart2js-unit-linux-x64-release-try" }

From e55cd8069c2c6cf3df206673947e6688ec2ac2c3 Mon Sep 17 00:00:00 2001
From: Sergiy Byelozyorov <sergiyb@chromium.org>
Date: Tue, 3 Jul 2018 16:20:39 +0000
Subject: [PATCH 145/826] Replace deprecated ref field with refs field

R=tandrii@chromium.org

No-Try: true
No-Tree-Checks: true
Bug: 836232
Change-Id: Iff2d701af27fe254b8cc42802e6ada6091fec0f9
Reviewed-on: https://dart-review.googlesource.com/63586
Reviewed-by: William Hesse <whesse@google.com>
Reviewed-by: Andrii Shyshkalov <tandrii@google.com>
---
 luci-milo.cfg | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 01d6fb011652..07a25b60c6c1 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -4,7 +4,7 @@ consoles: {
   id: "be"
   name: "SDK Bleeding Edge Console (migration)"
   repo_url: "https://dart.googlesource.com/sdk"
-  ref: "refs/heads/master"
+  refs: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
@@ -731,7 +731,7 @@ consoles: {
   id: "alt"
   name: "SDK Bleeding Edge Console (alternative, migration)"
   repo_url: "https://dart.googlesource.com/sdk"
-  ref: "refs/heads/master"
+  refs: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
@@ -1456,7 +1456,7 @@ consoles: {
   id: "luci"
   name: "SDK Bleeding Edge Console (LUCI Preview)"
   repo_url: "https://dart.googlesource.com/sdk/"
-  ref: "refs/heads/master"
+  refs: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
@@ -1980,7 +1980,7 @@ consoles: {
   id: "dev"
   name: "SDK Dev Console"
   repo_url: "https://dart.googlesource.com/sdk"
-  ref: "refs/heads/dev"
+  refs: "refs/heads/dev"
   manifest_name: "REVISION"
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-dev"
@@ -2504,7 +2504,7 @@ consoles: {
   id: "stable"
   name: "SDK Stable Console"
   repo_url: "https://dart.googlesource.com/sdk"
-  ref: "refs/heads/stable"
+  refs: "refs/heads/stable"
   manifest_name: "REVISION"
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-stable"
@@ -3028,7 +3028,7 @@ consoles: {
   id: "fyi"
   name: "SDK FYI Console"
   repo_url: "https://dart.googlesource.com/sdk"
-  ref: "refs/heads/master"
+  refs: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-debug-ia32-none"
@@ -3098,7 +3098,7 @@ consoles: {
   name: "SDK CQ Console"
   builder_view_only: true
   repo_url: "https://dart.googlesource.com/sdk"
-  ref: "refs/heads/master"
+  refs: "refs/heads/master"
   manifest_name: "PATCHED"
   builders { name: "buildbucket/luci.dart.try/analyzer-linux-release-try" }
   builders { name: "buildbucket/luci.dart.try/analyzer-strong-linux-release-try" }

From 7a64e66bf624a64fd3ee66845c142917017bc714 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 3 Jul 2018 21:10:51 +0000
Subject: [PATCH 146/826] [infra] Remove analyzer-strong builders from Luci
 configuration

Change-Id: I7d4bd69711b89d071181851494fadf40a7813bbe
Reviewed-on: https://dart-review.googlesource.com/63587
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg |  12 -----
 luci-milo.cfg      |  76 -------------------------------
 luci-scheduler.cfg | 108 ---------------------------------------------
 3 files changed, 196 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 8f190ac6ef3e..b7958a6e6871 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -174,9 +174,6 @@ buckets {
     builders { name: "analyzer-analysis-server-linux" }
     builders { name: "analyzer-linux-release" }
     builders { name: "analyzer-mac-release" mixins: "mac" }
-    builders { name: "analyzer-strong-linux-release" }
-    builders { name: "analyzer-strong-mac-release" mixins: "mac" }
-    builders { name: "analyzer-strong-win-release" mixins: "win" }
     builders { name: "analyzer-use-fasta-parser-linux" }
     builders { name: "analyzer-win-release" mixins: "win" }
     builders { name: "androidvm-linux-release-x64" mixins: "android" }
@@ -301,9 +298,6 @@ buckets {
     builders { name: "analyzer-analysis-server-linux-dev" }
     builders { name: "analyzer-linux-release-dev" }
     builders { name: "analyzer-mac-release-dev" mixins: "mac" }
-    builders { name: "analyzer-strong-linux-release-dev" }
-    builders { name: "analyzer-strong-mac-release-dev" mixins: "mac" }
-    builders { name: "analyzer-strong-win-release-dev" mixins: "win" }
     builders { name: "analyzer-use-fasta-parser-linux-dev" }
     builders { name: "analyzer-win-release-dev" mixins: "win" }
     builders { name: "androidvm-linux-release-x64-dev" mixins: "android" }
@@ -428,9 +422,6 @@ buckets {
     builders { name: "analyzer-analysis-server-linux-stable" }
     builders { name: "analyzer-linux-release-stable" }
     builders { name: "analyzer-mac-release-stable" mixins: "mac" }
-    builders { name: "analyzer-strong-linux-release-stable" }
-    builders { name: "analyzer-strong-mac-release-stable" mixins: "mac" }
-    builders { name: "analyzer-strong-win-release-stable" mixins: "win" }
     builders { name: "analyzer-use-fasta-parser-linux-stable" }
     builders { name: "analyzer-win-release-stable" mixins: "win" }
     builders { name: "androidvm-linux-release-x64-stable" mixins: "android" }
@@ -589,9 +580,6 @@ buckets {
     builders { name: "analyzer-analysis-server-linux-try" }
     builders { name: "analyzer-linux-release-try" }
     builders { name: "analyzer-mac-release-try" mixins: "mac" }
-    builders { name: "analyzer-strong-linux-release-try" }
-    builders { name: "analyzer-strong-mac-release-try" mixins: "mac" }
-    builders { name: "analyzer-strong-win-release-try" mixins: "win" }
     builders { name: "analyzer-use-fasta-parser-linux-try" }
     builders { name: "analyzer-win-release-try" mixins: "win" }
     builders { name: "app-kernel-linux-debug-x64-try" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 07a25b60c6c1..36353958b577 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -502,21 +502,6 @@ consoles: {
     category: "analyzer"
     short_name: "mr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release"
-    category: "analyzer"
-    short_name: "sr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release"
-    category: "analyzer"
-    short_name: "smr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release"
-    category: "analyzer"
-    short_name: "swr"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
     category: "analyzer"
@@ -841,21 +826,6 @@ consoles: {
     category: "analyzer"
     short_name: "mr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release"
-    category: "analyzer"
-    short_name: "sr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release"
-    category: "analyzer"
-    short_name: "smr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release"
-    category: "analyzer"
-    short_name: "swr"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
     category: "analyzer"
@@ -1818,21 +1788,6 @@ consoles: {
     category: "analyzer"
     short_name: "mr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release"
-    category: "analyzer"
-    short_name: "sr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release"
-    category: "analyzer"
-    short_name: "smr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release"
-    category: "analyzer"
-    short_name: "swr"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
     category: "analyzer"
@@ -2342,21 +2297,6 @@ consoles: {
     category: "analyzer"
     short_name: "mr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release-dev"
-    category: "analyzer"
-    short_name: "sr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release-dev"
-    category: "analyzer"
-    short_name: "smr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release-dev"
-    category: "analyzer"
-    short_name: "swr"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-dev"
     category: "analyzer"
@@ -2866,21 +2806,6 @@ consoles: {
     category: "analyzer"
     short_name: "mr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-linux-release-stable"
-    category: "analyzer"
-    short_name: "sr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-mac-release-stable"
-    category: "analyzer"
-    short_name: "smr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-strong-win-release-stable"
-    category: "analyzer"
-    short_name: "swr"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-stable"
     category: "analyzer"
@@ -3101,7 +3026,6 @@ consoles: {
   refs: "refs/heads/master"
   manifest_name: "PATCHED"
   builders { name: "buildbucket/luci.dart.try/analyzer-linux-release-try" }
-  builders { name: "buildbucket/luci.dart.try/analyzer-strong-linux-release-try" }
   builders { name: "buildbucket/luci.dart.try/benchmark-linux-try" }
   builders { name: "buildbucket/luci.dart.try/dart-sdk-windows-try" }
   builders { name: "buildbucket/luci.dart.try/dart2js-linux-d8-hostchecked-try" }
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 072a189f571e..807fc3b7563e 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -24,9 +24,6 @@ trigger {
   triggers: "analyzer-analysis-server-linux"
   triggers: "analyzer-linux-release"
   triggers: "analyzer-mac-release"
-  triggers: "analyzer-strong-linux-release"
-  triggers: "analyzer-strong-mac-release"
-  triggers: "analyzer-strong-win-release"
   triggers: "analyzer-use-fasta-parser-linux"
   triggers: "analyzer-win-release"
   triggers: "app-kernel-linux-debug-x64"
@@ -78,9 +75,6 @@ trigger {
   triggers: "analyzer-analysis-server-linux-dev"
   triggers: "analyzer-linux-release-dev"
   triggers: "analyzer-mac-release-dev"
-  triggers: "analyzer-strong-linux-release-dev"
-  triggers: "analyzer-strong-mac-release-dev"
-  triggers: "analyzer-strong-win-release-dev"
   triggers: "analyzer-use-fasta-parser-linux-dev"
   triggers: "analyzer-win-release-dev"
   triggers: "app-kernel-linux-debug-x64-dev"
@@ -132,9 +126,6 @@ trigger {
   triggers: "analyzer-analysis-server-linux-stable"
   triggers: "analyzer-linux-release-stable"
   triggers: "analyzer-mac-release-stable"
-  triggers: "analyzer-strong-linux-release-stable"
-  triggers: "analyzer-strong-mac-release-stable"
-  triggers: "analyzer-strong-win-release-stable"
   triggers: "analyzer-use-fasta-parser-linux-stable"
   triggers: "analyzer-win-release-stable"
   triggers: "app-kernel-linux-debug-x64-stable"
@@ -209,39 +200,6 @@ job {
   }
 }
 
-job {
-  id: "analyzer-strong-linux-release"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-strong-linux-release"
-  }
-}
-
-job {
-  id: "analyzer-strong-mac-release"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-strong-mac-release"
-  }
-}
-
-job {
-  id: "analyzer-strong-win-release"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-strong-win-release"
-  }
-}
-
 job {
   id: "analyzer-use-fasta-parser-linux"
   acl_sets: "default"
@@ -707,39 +665,6 @@ job {
   }
 }
 
-job {
-  id: "analyzer-strong-linux-release-dev"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-strong-linux-release-dev"
-  }
-}
-
-job {
-  id: "analyzer-strong-mac-release-dev"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-strong-mac-release-dev"
-  }
-}
-
-job {
-  id: "analyzer-strong-win-release-dev"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-strong-win-release-dev"
-  }
-}
-
 job {
   id: "analyzer-use-fasta-parser-linux-dev"
   acl_sets: "default"
@@ -1205,39 +1130,6 @@ job {
   }
 }
 
-job {
-  id: "analyzer-strong-linux-release-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-strong-linux-release-stable"
-  }
-}
-
-job {
-  id: "analyzer-strong-mac-release-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-strong-mac-release-stable"
-  }
-}
-
-job {
-  id: "analyzer-strong-win-release-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-strong-win-release-stable"
-  }
-}
-
 job {
   id: "analyzer-use-fasta-parser-linux-stable"
   acl_sets: "default"

From 7f299ed2a07140fc578a6134f42589df1f5b1307 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 3 Jul 2018 21:41:51 +0000
Subject: [PATCH 147/826] [infra] Remove obsolete dart2js dump info builders
 from Luci config

TBR=whesse@google.com

Change-Id: I8f605eb659e5f3bb2af05530884f3fdb7447a874
Reviewed-on: https://dart-review.googlesource.com/63621
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg |  4 ----
 luci-milo.cfg      | 12 ------------
 2 files changed, 16 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index b7958a6e6871..b5c207befe79 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -185,7 +185,6 @@ buckets {
     builders { name: "app-linux-release-x64" }
     builders { name: "cross-vm-linux-release-arm64" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome" }
-    builders { name: "dart2js-dump-info-x64-linux" }
     builders { name: "dart2js-faststartup-linux-x64-chrome" }
     builders { name: "dart2js-faststartup-linux-x64-ff" }
     builders { name: "dart2js-faststartup-mac-x64-chrome" mixins: "mac" }
@@ -309,7 +308,6 @@ buckets {
     builders { name: "app-linux-release-x64-dev" }
     builders { name: "cross-vm-linux-release-arm64-dev" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome-dev" }
-    builders { name: "dart2js-dump-info-x64-linux-dev" }
     builders { name: "dart2js-faststartup-linux-x64-chrome-dev" }
     builders { name: "dart2js-faststartup-linux-x64-ff-dev" }
     builders { name: "dart2js-faststartup-mac-x64-chrome-dev" mixins: "mac" }
@@ -433,7 +431,6 @@ buckets {
     builders { name: "app-linux-release-x64-stable" }
     builders { name: "cross-vm-linux-release-arm64-stable" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome-stable" }
-    builders { name: "dart2js-dump-info-x64-linux-stable" }
     builders { name: "dart2js-faststartup-linux-x64-chrome-stable" }
     builders { name: "dart2js-faststartup-linux-x64-ff-stable" }
     builders { name: "dart2js-faststartup-mac-x64-chrome-stable" mixins: "mac" }
@@ -588,7 +585,6 @@ buckets {
     builders { name: "benchmark-linux-try" }
     builders { name: "dart-sdk-windows-try" mixins: "sdk" mixins: "win" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome-try" }
-    builders { name: "dart2js-dump-info-x64-linux-try" }
     builders { name: "dart2js-faststartup-linux-x64-chrome-try" }
     builders { name: "dart2js-faststartup-linux-x64-ff-try" }
     builders { name: "dart2js-faststartup-mac-x64-chrome-try" mixins: "mac" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 36353958b577..58594fb3f9f7 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -476,12 +476,6 @@ consoles: {
 #    category: "dart2js|misc"
 #    short_name: "ut"
 #  }
-  builders {
-    # migrating to dart2js-dump-info-x64-linux
-    name: "buildbot/client.dart.fyi/dart2jsdumpinfo-linux-be"
-    category: "dart2js|misc"
-    short_name: "dp"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
     category: "analyzer"
@@ -800,12 +794,6 @@ consoles: {
 #    category: "dart2js|misc"
 #    short_name: "ut"
 #  }
-  builders {
-    # migrating to dart2js-dump-info-x64-linux
-    name: "buildbot/client.dart.fyi/dart2jsdumpinfo-linux-be"
-    category: "dart2js|misc"
-    short_name: "dp"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
     category: "analyzer"

From 192babda5ada44730e58442b6fe4e4f5d7e033cf Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 3 Jul 2018 22:09:57 +0000
Subject: [PATCH 148/826] [infra] Add dart2js-strong-hostasserts builder

* Remove obsolete dart2js CQ builders.
* Update CQ console.
* Remove some more dump-info builders from the Luci consoles.

TBR=whesse@google.com

Change-Id: Id3c75dbc0c9b6f1f9ff1e3e48c0f902ef611b796
Reviewed-on: https://dart-review.googlesource.com/63622
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg |  7 ++++---
 luci-milo.cfg      | 21 +++------------------
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index b5c207befe79..639631a009ed 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -210,6 +210,7 @@ buckets {
     builders { name: "dart2js-strong-faststartup-win-x64-edge" mixins: "win" }
     builders { name: "dart2js-strong-faststartup-win-x64-ff" mixins: "win" }
     builders { name: "dart2js-strong-faststartup-win-x64-ie11" mixins: "win" }
+    builders { name: "dart2js-strong-hostasserts-linux-ia32-d8" }
     builders { name: "dart2js-strong-linux-x64-chrome" }
     builders { name: "dart2js-strong-linux-x64-ff" }
     builders { name: "dart2js-strong-mac-x64-chrome" mixins: "mac" }
@@ -333,6 +334,7 @@ buckets {
     builders { name: "dart2js-strong-faststartup-win-x64-edge-dev" mixins: "win" }
     builders { name: "dart2js-strong-faststartup-win-x64-ff-dev" mixins: "win" }
     builders { name: "dart2js-strong-faststartup-win-x64-ie11-dev" mixins: "win" }
+    builders { name: "dart2js-strong-hostasserts-linux-ia32-d8-dev" }
     builders { name: "dart2js-strong-linux-x64-chrome-dev" }
     builders { name: "dart2js-strong-linux-x64-ff-dev" }
     builders { name: "dart2js-strong-mac-x64-chrome-dev" mixins: "mac" }
@@ -456,6 +458,7 @@ buckets {
     builders { name: "dart2js-strong-faststartup-win-x64-edge-stable" mixins: "win" }
     builders { name: "dart2js-strong-faststartup-win-x64-ff-stable" mixins: "win" }
     builders { name: "dart2js-strong-faststartup-win-x64-ie11-stable" mixins: "win" }
+    builders { name: "dart2js-strong-hostasserts-linux-ia32-d8-stable" }
     builders { name: "dart2js-strong-linux-x64-chrome-stable" }
     builders { name: "dart2js-strong-linux-x64-ff-stable" }
     builders { name: "dart2js-strong-mac-x64-chrome-stable" mixins: "mac" }
@@ -593,9 +596,6 @@ buckets {
     builders { name: "dart2js-faststartup-win-x64-ff-try" mixins: "win" }
     builders { name: "dart2js-faststartup-win-x64-ie11-try" mixins: "win" }
     builders { name: "dart2js-linux-d8-hostchecked-try" mixins: "dart2js" }
-    builders { name: "dart2js-linux-d8-kernel-minified-try" mixins: "dart2js" }
-    #TODO(athom): Remove when dart2js-unit-linux-x64-release-try is on the CQ.
-    builders { name: "dart2js-linux-none-only-unittest-try" mixins: "dart2js" }
     builders { name: "dart2js-linux-x64-chrome-try" }
     builders { name: "dart2js-mac-x64-chrome-try" mixins: "mac" }
     builders { name: "dart2js-minified-strong-linux-x64-d8-try" }
@@ -606,6 +606,7 @@ buckets {
     builders { name: "dart2js-strong-faststartup-win-x64-chrome-try" mixins: "win" }
     builders { name: "dart2js-strong-faststartup-win-x64-ff-try" mixins: "win" }
     builders { name: "dart2js-strong-faststartup-win-x64-ie11-try" mixins: "win" }
+    builders { name: "dart2js-strong-hostasserts-linux-ia32-d8-try" }
     builders { name: "dart2js-strong-linux-x64-chrome-try" }
     builders { name: "dart2js-strong-linux-x64-ff-try" }
     builders { name: "dart2js-strong-mac-x64-chrome-try" mixins: "mac" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 58594fb3f9f7..ced5adc7dee7 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -1751,11 +1751,6 @@ consoles: {
     category: "dart2js|misc"
     short_name: "ut"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-dump-info-x64-linux"
-    category: "dart2js|misc"
-    short_name: "dp"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
     category: "analyzer"
@@ -2260,11 +2255,6 @@ consoles: {
     category: "dart2js|misc"
     short_name: "ut"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-dump-info-x64-linux-dev"
-    category: "dart2js|misc"
-    short_name: "dp"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-dev"
     category: "analyzer"
@@ -2769,11 +2759,6 @@ consoles: {
     category: "dart2js|misc"
     short_name: "ut"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-dump-info-x64-linux-stable"
-    category: "dart2js|misc"
-    short_name: "dp"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-stable"
     category: "analyzer"
@@ -3016,10 +3001,10 @@ consoles: {
   builders { name: "buildbucket/luci.dart.try/analyzer-linux-release-try" }
   builders { name: "buildbucket/luci.dart.try/benchmark-linux-try" }
   builders { name: "buildbucket/luci.dart.try/dart-sdk-windows-try" }
-  builders { name: "buildbucket/luci.dart.try/dart2js-linux-d8-hostchecked-try" }
-  builders { name: "buildbucket/luci.dart.try/dart2js-linux-d8-kernel-minified-try" }
-  builders { name: "buildbucket/luci.dart.try/dart2js-linux-none-only-unittest-try" }
   builders { name: "buildbucket/luci.dart.try/dart2js-linux-x64-chrome-try" }
+  builders { name: "buildbucket/luci.dart.try/dart2js-minified-strong-linux-x64-d8-try" }
+  builders { name: "buildbucket/luci.dart.try/dart2js-strong-hostasserts-linux-ia32-d8-try" }
+  builders { name: "buildbucket/luci.dart.try/dart2js-unit-linux-x64-release-try" }
   builders { name: "buildbucket/luci.dart.try/ddc-linux-release-chrome-try" }
   builders { name: "buildbucket/luci.dart.try/front-end-linux-release-x64-try" }
   builders { name: "buildbucket/luci.dart.try/pkg-linux-release-try" }

From 0d495a335591c69d16ac3bae84add147a1b3f5ff Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 4 Jul 2018 09:21:34 +0000
Subject: [PATCH 149/826] [infra] Assign consistent short_names to analyzer
 builders

TBR=whesse@google.com

Change-Id: I2a537df37bbe466a3b7d66134a39276473eb6993
Reviewed-on: https://dart-review.googlesource.com/63628
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-milo.cfg | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index ced5adc7dee7..486c1dc7adeb 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -489,17 +489,17 @@ consoles: {
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
     category: "analyzer"
-    short_name: "r"
+    short_name: "l"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
     category: "analyzer"
-    short_name: "mr"
+    short_name: "m"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
     category: "analyzer"
-    short_name: "awr"
+    short_name: "w"
   }
   builders {
     # migrating to dart-sdk-linux
@@ -807,17 +807,17 @@ consoles: {
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
     category: "analyzer"
-    short_name: "r"
+    short_name: "l"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
     category: "analyzer"
-    short_name: "mr"
+    short_name: "m"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
     category: "analyzer"
-    short_name: "awr"
+    short_name: "w"
   }
   builders {
     # migrating to dart-sdk-linux
@@ -1754,7 +1754,7 @@ consoles: {
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
     category: "analyzer"
-    short_name: "aas"
+    short_name: "as"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-fasta-parser-linux"
@@ -1764,17 +1764,17 @@ consoles: {
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
     category: "analyzer"
-    short_name: "r"
+    short_name: "l"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
     category: "analyzer"
-    short_name: "mr"
+    short_name: "m"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
     category: "analyzer"
-    short_name: "awr"
+    short_name: "w"
   }
   builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-linux"
@@ -2258,7 +2258,7 @@ consoles: {
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-dev"
     category: "analyzer"
-    short_name: "aas"
+    short_name: "as"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-fasta-parser-linux-dev"
@@ -2268,17 +2268,17 @@ consoles: {
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-dev"
     category: "analyzer"
-    short_name: "r"
+    short_name: "l"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-dev"
     category: "analyzer"
-    short_name: "mr"
+    short_name: "m"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-dev"
     category: "analyzer"
-    short_name: "awr"
+    short_name: "w"
   }
   builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-linux-dev"
@@ -2762,7 +2762,7 @@ consoles: {
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-stable"
     category: "analyzer"
-    short_name: "aas"
+    short_name: "as"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-fasta-parser-linux-stable"
@@ -2772,17 +2772,17 @@ consoles: {
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-stable"
     category: "analyzer"
-    short_name: "r"
+    short_name: "l"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-stable"
     category: "analyzer"
-    short_name: "mr"
+    short_name: "m"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-stable"
     category: "analyzer"
-    short_name: "awr"
+    short_name: "w"
   }
   builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-linux-stable"

From 2f7dc6d0122e527a8e5577f145b72c1080d0ccdd Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 4 Jul 2018 11:10:22 +0000
Subject: [PATCH 150/826] [infra] Add front-end-legacy builder to Luci config

Change-Id: I709ce335b184ea2c300865e58c3744421494a11b
Reviewed-on: https://dart-review.googlesource.com/63627
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg |  4 ++++
 luci-milo.cfg      | 45 +++++++++++++++++++++++++++++++++++----------
 luci-scheduler.cfg | 42 +++++++++++++++++++++++++++++++++++++++---
 3 files changed, 78 insertions(+), 13 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 639631a009ed..57b39adfe936 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -228,6 +228,7 @@ buckets {
     builders { name: "ddc-mac-release-chrome" mixins: "mac" }
     builders { name: "ddc-win-release-chrome" mixins: "win" }
     builders { name: "front-end-mac-release-x64" mixins: "clobber" mixins: "mac" }
+    builders { name: "front-end-legacy-linux-release-x64" mixins: "clobber" }
     builders { name: "front-end-linux-release-x64" mixins: "clobber" }
     builders { name: "front-end-win-release-x64" mixins: "clobber" mixins: "win" }
     builders { name: "pkg-linux-release" }
@@ -352,6 +353,7 @@ buckets {
     builders { name: "ddc-mac-release-chrome-dev" mixins: "mac" }
     builders { name: "ddc-win-release-chrome-dev" mixins: "win" }
     builders { name: "front-end-mac-release-x64-dev" mixins: "clobber" mixins: "mac" }
+    builders { name: "front-end-legacy-linux-release-x64-dev" mixins: "clobber" }
     builders { name: "front-end-linux-release-x64-dev" mixins: "clobber" }
     builders { name: "front-end-win-release-x64-dev" mixins: "clobber" mixins: "win" }
     builders { name: "pkg-linux-release-dev" }
@@ -475,6 +477,7 @@ buckets {
     builders { name: "ddc-linux-release-chrome-stable" }
     builders { name: "ddc-mac-release-chrome-stable" mixins: "mac" }
     builders { name: "ddc-win-release-chrome-stable" mixins: "win" }
+    builders { name: "front-end-legacy-linux-release-x64-stable" mixins: "clobber" }
     builders { name: "front-end-mac-release-x64-stable" mixins: "clobber" mixins: "mac" }
     builders { name: "front-end-linux-release-x64-stable" mixins: "clobber" }
     builders { name: "front-end-win-release-x64-stable" mixins: "clobber" mixins: "win" }
@@ -619,6 +622,7 @@ buckets {
     builders { name: "ddc-linux-release-chrome-try" mixins: "clobber" }
     builders { name: "ddc-mac-release-chrome-try" mixins: "mac" }
     builders { name: "ddc-win-release-chrome-try" mixins: "win" }
+    builders { name: "front-end-legacy-linux-release-x64-try" mixins: "clobber" }
     builders { name: "front-end-linux-release-x64-try" mixins: "clobber" }
     builders { name: "front-end-mac-release-x64-try" mixins: "clobber" mixins: "mac" }
     builders { name: "front-end-win-release-x64-try" mixins: "clobber" mixins: "win" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 486c1dc7adeb..80758462fc85 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -7,15 +7,20 @@ consoles: {
   refs: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-legacy-linux-release-x64"
     category: "fasta"
-    short_name: "m"
+    short_name: "ll"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
     category: "fasta"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
+    category: "fasta"
+    short_name: "m"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
     category: "fasta"
@@ -713,15 +718,20 @@ consoles: {
   refs: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-legacy-linux-release-x64"
     category: "fasta"
-    short_name: "m"
+    short_name: "ll"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
     category: "fasta"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
+    category: "fasta"
+    short_name: "m"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
     category: "fasta"
@@ -1417,15 +1427,20 @@ consoles: {
   refs: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-legacy-linux-release-x64"
     category: "fasta"
-    short_name: "m"
+    short_name: "ll"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
     category: "fasta"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
+    category: "fasta"
+    short_name: "m"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
     category: "fasta"
@@ -1921,15 +1936,20 @@ consoles: {
   refs: "refs/heads/dev"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-legacy-linux-release-x64-dev"
     category: "fasta"
-    short_name: "m"
+    short_name: "ll"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-dev"
     category: "fasta"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-dev"
+    category: "fasta"
+    short_name: "m"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-dev"
     category: "fasta"
@@ -2425,15 +2445,20 @@ consoles: {
   refs: "refs/heads/stable"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-legacy-linux-release-x64-stable"
     category: "fasta"
-    short_name: "m"
+    short_name: "ll"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-stable"
     category: "fasta"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-stable"
+    category: "fasta"
+    short_name: "m"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-stable"
     category: "fasta"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 807fc3b7563e..abbd383c5100 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -40,8 +40,9 @@ trigger {
   triggers: "ddc-linux-release-chrome"
   triggers: "ddc-mac-release-chrome"
   triggers: "ddc-win-release-chrome"
-  triggers: "front-end-mac-release-x64"
+  triggers: "front-end-legacy-linux-release-x64"
   triggers: "front-end-linux-release-x64"
+  triggers: "front-end-mac-release-x64"
   triggers: "front-end-win-release-x64"
   triggers: "pkg-linux-release"
   triggers: "pkg-mac-release"
@@ -91,8 +92,9 @@ trigger {
   triggers: "ddc-linux-release-chrome-dev"
   triggers: "ddc-mac-release-chrome-dev"
   triggers: "ddc-win-release-chrome-dev"
-  triggers: "front-end-mac-release-x64-dev"
+  triggers: "front-end-legacy-linux-release-x64-dev"
   triggers: "front-end-linux-release-x64-dev"
+  triggers: "front-end-mac-release-x64-dev"
   triggers: "front-end-win-release-x64-dev"
   triggers: "pkg-linux-release-dev"
   triggers: "pkg-mac-release-dev"
@@ -142,8 +144,9 @@ trigger {
   triggers: "ddc-linux-release-chrome-stable"
   triggers: "ddc-mac-release-chrome-stable"
   triggers: "ddc-win-release-chrome-stable"
-  triggers: "front-end-mac-release-x64-stable"
+  triggers: "front-end-legacy-linux-release-x64-stable"
   triggers: "front-end-linux-release-x64-stable"
+  triggers: "front-end-mac-release-x64-stable"
   triggers: "front-end-win-release-x64-stable"
   triggers: "pkg-linux-release-stable"
   triggers: "pkg-mac-release-stable"
@@ -379,6 +382,17 @@ job {
   }
 }
 
+job {
+  id: "front-end-legacy-linux-release-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-legacy-linux-release-x64"
+  }
+}
+
 job {
   id: "front-end-linux-release-x64"
   acl_sets: "default"
@@ -844,6 +858,17 @@ job {
   }
 }
 
+job {
+  id: "front-end-legacy-linux-release-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-legacy-linux-release-x64-dev"
+  }
+}
+
 job {
   id: "front-end-linux-release-x64-dev"
   acl_sets: "default"
@@ -1309,6 +1334,17 @@ job {
   }
 }
 
+job {
+  id: "front-end-legacy-linux-release-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-legacy-linux-release-x64-stable"
+  }
+}
+
 job {
   id: "front-end-linux-release-x64-stable"
   acl_sets: "default"

From a2ef91298ca3b56ca8f687fdc266424ded33c2b3 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 5 Jul 2018 17:46:47 +0000
Subject: [PATCH 151/826] [infra] Add dart2js d8 builders to scheduler and
 consoles

Change-Id: I089274449c1ba1f6108664a2c0645b19ae02ceac
Reviewed-on: https://dart-review.googlesource.com/63881
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-milo.cfg      | 164 +++++++++------------------------------------
 luci-scheduler.cfg | 108 +++++++++++++++++++++++++++++
 2 files changed, 138 insertions(+), 134 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 80758462fc85..2fb680d548c8 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -415,72 +415,20 @@ consoles: {
     short_name: "rrb"
   }
   builders {
-    # migrating to dart2js-hostchecked-linux-ia32-d8
-    name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-1-5-be"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
     category: "dart2js|d8"
-    short_name: "1hc"
+    short_name: "ha"
   }
   builders {
-    # migrating to dart2js-hostchecked-linux-ia32-d8
-    name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-2-5-be"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
     category: "dart2js|d8"
-    short_name: "2hc"
-  }
-  builders {
-    # migrating to dart2js-hostchecked-linux-ia32-d8
-    name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-3-5-be"
-    category: "dart2js|d8"
-    short_name: "3hc"
-  }
-  builders {
-    # migrating to dart2js-hostchecked-linux-ia32-d8
-    name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-4-5-be"
-    category: "dart2js|d8"
-    short_name: "4hc"
-  }
-  builders {
-    # migrating to dart2js-hostchecked-linux-ia32-d8
-    name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-5-5-be"
-    category: "dart2js|d8"
-    short_name: "5hc"
-  }
-  builders {
-    # migrating to dart2js-minified-linux-x64-d8
-    name: "buildbot/client.dart/dart2js-linux-d8-minified-1-5-be"
-    category: "dart2js|d8"
-    short_name: "1mi"
-  }
-  builders {
-    # migrating to dart2js-minified-linux-x64-d8
-    name: "buildbot/client.dart/dart2js-linux-d8-minified-2-5-be"
-    category: "dart2js|d8"
-    short_name: "2mi"
-  }
-  builders {
-    # migrating to dart2js-minified-linux-x64-d8
-    name: "buildbot/client.dart/dart2js-linux-d8-minified-3-5-be"
-    category: "dart2js|d8"
-    short_name: "3mi"
-  }
-  builders {
-    # migrating to dart2js-minified-linux-x64-d8
-    name: "buildbot/client.dart/dart2js-linux-d8-minified-4-5-be"
-    category: "dart2js|d8"
-    short_name: "4mi"
+    short_name: "mi"
   }
   builders {
-    # migrating to dart2js-minified-linux-x64-d8
-    name: "buildbot/client.dart/dart2js-linux-d8-minified-5-5-be"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
     category: "dart2js|d8"
-    short_name: "5mi"
+    short_name: "u"
   }
-# doesn't exist on buildbot, maybe migrate immediately?
-#  builders {
-#    # migrating to dart2js-only-unittest-linux-ia32-none
-#    name: "buildbot/client.dart/dart2js-only-unittest-linux-ia32-none-be"
-#    category: "dart2js|misc"
-#    short_name: "ut"
-#  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
     category: "analyzer"
@@ -738,72 +686,20 @@ consoles: {
     short_name: "w"
   }
   builders {
-    # migrating to dart2js-hostchecked-linux-ia32-d8
-    name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-1-5-be"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
     category: "dart2js|d8"
-    short_name: "1hc"
+    short_name: "ha"
   }
   builders {
-    # migrating to dart2js-hostchecked-linux-ia32-d8
-    name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-2-5-be"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
     category: "dart2js|d8"
-    short_name: "2hc"
-  }
-  builders {
-    # migrating to dart2js-hostchecked-linux-ia32-d8
-    name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-3-5-be"
-    category: "dart2js|d8"
-    short_name: "3hc"
-  }
-  builders {
-    # migrating to dart2js-hostchecked-linux-ia32-d8
-    name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-4-5-be"
-    category: "dart2js|d8"
-    short_name: "4hc"
-  }
-  builders {
-    # migrating to dart2js-hostchecked-linux-ia32-d8
-    name: "buildbot/client.dart/dart2js-linux-d8-hostchecked-unittest-5-5-be"
-    category: "dart2js|d8"
-    short_name: "5hc"
-  }
-  builders {
-    # migrating to dart2js-minified-linux-x64-d8
-    name: "buildbot/client.dart/dart2js-linux-d8-minified-1-5-be"
-    category: "dart2js|d8"
-    short_name: "1mi"
-  }
-  builders {
-    # migrating to dart2js-minified-linux-x64-d8
-    name: "buildbot/client.dart/dart2js-linux-d8-minified-2-5-be"
-    category: "dart2js|d8"
-    short_name: "2mi"
-  }
-  builders {
-    # migrating to dart2js-minified-linux-x64-d8
-    name: "buildbot/client.dart/dart2js-linux-d8-minified-3-5-be"
-    category: "dart2js|d8"
-    short_name: "3mi"
-  }
-  builders {
-    # migrating to dart2js-minified-linux-x64-d8
-    name: "buildbot/client.dart/dart2js-linux-d8-minified-4-5-be"
-    category: "dart2js|d8"
-    short_name: "4mi"
+    short_name: "mi"
   }
   builders {
-    # migrating to dart2js-minified-linux-x64-d8
-    name: "buildbot/client.dart/dart2js-linux-d8-minified-5-5-be"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
     category: "dart2js|d8"
-    short_name: "5mi"
+    short_name: "u"
   }
-# doesn't exist on buildbot, maybe migrate immediately?
-#  builders {
-#    # migrating to dart2js-only-unittest-linux-ia32-none
-#    name: "buildbot/client.dart/dart2js-only-unittest-linux-ia32-none-be"
-#    category: "dart2js|misc"
-#    short_name: "ut"
-#  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
     category: "analyzer"
@@ -1752,19 +1648,19 @@ consoles: {
     short_name: "rrb"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-ia32-d8"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
     category: "dart2js|d8"
-    short_name: "hc"
+    short_name: "ha"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-linux-x64-d8"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
     category: "dart2js|d8"
     short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-only-unittest-linux-ia32-none"
-    category: "dart2js|misc"
-    short_name: "ut"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
+    category: "dart2js|d8"
+    short_name: "u"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
@@ -2261,19 +2157,19 @@ consoles: {
     short_name: "rrb"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-ia32-d8-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-dev"
     category: "dart2js|d8"
-    short_name: "hc"
+    short_name: "ha"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-linux-x64-d8-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-dev"
     category: "dart2js|d8"
     short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-only-unittest-linux-ia32-none-dev"
-    category: "dart2js|misc"
-    short_name: "ut"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-dev"
+    category: "dart2js|d8"
+    short_name: "u"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-dev"
@@ -2770,19 +2666,19 @@ consoles: {
     short_name: "rrb"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-ia32-d8-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-stable"
     category: "dart2js|d8"
-    short_name: "hc"
+    short_name: "ha"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-linux-x64-d8-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-stable"
     category: "dart2js|d8"
     short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-only-unittest-linux-ia32-none-stable"
-    category: "dart2js|misc"
-    short_name: "ut"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-stable"
+    category: "dart2js|d8"
+    short_name: "u"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-stable"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index abbd383c5100..c87bdf7580fe 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -36,6 +36,9 @@ trigger {
   triggers: "dart2js-faststartup-linux-x64-chrome"
   triggers: "dart2js-linux-x64-chrome"
   triggers: "dart2js-mac-x64-chrome"
+  triggers: "dart2js-minified-strong-linux-x64-d8"
+  triggers: "dart2js-strong-hostasserts-linux-ia32-d8"
+  triggers: "dart2js-unit-linux-x64-release"
   triggers: "dart2js-win-x64-chrome"
   triggers: "ddc-linux-release-chrome"
   triggers: "ddc-mac-release-chrome"
@@ -88,6 +91,9 @@ trigger {
   triggers: "dart2js-faststartup-linux-x64-chrome-dev"
   triggers: "dart2js-linux-x64-chrome-dev"
   triggers: "dart2js-mac-x64-chrome-dev"
+  triggers: "dart2js-minified-strong-linux-x64-d8-dev"
+  triggers: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
+  triggers: "dart2js-unit-linux-x64-release-dev"
   triggers: "dart2js-win-x64-chrome-dev"
   triggers: "ddc-linux-release-chrome-dev"
   triggers: "ddc-mac-release-chrome-dev"
@@ -140,6 +146,9 @@ trigger {
   triggers: "dart2js-faststartup-linux-x64-chrome-stable"
   triggers: "dart2js-linux-x64-chrome-stable"
   triggers: "dart2js-mac-x64-chrome-stable"
+  triggers: "dart2js-minified-strong-linux-x64-d8-stable"
+  triggers: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
+  triggers: "dart2js-unit-linux-x64-release-stable"
   triggers: "dart2js-win-x64-chrome-stable"
   triggers: "ddc-linux-release-chrome-stable"
   triggers: "ddc-mac-release-chrome-stable"
@@ -338,6 +347,39 @@ job {
   }
 }
 
+job {
+  id: "dart2js-minified-strong-linux-x64-d8"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-minified-strong-linux-x64-d8"
+  }
+}
+
+job {
+  id: "dart2js-strong-hostasserts-linux-ia32-d8"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-hostasserts-linux-ia32-d8"
+  }
+}
+
+job {
+  id: "dart2js-unit-linux-x64-release"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-unit-linux-x64-release"
+  }
+}
+
 job {
   id: "dart2js-win-x64-chrome"
   acl_sets: "default"
@@ -814,6 +856,39 @@ job {
   }
 }
 
+job {
+  id: "dart2js-minified-strong-linux-x64-d8-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-minified-strong-linux-x64-d8-dev"
+  }
+}
+
+job {
+  id: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
+  }
+}
+
+job {
+  id: "dart2js-unit-linux-x64-release-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-unit-linux-x64-release-dev"
+  }
+}
+
 job {
   id: "dart2js-win-x64-chrome-dev"
   acl_sets: "default"
@@ -1290,6 +1365,39 @@ job {
   }
 }
 
+job {
+  id: "dart2js-minified-strong-linux-x64-d8-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-minified-strong-linux-x64-d8-stable"
+  }
+}
+
+job {
+  id: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
+  }
+}
+
+job {
+  id: "dart2js-unit-linux-x64-release-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-unit-linux-x64-release-stable"
+  }
+}
+
 job {
   id: "dart2js-win-x64-chrome-stable"
   acl_sets: "default"

From ff8b07b24f302f103a43e45e023ca2ed9eee96e3 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Tue, 10 Jul 2018 11:05:43 +0000
Subject: [PATCH 152/826] Switch dart2js-chrome buildbot builders to Dart 2

Change-Id: I68460286305b67a9b39353540c2975f0ace37ab5
Reviewed-on: https://dart-review.googlesource.com/64320
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 luci-milo.cfg      | 42 +++++++++++++--------------
 luci-scheduler.cfg | 72 +++++++++++++++++++++++-----------------------
 2 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 2fb680d548c8..f2b16f248eca 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -488,12 +488,12 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-faststartup-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "fs"
   }
@@ -534,7 +534,7 @@ consoles: {
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
@@ -557,7 +557,7 @@ consoles: {
     short_name: "3m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
@@ -783,12 +783,12 @@ consoles: {
     short_name: "4l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-faststartup-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "fs"
   }
@@ -803,7 +803,7 @@ consoles: {
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
@@ -826,7 +826,7 @@ consoles: {
     short_name: "3m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
@@ -1718,12 +1718,12 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-faststartup-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "fs"
   }
@@ -1738,7 +1738,7 @@ consoles: {
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
@@ -1748,7 +1748,7 @@ consoles: {
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
@@ -2227,12 +2227,12 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-faststartup-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "fs"
   }
@@ -2247,7 +2247,7 @@ consoles: {
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "m"
   }
@@ -2257,7 +2257,7 @@ consoles: {
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "w"
   }
@@ -2736,12 +2736,12 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-faststartup-linux-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-faststartup-linux-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "fs"
   }
@@ -2756,7 +2756,7 @@ consoles: {
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "m"
   }
@@ -2766,7 +2766,7 @@ consoles: {
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "w"
   }
@@ -2922,7 +2922,7 @@ consoles: {
   builders { name: "buildbucket/luci.dart.try/analyzer-linux-release-try" }
   builders { name: "buildbucket/luci.dart.try/benchmark-linux-try" }
   builders { name: "buildbucket/luci.dart.try/dart-sdk-windows-try" }
-  builders { name: "buildbucket/luci.dart.try/dart2js-linux-x64-chrome-try" }
+  builders { name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-chrome-try" }
   builders { name: "buildbucket/luci.dart.try/dart2js-minified-strong-linux-x64-d8-try" }
   builders { name: "buildbucket/luci.dart.try/dart2js-strong-hostasserts-linux-ia32-d8-try" }
   builders { name: "buildbucket/luci.dart.try/dart2js-unit-linux-x64-release-try" }
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index c87bdf7580fe..444d39fd491e 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -33,13 +33,13 @@ trigger {
   triggers: "dart-sdk-mac"
   triggers: "dart-sdk-win"
   triggers: "dart2js-csp-minified-linux-x64-chrome"
-  triggers: "dart2js-faststartup-linux-x64-chrome"
-  triggers: "dart2js-linux-x64-chrome"
-  triggers: "dart2js-mac-x64-chrome"
+  triggers: "dart2js-strong-faststartup-linux-x64-chrome"
+  triggers: "dart2js-strong-linux-x64-chrome"
+  triggers: "dart2js-strong-mac-x64-chrome"
   triggers: "dart2js-minified-strong-linux-x64-d8"
   triggers: "dart2js-strong-hostasserts-linux-ia32-d8"
   triggers: "dart2js-unit-linux-x64-release"
-  triggers: "dart2js-win-x64-chrome"
+  triggers: "dart2js-strong-win-x64-chrome"
   triggers: "ddc-linux-release-chrome"
   triggers: "ddc-mac-release-chrome"
   triggers: "ddc-win-release-chrome"
@@ -88,13 +88,13 @@ trigger {
   triggers: "dart-sdk-mac-dev"
   triggers: "dart-sdk-win-dev"
   triggers: "dart2js-csp-minified-linux-x64-chrome-dev"
-  triggers: "dart2js-faststartup-linux-x64-chrome-dev"
-  triggers: "dart2js-linux-x64-chrome-dev"
-  triggers: "dart2js-mac-x64-chrome-dev"
+  triggers: "dart2js-strong-faststartup-linux-x64-chrome-dev"
+  triggers: "dart2js-strong-linux-x64-chrome-dev"
+  triggers: "dart2js-strong-mac-x64-chrome-dev"
   triggers: "dart2js-minified-strong-linux-x64-d8-dev"
   triggers: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
   triggers: "dart2js-unit-linux-x64-release-dev"
-  triggers: "dart2js-win-x64-chrome-dev"
+  triggers: "dart2js-strong-win-x64-chrome-dev"
   triggers: "ddc-linux-release-chrome-dev"
   triggers: "ddc-mac-release-chrome-dev"
   triggers: "ddc-win-release-chrome-dev"
@@ -143,13 +143,13 @@ trigger {
   triggers: "dart-sdk-mac-stable"
   triggers: "dart-sdk-win-stable"
   triggers: "dart2js-csp-minified-linux-x64-chrome-stable"
-  triggers: "dart2js-faststartup-linux-x64-chrome-stable"
-  triggers: "dart2js-linux-x64-chrome-stable"
-  triggers: "dart2js-mac-x64-chrome-stable"
+  triggers: "dart2js-strong-faststartup-linux-x64-chrome-stable"
+  triggers: "dart2js-strong-linux-x64-chrome-stable"
+  triggers: "dart2js-strong-mac-x64-chrome-stable"
   triggers: "dart2js-minified-strong-linux-x64-d8-stable"
   triggers: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
   triggers: "dart2js-unit-linux-x64-release-stable"
-  triggers: "dart2js-win-x64-chrome-stable"
+  triggers: "dart2js-strong-win-x64-chrome-stable"
   triggers: "ddc-linux-release-chrome-stable"
   triggers: "ddc-mac-release-chrome-stable"
   triggers: "ddc-win-release-chrome-stable"
@@ -315,35 +315,35 @@ job {
 }
 
 job {
-  id: "dart2js-faststartup-linux-x64-chrome"
+  id: "dart2js-strong-faststartup-linux-x64-chrome"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-faststartup-linux-x64-chrome"
+    builder: "dart2js-strong-faststartup-linux-x64-chrome"
   }
 }
 
 job {
-  id: "dart2js-linux-x64-chrome"
+  id: "dart2js-strong-linux-x64-chrome"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-linux-x64-chrome"
+    builder: "dart2js-strong-linux-x64-chrome"
   }
 }
 
 job {
-  id: "dart2js-mac-x64-chrome"
+  id: "dart2js-strong-mac-x64-chrome"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-mac-x64-chrome"
+    builder: "dart2js-strong-mac-x64-chrome"
   }
 }
 
@@ -381,13 +381,13 @@ job {
 }
 
 job {
-  id: "dart2js-win-x64-chrome"
+  id: "dart2js-strong-win-x64-chrome"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-win-x64-chrome"
+    builder: "dart2js-strong-win-x64-chrome"
   }
 }
 
@@ -824,35 +824,35 @@ job {
 }
 
 job {
-  id: "dart2js-faststartup-linux-x64-chrome-dev"
+  id: "dart2js-strong-faststartup-linux-x64-chrome-dev"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-faststartup-linux-x64-chrome-dev"
+    builder: "dart2js-strong-faststartup-linux-x64-chrome-dev"
   }
 }
 
 job {
-  id: "dart2js-linux-x64-chrome-dev"
+  id: "dart2js-strong-linux-x64-chrome-dev"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-linux-x64-chrome-dev"
+    builder: "dart2js-strong-linux-x64-chrome-dev"
   }
 }
 
 job {
-  id: "dart2js-mac-x64-chrome-dev"
+  id: "dart2js-strong-mac-x64-chrome-dev"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-mac-x64-chrome-dev"
+    builder: "dart2js-strong-mac-x64-chrome-dev"
   }
 }
 
@@ -890,13 +890,13 @@ job {
 }
 
 job {
-  id: "dart2js-win-x64-chrome-dev"
+  id: "dart2js-strong-win-x64-chrome-dev"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-win-x64-chrome-dev"
+    builder: "dart2js-strong-win-x64-chrome-dev"
   }
 }
 
@@ -1333,35 +1333,35 @@ job {
 }
 
 job {
-  id: "dart2js-faststartup-linux-x64-chrome-stable"
+  id: "dart2js-strong-faststartup-linux-x64-chrome-stable"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-faststartup-linux-x64-chrome-stable"
+    builder: "dart2js-strong-faststartup-linux-x64-chrome-stable"
   }
 }
 
 job {
-  id: "dart2js-linux-x64-chrome-stable"
+  id: "dart2js-strong-linux-x64-chrome-stable"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-linux-x64-chrome-stable"
+    builder: "dart2js-strong-linux-x64-chrome-stable"
   }
 }
 
 job {
-  id: "dart2js-mac-x64-chrome-stable"
+  id: "dart2js-strong-mac-x64-chrome-stable"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-mac-x64-chrome-stable"
+    builder: "dart2js-strong-mac-x64-chrome-stable"
   }
 }
 
@@ -1399,13 +1399,13 @@ job {
 }
 
 job {
-  id: "dart2js-win-x64-chrome-stable"
+  id: "dart2js-strong-win-x64-chrome-stable"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-win-x64-chrome-stable"
+    builder: "dart2js-strong-win-x64-chrome-stable"
   }
 }
 

From bd5ed3e6d4500ee23af64922c541d3d93d4298f8 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Thu, 12 Jul 2018 09:14:47 +0000
Subject: [PATCH 153/826] Switch Dart2js Firefox builders over to Dart2 and
 Luci

Bug: https://github.com/dart-lang/sdk/issues/33454
Change-Id: I27dd95d3eb4ffeec47eb459c5a72bee30ac440b4
Reviewed-on: https://dart-review.googlesource.com/64545
Reviewed-by: Sigmund Cherem <sigmund@google.com>
---
 luci-milo.cfg      | 116 ++++++++++++++-------------------------------
 luci-scheduler.cfg |  72 ++++++++++++++++++++++++++++
 2 files changed, 108 insertions(+), 80 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index f2b16f248eca..ff2cfae6e1e6 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -498,36 +498,15 @@ consoles: {
     short_name: "fs"
   }
   builders {
-    # migrating to dart2js-linux-x64-ff
-    name: "buildbot/client.dart/dart2js-linux-ff-1-4-be"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-ff"
     category: "dart2js|ff"
-    short_name: "1l"
-  }
-  builders {
-    # migrating to dart2js-linux-x64-ff
-    name: "buildbot/client.dart/dart2js-linux-ff-2-4-be"
-    category: "dart2js|ff"
-    short_name: "2l"
-  }
-  builders {
-    # migrating to dart2js-linux-x64-ff
-    name: "buildbot/client.dart/dart2js-linux-ff-3-4-be"
-    category: "dart2js|ff"
-    short_name: "3l"
+    short_name: "l"
   }
   builders {
-    # migrating to dart2js-linux-x64-ff
-    name: "buildbot/client.dart/dart2js-linux-ff-4-4-be"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ff"
     category: "dart2js|ff"
-    short_name: "4l"
+    short_name: "w"
   }
-# doesn't exist on buildbot, included in chromeff builder
-#  builders {
-#    # migrating to dart2js-linux-x64-ff
-#    name: "buildbot/client.dart/dart2js-linux-x64-ff-be"
-#    category: "dart2js|ff"
-#    short_name: "l"
-#  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
     category: "dart2js|chrome"
@@ -570,27 +549,27 @@ consoles: {
 #  }
   builders {
     # migrating to dart2js-win-x64-ff
-    name: "buildbot/client.dart/dart2js-win7-ie11ff-1-4-be"
-    category: "dart2js|ff"
-    short_name: "1w"
+    name: "buildbot/client.dart/dart2js-win7-ie11-2-4-be"
+    category: "dart2js|ms"
+    short_name: "1ie"
   }
   builders {
     # migrating to dart2js-win-x64-ff
-    name: "buildbot/client.dart/dart2js-win7-ie11ff-2-4-be"
-    category: "dart2js|ff"
-    short_name: "2w"
+    name: "buildbot/client.dart/dart2js-win7-ie11-2-4-be"
+    category: "dart2js|ms"
+    short_name: "2ie"
   }
   builders {
     # migrating to dart2js-win-x64-ff
-    name: "buildbot/client.dart/dart2js-win7-ie11ff-3-4-be"
-    category: "dart2js|ff"
-    short_name: "3w"
+    name: "buildbot/client.dart/dart2js-win7-ie11-3-4-be"
+    category: "dart2js|ms"
+    short_name: "3ie"
   }
   builders {
     # migrating to dart2js-win-x64-ff
-    name: "buildbot/client.dart/dart2js-win7-ie11ff-4-4-be"
-    category: "dart2js|ff"
-    short_name: "4w"
+    name: "buildbot/client.dart/dart2js-win7-ie11-4-4-be"
+    category: "dart2js|ms"
+    short_name: "4ie"
   }
 # doesn't exist on buildbot, included in ie11ff builder
 #  builders {
@@ -759,28 +738,14 @@ consoles: {
     short_name: "w"
   }
   builders {
-    # migrating to dart2js-linux-x64-ff
-    name: "buildbot/client.dart/dart2js-linux-ff-1-4-be"
-    category: "dart2js|ff"
-    short_name: "1l"
-  }
-  builders {
-    # migrating to dart2js-linux-x64-ff
-    name: "buildbot/client.dart/dart2js-linux-ff-2-4-be"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-ff"
     category: "dart2js|ff"
-    short_name: "2l"
-  }
-  builders {
-    # migrating to dart2js-linux-x64-ff
-    name: "buildbot/client.dart/dart2js-linux-ff-3-4-be"
-    category: "dart2js|ff"
-    short_name: "3l"
+    short_name: "l"
   }
   builders {
-    # migrating to dart2js-linux-x64-ff
-    name: "buildbot/client.dart/dart2js-linux-ff-4-4-be"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ff"
     category: "dart2js|ff"
-    short_name: "4l"
+    short_name: "w"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
@@ -792,11 +757,6 @@ consoles: {
     category: "dart2js|chrome"
     short_name: "fs"
   }
-#  builders {
-#    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-ff"
-#    category: "dart2js|ff"
-#    short_name: "l"
-#  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
     category: "dart2js|chrome"
@@ -838,28 +798,24 @@ consoles: {
 #    short_name: "ed"
 #  }
   builders {
-    # migrating to dart2js-win-x64-ff
-    name: "buildbot/client.dart/dart2js-win7-ie11ff-1-4-be"
-    category: "dart2js|ff"
-    short_name: "1w"
+    name: "buildbot/client.dart/dart2js-win7-ie11-1-4-be"
+    category: "dart2js|ms"
+    short_name: "1ie"
   }
   builders {
-    # migrating to dart2js-win-x64-ff
-    name: "buildbot/client.dart/dart2js-win7-ie11ff-2-4-be"
-    category: "dart2js|ff"
-    short_name: "2w"
+    name: "buildbot/client.dart/dart2js-win7-ie11-2-4-be"
+    category: "dart2js|ms"
+    short_name: "2ie"
   }
   builders {
-    # migrating to dart2js-win-x64-ff
-    name: "buildbot/client.dart/dart2js-win7-ie11ff-3-4-be"
-    category: "dart2js|ff"
-    short_name: "3w"
+    name: "buildbot/client.dart/dart2js-win7-ie11-3-4-be"
+    category: "dart2js|ms"
+    short_name: "3ie"
   }
   builders {
-    # migrating to dart2js-win-x64-ff
-    name: "buildbot/client.dart/dart2js-win7-ie11ff-4-4-be"
-    category: "dart2js|ff"
-    short_name: "4w"
+    name: "buildbot/client.dart/dart2js-win7-ie11-4-4-be"
+    category: "dart2js|ms"
+    short_name: "4ie"
   }
 # doesn't exist on buildbot, included in ie11ff builder
 #  builders {
@@ -2237,7 +2193,7 @@ consoles: {
     short_name: "fs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-ff-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-ff-dev"
     category: "dart2js|ff"
     short_name: "l"
   }
@@ -2267,7 +2223,7 @@ consoles: {
     short_name: "ed"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ff-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ff-dev"
     category: "dart2js|ff"
     short_name: "w"
   }
@@ -2746,7 +2702,7 @@ consoles: {
     short_name: "fs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-ff-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-ff-stable"
     category: "dart2js|ff"
     short_name: "l"
   }
@@ -2776,7 +2732,7 @@ consoles: {
     short_name: "ed"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ff-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ff-stable"
     category: "dart2js|ff"
     short_name: "w"
   }
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 444d39fd491e..9e032aeb1226 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -35,11 +35,13 @@ trigger {
   triggers: "dart2js-csp-minified-linux-x64-chrome"
   triggers: "dart2js-strong-faststartup-linux-x64-chrome"
   triggers: "dart2js-strong-linux-x64-chrome"
+  triggers: "dart2js-strong-linux-x64-ff"
   triggers: "dart2js-strong-mac-x64-chrome"
   triggers: "dart2js-minified-strong-linux-x64-d8"
   triggers: "dart2js-strong-hostasserts-linux-ia32-d8"
   triggers: "dart2js-unit-linux-x64-release"
   triggers: "dart2js-strong-win-x64-chrome"
+  triggers: "dart2js-strong-win-x64-ff"
   triggers: "ddc-linux-release-chrome"
   triggers: "ddc-mac-release-chrome"
   triggers: "ddc-win-release-chrome"
@@ -90,11 +92,13 @@ trigger {
   triggers: "dart2js-csp-minified-linux-x64-chrome-dev"
   triggers: "dart2js-strong-faststartup-linux-x64-chrome-dev"
   triggers: "dart2js-strong-linux-x64-chrome-dev"
+  triggers: "dart2js-strong-linux-x64-ff-dev"
   triggers: "dart2js-strong-mac-x64-chrome-dev"
   triggers: "dart2js-minified-strong-linux-x64-d8-dev"
   triggers: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
   triggers: "dart2js-unit-linux-x64-release-dev"
   triggers: "dart2js-strong-win-x64-chrome-dev"
+  triggers: "dart2js-strong-win-x64-ff-dev"
   triggers: "ddc-linux-release-chrome-dev"
   triggers: "ddc-mac-release-chrome-dev"
   triggers: "ddc-win-release-chrome-dev"
@@ -145,11 +149,13 @@ trigger {
   triggers: "dart2js-csp-minified-linux-x64-chrome-stable"
   triggers: "dart2js-strong-faststartup-linux-x64-chrome-stable"
   triggers: "dart2js-strong-linux-x64-chrome-stable"
+  triggers: "dart2js-strong-linux-x64-ff-stable"
   triggers: "dart2js-strong-mac-x64-chrome-stable"
   triggers: "dart2js-minified-strong-linux-x64-d8-stable"
   triggers: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
   triggers: "dart2js-unit-linux-x64-release-stable"
   triggers: "dart2js-strong-win-x64-chrome-stable"
+  triggers: "dart2js-strong-win-x64-ff-stable"
   triggers: "ddc-linux-release-chrome-stable"
   triggers: "ddc-mac-release-chrome-stable"
   triggers: "ddc-win-release-chrome-stable"
@@ -336,6 +342,17 @@ job {
   }
 }
 
+job {
+  id: "dart2js-strong-linux-x64-ff"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-linux-x64-ff"
+  }
+}
+
 job {
   id: "dart2js-strong-mac-x64-chrome"
   acl_sets: "default"
@@ -391,6 +408,17 @@ job {
   }
 }
 
+job {
+  id: "dart2js-strong-win-x64-ff"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-win-x64-ff"
+  }
+}
+
 job {
   id: "ddc-linux-release-chrome"
   acl_sets: "default"
@@ -845,6 +873,17 @@ job {
   }
 }
 
+job {
+  id: "dart2js-strong-linux-x64-ff-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-linux-x64-ff-dev"
+  }
+}
+
 job {
   id: "dart2js-strong-mac-x64-chrome-dev"
   acl_sets: "default"
@@ -900,6 +939,17 @@ job {
   }
 }
 
+job {
+  id: "dart2js-strong-win-x64-ff-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-win-x64-ff-dev"
+  }
+}
+
 job {
   id: "ddc-linux-release-chrome-dev"
   acl_sets: "default"
@@ -1354,6 +1404,17 @@ job {
   }
 }
 
+job {
+  id: "dart2js-strong-linux-x64-ff-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-linux-x64-ff-stable"
+  }
+}
+
 job {
   id: "dart2js-strong-mac-x64-chrome-stable"
   acl_sets: "default"
@@ -1409,6 +1470,17 @@ job {
   }
 }
 
+job {
+  id: "dart2js-strong-win-x64-ff-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-win-x64-ff-stable"
+  }
+}
+
 job {
   id: "ddc-linux-release-chrome-stable"
   acl_sets: "default"

From dd314e8c4a373aa1fd84b0914d7519ed3072f921 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Thu, 12 Jul 2018 12:13:13 +0000
Subject: [PATCH 154/826] Switch safari to luci/milo and to Dart 2 testing

Change-Id: If96a89f642733473111be45a8c262f4282a4e68b
Reviewed-on: https://dart-review.googlesource.com/64683
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 luci-milo.cfg      | 40 +++++++---------------------------------
 luci-scheduler.cfg | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index ff2cfae6e1e6..47688a017bf8 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -518,22 +518,9 @@ consoles: {
     short_name: "m"
   }
   builders {
-    # migrating to dart2js-mac-x64-safari
-    name: "buildbot/client.dart/dart2js-mac10.11-safari-1-3-be"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
     category: "dart2js|safari"
-    short_name: "1m"
-  }
-  builders {
-    # migrating to dart2js-mac-x64-safari
-    name: "buildbot/client.dart/dart2js-mac10.11-safari-2-3-be"
-    category: "dart2js|safari"
-    short_name: "2m"
-  }
-  builders {
-    # migrating to dart2js-mac-x64-safari
-    name: "buildbot/client.dart/dart2js-mac10.11-safari-3-3-be"
-    category: "dart2js|safari"
-    short_name: "3m"
+    short_name: "m"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
@@ -768,22 +755,9 @@ consoles: {
     short_name: "m"
   }
   builders {
-    # migrating to dart2js-mac-x64-safari
-    name: "buildbot/client.dart/dart2js-mac10.11-safari-1-3-be"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
     category: "dart2js|safari"
-    short_name: "1m"
-  }
-  builders {
-    # migrating to dart2js-mac-x64-safari
-    name: "buildbot/client.dart/dart2js-mac10.11-safari-2-3-be"
-    category: "dart2js|safari"
-    short_name: "2m"
-  }
-  builders {
-    # migrating to dart2js-mac-x64-safari
-    name: "buildbot/client.dart/dart2js-mac10.11-safari-3-3-be"
-    category: "dart2js|safari"
-    short_name: "3m"
+    short_name: "m"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
@@ -1699,7 +1673,7 @@ consoles: {
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-safari"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
     category: "dart2js|safari"
     short_name: "m"
   }
@@ -2208,7 +2182,7 @@ consoles: {
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-safari-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-dev"
     category: "dart2js|safari"
     short_name: "m"
   }
@@ -2717,7 +2691,7 @@ consoles: {
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-x64-safari-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-stable"
     category: "dart2js|safari"
     short_name: "m"
   }
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 9e032aeb1226..507cbc37761f 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -37,6 +37,7 @@ trigger {
   triggers: "dart2js-strong-linux-x64-chrome"
   triggers: "dart2js-strong-linux-x64-ff"
   triggers: "dart2js-strong-mac-x64-chrome"
+  triggers: "dart2js-strong-mac-x64-safari"
   triggers: "dart2js-minified-strong-linux-x64-d8"
   triggers: "dart2js-strong-hostasserts-linux-ia32-d8"
   triggers: "dart2js-unit-linux-x64-release"
@@ -94,6 +95,7 @@ trigger {
   triggers: "dart2js-strong-linux-x64-chrome-dev"
   triggers: "dart2js-strong-linux-x64-ff-dev"
   triggers: "dart2js-strong-mac-x64-chrome-dev"
+  triggers: "dart2js-strong-mac-x64-safari-dev"
   triggers: "dart2js-minified-strong-linux-x64-d8-dev"
   triggers: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
   triggers: "dart2js-unit-linux-x64-release-dev"
@@ -151,6 +153,7 @@ trigger {
   triggers: "dart2js-strong-linux-x64-chrome-stable"
   triggers: "dart2js-strong-linux-x64-ff-stable"
   triggers: "dart2js-strong-mac-x64-chrome-stable"
+  triggers: "dart2js-strong-mac-x64-safari-stable"
   triggers: "dart2js-minified-strong-linux-x64-d8-stable"
   triggers: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
   triggers: "dart2js-unit-linux-x64-release-stable"
@@ -364,6 +367,17 @@ job {
   }
 }
 
+job {
+  id: "dart2js-strong-mac-x64-safari"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-mac-x64-safari"
+  }
+}
+
 job {
   id: "dart2js-minified-strong-linux-x64-d8"
   acl_sets: "default"
@@ -895,6 +909,17 @@ job {
   }
 }
 
+job {
+  id: "dart2js-strong-mac-x64-safari-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-mac-x64-safari-dev"
+  }
+}
+
 job {
   id: "dart2js-minified-strong-linux-x64-d8-dev"
   acl_sets: "default"
@@ -1426,6 +1451,17 @@ job {
   }
 }
 
+job {
+  id: "dart2js-strong-mac-x64-safari-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-mac-x64-safari-stable"
+  }
+}
+
 job {
   id: "dart2js-minified-strong-linux-x64-d8-stable"
   acl_sets: "default"

From d9f2115936c059802685c3aad7e4eccd4c75cf4f Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Thu, 12 Jul 2018 16:27:11 +0000
Subject: [PATCH 155/826] [Buildbot] Fix builder reference on Milo console

Change-Id: I5d1dd8312890ab457903b1a8f25a0a2cb18ed785
Reviewed-on: https://dart-review.googlesource.com/64740
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-milo.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 47688a017bf8..6e6ab1d46894 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -536,7 +536,7 @@ consoles: {
 #  }
   builders {
     # migrating to dart2js-win-x64-ff
-    name: "buildbot/client.dart/dart2js-win7-ie11-2-4-be"
+    name: "buildbot/client.dart/dart2js-win7-ie11-1-4-be"
     category: "dart2js|ms"
     short_name: "1ie"
   }

From 7c8742546794f21391d4684a8b53c13d0fb293d3 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 26 Jul 2018 08:15:20 +0000
Subject: [PATCH 156/826] [infra] Remove reference to obsolete
 dart2js-d8-hostchecked builder

This was the last use of the dart2js swarming mixin.

TBR=whesse@google.com

Change-Id: If52681ab4442b51a8414c0d5b13e2ba3a3d21f67
Reviewed-on: https://dart-review.googlesource.com/66573
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 57b39adfe936..ed0b33f6baae 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -57,14 +57,6 @@ builder_mixins {
   }
 }
 
-builder_mixins {
-  name: "dart2js"
-  recipe {
-    name: "dart/dart2js_swarming"
-    properties_j: "shards:6"
-  }
-}
-
 builder_mixins {
   name: "debianpackage"
   # todo(athom): how should this machine be defined?
@@ -598,7 +590,6 @@ buckets {
     builders { name: "dart2js-faststartup-win-x64-chrome-try" mixins: "win" }
     builders { name: "dart2js-faststartup-win-x64-ff-try" mixins: "win" }
     builders { name: "dart2js-faststartup-win-x64-ie11-try" mixins: "win" }
-    builders { name: "dart2js-linux-d8-hostchecked-try" mixins: "dart2js" }
     builders { name: "dart2js-linux-x64-chrome-try" }
     builders { name: "dart2js-mac-x64-chrome-try" mixins: "mac" }
     builders { name: "dart2js-minified-strong-linux-x64-d8-try" }

From 4bcc06cc2df718a1b98d91744e5a0ec3a3c15b81 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 26 Jul 2018 11:16:32 +0000
Subject: [PATCH 157/826] [infra] Add new dartkb builders

TBR=whesse@google.com

Change-Id: Ie12348f940520ed78e36cc036c574e7cc8adc64e
Reviewed-on: https://dart-review.googlesource.com/66574
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index ed0b33f6baae..d4a0e5fbd5e9 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -234,6 +234,8 @@ buckets {
     builders { name: "target-vm-linux-release-arm64" dimensions: "cpu:arm64" }
     builders { name: "versionchecker-linux" }
     builders { name: "vm-asan-linux-release-x64" }
+    builders { name: "vm-dartkb-linux-debug-x64" }
+    builders { name: "vm-dartkb-linux-release-x64" }
     builders { name: "vm-kernel-linux-debug-simdbc64" }
     builders { name: "vm-kernel-linux-debug-x64" }
     builders { name: "vm-kernel-linux-release-simarm" }
@@ -359,6 +361,8 @@ buckets {
     builders { name: "target-vm-linux-release-arm64-dev" dimensions: "cpu:arm64" }
     builders { name: "versionchecker-linux-dev" }
     builders { name: "vm-asan-linux-release-x64-dev" }
+    builders { name: "vm-dartkb-linux-debug-x64-dev" }
+    builders { name: "vm-dartkb-linux-release-x64-dev" }
     builders { name: "vm-kernel-linux-debug-simdbc64-dev" }
     builders { name: "vm-kernel-linux-debug-x64-dev" }
     builders { name: "vm-kernel-linux-release-simarm-dev" }
@@ -484,6 +488,8 @@ buckets {
     builders { name: "target-vm-linux-release-arm64-stable" dimensions: "cpu:arm64" }
     builders { name: "versionchecker-linux-stable" }
     builders { name: "vm-asan-linux-release-x64-stable" }
+    builders { name: "vm-dartkb-linux-debug-x64-stable" }
+    builders { name: "vm-dartkb-linux-release-x64-stable" }
     builders { name: "vm-kernel-linux-debug-simdbc64-stable" }
     builders { name: "vm-kernel-linux-debug-x64-stable" }
     builders { name: "vm-kernel-linux-release-simarm-stable" }
@@ -621,6 +627,8 @@ buckets {
     builders { name: "pkg-mac-release-try" mixins: "mac" }
     builders { name: "pkg-win-release-try" mixins: "win" }
     builders { name: "vm-canary-linux-debug-try" }
+    builders { name: "vm-dartkb-linux-debug-x64-try" }
+    builders { name: "vm-dartkb-linux-release-x64-try" }
     builders { name: "vm-kernel-linux-debug-simdbc64-try" }
     builders { name: "vm-kernel-linux-debug-x64-try" }
     builders { name: "vm-kernel-linux-release-simarm-try" }

From dc17ce3e1e3f90da467efb9d32795f94cda04c10 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 27 Jul 2018 12:03:55 +0000
Subject: [PATCH 158/826] [infra] Use correct recipe for docker builder

TBR=whesse@google.com

Change-Id: Ic457dd6423b94aca16955dfbdd6483ed0b23f28c
Reviewed-on: https://dart-review.googlesource.com/67122
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index d4a0e5fbd5e9..56386b1f1feb 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -62,6 +62,13 @@ builder_mixins {
   # todo(athom): how should this machine be defined?
 }
 
+builder_mixins {
+  name: "docker"
+  recipe {
+    name: "dart/docker"
+  }
+}
+
 builder_mixins {
   name: "mac"
   dimensions: "os:Mac"
@@ -120,7 +127,7 @@ buckets {
     builders { name: "dart-sdk-linux" }
     builders { name: "dart-sdk-mac" mixins: "mac" }
     builders { name: "dart-sdk-win" mixins: "win" }
-    builders { name: "docker" }
+    builders { name: "docker" mixins: "docker" }
     builders { name: "debianpackage-linux" mixins: "debianpackage" }
     builders { name: "dart-sdk-linux-dev" }
     builders { name: "dart-sdk-mac-dev" mixins: "mac" }

From 5d638bd1819d61d011bb21cd1939cd245413e36c Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 30 Jul 2018 16:20:56 +0000
Subject: [PATCH 159/826] [infra] Add analyzer-use-cfe builders

Issue #33792

TBR=whesse@google.com

Change-Id: Ifc7ad26ed409a70ff4adcd90f6803852e492cd19
Reviewed-on: https://dart-review.googlesource.com/67347
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 56386b1f1feb..a9ae964bbd51 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -173,6 +173,9 @@ buckets {
     builders { name: "analyzer-analysis-server-linux" }
     builders { name: "analyzer-linux-release" }
     builders { name: "analyzer-mac-release" mixins: "mac" }
+    builders { name: "analyzer-use-cfe-mac" mixins: "mac" }
+    builders { name: "analyzer-use-cfe-linux" }
+    builders { name: "analyzer-use-cfe-win" mixins: "win" }
     builders { name: "analyzer-use-fasta-parser-linux" }
     builders { name: "analyzer-win-release" mixins: "win" }
     builders { name: "androidvm-linux-release-x64" mixins: "android" }
@@ -300,6 +303,9 @@ buckets {
     builders { name: "analyzer-analysis-server-linux-dev" }
     builders { name: "analyzer-linux-release-dev" }
     builders { name: "analyzer-mac-release-dev" mixins: "mac" }
+    builders { name: "analyzer-use-cfe-mac-dev" mixins: "mac" }
+    builders { name: "analyzer-use-cfe-linux-dev" }
+    builders { name: "analyzer-use-cfe-win-dev" mixins: "win" }
     builders { name: "analyzer-use-fasta-parser-linux-dev" }
     builders { name: "analyzer-win-release-dev" mixins: "win" }
     builders { name: "androidvm-linux-release-x64-dev" mixins: "android" }
@@ -427,6 +433,9 @@ buckets {
     builders { name: "analyzer-analysis-server-linux-stable" }
     builders { name: "analyzer-linux-release-stable" }
     builders { name: "analyzer-mac-release-stable" mixins: "mac" }
+    builders { name: "analyzer-use-cfe-mac-stable" mixins: "mac" }
+    builders { name: "analyzer-use-cfe-linux-stable" }
+    builders { name: "analyzer-use-cfe-win-stable" mixins: "win" }
     builders { name: "analyzer-use-fasta-parser-linux-stable" }
     builders { name: "analyzer-win-release-stable" mixins: "win" }
     builders { name: "androidvm-linux-release-x64-stable" mixins: "android" }
@@ -588,6 +597,9 @@ buckets {
     builders { name: "analyzer-analysis-server-linux-try" }
     builders { name: "analyzer-linux-release-try" }
     builders { name: "analyzer-mac-release-try" mixins: "mac" }
+    builders { name: "analyzer-use-cfe-mac-try" mixins: "mac" }
+    builders { name: "analyzer-use-cfe-linux-try" }
+    builders { name: "analyzer-use-cfe-win-try" mixins: "win" }
     builders { name: "analyzer-use-fasta-parser-linux-try" }
     builders { name: "analyzer-win-release-try" mixins: "win" }
     builders { name: "app-kernel-linux-debug-x64-try" }

From 6528aaaf433063f717b1a5a8113296d7ab3b5848 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Wed, 1 Aug 2018 12:38:19 +0000
Subject: [PATCH 160/826] Rename -ff- builders in pool configurations, remove
 non-strong dart2js builders.

Change-Id: I5ad81d471774fd0d3e3a39126d836bdc806276e6
Reviewed-on: https://dart-review.googlesource.com/67800
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 104 ++++++++-------------------------------------
 luci-milo.cfg      |  85 +++++++++---------------------------
 luci-scheduler.cfg |  36 ++++++++--------
 3 files changed, 55 insertions(+), 170 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index a9ae964bbd51..daff83a2bbf4 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -187,45 +187,25 @@ buckets {
     builders { name: "app-linux-release-x64" }
     builders { name: "cross-vm-linux-release-arm64" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome" }
-    builders { name: "dart2js-faststartup-linux-x64-chrome" }
-    builders { name: "dart2js-faststartup-linux-x64-ff" }
-    builders { name: "dart2js-faststartup-mac-x64-chrome" mixins: "mac" }
-    builders { name: "dart2js-faststartup-mac-x64-safari" mixins: "mac" }
-    builders { name: "dart2js-faststartup-win-x64-chrome" mixins: "win" }
-    builders { name: "dart2js-faststartup-win-x64-edge" mixins: "win" }
-    builders { name: "dart2js-faststartup-win-x64-ff" mixins: "win" }
-    builders { name: "dart2js-faststartup-win-x64-ie11" mixins: "win" }
-    builders { name: "dart2js-hostchecked-linux-ia32-d8" }
-    builders { name: "dart2js-hostchecked-linux-debug-ia32-none" }
-    builders { name: "dart2js-linux-x64-chrome" }
-    builders { name: "dart2js-linux-x64-ff" }
-    builders { name: "dart2js-linux-debug-ia32-none" }
-    builders { name: "dart2js-mac-x64-chrome" mixins: "mac" }
-    builders { name: "dart2js-mac-x64-safari" mixins: "mac" }
-    builders { name: "dart2js-minified-linux-x64-d8" }
     builders { name: "dart2js-minified-strong-linux-x64-d8" }
     builders { name: "dart2js-strong-faststartup-linux-x64-chrome" }
-    builders { name: "dart2js-strong-faststartup-linux-x64-ff" }
+    builders { name: "dart2js-strong-faststartup-linux-x64-firefox" }
     builders { name: "dart2js-strong-faststartup-mac-x64-chrome" mixins: "mac" }
     builders { name: "dart2js-strong-faststartup-mac-x64-safari" mixins: "mac" }
     builders { name: "dart2js-strong-faststartup-win-x64-chrome" mixins: "win" }
     builders { name: "dart2js-strong-faststartup-win-x64-edge" mixins: "win" }
-    builders { name: "dart2js-strong-faststartup-win-x64-ff" mixins: "win" }
+    builders { name: "dart2js-strong-faststartup-win-x64-firefox" mixins: "win" }
     builders { name: "dart2js-strong-faststartup-win-x64-ie11" mixins: "win" }
     builders { name: "dart2js-strong-hostasserts-linux-ia32-d8" }
     builders { name: "dart2js-strong-linux-x64-chrome" }
-    builders { name: "dart2js-strong-linux-x64-ff" }
+    builders { name: "dart2js-strong-linux-x64-firefox" }
     builders { name: "dart2js-strong-mac-x64-chrome" mixins: "mac" }
     builders { name: "dart2js-strong-mac-x64-safari" mixins: "mac" }
     builders { name: "dart2js-strong-win-x64-chrome" mixins: "win" }
     builders { name: "dart2js-strong-win-x64-edge" mixins: "win" }
-    builders { name: "dart2js-strong-win-x64-ff" mixins: "win" }
+    builders { name: "dart2js-strong-win-x64-firefox" mixins: "win" }
     builders { name: "dart2js-strong-win-x64-ie11" mixins: "win" }
     builders { name: "dart2js-unit-linux-x64-release" }
-    builders { name: "dart2js-win-x64-chrome" mixins: "win" }
-    builders { name: "dart2js-win-x64-edge" mixins: "win" }
-    builders { name: "dart2js-win-x64-ff" mixins: "win" }
-    builders { name: "dart2js-win-x64-ie11" mixins: "win" }
     builders { name: "ddc-linux-release-chrome" }
     builders { name: "ddc-mac-release-chrome" mixins: "mac" }
     builders { name: "ddc-win-release-chrome" mixins: "win" }
@@ -317,45 +297,25 @@ buckets {
     builders { name: "app-linux-release-x64-dev" }
     builders { name: "cross-vm-linux-release-arm64-dev" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome-dev" }
-    builders { name: "dart2js-faststartup-linux-x64-chrome-dev" }
-    builders { name: "dart2js-faststartup-linux-x64-ff-dev" }
-    builders { name: "dart2js-faststartup-mac-x64-chrome-dev" mixins: "mac" }
-    builders { name: "dart2js-faststartup-mac-x64-safari-dev" mixins: "mac" }
-    builders { name: "dart2js-faststartup-win-x64-chrome-dev" mixins: "win" }
-    builders { name: "dart2js-faststartup-win-x64-edge-dev" mixins: "win" }
-    builders { name: "dart2js-faststartup-win-x64-ff-dev" mixins: "win" }
-    builders { name: "dart2js-faststartup-win-x64-ie11-dev" mixins: "win" }
-    builders { name: "dart2js-hostchecked-linux-ia32-d8-dev" }
-    builders { name: "dart2js-hostchecked-linux-debug-ia32-none-dev" }
-    builders { name: "dart2js-linux-x64-chrome-dev" }
-    builders { name: "dart2js-linux-x64-ff-dev" }
-    builders { name: "dart2js-linux-debug-ia32-none-dev" }
-    builders { name: "dart2js-mac-x64-chrome-dev" mixins: "mac" }
-    builders { name: "dart2js-mac-x64-safari-dev" mixins: "mac" }
-    builders { name: "dart2js-minified-linux-x64-d8-dev" }
     builders { name: "dart2js-minified-strong-linux-x64-d8-dev" }
     builders { name: "dart2js-strong-faststartup-linux-x64-chrome-dev" }
-    builders { name: "dart2js-strong-faststartup-linux-x64-ff-dev" }
+    builders { name: "dart2js-strong-faststartup-linux-x64-firefox-dev" }
     builders { name: "dart2js-strong-faststartup-mac-x64-chrome-dev" mixins: "mac" }
     builders { name: "dart2js-strong-faststartup-mac-x64-safari-dev" mixins: "mac" }
     builders { name: "dart2js-strong-faststartup-win-x64-chrome-dev" mixins: "win" }
     builders { name: "dart2js-strong-faststartup-win-x64-edge-dev" mixins: "win" }
-    builders { name: "dart2js-strong-faststartup-win-x64-ff-dev" mixins: "win" }
+    builders { name: "dart2js-strong-faststartup-win-x64-firefox-dev" mixins: "win" }
     builders { name: "dart2js-strong-faststartup-win-x64-ie11-dev" mixins: "win" }
     builders { name: "dart2js-strong-hostasserts-linux-ia32-d8-dev" }
     builders { name: "dart2js-strong-linux-x64-chrome-dev" }
-    builders { name: "dart2js-strong-linux-x64-ff-dev" }
+    builders { name: "dart2js-strong-linux-x64-firefox-dev" }
     builders { name: "dart2js-strong-mac-x64-chrome-dev" mixins: "mac" }
     builders { name: "dart2js-strong-mac-x64-safari-dev" mixins: "mac" }
     builders { name: "dart2js-strong-win-x64-chrome-dev" mixins: "win" }
     builders { name: "dart2js-strong-win-x64-edge-dev" mixins: "win" }
-    builders { name: "dart2js-strong-win-x64-ff-dev" mixins: "win" }
+    builders { name: "dart2js-strong-win-x64-firefox-dev" mixins: "win" }
     builders { name: "dart2js-strong-win-x64-ie11-dev" mixins: "win" }
     builders { name: "dart2js-unit-linux-x64-release-dev" }
-    builders { name: "dart2js-win-x64-chrome-dev" mixins: "win" }
-    builders { name: "dart2js-win-x64-edge-dev" mixins: "win" }
-    builders { name: "dart2js-win-x64-ff-dev" mixins: "win" }
-    builders { name: "dart2js-win-x64-ie11-dev" mixins: "win" }
     builders { name: "ddc-linux-release-chrome-dev" }
     builders { name: "ddc-mac-release-chrome-dev" mixins: "mac" }
     builders { name: "ddc-win-release-chrome-dev" mixins: "win" }
@@ -447,46 +407,26 @@ buckets {
     builders { name: "app-linux-release-x64-stable" }
     builders { name: "cross-vm-linux-release-arm64-stable" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome-stable" }
-    builders { name: "dart2js-faststartup-linux-x64-chrome-stable" }
-    builders { name: "dart2js-faststartup-linux-x64-ff-stable" }
-    builders { name: "dart2js-faststartup-mac-x64-chrome-stable" mixins: "mac" }
-    builders { name: "dart2js-faststartup-mac-x64-safari-stable" mixins: "mac" }
-    builders { name: "dart2js-faststartup-win-x64-chrome-stable" mixins: "win" }
-    builders { name: "dart2js-faststartup-win-x64-edge-stable" mixins: "win" }
-    builders { name: "dart2js-faststartup-win-x64-ff-stable" mixins: "win" }
-    builders { name: "dart2js-faststartup-win-x64-ie11-stable" mixins: "win" }
-    builders { name: "dart2js-hostchecked-linux-ia32-d8-stable" }
-    builders { name: "dart2js-hostchecked-linux-debug-ia32-none-stable" }
-    builders { name: "dart2js-linux-x64-chrome-stable" }
-    builders { name: "dart2js-linux-x64-ff-stable" }
-    builders { name: "dart2js-linux-debug-ia32-none-stable" }
-    builders { name: "dart2js-mac-x64-chrome-stable" mixins: "mac" }
-    builders { name: "dart2js-mac-x64-safari-stable" mixins: "mac" }
-    builders { name: "dart2js-minified-linux-x64-d8-stable" }
     builders { name: "dart2js-minified-strong-linux-x64-d8-stable" }
     builders { name: "dart2js-strong-faststartup-linux-x64-chrome-stable" }
-    builders { name: "dart2js-strong-faststartup-linux-x64-ff-stable" }
+    builders { name: "dart2js-strong-faststartup-linux-x64-firefox-stable" }
     builders { name: "dart2js-strong-faststartup-mac-x64-chrome-stable" mixins: "mac" }
     builders { name: "dart2js-strong-faststartup-mac-x64-safari-stable" mixins: "mac" }
     builders { name: "dart2js-strong-faststartup-win-x64-chrome-stable" mixins: "win" }
     builders { name: "dart2js-strong-faststartup-win-x64-edge-stable" mixins: "win" }
-    builders { name: "dart2js-strong-faststartup-win-x64-ff-stable" mixins: "win" }
+    builders { name: "dart2js-strong-faststartup-win-x64-firefox-stable" mixins: "win" }
     builders { name: "dart2js-strong-faststartup-win-x64-ie11-stable" mixins: "win" }
     builders { name: "dart2js-strong-hostasserts-linux-ia32-d8-stable" }
     builders { name: "dart2js-strong-linux-x64-chrome-stable" }
-    builders { name: "dart2js-strong-linux-x64-ff-stable" }
+    builders { name: "dart2js-strong-linux-x64-firefox-stable" }
     builders { name: "dart2js-strong-mac-x64-chrome-stable" mixins: "mac" }
     builders { name: "dart2js-strong-mac-x64-safari-stable" mixins: "mac" }
     builders { name: "dart2js-strong-win-x64-chrome-stable" mixins: "win" }
     builders { name: "dart2js-strong-win-x64-edge-stable" mixins: "win" }
-    builders { name: "dart2js-strong-win-x64-ff-stable" mixins: "win" }
+    builders { name: "dart2js-strong-win-x64-firefox-stable" mixins: "win" }
     builders { name: "dart2js-strong-win-x64-ie11-stable" mixins: "win" }
     builders { name: "dart2js-unit-linux-x64-release-stable" }
-    builders { name: "dart2js-win-x64-chrome-stable" mixins: "win" }
-    builders { name: "dart2js-win-x64-edge-stable" mixins: "win" }
-    builders { name: "dart2js-win-x64-ff-stable" mixins: "win" }
-    builders { name: "dart2js-win-x64-ie11-stable" mixins: "win" }
-    builders { name: "ddc-linux-release-chrome-stable" }
+   builders { name: "ddc-linux-release-chrome-stable" }
     builders { name: "ddc-mac-release-chrome-stable" mixins: "mac" }
     builders { name: "ddc-win-release-chrome-stable" mixins: "win" }
     builders { name: "front-end-legacy-linux-release-x64-stable" mixins: "clobber" }
@@ -608,33 +548,23 @@ buckets {
     builders { name: "benchmark-linux-try" }
     builders { name: "dart-sdk-windows-try" mixins: "sdk" mixins: "win" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome-try" }
-    builders { name: "dart2js-faststartup-linux-x64-chrome-try" }
-    builders { name: "dart2js-faststartup-linux-x64-ff-try" }
-    builders { name: "dart2js-faststartup-mac-x64-chrome-try" mixins: "mac" }
-    builders { name: "dart2js-faststartup-mac-x64-safari-try" mixins: "mac" }
-    builders { name: "dart2js-faststartup-win-x64-chrome-try" mixins: "win" }
-    builders { name: "dart2js-faststartup-win-x64-ff-try" mixins: "win" }
-    builders { name: "dart2js-faststartup-win-x64-ie11-try" mixins: "win" }
-    builders { name: "dart2js-linux-x64-chrome-try" }
-    builders { name: "dart2js-mac-x64-chrome-try" mixins: "mac" }
     builders { name: "dart2js-minified-strong-linux-x64-d8-try" }
     builders { name: "dart2js-strong-faststartup-linux-x64-chrome-try" }
-    builders { name: "dart2js-strong-faststartup-linux-x64-ff-try" }
+    builders { name: "dart2js-strong-faststartup-linux-x64-firefox-try" }
     builders { name: "dart2js-strong-faststartup-mac-x64-chrome-try" mixins: "mac" }
     builders { name: "dart2js-strong-faststartup-mac-x64-safari-try" mixins: "mac" }
     builders { name: "dart2js-strong-faststartup-win-x64-chrome-try" mixins: "win" }
-    builders { name: "dart2js-strong-faststartup-win-x64-ff-try" mixins: "win" }
+    builders { name: "dart2js-strong-faststartup-win-x64-firefox-try" mixins: "win" }
     builders { name: "dart2js-strong-faststartup-win-x64-ie11-try" mixins: "win" }
     builders { name: "dart2js-strong-hostasserts-linux-ia32-d8-try" }
     builders { name: "dart2js-strong-linux-x64-chrome-try" }
-    builders { name: "dart2js-strong-linux-x64-ff-try" }
+    builders { name: "dart2js-strong-linux-x64-firefox-try" }
     builders { name: "dart2js-strong-mac-x64-chrome-try" mixins: "mac" }
     builders { name: "dart2js-strong-mac-x64-safari-try" mixins: "mac" }
     builders { name: "dart2js-strong-win-x64-chrome-try" mixins: "win" }
-    builders { name: "dart2js-strong-win-x64-ff-try" mixins: "win" }
+    builders { name: "dart2js-strong-win-x64-firefox-try" mixins: "win" }
     builders { name: "dart2js-strong-win-x64-ie11-try" mixins: "win" }
     builders { name: "dart2js-unit-linux-x64-release-try" }
-    builders { name: "dart2js-win-x64-chrome-try" mixins: "win" }
     builders { name: "ddc-linux-release-chrome-try" mixins: "clobber" }
     builders { name: "ddc-mac-release-chrome-try" mixins: "mac" }
     builders { name: "ddc-win-release-chrome-try" mixins: "win" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 6e6ab1d46894..9a87b7e49492 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -498,13 +498,13 @@ consoles: {
     short_name: "fs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-ff"
-    category: "dart2js|ff"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
+    category: "dart2js|firefox"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ff"
-    category: "dart2js|ff"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
+    category: "dart2js|firefox"
     short_name: "w"
   }
   builders {
@@ -535,25 +535,25 @@ consoles: {
 #    short_name: "ed"
 #  }
   builders {
-    # migrating to dart2js-win-x64-ff
+    # migrating to dart2js-win-x64-firefox
     name: "buildbot/client.dart/dart2js-win7-ie11-1-4-be"
     category: "dart2js|ms"
     short_name: "1ie"
   }
   builders {
-    # migrating to dart2js-win-x64-ff
+    # migrating to dart2js-win-x64-firefox
     name: "buildbot/client.dart/dart2js-win7-ie11-2-4-be"
     category: "dart2js|ms"
     short_name: "2ie"
   }
   builders {
-    # migrating to dart2js-win-x64-ff
+    # migrating to dart2js-win-x64-firefox
     name: "buildbot/client.dart/dart2js-win7-ie11-3-4-be"
     category: "dart2js|ms"
     short_name: "3ie"
   }
   builders {
-    # migrating to dart2js-win-x64-ff
+    # migrating to dart2js-win-x64-firefox
     name: "buildbot/client.dart/dart2js-win7-ie11-4-4-be"
     category: "dart2js|ms"
     short_name: "4ie"
@@ -725,13 +725,13 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-ff"
-    category: "dart2js|ff"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
+    category: "dart2js|firefox"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ff"
-    category: "dart2js|ff"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
+    category: "dart2js|firefox"
     short_name: "w"
   }
   builders {
@@ -1657,11 +1657,6 @@ consoles: {
     category: "dart2js|chrome"
     short_name: "fs"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-x64-ff"
-    category: "dart2js|ff"
-    short_name: "l"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
     category: "dart2js|chrome"
@@ -1682,21 +1677,6 @@ consoles: {
     category: "dart2js|chrome"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-edge"
-    category: "dart2js|ms"
-    short_name: "ed"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ff"
-    category: "dart2js|ff"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ie11"
-    category: "dart2js|ms"
-    short_name: "ie"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
@@ -2167,8 +2147,8 @@ consoles: {
     short_name: "fs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-ff-dev"
-    category: "dart2js|ff"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-dev"
+    category: "dart2js|firefox"
     short_name: "l"
   }
   builders {
@@ -2192,20 +2172,10 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-edge-dev"
-    category: "dart2js|ms"
-    short_name: "ed"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ff-dev"
-    category: "dart2js|ff"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox-dev"
+    category: "dart2js|firefox"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ie11-dev"
-    category: "dart2js|ms"
-    short_name: "ie"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
     category: "pkg"
@@ -2676,8 +2646,8 @@ consoles: {
     short_name: "fs"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-ff-stable"
-    category: "dart2js|ff"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-stable"
+    category: "dart2js|firefox"
     short_name: "l"
   }
   builders {
@@ -2701,20 +2671,10 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-edge-stable"
-    category: "dart2js|ms"
-    short_name: "ed"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ff-stable"
-    category: "dart2js|ff"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox-stable"
+    category: "dart2js|firefox"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-x64-ie11-stable"
-    category: "dart2js|ms"
-    short_name: "ie"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
     category: "pkg"
@@ -2784,11 +2744,6 @@ consoles: {
     category: "dart2js"
     short_name: "hcd"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-debug-ia32-none"
-    category: "dart2js"
-    short_name: "d"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pub-linux-release"
     category: "pub"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 507cbc37761f..c4717aeae167 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -35,14 +35,14 @@ trigger {
   triggers: "dart2js-csp-minified-linux-x64-chrome"
   triggers: "dart2js-strong-faststartup-linux-x64-chrome"
   triggers: "dart2js-strong-linux-x64-chrome"
-  triggers: "dart2js-strong-linux-x64-ff"
+  triggers: "dart2js-strong-linux-x64-firefox"
   triggers: "dart2js-strong-mac-x64-chrome"
   triggers: "dart2js-strong-mac-x64-safari"
   triggers: "dart2js-minified-strong-linux-x64-d8"
   triggers: "dart2js-strong-hostasserts-linux-ia32-d8"
   triggers: "dart2js-unit-linux-x64-release"
   triggers: "dart2js-strong-win-x64-chrome"
-  triggers: "dart2js-strong-win-x64-ff"
+  triggers: "dart2js-strong-win-x64-firefox"
   triggers: "ddc-linux-release-chrome"
   triggers: "ddc-mac-release-chrome"
   triggers: "ddc-win-release-chrome"
@@ -93,14 +93,14 @@ trigger {
   triggers: "dart2js-csp-minified-linux-x64-chrome-dev"
   triggers: "dart2js-strong-faststartup-linux-x64-chrome-dev"
   triggers: "dart2js-strong-linux-x64-chrome-dev"
-  triggers: "dart2js-strong-linux-x64-ff-dev"
+  triggers: "dart2js-strong-linux-x64-firefox-dev"
   triggers: "dart2js-strong-mac-x64-chrome-dev"
   triggers: "dart2js-strong-mac-x64-safari-dev"
   triggers: "dart2js-minified-strong-linux-x64-d8-dev"
   triggers: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
   triggers: "dart2js-unit-linux-x64-release-dev"
   triggers: "dart2js-strong-win-x64-chrome-dev"
-  triggers: "dart2js-strong-win-x64-ff-dev"
+  triggers: "dart2js-strong-win-x64-firefox-dev"
   triggers: "ddc-linux-release-chrome-dev"
   triggers: "ddc-mac-release-chrome-dev"
   triggers: "ddc-win-release-chrome-dev"
@@ -151,14 +151,14 @@ trigger {
   triggers: "dart2js-csp-minified-linux-x64-chrome-stable"
   triggers: "dart2js-strong-faststartup-linux-x64-chrome-stable"
   triggers: "dart2js-strong-linux-x64-chrome-stable"
-  triggers: "dart2js-strong-linux-x64-ff-stable"
+  triggers: "dart2js-strong-linux-x64-firefox-stable"
   triggers: "dart2js-strong-mac-x64-chrome-stable"
   triggers: "dart2js-strong-mac-x64-safari-stable"
   triggers: "dart2js-minified-strong-linux-x64-d8-stable"
   triggers: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
   triggers: "dart2js-unit-linux-x64-release-stable"
   triggers: "dart2js-strong-win-x64-chrome-stable"
-  triggers: "dart2js-strong-win-x64-ff-stable"
+  triggers: "dart2js-strong-win-x64-firefox-stable"
   triggers: "ddc-linux-release-chrome-stable"
   triggers: "ddc-mac-release-chrome-stable"
   triggers: "ddc-win-release-chrome-stable"
@@ -346,13 +346,13 @@ job {
 }
 
 job {
-  id: "dart2js-strong-linux-x64-ff"
+  id: "dart2js-strong-linux-x64-firefox"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-linux-x64-ff"
+    builder: "dart2js-strong-linux-x64-firefox"
   }
 }
 
@@ -423,13 +423,13 @@ job {
 }
 
 job {
-  id: "dart2js-strong-win-x64-ff"
+  id: "dart2js-strong-win-x64-firefox"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-ff"
+    builder: "dart2js-strong-win-x64-firefox"
   }
 }
 
@@ -888,13 +888,13 @@ job {
 }
 
 job {
-  id: "dart2js-strong-linux-x64-ff-dev"
+  id: "dart2js-strong-linux-x64-firefox-dev"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-linux-x64-ff-dev"
+    builder: "dart2js-strong-linux-x64-firefox-dev"
   }
 }
 
@@ -965,13 +965,13 @@ job {
 }
 
 job {
-  id: "dart2js-strong-win-x64-ff-dev"
+  id: "dart2js-strong-win-x64-firefox-dev"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-ff-dev"
+    builder: "dart2js-strong-win-x64-firefox-dev"
   }
 }
 
@@ -1430,13 +1430,13 @@ job {
 }
 
 job {
-  id: "dart2js-strong-linux-x64-ff-stable"
+  id: "dart2js-strong-linux-x64-firefox-stable"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-linux-x64-ff-stable"
+    builder: "dart2js-strong-linux-x64-firefox-stable"
   }
 }
 
@@ -1507,13 +1507,13 @@ job {
 }
 
 job {
-  id: "dart2js-strong-win-x64-ff-stable"
+  id: "dart2js-strong-win-x64-firefox-stable"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-ff-stable"
+    builder: "dart2js-strong-win-x64-firefox-stable"
   }
 }
 

From 8c599f6ab3c8fc34e80c0e3f989131006f432393 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 2 Aug 2018 10:01:08 +0000
Subject: [PATCH 161/826] [infra] Add analyzer-use-cfe builders to consoles and
 scheduler

TBR=whesse@google.com

Change-Id: Iee403407bb029c6633047febb3834a1be4cf1142
Reviewed-on: https://dart-review.googlesource.com/68041
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-milo.cfg      |  75 +++++++++++++++++++++++++++++++
 luci-scheduler.cfg | 108 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 183 insertions(+)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 9a87b7e49492..4009fd720ec9 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -434,6 +434,21 @@ consoles: {
     category: "analyzer"
     short_name: "as"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-linux"
+    category: "analyzer|cfe"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-mac"
+    category: "analyzer|cfe"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-win"
+    category: "analyzer|cfe"
+    short_name: "w"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-fasta-parser-linux"
     category: "analyzer"
@@ -671,6 +686,21 @@ consoles: {
     category: "analyzer"
     short_name: "as"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-linux"
+    category: "analyzer|cfe"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-mac"
+    category: "analyzer|cfe"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-win"
+    category: "analyzer|cfe"
+    short_name: "w"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-fasta-parser-linux"
     category: "analyzer"
@@ -1597,6 +1627,21 @@ consoles: {
     category: "analyzer"
     short_name: "as"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-linux"
+    category: "analyzer|cfe"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-mac"
+    category: "analyzer|cfe"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-win"
+    category: "analyzer|cfe"
+    short_name: "w"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-fasta-parser-linux"
     category: "analyzer"
@@ -2086,6 +2131,21 @@ consoles: {
     category: "analyzer"
     short_name: "as"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-linux-dev"
+    category: "analyzer|cfe"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-mac-dev"
+    category: "analyzer|cfe"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-win-dev"
+    category: "analyzer|cfe"
+    short_name: "w"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-fasta-parser-linux-dev"
     category: "analyzer"
@@ -2585,6 +2645,21 @@ consoles: {
     category: "analyzer"
     short_name: "as"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-linux-stable"
+    category: "analyzer|cfe"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-mac-stable"
+    category: "analyzer|cfe"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-win-stable"
+    category: "analyzer|cfe"
+    short_name: "w"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-fasta-parser-linux-stable"
     category: "analyzer"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index c4717aeae167..0dda1b3f6646 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -24,6 +24,9 @@ trigger {
   triggers: "analyzer-analysis-server-linux"
   triggers: "analyzer-linux-release"
   triggers: "analyzer-mac-release"
+  triggers: "analyzer-use-cfe-linux"
+  triggers: "analyzer-use-cfe-mac"
+  triggers: "analyzer-use-cfe-win"
   triggers: "analyzer-use-fasta-parser-linux"
   triggers: "analyzer-win-release"
   triggers: "app-kernel-linux-debug-x64"
@@ -82,6 +85,9 @@ trigger {
   triggers: "analyzer-analysis-server-linux-dev"
   triggers: "analyzer-linux-release-dev"
   triggers: "analyzer-mac-release-dev"
+  triggers: "analyzer-use-cfe-linux-dev"
+  triggers: "analyzer-use-cfe-mac-dev"
+  triggers: "analyzer-use-cfe-win-dev"
   triggers: "analyzer-use-fasta-parser-linux-dev"
   triggers: "analyzer-win-release-dev"
   triggers: "app-kernel-linux-debug-x64-dev"
@@ -140,6 +146,9 @@ trigger {
   triggers: "analyzer-analysis-server-linux-stable"
   triggers: "analyzer-linux-release-stable"
   triggers: "analyzer-mac-release-stable"
+  triggers: "analyzer-use-cfe-linux-stable"
+  triggers: "analyzer-use-cfe-mac-stable"
+  triggers: "analyzer-use-cfe-win-stable"
   triggers: "analyzer-use-fasta-parser-linux-stable"
   triggers: "analyzer-win-release-stable"
   triggers: "app-kernel-linux-debug-x64-stable"
@@ -221,6 +230,39 @@ job {
   }
 }
 
+job {
+  id: "analyzer-use-cfe-linux"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-use-cfe-linux"
+  }
+}
+
+job {
+  id: "analyzer-use-cfe-mac"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-use-cfe-mac"
+  }
+}
+
+job {
+  id: "analyzer-use-cfe-win"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-use-cfe-win"
+  }
+}
+
 job {
   id: "analyzer-use-fasta-parser-linux"
   acl_sets: "default"
@@ -763,6 +805,39 @@ job {
   }
 }
 
+job {
+  id: "analyzer-use-cfe-linux-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-use-cfe-linux-dev"
+  }
+}
+
+job {
+  id: "analyzer-use-cfe-mac-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-use-cfe-mac-dev"
+  }
+}
+
+job {
+  id: "analyzer-use-cfe-win-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-use-cfe-win-dev"
+  }
+}
+
 job {
   id: "analyzer-use-fasta-parser-linux-dev"
   acl_sets: "default"
@@ -1305,6 +1380,39 @@ job {
   }
 }
 
+job {
+  id: "analyzer-use-cfe-linux-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-use-cfe-linux-stable"
+  }
+}
+
+job {
+  id: "analyzer-use-cfe-mac-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-use-cfe-mac-stable"
+  }
+}
+
+job {
+  id: "analyzer-use-cfe-win-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-use-cfe-win-stable"
+  }
+}
+
 job {
   id: "analyzer-use-fasta-parser-linux-stable"
   acl_sets: "default"

From cbbe3882c34e3f7d04ab8b3fe0d3b80eb75aad3d Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 2 Aug 2018 12:59:05 +0000
Subject: [PATCH 162/826] [infra] Add dartkb FYI builders

TBR=whesse@google.com

Change-Id: I07ad97d530bb6e8b9fe5b411f96e58ca0b8c1c80
Reviewed-on: https://dart-review.googlesource.com/68081
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 19 +++++++++++++------
 luci-milo.cfg      | 10 ++++++++++
 luci-scheduler.cfg | 24 ++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index daff83a2bbf4..f67175bbd74b 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -69,6 +69,13 @@ builder_mixins {
   }
 }
 
+builder_mixins {
+  name: "fyi"
+  recipe {
+    properties: "mastername:client.dart.fyi"
+  }
+}
+
 builder_mixins {
   name: "mac"
   dimensions: "os:Mac"
@@ -224,8 +231,8 @@ buckets {
     builders { name: "target-vm-linux-release-arm64" dimensions: "cpu:arm64" }
     builders { name: "versionchecker-linux" }
     builders { name: "vm-asan-linux-release-x64" }
-    builders { name: "vm-dartkb-linux-debug-x64" }
-    builders { name: "vm-dartkb-linux-release-x64" }
+    builders { name: "vm-dartkb-linux-debug-x64" mixins: "fyi" }
+    builders { name: "vm-dartkb-linux-release-x64" mixins: "fyi" }
     builders { name: "vm-kernel-linux-debug-simdbc64" }
     builders { name: "vm-kernel-linux-debug-x64" }
     builders { name: "vm-kernel-linux-release-simarm" }
@@ -334,8 +341,8 @@ buckets {
     builders { name: "target-vm-linux-release-arm64-dev" dimensions: "cpu:arm64" }
     builders { name: "versionchecker-linux-dev" }
     builders { name: "vm-asan-linux-release-x64-dev" }
-    builders { name: "vm-dartkb-linux-debug-x64-dev" }
-    builders { name: "vm-dartkb-linux-release-x64-dev" }
+    builders { name: "vm-dartkb-linux-debug-x64-dev" mixins: "fyi" }
+    builders { name: "vm-dartkb-linux-release-x64-dev" mixins: "fyi" }
     builders { name: "vm-kernel-linux-debug-simdbc64-dev" }
     builders { name: "vm-kernel-linux-debug-x64-dev" }
     builders { name: "vm-kernel-linux-release-simarm-dev" }
@@ -444,8 +451,8 @@ buckets {
     builders { name: "target-vm-linux-release-arm64-stable" dimensions: "cpu:arm64" }
     builders { name: "versionchecker-linux-stable" }
     builders { name: "vm-asan-linux-release-x64-stable" }
-    builders { name: "vm-dartkb-linux-debug-x64-stable" }
-    builders { name: "vm-dartkb-linux-release-x64-stable" }
+    builders { name: "vm-dartkb-linux-debug-x64-stable" mixins: "fyi" }
+    builders { name: "vm-dartkb-linux-release-x64-stable" mixins: "fyi" }
     builders { name: "vm-kernel-linux-debug-simdbc64-stable" }
     builders { name: "vm-kernel-linux-debug-x64-stable" }
     builders { name: "vm-kernel-linux-release-simarm-stable" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 4009fd720ec9..8254065975f2 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2814,6 +2814,16 @@ consoles: {
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "refs/heads/master"
   manifest_name: "REVISION"
+  builders {
+    name: "vm-dartkb-linux-debug-x64"
+    category: "vm|dartkb"
+    short_name: "d"
+  }
+  builders {
+    name: "vm-dartkb-linux-release-x64"
+    category: "vm|dartkb"
+    short_name: "r"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-debug-ia32-none"
     category: "dart2js"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 0dda1b3f6646..f121d500dba6 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -56,6 +56,8 @@ trigger {
   triggers: "pkg-linux-release"
   triggers: "pkg-mac-release"
   triggers: "pkg-win-release"
+  triggers: "vm-dartkb-linux-debug-x64"
+  triggers: "vm-dartkb-linux-release-x64"
   triggers: "vm-kernel-linux-debug-simdbc64"
   triggers: "vm-kernel-linux-debug-x64"
   triggers: "vm-kernel-linux-release-simarm"
@@ -585,6 +587,28 @@ job {
   }
 }
 
+job {
+  id: "vm-dartkb-linux-debug-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-debug-x64"
+  }
+}
+
+job {
+  id: "vm-dartkb-linux-release-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-release-x64"
+  }
+}
+
 job {
   id: "vm-kernel-linux-debug-simdbc64"
   acl_sets: "default"

From 6d6a3471540d5c006575f2246ed6c107baced25e Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 2 Aug 2018 19:44:54 +0000
Subject: [PATCH 163/826] [infra] Fix builder id for dartkb builders on FYI

TBR=whesse@google.com

Change-Id: I4709c13fa5d4a454619f4da004565c654a3cdf94
Reviewed-on: https://dart-review.googlesource.com/68084
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-milo.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 8254065975f2..50908ce48380 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2815,12 +2815,12 @@ consoles: {
   refs: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "vm-dartkb-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64"
     category: "vm|dartkb"
     short_name: "d"
   }
   builders {
-    name: "vm-dartkb-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64"
     category: "vm|dartkb"
     short_name: "r"
   }

From 7d269bd6b8b1010d5bd160835fa534b653815c04 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 9 Aug 2018 05:56:23 +0000
Subject: [PATCH 164/826] [infra] Move vm-precomp builders to Dart 2

* Move cra/tra builders to the vm|kernel category.
* Keep precomp-android builders as is for now until Buildbot is updated.

Change-Id: I6f5b4f7f6b2c84d10ea2d9a054dd0838757a5c96
Reviewed-on: https://dart-review.googlesource.com/68941
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg |  29 +++--
 luci-milo.cfg      | 278 ++++++++++++++-------------------------------
 luci-scheduler.cfg | 156 +++++++++++++++++++++----
 3 files changed, 230 insertions(+), 233 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index f67175bbd74b..05334c619745 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -226,8 +226,6 @@ buckets {
     builders { name: "pub-linux-release" }
     builders { name: "pub-mac-release" mixins: "mac" }
     builders { name: "pub-win-release" mixins: "win" }
-    builders { name: "precomp-linux-debug-x64" }
-    builders { name: "precomp-linux-product-x64" }
     builders { name: "target-vm-linux-release-arm64" dimensions: "cpu:arm64" }
     builders { name: "versionchecker-linux" }
     builders { name: "vm-asan-linux-release-x64" }
@@ -243,9 +241,12 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-debug-x64" mixins: "slow" }
+    builders { name: "vm-kernel-precomp-linux-product-x64" }
     builders { name: "vm-kernel-precomp-linux-release-simarm" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64" }
     builders { name: "vm-kernel-precomp-linux-release-x64" }
+    builders { name: "vm-kernel-precomp-mac-release-simarm64" mixins: "mac" }
+    builders { name: "vm-kernel-precomp-win-release-simarm64" mixins: "win" }
     builders { name: "vm-kernel-precomp-win-release-x64" mixins: "win" }
     builders { name: "vm-kernel-reload-linux-debug-x64" }
     builders { name: "vm-kernel-reload-linux-release-x64" }
@@ -269,11 +270,8 @@ buckets {
     builders { name: "vm-mac-release-ia32" mixins: "mac" }
     builders { name: "vm-mac-release-simdbc64" mixins: "mac" }
     builders { name: "vm-mac-release-x64" mixins: "mac" }
-    builders { name: "vm-noopt-mac-simarm64" mixins: "mac" }
     builders { name: "vm-optcounter-threshold-linux-release-ia32" }
     builders { name: "vm-optcounter-threshold-linux-release-x64" }
-    builders { name: "vm-precomp-android-release" }
-    builders { name: "vm-precomp-win-simarm64" mixins: "win" }
     builders { name: "vm-reload-linux-debug-x64" }
     builders { name: "vm-reload-linux-release-x64" }
     builders { name: "vm-reload-mac-debug-simdbc64" mixins: "mac" }
@@ -336,8 +334,6 @@ buckets {
     builders { name: "pub-linux-release-dev" }
     builders { name: "pub-mac-release-dev" mixins: "mac" }
     builders { name: "pub-win-release-dev" mixins: "win" }
-    builders { name: "precomp-linux-debug-x64-dev" }
-    builders { name: "precomp-linux-product-x64-dev" }
     builders { name: "target-vm-linux-release-arm64-dev" dimensions: "cpu:arm64" }
     builders { name: "versionchecker-linux-dev" }
     builders { name: "vm-asan-linux-release-x64-dev" }
@@ -353,9 +349,12 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-dev" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-dev" mixins: "slow" }
+    builders { name: "vm-kernel-precomp-linux-product-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-dev" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-dev" }
     builders { name: "vm-kernel-precomp-linux-release-x64-dev" }
+    builders { name: "vm-kernel-precomp-mac-release-simarm64-dev" mixins: "mac" }
+    builders { name: "vm-kernel-precomp-win-release-simarm64-dev" mixins: "win" }
     builders { name: "vm-kernel-precomp-win-release-x64-dev" mixins: "win" }
     builders { name: "vm-kernel-reload-linux-debug-x64-dev" }
     builders { name: "vm-kernel-reload-linux-release-x64-dev" }
@@ -379,11 +378,8 @@ buckets {
     builders { name: "vm-mac-release-ia32-dev" mixins: "mac" }
     builders { name: "vm-mac-release-simdbc64-dev" mixins: "mac" }
     builders { name: "vm-mac-release-x64-dev" mixins: "mac" }
-    builders { name: "vm-noopt-mac-simarm64-dev" mixins: "mac" }
     builders { name: "vm-optcounter-threshold-linux-release-ia32-dev" }
     builders { name: "vm-optcounter-threshold-linux-release-x64-dev" }
-    builders { name: "vm-precomp-android-release-dev" }
-    builders { name: "vm-precomp-win-simarm64-dev" mixins: "win" }
     builders { name: "vm-reload-linux-debug-x64-dev" }
     builders { name: "vm-reload-linux-release-x64-dev" }
     builders { name: "vm-reload-mac-debug-simdbc64-dev" mixins: "mac" }
@@ -433,7 +429,7 @@ buckets {
     builders { name: "dart2js-strong-win-x64-firefox-stable" mixins: "win" }
     builders { name: "dart2js-strong-win-x64-ie11-stable" mixins: "win" }
     builders { name: "dart2js-unit-linux-x64-release-stable" }
-   builders { name: "ddc-linux-release-chrome-stable" }
+    builders { name: "ddc-linux-release-chrome-stable" }
     builders { name: "ddc-mac-release-chrome-stable" mixins: "mac" }
     builders { name: "ddc-win-release-chrome-stable" mixins: "win" }
     builders { name: "front-end-legacy-linux-release-x64-stable" mixins: "clobber" }
@@ -446,8 +442,6 @@ buckets {
     builders { name: "pub-linux-release-stable" }
     builders { name: "pub-mac-release-stable" mixins: "mac" }
     builders { name: "pub-win-release-stable" mixins: "win" }
-    builders { name: "precomp-linux-debug-x64-stable" }
-    builders { name: "precomp-linux-product-x64-stable" }
     builders { name: "target-vm-linux-release-arm64-stable" dimensions: "cpu:arm64" }
     builders { name: "versionchecker-linux-stable" }
     builders { name: "vm-asan-linux-release-x64-stable" }
@@ -463,9 +457,12 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-stable" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-stable" mixins: "slow" }
+    builders { name: "vm-kernel-precomp-linux-product-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-stable" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-stable" }
     builders { name: "vm-kernel-precomp-linux-release-x64-stable" }
+    builders { name: "vm-kernel-precomp-mac-release-simarm64-stable" mixins: "mac" }
+    builders { name: "vm-kernel-precomp-win-release-simarm64-stable" mixins: "win" }
     builders { name: "vm-kernel-precomp-win-release-x64-stable" mixins: "win" }
     builders { name: "vm-kernel-reload-linux-debug-x64-stable" }
     builders { name: "vm-kernel-reload-linux-release-x64-stable" }
@@ -489,11 +486,8 @@ buckets {
     builders { name: "vm-mac-release-ia32-stable" mixins: "mac" }
     builders { name: "vm-mac-release-simdbc64-stable" mixins: "mac" }
     builders { name: "vm-mac-release-x64-stable" mixins: "mac" }
-    builders { name: "vm-noopt-mac-simarm64-stable" mixins: "mac" }
     builders { name: "vm-optcounter-threshold-linux-release-ia32-stable" }
     builders { name: "vm-optcounter-threshold-linux-release-x64-stable" }
-    builders { name: "vm-precomp-android-release-stable" }
-    builders { name: "vm-precomp-win-simarm64-stable" mixins: "win" }
     builders { name: "vm-reload-linux-debug-x64-stable" }
     builders { name: "vm-reload-linux-release-x64-stable" }
     builders { name: "vm-reload-mac-debug-simdbc64-stable" mixins: "mac" }
@@ -594,9 +588,12 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-try" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-try" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-try" mixins: "slow" }
+    builders { name: "vm-kernel-precomp-linux-product-x64-try" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-try" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-try" }
     builders { name: "vm-kernel-precomp-linux-release-x64-try" }
+    builders { name: "vm-kernel-precomp-mac-release-simarm64-try" mixins: "mac" }
+    builders { name: "vm-kernel-precomp-win-release-simarm64-try" mixins: "win" }
     builders { name: "vm-kernel-precomp-win-release-x64-try" mixins: "win" }
     builders { name: "vm-kernel-reload-linux-debug-x64-try" }
     builders { name: "vm-kernel-reload-linux-release-x64-try" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 50908ce48380..0ed600a41fb1 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -218,6 +218,11 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "d"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
+    category: "vm|kernel-precomp"
+    short_name: "p"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
     category: "vm|kernel-precomp"
@@ -233,6 +238,16 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "ma"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "wa"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
     category: "vm|kernel-precomp"
@@ -241,13 +256,13 @@ consoles: {
   builders {
     # migrating to cross-vm-linux-release-arm64
     name: "buildbot/client.dart/cross-arm64-vm-linux-release-be"
-    category: "vm|misc"
+    category: "vm|kernel"
     short_name: "cra"
   }
   builders {
     # migrating to target-vm-linux-release-arm64
     name: "buildbot/client.dart/target-arm64-vm-linux-release-be"
-    category: "vm|misc"
+    category: "vm|kernel"
     short_name: "tra"
   }
   builders {
@@ -268,36 +283,6 @@ consoles: {
     category: "vm|misc"
     short_name: "o64"
   }
-  builders {
-    # migrating to precomp-linux-debug-x64
-    name: "buildbot/client.dart/precomp-linux-debug-x64-1-3-be"
-    category: "vm|precomp"
-    short_name: "1d64"
-  }
-  builders {
-    # migrating to precomp-linux-debug-x64
-    name: "buildbot/client.dart/precomp-linux-debug-x64-2-3-be"
-    category: "vm|precomp"
-    short_name: "2d64"
-  }
-  builders {
-    # migrating to precomp-linux-debug-x64
-    name: "buildbot/client.dart/precomp-linux-debug-x64-3-3-be"
-    category: "vm|precomp"
-    short_name: "3d64"
-  }
-  builders {
-    # migrating to precomp-linux-product-x64
-    name: "buildbot/client.dart/precomp-linux-product-x64-be"
-    category: "vm|precomp"
-    short_name: "p64"
-  }
-  builders {
-    # migrating to vm-noopt-mac-simarm64
-    name: "buildbot/client.dart/vm-noopt-simarm64-mac-be"
-    category: "vm|precomp"
-    short_name: "no"
-  }
   builders {
     # migrating to vm-precomp-android-release
     name: "buildbot/client.dart/vm-precomp-android-release-1-3-be"
@@ -316,30 +301,6 @@ consoles: {
     category: "vm|precomp"
     short_name: "3and"
   }
-  builders {
-    # migrating to vm-precomp-win-simarm64
-    name: "buildbot/client.dart/vm-precomp-win-simarm64-1-4-be"
-    category: "vm|precomp"
-    short_name: "1wsi"
-  }
-  builders {
-    # migrating to vm-precomp-win-simarm64
-    name: "buildbot/client.dart/vm-precomp-win-simarm64-2-4-be"
-    category: "vm|precomp"
-    short_name: "2wsi"
-  }
-  builders {
-    # migrating to vm-precomp-win-simarm64
-    name: "buildbot/client.dart/vm-precomp-win-simarm64-3-4-be"
-    category: "vm|precomp"
-    short_name: "3wsi"
-  }
-  builders {
-    # migrating to vm-precomp-win-simarm64
-    name: "buildbot/client.dart/vm-precomp-win-simarm64-4-4-be"
-    category: "vm|precomp"
-    short_name: "4wsi"
-  }
   builders {
     # migrating to vm-linux-product-x64
     name: "buildbot/client.dart/vm-linux-product-x64-be"
@@ -1047,6 +1008,11 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "d"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
+    category: "vm|kernel-precomp"
+    short_name: "p"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
     category: "vm|kernel-precomp"
@@ -1062,6 +1028,16 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "ma"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "wa"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
     category: "vm|kernel-precomp"
@@ -1070,13 +1046,13 @@ consoles: {
   builders {
     # migrating to cross-vm-linux-release-arm64
     name: "buildbot/client.dart/cross-arm64-vm-linux-release-be"
-    category: "vm|misc"
+    category: "vm|kernel"
     short_name: "cra"
   }
   builders {
     # migrating to target-vm-linux-release-arm64
     name: "buildbot/client.dart/target-arm64-vm-linux-release-be"
-    category: "vm|misc"
+    category: "vm|kernel"
     short_name: "tra"
   }
   builders {
@@ -1097,36 +1073,6 @@ consoles: {
     category: "vm|misc"
     short_name: "o64"
   }
-  builders {
-    # migrating to precomp-linux-debug-x64
-    name: "buildbot/client.dart/precomp-linux-debug-x64-1-3-be"
-    category: "vm|precomp"
-    short_name: "1d64"
-  }
-  builders {
-    # migrating to precomp-linux-debug-x64
-    name: "buildbot/client.dart/precomp-linux-debug-x64-2-3-be"
-    category: "vm|precomp"
-    short_name: "2d64"
-  }
-  builders {
-    # migrating to precomp-linux-debug-x64
-    name: "buildbot/client.dart/precomp-linux-debug-x64-3-3-be"
-    category: "vm|precomp"
-    short_name: "3d64"
-  }
-  builders {
-    # migrating to precomp-linux-product-x64
-    name: "buildbot/client.dart/precomp-linux-product-x64-be"
-    category: "vm|precomp"
-    short_name: "p64"
-  }
-  builders {
-    # migrating to vm-noopt-mac-simarm64
-    name: "buildbot/client.dart/vm-noopt-simarm64-mac-be"
-    category: "vm|precomp"
-    short_name: "no"
-  }
   builders {
     # migrating to vm-precomp-android-release
     name: "buildbot/client.dart/vm-precomp-android-release-1-3-be"
@@ -1145,30 +1091,6 @@ consoles: {
     category: "vm|precomp"
     short_name: "3and"
   }
-  builders {
-    # migrating to vm-precomp-win-simarm64
-    name: "buildbot/client.dart/vm-precomp-win-simarm64-1-4-be"
-    category: "vm|precomp"
-    short_name: "1wsi"
-  }
-  builders {
-    # migrating to vm-precomp-win-simarm64
-    name: "buildbot/client.dart/vm-precomp-win-simarm64-2-4-be"
-    category: "vm|precomp"
-    short_name: "2wsi"
-  }
-  builders {
-    # migrating to vm-precomp-win-simarm64
-    name: "buildbot/client.dart/vm-precomp-win-simarm64-3-4-be"
-    category: "vm|precomp"
-    short_name: "3wsi"
-  }
-  builders {
-    # migrating to vm-precomp-win-simarm64
-    name: "buildbot/client.dart/vm-precomp-win-simarm64-4-4-be"
-    category: "vm|precomp"
-    short_name: "4wsi"
-  }
   builders {
     # migrating to vm-linux-product-x64
     name: "buildbot/client.dart/vm-linux-product-x64-be"
@@ -1472,6 +1394,11 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "d"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
+    category: "vm|kernel-precomp"
+    short_name: "p"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
     category: "vm|kernel-precomp"
@@ -1487,6 +1414,16 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "ma"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "wa"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
     category: "vm|kernel-precomp"
@@ -1494,12 +1431,12 @@ consoles: {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
-    category: "vm|misc"
+    category: "vm|kernel"
     short_name: "cra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64"
-    category: "vm|misc"
+    category: "vm|kernel"
     short_name: "tra"
   }
   builders {
@@ -1517,31 +1454,6 @@ consoles: {
     category: "vm|misc"
     short_name: "o64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-debug-x64"
-    category: "vm|precomp"
-    short_name: "d64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-product-x64"
-    category: "vm|precomp"
-    short_name: "p64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-noopt-mac-simarm64"
-    category: "vm|precomp"
-    short_name: "no"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-android-release"
-    category: "vm|precomp"
-    short_name: "and"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-win-simarm64"
-    category: "vm|precomp"
-    short_name: "wsi"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-linux-product-x64"
     category: "vm|product"
@@ -1976,6 +1888,11 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "d"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "p"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-dev"
     category: "vm|kernel-precomp"
@@ -1991,6 +1908,16 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "ma"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-simarm64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "wa"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-dev"
     category: "vm|kernel-precomp"
@@ -1998,12 +1925,12 @@ consoles: {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-dev"
-    category: "vm|misc"
+    category: "vm|kernel"
     short_name: "cra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64-dev"
-    category: "vm|misc"
+    category: "vm|kernel"
     short_name: "tra"
   }
   builders {
@@ -2021,31 +1948,6 @@ consoles: {
     category: "vm|misc"
     short_name: "o64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-debug-x64-dev"
-    category: "vm|precomp"
-    short_name: "d64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-product-x64-dev"
-    category: "vm|precomp"
-    short_name: "p64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-noopt-mac-simarm64-dev"
-    category: "vm|precomp"
-    short_name: "no"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-android-release-dev"
-    category: "vm|precomp"
-    short_name: "and"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-win-simarm64-dev"
-    category: "vm|precomp"
-    short_name: "wsi"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-linux-product-x64-dev"
     category: "vm|product"
@@ -2490,6 +2392,11 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "d"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "p"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-stable"
     category: "vm|kernel-precomp"
@@ -2505,6 +2412,16 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "ma"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-simarm64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "wa"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-stable"
     category: "vm|kernel-precomp"
@@ -2512,12 +2429,12 @@ consoles: {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-stable"
-    category: "vm|misc"
+    category: "vm|kernel"
     short_name: "cra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64-stable"
-    category: "vm|misc"
+    category: "vm|kernel"
     short_name: "tra"
   }
   builders {
@@ -2535,31 +2452,6 @@ consoles: {
     category: "vm|misc"
     short_name: "o64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-debug-x64-stable"
-    category: "vm|precomp"
-    short_name: "d64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/precomp-linux-product-x64-stable"
-    category: "vm|precomp"
-    short_name: "p64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-noopt-mac-simarm64-stable"
-    category: "vm|precomp"
-    short_name: "no"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-android-release-stable"
-    category: "vm|precomp"
-    short_name: "and"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-win-simarm64-stable"
-    category: "vm|precomp"
-    short_name: "wsi"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-linux-product-x64-stable"
     category: "vm|product"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index f121d500dba6..8d79dfd2c714 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -66,9 +66,12 @@ trigger {
   triggers: "vm-kernel-linux-release-x64"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
   triggers: "vm-kernel-precomp-linux-debug-x64"
+  triggers: "vm-kernel-precomp-linux-product-x64"
   triggers: "vm-kernel-precomp-linux-release-simarm"
   triggers: "vm-kernel-precomp-linux-release-simarm64"
   triggers: "vm-kernel-precomp-linux-release-x64"
+  triggers: "vm-kernel-precomp-mac-release-simarm64"
+  triggers: "vm-kernel-precomp-win-release-simarm64"
   triggers: "vm-kernel-precomp-win-release-x64"
   triggers: "vm-kernel-reload-linux-debug-x64"
   triggers: "vm-kernel-reload-linux-release-x64"
@@ -127,9 +130,12 @@ trigger {
   triggers: "vm-kernel-linux-release-x64-dev"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-linux-debug-x64-dev"
+  triggers: "vm-kernel-precomp-linux-product-x64-dev"
   triggers: "vm-kernel-precomp-linux-release-simarm-dev"
   triggers: "vm-kernel-precomp-linux-release-simarm64-dev"
   triggers: "vm-kernel-precomp-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-mac-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-win-release-simarm64-dev"
   triggers: "vm-kernel-precomp-win-release-x64-dev"
   triggers: "vm-kernel-reload-linux-debug-x64-dev"
   triggers: "vm-kernel-reload-linux-release-x64-dev"
@@ -188,9 +194,12 @@ trigger {
   triggers: "vm-kernel-linux-release-x64-stable"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-linux-debug-x64-stable"
+  triggers: "vm-kernel-precomp-linux-product-x64-stable"
   triggers: "vm-kernel-precomp-linux-release-simarm-stable"
   triggers: "vm-kernel-precomp-linux-release-simarm64-stable"
   triggers: "vm-kernel-precomp-linux-release-x64-stable"
+  triggers: "vm-kernel-precomp-mac-release-simarm64-stable"
+  triggers: "vm-kernel-precomp-win-release-simarm64-stable"
   triggers: "vm-kernel-precomp-win-release-x64-stable"
   triggers: "vm-kernel-reload-linux-debug-x64-stable"
   triggers: "vm-kernel-reload-linux-release-x64-stable"
@@ -687,46 +696,46 @@ job {
 }
 
 job {
-  id: "vm-kernel-precomp-linux-release-simarm"
+  id: "vm-kernel-precomp-linux-debug-x64"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm"
+    builder: "vm-kernel-precomp-linux-debug-x64"
   }
 }
 
 job {
-  id: "vm-kernel-precomp-linux-debug-x64"
+  id: "vm-kernel-precomp-linux-product-x64"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64"
+    builder: "vm-kernel-precomp-linux-product-x64"
   }
 }
 
 job {
-  id: "vm-kernel-precomp-linux-release-simarm64"
+  id: "vm-kernel-precomp-linux-release-simarm"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm64"
+    builder: "vm-kernel-precomp-linux-release-simarm"
   }
 }
 
 job {
-  id: "vm-kernel-precomp-win-release-x64"
+  id: "vm-kernel-precomp-linux-release-simarm64"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-x64"
+    builder: "vm-kernel-precomp-linux-release-simarm64"
   }
 }
 
@@ -741,6 +750,39 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-precomp-mac-release-simarm64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-mac-release-simarm64"
+  }
+}
+
+job {
+  id: "vm-kernel-precomp-win-release-simarm64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-win-release-simarm64"
+  }
+}
+
+job {
+  id: "vm-kernel-precomp-win-release-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-win-release-x64"
+  }
+}
+
 job {
   id: "vm-kernel-reload-linux-debug-x64"
   acl_sets: "default"
@@ -1262,46 +1304,46 @@ job {
 }
 
 job {
-  id: "vm-kernel-precomp-linux-release-simarm-dev"
+  id: "vm-kernel-precomp-linux-debug-x64-dev"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm-dev"
+    builder: "vm-kernel-precomp-linux-debug-x64-dev"
   }
 }
 
 job {
-  id: "vm-kernel-precomp-linux-debug-x64-dev"
+  id: "vm-kernel-precomp-linux-product-x64-dev"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64-dev"
+    builder: "vm-kernel-precomp-linux-product-x64-dev"
   }
 }
 
 job {
-  id: "vm-kernel-precomp-linux-release-simarm64-dev"
+  id: "vm-kernel-precomp-linux-release-simarm-dev"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm64-dev"
+    builder: "vm-kernel-precomp-linux-release-simarm-dev"
   }
 }
 
 job {
-  id: "vm-kernel-precomp-win-release-x64-dev"
+  id: "vm-kernel-precomp-linux-release-simarm64-dev"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-x64-dev"
+    builder: "vm-kernel-precomp-linux-release-simarm64-dev"
   }
 }
 
@@ -1316,6 +1358,39 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-precomp-mac-release-simarm64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-mac-release-simarm64-dev"
+  }
+}
+
+job {
+  id: "vm-kernel-precomp-win-release-simarm64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-win-release-simarm64-dev"
+  }
+}
+
+job {
+  id: "vm-kernel-precomp-win-release-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-win-release-x64-dev"
+  }
+}
+
 job {
   id: "vm-kernel-reload-linux-debug-x64-dev"
   acl_sets: "default"
@@ -1837,46 +1912,46 @@ job {
 }
 
 job {
-  id: "vm-kernel-precomp-linux-release-simarm-stable"
+  id: "vm-kernel-precomp-linux-debug-x64-stable"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm-stable"
+    builder: "vm-kernel-precomp-linux-debug-x64-stable"
   }
 }
 
 job {
-  id: "vm-kernel-precomp-linux-debug-x64-stable"
+  id: "vm-kernel-precomp-linux-product-x64-stable"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64-stable"
+    builder: "vm-kernel-precomp-linux-product-x64-stable"
   }
 }
 
 job {
-  id: "vm-kernel-precomp-linux-release-simarm64-stable"
+  id: "vm-kernel-precomp-linux-release-simarm-stable"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm64-stable"
+    builder: "vm-kernel-precomp-linux-release-simarm-stable"
   }
 }
 
 job {
-  id: "vm-kernel-precomp-win-release-x64-stable"
+  id: "vm-kernel-precomp-linux-release-simarm64-stable"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-x64-stable"
+    builder: "vm-kernel-precomp-linux-release-simarm64-stable"
   }
 }
 
@@ -1891,6 +1966,39 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-precomp-mac-release-simarm64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-mac-release-simarm64-dev"
+  }
+}
+
+job {
+  id: "vm-kernel-precomp-win-release-simarm64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-win-release-simarm64-dev"
+  }
+}
+
+job {
+  id: "vm-kernel-precomp-win-release-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-win-release-x64-stable"
+  }
+}
+
 job {
   id: "vm-kernel-reload-linux-debug-x64-stable"
   acl_sets: "default"

From 6ce564f0719e573784d3d138e80c3c8b9ef17080 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 9 Aug 2018 12:22:02 +0000
Subject: [PATCH 165/826] [infra] Rename precomp-android builder on consoles

TBR=whesse@google.com

Change-Id: Ic57650f3c9ad34fae3808dc705db51c51af92d25
Reviewed-on: https://dart-review.googlesource.com/69104
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-milo.cfg | 72 +++++++++++++++++++++++++--------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 0ed600a41fb1..45666891f7d5 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -213,6 +213,24 @@ consoles: {
     category: "vm|kernel"
     short_name: "wr"
   }
+  builders {
+    # migrating to vm-kernel-precomp-android-release
+    name: "buildbot/client.dart/vm-kernel-precomp-android-release-1-3-be"
+    category: "vm|kernel-precomp"
+    short_name: "1an"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-android-release
+    name: "buildbot/client.dart/vm-kernel-precomp-android-release-2-3-be"
+    category: "vm|kernel-precomp"
+    short_name: "2an"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-android-release
+    name: "buildbot/client.dart/vm-kernel-precomp-android-release-3-3-be"
+    category: "vm|kernel-precomp"
+    short_name: "3an"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
     category: "vm|kernel-precomp"
@@ -283,24 +301,6 @@ consoles: {
     category: "vm|misc"
     short_name: "o64"
   }
-  builders {
-    # migrating to vm-precomp-android-release
-    name: "buildbot/client.dart/vm-precomp-android-release-1-3-be"
-    category: "vm|precomp"
-    short_name: "1and"
-  }
-  builders {
-    # migrating to vm-precomp-android-release
-    name: "buildbot/client.dart/vm-precomp-android-release-2-3-be"
-    category: "vm|precomp"
-    short_name: "2and"
-  }
-  builders {
-    # migrating to vm-precomp-android-release
-    name: "buildbot/client.dart/vm-precomp-android-release-3-3-be"
-    category: "vm|precomp"
-    short_name: "3and"
-  }
   builders {
     # migrating to vm-linux-product-x64
     name: "buildbot/client.dart/vm-linux-product-x64-be"
@@ -1003,6 +1003,24 @@ consoles: {
     category: "vm|kernel"
     short_name: "wr"
   }
+  builders {
+    # migrating to vm-kernel-precomp-android-release
+    name: "buildbot/client.dart/vm-kernel-precomp-android-release-1-3-be"
+    category: "vm|kernel-precomp"
+    short_name: "1an"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-android-release
+    name: "buildbot/client.dart/vm-kernel-precomp-android-release-2-3-be"
+    category: "vm|kernel-precomp"
+    short_name: "2an"
+  }
+  builders {
+    # migrating to vm-kernel-precomp-android-release
+    name: "buildbot/client.dart/vm-kernel-precomp-android-release-3-3-be"
+    category: "vm|kernel-precomp"
+    short_name: "3an"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
     category: "vm|kernel-precomp"
@@ -1073,24 +1091,6 @@ consoles: {
     category: "vm|misc"
     short_name: "o64"
   }
-  builders {
-    # migrating to vm-precomp-android-release
-    name: "buildbot/client.dart/vm-precomp-android-release-1-3-be"
-    category: "vm|precomp"
-    short_name: "1and"
-  }
-  builders {
-    # migrating to vm-precomp-android-release
-    name: "buildbot/client.dart/vm-precomp-android-release-2-3-be"
-    category: "vm|precomp"
-    short_name: "2and"
-  }
-  builders {
-    # migrating to vm-precomp-android-release
-    name: "buildbot/client.dart/vm-precomp-android-release-3-3-be"
-    category: "vm|precomp"
-    short_name: "3and"
-  }
   builders {
     # migrating to vm-linux-product-x64
     name: "buildbot/client.dart/vm-linux-product-x64-be"

From a71e0b55d3bb3cbfe0bc61d84199c2cbc6a6218f Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 15 Aug 2018 09:07:13 +0000
Subject: [PATCH 166/826] [infra] Remove Dart 1 front-end builder from the Luci
 config

TBR=whesse@google.com

Change-Id: I9ae1bdb3dca770654d82326a40e2033d9184fd05
Reviewed-on: https://dart-review.googlesource.com/69965
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 10 +++-------
 luci-milo.cfg      | 25 -------------------------
 luci-scheduler.cfg | 36 ------------------------------------
 3 files changed, 3 insertions(+), 68 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 05334c619745..aa83a5f5909f 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -216,9 +216,8 @@ buckets {
     builders { name: "ddc-linux-release-chrome" }
     builders { name: "ddc-mac-release-chrome" mixins: "mac" }
     builders { name: "ddc-win-release-chrome" mixins: "win" }
-    builders { name: "front-end-mac-release-x64" mixins: "clobber" mixins: "mac" }
-    builders { name: "front-end-legacy-linux-release-x64" mixins: "clobber" }
     builders { name: "front-end-linux-release-x64" mixins: "clobber" }
+    builders { name: "front-end-mac-release-x64" mixins: "clobber" mixins: "mac" }
     builders { name: "front-end-win-release-x64" mixins: "clobber" mixins: "win" }
     builders { name: "pkg-linux-release" }
     builders { name: "pkg-mac-release" mixins: "mac" }
@@ -324,9 +323,8 @@ buckets {
     builders { name: "ddc-linux-release-chrome-dev" }
     builders { name: "ddc-mac-release-chrome-dev" mixins: "mac" }
     builders { name: "ddc-win-release-chrome-dev" mixins: "win" }
-    builders { name: "front-end-mac-release-x64-dev" mixins: "clobber" mixins: "mac" }
-    builders { name: "front-end-legacy-linux-release-x64-dev" mixins: "clobber" }
     builders { name: "front-end-linux-release-x64-dev" mixins: "clobber" }
+    builders { name: "front-end-mac-release-x64-dev" mixins: "clobber" mixins: "mac" }
     builders { name: "front-end-win-release-x64-dev" mixins: "clobber" mixins: "win" }
     builders { name: "pkg-linux-release-dev" }
     builders { name: "pkg-mac-release-dev" mixins: "mac" }
@@ -432,9 +430,8 @@ buckets {
     builders { name: "ddc-linux-release-chrome-stable" }
     builders { name: "ddc-mac-release-chrome-stable" mixins: "mac" }
     builders { name: "ddc-win-release-chrome-stable" mixins: "win" }
-    builders { name: "front-end-legacy-linux-release-x64-stable" mixins: "clobber" }
-    builders { name: "front-end-mac-release-x64-stable" mixins: "clobber" mixins: "mac" }
     builders { name: "front-end-linux-release-x64-stable" mixins: "clobber" }
+    builders { name: "front-end-mac-release-x64-stable" mixins: "clobber" mixins: "mac" }
     builders { name: "front-end-win-release-x64-stable" mixins: "clobber" mixins: "win" }
     builders { name: "pkg-linux-release-stable" }
     builders { name: "pkg-mac-release-stable" mixins: "mac" }
@@ -569,7 +566,6 @@ buckets {
     builders { name: "ddc-linux-release-chrome-try" mixins: "clobber" }
     builders { name: "ddc-mac-release-chrome-try" mixins: "mac" }
     builders { name: "ddc-win-release-chrome-try" mixins: "win" }
-    builders { name: "front-end-legacy-linux-release-x64-try" mixins: "clobber" }
     builders { name: "front-end-linux-release-x64-try" mixins: "clobber" }
     builders { name: "front-end-mac-release-x64-try" mixins: "clobber" mixins: "mac" }
     builders { name: "front-end-win-release-x64-try" mixins: "clobber" mixins: "win" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 45666891f7d5..c982e5b8c6c3 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -6,11 +6,6 @@ consoles: {
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-legacy-linux-release-x64"
-    category: "fasta"
-    short_name: "ll"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
     category: "fasta"
@@ -607,11 +602,6 @@ consoles: {
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-legacy-linux-release-x64"
-    category: "fasta"
-    short_name: "ll"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
     category: "fasta"
@@ -1204,11 +1194,6 @@ consoles: {
   repo_url: "https://dart.googlesource.com/sdk/"
   refs: "refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-legacy-linux-release-x64"
-    category: "fasta"
-    short_name: "ll"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
     category: "fasta"
@@ -1698,11 +1683,6 @@ consoles: {
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "refs/heads/dev"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-legacy-linux-release-x64-dev"
-    category: "fasta"
-    short_name: "ll"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-dev"
     category: "fasta"
@@ -2202,11 +2182,6 @@ consoles: {
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "refs/heads/stable"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-legacy-linux-release-x64-stable"
-    category: "fasta"
-    short_name: "ll"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-stable"
     category: "fasta"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 8d79dfd2c714..51344e6957ac 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -49,7 +49,6 @@ trigger {
   triggers: "ddc-linux-release-chrome"
   triggers: "ddc-mac-release-chrome"
   triggers: "ddc-win-release-chrome"
-  triggers: "front-end-legacy-linux-release-x64"
   triggers: "front-end-linux-release-x64"
   triggers: "front-end-mac-release-x64"
   triggers: "front-end-win-release-x64"
@@ -115,7 +114,6 @@ trigger {
   triggers: "ddc-linux-release-chrome-dev"
   triggers: "ddc-mac-release-chrome-dev"
   triggers: "ddc-win-release-chrome-dev"
-  triggers: "front-end-legacy-linux-release-x64-dev"
   triggers: "front-end-linux-release-x64-dev"
   triggers: "front-end-mac-release-x64-dev"
   triggers: "front-end-win-release-x64-dev"
@@ -179,7 +177,6 @@ trigger {
   triggers: "ddc-linux-release-chrome-stable"
   triggers: "ddc-mac-release-chrome-stable"
   triggers: "ddc-win-release-chrome-stable"
-  triggers: "front-end-legacy-linux-release-x64-stable"
   triggers: "front-end-linux-release-x64-stable"
   triggers: "front-end-mac-release-x64-stable"
   triggers: "front-end-win-release-x64-stable"
@@ -519,17 +516,6 @@ job {
   }
 }
 
-job {
-  id: "front-end-legacy-linux-release-x64"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-legacy-linux-release-x64"
-  }
-}
-
 job {
   id: "front-end-linux-release-x64"
   acl_sets: "default"
@@ -1149,17 +1135,6 @@ job {
   }
 }
 
-job {
-  id: "front-end-legacy-linux-release-x64-dev"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-legacy-linux-release-x64-dev"
-  }
-}
-
 job {
   id: "front-end-linux-release-x64-dev"
   acl_sets: "default"
@@ -1757,17 +1732,6 @@ job {
   }
 }
 
-job {
-  id: "front-end-legacy-linux-release-x64-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-legacy-linux-release-x64-stable"
-  }
-}
-
 job {
   id: "front-end-linux-release-x64-stable"
   acl_sets: "default"

From 6d3fec0eee9e196f01c4eb1bfae2c4926f1da912 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 16 Aug 2018 11:17:57 +0000
Subject: [PATCH 167/826] [infra] Experiment: put flutter 3xhead builder on FYI
 console

TBR=whesse@google.com

Change-Id: Iabcdfeb6fdce1d409c258c7cc0c8c5664f4452c0
Reviewed-on: https://dart-review.googlesource.com/70263
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-milo.cfg | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index c982e5b8c6c3..d1d736d22fe7 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2681,6 +2681,11 @@ consoles: {
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "refs/heads/master"
   manifest_name: "REVISION"
+  builders {
+    name: "buildbot/client.dart.internal/flutter-engine-linux"
+    category: "vm|flutter"
+    short_name: "f"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64"
     category: "vm|dartkb"

From bacdc4290a1a0fe4502ffe60121f43946eabb092 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 16 Aug 2018 12:20:23 +0000
Subject: [PATCH 168/826] [infra] Experiment: put Flutter console group on main
 consoles

TBR=whesse@google.com

Change-Id: I590acf3e7c8b14efa1e3dfcd76aa09f908469a6f
Reviewed-on: https://dart-review.googlesource.com/70266
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-milo.cfg | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index d1d736d22fe7..204309c09662 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -592,6 +592,9 @@ consoles: {
         alt: "SDK CQ Status"
       }
     }
+    console_groups: {
+      console_ids: "flutter"
+    }
     tree_status_host: "dart-status.appspot.com"
   }
 }
@@ -1184,6 +1187,9 @@ consoles: {
         alt: "SDK CQ Status"
       }
     }
+    console_groups: {
+      console_ids: "flutter"
+    }
     tree_status_host: "dart-status.appspot.com"
   }
 }
@@ -2675,6 +2681,19 @@ consoles: {
   }
 }
 
+consoles: {
+  id: "flutter"
+  name: "Dart/Flutter Console"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "refs/heads/master"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbot/client.dart.internal/flutter-engine-linux"
+    category: "3xH"
+    short_name: "f"
+  }
+}
+
 consoles: {
   id: "fyi"
   name: "SDK FYI Console"

From 8d3d51b397962c5a2701c8824455ce27f9df6f79 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 16 Aug 2018 12:24:23 +0000
Subject: [PATCH 169/826] [infra] Fix flutter console group

TBR=whesse@google.com

Change-Id: Ib8f2ce31b5a417d46ec0af81034a7bb27cd81803
Reviewed-on: https://dart-review.googlesource.com/70267
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-milo.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 204309c09662..0250370ed0c0 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -593,7 +593,7 @@ consoles: {
       }
     }
     console_groups: {
-      console_ids: "flutter"
+      console_ids: "dart/flutter"
     }
     tree_status_host: "dart-status.appspot.com"
   }
@@ -1188,7 +1188,7 @@ consoles: {
       }
     }
     console_groups: {
-      console_ids: "flutter"
+      console_ids: "dart/flutter"
     }
     tree_status_host: "dart-status.appspot.com"
   }

From 4dd2203201a74ae799335eaecd87f181e803bfd8 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 29 Aug 2018 12:40:29 +0000
Subject: [PATCH 170/826] [infra] Remove analyzer CFE builders from Luci config

TBR=whesse@google.com

Change-Id: I72d57f2734f596893545bdbd502ee5cae0cd0bdc
Reviewed-on: https://dart-review.googlesource.com/72002
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg |  12 -----
 luci-milo.cfg      |  75 -------------------------------
 luci-scheduler.cfg | 108 ---------------------------------------------
 3 files changed, 195 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index aa83a5f5909f..417ada202ef8 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -180,9 +180,6 @@ buckets {
     builders { name: "analyzer-analysis-server-linux" }
     builders { name: "analyzer-linux-release" }
     builders { name: "analyzer-mac-release" mixins: "mac" }
-    builders { name: "analyzer-use-cfe-mac" mixins: "mac" }
-    builders { name: "analyzer-use-cfe-linux" }
-    builders { name: "analyzer-use-cfe-win" mixins: "win" }
     builders { name: "analyzer-use-fasta-parser-linux" }
     builders { name: "analyzer-win-release" mixins: "win" }
     builders { name: "androidvm-linux-release-x64" mixins: "android" }
@@ -287,9 +284,6 @@ buckets {
     builders { name: "analyzer-analysis-server-linux-dev" }
     builders { name: "analyzer-linux-release-dev" }
     builders { name: "analyzer-mac-release-dev" mixins: "mac" }
-    builders { name: "analyzer-use-cfe-mac-dev" mixins: "mac" }
-    builders { name: "analyzer-use-cfe-linux-dev" }
-    builders { name: "analyzer-use-cfe-win-dev" mixins: "win" }
     builders { name: "analyzer-use-fasta-parser-linux-dev" }
     builders { name: "analyzer-win-release-dev" mixins: "win" }
     builders { name: "androidvm-linux-release-x64-dev" mixins: "android" }
@@ -394,9 +388,6 @@ buckets {
     builders { name: "analyzer-analysis-server-linux-stable" }
     builders { name: "analyzer-linux-release-stable" }
     builders { name: "analyzer-mac-release-stable" mixins: "mac" }
-    builders { name: "analyzer-use-cfe-mac-stable" mixins: "mac" }
-    builders { name: "analyzer-use-cfe-linux-stable" }
-    builders { name: "analyzer-use-cfe-win-stable" mixins: "win" }
     builders { name: "analyzer-use-fasta-parser-linux-stable" }
     builders { name: "analyzer-win-release-stable" mixins: "win" }
     builders { name: "androidvm-linux-release-x64-stable" mixins: "android" }
@@ -535,9 +526,6 @@ buckets {
     builders { name: "analyzer-analysis-server-linux-try" }
     builders { name: "analyzer-linux-release-try" }
     builders { name: "analyzer-mac-release-try" mixins: "mac" }
-    builders { name: "analyzer-use-cfe-mac-try" mixins: "mac" }
-    builders { name: "analyzer-use-cfe-linux-try" }
-    builders { name: "analyzer-use-cfe-win-try" mixins: "win" }
     builders { name: "analyzer-use-fasta-parser-linux-try" }
     builders { name: "analyzer-win-release-try" mixins: "win" }
     builders { name: "app-kernel-linux-debug-x64-try" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 0250370ed0c0..b0e603b35622 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -390,21 +390,6 @@ consoles: {
     category: "analyzer"
     short_name: "as"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-linux"
-    category: "analyzer|cfe"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-mac"
-    category: "analyzer|cfe"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-win"
-    category: "analyzer|cfe"
-    short_name: "w"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-fasta-parser-linux"
     category: "analyzer"
@@ -640,21 +625,6 @@ consoles: {
     category: "analyzer"
     short_name: "as"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-linux"
-    category: "analyzer|cfe"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-mac"
-    category: "analyzer|cfe"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-win"
-    category: "analyzer|cfe"
-    short_name: "w"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-fasta-parser-linux"
     category: "analyzer"
@@ -1530,21 +1500,6 @@ consoles: {
     category: "analyzer"
     short_name: "as"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-linux"
-    category: "analyzer|cfe"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-mac"
-    category: "analyzer|cfe"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-win"
-    category: "analyzer|cfe"
-    short_name: "w"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-fasta-parser-linux"
     category: "analyzer"
@@ -2019,21 +1974,6 @@ consoles: {
     category: "analyzer"
     short_name: "as"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-linux-dev"
-    category: "analyzer|cfe"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-mac-dev"
-    category: "analyzer|cfe"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-win-dev"
-    category: "analyzer|cfe"
-    short_name: "w"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-fasta-parser-linux-dev"
     category: "analyzer"
@@ -2518,21 +2458,6 @@ consoles: {
     category: "analyzer"
     short_name: "as"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-linux-stable"
-    category: "analyzer|cfe"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-mac-stable"
-    category: "analyzer|cfe"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-cfe-win-stable"
-    category: "analyzer|cfe"
-    short_name: "w"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-fasta-parser-linux-stable"
     category: "analyzer"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 51344e6957ac..c4f102781dd6 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -24,9 +24,6 @@ trigger {
   triggers: "analyzer-analysis-server-linux"
   triggers: "analyzer-linux-release"
   triggers: "analyzer-mac-release"
-  triggers: "analyzer-use-cfe-linux"
-  triggers: "analyzer-use-cfe-mac"
-  triggers: "analyzer-use-cfe-win"
   triggers: "analyzer-use-fasta-parser-linux"
   triggers: "analyzer-win-release"
   triggers: "app-kernel-linux-debug-x64"
@@ -89,9 +86,6 @@ trigger {
   triggers: "analyzer-analysis-server-linux-dev"
   triggers: "analyzer-linux-release-dev"
   triggers: "analyzer-mac-release-dev"
-  triggers: "analyzer-use-cfe-linux-dev"
-  triggers: "analyzer-use-cfe-mac-dev"
-  triggers: "analyzer-use-cfe-win-dev"
   triggers: "analyzer-use-fasta-parser-linux-dev"
   triggers: "analyzer-win-release-dev"
   triggers: "app-kernel-linux-debug-x64-dev"
@@ -152,9 +146,6 @@ trigger {
   triggers: "analyzer-analysis-server-linux-stable"
   triggers: "analyzer-linux-release-stable"
   triggers: "analyzer-mac-release-stable"
-  triggers: "analyzer-use-cfe-linux-stable"
-  triggers: "analyzer-use-cfe-mac-stable"
-  triggers: "analyzer-use-cfe-win-stable"
   triggers: "analyzer-use-fasta-parser-linux-stable"
   triggers: "analyzer-win-release-stable"
   triggers: "app-kernel-linux-debug-x64-stable"
@@ -238,39 +229,6 @@ job {
   }
 }
 
-job {
-  id: "analyzer-use-cfe-linux"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-use-cfe-linux"
-  }
-}
-
-job {
-  id: "analyzer-use-cfe-mac"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-use-cfe-mac"
-  }
-}
-
-job {
-  id: "analyzer-use-cfe-win"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-use-cfe-win"
-  }
-}
-
 job {
   id: "analyzer-use-fasta-parser-linux"
   acl_sets: "default"
@@ -857,39 +815,6 @@ job {
   }
 }
 
-job {
-  id: "analyzer-use-cfe-linux-dev"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-use-cfe-linux-dev"
-  }
-}
-
-job {
-  id: "analyzer-use-cfe-mac-dev"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-use-cfe-mac-dev"
-  }
-}
-
-job {
-  id: "analyzer-use-cfe-win-dev"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-use-cfe-win-dev"
-  }
-}
-
 job {
   id: "analyzer-use-fasta-parser-linux-dev"
   acl_sets: "default"
@@ -1454,39 +1379,6 @@ job {
   }
 }
 
-job {
-  id: "analyzer-use-cfe-linux-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-use-cfe-linux-stable"
-  }
-}
-
-job {
-  id: "analyzer-use-cfe-mac-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-use-cfe-mac-stable"
-  }
-}
-
-job {
-  id: "analyzer-use-cfe-win-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-use-cfe-win-stable"
-  }
-}
-
 job {
   id: "analyzer-use-fasta-parser-linux-stable"
   acl_sets: "default"

From 4609b43ff2edd86e9f92c65b8af3416773a57029 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Sun, 2 Sep 2018 19:35:11 +0000
Subject: [PATCH 171/826] [infra] Add dartkp-obfuscate builder to buildbucket
 (#32229)

TBR=whesse@google.com

Change-Id: I910693fd078f4a6d255934c7ea870a80f311d140
Reviewed-on: https://dart-review.googlesource.com/72620
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 417ada202ef8..b06e9b3355e7 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -237,6 +237,7 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-debug-x64" mixins: "slow" }
+    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-product-x64" }
     builders { name: "vm-kernel-precomp-linux-release-simarm" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64" }
@@ -341,6 +342,7 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-dev" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-dev" mixins: "slow" }
+    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-product-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-dev" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-dev" }
@@ -445,6 +447,7 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-stable" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-stable" mixins: "slow" }
+    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-product-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-stable" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-stable" }
@@ -572,6 +575,7 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-try" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-try" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-try" mixins: "slow" }
+    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64-try" }
     builders { name: "vm-kernel-precomp-linux-product-x64-try" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-try" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-try" }

From f0559b7c71491f25011dabadea681a9507d8165c Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 3 Sep 2018 08:04:56 +0000
Subject: [PATCH 172/826] [infra] Add dartkp-obfuscate builder to FYI console
 (#32229)

Change-Id: I086e858640000de4850220d18f19e5af8f702ad0
Reviewed-on: https://dart-review.googlesource.com/72640
Reviewed-by: Martin Kustermann <kustermann@google.com>
---
 cr-buildbucket.cfg |  8 ++++----
 luci-milo.cfg      |  5 +++++
 luci-scheduler.cfg | 12 ++++++++++++
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index b06e9b3355e7..7bc82eda1b36 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -237,12 +237,12 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-debug-x64" mixins: "slow" }
-    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-product-x64" }
     builders { name: "vm-kernel-precomp-linux-release-simarm" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64" }
     builders { name: "vm-kernel-precomp-linux-release-x64" }
     builders { name: "vm-kernel-precomp-mac-release-simarm64" mixins: "mac" }
+    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64" }
     builders { name: "vm-kernel-precomp-win-release-simarm64" mixins: "win" }
     builders { name: "vm-kernel-precomp-win-release-x64" mixins: "win" }
     builders { name: "vm-kernel-reload-linux-debug-x64" }
@@ -342,12 +342,12 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-dev" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-dev" mixins: "slow" }
-    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-product-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-dev" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-dev" }
     builders { name: "vm-kernel-precomp-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-mac-release-simarm64-dev" mixins: "mac" }
+    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-win-release-simarm64-dev" mixins: "win" }
     builders { name: "vm-kernel-precomp-win-release-x64-dev" mixins: "win" }
     builders { name: "vm-kernel-reload-linux-debug-x64-dev" }
@@ -447,12 +447,12 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-stable" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-stable" mixins: "slow" }
-    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-product-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-stable" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-stable" }
     builders { name: "vm-kernel-precomp-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-mac-release-simarm64-stable" mixins: "mac" }
+    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-win-release-simarm64-stable" mixins: "win" }
     builders { name: "vm-kernel-precomp-win-release-x64-stable" mixins: "win" }
     builders { name: "vm-kernel-reload-linux-debug-x64-stable" }
@@ -575,12 +575,12 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-try" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-try" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-try" mixins: "slow" }
-    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64-try" }
     builders { name: "vm-kernel-precomp-linux-product-x64-try" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-try" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-try" }
     builders { name: "vm-kernel-precomp-linux-release-x64-try" }
     builders { name: "vm-kernel-precomp-mac-release-simarm64-try" mixins: "mac" }
+    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64-try" }
     builders { name: "vm-kernel-precomp-win-release-simarm64-try" mixins: "win" }
     builders { name: "vm-kernel-precomp-win-release-x64-try" mixins: "win" }
     builders { name: "vm-kernel-reload-linux-debug-x64-try" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index b0e603b35622..ab0ddbc6b7ad 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2640,6 +2640,11 @@ consoles: {
     category: "vm|dartkb"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "o"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-debug-ia32-none"
     category: "dart2js"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index c4f102781dd6..70c181066000 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -67,6 +67,7 @@ trigger {
   triggers: "vm-kernel-precomp-linux-release-simarm64"
   triggers: "vm-kernel-precomp-linux-release-x64"
   triggers: "vm-kernel-precomp-mac-release-simarm64"
+  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64"
   triggers: "vm-kernel-precomp-win-release-simarm64"
   triggers: "vm-kernel-precomp-win-release-x64"
   triggers: "vm-kernel-reload-linux-debug-x64"
@@ -705,6 +706,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-precomp-obfuscate-linux-release-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-obfuscate-linux-release-x64"
+  }
+}
+
 job {
   id: "vm-kernel-precomp-win-release-simarm64"
   acl_sets: "default"

From 84610be65c8917b09b4ce9ca43134802fd97d453 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 5 Sep 2018 16:13:35 +0000
Subject: [PATCH 173/826] [infra] Add dartk-checked builder to Luci config

Change-Id: I23985f76e93b6a40cb2aca020d17e1d70fc11555
Reviewed-on: https://dart-review.googlesource.com/73201
Reviewed-by: Martin Kustermann <kustermann@google.com>
---
 cr-buildbucket.cfg |  4 ++++
 luci-milo.cfg      | 25 +++++++++++++++++++++++++
 luci-scheduler.cfg | 36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 7bc82eda1b36..e70ce20e5533 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -227,6 +227,7 @@ buckets {
     builders { name: "vm-asan-linux-release-x64" }
     builders { name: "vm-dartkb-linux-debug-x64" mixins: "fyi" }
     builders { name: "vm-dartkb-linux-release-x64" mixins: "fyi" }
+    builders { name: "vm-kernel-checked-linux-release-x64" }
     builders { name: "vm-kernel-linux-debug-simdbc64" }
     builders { name: "vm-kernel-linux-debug-x64" }
     builders { name: "vm-kernel-linux-release-simarm" }
@@ -332,6 +333,7 @@ buckets {
     builders { name: "vm-asan-linux-release-x64-dev" }
     builders { name: "vm-dartkb-linux-debug-x64-dev" mixins: "fyi" }
     builders { name: "vm-dartkb-linux-release-x64-dev" mixins: "fyi" }
+    builders { name: "vm-kernel-checked-linux-release-x64-dev" }
     builders { name: "vm-kernel-linux-debug-simdbc64-dev" }
     builders { name: "vm-kernel-linux-debug-x64-dev" }
     builders { name: "vm-kernel-linux-release-simarm-dev" }
@@ -437,6 +439,7 @@ buckets {
     builders { name: "vm-asan-linux-release-x64-stable" }
     builders { name: "vm-dartkb-linux-debug-x64-stable" mixins: "fyi" }
     builders { name: "vm-dartkb-linux-release-x64-stable" mixins: "fyi" }
+    builders { name: "vm-kernel-checked-linux-release-x64-stable" }
     builders { name: "vm-kernel-linux-debug-simdbc64-stable" }
     builders { name: "vm-kernel-linux-debug-x64-stable" }
     builders { name: "vm-kernel-linux-release-simarm-stable" }
@@ -566,6 +569,7 @@ buckets {
     builders { name: "vm-canary-linux-debug-try" }
     builders { name: "vm-dartkb-linux-debug-x64-try" }
     builders { name: "vm-dartkb-linux-release-x64-try" }
+    builders { name: "vm-kernel-checked-linux-release-x64-try" }
     builders { name: "vm-kernel-linux-debug-simdbc64-try" }
     builders { name: "vm-kernel-linux-debug-x64-try" }
     builders { name: "vm-kernel-linux-release-simarm-try" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index ab0ddbc6b7ad..b61f6e71a76e 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -186,6 +186,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "rc"
+  }
   builders {
     # migrating to vm-kernel-mac-debug-x64
     name: "buildbot/client.dart/vm-kernel-mac-debug-x64-be"
@@ -944,6 +949,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "rc"
+  }
   builders {
     # migrating to vm-kernel-mac-debug-x64
     name: "buildbot/client.dart/vm-kernel-mac-debug-x64-be"
@@ -1330,6 +1340,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "rc"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
     category: "vm|kernel"
@@ -1804,6 +1819,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-dev"
+    category: "vm|kernel"
+    short_name: "rc"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-dev"
     category: "vm|kernel"
@@ -2288,6 +2308,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-stable"
+    category: "vm|kernel"
+    short_name: "rc"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-stable"
     category: "vm|kernel"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 70c181066000..43e332a7a29d 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -54,6 +54,7 @@ trigger {
   triggers: "pkg-win-release"
   triggers: "vm-dartkb-linux-debug-x64"
   triggers: "vm-dartkb-linux-release-x64"
+  triggers: "vm-kernel-checked-linux-release-x64"
   triggers: "vm-kernel-linux-debug-simdbc64"
   triggers: "vm-kernel-linux-debug-x64"
   triggers: "vm-kernel-linux-release-simarm"
@@ -115,6 +116,7 @@ trigger {
   triggers: "pkg-linux-release-dev"
   triggers: "pkg-mac-release-dev"
   triggers: "pkg-win-release-dev"
+  triggers: "vm-kernel-checked-linux-release-x64-dev"
   triggers: "vm-kernel-linux-debug-simdbc64-dev"
   triggers: "vm-kernel-linux-debug-x64-dev"
   triggers: "vm-kernel-linux-release-simarm-dev"
@@ -175,6 +177,7 @@ trigger {
   triggers: "pkg-linux-release-stable"
   triggers: "pkg-mac-release-stable"
   triggers: "pkg-win-release-stable"
+  triggers: "vm-kernel-checked-linux-release-x64-stable"
   triggers: "vm-kernel-linux-debug-simdbc64-stable"
   triggers: "vm-kernel-linux-debug-x64-stable"
   triggers: "vm-kernel-linux-release-simarm-stable"
@@ -563,6 +566,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-checked-linux-release-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-checked-linux-release-x64"
+  }
+}
+
 job {
   id: "vm-kernel-linux-debug-simdbc64"
   acl_sets: "default"
@@ -1138,6 +1152,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-checked-linux-release-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-checked-linux-release-x64-dev"
+  }
+}
+
 job {
   id: "vm-kernel-linux-debug-simdbc64-dev"
   acl_sets: "default"
@@ -1702,6 +1727,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-checked-linux-release-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-checked-linux-release-x64-stable"
+  }
+}
+
 job {
   id: "vm-kernel-linux-debug-simdbc64-stable"
   acl_sets: "default"

From 519c7a0481806957121571d9a9b5becd21557862 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 6 Sep 2018 12:44:13 +0000
Subject: [PATCH 174/826] [infra] Update FYI console link to point to Milo

Change-Id: Ifc170e1e39e4b388183f5f28e9cfd45dcd07158e
Reviewed-on: https://dart-review.googlesource.com/73440
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-milo.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index b61f6e71a76e..763c1c950bf9 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -573,7 +573,7 @@ consoles: {
       }
       links: {
         text: "FYI console"
-        url: "https://build.chromium.org/p/client.dart.fyi/console"
+        url: "/p/dart/g/fyi/console"
         alt: "SDK FYI Console"
       }
       links: {
@@ -1158,7 +1158,7 @@ consoles: {
       }
       links: {
         text: "FYI console"
-        url: "https://build.chromium.org/p/client.dart.fyi/console"
+        url: "/p/dart/g/fyi/console"
         alt: "SDK FYI Console"
       }
       links: {

From 9ebda33daecdd9d05a46fb682c683e54fe421bd4 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 19 Sep 2018 13:39:03 +0000
Subject: [PATCH 175/826] [infra] Create config for luci-notify to replace
 Gatekeeper

For now, only dart-engprod@ is notified.

Change-Id: I346e77de53f011cb5101846f4b164ff490100648
Reviewed-on: https://dart-review.googlesource.com/75460
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-notify.cfg                              | 528 +++++++++++++++++++
 luci-notify/email-templates/common.template  |  23 +
 luci-notify/email-templates/default.template |  20 +
 3 files changed, 571 insertions(+)
 create mode 100644 luci-notify.cfg
 create mode 100644 luci-notify/email-templates/common.template
 create mode 100644 luci-notify/email-templates/default.template

diff --git a/luci-notify.cfg b/luci-notify.cfg
new file mode 100644
index 000000000000..cb84d50de534
--- /dev/null
+++ b/luci-notify.cfg
@@ -0,0 +1,528 @@
+# Copyright 2018 The Fuchsia Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+# Defines notifiers on luci-notify.appspot.com.
+# See schema at
+# https://chromium.googlesource.com/infra/luci/luci-go/+/master/luci_notify/api/config/notify.proto
+# Please keep this list sorted by name.
+# on_change  = Whenever the build status changes.
+# on_success = On every build success.
+# on_failure = On every build failure.
+notifiers {
+    name: "dart"
+    notifications {
+        on_change: true
+        on_success: false
+        on_failure: false
+        email {
+            recipients: "dart-engprod@google.com"
+        }
+    }
+
+    # CI Builders for the master branch
+    builders {
+        name: "analyzer-analysis-server-linux"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "analyzer-linux-release"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "analyzer-mac-release"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "analyzer-use-fasta-parser-linux"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "analyzer-win-release"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "androidvm-linux-release-x64" mixins: "android"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "app-kernel-linux-debug-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "app-kernel-linux-product-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "app-kernel-linux-release-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "app-linux-debug-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "app-linux-product-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "app-linux-release-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "cross-vm-linux-release-arm64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "dart2js-csp-minified-linux-x64-chrome"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "dart2js-minified-strong-linux-x64-d8"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "dart2js-strong-faststartup-linux-x64-chrome"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "dart2js-strong-faststartup-linux-x64-firefox"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "dart2js-strong-faststartup-mac-x64-chrome"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "dart2js-strong-faststartup-mac-x64-safari"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "dart2js-strong-faststartup-win-x64-chrome"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "dart2js-strong-faststartup-win-x64-edge"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "dart2js-strong-faststartup-win-x64-firefox"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "dart2js-strong-faststartup-win-x64-ie11"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "dart2js-strong-hostasserts-linux-ia32-d8"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "dart2js-strong-linux-x64-chrome"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "dart2js-strong-linux-x64-firefox"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "dart2js-strong-mac-x64-chrome"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "dart2js-strong-mac-x64-safari"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "dart2js-strong-win-x64-chrome"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "dart2js-strong-win-x64-edge"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "dart2js-strong-win-x64-firefox"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "dart2js-strong-win-x64-ie11"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "dart2js-unit-linux-x64-release"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "ddc-linux-release-chrome"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "ddc-mac-release-chrome"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "ddc-win-release-chrome"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "front-end-linux-release-x64" mixins: "clobber"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "front-end-mac-release-x64" mixins: "clobber"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "front-end-win-release-x64" mixins: "clobber"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "pkg-linux-release"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "pkg-mac-release"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "pkg-win-release"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "pub-linux-release"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "pub-mac-release"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "pub-win-release"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "target-vm-linux-release-arm64" dimensions: "cpu:arm64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "versionchecker-linux"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-asan-linux-release-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-kernel-checked-linux-release-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-kernel-linux-debug-simdbc64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-kernel-linux-debug-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-kernel-linux-release-simarm"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-kernel-linux-release-simarm64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-kernel-linux-release-simdbc64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-kernel-linux-release-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-kernel-mac-debug-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-kernel-mac-release-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-kernel-optcounter-threshold-linux-release-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-kernel-precomp-linux-debug-x64" mixins: "slow"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-kernel-precomp-linux-product-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-kernel-precomp-linux-release-simarm"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-kernel-precomp-linux-release-simarm64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-kernel-precomp-linux-release-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-kernel-precomp-mac-release-simarm64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-kernel-precomp-win-release-simarm64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-kernel-precomp-win-release-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-kernel-reload-linux-debug-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-kernel-reload-linux-release-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-kernel-reload-mac-debug-simdbc64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-kernel-reload-mac-release-simdbc64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-kernel-reload-rollback-linux-debug-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-kernel-reload-rollback-linux-release-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-kernel-win-release-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-linux-debug-ia32"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-linux-debug-simarm"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-linux-debug-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-linux-product-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-linux-release-ia32"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-linux-release-simarm"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-linux-release-simarm64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-linux-release-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-mac-debug-ia32"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-mac-debug-simdbc64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-mac-debug-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-mac-product-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-mac-release-ia32"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-mac-release-simdbc64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-mac-release-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-optcounter-threshold-linux-release-ia32"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-optcounter-threshold-linux-release-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-reload-linux-debug-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-reload-linux-release-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-reload-mac-debug-simdbc64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-reload-mac-release-simdbc64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-reload-rollback-linux-debug-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-reload-rollback-linux-release-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-win-debug-ia32"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-win-debug-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-win-product-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-win-release-ia32"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-win-release-x64"
+        bucket: "luci.dart.ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+}
diff --git a/luci-notify/email-templates/common.template b/luci-notify/email-templates/common.template
new file mode 100644
index 000000000000..b62ca383eee5
--- /dev/null
+++ b/luci-notify/email-templates/common.template
@@ -0,0 +1,23 @@
+This file contains useful common templates for email notifications.
+{{- define "status_to_color" -}}
+{{- if eq . 12 }} {{/* SUCCESS */}}
+#049300
+{{- else if eq . 20 -}} {{/* FAILURE */}}
+#b50000
+{{- else if eq . 36 -}} {{/* INFRA FAILURE */}}
+#850093
+{{- else if eq . 68 -}} {{/* CANCELED */}}
+#c400aa
+{{- else -}}
+#000000
+{{- end -}}
+{{- end -}}
+{{ define "builder_link" -}}
+<a href="https://ci.chromium.org/b/{{ .Build.Id }}">{{.Build.Builder.Builder}}</a>
+{{- end -}}
+{{ define "summary" -}}
+{{- template "builder_link" -}}:
+<span style="color: #ffffff; background-color: {{- template "status_to_color" .Build.Status -}}; font-weight: bold">
+{{ .Build.Status -}}
+</span>
+{{ end -}}
diff --git a/luci-notify/email-templates/default.template b/luci-notify/email-templates/default.template
new file mode 100644
index 000000000000..61b39b201b06
--- /dev/null
+++ b/luci-notify/email-templates/default.template
@@ -0,0 +1,20 @@
+Dart build {{ .Build.Status }} on {{.Build.Builder.Builder}}
+{{ template "summary" . }}
+{{/* If the build is a failure, show failed steps. */}}
+{{ if ne .Build.Status 12 -}}
+<br />
+Failed Steps:
+<ul>
+{{ range $step := .Build.Steps -}}
+{{ if ne $step.Status 12 -}}
+<li>{{ $step.Name }}</li>
+<ul>
+  {{ range $log := .Logs -}}
+  <li><a href="{{ $log.ViewUrl }}">{{ $log.Name }}</a></li>
+  {{ end -}}
+</ul>
+{{ end -}}
+{{ end -}}
+</ul>
+<br />
+{{ end -}}

From eb65ef307a79532c3f45dc81328caaea92c5bb50 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 19 Sep 2018 16:05:40 +0000
Subject: [PATCH 176/826] [infra] Fix issues in luci-notify.cfg

* Remove leftovers from cr-buildbucket.cfg.
* Fix license header.
* Send emails to athom@ instead of to a non-public group.

TBR=whesse@google.com

Change-Id: I08551abdf22ed5554f28e64f7fa5450eb41b4a47
Reviewed-on: https://dart-review.googlesource.com/75520
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-notify.cfg | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/luci-notify.cfg b/luci-notify.cfg
index cb84d50de534..c0ef16ce1627 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -1,6 +1,6 @@
-# Copyright 2018 The Fuchsia Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
+# Copyright (c) 2018, the Dart project authors. Please see the AUTHORS file
+# for details. All rights reserved. Use of this source code is governed by a
+# BSD-style license that can be found in the LICENSE file.
 # Defines notifiers on luci-notify.appspot.com.
 # See schema at
 # https://chromium.googlesource.com/infra/luci/luci-go/+/master/luci_notify/api/config/notify.proto
@@ -15,7 +15,7 @@ notifiers {
         on_success: false
         on_failure: false
         email {
-            recipients: "dart-engprod@google.com"
+            recipients: "athom@google.com"
         }
     }
 
@@ -46,7 +46,7 @@ notifiers {
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
-        name: "androidvm-linux-release-x64" mixins: "android"
+        name: "androidvm-linux-release-x64"
         bucket: "luci.dart.ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
@@ -201,17 +201,17 @@ notifiers {
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
-        name: "front-end-linux-release-x64" mixins: "clobber"
+        name: "front-end-linux-release-x64"
         bucket: "luci.dart.ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
-        name: "front-end-mac-release-x64" mixins: "clobber"
+        name: "front-end-mac-release-x64"
         bucket: "luci.dart.ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
-        name: "front-end-win-release-x64" mixins: "clobber"
+        name: "front-end-win-release-x64"
         bucket: "luci.dart.ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
@@ -246,7 +246,7 @@ notifiers {
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
-        name: "target-vm-linux-release-arm64" dimensions: "cpu:arm64"
+        name: "target-vm-linux-release-arm64"
         bucket: "luci.dart.ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
@@ -311,7 +311,7 @@ notifiers {
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
-        name: "vm-kernel-precomp-linux-debug-x64" mixins: "slow"
+        name: "vm-kernel-precomp-linux-debug-x64"
         bucket: "luci.dart.ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }

From d8240509299b36963c9c11edf730b9c19b76e33c Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 20 Sep 2018 19:29:41 +0000
Subject: [PATCH 177/826] [infra] Fix bucket names in luci-notify.cfg

luci-notify follows another convention for bucket names, and doesn't
handle the luci.dart prefix.

TBR=whesse@google.com

Bug: 887219
Change-Id: Ie0cafdc92c88d428db4f29c1c665c13d7be7906c
Reviewed-on: https://dart-review.googlesource.com/75742
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-notify.cfg | 202 ++++++++++++++++++++++++------------------------
 1 file changed, 101 insertions(+), 101 deletions(-)

diff --git a/luci-notify.cfg b/luci-notify.cfg
index c0ef16ce1627..672503d7e9c0 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -22,507 +22,507 @@ notifiers {
     # CI Builders for the master branch
     builders {
         name: "analyzer-analysis-server-linux"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "analyzer-linux-release"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "analyzer-mac-release"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "analyzer-use-fasta-parser-linux"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "analyzer-win-release"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "androidvm-linux-release-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "app-kernel-linux-debug-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "app-kernel-linux-product-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "app-kernel-linux-release-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "app-linux-debug-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "app-linux-product-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "app-linux-release-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "cross-vm-linux-release-arm64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-csp-minified-linux-x64-chrome"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-minified-strong-linux-x64-d8"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-strong-faststartup-linux-x64-chrome"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-strong-faststartup-linux-x64-firefox"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-strong-faststartup-mac-x64-chrome"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-strong-faststartup-mac-x64-safari"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-strong-faststartup-win-x64-chrome"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-strong-faststartup-win-x64-edge"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-strong-faststartup-win-x64-firefox"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-strong-faststartup-win-x64-ie11"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-strong-hostasserts-linux-ia32-d8"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-strong-linux-x64-chrome"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-strong-linux-x64-firefox"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-strong-mac-x64-chrome"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-strong-mac-x64-safari"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-strong-win-x64-chrome"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-strong-win-x64-edge"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-strong-win-x64-firefox"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-strong-win-x64-ie11"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-unit-linux-x64-release"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "ddc-linux-release-chrome"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "ddc-mac-release-chrome"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "ddc-win-release-chrome"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "front-end-linux-release-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "front-end-mac-release-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "front-end-win-release-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "pkg-linux-release"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "pkg-mac-release"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "pkg-win-release"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "pub-linux-release"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "pub-mac-release"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "pub-win-release"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "target-vm-linux-release-arm64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "versionchecker-linux"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-asan-linux-release-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-checked-linux-release-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-linux-debug-simdbc64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-linux-debug-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-linux-release-simarm"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-linux-release-simarm64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-linux-release-simdbc64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-linux-release-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-mac-debug-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-mac-release-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-optcounter-threshold-linux-release-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-precomp-linux-debug-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-precomp-linux-product-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-precomp-linux-release-simarm"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-precomp-linux-release-simarm64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-precomp-linux-release-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-precomp-mac-release-simarm64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-precomp-win-release-simarm64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-precomp-win-release-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-reload-linux-debug-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-reload-linux-release-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-reload-mac-debug-simdbc64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-reload-mac-release-simdbc64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-reload-rollback-linux-debug-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-reload-rollback-linux-release-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-win-release-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-linux-debug-ia32"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-linux-debug-simarm"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-linux-debug-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-linux-product-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-linux-release-ia32"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-linux-release-simarm"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-linux-release-simarm64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-linux-release-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-mac-debug-ia32"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-mac-debug-simdbc64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-mac-debug-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-mac-product-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-mac-release-ia32"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-mac-release-simdbc64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-mac-release-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-optcounter-threshold-linux-release-ia32"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-optcounter-threshold-linux-release-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-reload-linux-debug-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-reload-linux-release-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-reload-mac-debug-simdbc64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-reload-mac-release-simdbc64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-reload-rollback-linux-debug-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-reload-rollback-linux-release-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-win-debug-ia32"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-win-debug-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-win-product-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-win-release-ia32"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-win-release-x64"
-        bucket: "luci.dart.ci.sandbox"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
 }

From 2fc250c5b3067cc268308ef685f48b1804b9abad Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 25 Sep 2018 11:00:17 +0000
Subject: [PATCH 178/826] [infra] Remove Dart 1 app-* builders from Luci config

Change-Id: If65cc79b35fb26eb3f03ad7cc21813ffcdb101b8
Reviewed-on: https://dart-review.googlesource.com/69680
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg |  9 ------
 luci-milo.cfg      | 81 ----------------------------------------------
 2 files changed, 90 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index e70ce20e5533..89d54dd1a5f6 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -186,9 +186,6 @@ buckets {
     builders { name: "app-kernel-linux-debug-x64" }
     builders { name: "app-kernel-linux-product-x64" }
     builders { name: "app-kernel-linux-release-x64" }
-    builders { name: "app-linux-debug-x64" }
-    builders { name: "app-linux-product-x64" }
-    builders { name: "app-linux-release-x64" }
     builders { name: "cross-vm-linux-release-arm64" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome" }
     builders { name: "dart2js-minified-strong-linux-x64-d8" }
@@ -292,9 +289,6 @@ buckets {
     builders { name: "app-kernel-linux-debug-x64-dev" }
     builders { name: "app-kernel-linux-product-x64-dev" }
     builders { name: "app-kernel-linux-release-x64-dev" }
-    builders { name: "app-linux-debug-x64-dev" }
-    builders { name: "app-linux-product-x64-dev" }
-    builders { name: "app-linux-release-x64-dev" }
     builders { name: "cross-vm-linux-release-arm64-dev" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome-dev" }
     builders { name: "dart2js-minified-strong-linux-x64-d8-dev" }
@@ -398,9 +392,6 @@ buckets {
     builders { name: "app-kernel-linux-debug-x64-stable" }
     builders { name: "app-kernel-linux-product-x64-stable" }
     builders { name: "app-kernel-linux-release-x64-stable" }
-    builders { name: "app-linux-debug-x64-stable" }
-    builders { name: "app-linux-product-x64-stable" }
-    builders { name: "app-linux-release-x64-stable" }
     builders { name: "cross-vm-linux-release-arm64-stable" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome-stable" }
     builders { name: "dart2js-minified-strong-linux-x64-d8-stable" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 763c1c950bf9..49dbf74b5347 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -123,24 +123,6 @@ consoles: {
     category: "vm|release"
     short_name: "w64"
   }
-  builders {
-    # migrating to app-linux-debug-x64
-    name: "buildbot/client.dart/app-linux-debug-x64-be"
-    category: "vm|app"
-    short_name: "d64"
-  }
-  builders {
-    # migrating to app-linux-product-x64
-    name: "buildbot/client.dart/app-linux-product-x64-be"
-    category: "vm|app"
-    short_name: "p64"
-  }
-  builders {
-    # migrating to app-linux-release-x64
-    name: "buildbot/client.dart/app-linux-release-x64-be"
-    category: "vm|app"
-    short_name: "r64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
     category: "vm|app-kernel"
@@ -886,24 +868,6 @@ consoles: {
     category: "vm|release"
     short_name: "w64"
   }
-  builders {
-    # migrating to app-linux-debug-x64
-    name: "buildbot/client.dart/app-linux-debug-x64-be"
-    category: "vm|app"
-    short_name: "d64"
-  }
-  builders {
-    # migrating to app-linux-product-x64
-    name: "buildbot/client.dart/app-linux-product-x64-be"
-    category: "vm|app"
-    short_name: "p64"
-  }
-  builders {
-    # migrating to app-linux-release-x64
-    name: "buildbot/client.dart/app-linux-release-x64-be"
-    category: "vm|app"
-    short_name: "r64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
     category: "vm|app-kernel"
@@ -1280,21 +1244,6 @@ consoles: {
     category: "vm|release"
     short_name: "w64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-linux-debug-x64"
-    category: "vm|app"
-    short_name: "d64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-linux-product-x64"
-    category: "vm|app"
-    short_name: "p64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-linux-release-x64"
-    category: "vm|app"
-    short_name: "r64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
     category: "vm|app-kernel"
@@ -1759,21 +1708,6 @@ consoles: {
     category: "vm|release"
     short_name: "w64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-linux-debug-x64-dev"
-    category: "vm|app"
-    short_name: "d64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-linux-product-x64-dev"
-    category: "vm|app"
-    short_name: "p64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-linux-release-x64-dev"
-    category: "vm|app"
-    short_name: "r64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-dev"
     category: "vm|app-kernel"
@@ -2248,21 +2182,6 @@ consoles: {
     category: "vm|release"
     short_name: "w64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-linux-debug-x64-stable"
-    category: "vm|app"
-    short_name: "d64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-linux-product-x64-stable"
-    category: "vm|app"
-    short_name: "p64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-linux-release-x64-stable"
-    category: "vm|app"
-    short_name: "r64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-stable"
     category: "vm|app-kernel"

From aca0a37401658082a61151cb37eab3170aed43b1 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 25 Sep 2018 11:02:10 +0000
Subject: [PATCH 179/826] [infra] Add missing line breaks to luci-notify
 templates

TBR=whesse@google.com

Change-Id: If272bdb95baa1adc8178411d89b4be4f053be0ee
Reviewed-on: https://dart-review.googlesource.com/76240
Reviewed-by: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-notify/email-templates/common.template  | 1 +
 luci-notify/email-templates/default.template | 1 +
 2 files changed, 2 insertions(+)

diff --git a/luci-notify/email-templates/common.template b/luci-notify/email-templates/common.template
index b62ca383eee5..cfada25fc801 100644
--- a/luci-notify/email-templates/common.template
+++ b/luci-notify/email-templates/common.template
@@ -1,4 +1,5 @@
 This file contains useful common templates for email notifications.
+
 {{- define "status_to_color" -}}
 {{- if eq . 12 }} {{/* SUCCESS */}}
 #049300
diff --git a/luci-notify/email-templates/default.template b/luci-notify/email-templates/default.template
index 61b39b201b06..58ad9c76ef30 100644
--- a/luci-notify/email-templates/default.template
+++ b/luci-notify/email-templates/default.template
@@ -1,4 +1,5 @@
 Dart build {{ .Build.Status }} on {{.Build.Builder.Builder}}
+
 {{ template "summary" . }}
 {{/* If the build is a failure, show failed steps. */}}
 {{ if ne .Build.Status 12 -}}

From cf4c453e20f72bdac9b3ab69f527698291dc9371 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 25 Sep 2018 16:58:01 +0000
Subject: [PATCH 180/826] [infra] Fix bugs in luci-notify template

TBR=whesse@google.com

Change-Id: I594da76728a0f54c63f0ee339ee547dfefa67454
Reviewed-on: https://dart-review.googlesource.com/76460
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-notify/email-templates/common.template  | 8 ++++----
 luci-notify/email-templates/default.template | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/luci-notify/email-templates/common.template b/luci-notify/email-templates/common.template
index cfada25fc801..eee1aa13042b 100644
--- a/luci-notify/email-templates/common.template
+++ b/luci-notify/email-templates/common.template
@@ -14,11 +14,11 @@ This file contains useful common templates for email notifications.
 {{- end -}}
 {{- end -}}
 {{ define "builder_link" -}}
-<a href="https://ci.chromium.org/b/{{ .Build.Id }}">{{.Build.Builder.Builder}}</a>
+<a href="https://ci.chromium.org/b/{{ .Id }}">{{ .Builder.Builder }}#{{ .Number }}</a>
 {{- end -}}
 {{ define "summary" -}}
-{{- template "builder_link" -}}:
-<span style="color: #ffffff; background-color: {{- template "status_to_color" .Build.Status -}}; font-weight: bold">
-{{ .Build.Status -}}
+{{- template "builder_link" . -}}:
+<span style="color: #ffffff; background-color: {{- template "status_to_color" .Status -}}; font-weight: bold">
+{{- .Status -}}
 </span>
 {{ end -}}
diff --git a/luci-notify/email-templates/default.template b/luci-notify/email-templates/default.template
index 58ad9c76ef30..d69072fdeed8 100644
--- a/luci-notify/email-templates/default.template
+++ b/luci-notify/email-templates/default.template
@@ -1,6 +1,6 @@
-Dart build {{ .Build.Status }} on {{.Build.Builder.Builder}}
+Dart build {{ .Build.Status }} on {{ .Build.Builder.Builder }}
 
-{{ template "summary" . }}
+{{ template "summary" .Build }}
 {{/* If the build is a failure, show failed steps. */}}
 {{ if ne .Build.Status 12 -}}
 <br />

From 8e07ac17488fa213661a71c83503fb202bf09b5a Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 25 Sep 2018 20:13:17 +0000
Subject: [PATCH 181/826] [infra] Switch vm-product builders to Dart 2/Luci

* Dart 1 try bot is still used on the CQ and will be removed in a follow up.

TBR=whesse@google.com

Change-Id: I31f6a89ed48afc1fcbeef7e4f48f78c44e06d104
Reviewed-on: https://dart-review.googlesource.com/76540
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg |  18 ++++----
 luci-milo.cfg      |  70 +++++++++++++----------------
 luci-notify.cfg    |  30 ++++++-------
 luci-scheduler.cfg | 108 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 163 insertions(+), 63 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 89d54dd1a5f6..11d6fb35b7d1 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -227,11 +227,13 @@ buckets {
     builders { name: "vm-kernel-checked-linux-release-x64" }
     builders { name: "vm-kernel-linux-debug-simdbc64" }
     builders { name: "vm-kernel-linux-debug-x64" }
+    builders { name: "vm-kernel-linux-product-x64" }
     builders { name: "vm-kernel-linux-release-simarm" }
     builders { name: "vm-kernel-linux-release-simarm64" }
     builders { name: "vm-kernel-linux-release-simdbc64" }
     builders { name: "vm-kernel-linux-release-x64" }
     builders { name: "vm-kernel-mac-debug-x64" mixins: "mac" }
+    builders { name: "vm-kernel-mac-product-x64" mixins: "mac" }
     builders { name: "vm-kernel-mac-release-x64" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-debug-x64" mixins: "slow" }
@@ -249,11 +251,11 @@ buckets {
     builders { name: "vm-kernel-reload-mac-release-simdbc64" mixins: "mac" }
     builders { name: "vm-kernel-reload-rollback-linux-debug-x64" }
     builders { name: "vm-kernel-reload-rollback-linux-release-x64" }
+    builders { name: "vm-kernel-win-product-x64" mixins: "win" }
     builders { name: "vm-kernel-win-release-x64" mixins: "win" }
     builders { name: "vm-linux-debug-ia32" }
     builders { name: "vm-linux-debug-simarm" }
     builders { name: "vm-linux-debug-x64" }
-    builders { name: "vm-linux-product-x64" }
     builders { name: "vm-linux-release-ia32" }
     builders { name: "vm-linux-release-simarm" }
     builders { name: "vm-linux-release-simarm64" }
@@ -261,7 +263,6 @@ buckets {
     builders { name: "vm-mac-debug-ia32" mixins: "mac" }
     builders { name: "vm-mac-debug-simdbc64" mixins: "mac" }
     builders { name: "vm-mac-debug-x64" mixins: "mac" }
-    builders { name: "vm-mac-product-x64" mixins: "mac" }
     builders { name: "vm-mac-release-ia32" mixins: "mac" }
     builders { name: "vm-mac-release-simdbc64" mixins: "mac" }
     builders { name: "vm-mac-release-x64" mixins: "mac" }
@@ -275,7 +276,6 @@ buckets {
     builders { name: "vm-reload-rollback-linux-release-x64" }
     builders { name: "vm-win-debug-ia32" mixins: "win" }
     builders { name: "vm-win-debug-x64" mixins: "win" }
-    builders { name: "vm-win-product-x64" mixins: "win" }
     builders { name: "vm-win-release-ia32" mixins: "win" }
     builders { name: "vm-win-release-x64" mixins: "win" }
 
@@ -330,11 +330,13 @@ buckets {
     builders { name: "vm-kernel-checked-linux-release-x64-dev" }
     builders { name: "vm-kernel-linux-debug-simdbc64-dev" }
     builders { name: "vm-kernel-linux-debug-x64-dev" }
+    builders { name: "vm-kernel-linux-product-x64-dev" }
     builders { name: "vm-kernel-linux-release-simarm-dev" }
     builders { name: "vm-kernel-linux-release-simarm64-dev" }
     builders { name: "vm-kernel-linux-release-simdbc64-dev" }
     builders { name: "vm-kernel-linux-release-x64-dev" }
     builders { name: "vm-kernel-mac-debug-x64-dev" mixins: "mac" }
+    builders { name: "vm-kernel-mac-product-x64-dev" mixins: "mac" }
     builders { name: "vm-kernel-mac-release-x64-dev" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-dev" mixins: "slow" }
@@ -352,11 +354,11 @@ buckets {
     builders { name: "vm-kernel-reload-mac-release-simdbc64-dev" mixins: "mac" }
     builders { name: "vm-kernel-reload-rollback-linux-debug-x64-dev" }
     builders { name: "vm-kernel-reload-rollback-linux-release-x64-dev" }
+    builders { name: "vm-kernel-win-product-x64-dev" mixins: "win" }
     builders { name: "vm-kernel-win-release-x64-dev" mixins: "win" }
     builders { name: "vm-linux-debug-ia32-dev" }
     builders { name: "vm-linux-debug-simarm-dev" }
     builders { name: "vm-linux-debug-x64-dev" }
-    builders { name: "vm-linux-product-x64-dev" }
     builders { name: "vm-linux-release-ia32-dev" }
     builders { name: "vm-linux-release-simarm-dev" }
     builders { name: "vm-linux-release-simarm64-dev" }
@@ -364,7 +366,6 @@ buckets {
     builders { name: "vm-mac-debug-ia32-dev" mixins: "mac" }
     builders { name: "vm-mac-debug-simdbc64-dev" mixins: "mac" }
     builders { name: "vm-mac-debug-x64-dev" mixins: "mac" }
-    builders { name: "vm-mac-product-x64-dev" mixins: "mac" }
     builders { name: "vm-mac-release-ia32-dev" mixins: "mac" }
     builders { name: "vm-mac-release-simdbc64-dev" mixins: "mac" }
     builders { name: "vm-mac-release-x64-dev" mixins: "mac" }
@@ -378,7 +379,6 @@ buckets {
     builders { name: "vm-reload-rollback-linux-release-x64-dev" }
     builders { name: "vm-win-debug-ia32-dev" mixins: "win" }
     builders { name: "vm-win-debug-x64-dev" mixins: "win" }
-    builders { name: "vm-win-product-x64-dev" mixins: "win" }
     builders { name: "vm-win-release-ia32-dev" mixins: "win" }
     builders { name: "vm-win-release-x64-dev" mixins: "win" }
 
@@ -433,11 +433,13 @@ buckets {
     builders { name: "vm-kernel-checked-linux-release-x64-stable" }
     builders { name: "vm-kernel-linux-debug-simdbc64-stable" }
     builders { name: "vm-kernel-linux-debug-x64-stable" }
+    builders { name: "vm-kernel-linux-product-x64-stable" }
     builders { name: "vm-kernel-linux-release-simarm-stable" }
     builders { name: "vm-kernel-linux-release-simarm64-stable" }
     builders { name: "vm-kernel-linux-release-simdbc64-stable" }
     builders { name: "vm-kernel-linux-release-x64-stable" }
     builders { name: "vm-kernel-mac-debug-x64-stable" mixins: "mac" }
+    builders { name: "vm-kernel-mac-product-x64-stable" mixins: "mac" }
     builders { name: "vm-kernel-mac-release-x64-stable" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-stable" mixins: "slow" }
@@ -455,11 +457,11 @@ buckets {
     builders { name: "vm-kernel-reload-mac-release-simdbc64-stable" mixins: "mac" }
     builders { name: "vm-kernel-reload-rollback-linux-debug-x64-stable" }
     builders { name: "vm-kernel-reload-rollback-linux-release-x64-stable" }
+    builders { name: "vm-kernel-win-product-x64-stable" mixins: "win" }
     builders { name: "vm-kernel-win-release-x64-stable" mixins: "win" }
     builders { name: "vm-linux-debug-ia32-stable" }
     builders { name: "vm-linux-debug-simarm-stable" }
     builders { name: "vm-linux-debug-x64-stable" }
-    builders { name: "vm-linux-product-x64-stable" }
     builders { name: "vm-linux-release-ia32-stable" }
     builders { name: "vm-linux-release-simarm-stable" }
     builders { name: "vm-linux-release-simarm64-stable" }
@@ -467,7 +469,6 @@ buckets {
     builders { name: "vm-mac-debug-ia32-stable" mixins: "mac" }
     builders { name: "vm-mac-debug-simdbc64-stable" mixins: "mac" }
     builders { name: "vm-mac-debug-x64-stable" mixins: "mac" }
-    builders { name: "vm-mac-product-x64-stable" mixins: "mac" }
     builders { name: "vm-mac-release-ia32-stable" mixins: "mac" }
     builders { name: "vm-mac-release-simdbc64-stable" mixins: "mac" }
     builders { name: "vm-mac-release-x64-stable" mixins: "mac" }
@@ -481,7 +482,6 @@ buckets {
     builders { name: "vm-reload-rollback-linux-release-x64-stable" }
     builders { name: "vm-win-debug-ia32-stable" mixins: "win" }
     builders { name: "vm-win-debug-x64-stable" mixins: "win" }
-    builders { name: "vm-win-product-x64-stable" mixins: "win" }
     builders { name: "vm-win-release-ia32-stable" mixins: "win" }
     builders { name: "vm-win-release-x64-stable" mixins: "win" }
   }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 49dbf74b5347..646e95041b8c 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -284,22 +284,19 @@ consoles: {
     short_name: "o64"
   }
   builders {
-    # migrating to vm-linux-product-x64
-    name: "buildbot/client.dart/vm-linux-product-x64-be"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
     category: "vm|product"
-    short_name: "64"
+    short_name: "l"
   }
   builders {
-    # migrating to vm-mac-product-x64
-    name: "buildbot/client.dart/vm-mac-product-x64-be"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
     category: "vm|product"
-    short_name: "m64"
+    short_name: "m"
   }
   builders {
-    # migrating to vm-win-product-x64
-    name: "buildbot/client.dart/vm-win-product-x64-be"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
     category: "vm|product"
-    short_name: "w64"
+    short_name: "w"
   }
   builders {
     # migrating to vm-reload-linux-debug-x64
@@ -1029,22 +1026,19 @@ consoles: {
     short_name: "o64"
   }
   builders {
-    # migrating to vm-linux-product-x64
-    name: "buildbot/client.dart/vm-linux-product-x64-be"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
     category: "vm|product"
-    short_name: "64"
+    short_name: "l"
   }
   builders {
-    # migrating to vm-mac-product-x64
-    name: "buildbot/client.dart/vm-mac-product-x64-be"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
     category: "vm|product"
-    short_name: "m64"
+    short_name: "m"
   }
   builders {
-    # migrating to vm-win-product-x64
-    name: "buildbot/client.dart/vm-win-product-x64-be"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
     category: "vm|product"
-    short_name: "w64"
+    short_name: "w"
   }
   builders {
     # migrating to vm-reload-linux-debug-x64
@@ -1380,19 +1374,19 @@ consoles: {
     short_name: "o64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
     category: "vm|product"
-    short_name: "64"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
     category: "vm|product"
-    short_name: "m64"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
     category: "vm|product"
-    short_name: "w64"
+    short_name: "w"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-debug-x64"
@@ -1844,19 +1838,19 @@ consoles: {
     short_name: "o64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-product-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
     category: "vm|product"
-    short_name: "64"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-product-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
     category: "vm|product"
-    short_name: "m64"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-product-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
     category: "vm|product"
-    short_name: "w64"
+    short_name: "w"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-debug-x64-dev"
@@ -2318,19 +2312,19 @@ consoles: {
     short_name: "o64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-product-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
     category: "vm|product"
-    short_name: "64"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-product-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
     category: "vm|product"
-    short_name: "m64"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-product-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
     category: "vm|product"
-    short_name: "w64"
+    short_name: "w"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-debug-x64-stable"
@@ -2667,7 +2661,5 @@ consoles: {
   builders { name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try" }
   builders { name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simdbc64-try" }
   builders { name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try" }
-  builders { name: "buildbucket/luci.dart.try/vm-linux-product-x64-try" }
-  builders { name: "buildbucket/luci.dart.try/vm-linux-release-x64-try" }
-  builders { name: "buildbucket/luci.dart.try/vm-mac-release-x64-try" }
+  builders { name: "buildbucket/luci.dart.try/vm-kernel-linux-product-x64-try" }
 }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 672503d7e9c0..0479f3e88318 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -275,6 +275,11 @@ notifiers {
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
+    builders {
+        name: "vm-kernel-linux-product-x64"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
     builders {
         name: "vm-kernel-linux-release-simarm"
         bucket: "ci.sandbox"
@@ -300,6 +305,11 @@ notifiers {
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
+    builders {
+        name: "vm-kernel-mac-product-x64"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
     builders {
         name: "vm-kernel-mac-release-x64"
         bucket: "ci.sandbox"
@@ -381,27 +391,27 @@ notifiers {
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
-        name: "vm-kernel-win-release-x64"
+        name: "vm-kernel-win-product-x64"
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
-        name: "vm-linux-debug-ia32"
+        name: "vm-kernel-win-release-x64"
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
-        name: "vm-linux-debug-simarm"
+        name: "vm-linux-debug-ia32"
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
-        name: "vm-linux-debug-x64"
+        name: "vm-linux-debug-simarm"
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
-        name: "vm-linux-product-x64"
+        name: "vm-linux-debug-x64"
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
@@ -440,11 +450,6 @@ notifiers {
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
-    builders {
-        name: "vm-mac-product-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
     builders {
         name: "vm-mac-release-ia32"
         bucket: "ci.sandbox"
@@ -510,11 +515,6 @@ notifiers {
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
-    builders {
-        name: "vm-win-product-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
     builders {
         name: "vm-win-release-ia32"
         bucket: "ci.sandbox"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 43e332a7a29d..114ebadb996b 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -57,10 +57,12 @@ trigger {
   triggers: "vm-kernel-checked-linux-release-x64"
   triggers: "vm-kernel-linux-debug-simdbc64"
   triggers: "vm-kernel-linux-debug-x64"
+  triggers: "vm-kernel-linux-product-x64"
   triggers: "vm-kernel-linux-release-simarm"
   triggers: "vm-kernel-linux-release-simarm64"
   triggers: "vm-kernel-linux-release-simdbc64"
   triggers: "vm-kernel-linux-release-x64"
+  triggers: "vm-kernel-mac-product-x64"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
   triggers: "vm-kernel-precomp-linux-debug-x64"
   triggers: "vm-kernel-precomp-linux-product-x64"
@@ -75,6 +77,7 @@ trigger {
   triggers: "vm-kernel-reload-linux-release-x64"
   triggers: "vm-kernel-reload-rollback-linux-debug-x64"
   triggers: "vm-kernel-reload-rollback-linux-release-x64"
+  triggers: "vm-kernel-win-product-x64"
   triggers: "vm-kernel-win-release-x64"
 }
 
@@ -119,10 +122,12 @@ trigger {
   triggers: "vm-kernel-checked-linux-release-x64-dev"
   triggers: "vm-kernel-linux-debug-simdbc64-dev"
   triggers: "vm-kernel-linux-debug-x64-dev"
+  triggers: "vm-kernel-linux-product-x64-dev"
   triggers: "vm-kernel-linux-release-simarm-dev"
   triggers: "vm-kernel-linux-release-simarm64-dev"
   triggers: "vm-kernel-linux-release-simdbc64-dev"
   triggers: "vm-kernel-linux-release-x64-dev"
+  triggers: "vm-kernel-mac-product-x64-dev"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-linux-debug-x64-dev"
   triggers: "vm-kernel-precomp-linux-product-x64-dev"
@@ -136,6 +141,7 @@ trigger {
   triggers: "vm-kernel-reload-linux-release-x64-dev"
   triggers: "vm-kernel-reload-rollback-linux-debug-x64-dev"
   triggers: "vm-kernel-reload-rollback-linux-release-x64-dev"
+  triggers: "vm-kernel-win-product-x64-dev"
   triggers: "vm-kernel-win-release-x64-dev"
 }
 
@@ -180,10 +186,12 @@ trigger {
   triggers: "vm-kernel-checked-linux-release-x64-stable"
   triggers: "vm-kernel-linux-debug-simdbc64-stable"
   triggers: "vm-kernel-linux-debug-x64-stable"
+  triggers: "vm-kernel-linux-product-x64-stable"
   triggers: "vm-kernel-linux-release-simarm-stable"
   triggers: "vm-kernel-linux-release-simarm64-stable"
   triggers: "vm-kernel-linux-release-simdbc64-stable"
   triggers: "vm-kernel-linux-release-x64-stable"
+  triggers: "vm-kernel-mac-product-x64-stable"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-linux-debug-x64-stable"
   triggers: "vm-kernel-precomp-linux-product-x64-stable"
@@ -197,6 +205,7 @@ trigger {
   triggers: "vm-kernel-reload-linux-release-x64-stable"
   triggers: "vm-kernel-reload-rollback-linux-debug-x64-stable"
   triggers: "vm-kernel-reload-rollback-linux-release-x64-stable"
+  triggers: "vm-kernel-win-product-x64-dev"
   triggers: "vm-kernel-win-release-x64-stable"
 }
 
@@ -599,6 +608,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-linux-product-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-product-x64"
+  }
+}
+
 job {
   id: "vm-kernel-linux-release-simarm"
   acl_sets: "default"
@@ -643,6 +663,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-mac-product-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-product-x64"
+  }
+}
+
 job {
   id: "vm-kernel-optcounter-threshold-linux-release-x64"
   acl_sets: "default"
@@ -797,6 +828,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-win-product-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-product-x64"
+  }
+}
+
 job {
   id: "vm-kernel-win-release-x64"
   acl_sets: "default"
@@ -1185,6 +1227,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-linux-product-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-product-x64-dev"
+  }
+}
+
 job {
   id: "vm-kernel-linux-release-simarm-dev"
   acl_sets: "default"
@@ -1229,6 +1282,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-mac-product-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-product-x64-dev"
+  }
+}
+
 job {
   id: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
   acl_sets: "default"
@@ -1372,6 +1436,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-win-product-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-product-x64-dev"
+  }
+}
+
 job {
   id: "vm-kernel-win-release-x64-dev"
   acl_sets: "default"
@@ -1760,6 +1835,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-linux-product-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-product-x64-stable"
+  }
+}
+
 job {
   id: "vm-kernel-linux-release-simarm-stable"
   acl_sets: "default"
@@ -1804,6 +1890,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-mac-product-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-product-x64-stable"
+  }
+}
+
 job {
   id: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
   acl_sets: "default"
@@ -1947,6 +2044,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-win-product-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-product-x64-stable"
+  }
+}
+
 job {
   id: "vm-kernel-win-release-x64-stable"
   acl_sets: "default"

From c9f246d323793c850697abd010a944c0c10b792c Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 25 Sep 2018 20:46:51 +0000
Subject: [PATCH 182/826] [infra] Add product try builders

* Delete Dart 1 builders that have been removed from the CQ.

TBR=whesse@google.com

Change-Id: I6430ffd42788a013266c8c22547d97c607988125
Reviewed-on: https://dart-review.googlesource.com/76542
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 11d6fb35b7d1..b9074973f320 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -563,10 +563,12 @@ buckets {
     builders { name: "vm-kernel-checked-linux-release-x64-try" }
     builders { name: "vm-kernel-linux-debug-simdbc64-try" }
     builders { name: "vm-kernel-linux-debug-x64-try" }
+    builders { name: "vm-kernel-linux-product-x64-try" }
     builders { name: "vm-kernel-linux-release-simarm-try" }
     builders { name: "vm-kernel-linux-release-simarm64-try" }
     builders { name: "vm-kernel-linux-release-simdbc64-try" }
     builders { name: "vm-kernel-linux-release-x64-try" }
+    builders { name: "vm-kernel-mac-product-x64-try" mixins: "mac" }
     builders { name: "vm-kernel-mac-release-x64-try" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-try" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-try" mixins: "slow" }
@@ -584,9 +586,8 @@ buckets {
     builders { name: "vm-kernel-reload-mac-release-simdbc64-try" mixins: "mac" }
     builders { name: "vm-kernel-reload-rollback-linux-debug-x64-try" }
     builders { name: "vm-kernel-reload-rollback-linux-release-x64-try" }
+    builders { name: "vm-kernel-win-product-x64-try" mixins: "win" }
     builders { name: "vm-kernel-win-release-x64-try" mixins: "win" }
     builders { name: "vm-linux-product-x64-try" }
-    builders { name: "vm-linux-release-x64-try" }
-    builders { name: "vm-mac-release-x64-try" mixins: "mac" }
   }
 }

From 25b7e6d363014d7fcba96b6e89ccd3a1cf6d05b7 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 26 Sep 2018 07:30:28 +0000
Subject: [PATCH 183/826] [infra] Add timestamp at the end of the email

This should improve threading in email clients.

TBR=whesse@google.com

Change-Id: I103cc5c959a88ea84013417ea04505a7eaaa0912
Reviewed-on: https://dart-review.googlesource.com/76606
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-notify/email-templates/default.template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/luci-notify/email-templates/default.template b/luci-notify/email-templates/default.template
index d69072fdeed8..c33939c88c0e 100644
--- a/luci-notify/email-templates/default.template
+++ b/luci-notify/email-templates/default.template
@@ -18,4 +18,5 @@ Failed Steps:
 {{ end -}}
 </ul>
 <br />
+Completed at:{{ .Build.EndTime }}
 {{ end -}}

From f98fa592fe9d9d8ab224bf85b79aa4e80e086750 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 26 Sep 2018 08:02:54 +0000
Subject: [PATCH 184/826] [infra] Format the timestamp

TBR=whesse@google.com

Change-Id: Ibc4efcf53f813772c964e5ff0c44285a767a8411
Reviewed-on: https://dart-review.googlesource.com/76620
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-notify/email-templates/default.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/luci-notify/email-templates/default.template b/luci-notify/email-templates/default.template
index c33939c88c0e..f58b2bf94876 100644
--- a/luci-notify/email-templates/default.template
+++ b/luci-notify/email-templates/default.template
@@ -18,5 +18,5 @@ Failed Steps:
 {{ end -}}
 </ul>
 <br />
-Completed at:{{ .Build.EndTime }}
+Completed at:{{ .Build.EndTime | time }}
 {{ end -}}

From d67d4e6db099a76bd0da0a23bab6b300457f38eb Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 26 Sep 2018 08:12:55 +0000
Subject: [PATCH 185/826] [infra] Add some whitespace before timestamp

TBR=whesse@google.com

Change-Id: Ie9c144305878d268a25c0e075bcab0338ad610d8
Reviewed-on: https://dart-review.googlesource.com/76621
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-notify/email-templates/default.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/luci-notify/email-templates/default.template b/luci-notify/email-templates/default.template
index f58b2bf94876..3cc46bfcee21 100644
--- a/luci-notify/email-templates/default.template
+++ b/luci-notify/email-templates/default.template
@@ -18,5 +18,5 @@ Failed Steps:
 {{ end -}}
 </ul>
 <br />
-Completed at:{{ .Build.EndTime | time }}
+Completed at: {{ .Build.EndTime | time }}
 {{ end -}}

From 0bd2d7ea11698deecb31f86f4c2e4f72d85e284b Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 27 Sep 2018 09:30:26 +0000
Subject: [PATCH 186/826] [infra] Enable luci-notify blamelist notifications

Change-Id: I809735a198ba31bc0e3ee7c54bf0557d927460d3
Reviewed-on: https://dart-review.googlesource.com/76862
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-notify.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/luci-notify.cfg b/luci-notify.cfg
index 0479f3e88318..1574c24cfb88 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -17,6 +17,7 @@ notifiers {
         email {
             recipients: "athom@google.com"
         }
+        notify_blamelist {}
     }
 
     # CI Builders for the master branch

From e0b3a57f5a5a557038a3ddeb9c37561d943e7edd Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 27 Sep 2018 10:06:53 +0000
Subject: [PATCH 187/826] Revert "[infra] Enable luci-notify blamelist
 notifications"

This reverts commit 0bd2d7ea11698deecb31f86f4c2e4f72d85e284b.

Reason for revert: seems like GK just came back online. Reverting this to avoid duplicate notifications until GK is shutdown.

Original change's description:
> [infra] Enable luci-notify blamelist notifications
>
> Change-Id: I809735a198ba31bc0e3ee7c54bf0557d927460d3
> Reviewed-on: https://dart-review.googlesource.com/76862
> Reviewed-by: William Hesse <whesse@google.com>

TBR=whesse@google.com,athom@google.com

Change-Id: I2339914ecbc728f30e4e53251952e1917935e1c4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/76920
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 luci-notify.cfg | 1 -
 1 file changed, 1 deletion(-)

diff --git a/luci-notify.cfg b/luci-notify.cfg
index 1574c24cfb88..0479f3e88318 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -17,7 +17,6 @@ notifiers {
         email {
             recipients: "athom@google.com"
         }
-        notify_blamelist {}
     }
 
     # CI Builders for the master branch

From 8e73f8d43c18db528f24fb7c737e58a1ebd83992 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 1 Oct 2018 07:01:48 +0000
Subject: [PATCH 188/826] Reland "[infra] Enable luci-notify blamelist
 notifications"

This reverts commit e0b3a57f5a5a557038a3ddeb9c37561d943e7edd.

Reason for revert: GK is still broken, will remove GK and bet on luci-notify instead.

Original change's description:
> Revert "[infra] Enable luci-notify blamelist notifications"
>
> This reverts commit 0bd2d7ea11698deecb31f86f4c2e4f72d85e284b.
>
> Reason for revert: seems like GK just came back online. Reverting this to avoid duplicate notifications until GK is shutdown.
>
> Original change's description:
> > [infra] Enable luci-notify blamelist notifications
> >
> > Change-Id: I809735a198ba31bc0e3ee7c54bf0557d927460d3
> > Reviewed-on: https://dart-review.googlesource.com/76862
> > Reviewed-by: William Hesse <whesse@google.com>
>
> TBR=whesse@google.com,athom@google.com
>
> Change-Id: I2339914ecbc728f30e4e53251952e1917935e1c4
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://dart-review.googlesource.com/76920
> Reviewed-by: Alexander Thomas <athom@google.com>
> Commit-Queue: Alexander Thomas <athom@google.com>

TBR=whesse@google.com,athom@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: I55945d52bb8a9dc6c2bcfea425297327c2d0b51a
Reviewed-on: https://dart-review.googlesource.com/77300
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-notify.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/luci-notify.cfg b/luci-notify.cfg
index 0479f3e88318..1574c24cfb88 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -17,6 +17,7 @@ notifiers {
         email {
             recipients: "athom@google.com"
         }
+        notify_blamelist {}
     }
 
     # CI Builders for the master branch

From ee109ece6ce200f24dbc3289f729ea3a05aa637d Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 2 Oct 2018 19:58:58 +0000
Subject: [PATCH 189/826] [infra] Add fuzz testing config to Luci

TBR=whesse@google.com

Change-Id: Iea4b8e73b82b2b7ecb731c9673ec55a4077c41c1
Reviewed-on: https://dart-review.googlesource.com/c/77680
Reviewed-by: Alexander Thomas <athom@google.com>
Reviewed-by: Aart Bik <ajcbik@google.com>
---
 cr-buildbucket.cfg |  3 +++
 luci-notify.cfg    | 19 +++++++++++++++++++
 luci-scheduler.cfg | 17 +++++++++++++++++
 3 files changed, 39 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index b9074973f320..4eae78e87819 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -176,6 +176,9 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
 
+    # Fuzz testing builders
+    builders { name: "fuzz-linux" }
+
     # CI Builders for the master branch
     builders { name: "analyzer-analysis-server-linux" }
     builders { name: "analyzer-linux-release" }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 1574c24cfb88..aedb03f87c42 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -527,3 +527,22 @@ notifiers {
         repository: "https://dart.googlesource.com/sdk"
     }
 }
+
+notifiers {
+    name: "dart-fuzz-testing"
+    notifications {
+        on_change: false
+        on_success: false
+        on_failure: true
+        email {
+            recipients: "ajcbik@google.com"
+        }
+    }
+
+    # CI Builders for the master branch
+    builders {
+        name: "fuzz-linux"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+}
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 114ebadb996b..7d4777201daf 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -14,6 +14,21 @@ acl_sets {
   }
 }
 
+# Fuzz testing cron jobs
+
+job {
+  id: "fuzz-linux"
+  acl_sets: "default"
+  schedule: "0 3 * * *" # 3 AM UTC
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "fuzz-linux"
+  }
+}
+
+# CI triggers
+
 trigger {
   id: "dart-gitiles-trigger-master"
   acl_sets: "default"
@@ -209,6 +224,8 @@ trigger {
   triggers: "vm-kernel-win-release-x64-stable"
 }
 
+# CI jobs
+
 job {
   id: "analyzer-analysis-server-linux"
   acl_sets: "default"

From 7023956c6b136e3be255abfb7b19d2bd149750e7 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 4 Oct 2018 15:50:37 +0000
Subject: [PATCH 190/826] [infra] Remove/Migrate Dart 1 builders in Luci config

Change-Id: Ie87013245ee393b13c1c89332cec815f3ab564f5
Reviewed-on: https://dart-review.googlesource.com/c/78062
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 120 +++----
 luci-milo.cfg      | 840 ++++++++++++---------------------------------
 luci-notify.cfg    | 152 ++------
 luci-scheduler.cfg | 434 ++++++++++++++++++++++-
 4 files changed, 724 insertions(+), 822 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 4eae78e87819..1d53e6904fb9 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -224,20 +224,26 @@ buckets {
     builders { name: "pub-win-release" mixins: "win" }
     builders { name: "target-vm-linux-release-arm64" dimensions: "cpu:arm64" }
     builders { name: "versionchecker-linux" }
-    builders { name: "vm-asan-linux-release-x64" }
     builders { name: "vm-dartkb-linux-debug-x64" mixins: "fyi" }
     builders { name: "vm-dartkb-linux-release-x64" mixins: "fyi" }
+    builders { name: "vm-kernel-asan-linux-release-ia32" }
+    builders { name: "vm-kernel-asan-linux-release-x64" }
     builders { name: "vm-kernel-checked-linux-release-x64" }
+    builders { name: "vm-kernel-linux-debug-ia32" }
     builders { name: "vm-kernel-linux-debug-simdbc64" }
     builders { name: "vm-kernel-linux-debug-x64" }
     builders { name: "vm-kernel-linux-product-x64" }
+    builders { name: "vm-kernel-linux-release-ia32" }
     builders { name: "vm-kernel-linux-release-simarm" }
     builders { name: "vm-kernel-linux-release-simarm64" }
     builders { name: "vm-kernel-linux-release-simdbc64" }
     builders { name: "vm-kernel-linux-release-x64" }
+    builders { name: "vm-kernel-mac-debug-simdbc64" mixins: "mac" }
     builders { name: "vm-kernel-mac-debug-x64" mixins: "mac" }
     builders { name: "vm-kernel-mac-product-x64" mixins: "mac" }
+    builders { name: "vm-kernel-mac-release-simdbc64" mixins: "mac" }
     builders { name: "vm-kernel-mac-release-x64" mixins: "mac" }
+    builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-debug-x64" mixins: "slow" }
     builders { name: "vm-kernel-precomp-linux-product-x64" }
@@ -254,33 +260,11 @@ buckets {
     builders { name: "vm-kernel-reload-mac-release-simdbc64" mixins: "mac" }
     builders { name: "vm-kernel-reload-rollback-linux-debug-x64" }
     builders { name: "vm-kernel-reload-rollback-linux-release-x64" }
+    builders { name: "vm-kernel-win-debug-ia32" mixins: "win" }
+    builders { name: "vm-kernel-win-debug-x64" mixins: "win" }
     builders { name: "vm-kernel-win-product-x64" mixins: "win" }
+    builders { name: "vm-kernel-win-release-ia32" mixins: "win" }
     builders { name: "vm-kernel-win-release-x64" mixins: "win" }
-    builders { name: "vm-linux-debug-ia32" }
-    builders { name: "vm-linux-debug-simarm" }
-    builders { name: "vm-linux-debug-x64" }
-    builders { name: "vm-linux-release-ia32" }
-    builders { name: "vm-linux-release-simarm" }
-    builders { name: "vm-linux-release-simarm64" }
-    builders { name: "vm-linux-release-x64" }
-    builders { name: "vm-mac-debug-ia32" mixins: "mac" }
-    builders { name: "vm-mac-debug-simdbc64" mixins: "mac" }
-    builders { name: "vm-mac-debug-x64" mixins: "mac" }
-    builders { name: "vm-mac-release-ia32" mixins: "mac" }
-    builders { name: "vm-mac-release-simdbc64" mixins: "mac" }
-    builders { name: "vm-mac-release-x64" mixins: "mac" }
-    builders { name: "vm-optcounter-threshold-linux-release-ia32" }
-    builders { name: "vm-optcounter-threshold-linux-release-x64" }
-    builders { name: "vm-reload-linux-debug-x64" }
-    builders { name: "vm-reload-linux-release-x64" }
-    builders { name: "vm-reload-mac-debug-simdbc64" mixins: "mac" }
-    builders { name: "vm-reload-mac-release-simdbc64" mixins: "mac" }
-    builders { name: "vm-reload-rollback-linux-debug-x64" }
-    builders { name: "vm-reload-rollback-linux-release-x64" }
-    builders { name: "vm-win-debug-ia32" mixins: "win" }
-    builders { name: "vm-win-debug-x64" mixins: "win" }
-    builders { name: "vm-win-release-ia32" mixins: "win" }
-    builders { name: "vm-win-release-x64" mixins: "win" }
 
     # CI Builders for the dev branch
     builders { name: "analyzer-analysis-server-linux-dev" }
@@ -327,20 +311,26 @@ buckets {
     builders { name: "pub-win-release-dev" mixins: "win" }
     builders { name: "target-vm-linux-release-arm64-dev" dimensions: "cpu:arm64" }
     builders { name: "versionchecker-linux-dev" }
-    builders { name: "vm-asan-linux-release-x64-dev" }
     builders { name: "vm-dartkb-linux-debug-x64-dev" mixins: "fyi" }
     builders { name: "vm-dartkb-linux-release-x64-dev" mixins: "fyi" }
+    builders { name: "vm-kernel-asan-linux-release-ia32-dev" }
+    builders { name: "vm-kernel-asan-linux-release-x64-dev" }
     builders { name: "vm-kernel-checked-linux-release-x64-dev" }
+    builders { name: "vm-kernel-linux-debug-ia32-dev" }
     builders { name: "vm-kernel-linux-debug-simdbc64-dev" }
     builders { name: "vm-kernel-linux-debug-x64-dev" }
     builders { name: "vm-kernel-linux-product-x64-dev" }
+    builders { name: "vm-kernel-linux-release-ia32-dev" }
     builders { name: "vm-kernel-linux-release-simarm-dev" }
     builders { name: "vm-kernel-linux-release-simarm64-dev" }
     builders { name: "vm-kernel-linux-release-simdbc64-dev" }
     builders { name: "vm-kernel-linux-release-x64-dev" }
+    builders { name: "vm-kernel-mac-debug-simdbc64-dev" mixins: "mac" }
     builders { name: "vm-kernel-mac-debug-x64-dev" mixins: "mac" }
     builders { name: "vm-kernel-mac-product-x64-dev" mixins: "mac" }
+    builders { name: "vm-kernel-mac-release-simdbc64-dev" mixins: "mac" }
     builders { name: "vm-kernel-mac-release-x64-dev" mixins: "mac" }
+    builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-dev" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-dev" mixins: "slow" }
     builders { name: "vm-kernel-precomp-linux-product-x64-dev" }
@@ -357,33 +347,11 @@ buckets {
     builders { name: "vm-kernel-reload-mac-release-simdbc64-dev" mixins: "mac" }
     builders { name: "vm-kernel-reload-rollback-linux-debug-x64-dev" }
     builders { name: "vm-kernel-reload-rollback-linux-release-x64-dev" }
+    builders { name: "vm-kernel-win-debug-ia32-dev" mixins: "win" }
+    builders { name: "vm-kernel-win-debug-x64-dev" mixins: "win" }
     builders { name: "vm-kernel-win-product-x64-dev" mixins: "win" }
+    builders { name: "vm-kernel-win-release-ia32-dev" mixins: "win" }
     builders { name: "vm-kernel-win-release-x64-dev" mixins: "win" }
-    builders { name: "vm-linux-debug-ia32-dev" }
-    builders { name: "vm-linux-debug-simarm-dev" }
-    builders { name: "vm-linux-debug-x64-dev" }
-    builders { name: "vm-linux-release-ia32-dev" }
-    builders { name: "vm-linux-release-simarm-dev" }
-    builders { name: "vm-linux-release-simarm64-dev" }
-    builders { name: "vm-linux-release-x64-dev" }
-    builders { name: "vm-mac-debug-ia32-dev" mixins: "mac" }
-    builders { name: "vm-mac-debug-simdbc64-dev" mixins: "mac" }
-    builders { name: "vm-mac-debug-x64-dev" mixins: "mac" }
-    builders { name: "vm-mac-release-ia32-dev" mixins: "mac" }
-    builders { name: "vm-mac-release-simdbc64-dev" mixins: "mac" }
-    builders { name: "vm-mac-release-x64-dev" mixins: "mac" }
-    builders { name: "vm-optcounter-threshold-linux-release-ia32-dev" }
-    builders { name: "vm-optcounter-threshold-linux-release-x64-dev" }
-    builders { name: "vm-reload-linux-debug-x64-dev" }
-    builders { name: "vm-reload-linux-release-x64-dev" }
-    builders { name: "vm-reload-mac-debug-simdbc64-dev" mixins: "mac" }
-    builders { name: "vm-reload-mac-release-simdbc64-dev" mixins: "mac" }
-    builders { name: "vm-reload-rollback-linux-debug-x64-dev" }
-    builders { name: "vm-reload-rollback-linux-release-x64-dev" }
-    builders { name: "vm-win-debug-ia32-dev" mixins: "win" }
-    builders { name: "vm-win-debug-x64-dev" mixins: "win" }
-    builders { name: "vm-win-release-ia32-dev" mixins: "win" }
-    builders { name: "vm-win-release-x64-dev" mixins: "win" }
 
     # CI Builders for the stable branch
     builders { name: "analyzer-analysis-server-linux-stable" }
@@ -430,20 +398,26 @@ buckets {
     builders { name: "pub-win-release-stable" mixins: "win" }
     builders { name: "target-vm-linux-release-arm64-stable" dimensions: "cpu:arm64" }
     builders { name: "versionchecker-linux-stable" }
-    builders { name: "vm-asan-linux-release-x64-stable" }
     builders { name: "vm-dartkb-linux-debug-x64-stable" mixins: "fyi" }
     builders { name: "vm-dartkb-linux-release-x64-stable" mixins: "fyi" }
+    builders { name: "vm-kernel-asan-linux-release-ia32-stable" }
+    builders { name: "vm-kernel-asan-linux-release-x64-stable" }
     builders { name: "vm-kernel-checked-linux-release-x64-stable" }
+    builders { name: "vm-kernel-linux-debug-ia32-stable" }
     builders { name: "vm-kernel-linux-debug-simdbc64-stable" }
     builders { name: "vm-kernel-linux-debug-x64-stable" }
     builders { name: "vm-kernel-linux-product-x64-stable" }
+    builders { name: "vm-kernel-linux-release-ia32-stable" }
     builders { name: "vm-kernel-linux-release-simarm-stable" }
     builders { name: "vm-kernel-linux-release-simarm64-stable" }
     builders { name: "vm-kernel-linux-release-simdbc64-stable" }
     builders { name: "vm-kernel-linux-release-x64-stable" }
+    builders { name: "vm-kernel-mac-debug-simdbc64-stable" mixins: "mac" }
     builders { name: "vm-kernel-mac-debug-x64-stable" mixins: "mac" }
     builders { name: "vm-kernel-mac-product-x64-stable" mixins: "mac" }
+    builders { name: "vm-kernel-mac-release-simdbc64-stable" mixins: "mac" }
     builders { name: "vm-kernel-mac-release-x64-stable" mixins: "mac" }
+    builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-stable" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-stable" mixins: "slow" }
     builders { name: "vm-kernel-precomp-linux-product-x64-stable" }
@@ -460,33 +434,11 @@ buckets {
     builders { name: "vm-kernel-reload-mac-release-simdbc64-stable" mixins: "mac" }
     builders { name: "vm-kernel-reload-rollback-linux-debug-x64-stable" }
     builders { name: "vm-kernel-reload-rollback-linux-release-x64-stable" }
+    builders { name: "vm-kernel-win-debug-ia32-stable" mixins: "win" }
+    builders { name: "vm-kernel-win-debug-x64-stable" mixins: "win" }
     builders { name: "vm-kernel-win-product-x64-stable" mixins: "win" }
+    builders { name: "vm-kernel-win-release-ia32-stable" mixins: "win" }
     builders { name: "vm-kernel-win-release-x64-stable" mixins: "win" }
-    builders { name: "vm-linux-debug-ia32-stable" }
-    builders { name: "vm-linux-debug-simarm-stable" }
-    builders { name: "vm-linux-debug-x64-stable" }
-    builders { name: "vm-linux-release-ia32-stable" }
-    builders { name: "vm-linux-release-simarm-stable" }
-    builders { name: "vm-linux-release-simarm64-stable" }
-    builders { name: "vm-linux-release-x64-stable" }
-    builders { name: "vm-mac-debug-ia32-stable" mixins: "mac" }
-    builders { name: "vm-mac-debug-simdbc64-stable" mixins: "mac" }
-    builders { name: "vm-mac-debug-x64-stable" mixins: "mac" }
-    builders { name: "vm-mac-release-ia32-stable" mixins: "mac" }
-    builders { name: "vm-mac-release-simdbc64-stable" mixins: "mac" }
-    builders { name: "vm-mac-release-x64-stable" mixins: "mac" }
-    builders { name: "vm-optcounter-threshold-linux-release-ia32-stable" }
-    builders { name: "vm-optcounter-threshold-linux-release-x64-stable" }
-    builders { name: "vm-reload-linux-debug-x64-stable" }
-    builders { name: "vm-reload-linux-release-x64-stable" }
-    builders { name: "vm-reload-mac-debug-simdbc64-stable" mixins: "mac" }
-    builders { name: "vm-reload-mac-release-simdbc64-stable" mixins: "mac" }
-    builders { name: "vm-reload-rollback-linux-debug-x64-stable" }
-    builders { name: "vm-reload-rollback-linux-release-x64-stable" }
-    builders { name: "vm-win-debug-ia32-stable" mixins: "win" }
-    builders { name: "vm-win-debug-x64-stable" mixins: "win" }
-    builders { name: "vm-win-release-ia32-stable" mixins: "win" }
-    builders { name: "vm-win-release-x64-stable" mixins: "win" }
   }
 }
 
@@ -563,16 +515,24 @@ buckets {
     builders { name: "vm-canary-linux-debug-try" }
     builders { name: "vm-dartkb-linux-debug-x64-try" }
     builders { name: "vm-dartkb-linux-release-x64-try" }
+    builders { name: "vm-kernel-asan-linux-release-ia32-try" }
+    builders { name: "vm-kernel-asan-linux-release-x64-try" }
     builders { name: "vm-kernel-checked-linux-release-x64-try" }
+    builders { name: "vm-kernel-linux-debug-ia32-try" }
     builders { name: "vm-kernel-linux-debug-simdbc64-try" }
     builders { name: "vm-kernel-linux-debug-x64-try" }
     builders { name: "vm-kernel-linux-product-x64-try" }
+    builders { name: "vm-kernel-linux-release-ia32-try" }
     builders { name: "vm-kernel-linux-release-simarm-try" }
     builders { name: "vm-kernel-linux-release-simarm64-try" }
     builders { name: "vm-kernel-linux-release-simdbc64-try" }
     builders { name: "vm-kernel-linux-release-x64-try" }
+    builders { name: "vm-kernel-mac-debug-simdbc64-try" mixins: "mac" }
+    builders { name: "vm-kernel-mac-debug-x64-try" mixins: "mac" }
     builders { name: "vm-kernel-mac-product-x64-try" mixins: "mac" }
+    builders { name: "vm-kernel-mac-release-simdbc64-try" mixins: "mac" }
     builders { name: "vm-kernel-mac-release-x64-try" mixins: "mac" }
+    builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-try" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-try" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-try" mixins: "slow" }
     builders { name: "vm-kernel-precomp-linux-product-x64-try" }
@@ -589,8 +549,10 @@ buckets {
     builders { name: "vm-kernel-reload-mac-release-simdbc64-try" mixins: "mac" }
     builders { name: "vm-kernel-reload-rollback-linux-debug-x64-try" }
     builders { name: "vm-kernel-reload-rollback-linux-release-x64-try" }
+    builders { name: "vm-kernel-win-debug-ia32-try" mixins: "win" }
+    builders { name: "vm-kernel-win-debug-x64-try" mixins: "win" }
     builders { name: "vm-kernel-win-product-x64-try" mixins: "win" }
+    builders { name: "vm-kernel-win-release-ia32-try" mixins: "win" }
     builders { name: "vm-kernel-win-release-x64-try" mixins: "win" }
-    builders { name: "vm-linux-product-x64-try" }
   }
 }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 646e95041b8c..61c5bc43defa 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -21,108 +21,6 @@ consoles: {
     category: "fasta"
     short_name: "w"
   }
-  builders {
-    # migrating to vm-linux-debug-ia32
-    name: "buildbot/client.dart/vm-linux-debug-ia32-be"
-    category: "vm|debug"
-    short_name: "32"
-  }
-  builders {
-    # migrating to vm-linux-debug-simarm
-    name: "buildbot/client.dart/vm-linux-debug-simarm-be"
-    category: "vm|simarm"
-    short_name: "d"
-  }
-  builders {
-    # migrating to vm-linux-debug-x64
-    name: "buildbot/client.dart/vm-linux-debug-x64-be"
-    category: "vm|debug"
-    short_name: "64"
-  }
-  builders {
-    # migrating to vm-linux-release-ia32
-    name: "buildbot/client.dart/vm-linux-release-ia32-be"
-    category: "vm|release"
-    short_name: "32"
-  }
-  builders {
-    # migrating to vm-linux-release-simarm
-    name: "buildbot/client.dart/vm-linux-release-simarm-be"
-    category: "vm|simarm"
-    short_name: "r"
-  }
-  builders {
-    # migrating to vm-linux-release-simarm64
-    name: "buildbot/client.dart/vm-linux-release-simarm64-be"
-    category: "vm|simarm"
-    short_name: "r64"
-  }
-  builders {
-    # migrating to vm-linux-release-x64
-    name: "buildbot/client.dart/vm-linux-release-x64-be"
-    category: "vm|release"
-    short_name: "64"
-  }
-  builders {
-    # migrating to vm-mac-debug-ia32
-    name: "buildbot/client.dart/vm-mac-debug-ia32-be"
-    category: "vm|debug"
-    short_name: "m32"
-  }
-  builders {
-    # migrating to vm-mac-debug-simdbc64
-    name: "buildbot/client.dart/vm-mac-debug-simdbc64-be"
-    category: "vm|debug"
-    short_name: "msi"
-  }
-  builders {
-    # migrating to vm-mac-debug-x64
-    name: "buildbot/client.dart/vm-mac-debug-x64-be"
-    category: "vm|debug"
-    short_name: "m64"
-  }
-  builders {
-    # migrating to vm-mac-release-ia32
-    name: "buildbot/client.dart/vm-mac-release-ia32-be"
-    category: "vm|release"
-    short_name: "m32"
-  }
-  builders {
-    # migrating to vm-mac-release-simdbc64
-    name: "buildbot/client.dart/vm-mac-release-simdbc64-be"
-    category: "vm|release"
-    short_name: "msi"
-  }
-  builders {
-    # migrating to vm-mac-release-x64
-    name: "buildbot/client.dart/vm-mac-release-x64-be"
-    category: "vm|release"
-    short_name: "m64"
-  }
-  builders {
-    # migrating to vm-win-debug-ia32
-    name: "buildbot/client.dart/vm-win-debug-ia32-be"
-    category: "vm|debug"
-    short_name: "w32"
-  }
-  builders {
-    # migrating to vm-win-debug-x64
-    name: "buildbot/client.dart/vm-win-debug-x64-be"
-    category: "vm|debug"
-    short_name: "w64"
-  }
-  builders {
-    # migrating to vm-win-release-ia32
-    name: "buildbot/client.dart/vm-win-release-ia32-be"
-    category: "vm|release"
-    short_name: "w32"
-  }
-  builders {
-    # migrating to vm-win-release-x64
-    name: "buildbot/client.dart/vm-win-release-x64-be"
-    category: "vm|release"
-    short_name: "w64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
     category: "vm|app-kernel"
@@ -163,6 +61,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "rbc"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32"
+    category: "vm|kernel"
+    short_name: "r32"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
     category: "vm|kernel"
@@ -173,6 +76,21 @@ consoles: {
     category: "vm|kernel"
     short_name: "rc"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32"
+    category: "vm|kernel"
+    short_name: "d32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-simdbc64"
+    category: "vm|kernel"
+    short_name: "mds"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-simdbc64"
+    category: "vm|kernel"
+    short_name: "mrs"
+  }
   builders {
     # migrating to vm-kernel-mac-debug-x64
     name: "buildbot/client.dart/vm-kernel-mac-debug-x64-be"
@@ -186,9 +104,19 @@ consoles: {
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
+    category: "vm|kernel"
+    short_name: "wd3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64"
     category: "vm|kernel"
-    short_name: "oc"
+    short_name: "wd"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32"
+    category: "vm|kernel"
+    short_name: "wr3"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
@@ -266,20 +194,22 @@ consoles: {
     short_name: "tra"
   }
   builders {
-    # migrating to vm-asan-linux-release-x64
-    name: "buildbot/client.dart/vm-linux-release-x64-asan-be"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-ia32"
+    category: "vm|misc"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
     category: "vm|misc"
     short_name: "a64"
   }
   builders {
-    # migrating to vm-optcounter-threshold-linux-release-ia32
-    name: "buildbot/client.dart/vm-linux-release-ia32-optcounter-threshold-be"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
     category: "vm|misc"
     short_name: "o32"
   }
   builders {
-    # migrating to vm-optcounter-threshold-linux-release-x64
-    name: "buildbot/client.dart/vm-linux-release-x64-optcounter-threshold-be"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
     category: "vm|misc"
     short_name: "o64"
   }
@@ -299,50 +229,24 @@ consoles: {
     short_name: "w"
   }
   builders {
-    # migrating to vm-reload-linux-debug-x64
-    name: "buildbot/client.dart/vm-linux-debug-x64-reload-be"
-    category: "vm|reload"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
+    category: "vm|reload-kernel"
     short_name: "d"
   }
   builders {
-    # migrating to vm-reload-linux-release-x64
-    name: "buildbot/client.dart/vm-linux-release-x64-reload-be"
-    category: "vm|reload"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
+    category: "vm|reload-kernel"
     short_name: "r"
   }
   builders {
-    # migrating to vm-reload-mac-debug-simdbc64
-    name: "buildbot/client.dart/vm-mac-debug-simdbc64-reload-be"
-    category: "vm|reload"
-    short_name: "mds"
-  }
-  builders {
-    # migrating to vm-reload-mac-release-simdbc64
-    name: "buildbot/client.dart/vm-mac-release-simdbc64-reload-be"
-    category: "vm|reload"
-    short_name: "mrs"
-  }
-  builders {
-    # migrating to vm-reload-rollback-linux-debug-x64
-    name: "buildbot/client.dart/vm-linux-debug-x64-reload-rollback-be"
-    category: "vm|reload"
-    short_name: "dro"
-  }
-  builders {
-    # migrating to vm-reload-rollback-linux-release-x64
-    name: "buildbot/client.dart/vm-linux-release-x64-reload-rollback-be"
-    category: "vm|reload"
-    short_name: "rro"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-debug-simdbc64"
     category: "vm|reload-kernel"
-    short_name: "d"
+    short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64"
     category: "vm|reload-kernel"
-    short_name: "r"
+    short_name: "mr"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
@@ -763,108 +667,6 @@ consoles: {
     category: "misc"
     short_name: "vc"
   }
-  builders {
-    # migrating to vm-linux-debug-ia32
-    name: "buildbot/client.dart/vm-linux-debug-ia32-be"
-    category: "vm|debug"
-    short_name: "32"
-  }
-  builders {
-    # migrating to vm-linux-debug-simarm
-    name: "buildbot/client.dart/vm-linux-debug-simarm-be"
-    category: "vm|simarm"
-    short_name: "d"
-  }
-  builders {
-    # migrating to vm-linux-debug-x64
-    name: "buildbot/client.dart/vm-linux-debug-x64-be"
-    category: "vm|debug"
-    short_name: "64"
-  }
-  builders {
-    # migrating to vm-linux-release-ia32
-    name: "buildbot/client.dart/vm-linux-release-ia32-be"
-    category: "vm|release"
-    short_name: "32"
-  }
-  builders {
-    # migrating to vm-linux-release-simarm
-    name: "buildbot/client.dart/vm-linux-release-simarm-be"
-    category: "vm|simarm"
-    short_name: "r"
-  }
-  builders {
-    # migrating to vm-linux-release-simarm64
-    name: "buildbot/client.dart/vm-linux-release-simarm64-be"
-    category: "vm|simarm"
-    short_name: "r64"
-  }
-  builders {
-    # migrating to vm-linux-release-x64
-    name: "buildbot/client.dart/vm-linux-release-x64-be"
-    category: "vm|release"
-    short_name: "64"
-  }
-  builders {
-    # migrating to vm-mac-debug-ia32
-    name: "buildbot/client.dart/vm-mac-debug-ia32-be"
-    category: "vm|debug"
-    short_name: "m32"
-  }
-  builders {
-    # migrating to vm-mac-debug-simdbc64
-    name: "buildbot/client.dart/vm-mac-debug-simdbc64-be"
-    category: "vm|debug"
-    short_name: "msi"
-  }
-  builders {
-    # migrating to vm-mac-debug-x64
-    name: "buildbot/client.dart/vm-mac-debug-x64-be"
-    category: "vm|debug"
-    short_name: "m64"
-  }
-  builders {
-    # migrating to vm-mac-release-ia32
-    name: "buildbot/client.dart/vm-mac-release-ia32-be"
-    category: "vm|release"
-    short_name: "m32"
-  }
-  builders {
-    # migrating to vm-mac-release-simdbc64
-    name: "buildbot/client.dart/vm-mac-release-simdbc64-be"
-    category: "vm|release"
-    short_name: "msi"
-  }
-  builders {
-    # migrating to vm-mac-release-x64
-    name: "buildbot/client.dart/vm-mac-release-x64-be"
-    category: "vm|release"
-    short_name: "m64"
-  }
-  builders {
-    # migrating to vm-win-debug-ia32
-    name: "buildbot/client.dart/vm-win-debug-ia32-be"
-    category: "vm|debug"
-    short_name: "w32"
-  }
-  builders {
-    # migrating to vm-win-debug-x64
-    name: "buildbot/client.dart/vm-win-debug-x64-be"
-    category: "vm|debug"
-    short_name: "w64"
-  }
-  builders {
-    # migrating to vm-win-release-ia32
-    name: "buildbot/client.dart/vm-win-release-ia32-be"
-    category: "vm|release"
-    short_name: "w32"
-  }
-  builders {
-    # migrating to vm-win-release-x64
-    name: "buildbot/client.dart/vm-win-release-x64-be"
-    category: "vm|release"
-    short_name: "w64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
     category: "vm|app-kernel"
@@ -905,6 +707,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "rbc"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32"
+    category: "vm|kernel"
+    short_name: "r32"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
     category: "vm|kernel"
@@ -915,6 +722,21 @@ consoles: {
     category: "vm|kernel"
     short_name: "rc"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32"
+    category: "vm|kernel"
+    short_name: "d32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-simdbc64"
+    category: "vm|kernel"
+    short_name: "mds"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-simdbc64"
+    category: "vm|kernel"
+    short_name: "mrs"
+  }
   builders {
     # migrating to vm-kernel-mac-debug-x64
     name: "buildbot/client.dart/vm-kernel-mac-debug-x64-be"
@@ -928,9 +750,19 @@ consoles: {
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
+    category: "vm|kernel"
+    short_name: "wd3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64"
     category: "vm|kernel"
-    short_name: "oc"
+    short_name: "wd"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32"
+    category: "vm|kernel"
+    short_name: "wr3"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
@@ -1008,20 +840,22 @@ consoles: {
     short_name: "tra"
   }
   builders {
-    # migrating to vm-asan-linux-release-x64
-    name: "buildbot/client.dart/vm-linux-release-x64-asan-be"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-ia32"
+    category: "vm|misc"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asanlinux-release-x64"
     category: "vm|misc"
     short_name: "a64"
   }
   builders {
-    # migrating to vm-optcounter-threshold-linux-release-ia32
-    name: "buildbot/client.dart/vm-linux-release-ia32-optcounter-threshold-be"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
     category: "vm|misc"
     short_name: "o32"
   }
   builders {
-    # migrating to vm-optcounter-threshold-linux-release-x64
-    name: "buildbot/client.dart/vm-linux-release-x64-optcounter-threshold-be"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
     category: "vm|misc"
     short_name: "o64"
   }
@@ -1040,42 +874,6 @@ consoles: {
     category: "vm|product"
     short_name: "w"
   }
-  builders {
-    # migrating to vm-reload-linux-debug-x64
-    name: "buildbot/client.dart/vm-linux-debug-x64-reload-be"
-    category: "vm|reload"
-    short_name: "d"
-  }
-  builders {
-    # migrating to vm-reload-linux-release-x64
-    name: "buildbot/client.dart/vm-linux-release-x64-reload-be"
-    category: "vm|reload"
-    short_name: "r"
-  }
-  builders {
-    # migrating to vm-reload-mac-debug-simdbc64
-    name: "buildbot/client.dart/vm-mac-debug-simdbc64-reload-be"
-    category: "vm|reload"
-    short_name: "mds"
-  }
-  builders {
-    # migrating to vm-reload-mac-release-simdbc64
-    name: "buildbot/client.dart/vm-mac-release-simdbc64-reload-be"
-    category: "vm|reload"
-    short_name: "mrs"
-  }
-  builders {
-    # migrating to vm-reload-rollback-linux-debug-x64
-    name: "buildbot/client.dart/vm-linux-debug-x64-reload-rollback-be"
-    category: "vm|reload"
-    short_name: "dro"
-  }
-  builders {
-    # migrating to vm-reload-rollback-linux-release-x64
-    name: "buildbot/client.dart/vm-linux-release-x64-reload-rollback-be"
-    category: "vm|reload"
-    short_name: "rro"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
     category: "vm|reload-kernel"
@@ -1153,91 +951,6 @@ consoles: {
     category: "fasta"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-ia32"
-    category: "vm|debug"
-    short_name: "32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simarm"
-    category: "vm|simarm"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64"
-    category: "vm|debug"
-    short_name: "64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-ia32"
-    category: "vm|release"
-    short_name: "32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm"
-    category: "vm|simarm"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64"
-    category: "vm|simarm"
-    short_name: "r64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-x64"
-    category: "vm|release"
-    short_name: "64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-ia32"
-    category: "vm|debug"
-    short_name: "m32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-simdbc64"
-    category: "vm|debug"
-    short_name: "msi"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64"
-    category: "vm|debug"
-    short_name: "m64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-ia32"
-    category: "vm|release"
-    short_name: "m32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-simdbc64"
-    category: "vm|release"
-    short_name: "msi"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64"
-    category: "vm|release"
-    short_name: "m64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-ia32"
-    category: "vm|debug"
-    short_name: "w32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64"
-    category: "vm|debug"
-    short_name: "w64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-ia32"
-    category: "vm|release"
-    short_name: "w32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-x64"
-    category: "vm|release"
-    short_name: "w64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
     category: "vm|app-kernel"
@@ -1278,6 +991,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "rbc"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32"
+    category: "vm|kernel"
+    short_name: "r32"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
     category: "vm|kernel"
@@ -1288,6 +1006,21 @@ consoles: {
     category: "vm|kernel"
     short_name: "rc"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32"
+    category: "vm|kernel"
+    short_name: "d32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-simdbc64"
+    category: "vm|kernel"
+    short_name: "mds"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-simdbc64"
+    category: "vm|kernel"
+    short_name: "mrs"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
     category: "vm|kernel"
@@ -1299,9 +1032,19 @@ consoles: {
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
     category: "vm|kernel"
-    short_name: "oc"
+    short_name: "wd3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64"
+    category: "vm|kernel"
+    short_name: "wd"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32"
+    category: "vm|kernel"
+    short_name: "wr3"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
@@ -1359,17 +1102,22 @@ consoles: {
     short_name: "tra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-ia32"
+    category: "vm|misc"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
     category: "vm|misc"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
     category: "vm|misc"
     short_name: "o32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
     category: "vm|misc"
     short_name: "o64"
   }
@@ -1617,91 +1365,6 @@ consoles: {
     category: "fasta"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-ia32-dev"
-    category: "vm|debug"
-    short_name: "32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simarm-dev"
-    category: "vm|simarm"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64-dev"
-    category: "vm|debug"
-    short_name: "64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-ia32-dev"
-    category: "vm|release"
-    short_name: "32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm-dev"
-    category: "vm|simarm"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64-dev"
-    category: "vm|simarm"
-    short_name: "r64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-x64-dev"
-    category: "vm|release"
-    short_name: "64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-ia32-dev"
-    category: "vm|debug"
-    short_name: "m32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-simdbc64-dev"
-    category: "vm|debug"
-    short_name: "msi"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64-dev"
-    category: "vm|debug"
-    short_name: "m64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-ia32-dev"
-    category: "vm|release"
-    short_name: "m32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-simdbc64-dev"
-    category: "vm|release"
-    short_name: "msi"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64-dev"
-    category: "vm|release"
-    short_name: "m64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-ia32-dev"
-    category: "vm|debug"
-    short_name: "w32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64-dev"
-    category: "vm|debug"
-    short_name: "w64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-ia32-dev"
-    category: "vm|release"
-    short_name: "w32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-x64-dev"
-    category: "vm|release"
-    short_name: "w64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-dev"
     category: "vm|app-kernel"
@@ -1742,6 +1405,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "rbc"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32-dev"
+    category: "vm|kernel"
+    short_name: "r32"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-dev"
     category: "vm|kernel"
@@ -1752,6 +1420,21 @@ consoles: {
     category: "vm|kernel"
     short_name: "rc"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32-dev"
+    category: "vm|kernel"
+    short_name: "d32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-simdbc64-dev"
+    category: "vm|kernel"
+    short_name: "mds"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-simdbc64-dev"
+    category: "vm|kernel"
+    short_name: "mrs"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-dev"
     category: "vm|kernel"
@@ -1763,9 +1446,19 @@ consoles: {
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32-dev"
     category: "vm|kernel"
-    short_name: "oc"
+    short_name: "wd3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-dev"
+    category: "vm|kernel"
+    short_name: "wd"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32-dev"
+    category: "vm|kernel"
+    short_name: "wr3"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-dev"
@@ -1823,65 +1516,40 @@ consoles: {
     short_name: "tra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-ia32-dev"
+    category: "vm|misc"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-dev"
     category: "vm|misc"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-ia32-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32-dev"
     category: "vm|misc"
     short_name: "o32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-dev"
     category: "vm|misc"
     short_name: "o64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64-dev"
     category: "vm|product"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64-dev"
     category: "vm|product"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64-dev"
     category: "vm|product"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-debug-x64-dev"
-    category: "vm|reload"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-release-x64-dev"
-    category: "vm|reload"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-debug-simdbc64-dev"
-    category: "vm|reload"
-    short_name: "mds"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-release-simdbc64-dev"
-    category: "vm|reload"
-    short_name: "mrs"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-debug-x64-dev"
-    category: "vm|reload"
-    short_name: "dro"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-release-x64-dev"
-    category: "vm|reload"
-    short_name: "rro"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64-dev"
     category: "vm|reload-kernel"
@@ -2091,91 +1759,6 @@ consoles: {
     category: "fasta"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-ia32-stable"
-    category: "vm|debug"
-    short_name: "32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simarm-stable"
-    category: "vm|simarm"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64-stable"
-    category: "vm|debug"
-    short_name: "64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-ia32-stable"
-    category: "vm|release"
-    short_name: "32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm-stable"
-    category: "vm|simarm"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64-stable"
-    category: "vm|simarm"
-    short_name: "r64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-x64-stable"
-    category: "vm|release"
-    short_name: "64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-ia32-stable"
-    category: "vm|debug"
-    short_name: "m32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-simdbc64-stable"
-    category: "vm|debug"
-    short_name: "msi"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64-stable"
-    category: "vm|debug"
-    short_name: "m64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-ia32-stable"
-    category: "vm|release"
-    short_name: "m32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-simdbc64-stable"
-    category: "vm|release"
-    short_name: "msi"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64-stable"
-    category: "vm|release"
-    short_name: "m64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-ia32-stable"
-    category: "vm|debug"
-    short_name: "w32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64-stable"
-    category: "vm|debug"
-    short_name: "w64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-ia32-stable"
-    category: "vm|release"
-    short_name: "w32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-x64-stable"
-    category: "vm|release"
-    short_name: "w64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-stable"
     category: "vm|app-kernel"
@@ -2216,6 +1799,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "rbc"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32-stable"
+    category: "vm|kernel"
+    short_name: "r32"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-stable"
     category: "vm|kernel"
@@ -2226,6 +1814,21 @@ consoles: {
     category: "vm|kernel"
     short_name: "rc"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32-stable"
+    category: "vm|kernel"
+    short_name: "d32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-simdbc64-stable"
+    category: "vm|kernel"
+    short_name: "mds"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-simdbc64-stable"
+    category: "vm|kernel"
+    short_name: "mrs"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-stable"
     category: "vm|kernel"
@@ -2237,9 +1840,19 @@ consoles: {
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32-stable"
+    category: "vm|kernel"
+    short_name: "wd3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-stable"
+    category: "vm|kernel"
+    short_name: "wd"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32-stable"
     category: "vm|kernel"
-    short_name: "oc"
+    short_name: "wr3"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-stable"
@@ -2297,65 +1910,40 @@ consoles: {
     short_name: "tra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-ia32-stable"
+    category: "vm|misc"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-stable"
     category: "vm|misc"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-ia32-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32-stable"
     category: "vm|misc"
     short_name: "o32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-stable"
     category: "vm|misc"
     short_name: "o64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64-stable"
     category: "vm|product"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64-stable"
     category: "vm|product"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64-stable"
     category: "vm|product"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-debug-x64-stable"
-    category: "vm|reload"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-release-x64-stable"
-    category: "vm|reload"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-debug-simdbc64-stable"
-    category: "vm|reload"
-    short_name: "mds"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-release-simdbc64-stable"
-    category: "vm|reload"
-    short_name: "mrs"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-debug-x64-stable"
-    category: "vm|reload"
-    short_name: "dro"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-release-x64-stable"
-    category: "vm|reload"
-    short_name: "rro"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64-stable"
     category: "vm|reload-kernel"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index aedb03f87c42..c6cc567b15fa 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -257,7 +257,12 @@ notifiers {
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
-        name: "vm-asan-linux-release-x64"
+        name: "vm-kernel-asan-linux-release-ia32"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-kernel-asan-linux-release-x64"
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
@@ -266,6 +271,11 @@ notifiers {
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
+    builders {
+        name: "vm-kernel-linux-debug-ia32"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
     builders {
         name: "vm-kernel-linux-debug-simdbc64"
         bucket: "ci.sandbox"
@@ -281,6 +291,11 @@ notifiers {
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
+    builders {
+        name: "vm-kernel-linux-release-ia32"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
     builders {
         name: "vm-kernel-linux-release-simarm"
         bucket: "ci.sandbox"
@@ -301,6 +316,11 @@ notifiers {
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
+    builders {
+        name: "vm-kernel-mac-debug-simdbc64"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
     builders {
         name: "vm-kernel-mac-debug-x64"
         bucket: "ci.sandbox"
@@ -311,11 +331,21 @@ notifiers {
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
+    builders {
+        name: "vm-kernel-mac-release-simdbc64"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
     builders {
         name: "vm-kernel-mac-release-x64"
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
+    builders {
+        name: "vm-kernel-optcounter-threshold-linux-release-ia32"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
     builders {
         name: "vm-kernel-optcounter-threshold-linux-release-x64"
         bucket: "ci.sandbox"
@@ -392,137 +422,27 @@ notifiers {
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
-        name: "vm-kernel-win-product-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-win-release-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-linux-debug-ia32"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-linux-debug-simarm"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-linux-debug-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-linux-release-ia32"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-linux-release-simarm"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-linux-release-simarm64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-linux-release-x64"
+        name: "vm-kernel-win-debug-ia32"
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
-        name: "vm-mac-debug-ia32"
+        name: "vm-kernel-win-debug-x64"
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
-        name: "vm-mac-debug-simdbc64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-mac-debug-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-mac-release-ia32"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-mac-release-simdbc64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-mac-release-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-optcounter-threshold-linux-release-ia32"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-optcounter-threshold-linux-release-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-reload-linux-debug-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-reload-linux-release-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-reload-mac-debug-simdbc64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-reload-mac-release-simdbc64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-reload-rollback-linux-debug-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-reload-rollback-linux-release-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-win-debug-ia32"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-win-debug-x64"
+        name: "vm-kernel-win-product-x64"
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
-        name: "vm-win-release-ia32"
+        name: "vm-kernel-win-release-ia32"
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
-        name: "vm-win-release-x64"
+        name: "vm-kernel-win-release-x64"
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 7d4777201daf..6261a8a4cefc 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -69,15 +69,22 @@ trigger {
   triggers: "pkg-win-release"
   triggers: "vm-dartkb-linux-debug-x64"
   triggers: "vm-dartkb-linux-release-x64"
+  triggers: "vm-kernel-asan-linux-release-ia32"
+  triggers: "vm-kernel-asan-linux-release-x64"
   triggers: "vm-kernel-checked-linux-release-x64"
+  triggers: "vm-kernel-linux-debug-ia32"
   triggers: "vm-kernel-linux-debug-simdbc64"
   triggers: "vm-kernel-linux-debug-x64"
   triggers: "vm-kernel-linux-product-x64"
+  triggers: "vm-kernel-linux-release-ia32"
   triggers: "vm-kernel-linux-release-simarm"
   triggers: "vm-kernel-linux-release-simarm64"
   triggers: "vm-kernel-linux-release-simdbc64"
   triggers: "vm-kernel-linux-release-x64"
+  triggers: "vm-kernel-mac-debug-simdbc64"
   triggers: "vm-kernel-mac-product-x64"
+  triggers: "vm-kernel-mac-release-simdbc64"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
   triggers: "vm-kernel-precomp-linux-debug-x64"
   triggers: "vm-kernel-precomp-linux-product-x64"
@@ -90,9 +97,14 @@ trigger {
   triggers: "vm-kernel-precomp-win-release-x64"
   triggers: "vm-kernel-reload-linux-debug-x64"
   triggers: "vm-kernel-reload-linux-release-x64"
+  triggers: "vm-kernel-reload-mac-debug-simdbc64"
+  triggers: "vm-kernel-reload-mac-release-simdbc64"
   triggers: "vm-kernel-reload-rollback-linux-debug-x64"
   triggers: "vm-kernel-reload-rollback-linux-release-x64"
+  triggers: "vm-kernel-win-debug-ia32"
+  triggers: "vm-kernel-win-debug-x64"
   triggers: "vm-kernel-win-product-x64"
+  triggers: "vm-kernel-win-release-ia32"
   triggers: "vm-kernel-win-release-x64"
 }
 
@@ -134,15 +146,22 @@ trigger {
   triggers: "pkg-linux-release-dev"
   triggers: "pkg-mac-release-dev"
   triggers: "pkg-win-release-dev"
+  triggers: "vm-kernel-asan-linux-release-ia32-dev"
+  triggers: "vm-kernel-asan-linux-release-x64-dev"
   triggers: "vm-kernel-checked-linux-release-x64-dev"
+  triggers: "vm-kernel-linux-debug-ia32-dev"
   triggers: "vm-kernel-linux-debug-simdbc64-dev"
   triggers: "vm-kernel-linux-debug-x64-dev"
   triggers: "vm-kernel-linux-product-x64-dev"
+  triggers: "vm-kernel-linux-release-ia32-dev"
   triggers: "vm-kernel-linux-release-simarm-dev"
   triggers: "vm-kernel-linux-release-simarm64-dev"
   triggers: "vm-kernel-linux-release-simdbc64-dev"
   triggers: "vm-kernel-linux-release-x64-dev"
+  triggers: "vm-kernel-mac-debug-simdbc64-dev"
   triggers: "vm-kernel-mac-product-x64-dev"
+  triggers: "vm-kernel-mac-release-simdbc64-dev"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-linux-debug-x64-dev"
   triggers: "vm-kernel-precomp-linux-product-x64-dev"
@@ -154,9 +173,14 @@ trigger {
   triggers: "vm-kernel-precomp-win-release-x64-dev"
   triggers: "vm-kernel-reload-linux-debug-x64-dev"
   triggers: "vm-kernel-reload-linux-release-x64-dev"
+  triggers: "vm-kernel-reload-mac-debug-simdbc64-dev"
+  triggers: "vm-kernel-reload-mac-release-simdbc64-dev"
   triggers: "vm-kernel-reload-rollback-linux-debug-x64-dev"
   triggers: "vm-kernel-reload-rollback-linux-release-x64-dev"
+  triggers: "vm-kernel-win-debug-ia32-dev"
+  triggers: "vm-kernel-win-debug-x64-dev"
   triggers: "vm-kernel-win-product-x64-dev"
+  triggers: "vm-kernel-win-release-ia32-dev"
   triggers: "vm-kernel-win-release-x64-dev"
 }
 
@@ -198,15 +222,22 @@ trigger {
   triggers: "pkg-linux-release-stable"
   triggers: "pkg-mac-release-stable"
   triggers: "pkg-win-release-stable"
+  triggers: "vm-kernel-asan-linux-release-ia32-stable"
+  triggers: "vm-kernel-asan-linux-release-x64-stable"
   triggers: "vm-kernel-checked-linux-release-x64-stable"
+  triggers: "vm-kernel-linux-debug-ia32-stable"
   triggers: "vm-kernel-linux-debug-simdbc64-stable"
   triggers: "vm-kernel-linux-debug-x64-stable"
   triggers: "vm-kernel-linux-product-x64-stable"
+  triggers: "vm-kernel-linux-release-ia32-stable"
   triggers: "vm-kernel-linux-release-simarm-stable"
   triggers: "vm-kernel-linux-release-simarm64-stable"
   triggers: "vm-kernel-linux-release-simdbc64-stable"
   triggers: "vm-kernel-linux-release-x64-stable"
+  triggers: "vm-kernel-mac-debug-simdbc64-stable"
   triggers: "vm-kernel-mac-product-x64-stable"
+  triggers: "vm-kernel-mac-release-simdbc64-stable"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-linux-debug-x64-stable"
   triggers: "vm-kernel-precomp-linux-product-x64-stable"
@@ -218,9 +249,14 @@ trigger {
   triggers: "vm-kernel-precomp-win-release-x64-stable"
   triggers: "vm-kernel-reload-linux-debug-x64-stable"
   triggers: "vm-kernel-reload-linux-release-x64-stable"
+  triggers: "vm-kernel-reload-mac-debug-simdbc64-stable"
+  triggers: "vm-kernel-reload-mac-release-simdbc64-stable"
   triggers: "vm-kernel-reload-rollback-linux-debug-x64-stable"
   triggers: "vm-kernel-reload-rollback-linux-release-x64-stable"
-  triggers: "vm-kernel-win-product-x64-dev"
+  triggers: "vm-kernel-win-debug-ia32-stable"
+  triggers: "vm-kernel-win-debug-x64-stable"
+  triggers: "vm-kernel-win-product-x64-stable"
+  triggers: "vm-kernel-win-release-ia32-stable"
   triggers: "vm-kernel-win-release-x64-stable"
 }
 
@@ -592,6 +628,28 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-asan-linux-release-ia32"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-asan-linux-release-ia32"
+  }
+}
+
+job {
+  id: "vm-kernel-asan-linux-release-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-asan-linux-release-x64"
+  }
+}
+
 job {
   id: "vm-kernel-checked-linux-release-x64"
   acl_sets: "default"
@@ -603,6 +661,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-linux-debug-ia32"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-ia32"
+  }
+}
+
 job {
   id: "vm-kernel-linux-debug-simdbc64"
   acl_sets: "default"
@@ -636,6 +705,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-linux-release-ia32"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-ia32"
+  }
+}
+
 job {
   id: "vm-kernel-linux-release-simarm"
   acl_sets: "default"
@@ -680,6 +760,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-mac-debug-simdbc64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-debug-simdbc64"
+  }
+}
+
 job {
   id: "vm-kernel-mac-product-x64"
   acl_sets: "default"
@@ -691,6 +782,28 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-mac-release-simdbc64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-release-simdbc64"
+  }
+}
+
+job {
+  id: "vm-kernel-optcounter-threshold-linux-release-ia32"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-optcounter-threshold-linux-release-ia32"
+  }
+}
+
 job {
   id: "vm-kernel-optcounter-threshold-linux-release-x64"
   acl_sets: "default"
@@ -823,6 +936,28 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-reload-mac-debug-simdbc64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-mac-debug-simdbc64"
+  }
+}
+
+job {
+  id: "vm-kernel-reload-mac-release-simdbc64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-mac-release-simdbc64"
+  }
+}
+
 job {
   id: "vm-kernel-reload-rollback-linux-debug-x64"
   acl_sets: "default"
@@ -845,6 +980,28 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-win-debug-ia32"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-debug-ia32"
+  }
+}
+
+job {
+  id: "vm-kernel-win-debug-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-debug-x64"
+  }
+}
+
 job {
   id: "vm-kernel-win-product-x64"
   acl_sets: "default"
@@ -856,6 +1013,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-win-release-ia32"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-release-ia32"
+  }
+}
+
 job {
   id: "vm-kernel-win-release-x64"
   acl_sets: "default"
@@ -1211,6 +1379,28 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-asan-linux-release-ia32-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-asan-linux-release-ia32-dev"
+  }
+}
+
+job {
+  id: "vm-kernel-asan-linux-release-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-asan-linux-release-x64-dev"
+  }
+}
+
 job {
   id: "vm-kernel-checked-linux-release-x64-dev"
   acl_sets: "default"
@@ -1222,6 +1412,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-linux-debug-ia32-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-ia32-dev"
+  }
+}
+
 job {
   id: "vm-kernel-linux-debug-simdbc64-dev"
   acl_sets: "default"
@@ -1255,6 +1456,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-linux-release-ia32-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-ia32-dev"
+  }
+}
+
 job {
   id: "vm-kernel-linux-release-simarm-dev"
   acl_sets: "default"
@@ -1299,6 +1511,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-mac-debug-simdbc64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-debug-simdbc64-dev"
+  }
+}
+
 job {
   id: "vm-kernel-mac-product-x64-dev"
   acl_sets: "default"
@@ -1310,6 +1533,28 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-mac-release-simdbc64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-release-simdbc64-dev"
+  }
+}
+
+job {
+  id: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
+  }
+}
+
 job {
   id: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
   acl_sets: "default"
@@ -1431,6 +1676,28 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-reload-mac-debug-simdbc64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-mac-debug-simdbc64-dev"
+  }
+}
+
+job {
+  id: "vm-kernel-reload-mac-release-simdbc64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-mac-release-simdbc64-dev"
+  }
+}
+
 job {
   id: "vm-kernel-reload-rollback-linux-debug-x64-dev"
   acl_sets: "default"
@@ -1453,6 +1720,28 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-win-debug-ia32-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-debug-ia32-dev"
+  }
+}
+
+job {
+  id: "vm-kernel-win-debug-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-debug-x64-dev"
+  }
+}
+
 job {
   id: "vm-kernel-win-product-x64-dev"
   acl_sets: "default"
@@ -1464,6 +1753,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-win-release-ia32-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-release-ia32-dev"
+  }
+}
+
 job {
   id: "vm-kernel-win-release-x64-dev"
   acl_sets: "default"
@@ -1819,6 +2119,28 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-asan-linux-release-ia32-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-asan-linux-release-ia32-stable"
+  }
+}
+
+job {
+  id: "vm-kernel-asan-linux-release-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-asan-linux-release-x64-stable"
+  }
+}
+
 job {
   id: "vm-kernel-checked-linux-release-x64-stable"
   acl_sets: "default"
@@ -1830,6 +2152,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-linux-debug-ia32-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-ia32-stable"
+  }
+}
+
 job {
   id: "vm-kernel-linux-debug-simdbc64-stable"
   acl_sets: "default"
@@ -1863,6 +2196,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-linux-release-ia32-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-ia32-stable"
+  }
+}
+
 job {
   id: "vm-kernel-linux-release-simarm-stable"
   acl_sets: "default"
@@ -1907,6 +2251,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-mac-debug-simdbc64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-debug-simdbc64-stable"
+  }
+}
+
 job {
   id: "vm-kernel-mac-product-x64-stable"
   acl_sets: "default"
@@ -1918,6 +2273,28 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-mac-release-simdbc64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-release-simdbc64-stable"
+  }
+}
+
+job {
+  id: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
+  }
+}
+
 job {
   id: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
   acl_sets: "default"
@@ -2039,6 +2416,28 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-reload-mac-debug-simdbc64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-mac-debug-simdbc64-stable"
+  }
+}
+
+job {
+  id: "vm-kernel-reload-mac-release-simdbc64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-mac-release-simdbc64-stable"
+  }
+}
+
 job {
   id: "vm-kernel-reload-rollback-linux-debug-x64-stable"
   acl_sets: "default"
@@ -2061,6 +2460,28 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-win-debug-ia32-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-debug-ia32-stable"
+  }
+}
+
+job {
+  id: "vm-kernel-win-debug-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-debug-x64-stable"
+  }
+}
+
 job {
   id: "vm-kernel-win-product-x64-stable"
   acl_sets: "default"
@@ -2072,6 +2493,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-win-release-ia32-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-release-ia32-stable"
+  }
+}
+
 job {
   id: "vm-kernel-win-release-x64-stable"
   acl_sets: "default"

From 16fa6227fdf9b12bac986a709578fcbd341b8947 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Fri, 5 Oct 2018 14:19:22 +0000
Subject: [PATCH 191/826] Move vm-kernel-reload-mac-debug-simdbc64 to FYI
 console, fix other consoles.

This debug-reload-sim bot times out when running 10,000 tests.
The mac-reload bots were missing from some consoles.
The non-kernel reload bots are removed from the LUCI console, they will never exist.

Change-Id: I9c9fe7b4a7c2106c714f97bc4a1325034115dcc7
Reviewed-on: https://dart-review.googlesource.com/c/78247
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 luci-milo.cfg | 62 +++++++++++++++++++++------------------------------
 1 file changed, 26 insertions(+), 36 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 61c5bc43defa..1d78328aaa8e 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -238,11 +238,6 @@ consoles: {
     category: "vm|reload-kernel"
     short_name: "r"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-debug-simdbc64"
-    category: "vm|reload-kernel"
-    short_name: "md"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64"
     category: "vm|reload-kernel"
@@ -845,7 +840,7 @@ consoles: {
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asanlinux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
     category: "vm|misc"
     short_name: "a64"
   }
@@ -884,6 +879,11 @@ consoles: {
     category: "vm|reload-kernel"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64"
+    category: "vm|reload-kernel"
+    short_name: "mr"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
     category: "vm|reload-kernel"
@@ -1136,36 +1136,6 @@ consoles: {
     category: "vm|product"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-debug-x64"
-    category: "vm|reload"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-release-x64"
-    category: "vm|reload"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-debug-simdbc64"
-    category: "vm|reload"
-    short_name: "mds"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-mac-release-simdbc64"
-    category: "vm|reload"
-    short_name: "mrs"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-debug-x64"
-    category: "vm|reload"
-    short_name: "dro"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-release-x64"
-    category: "vm|reload"
-    short_name: "rro"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
     category: "vm|reload-kernel"
@@ -1176,6 +1146,11 @@ consoles: {
     category: "vm|reload-kernel"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64"
+    category: "vm|reload-kernel"
+    short_name: "mr"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
     category: "vm|reload-kernel"
@@ -1560,6 +1535,11 @@ consoles: {
     category: "vm|reload-kernel"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64-dev"
+    category: "vm|reload-kernel"
+    short_name: "mr"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64-dev"
     category: "vm|reload-kernel"
@@ -1954,6 +1934,11 @@ consoles: {
     category: "vm|reload-kernel"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64-stable"
+    category: "vm|reload-kernel"
+    short_name: "mr"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64-stable"
     category: "vm|reload-kernel"
@@ -2171,6 +2156,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "o"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-debug-simdbc64"
+    category: "vm|reload-kernel"
+    short_name: "md"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-debug-ia32-none"
     category: "dart2js"

From 365ba64af532f7f1781d7de87e24060370541928 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 8 Oct 2018 06:41:04 +0000
Subject: [PATCH 192/826] [infra] Make fuzzer notify more to test email
 notifcations

TBR=whesse@google.com

Change-Id: I2f5e377ca26f05c51433d7f88546c53a493891f5
Reviewed-on: https://dart-review.googlesource.com/c/78460
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-notify.cfg | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/luci-notify.cfg b/luci-notify.cfg
index c6cc567b15fa..d16fb524064e 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -452,10 +452,11 @@ notifiers {
     name: "dart-fuzz-testing"
     notifications {
         on_change: false
-        on_success: false
+        on_success: true
         on_failure: true
         email {
             recipients: "ajcbik@google.com"
+            recipients: "athom@google.com"
         }
     }
 

From 4d002d832973f28afd00b062494bf7eb40da1499 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 8 Oct 2018 06:45:34 +0000
Subject: [PATCH 193/826] [infra] Notify only on new failures, not new
 successes

TBR=whesse@google.com

Change-Id: Id0f10f61ad1a09a2463d74986d934713bd23851b
Reviewed-on: https://dart-review.googlesource.com/c/78461
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-notify.cfg | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/luci-notify.cfg b/luci-notify.cfg
index d16fb524064e..57b08911f3cc 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -11,9 +11,10 @@
 notifiers {
     name: "dart"
     notifications {
-        on_change: true
+        on_change: false
         on_success: false
         on_failure: false
+        on_new_failure: true
         email {
             recipients: "athom@google.com"
         }

From 540f3f93a7c7f90b933c7f63ea2b1a6f2ebc735a Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 8 Oct 2018 13:06:46 +0000
Subject: [PATCH 194/826] [infra] Remove deleted builders from luci-notify.cfg

TBR=whesse@google.com

Change-Id: I3e0cb6ae1e5a4fa9762906d52cdf7111dd672e23
Reviewed-on: https://dart-review.googlesource.com/c/78522
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-notify.cfg | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/luci-notify.cfg b/luci-notify.cfg
index 57b08911f3cc..c1c4cd27d93f 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -67,21 +67,6 @@ notifiers {
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
-    builders {
-        name: "app-linux-debug-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "app-linux-product-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "app-linux-release-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
     builders {
         name: "cross-vm-linux-release-arm64"
         bucket: "ci.sandbox"

From 89764aeef052ace063d72b75fa4718c4a27e7b88 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 9 Oct 2018 15:47:39 +0000
Subject: [PATCH 195/826] [infra] Remove vm-kernel-asan-linux-release-ia32
 builder

Change-Id: I987bb49f116932020bb82ec5a9742d75b38d0e19
Reviewed-on: https://dart-review.googlesource.com/c/78781
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg |  4 ----
 luci-milo.cfg      | 25 -------------------------
 luci-notify.cfg    |  5 -----
 luci-scheduler.cfg | 36 ------------------------------------
 4 files changed, 70 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 1d53e6904fb9..89a29a6fd609 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -226,7 +226,6 @@ buckets {
     builders { name: "versionchecker-linux" }
     builders { name: "vm-dartkb-linux-debug-x64" mixins: "fyi" }
     builders { name: "vm-dartkb-linux-release-x64" mixins: "fyi" }
-    builders { name: "vm-kernel-asan-linux-release-ia32" }
     builders { name: "vm-kernel-asan-linux-release-x64" }
     builders { name: "vm-kernel-checked-linux-release-x64" }
     builders { name: "vm-kernel-linux-debug-ia32" }
@@ -313,7 +312,6 @@ buckets {
     builders { name: "versionchecker-linux-dev" }
     builders { name: "vm-dartkb-linux-debug-x64-dev" mixins: "fyi" }
     builders { name: "vm-dartkb-linux-release-x64-dev" mixins: "fyi" }
-    builders { name: "vm-kernel-asan-linux-release-ia32-dev" }
     builders { name: "vm-kernel-asan-linux-release-x64-dev" }
     builders { name: "vm-kernel-checked-linux-release-x64-dev" }
     builders { name: "vm-kernel-linux-debug-ia32-dev" }
@@ -400,7 +398,6 @@ buckets {
     builders { name: "versionchecker-linux-stable" }
     builders { name: "vm-dartkb-linux-debug-x64-stable" mixins: "fyi" }
     builders { name: "vm-dartkb-linux-release-x64-stable" mixins: "fyi" }
-    builders { name: "vm-kernel-asan-linux-release-ia32-stable" }
     builders { name: "vm-kernel-asan-linux-release-x64-stable" }
     builders { name: "vm-kernel-checked-linux-release-x64-stable" }
     builders { name: "vm-kernel-linux-debug-ia32-stable" }
@@ -515,7 +512,6 @@ buckets {
     builders { name: "vm-canary-linux-debug-try" }
     builders { name: "vm-dartkb-linux-debug-x64-try" }
     builders { name: "vm-dartkb-linux-release-x64-try" }
-    builders { name: "vm-kernel-asan-linux-release-ia32-try" }
     builders { name: "vm-kernel-asan-linux-release-x64-try" }
     builders { name: "vm-kernel-checked-linux-release-x64-try" }
     builders { name: "vm-kernel-linux-debug-ia32-try" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 1d78328aaa8e..8ffd424f9796 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -193,11 +193,6 @@ consoles: {
     category: "vm|kernel"
     short_name: "tra"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-ia32"
-    category: "vm|misc"
-    short_name: "a32"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
     category: "vm|misc"
@@ -834,11 +829,6 @@ consoles: {
     category: "vm|kernel"
     short_name: "tra"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-ia32"
-    category: "vm|misc"
-    short_name: "a32"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
     category: "vm|misc"
@@ -1101,11 +1091,6 @@ consoles: {
     category: "vm|kernel"
     short_name: "tra"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-ia32"
-    category: "vm|misc"
-    short_name: "a32"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
     category: "vm|misc"
@@ -1490,11 +1475,6 @@ consoles: {
     category: "vm|kernel"
     short_name: "tra"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-ia32-dev"
-    category: "vm|misc"
-    short_name: "a32"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-dev"
     category: "vm|misc"
@@ -1889,11 +1869,6 @@ consoles: {
     category: "vm|kernel"
     short_name: "tra"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-ia32-stable"
-    category: "vm|misc"
-    short_name: "a32"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-stable"
     category: "vm|misc"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index c1c4cd27d93f..336a8e93907e 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -242,11 +242,6 @@ notifiers {
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
-    builders {
-        name: "vm-kernel-asan-linux-release-ia32"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
     builders {
         name: "vm-kernel-asan-linux-release-x64"
         bucket: "ci.sandbox"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 6261a8a4cefc..af693e5c1b9c 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -69,7 +69,6 @@ trigger {
   triggers: "pkg-win-release"
   triggers: "vm-dartkb-linux-debug-x64"
   triggers: "vm-dartkb-linux-release-x64"
-  triggers: "vm-kernel-asan-linux-release-ia32"
   triggers: "vm-kernel-asan-linux-release-x64"
   triggers: "vm-kernel-checked-linux-release-x64"
   triggers: "vm-kernel-linux-debug-ia32"
@@ -146,7 +145,6 @@ trigger {
   triggers: "pkg-linux-release-dev"
   triggers: "pkg-mac-release-dev"
   triggers: "pkg-win-release-dev"
-  triggers: "vm-kernel-asan-linux-release-ia32-dev"
   triggers: "vm-kernel-asan-linux-release-x64-dev"
   triggers: "vm-kernel-checked-linux-release-x64-dev"
   triggers: "vm-kernel-linux-debug-ia32-dev"
@@ -222,7 +220,6 @@ trigger {
   triggers: "pkg-linux-release-stable"
   triggers: "pkg-mac-release-stable"
   triggers: "pkg-win-release-stable"
-  triggers: "vm-kernel-asan-linux-release-ia32-stable"
   triggers: "vm-kernel-asan-linux-release-x64-stable"
   triggers: "vm-kernel-checked-linux-release-x64-stable"
   triggers: "vm-kernel-linux-debug-ia32-stable"
@@ -628,17 +625,6 @@ job {
   }
 }
 
-job {
-  id: "vm-kernel-asan-linux-release-ia32"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-asan-linux-release-ia32"
-  }
-}
-
 job {
   id: "vm-kernel-asan-linux-release-x64"
   acl_sets: "default"
@@ -1379,17 +1365,6 @@ job {
   }
 }
 
-job {
-  id: "vm-kernel-asan-linux-release-ia32-dev"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-asan-linux-release-ia32-dev"
-  }
-}
-
 job {
   id: "vm-kernel-asan-linux-release-x64-dev"
   acl_sets: "default"
@@ -2119,17 +2094,6 @@ job {
   }
 }
 
-job {
-  id: "vm-kernel-asan-linux-release-ia32-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-asan-linux-release-ia32-stable"
-  }
-}
-
 job {
   id: "vm-kernel-asan-linux-release-x64-stable"
   acl_sets: "default"

From 931a3e3cb27752f6b44b0a3061845a0f019d6738 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 10 Oct 2018 18:48:05 +0000
Subject: [PATCH 196/826] [infra] Move vm-kernel-reload-mac-debug-simdbc64 back
 to main consoles

TBR=whesse@google.com

Change-Id: Ieb3d7f26f14f323c6879e981edeb5b4ba92e9c0d
Reviewed-on: https://dart-review.googlesource.com/c/79120
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-milo.cfg | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 8ffd424f9796..92358e37490c 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -233,6 +233,11 @@ consoles: {
     category: "vm|reload-kernel"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-debug-simdbc64"
+    category: "vm|reload-kernel"
+    short_name: "md"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64"
     category: "vm|reload-kernel"
@@ -869,6 +874,11 @@ consoles: {
     category: "vm|reload-kernel"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-debug-simdbc64"
+    category: "vm|reload-kernel"
+    short_name: "md"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64"
     category: "vm|reload-kernel"
@@ -1131,6 +1141,11 @@ consoles: {
     category: "vm|reload-kernel"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-debug-simdbc64"
+    category: "vm|reload-kernel"
+    short_name: "md"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64"
     category: "vm|reload-kernel"
@@ -1515,6 +1530,11 @@ consoles: {
     category: "vm|reload-kernel"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-debug-simdbc64-dev"
+    category: "vm|reload-kernel"
+    short_name: "md"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64-dev"
     category: "vm|reload-kernel"
@@ -1909,6 +1929,11 @@ consoles: {
     category: "vm|reload-kernel"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-debug-simdbc64-stable"
+    category: "vm|reload-kernel"
+    short_name: "md"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64-stable"
     category: "vm|reload-kernel"
@@ -2131,11 +2156,6 @@ consoles: {
     category: "vm|kernel"
     short_name: "o"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-debug-simdbc64"
-    category: "vm|reload-kernel"
-    short_name: "md"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-debug-ia32-none"
     category: "dart2js"

From 1e615f81cdf0fb52ea6872465ce4a5c83b057494 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Fri, 12 Oct 2018 12:28:29 +0000
Subject: [PATCH 197/826] Enable new workflow on FYI builder
 vm-kernel-precomp-obfuscate-linux-release-x64

Change-Id: Idc168bb092b78add39f9125d320f497beba28bd2
Reviewed-on: https://dart-review.googlesource.com/c/79522
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 cr-buildbucket.cfg | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 89a29a6fd609..7ef9f4a49277 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -101,6 +101,13 @@ builder_mixins {
   dimensions: "os:Windows"
 }
 
+builder_mixins {
+  name: "new_workflow"
+  recipe {
+    properties_j: "new_workflow_enabled:true"
+  }
+}
+
 buckets {
   # CI Builders that require special permissions
   name: "luci.dart.ci"
@@ -250,7 +257,7 @@ buckets {
     builders { name: "vm-kernel-precomp-linux-release-simarm64" }
     builders { name: "vm-kernel-precomp-linux-release-x64" }
     builders { name: "vm-kernel-precomp-mac-release-simarm64" mixins: "mac" }
-    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64" }
+    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64"  mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-win-release-simarm64" mixins: "win" }
     builders { name: "vm-kernel-precomp-win-release-x64" mixins: "win" }
     builders { name: "vm-kernel-reload-linux-debug-x64" }

From 1289799897f3bdd1e1563397e03bf4b0e13a6013 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 15 Oct 2018 13:41:57 +0000
Subject: [PATCH 198/826] [infra] Add analyzer branch to Luci config (#34780)

TBR=whesse@google.com

Change-Id: I9f03a5a5b35ee603a2a751d59c7d97a0aa6f64e4
Reviewed-on: https://dart-review.googlesource.com/c/79761
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg |  6 +++++
 luci-milo.cfg      | 67 ++++++++++++++++++++++++++++++++++++++++++++++
 luci-scheduler.cfg | 64 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 137 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 7ef9f4a49277..7b017a46a46d 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -186,6 +186,12 @@ buckets {
     # Fuzz testing builders
     builders { name: "fuzz-linux" }
 
+    # CI Builders for the analyzer branch
+    builders { name: "analyzer-analysis-server-linux-analyzer" }
+    builders { name: "analyzer-linux-release-analyzer" }
+    builders { name: "analyzer-mac-release-analyzer" mixins: "mac" }
+    builders { name: "analyzer-win-release-analyzer" mixins: "win" }
+
     # CI Builders for the master branch
     builders { name: "analyzer-analysis-server-linux" }
     builders { name: "analyzer-linux-release" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 92358e37490c..af8bb2477ea6 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -1,5 +1,72 @@
 logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png"
 
+consoles: {
+  id: "analyzer"
+  name: "SDK Analyzer Branch Console"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "refs/heads/analyzer"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-analyzer"
+    category: "analyzer"
+    short_name: "as"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-analyzer"
+    category: "analyzer"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-analyzer"
+    category: "analyzer"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-analyzer"
+    category: "analyzer"
+    short_name: "w"
+  }
+  header: {
+    links: {
+      name: "Consoles"
+      links: {
+        text: "Bleeding Edge console"
+        url: "/p/dart/g/be/console"
+        alt: "SDK BE Console (migration)"
+      }
+      links: {
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (migration, alternative)"
+      }
+      links: {
+        text: "LUCI console"
+        url: "/p/dart/g/luci/console"
+        alt: "SDK BE Console (LUCI Preview)"
+      }
+      links: {
+        text: "Buildbot console"
+        url: "https://uberchromegw.corp.google.com/i/client.dart/console"
+        alt: "Buildbot Console"
+      }
+      links: {
+        text: "FYI console"
+        url: "/p/dart/g/fyi/console"
+        alt: "SDK FYI Console"
+      }
+      links: {
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      }
+    }
+    console_groups: {
+      console_ids: "dart/flutter"
+    }
+    tree_status_host: "dart-status.appspot.com"
+  }
+}
+
 consoles: {
   id: "be"
   name: "SDK Bleeding Edge Console (migration)"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index af693e5c1b9c..b7cbaedb948a 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -28,6 +28,18 @@ job {
 }
 
 # CI triggers
+trigger {
+  id: "dart-gitiles-trigger-master"
+  acl_sets: "default"
+  gitiles: {
+    repo: "https://dart.googlesource.com/sdk/"
+    refs: "refs/heads/analyzer"
+  }
+  triggers: "analyzer-analysis-server-linux-analyzer"
+  triggers: "analyzer-linux-release-analyzer"
+  triggers: "analyzer-mac-release-analyzer"
+  triggers: "analyzer-win-release-analyzer"
+}
 
 trigger {
   id: "dart-gitiles-trigger-master"
@@ -259,6 +271,54 @@ trigger {
 
 # CI jobs
 
+# analyzer
+
+job {
+  id: "analyzer-analysis-server-linux-analyzer"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-analysis-server-linux-analyzer"
+  }
+}
+
+job {
+  id: "analyzer-linux-release-analyzer"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-linux-release-analyzer"
+  }
+}
+
+job {
+  id: "analyzer-mac-release-analyzer"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-mac-release-analyzer"
+  }
+}
+
+job {
+  id: "analyzer-win-release-analyzer"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-win-release-analyzer"
+  }
+}
+
+# master
+
 job {
   id: "analyzer-analysis-server-linux"
   acl_sets: "default"
@@ -1021,6 +1081,8 @@ job {
   }
 }
 
+# dev
+
 job {
   id: "analyzer-analysis-server-linux-dev"
   acl_sets: "default"
@@ -1750,6 +1812,8 @@ job {
   }
 }
 
+# stable
+
 job {
   id: "analyzer-analysis-server-linux-stable"
   acl_sets: "default"

From 3d7b30e99576da3d63771f71ddc8a250300ad931 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Mon, 15 Oct 2018 14:24:21 +0000
Subject: [PATCH 199/826] Add "new_workflow_enabled" property to vm-obfuscate
 try builder

Change-Id: I2ef47d97585b76fc1ed527dfa8a52ba2aff9c766
Reviewed-on: https://dart-review.googlesource.com/c/79780
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 7b017a46a46d..360324b502af 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -263,7 +263,7 @@ buckets {
     builders { name: "vm-kernel-precomp-linux-release-simarm64" }
     builders { name: "vm-kernel-precomp-linux-release-x64" }
     builders { name: "vm-kernel-precomp-mac-release-simarm64" mixins: "mac" }
-    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64"  mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-win-release-simarm64" mixins: "win" }
     builders { name: "vm-kernel-precomp-win-release-x64" mixins: "win" }
     builders { name: "vm-kernel-reload-linux-debug-x64" }
@@ -549,7 +549,7 @@ buckets {
     builders { name: "vm-kernel-precomp-linux-release-simarm64-try" }
     builders { name: "vm-kernel-precomp-linux-release-x64-try" }
     builders { name: "vm-kernel-precomp-mac-release-simarm64-try" mixins: "mac" }
-    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64-try" }
+    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64-try" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-win-release-simarm64-try" mixins: "win" }
     builders { name: "vm-kernel-precomp-win-release-x64-try" mixins: "win" }
     builders { name: "vm-kernel-reload-linux-debug-x64-try" }

From 67911ac3f8f5d0812155de82a5e14462b4186472 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 16 Oct 2018 12:52:11 +0000
Subject: [PATCH 200/826] [infra] Fix incorrect trigger id in scheduler

TBR=whesse@google.com

Change-Id: I8aacf1af7e3e132436814ccfaaf1141e234bc87b
Reviewed-on: https://dart-review.googlesource.com/c/80200
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-scheduler.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index b7cbaedb948a..e36c677208b3 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -29,7 +29,7 @@ job {
 
 # CI triggers
 trigger {
-  id: "dart-gitiles-trigger-master"
+  id: "dart-gitiles-trigger-analyzer"
   acl_sets: "default"
   gitiles: {
     repo: "https://dart.googlesource.com/sdk/"

From aba19686cb02044e2086b70f5db764affac9f578 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 16 Oct 2018 13:30:12 +0000
Subject: [PATCH 201/826] [infra] Tweak notify config for fuzz testing

TBR=whesse@google.com

Change-Id: If53865a20c0f36b15d62a45abf9fbe47bf392a8d
Reviewed-on: https://dart-review.googlesource.com/c/80222
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-notify.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/luci-notify.cfg b/luci-notify.cfg
index 336a8e93907e..8036331fff3e 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -435,6 +435,7 @@ notifiers {
         on_change: false
         on_success: true
         on_failure: true
+        on_new_failure: false
         email {
             recipients: "ajcbik@google.com"
             recipients: "athom@google.com"
@@ -445,6 +446,5 @@ notifiers {
     builders {
         name: "fuzz-linux"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
     }
 }

From b3ed4db6f1b80780021619a2b7586429b40cbd6b Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 16 Oct 2018 14:34:43 +0000
Subject: [PATCH 202/826] [infra] Move dartkb builder to main consoles

TBR=whesse@google.com

Change-Id: Ide6ddfc6fb9cf6842d881e6b0a1a96a009b27d5a
Reviewed-on: https://dart-review.googlesource.com/c/80223
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 12 +++++-----
 luci-milo.cfg      | 60 ++++++++++++++++++++++++++++++++++++++--------
 luci-notify.cfg    | 10 ++++++++
 luci-scheduler.cfg | 48 +++++++++++++++++++++++++++++++++++++
 4 files changed, 114 insertions(+), 16 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 360324b502af..d75bb63dd554 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -237,8 +237,8 @@ buckets {
     builders { name: "pub-win-release" mixins: "win" }
     builders { name: "target-vm-linux-release-arm64" dimensions: "cpu:arm64" }
     builders { name: "versionchecker-linux" }
-    builders { name: "vm-dartkb-linux-debug-x64" mixins: "fyi" }
-    builders { name: "vm-dartkb-linux-release-x64" mixins: "fyi" }
+    builders { name: "vm-dartkb-linux-debug-x64" }
+    builders { name: "vm-dartkb-linux-release-x64" }
     builders { name: "vm-kernel-asan-linux-release-x64" }
     builders { name: "vm-kernel-checked-linux-release-x64" }
     builders { name: "vm-kernel-linux-debug-ia32" }
@@ -323,8 +323,8 @@ buckets {
     builders { name: "pub-win-release-dev" mixins: "win" }
     builders { name: "target-vm-linux-release-arm64-dev" dimensions: "cpu:arm64" }
     builders { name: "versionchecker-linux-dev" }
-    builders { name: "vm-dartkb-linux-debug-x64-dev" mixins: "fyi" }
-    builders { name: "vm-dartkb-linux-release-x64-dev" mixins: "fyi" }
+    builders { name: "vm-dartkb-linux-debug-x64-dev" }
+    builders { name: "vm-dartkb-linux-release-x64-dev" }
     builders { name: "vm-kernel-asan-linux-release-x64-dev" }
     builders { name: "vm-kernel-checked-linux-release-x64-dev" }
     builders { name: "vm-kernel-linux-debug-ia32-dev" }
@@ -409,8 +409,8 @@ buckets {
     builders { name: "pub-win-release-stable" mixins: "win" }
     builders { name: "target-vm-linux-release-arm64-stable" dimensions: "cpu:arm64" }
     builders { name: "versionchecker-linux-stable" }
-    builders { name: "vm-dartkb-linux-debug-x64-stable" mixins: "fyi" }
-    builders { name: "vm-dartkb-linux-release-x64-stable" mixins: "fyi" }
+    builders { name: "vm-dartkb-linux-debug-x64-stable" }
+    builders { name: "vm-dartkb-linux-release-x64-stable" }
     builders { name: "vm-kernel-asan-linux-release-x64-stable" }
     builders { name: "vm-kernel-checked-linux-release-x64-stable" }
     builders { name: "vm-kernel-linux-debug-ia32-stable" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index af8bb2477ea6..89df4707dd6a 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -103,6 +103,16 @@ consoles: {
     category: "vm|app-kernel"
     short_name: "r64"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64"
+    category: "vm|dartkb"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64"
+    category: "vm|dartkb"
+    short_name: "r"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
     category: "vm|kernel"
@@ -744,6 +754,16 @@ consoles: {
     category: "vm|app-kernel"
     short_name: "r64"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64"
+    category: "vm|dartkb"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64"
+    category: "vm|dartkb"
+    short_name: "r"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
     category: "vm|kernel"
@@ -1033,6 +1053,16 @@ consoles: {
     category: "vm|app-kernel"
     short_name: "r64"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64"
+    category: "vm|dartkb"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64"
+    category: "vm|dartkb"
+    short_name: "r"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
     category: "vm|kernel"
@@ -1422,6 +1452,16 @@ consoles: {
     category: "vm|app-kernel"
     short_name: "r64"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64-dev"
+    category: "vm|dartkb"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-dev"
+    category: "vm|dartkb"
+    short_name: "r"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-dev"
     category: "vm|kernel"
@@ -1821,6 +1861,16 @@ consoles: {
     category: "vm|app-kernel"
     short_name: "r64"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64-stable"
+    category: "vm|dartkb"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-stable"
+    category: "vm|dartkb"
+    short_name: "r"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-stable"
     category: "vm|kernel"
@@ -2208,16 +2258,6 @@ consoles: {
     category: "vm|flutter"
     short_name: "f"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64"
-    category: "vm|dartkb"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64"
-    category: "vm|dartkb"
-    short_name: "r"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
     category: "vm|kernel"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 8036331fff3e..52c535721bbc 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -242,6 +242,16 @@ notifiers {
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
+    builders {
+        name: "vm-dartkb-linux-debug-x64"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-dartkb-linux-release-x64"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
     builders {
         name: "vm-kernel-asan-linux-release-x64"
         bucket: "ci.sandbox"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index e36c677208b3..c10dccf98037 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -157,6 +157,8 @@ trigger {
   triggers: "pkg-linux-release-dev"
   triggers: "pkg-mac-release-dev"
   triggers: "pkg-win-release-dev"
+  triggers: "vm-dartkb-linux-debug-x64-dev"
+  triggers: "vm-dartkb-linux-release-x64-dev"
   triggers: "vm-kernel-asan-linux-release-x64-dev"
   triggers: "vm-kernel-checked-linux-release-x64-dev"
   triggers: "vm-kernel-linux-debug-ia32-dev"
@@ -232,6 +234,8 @@ trigger {
   triggers: "pkg-linux-release-stable"
   triggers: "pkg-mac-release-stable"
   triggers: "pkg-win-release-stable"
+  triggers: "vm-dartkb-linux-debug-x64-stable"
+  triggers: "vm-dartkb-linux-release-x64-stable"
   triggers: "vm-kernel-asan-linux-release-x64-stable"
   triggers: "vm-kernel-checked-linux-release-x64-stable"
   triggers: "vm-kernel-linux-debug-ia32-stable"
@@ -1427,6 +1431,28 @@ job {
   }
 }
 
+job {
+  id: "vm-dartkb-linux-debug-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-debug-x64-dev"
+  }
+}
+
+job {
+  id: "vm-dartkb-linux-release-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-release-x64-dev"
+  }
+}
+
 job {
   id: "vm-kernel-asan-linux-release-x64-dev"
   acl_sets: "default"
@@ -2158,6 +2184,28 @@ job {
   }
 }
 
+job {
+  id: "vm-dartkb-linux-debug-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-debug-x64-stable"
+  }
+}
+
+job {
+  id: "vm-dartkb-linux-release-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-release-x64-stable"
+  }
+}
+
 job {
   id: "vm-kernel-asan-linux-release-x64-stable"
   acl_sets: "default"

From 92517c589b7512a93ce1c4492bfbad728df5653d Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 18 Oct 2018 09:47:40 +0000
Subject: [PATCH 203/826] [infra] Add flutter-analyze try builder (#34739)

TBR=whesse@google.com

Change-Id: I2393bc27bf6681b84aeead5631de01b0c775cb9c
Reviewed-on: https://dart-review.googlesource.com/c/80622
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index d75bb63dd554..098e61b80f77 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -516,6 +516,7 @@ buckets {
     builders { name: "ddc-linux-release-chrome-try" mixins: "clobber" }
     builders { name: "ddc-mac-release-chrome-try" mixins: "mac" }
     builders { name: "ddc-win-release-chrome-try" mixins: "win" }
+    builders { name: "flutter-analyze-try" }
     builders { name: "front-end-linux-release-x64-try" mixins: "clobber" }
     builders { name: "front-end-mac-release-x64-try" mixins: "clobber" mixins: "mac" }
     builders { name: "front-end-win-release-x64-try" mixins: "clobber" mixins: "win" }

From 0bcc5e656eeca6beecdb5576e2b942952eb7055d Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Mon, 22 Oct 2018 12:47:18 +0000
Subject: [PATCH 204/826] Revert "Add "new_workflow_enabled" property to
 vm-obfuscate try builder"

This reverts commit 3d7b30e99576da3d63771f71ddc8a250300ad931.

Reason for revert: The VM team wishes to maintain the bot.

Original change's description:
> Add "new_workflow_enabled" property to vm-obfuscate try builder
>
> Change-Id: I2ef47d97585b76fc1ed527dfa8a52ba2aff9c766
> Reviewed-on: https://dart-review.googlesource.com/c/79780
> Reviewed-by: Alexander Thomas <athom@google.com>

TBR=whesse@google.com,sortie@google.com,athom@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: I5e90ff2194cee7750e26049c61e3be8b179d23b3
Reviewed-on: https://dart-review.googlesource.com/c/81010
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 cr-buildbucket.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 098e61b80f77..b9a6b1b96bb3 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -263,7 +263,7 @@ buckets {
     builders { name: "vm-kernel-precomp-linux-release-simarm64" }
     builders { name: "vm-kernel-precomp-linux-release-x64" }
     builders { name: "vm-kernel-precomp-mac-release-simarm64" mixins: "mac" }
-    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64"  mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-win-release-simarm64" mixins: "win" }
     builders { name: "vm-kernel-precomp-win-release-x64" mixins: "win" }
     builders { name: "vm-kernel-reload-linux-debug-x64" }
@@ -550,7 +550,7 @@ buckets {
     builders { name: "vm-kernel-precomp-linux-release-simarm64-try" }
     builders { name: "vm-kernel-precomp-linux-release-x64-try" }
     builders { name: "vm-kernel-precomp-mac-release-simarm64-try" mixins: "mac" }
-    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64-try" }
     builders { name: "vm-kernel-precomp-win-release-simarm64-try" mixins: "win" }
     builders { name: "vm-kernel-precomp-win-release-x64-try" mixins: "win" }
     builders { name: "vm-kernel-reload-linux-debug-x64-try" }

From ce1d555e9c2f15be79bd06784dc9a9e8806153d2 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Mon, 22 Oct 2018 13:01:07 +0000
Subject: [PATCH 205/826] Revert "Enable new workflow on FYI builder
 vm-kernel-precomp-obfuscate-linux-release-x64"

This reverts commit 1e615f81cdf0fb52ea6872465ce4a5c83b057494.

Reason for revert: The VM team wishes to maintain the bot.

Original change's description:
> Enable new workflow on FYI builder vm-kernel-precomp-obfuscate-linux-release-x64
>
> Change-Id: Idc168bb092b78add39f9125d320f497beba28bd2
> Reviewed-on: https://dart-review.googlesource.com/c/79522
> Reviewed-by: Jonas Termansen <sortie@google.com>

TBR=whesse@google.com,sortie@google.com,athom@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: I1c993cfe50f390bbf473c4abf4438827f71a7f52
Reviewed-on: https://dart-review.googlesource.com/c/81020
Commit-Queue: Jonas Termansen <sortie@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 cr-buildbucket.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index b9a6b1b96bb3..b1d37f8036f3 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -263,7 +263,7 @@ buckets {
     builders { name: "vm-kernel-precomp-linux-release-simarm64" }
     builders { name: "vm-kernel-precomp-linux-release-x64" }
     builders { name: "vm-kernel-precomp-mac-release-simarm64" mixins: "mac" }
-    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64"  mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64" }
     builders { name: "vm-kernel-precomp-win-release-simarm64" mixins: "win" }
     builders { name: "vm-kernel-precomp-win-release-x64" mixins: "win" }
     builders { name: "vm-kernel-reload-linux-debug-x64" }

From e53ab40855319df22570d2c02b9b1d7fa7153995 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 22 Oct 2018 18:31:47 +0000
Subject: [PATCH 206/826] [infra] Create new flutter-analyze builder for the
 analyzer branch

See #34739.

TBR=whesse@google.com

Change-Id: I30e6fbbe94e760c2fe306dff9571f91af18c2ce1
Reviewed-on: https://dart-review.googlesource.com/c/81102
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg |  1 +
 luci-milo.cfg      |  5 +++++
 luci-scheduler.cfg | 12 ++++++++++++
 3 files changed, 18 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index b1d37f8036f3..dd91dca0ef26 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -191,6 +191,7 @@ buckets {
     builders { name: "analyzer-linux-release-analyzer" }
     builders { name: "analyzer-mac-release-analyzer" mixins: "mac" }
     builders { name: "analyzer-win-release-analyzer" mixins: "win" }
+    builders { name: "flutter-analyze-analyzer" }
 
     # CI Builders for the master branch
     builders { name: "analyzer-analysis-server-linux" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 89df4707dd6a..b47afdc5f57a 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -26,6 +26,11 @@ consoles: {
     category: "analyzer"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze-analyzer"
+    category: "analyzer"
+    short_name: "fl"
+  }
   header: {
     links: {
       name: "Consoles"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index c10dccf98037..6545cadb1de5 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -39,6 +39,7 @@ trigger {
   triggers: "analyzer-linux-release-analyzer"
   triggers: "analyzer-mac-release-analyzer"
   triggers: "analyzer-win-release-analyzer"
+  triggers: "flutter-analyze-analyzer"
 }
 
 trigger {
@@ -321,6 +322,17 @@ job {
   }
 }
 
+job {
+  id: "flutter-analyze-analyzer"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "flutter-analyze-analyzer"
+  }
+}
+
 # master
 
 job {

From 50b64f4e64925780b8cb48150dda168177e1650d Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Wed, 31 Oct 2018 23:37:56 +0000
Subject: [PATCH 207/826] [infra] Add duplicated builder to analyzer branch,
 running new test results workflow

Dogfooding of new workflow for analyzer team on a builder that only appears
on their console at https://ci.chromium.org/p/dart/g/analyzer/console

Change-Id: Ib516ef4a12c293cd78ea073edbde00a2ec18d9a5
Reviewed-on: https://dart-review.googlesource.com/c/82420
Reviewed-by: Devon Carew <devoncarew@google.com>
---
 cr-buildbucket.cfg |  1 +
 luci-milo.cfg      |  5 +++++
 luci-scheduler.cfg | 12 ++++++++++++
 3 files changed, 18 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index dd91dca0ef26..f810beb2e763 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -189,6 +189,7 @@ buckets {
     # CI Builders for the analyzer branch
     builders { name: "analyzer-analysis-server-linux-analyzer" }
     builders { name: "analyzer-linux-release-analyzer" }
+    builders { name: "analyzer-linux-release-analyzer-new" mixins: "new_workflow" }
     builders { name: "analyzer-mac-release-analyzer" mixins: "mac" }
     builders { name: "analyzer-win-release-analyzer" mixins: "win" }
     builders { name: "flutter-analyze-analyzer" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index b47afdc5f57a..b64936c3c442 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -16,6 +16,11 @@ consoles: {
     category: "analyzer"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-analyzer-new"
+    category: "analyzer"
+    short_name: "ln"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-analyzer"
     category: "analyzer"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 6545cadb1de5..6c19e5feb48d 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -37,6 +37,7 @@ trigger {
   }
   triggers: "analyzer-analysis-server-linux-analyzer"
   triggers: "analyzer-linux-release-analyzer"
+  triggers: "analyzer-linux-release-analyzer-new"
   triggers: "analyzer-mac-release-analyzer"
   triggers: "analyzer-win-release-analyzer"
   triggers: "flutter-analyze-analyzer"
@@ -300,6 +301,17 @@ job {
   }
 }
 
+job {
+  id: "analyzer-linux-release-analyzer-new"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-linux-release-analyzer-new"
+  }
+}
+
 job {
   id: "analyzer-mac-release-analyzer"
   acl_sets: "default"

From e8fb774c012132075f91ac12b3c001571d6792a3 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Mon, 5 Nov 2018 19:22:45 +0000
Subject: [PATCH 208/826] Enable new workflow on dart2js-win-firefox builder

Change-Id: I9b26bd08a536e38738206b160f97a4eed6a9c679
Reviewed-on: https://dart-review.googlesource.com/c/82884
Reviewed-by: Alexander Thomas <athom@google.com>
Reviewed-by: Sigmund Cherem <sigmund@google.com>
---
 cr-buildbucket.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index f810beb2e763..f94b0b61834c 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -222,7 +222,7 @@ buckets {
     builders { name: "dart2js-strong-mac-x64-safari" mixins: "mac" }
     builders { name: "dart2js-strong-win-x64-chrome" mixins: "win" }
     builders { name: "dart2js-strong-win-x64-edge" mixins: "win" }
-    builders { name: "dart2js-strong-win-x64-firefox" mixins: "win" }
+    builders { name: "dart2js-strong-win-x64-firefox" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-win-x64-ie11" mixins: "win" }
     builders { name: "dart2js-unit-linux-x64-release" }
     builders { name: "ddc-linux-release-chrome" }

From b4a2c0e31b769296403ec1ee5590aa9e48f02d49 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 6 Nov 2018 07:55:17 +0000
Subject: [PATCH 209/826] [infra] Move obfuscate builder from FYI to the main
 consoles (#34922)

TBR=whesse@google.com

Change-Id: Iffd4912ddbbe94fcf6250f4ee13ea3bd97e5f5d1
Reviewed-on: https://dart-review.googlesource.com/c/82982
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-milo.cfg      | 30 +++++++++++++++++++++++++-----
 luci-notify.cfg    |  5 +++++
 luci-scheduler.cfg | 28 ++++++++++++++++++++++++++--
 3 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index b64936c3c442..75ab4cc3b705 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -253,6 +253,11 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "o"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
     category: "vm|kernel-precomp"
@@ -904,6 +909,11 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "o"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
     category: "vm|kernel-precomp"
@@ -1183,6 +1193,11 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "o"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
     category: "vm|kernel-precomp"
@@ -1582,6 +1597,11 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+    category: "vm|kernel"
+    short_name: "o"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-dev"
     category: "vm|kernel-precomp"
@@ -1991,6 +2011,11 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+    category: "vm|kernel"
+    short_name: "o"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-stable"
     category: "vm|kernel-precomp"
@@ -2268,11 +2293,6 @@ consoles: {
     category: "vm|flutter"
     short_name: "f"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
-    category: "vm|kernel"
-    short_name: "o"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-debug-ia32-none"
     category: "dart2js"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 52c535721bbc..d24846bbe7b3 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -372,6 +372,11 @@ notifiers {
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
+    builders {
+        name: "vm-kernel-precomp-obfuscate-linux-release-x64"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
     builders {
         name: "vm-kernel-precomp-win-release-simarm64"
         bucket: "ci.sandbox"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 6c19e5feb48d..cceed1ed96e3 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -183,6 +183,7 @@ trigger {
   triggers: "vm-kernel-precomp-linux-release-simarm64-dev"
   triggers: "vm-kernel-precomp-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-mac-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-win-release-simarm64-dev"
   triggers: "vm-kernel-precomp-win-release-x64-dev"
   triggers: "vm-kernel-reload-linux-debug-x64-dev"
@@ -260,6 +261,7 @@ trigger {
   triggers: "vm-kernel-precomp-linux-release-simarm64-stable"
   triggers: "vm-kernel-precomp-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-mac-release-simarm64-stable"
+  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-win-release-simarm64-stable"
   triggers: "vm-kernel-precomp-win-release-x64-stable"
   triggers: "vm-kernel-reload-linux-debug-x64-stable"
@@ -1719,6 +1721,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+  }
+}
+
 job {
   id: "vm-kernel-precomp-win-release-simarm64-dev"
   acl_sets: "default"
@@ -2468,7 +2481,18 @@ job {
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-mac-release-simarm64-dev"
+    builder: "vm-kernel-precomp-mac-release-simarm64-stable"
+  }
+}
+
+job {
+  id: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
   }
 }
 
@@ -2479,7 +2503,7 @@ job {
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-simarm64-dev"
+    builder: "vm-kernel-precomp-win-release-simarm64-stable"
   }
 }
 

From 54bda58b0cceac71733792289097d72f8a9a3df7 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 8 Nov 2018 13:09:41 +0000
Subject: [PATCH 210/826] [infra] Add base branch forwarding builder

Change-Id: I594baea148b3abcd741ff49203e7401a001c7c0d
Reviewed-on: https://dart-review.googlesource.com/c/83440
Reviewed-by: William Hesse <whesse@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 cr-buildbucket.cfg |  8 ++++++++
 luci-notify.cfg    | 21 ++++++++++++++++++++-
 luci-scheduler.cfg | 13 ++++++++++++-
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index f94b0b61834c..a722d5cc2cc2 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -69,6 +69,13 @@ builder_mixins {
   }
 }
 
+builder_mixins {
+  name: "forward"
+  recipe {
+    name: "dart/forward_branch"
+  }
+}
+
 builder_mixins {
   name: "fyi"
   recipe {
@@ -151,6 +158,7 @@ buckets {
     builders { name: "dart-sdk-mac-stable" mixins: "mac" }
     builders { name: "dart-sdk-win-stable" mixins: "win" }
     builders { name: "debianpackage-linux-stable" mixins: "debianpackage" }
+    builders { name: "base" mixins: "forward" }
   }
 }
 
diff --git a/luci-notify.cfg b/luci-notify.cfg
index d24846bbe7b3..70f52a89ab13 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -8,6 +8,26 @@
 # on_change  = Whenever the build status changes.
 # on_success = On every build success.
 # on_failure = On every build failure.
+notifiers {
+    name: "infra"
+    notifications {
+        on_change: false
+        on_success: false
+        on_failure: true
+        on_new_failure: false
+        email {
+            recipients: "athom@google.com"
+            recipients: "sortie@google.com"
+            recipients: "whesse@google.com"
+        }
+    }
+
+    builders {
+        name: "base"
+        bucket: "ci"
+    }
+}
+
 notifiers {
     name: "dart"
     notifications {
@@ -457,7 +477,6 @@ notifiers {
         }
     }
 
-    # CI Builders for the master branch
     builders {
         name: "fuzz-linux"
         bucket: "ci.sandbox"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index cceed1ed96e3..f68ba914d07d 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -14,7 +14,18 @@ acl_sets {
   }
 }
 
-# Fuzz testing cron jobs
+# Special cron jobs
+
+job {
+  id: "base"
+  acl_sets: "default"
+  schedule: "with 10m interval"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "base"
+  }
+}
 
 job {
   id: "fuzz-linux"

From 8622d4edde885170adb88b11f638b43470aa660f Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Thu, 8 Nov 2018 20:19:38 +0000
Subject: [PATCH 211/826] Switch linux/firefox and mac/safari dart2js bots to
 new workflow. win/firefox is already on new workflow.

Change-Id: I191895256e4b7eabdd32eea79dc103da3fbcfdc2
Reviewed-on: https://dart-review.googlesource.com/c/83861
Auto-Submit: William Hesse <whesse@google.com>
Reviewed-by: Sigmund Cherem <sigmund@google.com>
Commit-Queue: Sigmund Cherem <sigmund@google.com>
---
 cr-buildbucket.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index a722d5cc2cc2..f759e3c40f56 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -225,9 +225,9 @@ buckets {
     builders { name: "dart2js-strong-faststartup-win-x64-ie11" mixins: "win" }
     builders { name: "dart2js-strong-hostasserts-linux-ia32-d8" }
     builders { name: "dart2js-strong-linux-x64-chrome" }
-    builders { name: "dart2js-strong-linux-x64-firefox" }
+    builders { name: "dart2js-strong-linux-x64-firefox" mixins: "new_workflow" }
     builders { name: "dart2js-strong-mac-x64-chrome" mixins: "mac" }
-    builders { name: "dart2js-strong-mac-x64-safari" mixins: "mac" }
+    builders { name: "dart2js-strong-mac-x64-safari" mixins: "mac" mixins: "new_workflow" }
     builders { name: "dart2js-strong-win-x64-chrome" mixins: "win" }
     builders { name: "dart2js-strong-win-x64-edge" mixins: "win" }
     builders { name: "dart2js-strong-win-x64-firefox" mixins: "win" mixins: "new_workflow" }

From 337fe60e254b8b0b54663d113d30502ee709d5d1 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 12 Nov 2018 19:17:30 +0000
Subject: [PATCH 212/826] [infra] Migrate IE11 builder to Luci & new workflow

Change-Id: Iccfeeb5625a3e0dc024421f02547cc9188660423
Reviewed-on: https://dart-review.googlesource.com/c/84030
Reviewed-by: Sigmund Cherem <sigmund@google.com>
---
 cr-buildbucket.cfg |  8 ++---
 luci-milo.cfg      | 85 +++++++++++-----------------------------------
 luci-scheduler.cfg | 36 ++++++++++++++++++++
 3 files changed, 59 insertions(+), 70 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index f759e3c40f56..f46fef04c0a9 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -222,7 +222,7 @@ buckets {
     builders { name: "dart2js-strong-faststartup-win-x64-chrome" mixins: "win" }
     builders { name: "dart2js-strong-faststartup-win-x64-edge" mixins: "win" }
     builders { name: "dart2js-strong-faststartup-win-x64-firefox" mixins: "win" }
-    builders { name: "dart2js-strong-faststartup-win-x64-ie11" mixins: "win" }
+    builders { name: "dart2js-strong-faststartup-win-x64-ie11" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-hostasserts-linux-ia32-d8" }
     builders { name: "dart2js-strong-linux-x64-chrome" }
     builders { name: "dart2js-strong-linux-x64-firefox" mixins: "new_workflow" }
@@ -308,7 +308,7 @@ buckets {
     builders { name: "dart2js-strong-faststartup-win-x64-chrome-dev" mixins: "win" }
     builders { name: "dart2js-strong-faststartup-win-x64-edge-dev" mixins: "win" }
     builders { name: "dart2js-strong-faststartup-win-x64-firefox-dev" mixins: "win" }
-    builders { name: "dart2js-strong-faststartup-win-x64-ie11-dev" mixins: "win" }
+    builders { name: "dart2js-strong-faststartup-win-x64-ie11-dev" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-hostasserts-linux-ia32-d8-dev" }
     builders { name: "dart2js-strong-linux-x64-chrome-dev" }
     builders { name: "dart2js-strong-linux-x64-firefox-dev" }
@@ -394,7 +394,7 @@ buckets {
     builders { name: "dart2js-strong-faststartup-win-x64-chrome-stable" mixins: "win" }
     builders { name: "dart2js-strong-faststartup-win-x64-edge-stable" mixins: "win" }
     builders { name: "dart2js-strong-faststartup-win-x64-firefox-stable" mixins: "win" }
-    builders { name: "dart2js-strong-faststartup-win-x64-ie11-stable" mixins: "win" }
+    builders { name: "dart2js-strong-faststartup-win-x64-ie11-stable" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-hostasserts-linux-ia32-d8-stable" }
     builders { name: "dart2js-strong-linux-x64-chrome-stable" }
     builders { name: "dart2js-strong-linux-x64-firefox-stable" }
@@ -513,7 +513,7 @@ buckets {
     builders { name: "dart2js-strong-faststartup-mac-x64-safari-try" mixins: "mac" }
     builders { name: "dart2js-strong-faststartup-win-x64-chrome-try" mixins: "win" }
     builders { name: "dart2js-strong-faststartup-win-x64-firefox-try" mixins: "win" }
-    builders { name: "dart2js-strong-faststartup-win-x64-ie11-try" mixins: "win" }
+    builders { name: "dart2js-strong-faststartup-win-x64-ie11-try" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-hostasserts-linux-ia32-d8-try" }
     builders { name: "dart2js-strong-linux-x64-chrome-try" }
     builders { name: "dart2js-strong-linux-x64-firefox-try" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 75ab4cc3b705..d8a2f15b5430 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -458,44 +458,11 @@ consoles: {
     category: "dart2js|chrome"
     short_name: "w"
   }
-# doesn't exist on buildbot, new builder
-#  builders {
-#    # migrating to dart2js-win-x64-edge
-#    name: "buildbot/client.dart/dart2js-win-x64-edge-be"
-#    category: "dart2js|ms"
-#    short_name: "ed"
-#  }
-  builders {
-    # migrating to dart2js-win-x64-firefox
-    name: "buildbot/client.dart/dart2js-win7-ie11-1-4-be"
-    category: "dart2js|ms"
-    short_name: "1ie"
-  }
   builders {
-    # migrating to dart2js-win-x64-firefox
-    name: "buildbot/client.dart/dart2js-win7-ie11-2-4-be"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-faststartup-win-x64-ie11"
     category: "dart2js|ms"
-    short_name: "2ie"
+    short_name: "ie"
   }
-  builders {
-    # migrating to dart2js-win-x64-firefox
-    name: "buildbot/client.dart/dart2js-win7-ie11-3-4-be"
-    category: "dart2js|ms"
-    short_name: "3ie"
-  }
-  builders {
-    # migrating to dart2js-win-x64-firefox
-    name: "buildbot/client.dart/dart2js-win7-ie11-4-4-be"
-    category: "dart2js|ms"
-    short_name: "4ie"
-  }
-# doesn't exist on buildbot, included in ie11ff builder
-#  builders {
-#    # migrating to dart2js-win-x64-ie11
-#    name: "buildbot/client.dart/dart2js-win-x64-ie11-be"
-#    category: "dart2js|ms"
-#    short_name: "ie"
-#  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
@@ -693,40 +660,11 @@ consoles: {
     category: "dart2js|chrome"
     short_name: "w"
   }
-# doesn't exist on buildbot, new builder
-#  builders {
-#    # migrating to dart2js-win-x64-edge
-#    name: "buildbot/client.dart/dart2js-win-x64-edge-be"
-#    category: "dart2js|ms"
-#    short_name: "ed"
-#  }
-  builders {
-    name: "buildbot/client.dart/dart2js-win7-ie11-1-4-be"
-    category: "dart2js|ms"
-    short_name: "1ie"
-  }
-  builders {
-    name: "buildbot/client.dart/dart2js-win7-ie11-2-4-be"
-    category: "dart2js|ms"
-    short_name: "2ie"
-  }
-  builders {
-    name: "buildbot/client.dart/dart2js-win7-ie11-3-4-be"
-    category: "dart2js|ms"
-    short_name: "3ie"
-  }
   builders {
-    name: "buildbot/client.dart/dart2js-win7-ie11-4-4-be"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-faststartup-win-x64-ie11"
     category: "dart2js|ms"
-    short_name: "4ie"
+    short_name: "ie"
   }
-# doesn't exist on buildbot, included in ie11ff builder
-#  builders {
-#    # migrating to dart2js-win-x64-ie11
-#    name: "buildbot/client.dart/dart2js-win-x64-ie11-be"
-#    category: "dart2js|ms"
-#    short_name: "ie"
-#  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
@@ -1383,6 +1321,11 @@ consoles: {
     category: "dart2js|chrome"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-faststartup-win-x64-ie11"
+    category: "dart2js|ms"
+    short_name: "ie"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
@@ -1797,6 +1740,11 @@ consoles: {
     category: "dart2js|firefox"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-faststartup-win-x64-ie11-dev"
+    category: "dart2js|ms"
+    short_name: "ie"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
     category: "pkg"
@@ -2211,6 +2159,11 @@ consoles: {
     category: "dart2js|firefox"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-faststartup-win-x64-ie11-stable"
+    category: "dart2js|ms"
+    short_name: "ie"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
     category: "pkg"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index f68ba914d07d..18d6cd6fa501 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -74,6 +74,7 @@ trigger {
   triggers: "dart-sdk-win"
   triggers: "dart2js-csp-minified-linux-x64-chrome"
   triggers: "dart2js-strong-faststartup-linux-x64-chrome"
+  triggers: "dart2js-strong-faststartup-win-x64-ie11"
   triggers: "dart2js-strong-linux-x64-chrome"
   triggers: "dart2js-strong-linux-x64-firefox"
   triggers: "dart2js-strong-mac-x64-chrome"
@@ -152,6 +153,7 @@ trigger {
   triggers: "dart-sdk-win-dev"
   triggers: "dart2js-csp-minified-linux-x64-chrome-dev"
   triggers: "dart2js-strong-faststartup-linux-x64-chrome-dev"
+  triggers: "dart2js-strong-faststartup-win-x64-ie11-dev"
   triggers: "dart2js-strong-linux-x64-chrome-dev"
   triggers: "dart2js-strong-linux-x64-firefox-dev"
   triggers: "dart2js-strong-mac-x64-chrome-dev"
@@ -230,6 +232,7 @@ trigger {
   triggers: "dart-sdk-win-stable"
   triggers: "dart2js-csp-minified-linux-x64-chrome-stable"
   triggers: "dart2js-strong-faststartup-linux-x64-chrome-stable"
+  triggers: "dart2js-strong-faststartup-win-x64-ie11-stable"
   triggers: "dart2js-strong-linux-x64-chrome-stable"
   triggers: "dart2js-strong-linux-x64-firefox-stable"
   triggers: "dart2js-strong-mac-x64-chrome-stable"
@@ -506,6 +509,17 @@ job {
   }
 }
 
+job {
+  id: "dart2js-strong-faststartup-win-x64-ie11"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-faststartup-win-x64-ie11"
+  }
+}
+
 job {
   id: "dart2js-strong-linux-x64-chrome"
   acl_sets: "default"
@@ -1270,6 +1284,17 @@ job {
   }
 }
 
+job {
+  id: "dart2js-strong-faststartup-win-x64-ie11-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-faststartup-win-x64-ie11-dev"
+  }
+}
+
 job {
   id: "dart2js-strong-linux-x64-chrome-dev"
   acl_sets: "default"
@@ -2034,6 +2059,17 @@ job {
   }
 }
 
+job {
+  id: "dart2js-strong-faststartup-win-x64-ie11-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-faststartup-win-x64-ie11-stable"
+  }
+}
+
 job {
   id: "dart2js-strong-linux-x64-chrome-stable"
   acl_sets: "default"

From 4b1abba395e86f605b5627b7af2eb21a75c83243 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 14 Nov 2018 11:48:44 +0000
Subject: [PATCH 213/826] [infra] Migrate cross/target-vm builders to Luci

* Move the cross builders to the ci bucket so they can schedule builds.
* Add triggers for the master branch (dev and stable to be done later).
* Update consoles.

TBR=whesse@google.com

Change-Id: I3875618590377e40c2c5d6b0445349b04c2a98c4
Reviewed-on: https://dart-review.googlesource.com/c/84422
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 12 ++++++++----
 luci-milo.cfg      | 28 ++++++++++++----------------
 luci-notify.cfg    |  2 +-
 luci-scheduler.cfg | 12 ++++++++++++
 4 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index f46fef04c0a9..47b42daf7801 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -144,21 +144,28 @@ buckets {
     }
 
     # CI Builders that require privileged access
+    builders { name: "base" mixins: "forward" }
     builders { name: "chocolatey" mixins: "chocolatey" mixins: "win" }
+    builders { name: "cross-vm-linux-release-arm64" }
     builders { name: "dart-sdk-linux" }
     builders { name: "dart-sdk-mac" mixins: "mac" }
     builders { name: "dart-sdk-win" mixins: "win" }
     builders { name: "docker" mixins: "docker" }
     builders { name: "debianpackage-linux" mixins: "debianpackage" }
+
+    # CI Builders that require privileged access on the dev branch
+    builders { name: "cross-vm-linux-release-arm64-dev" }
     builders { name: "dart-sdk-linux-dev" }
     builders { name: "dart-sdk-mac-dev" mixins: "mac" }
     builders { name: "dart-sdk-win-dev" mixins: "win" }
     builders { name: "debianpackage-linux-dev" mixins: "debianpackage" }
+
+    # CI Builders that require privileged access on the stable branch
+    builders { name: "cross-vm-linux-release-arm64-stable" }
     builders { name: "dart-sdk-linux-stable" }
     builders { name: "dart-sdk-mac-stable" mixins: "mac" }
     builders { name: "dart-sdk-win-stable" mixins: "win" }
     builders { name: "debianpackage-linux-stable" mixins: "debianpackage" }
-    builders { name: "base" mixins: "forward" }
   }
 }
 
@@ -212,7 +219,6 @@ buckets {
     builders { name: "app-kernel-linux-debug-x64" }
     builders { name: "app-kernel-linux-product-x64" }
     builders { name: "app-kernel-linux-release-x64" }
-    builders { name: "cross-vm-linux-release-arm64" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome" }
     builders { name: "dart2js-minified-strong-linux-x64-d8" }
     builders { name: "dart2js-strong-faststartup-linux-x64-chrome" }
@@ -298,7 +304,6 @@ buckets {
     builders { name: "app-kernel-linux-debug-x64-dev" }
     builders { name: "app-kernel-linux-product-x64-dev" }
     builders { name: "app-kernel-linux-release-x64-dev" }
-    builders { name: "cross-vm-linux-release-arm64-dev" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome-dev" }
     builders { name: "dart2js-minified-strong-linux-x64-d8-dev" }
     builders { name: "dart2js-strong-faststartup-linux-x64-chrome-dev" }
@@ -384,7 +389,6 @@ buckets {
     builders { name: "app-kernel-linux-debug-x64-stable" }
     builders { name: "app-kernel-linux-product-x64-stable" }
     builders { name: "app-kernel-linux-release-x64-stable" }
-    builders { name: "cross-vm-linux-release-arm64-stable" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome-stable" }
     builders { name: "dart2js-minified-strong-linux-x64-d8-stable" }
     builders { name: "dart2js-strong-faststartup-linux-x64-chrome-stable" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index d8a2f15b5430..c4a6cb2c1a55 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -274,16 +274,14 @@ consoles: {
     short_name: "wr"
   }
   builders {
-    # migrating to cross-vm-linux-release-arm64
-    name: "buildbot/client.dart/cross-arm64-vm-linux-release-be"
+    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
     category: "vm|kernel"
     short_name: "cra"
   }
   builders {
-    # migrating to target-vm-linux-release-arm64
-    name: "buildbot/client.dart/target-arm64-vm-linux-release-be"
+    name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64"
     category: "vm|kernel"
-    short_name: "tra"
+    short_name: "ta"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
@@ -868,16 +866,14 @@ consoles: {
     short_name: "wr"
   }
   builders {
-    # migrating to cross-vm-linux-release-arm64
-    name: "buildbot/client.dart/cross-arm64-vm-linux-release-be"
+    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
     category: "vm|kernel"
     short_name: "cra"
   }
   builders {
-    # migrating to target-vm-linux-release-arm64
-    name: "buildbot/client.dart/target-arm64-vm-linux-release-be"
+    name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64"
     category: "vm|kernel"
-    short_name: "tra"
+    short_name: "ta"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
@@ -1152,14 +1148,14 @@ consoles: {
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
+    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
     category: "vm|kernel"
     short_name: "cra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64"
     category: "vm|kernel"
-    short_name: "tra"
+    short_name: "ta"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
@@ -1561,14 +1557,14 @@ consoles: {
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-dev"
+    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64-dev"
     category: "vm|kernel"
     short_name: "cra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64-dev"
     category: "vm|kernel"
-    short_name: "tra"
+    short_name: "ta"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-dev"
@@ -1980,14 +1976,14 @@ consoles: {
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-stable"
+    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64-stable"
     category: "vm|kernel"
     short_name: "cra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64-stable"
     category: "vm|kernel"
-    short_name: "tra"
+    short_name: "ta"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-stable"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 70f52a89ab13..7387f8fcc216 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -89,7 +89,7 @@ notifiers {
     }
     builders {
         name: "cross-vm-linux-release-arm64"
-        bucket: "ci.sandbox"
+        bucket: "ci"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 18d6cd6fa501..f19703f44f12 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -69,6 +69,7 @@ trigger {
   triggers: "app-kernel-linux-debug-x64"
   triggers: "app-kernel-linux-product-x64"
   triggers: "app-kernel-linux-release-x64"
+  triggers: "cross-vm-linux-release-arm64"
   triggers: "dart-sdk-linux"
   triggers: "dart-sdk-mac"
   triggers: "dart-sdk-win"
@@ -451,6 +452,17 @@ job {
   }
 }
 
+job {
+  id: "cross-vm-linux-release-arm64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "cross-vm-linux-release-arm64"
+  }
+}
+
 job {
   id: "dart-sdk-linux"
   acl_sets: "default"

From 3af34042c56e0618ac437c59811d41dfc5295084 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 14 Nov 2018 15:47:11 +0000
Subject: [PATCH 214/826] Revert "[infra] Migrate cross/target-vm builders to
 Luci"

This reverts commit 4b1abba395e86f605b5627b7af2eb21a75c83243.

Reason for revert: Triggering didn't work on arm64.

Original change's description:
> [infra] Migrate cross/target-vm builders to Luci
>
> * Move the cross builders to the ci bucket so they can schedule builds.
> * Add triggers for the master branch (dev and stable to be done later).
> * Update consoles.
>
> TBR=whesse@google.com
>
> Change-Id: I3875618590377e40c2c5d6b0445349b04c2a98c4
> Reviewed-on: https://dart-review.googlesource.com/c/84422
> Reviewed-by: Alexander Thomas <athom@google.com>

TBR=whesse@google.com,athom@google.com

Change-Id: I8399f73d1c5dc2583091df4897bc642100e3716f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/84431
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 12 ++++--------
 luci-milo.cfg      | 28 ++++++++++++++++------------
 luci-notify.cfg    |  2 +-
 luci-scheduler.cfg | 12 ------------
 4 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 47b42daf7801..f46fef04c0a9 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -144,28 +144,21 @@ buckets {
     }
 
     # CI Builders that require privileged access
-    builders { name: "base" mixins: "forward" }
     builders { name: "chocolatey" mixins: "chocolatey" mixins: "win" }
-    builders { name: "cross-vm-linux-release-arm64" }
     builders { name: "dart-sdk-linux" }
     builders { name: "dart-sdk-mac" mixins: "mac" }
     builders { name: "dart-sdk-win" mixins: "win" }
     builders { name: "docker" mixins: "docker" }
     builders { name: "debianpackage-linux" mixins: "debianpackage" }
-
-    # CI Builders that require privileged access on the dev branch
-    builders { name: "cross-vm-linux-release-arm64-dev" }
     builders { name: "dart-sdk-linux-dev" }
     builders { name: "dart-sdk-mac-dev" mixins: "mac" }
     builders { name: "dart-sdk-win-dev" mixins: "win" }
     builders { name: "debianpackage-linux-dev" mixins: "debianpackage" }
-
-    # CI Builders that require privileged access on the stable branch
-    builders { name: "cross-vm-linux-release-arm64-stable" }
     builders { name: "dart-sdk-linux-stable" }
     builders { name: "dart-sdk-mac-stable" mixins: "mac" }
     builders { name: "dart-sdk-win-stable" mixins: "win" }
     builders { name: "debianpackage-linux-stable" mixins: "debianpackage" }
+    builders { name: "base" mixins: "forward" }
   }
 }
 
@@ -219,6 +212,7 @@ buckets {
     builders { name: "app-kernel-linux-debug-x64" }
     builders { name: "app-kernel-linux-product-x64" }
     builders { name: "app-kernel-linux-release-x64" }
+    builders { name: "cross-vm-linux-release-arm64" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome" }
     builders { name: "dart2js-minified-strong-linux-x64-d8" }
     builders { name: "dart2js-strong-faststartup-linux-x64-chrome" }
@@ -304,6 +298,7 @@ buckets {
     builders { name: "app-kernel-linux-debug-x64-dev" }
     builders { name: "app-kernel-linux-product-x64-dev" }
     builders { name: "app-kernel-linux-release-x64-dev" }
+    builders { name: "cross-vm-linux-release-arm64-dev" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome-dev" }
     builders { name: "dart2js-minified-strong-linux-x64-d8-dev" }
     builders { name: "dart2js-strong-faststartup-linux-x64-chrome-dev" }
@@ -389,6 +384,7 @@ buckets {
     builders { name: "app-kernel-linux-debug-x64-stable" }
     builders { name: "app-kernel-linux-product-x64-stable" }
     builders { name: "app-kernel-linux-release-x64-stable" }
+    builders { name: "cross-vm-linux-release-arm64-stable" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome-stable" }
     builders { name: "dart2js-minified-strong-linux-x64-d8-stable" }
     builders { name: "dart2js-strong-faststartup-linux-x64-chrome-stable" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index c4a6cb2c1a55..d8a2f15b5430 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -274,14 +274,16 @@ consoles: {
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
+    # migrating to cross-vm-linux-release-arm64
+    name: "buildbot/client.dart/cross-arm64-vm-linux-release-be"
     category: "vm|kernel"
     short_name: "cra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64"
+    # migrating to target-vm-linux-release-arm64
+    name: "buildbot/client.dart/target-arm64-vm-linux-release-be"
     category: "vm|kernel"
-    short_name: "ta"
+    short_name: "tra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
@@ -866,14 +868,16 @@ consoles: {
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
+    # migrating to cross-vm-linux-release-arm64
+    name: "buildbot/client.dart/cross-arm64-vm-linux-release-be"
     category: "vm|kernel"
     short_name: "cra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64"
+    # migrating to target-vm-linux-release-arm64
+    name: "buildbot/client.dart/target-arm64-vm-linux-release-be"
     category: "vm|kernel"
-    short_name: "ta"
+    short_name: "tra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
@@ -1148,14 +1152,14 @@ consoles: {
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
     category: "vm|kernel"
     short_name: "cra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64"
     category: "vm|kernel"
-    short_name: "ta"
+    short_name: "tra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
@@ -1557,14 +1561,14 @@ consoles: {
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-dev"
     category: "vm|kernel"
     short_name: "cra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64-dev"
     category: "vm|kernel"
-    short_name: "ta"
+    short_name: "tra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-dev"
@@ -1976,14 +1980,14 @@ consoles: {
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/cross-vm-linux-release-arm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-stable"
     category: "vm|kernel"
     short_name: "cra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64-stable"
     category: "vm|kernel"
-    short_name: "ta"
+    short_name: "tra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-stable"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 7387f8fcc216..70f52a89ab13 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -89,7 +89,7 @@ notifiers {
     }
     builders {
         name: "cross-vm-linux-release-arm64"
-        bucket: "ci"
+        bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index f19703f44f12..18d6cd6fa501 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -69,7 +69,6 @@ trigger {
   triggers: "app-kernel-linux-debug-x64"
   triggers: "app-kernel-linux-product-x64"
   triggers: "app-kernel-linux-release-x64"
-  triggers: "cross-vm-linux-release-arm64"
   triggers: "dart-sdk-linux"
   triggers: "dart-sdk-mac"
   triggers: "dart-sdk-win"
@@ -452,17 +451,6 @@ job {
   }
 }
 
-job {
-  id: "cross-vm-linux-release-arm64"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "cross-vm-linux-release-arm64"
-  }
-}
-
 job {
   id: "dart-sdk-linux"
   acl_sets: "default"

From 684fdc328efd90230e68a32202b260d8ac8eaf4d Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 14 Nov 2018 16:01:13 +0000
Subject: [PATCH 215/826] [infra] Migrate cross-arm builder to Luci

Attempt #2, because triggering didn't work on arm64.

* Remove target builder, the builder will now run a single arm64 shard.

TBR=whesse@google.com

Change-Id: I33fd10a49e4c5c9cc372ae9cc49a3688ab95ab0a
Reviewed-on: https://dart-review.googlesource.com/c/84432
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg |  9 +++++----
 luci-milo.cfg      | 33 ++-------------------------------
 luci-notify.cfg    |  5 -----
 luci-scheduler.cfg | 36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index f46fef04c0a9..a914571382af 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -144,21 +144,25 @@ buckets {
     }
 
     # CI Builders that require privileged access
+    builders { name: "base" mixins: "forward" }
     builders { name: "chocolatey" mixins: "chocolatey" mixins: "win" }
     builders { name: "dart-sdk-linux" }
     builders { name: "dart-sdk-mac" mixins: "mac" }
     builders { name: "dart-sdk-win" mixins: "win" }
     builders { name: "docker" mixins: "docker" }
     builders { name: "debianpackage-linux" mixins: "debianpackage" }
+
+    # CI builders that require privileged access on the dev branch
     builders { name: "dart-sdk-linux-dev" }
     builders { name: "dart-sdk-mac-dev" mixins: "mac" }
     builders { name: "dart-sdk-win-dev" mixins: "win" }
     builders { name: "debianpackage-linux-dev" mixins: "debianpackage" }
+
+    # CI builders that require privileged access on the stable branch
     builders { name: "dart-sdk-linux-stable" }
     builders { name: "dart-sdk-mac-stable" mixins: "mac" }
     builders { name: "dart-sdk-win-stable" mixins: "win" }
     builders { name: "debianpackage-linux-stable" mixins: "debianpackage" }
-    builders { name: "base" mixins: "forward" }
   }
 }
 
@@ -245,7 +249,6 @@ buckets {
     builders { name: "pub-linux-release" }
     builders { name: "pub-mac-release" mixins: "mac" }
     builders { name: "pub-win-release" mixins: "win" }
-    builders { name: "target-vm-linux-release-arm64" dimensions: "cpu:arm64" }
     builders { name: "versionchecker-linux" }
     builders { name: "vm-dartkb-linux-debug-x64" }
     builders { name: "vm-dartkb-linux-release-x64" }
@@ -331,7 +334,6 @@ buckets {
     builders { name: "pub-linux-release-dev" }
     builders { name: "pub-mac-release-dev" mixins: "mac" }
     builders { name: "pub-win-release-dev" mixins: "win" }
-    builders { name: "target-vm-linux-release-arm64-dev" dimensions: "cpu:arm64" }
     builders { name: "versionchecker-linux-dev" }
     builders { name: "vm-dartkb-linux-debug-x64-dev" }
     builders { name: "vm-dartkb-linux-release-x64-dev" }
@@ -417,7 +419,6 @@ buckets {
     builders { name: "pub-linux-release-stable" }
     builders { name: "pub-mac-release-stable" mixins: "mac" }
     builders { name: "pub-win-release-stable" mixins: "win" }
-    builders { name: "target-vm-linux-release-arm64-stable" dimensions: "cpu:arm64" }
     builders { name: "versionchecker-linux-stable" }
     builders { name: "vm-dartkb-linux-debug-x64-stable" }
     builders { name: "vm-dartkb-linux-release-x64-stable" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index d8a2f15b5430..b135dc633950 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -274,17 +274,10 @@ consoles: {
     short_name: "wr"
   }
   builders {
-    # migrating to cross-vm-linux-release-arm64
-    name: "buildbot/client.dart/cross-arm64-vm-linux-release-be"
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
     category: "vm|kernel"
     short_name: "cra"
   }
-  builders {
-    # migrating to target-vm-linux-release-arm64
-    name: "buildbot/client.dart/target-arm64-vm-linux-release-be"
-    category: "vm|kernel"
-    short_name: "tra"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
     category: "vm|misc"
@@ -868,17 +861,10 @@ consoles: {
     short_name: "wr"
   }
   builders {
-    # migrating to cross-vm-linux-release-arm64
-    name: "buildbot/client.dart/cross-arm64-vm-linux-release-be"
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
     category: "vm|kernel"
     short_name: "cra"
   }
-  builders {
-    # migrating to target-vm-linux-release-arm64
-    name: "buildbot/client.dart/target-arm64-vm-linux-release-be"
-    category: "vm|kernel"
-    short_name: "tra"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
     category: "vm|misc"
@@ -1156,11 +1142,6 @@ consoles: {
     category: "vm|kernel"
     short_name: "cra"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64"
-    category: "vm|kernel"
-    short_name: "tra"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
     category: "vm|misc"
@@ -1565,11 +1546,6 @@ consoles: {
     category: "vm|kernel"
     short_name: "cra"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64-dev"
-    category: "vm|kernel"
-    short_name: "tra"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-dev"
     category: "vm|misc"
@@ -1984,11 +1960,6 @@ consoles: {
     category: "vm|kernel"
     short_name: "cra"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/target-vm-linux-release-arm64-stable"
-    category: "vm|kernel"
-    short_name: "tra"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-stable"
     category: "vm|misc"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 70f52a89ab13..471cd86396df 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -252,11 +252,6 @@ notifiers {
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
-    builders {
-        name: "target-vm-linux-release-arm64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
     builders {
         name: "versionchecker-linux"
         bucket: "ci.sandbox"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 18d6cd6fa501..1808c739baae 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -69,6 +69,7 @@ trigger {
   triggers: "app-kernel-linux-debug-x64"
   triggers: "app-kernel-linux-product-x64"
   triggers: "app-kernel-linux-release-x64"
+  triggers: "cross-vm-linux-release-arm64"
   triggers: "dart-sdk-linux"
   triggers: "dart-sdk-mac"
   triggers: "dart-sdk-win"
@@ -148,6 +149,7 @@ trigger {
   triggers: "app-kernel-linux-debug-x64-dev"
   triggers: "app-kernel-linux-product-x64-dev"
   triggers: "app-kernel-linux-release-x64-dev"
+  triggers: "cross-vm-linux-release-arm64-dev"
   triggers: "dart-sdk-linux-dev"
   triggers: "dart-sdk-mac-dev"
   triggers: "dart-sdk-win-dev"
@@ -227,6 +229,7 @@ trigger {
   triggers: "app-kernel-linux-debug-x64-stable"
   triggers: "app-kernel-linux-product-x64-stable"
   triggers: "app-kernel-linux-release-x64-stable"
+  triggers: "cross-vm-linux-release-arm64-stable"
   triggers: "dart-sdk-linux-stable"
   triggers: "dart-sdk-mac-stable"
   triggers: "dart-sdk-win-stable"
@@ -451,6 +454,17 @@ job {
   }
 }
 
+job {
+  id: "cross-vm-linux-release-arm64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "cross-vm-linux-release-arm64"
+  }
+}
+
 job {
   id: "dart-sdk-linux"
   acl_sets: "default"
@@ -1226,6 +1240,17 @@ job {
   }
 }
 
+job {
+  id: "cross-vm-linux-release-arm64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "cross-vm-linux-release-arm64-dev"
+  }
+}
+
 job {
   id: "dart-sdk-linux-dev"
   acl_sets: "default"
@@ -2001,6 +2026,17 @@ job {
   }
 }
 
+job {
+  id: "cross-vm-linux-release-arm64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "cross-vm-linux-release-arm64-stable"
+  }
+}
+
 job {
   id: "dart-sdk-linux-stable"
   acl_sets: "default"

From 48de204e45feab04a437207cb31b8ef427e6feb1 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 14 Nov 2018 17:35:18 +0000
Subject: [PATCH 216/826] [infra] Remove slow mixin from precomp debug builder

This builder used to be really slow, but is now reasonably fast. The
extra high timeouts can cause its shards to expire because there aren't
any bots available that will live longer than the execution timeout.

Lower the execution timeout for slow shards to 2h (twice the default).

TBR=whesse@google.com

Change-Id: I7392552b0453ede0ac88ea72375c1ec9041ffbf9
Reviewed-on: https://dart-review.googlesource.com/c/84434
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index a914571382af..78d7aac58b1c 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -99,7 +99,7 @@ builder_mixins {
   name: "slow"
   execution_timeout_secs: 21600 # 6h
   recipe {
-    properties_j: "shard_timeout:21600"
+    properties_j: "shard_timeout:7200" # 2h
   }
 }
 
@@ -270,7 +270,7 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64" }
-    builders { name: "vm-kernel-precomp-linux-debug-x64" mixins: "slow" }
+    builders { name: "vm-kernel-precomp-linux-debug-x64" }
     builders { name: "vm-kernel-precomp-linux-product-x64" }
     builders { name: "vm-kernel-precomp-linux-release-simarm" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64" }
@@ -355,7 +355,7 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-dev" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-dev" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-dev" }
-    builders { name: "vm-kernel-precomp-linux-debug-x64-dev" mixins: "slow" }
+    builders { name: "vm-kernel-precomp-linux-debug-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-product-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-dev" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-dev" }
@@ -440,7 +440,7 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-stable" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-stable" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-stable" }
-    builders { name: "vm-kernel-precomp-linux-debug-x64-stable" mixins: "slow" }
+    builders { name: "vm-kernel-precomp-linux-debug-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-product-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-stable" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-stable" }
@@ -555,7 +555,7 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-try" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-try" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-try" }
-    builders { name: "vm-kernel-precomp-linux-debug-x64-try" mixins: "slow" }
+    builders { name: "vm-kernel-precomp-linux-debug-x64-try" }
     builders { name: "vm-kernel-precomp-linux-product-x64-try" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-try" }
     builders { name: "vm-kernel-precomp-linux-release-simarm64-try" }

From 7b68c50ff7b094a9c8505235108518c5e1b39e76 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 20 Nov 2018 21:30:56 +0000
Subject: [PATCH 217/826] [infra] Migrate vm-kernel-mac builders to Luci

TBR=whesse@google.com

Change-Id: I4448bdd24e1129b3803a0bcd1a549ec8de3b54bf
Reviewed-on: https://dart-review.googlesource.com/c/84909
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-milo.cfg      | 12 +++-----
 luci-scheduler.cfg | 72 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 8 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index b135dc633950..d8a0f5692c59 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -179,14 +179,12 @@ consoles: {
     short_name: "mrs"
   }
   builders {
-    # migrating to vm-kernel-mac-debug-x64
-    name: "buildbot/client.dart/vm-kernel-mac-debug-x64-be"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
     category: "vm|kernel"
     short_name: "md"
   }
   builders {
-    # migrating to vm-kernel-mac-release-x64
-    name: "buildbot/client.dart/vm-kernel-mac-release-x64-be"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
     category: "vm|kernel"
     short_name: "mr"
   }
@@ -766,14 +764,12 @@ consoles: {
     short_name: "mrs"
   }
   builders {
-    # migrating to vm-kernel-mac-debug-x64
-    name: "buildbot/client.dart/vm-kernel-mac-debug-x64-be"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
     category: "vm|kernel"
     short_name: "md"
   }
   builders {
-    # migrating to vm-kernel-mac-release-x64
-    name: "buildbot/client.dart/vm-kernel-mac-release-x64-be"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
     category: "vm|kernel"
     short_name: "mr"
   }
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 1808c739baae..0f7b83be5de5 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -108,8 +108,10 @@ trigger {
   triggers: "vm-kernel-linux-release-simdbc64"
   triggers: "vm-kernel-linux-release-x64"
   triggers: "vm-kernel-mac-debug-simdbc64"
+  triggers: "vm-kernel-mac-debug-x64"
   triggers: "vm-kernel-mac-product-x64"
   triggers: "vm-kernel-mac-release-simdbc64"
+  triggers: "vm-kernel-mac-release-x64"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
   triggers: "vm-kernel-precomp-linux-debug-x64"
@@ -188,8 +190,10 @@ trigger {
   triggers: "vm-kernel-linux-release-simdbc64-dev"
   triggers: "vm-kernel-linux-release-x64-dev"
   triggers: "vm-kernel-mac-debug-simdbc64-dev"
+  triggers: "vm-kernel-mac-debug-x64-dev"
   triggers: "vm-kernel-mac-product-x64-dev"
   triggers: "vm-kernel-mac-release-simdbc64-dev"
+  triggers: "vm-kernel-mac-release-x64-dev"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-linux-debug-x64-dev"
@@ -268,8 +272,10 @@ trigger {
   triggers: "vm-kernel-linux-release-simdbc64-stable"
   triggers: "vm-kernel-linux-release-x64-stable"
   triggers: "vm-kernel-mac-debug-simdbc64-stable"
+  triggers: "vm-kernel-mac-debug-x64-stable"
   triggers: "vm-kernel-mac-product-x64-stable"
   triggers: "vm-kernel-mac-release-simdbc64-stable"
+  triggers: "vm-kernel-mac-release-x64-stable"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-linux-debug-x64-stable"
@@ -886,6 +892,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-mac-debug-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-debug-x64"
+  }
+}
+
 job {
   id: "vm-kernel-mac-product-x64"
   acl_sets: "default"
@@ -908,6 +925,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-mac-release-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-release-x64"
+  }
+}
+
 job {
   id: "vm-kernel-optcounter-threshold-linux-release-ia32"
   acl_sets: "default"
@@ -1672,6 +1700,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-mac-debug-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-debug-x64-dev"
+  }
+}
+
 job {
   id: "vm-kernel-mac-product-x64-dev"
   acl_sets: "default"
@@ -1694,6 +1733,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-mac-release-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-release-x64-dev"
+  }
+}
+
 job {
   id: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
   acl_sets: "default"
@@ -2458,6 +2508,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-mac-debug-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-debug-x64-stable"
+  }
+}
+
 job {
   id: "vm-kernel-mac-product-x64-stable"
   acl_sets: "default"
@@ -2480,6 +2541,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-mac-release-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-release-x64-stable"
+  }
+}
+
 job {
   id: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
   acl_sets: "default"

From 23cec7b0cfc9edc7d3edacad2700d7178093197f Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Thu, 29 Nov 2018 11:59:58 +0000
Subject: [PATCH 218/826] [infra] Enroll ddc-win-release-chrome in the new
 workflow.

Change-Id: I8e90b9d1175c5fc7023fd37e62467fc62fbbfd6f
Reviewed-on: https://dart-review.googlesource.com/c/85503
Reviewed-by: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 cr-buildbucket.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 78d7aac58b1c..1f596c37fa8a 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -239,7 +239,7 @@ buckets {
     builders { name: "dart2js-unit-linux-x64-release" }
     builders { name: "ddc-linux-release-chrome" }
     builders { name: "ddc-mac-release-chrome" mixins: "mac" }
-    builders { name: "ddc-win-release-chrome" mixins: "win" }
+    builders { name: "ddc-win-release-chrome" mixins: "win" mixins: "new_workflow" }
     builders { name: "front-end-linux-release-x64" mixins: "clobber" }
     builders { name: "front-end-mac-release-x64" mixins: "clobber" mixins: "mac" }
     builders { name: "front-end-win-release-x64" mixins: "clobber" mixins: "win" }
@@ -526,7 +526,7 @@ buckets {
     builders { name: "dart2js-unit-linux-x64-release-try" }
     builders { name: "ddc-linux-release-chrome-try" mixins: "clobber" }
     builders { name: "ddc-mac-release-chrome-try" mixins: "mac" }
-    builders { name: "ddc-win-release-chrome-try" mixins: "win" }
+    builders { name: "ddc-win-release-chrome-try" mixins: "win" mixins: "new_workflow" }
     builders { name: "flutter-analyze-try" }
     builders { name: "front-end-linux-release-x64-try" mixins: "clobber" }
     builders { name: "front-end-mac-release-x64-try" mixins: "clobber" mixins: "mac" }

From a009e240397fd242501851c16416c7bd5b7a0896 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Thu, 29 Nov 2018 15:55:42 +0000
Subject: [PATCH 219/826] [infra] Enroll front-end-win-release-x64 in the new
 workflow.

Change-Id: Iba3cd1efefea75fa044fed6ed14d9edeaf00d4a6
Reviewed-on: https://dart-review.googlesource.com/c/85584
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 cr-buildbucket.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 1f596c37fa8a..41b11bd93d50 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -242,7 +242,7 @@ buckets {
     builders { name: "ddc-win-release-chrome" mixins: "win" mixins: "new_workflow" }
     builders { name: "front-end-linux-release-x64" mixins: "clobber" }
     builders { name: "front-end-mac-release-x64" mixins: "clobber" mixins: "mac" }
-    builders { name: "front-end-win-release-x64" mixins: "clobber" mixins: "win" }
+    builders { name: "front-end-win-release-x64" mixins: "clobber" mixins: "win" mixins: "new_workflow" }
     builders { name: "pkg-linux-release" }
     builders { name: "pkg-mac-release" mixins: "mac" }
     builders { name: "pkg-win-release" mixins: "win" }
@@ -530,7 +530,7 @@ buckets {
     builders { name: "flutter-analyze-try" }
     builders { name: "front-end-linux-release-x64-try" mixins: "clobber" }
     builders { name: "front-end-mac-release-x64-try" mixins: "clobber" mixins: "mac" }
-    builders { name: "front-end-win-release-x64-try" mixins: "clobber" mixins: "win" }
+    builders { name: "front-end-win-release-x64-try" mixins: "clobber" mixins: "win" mixins: "new_workflow" }
     builders { name: "pkg-linux-release-try" }
     builders { name: "pkg-mac-release-try" mixins: "mac" }
     builders { name: "pkg-win-release-try" mixins: "win" }

From 5d53f07517bf711c012835059f2e7240429910e2 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Mon, 3 Dec 2018 17:53:15 +0000
Subject: [PATCH 220/826] [infra] Enable new luci builders for Dart SDK build

This does not enable failure notifications for these builders.
The buildbot SDK builders must be turned down when this lands.

Change-Id: I853b2bfe24b31ad2077184780910e8b86befd345
Reviewed-on: https://dart-review.googlesource.com/c/85770
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 luci-milo.cfg      | 18 ++++++------------
 luci-scheduler.cfg |  9 ---------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index d8a0f5692c59..fa2a5faeaef3 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -377,20 +377,17 @@ consoles: {
     short_name: "w"
   }
   builders {
-    # migrating to dart-sdk-linux
-    name: "buildbot/client.dart/dart-sdk-linux-be"
+    name: "buildbucket/luci.dart.ci/dart-sdk-linux"
     category: "sdk"
     short_name: "l"
   }
   builders {
-    # migrating to dart-sdk-mac
-    name: "buildbot/client.dart/dart-sdk-mac-be"
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac"
     category: "sdk"
     short_name: "m"
   }
   builders {
-    # migrating to dart-sdk-win
-    name: "buildbot/client.dart/dart-sdk-windows-be"
+    name: "buildbucket/luci.dart.ci/dart-sdk-win"
     category: "sdk"
     short_name: "w"
   }
@@ -579,20 +576,17 @@ consoles: {
     short_name: "w"
   }
   builders {
-    # migrating to dart-sdk-linux
-    name: "buildbot/client.dart/dart-sdk-linux-be"
+    name: "buildbucket/luci.dart.ci/dart-sdk-linux"
     category: "sdk"
     short_name: "l"
   }
   builders {
-    # migrating to dart-sdk-mac
-    name: "buildbot/client.dart/dart-sdk-mac-be"
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac"
     category: "sdk"
     short_name: "m"
   }
   builders {
-    # migrating to dart-sdk-win
-    name: "buildbot/client.dart/dart-sdk-windows-be"
+    name: "buildbucket/luci.dart.ci/dart-sdk-win"
     category: "sdk"
     short_name: "w"
   }
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 0f7b83be5de5..88d7d0908fa7 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -475,7 +475,6 @@ job {
   id: "dart-sdk-linux"
   acl_sets: "default"
   schedule: "triggered"
-  disabled: true
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
@@ -487,7 +486,6 @@ job {
   id: "dart-sdk-mac"
   acl_sets: "default"
   schedule: "triggered"
-  disabled: true
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
@@ -499,7 +497,6 @@ job {
   id: "dart-sdk-win"
   acl_sets: "default"
   schedule: "triggered"
-  disabled: true
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
@@ -1283,7 +1280,6 @@ job {
   id: "dart-sdk-linux-dev"
   acl_sets: "default"
   schedule: "triggered"
-  disabled: true
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
@@ -1295,7 +1291,6 @@ job {
   id: "dart-sdk-mac-dev"
   acl_sets: "default"
   schedule: "triggered"
-  disabled: true
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
@@ -1307,7 +1302,6 @@ job {
   id: "dart-sdk-win-dev"
   acl_sets: "default"
   schedule: "triggered"
-  disabled: true
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
@@ -2091,7 +2085,6 @@ job {
   id: "dart-sdk-linux-stable"
   acl_sets: "default"
   schedule: "triggered"
-  disabled: true
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
@@ -2103,7 +2096,6 @@ job {
   id: "dart-sdk-mac-stable"
   acl_sets: "default"
   schedule: "triggered"
-  disabled: true
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
@@ -2115,7 +2107,6 @@ job {
   id: "dart-sdk-win-stable"
   acl_sets: "default"
   schedule: "triggered"
-  disabled: true
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"

From 5d8507458e83c58307caa8f7cd9e13f5364ddd3f Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Wed, 5 Dec 2018 10:58:08 +0000
Subject: [PATCH 221/826] [infra] Add vm-canary-linux-debug builder.

The vm-canary-linux-debug-try trybot cannot work properly under the new
workflow unless there is a corresponding CI builder whose results it can
compare with.

Change-Id: I2bc59051c047f93076ac9886ef751e35c4621ffc
Reviewed-on: https://dart-review.googlesource.com/c/85945
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg |  3 +++
 luci-milo.cfg      | 25 +++++++++++++++++++++++++
 luci-notify.cfg    |  5 +++++
 luci-scheduler.cfg | 36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 69 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 41b11bd93d50..d41f2b00b63d 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -250,6 +250,7 @@ buckets {
     builders { name: "pub-mac-release" mixins: "mac" }
     builders { name: "pub-win-release" mixins: "win" }
     builders { name: "versionchecker-linux" }
+    builders { name: "vm-canary-linux-debug" }
     builders { name: "vm-dartkb-linux-debug-x64" }
     builders { name: "vm-dartkb-linux-release-x64" }
     builders { name: "vm-kernel-asan-linux-release-x64" }
@@ -335,6 +336,7 @@ buckets {
     builders { name: "pub-mac-release-dev" mixins: "mac" }
     builders { name: "pub-win-release-dev" mixins: "win" }
     builders { name: "versionchecker-linux-dev" }
+    builders { name: "vm-canary-linux-debug-dev" }
     builders { name: "vm-dartkb-linux-debug-x64-dev" }
     builders { name: "vm-dartkb-linux-release-x64-dev" }
     builders { name: "vm-kernel-asan-linux-release-x64-dev" }
@@ -420,6 +422,7 @@ buckets {
     builders { name: "pub-mac-release-stable" mixins: "mac" }
     builders { name: "pub-win-release-stable" mixins: "win" }
     builders { name: "versionchecker-linux-stable" }
+    builders { name: "vm-canary-linux-debug-stable" }
     builders { name: "vm-dartkb-linux-debug-x64-stable" }
     builders { name: "vm-dartkb-linux-release-x64-stable" }
     builders { name: "vm-kernel-asan-linux-release-x64-stable" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index fa2a5faeaef3..bc7a29a2f339 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -123,6 +123,11 @@ consoles: {
     category: "vm|dartkb"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
+    category: "vm|kernel"
+    short_name: "c"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
     category: "vm|kernel"
@@ -702,6 +707,11 @@ consoles: {
     category: "vm|dartkb"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
+    category: "vm|kernel"
+    short_name: "c"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
     category: "vm|kernel"
@@ -997,6 +1007,11 @@ consoles: {
     category: "vm|dartkb"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
+    category: "vm|kernel"
+    short_name: "c"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
     category: "vm|kernel"
@@ -1401,6 +1416,11 @@ consoles: {
     category: "vm|dartkb"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-dev"
+    category: "vm|kernel"
+    short_name: "c"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-dev"
     category: "vm|kernel"
@@ -1815,6 +1835,11 @@ consoles: {
     category: "vm|dartkb"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-stable"
+    category: "vm|kernel"
+    short_name: "c"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-stable"
     category: "vm|kernel"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 471cd86396df..2d85b0b00718 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -257,6 +257,11 @@ notifiers {
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
+    builders {
+        name: "vm-canary-linux-debug"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
     builders {
         name: "vm-dartkb-linux-debug-x64"
         bucket: "ci.sandbox"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 88d7d0908fa7..90d6dae13994 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -94,6 +94,7 @@ trigger {
   triggers: "pkg-linux-release"
   triggers: "pkg-mac-release"
   triggers: "pkg-win-release"
+  triggers: "vm-canary-linux-debug"
   triggers: "vm-dartkb-linux-debug-x64"
   triggers: "vm-dartkb-linux-release-x64"
   triggers: "vm-kernel-asan-linux-release-x64"
@@ -176,6 +177,7 @@ trigger {
   triggers: "pkg-linux-release-dev"
   triggers: "pkg-mac-release-dev"
   triggers: "pkg-win-release-dev"
+  triggers: "vm-canary-linux-debug-dev"
   triggers: "vm-dartkb-linux-debug-x64-dev"
   triggers: "vm-dartkb-linux-release-x64-dev"
   triggers: "vm-kernel-asan-linux-release-x64-dev"
@@ -258,6 +260,7 @@ trigger {
   triggers: "pkg-linux-release-stable"
   triggers: "pkg-mac-release-stable"
   triggers: "pkg-win-release-stable"
+  triggers: "vm-canary-linux-debug-stable"
   triggers: "vm-dartkb-linux-debug-x64-stable"
   triggers: "vm-dartkb-linux-release-x64-stable"
   triggers: "vm-kernel-asan-linux-release-x64-stable"
@@ -735,6 +738,17 @@ job {
   }
 }
 
+job {
+  id: "vm-canary-linux-debug"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-canary-linux-debug"
+  }
+}
+
 job {
   id: "vm-dartkb-linux-debug-x64"
   acl_sets: "default"
@@ -1540,6 +1554,17 @@ job {
   }
 }
 
+job {
+  id: "vm-canary-linux-debug-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-canary-linux-debug-dev"
+  }
+}
+
 job {
   id: "vm-dartkb-linux-debug-x64-dev"
   acl_sets: "default"
@@ -2345,6 +2370,17 @@ job {
   }
 }
 
+job {
+  id: "vm-canary-linux-debug-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-canary-linux-debug-stable"
+  }
+}
+
 job {
   id: "vm-dartkb-linux-debug-x64-stable"
   acl_sets: "default"

From d258ee768908e12d7c0abeba9c00776a21b982a1 Mon Sep 17 00:00:00 2001
From: Paul Berry <paulberry@google.com>
Date: Thu, 6 Dec 2018 10:26:42 +0000
Subject: [PATCH 222/826] Remove bot "analyzer-use-fasta-parser-linux".

This bot is no longer needed, since the analyzer has been switched
over to using the Fasta parser all the time, and the non-fasta code
paths (which the bot also tests) are beginning to bit rot.

Change-Id: I5974910fce8cc613b0974f98e7bf83bacb98be45
Reviewed-on: https://dart-review.googlesource.com/c/86241
Auto-Submit: Paul Berry <paulberry@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 cr-buildbucket.cfg |  4 ----
 luci-milo.cfg      | 25 -------------------------
 luci-notify.cfg    |  5 -----
 luci-scheduler.cfg | 36 ------------------------------------
 4 files changed, 70 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index d41f2b00b63d..0556411cf941 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -210,7 +210,6 @@ buckets {
     builders { name: "analyzer-analysis-server-linux" }
     builders { name: "analyzer-linux-release" }
     builders { name: "analyzer-mac-release" mixins: "mac" }
-    builders { name: "analyzer-use-fasta-parser-linux" }
     builders { name: "analyzer-win-release" mixins: "win" }
     builders { name: "androidvm-linux-release-x64" mixins: "android" }
     builders { name: "app-kernel-linux-debug-x64" }
@@ -296,7 +295,6 @@ buckets {
     builders { name: "analyzer-analysis-server-linux-dev" }
     builders { name: "analyzer-linux-release-dev" }
     builders { name: "analyzer-mac-release-dev" mixins: "mac" }
-    builders { name: "analyzer-use-fasta-parser-linux-dev" }
     builders { name: "analyzer-win-release-dev" mixins: "win" }
     builders { name: "androidvm-linux-release-x64-dev" mixins: "android" }
     builders { name: "app-kernel-linux-debug-x64-dev" }
@@ -382,7 +380,6 @@ buckets {
     builders { name: "analyzer-analysis-server-linux-stable" }
     builders { name: "analyzer-linux-release-stable" }
     builders { name: "analyzer-mac-release-stable" mixins: "mac" }
-    builders { name: "analyzer-use-fasta-parser-linux-stable" }
     builders { name: "analyzer-win-release-stable" mixins: "win" }
     builders { name: "androidvm-linux-release-x64-stable" mixins: "android" }
     builders { name: "app-kernel-linux-debug-x64-stable" }
@@ -502,7 +499,6 @@ buckets {
     builders { name: "analyzer-analysis-server-linux-try" }
     builders { name: "analyzer-linux-release-try" }
     builders { name: "analyzer-mac-release-try" mixins: "mac" }
-    builders { name: "analyzer-use-fasta-parser-linux-try" }
     builders { name: "analyzer-win-release-try" mixins: "win" }
     builders { name: "app-kernel-linux-debug-x64-try" }
     builders { name: "app-kernel-linux-product-x64-try" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index bc7a29a2f339..827485c5a3e1 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -361,11 +361,6 @@ consoles: {
     category: "analyzer"
     short_name: "as"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-fasta-parser-linux"
-    category: "analyzer"
-    short_name: "fl"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
     category: "analyzer"
@@ -560,11 +555,6 @@ consoles: {
     category: "analyzer"
     short_name: "as"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-fasta-parser-linux"
-    category: "analyzer"
-    short_name: "fl"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
     category: "analyzer"
@@ -1227,11 +1217,6 @@ consoles: {
     category: "analyzer"
     short_name: "as"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-fasta-parser-linux"
-    category: "analyzer"
-    short_name: "fl"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
     category: "analyzer"
@@ -1636,11 +1621,6 @@ consoles: {
     category: "analyzer"
     short_name: "as"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-fasta-parser-linux-dev"
-    category: "analyzer"
-    short_name: "fl"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-dev"
     category: "analyzer"
@@ -2055,11 +2035,6 @@ consoles: {
     category: "analyzer"
     short_name: "as"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-use-fasta-parser-linux-stable"
-    category: "analyzer"
-    short_name: "fl"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-stable"
     category: "analyzer"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 2d85b0b00718..8bee8c571961 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -57,11 +57,6 @@ notifiers {
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
-    builders {
-        name: "analyzer-use-fasta-parser-linux"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
     builders {
         name: "analyzer-win-release"
         bucket: "ci.sandbox"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 90d6dae13994..c8d2e6eb68b7 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -64,7 +64,6 @@ trigger {
   triggers: "analyzer-analysis-server-linux"
   triggers: "analyzer-linux-release"
   triggers: "analyzer-mac-release"
-  triggers: "analyzer-use-fasta-parser-linux"
   triggers: "analyzer-win-release"
   triggers: "app-kernel-linux-debug-x64"
   triggers: "app-kernel-linux-product-x64"
@@ -147,7 +146,6 @@ trigger {
   triggers: "analyzer-analysis-server-linux-dev"
   triggers: "analyzer-linux-release-dev"
   triggers: "analyzer-mac-release-dev"
-  triggers: "analyzer-use-fasta-parser-linux-dev"
   triggers: "analyzer-win-release-dev"
   triggers: "app-kernel-linux-debug-x64-dev"
   triggers: "app-kernel-linux-product-x64-dev"
@@ -230,7 +228,6 @@ trigger {
   triggers: "analyzer-analysis-server-linux-stable"
   triggers: "analyzer-linux-release-stable"
   triggers: "analyzer-mac-release-stable"
-  triggers: "analyzer-use-fasta-parser-linux-stable"
   triggers: "analyzer-win-release-stable"
   triggers: "app-kernel-linux-debug-x64-stable"
   triggers: "app-kernel-linux-product-x64-stable"
@@ -408,17 +405,6 @@ job {
   }
 }
 
-job {
-  id: "analyzer-use-fasta-parser-linux"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-use-fasta-parser-linux"
-  }
-}
-
 job {
   id: "analyzer-win-release"
   acl_sets: "default"
@@ -1224,17 +1210,6 @@ job {
   }
 }
 
-job {
-  id: "analyzer-use-fasta-parser-linux-dev"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-use-fasta-parser-linux-dev"
-  }
-}
-
 job {
   id: "analyzer-win-release-dev"
   acl_sets: "default"
@@ -2040,17 +2015,6 @@ job {
   }
 }
 
-job {
-  id: "analyzer-use-fasta-parser-linux-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-use-fasta-parser-linux-stable"
-  }
-}
-
 job {
   id: "analyzer-win-release-stable"
   acl_sets: "default"

From 482758da1fb821f7ad0812c15e5eeba0c9e41bbd Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Fri, 7 Dec 2018 10:20:12 +0000
Subject: [PATCH 223/826] [infra] Enroll dart2js in the new workflow.

Change-Id: I727c572308afb409a6ebe17ff15af2dfee692de0
Reviewed-on: https://dart-review.googlesource.com/c/86424
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 144 ++++++++++++++++++++++-----------------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 0556411cf941..05944fee439a 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -216,26 +216,26 @@ buckets {
     builders { name: "app-kernel-linux-product-x64" }
     builders { name: "app-kernel-linux-release-x64" }
     builders { name: "cross-vm-linux-release-arm64" }
-    builders { name: "dart2js-csp-minified-linux-x64-chrome" }
-    builders { name: "dart2js-minified-strong-linux-x64-d8" }
-    builders { name: "dart2js-strong-faststartup-linux-x64-chrome" }
-    builders { name: "dart2js-strong-faststartup-linux-x64-firefox" }
-    builders { name: "dart2js-strong-faststartup-mac-x64-chrome" mixins: "mac" }
-    builders { name: "dart2js-strong-faststartup-mac-x64-safari" mixins: "mac" }
-    builders { name: "dart2js-strong-faststartup-win-x64-chrome" mixins: "win" }
-    builders { name: "dart2js-strong-faststartup-win-x64-edge" mixins: "win" }
-    builders { name: "dart2js-strong-faststartup-win-x64-firefox" mixins: "win" }
+    builders { name: "dart2js-csp-minified-linux-x64-chrome" mixins: "new_workflow" }
+    builders { name: "dart2js-minified-strong-linux-x64-d8" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-linux-x64-chrome" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-linux-x64-firefox" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-mac-x64-chrome" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-mac-x64-safari" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-win-x64-chrome" mixins: "win" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-win-x64-edge" mixins: "win" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-win-x64-firefox" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-faststartup-win-x64-ie11" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-hostasserts-linux-ia32-d8" }
-    builders { name: "dart2js-strong-linux-x64-chrome" }
+    builders { name: "dart2js-strong-hostasserts-linux-ia32-d8" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-linux-x64-chrome" mixins: "new_workflow" }
     builders { name: "dart2js-strong-linux-x64-firefox" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-mac-x64-chrome" mixins: "mac" }
+    builders { name: "dart2js-strong-mac-x64-chrome" mixins: "mac" mixins: "new_workflow" }
     builders { name: "dart2js-strong-mac-x64-safari" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-win-x64-chrome" mixins: "win" }
-    builders { name: "dart2js-strong-win-x64-edge" mixins: "win" }
+    builders { name: "dart2js-strong-win-x64-chrome" mixins: "win" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-win-x64-edge" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-win-x64-firefox" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-win-x64-ie11" mixins: "win" }
-    builders { name: "dart2js-unit-linux-x64-release" }
+    builders { name: "dart2js-strong-win-x64-ie11" mixins: "win" mixins: "new_workflow" }
+    builders { name: "dart2js-unit-linux-x64-release" mixins: "new_workflow" }
     builders { name: "ddc-linux-release-chrome" }
     builders { name: "ddc-mac-release-chrome" mixins: "mac" }
     builders { name: "ddc-win-release-chrome" mixins: "win" mixins: "new_workflow" }
@@ -301,26 +301,26 @@ buckets {
     builders { name: "app-kernel-linux-product-x64-dev" }
     builders { name: "app-kernel-linux-release-x64-dev" }
     builders { name: "cross-vm-linux-release-arm64-dev" }
-    builders { name: "dart2js-csp-minified-linux-x64-chrome-dev" }
-    builders { name: "dart2js-minified-strong-linux-x64-d8-dev" }
-    builders { name: "dart2js-strong-faststartup-linux-x64-chrome-dev" }
-    builders { name: "dart2js-strong-faststartup-linux-x64-firefox-dev" }
-    builders { name: "dart2js-strong-faststartup-mac-x64-chrome-dev" mixins: "mac" }
-    builders { name: "dart2js-strong-faststartup-mac-x64-safari-dev" mixins: "mac" }
-    builders { name: "dart2js-strong-faststartup-win-x64-chrome-dev" mixins: "win" }
-    builders { name: "dart2js-strong-faststartup-win-x64-edge-dev" mixins: "win" }
-    builders { name: "dart2js-strong-faststartup-win-x64-firefox-dev" mixins: "win" }
+    builders { name: "dart2js-csp-minified-linux-x64-chrome-dev" mixins: "new_workflow" }
+    builders { name: "dart2js-minified-strong-linux-x64-d8-dev" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-linux-x64-chrome-dev" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-linux-x64-firefox-dev" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-mac-x64-chrome-dev" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-mac-x64-safari-dev" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-win-x64-chrome-dev" mixins: "win" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-win-x64-edge-dev" mixins: "win" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-win-x64-firefox-dev" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-faststartup-win-x64-ie11-dev" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-hostasserts-linux-ia32-d8-dev" }
-    builders { name: "dart2js-strong-linux-x64-chrome-dev" }
-    builders { name: "dart2js-strong-linux-x64-firefox-dev" }
-    builders { name: "dart2js-strong-mac-x64-chrome-dev" mixins: "mac" }
-    builders { name: "dart2js-strong-mac-x64-safari-dev" mixins: "mac" }
-    builders { name: "dart2js-strong-win-x64-chrome-dev" mixins: "win" }
-    builders { name: "dart2js-strong-win-x64-edge-dev" mixins: "win" }
-    builders { name: "dart2js-strong-win-x64-firefox-dev" mixins: "win" }
-    builders { name: "dart2js-strong-win-x64-ie11-dev" mixins: "win" }
-    builders { name: "dart2js-unit-linux-x64-release-dev" }
+    builders { name: "dart2js-strong-hostasserts-linux-ia32-d8-dev" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-linux-x64-chrome-dev" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-linux-x64-firefox-dev" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-mac-x64-chrome-dev" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-mac-x64-safari-dev" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-win-x64-chrome-dev" mixins: "win" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-win-x64-edge-dev" mixins: "win" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-win-x64-firefox-dev" mixins: "win" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-win-x64-ie11-dev" mixins: "win" mixins: "new_workflow" }
+    builders { name: "dart2js-unit-linux-x64-release-dev" mixins: "new_workflow" }
     builders { name: "ddc-linux-release-chrome-dev" }
     builders { name: "ddc-mac-release-chrome-dev" mixins: "mac" }
     builders { name: "ddc-win-release-chrome-dev" mixins: "win" }
@@ -386,26 +386,26 @@ buckets {
     builders { name: "app-kernel-linux-product-x64-stable" }
     builders { name: "app-kernel-linux-release-x64-stable" }
     builders { name: "cross-vm-linux-release-arm64-stable" }
-    builders { name: "dart2js-csp-minified-linux-x64-chrome-stable" }
-    builders { name: "dart2js-minified-strong-linux-x64-d8-stable" }
-    builders { name: "dart2js-strong-faststartup-linux-x64-chrome-stable" }
-    builders { name: "dart2js-strong-faststartup-linux-x64-firefox-stable" }
-    builders { name: "dart2js-strong-faststartup-mac-x64-chrome-stable" mixins: "mac" }
-    builders { name: "dart2js-strong-faststartup-mac-x64-safari-stable" mixins: "mac" }
-    builders { name: "dart2js-strong-faststartup-win-x64-chrome-stable" mixins: "win" }
-    builders { name: "dart2js-strong-faststartup-win-x64-edge-stable" mixins: "win" }
-    builders { name: "dart2js-strong-faststartup-win-x64-firefox-stable" mixins: "win" }
+    builders { name: "dart2js-csp-minified-linux-x64-chrome-stable" mixins: "new_workflow" }
+    builders { name: "dart2js-minified-strong-linux-x64-d8-stable" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-linux-x64-chrome-stable" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-linux-x64-firefox-stable" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-mac-x64-chrome-stable" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-mac-x64-safari-stable" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-win-x64-chrome-stable" mixins: "win" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-win-x64-edge-stable" mixins: "win" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-win-x64-firefox-stable" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-faststartup-win-x64-ie11-stable" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-hostasserts-linux-ia32-d8-stable" }
-    builders { name: "dart2js-strong-linux-x64-chrome-stable" }
-    builders { name: "dart2js-strong-linux-x64-firefox-stable" }
-    builders { name: "dart2js-strong-mac-x64-chrome-stable" mixins: "mac" }
-    builders { name: "dart2js-strong-mac-x64-safari-stable" mixins: "mac" }
-    builders { name: "dart2js-strong-win-x64-chrome-stable" mixins: "win" }
-    builders { name: "dart2js-strong-win-x64-edge-stable" mixins: "win" }
-    builders { name: "dart2js-strong-win-x64-firefox-stable" mixins: "win" }
-    builders { name: "dart2js-strong-win-x64-ie11-stable" mixins: "win" }
-    builders { name: "dart2js-unit-linux-x64-release-stable" }
+    builders { name: "dart2js-strong-hostasserts-linux-ia32-d8-stable" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-linux-x64-chrome-stable" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-linux-x64-firefox-stable" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-mac-x64-chrome-stable" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-mac-x64-safari-stable" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-win-x64-chrome-stable" mixins: "win" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-win-x64-edge-stable" mixins: "win" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-win-x64-firefox-stable" mixins: "win" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-win-x64-ie11-stable" mixins: "win" mixins: "new_workflow" }
+    builders { name: "dart2js-unit-linux-x64-release-stable" mixins: "new_workflow" }
     builders { name: "ddc-linux-release-chrome-stable" }
     builders { name: "ddc-mac-release-chrome-stable" mixins: "mac" }
     builders { name: "ddc-win-release-chrome-stable" mixins: "win" }
@@ -505,24 +505,24 @@ buckets {
     builders { name: "app-kernel-linux-release-x64-try" }
     builders { name: "benchmark-linux-try" }
     builders { name: "dart-sdk-windows-try" mixins: "sdk" mixins: "win" }
-    builders { name: "dart2js-csp-minified-linux-x64-chrome-try" }
-    builders { name: "dart2js-minified-strong-linux-x64-d8-try" }
-    builders { name: "dart2js-strong-faststartup-linux-x64-chrome-try" }
-    builders { name: "dart2js-strong-faststartup-linux-x64-firefox-try" }
-    builders { name: "dart2js-strong-faststartup-mac-x64-chrome-try" mixins: "mac" }
-    builders { name: "dart2js-strong-faststartup-mac-x64-safari-try" mixins: "mac" }
-    builders { name: "dart2js-strong-faststartup-win-x64-chrome-try" mixins: "win" }
-    builders { name: "dart2js-strong-faststartup-win-x64-firefox-try" mixins: "win" }
-    builders { name: "dart2js-strong-faststartup-win-x64-ie11-try" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-hostasserts-linux-ia32-d8-try" }
-    builders { name: "dart2js-strong-linux-x64-chrome-try" }
-    builders { name: "dart2js-strong-linux-x64-firefox-try" }
-    builders { name: "dart2js-strong-mac-x64-chrome-try" mixins: "mac" }
-    builders { name: "dart2js-strong-mac-x64-safari-try" mixins: "mac" }
-    builders { name: "dart2js-strong-win-x64-chrome-try" mixins: "win" }
-    builders { name: "dart2js-strong-win-x64-firefox-try" mixins: "win" }
-    builders { name: "dart2js-strong-win-x64-ie11-try" mixins: "win" }
-    builders { name: "dart2js-unit-linux-x64-release-try" }
+    builders { name: "dart2js-csp-minified-linux-x64-chrome-try" mixins: "new_workflow" }
+    builders { name: "dart2js-minified-strong-linux-x64-d8-try" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-linux-x64-chrome-try" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-linux-x64-firefox-try" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-mac-x64-chrome-try" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-mac-x64-safari-try" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-win-x64-chrome-try" mixins: "win" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-win-x64-firefox-try" mixins: "win" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-faststartup-win-x64-ie11-try" mixins: "win" mixins: "new_workflow" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-hostasserts-linux-ia32-d8-try" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-linux-x64-chrome-try" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-linux-x64-firefox-try" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-mac-x64-chrome-try" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-mac-x64-safari-try" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-win-x64-chrome-try" mixins: "win" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-win-x64-firefox-try" mixins: "win" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-win-x64-ie11-try" mixins: "win" mixins: "new_workflow" }
+    builders { name: "dart2js-unit-linux-x64-release-try" mixins: "new_workflow" }
     builders { name: "ddc-linux-release-chrome-try" mixins: "clobber" }
     builders { name: "ddc-mac-release-chrome-try" mixins: "mac" }
     builders { name: "ddc-win-release-chrome-try" mixins: "win" mixins: "new_workflow" }

From 1b7d2ec0a7753c2013ad45b6ca14029c4bb9721b Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Fri, 7 Dec 2018 11:50:20 +0000
Subject: [PATCH 224/826] [infra] Enroll analyzer-linux-release in the new
 workflow.

Change-Id: Ib40d934bf1e6e8eb79977cb9e743939cadc6b0d2
Reviewed-on: https://dart-review.googlesource.com/c/86425
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 05944fee439a..580bf527fcc9 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -208,7 +208,7 @@ buckets {
 
     # CI Builders for the master branch
     builders { name: "analyzer-analysis-server-linux" }
-    builders { name: "analyzer-linux-release" }
+    builders { name: "analyzer-linux-release" mixins: "new_workflow" }
     builders { name: "analyzer-mac-release" mixins: "mac" }
     builders { name: "analyzer-win-release" mixins: "win" }
     builders { name: "androidvm-linux-release-x64" mixins: "android" }
@@ -293,7 +293,7 @@ buckets {
 
     # CI Builders for the dev branch
     builders { name: "analyzer-analysis-server-linux-dev" }
-    builders { name: "analyzer-linux-release-dev" }
+    builders { name: "analyzer-linux-release-dev" mixins: "new_workflow" }
     builders { name: "analyzer-mac-release-dev" mixins: "mac" }
     builders { name: "analyzer-win-release-dev" mixins: "win" }
     builders { name: "androidvm-linux-release-x64-dev" mixins: "android" }
@@ -378,7 +378,7 @@ buckets {
 
     # CI Builders for the stable branch
     builders { name: "analyzer-analysis-server-linux-stable" }
-    builders { name: "analyzer-linux-release-stable" }
+    builders { name: "analyzer-linux-release-stable" mixins: "new_workflow" }
     builders { name: "analyzer-mac-release-stable" mixins: "mac" }
     builders { name: "analyzer-win-release-stable" mixins: "win" }
     builders { name: "androidvm-linux-release-x64-stable" mixins: "android" }
@@ -497,7 +497,7 @@ buckets {
 
     # CQ / choose tryjobs builders
     builders { name: "analyzer-analysis-server-linux-try" }
-    builders { name: "analyzer-linux-release-try" }
+    builders { name: "analyzer-linux-release-try" mixins: "new_workflow" }
     builders { name: "analyzer-mac-release-try" mixins: "mac" }
     builders { name: "analyzer-win-release-try" mixins: "win" }
     builders { name: "app-kernel-linux-debug-x64-try" }

From caefcd9e6d454851c4915d3ea364cc026f11af53 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Fri, 7 Dec 2018 15:31:17 +0000
Subject: [PATCH 225/826] Switch the analyzer CI builders and console to branch
 analyzer-0.33

Change-Id: I817ab61a7b5d1fe599e4ee483124fae022327599
Reviewed-on: https://dart-review.googlesource.com/c/86564
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 luci-milo.cfg      | 4 ++--
 luci-scheduler.cfg | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 827485c5a3e1..46cb4b1a2c9d 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2,9 +2,9 @@ logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png"
 
 consoles: {
   id: "analyzer"
-  name: "SDK Analyzer Branch Console"
+  name: "SDK Analyzer 0.33 Branch Console"
   repo_url: "https://dart.googlesource.com/sdk"
-  refs: "refs/heads/analyzer"
+  refs: "refs/heads/analyzer-0.33"
   manifest_name: "REVISION"
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-analyzer"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index c8d2e6eb68b7..83f2a3a3bfd0 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -44,7 +44,7 @@ trigger {
   acl_sets: "default"
   gitiles: {
     repo: "https://dart.googlesource.com/sdk/"
-    refs: "refs/heads/analyzer"
+    refs: "refs/heads/analyzer-0.33"
   }
   triggers: "analyzer-analysis-server-linux-analyzer"
   triggers: "analyzer-linux-release-analyzer"

From e1667fdea8208804e53279b95c9f4d0537d25d42 Mon Sep 17 00:00:00 2001
From: Nodir Turakulov <nodir@google.com>
Date: Mon, 10 Dec 2018 17:30:47 +0000
Subject: [PATCH 226/826] Fetch recipes via CIPD, not git

Use more modern CIPD-based fetching of recipes.
This is what Chromium is using.

Bug: 910127
Change-Id: I598991e0bdaa5bdf88933170599910945b34b82e
Reviewed-on: https://dart-review.googlesource.com/c/85472
Reviewed-by: William Hesse <whesse@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 580bf527fcc9..6dd066778884 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -135,7 +135,8 @@ buckets {
         name: "browsers"
       }
       recipe {
-        repository: "https://chromium.googlesource.com/chromium/tools/build.git"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
         properties: "clobber:true"
         properties: "mastername:client.dart"
         name: "dart/neo"
@@ -187,7 +188,8 @@ buckets {
         name: "browsers"
       }
       recipe {
-        repository: "https://chromium.googlesource.com/chromium/tools/build.git"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
         properties: "clobber:true"
         properties: "mastername:client.dart"
         name: "dart/neo"
@@ -482,7 +484,8 @@ buckets {
         name: "browsers"
       }
       recipe {
-        repository: "https://chromium.googlesource.com/chromium/tools/build.git"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
         properties: "clobber:true"
         properties: "mastername:dart.try"
         name: "dart/neo"

From b3462544c20e15889a1e63220d0ee46103b70ef4 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Tue, 11 Dec 2018 10:32:08 +0000
Subject: [PATCH 227/826] [infra] Enroll ddc in the new workflow.

Change-Id: I385ac0308d661596410dc67aa9f54ab8b1f138d3
Reviewed-on: https://dart-review.googlesource.com/c/86426
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 6dd066778884..9ebb42bc9c80 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -238,8 +238,8 @@ buckets {
     builders { name: "dart2js-strong-win-x64-firefox" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-win-x64-ie11" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-unit-linux-x64-release" mixins: "new_workflow" }
-    builders { name: "ddc-linux-release-chrome" }
-    builders { name: "ddc-mac-release-chrome" mixins: "mac" }
+    builders { name: "ddc-linux-release-chrome" mixins: "new_workflow" }
+    builders { name: "ddc-mac-release-chrome" mixins: "mac" mixins: "new_workflow" }
     builders { name: "ddc-win-release-chrome" mixins: "win" mixins: "new_workflow" }
     builders { name: "front-end-linux-release-x64" mixins: "clobber" }
     builders { name: "front-end-mac-release-x64" mixins: "clobber" mixins: "mac" }
@@ -323,9 +323,9 @@ buckets {
     builders { name: "dart2js-strong-win-x64-firefox-dev" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-win-x64-ie11-dev" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-unit-linux-x64-release-dev" mixins: "new_workflow" }
-    builders { name: "ddc-linux-release-chrome-dev" }
-    builders { name: "ddc-mac-release-chrome-dev" mixins: "mac" }
-    builders { name: "ddc-win-release-chrome-dev" mixins: "win" }
+    builders { name: "ddc-linux-release-chrome-dev" mixins: "new_workflow" }
+    builders { name: "ddc-mac-release-chrome-dev" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "ddc-win-release-chrome-dev" mixins: "win" mixins: "new_workflow" }
     builders { name: "front-end-linux-release-x64-dev" mixins: "clobber" }
     builders { name: "front-end-mac-release-x64-dev" mixins: "clobber" mixins: "mac" }
     builders { name: "front-end-win-release-x64-dev" mixins: "clobber" mixins: "win" }
@@ -408,9 +408,9 @@ buckets {
     builders { name: "dart2js-strong-win-x64-firefox-stable" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-win-x64-ie11-stable" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-unit-linux-x64-release-stable" mixins: "new_workflow" }
-    builders { name: "ddc-linux-release-chrome-stable" }
-    builders { name: "ddc-mac-release-chrome-stable" mixins: "mac" }
-    builders { name: "ddc-win-release-chrome-stable" mixins: "win" }
+    builders { name: "ddc-linux-release-chrome-stable" mixins: "new_workflow" }
+    builders { name: "ddc-mac-release-chrome-stable" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "ddc-win-release-chrome-stable" mixins: "win" mixins: "new_workflow" }
     builders { name: "front-end-linux-release-x64-stable" mixins: "clobber" }
     builders { name: "front-end-mac-release-x64-stable" mixins: "clobber" mixins: "mac" }
     builders { name: "front-end-win-release-x64-stable" mixins: "clobber" mixins: "win" }
@@ -526,8 +526,8 @@ buckets {
     builders { name: "dart2js-strong-win-x64-firefox-try" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-win-x64-ie11-try" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-unit-linux-x64-release-try" mixins: "new_workflow" }
-    builders { name: "ddc-linux-release-chrome-try" mixins: "clobber" }
-    builders { name: "ddc-mac-release-chrome-try" mixins: "mac" }
+    builders { name: "ddc-linux-release-chrome-try" mixins: "clobber" mixins: "new_workflow" }
+    builders { name: "ddc-mac-release-chrome-try" mixins: "mac" mixins: "new_workflow" }
     builders { name: "ddc-win-release-chrome-try" mixins: "win" mixins: "new_workflow" }
     builders { name: "flutter-analyze-try" }
     builders { name: "front-end-linux-release-x64-try" mixins: "clobber" }

From 1379ba5e0f886235b7ffb27795991f99289cd2ae Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Tue, 11 Dec 2018 15:29:34 +0000
Subject: [PATCH 228/826] [infra] Enroll pkg builders in the new workflow.

Change-Id: If9990d9d585b0f6501ed666a8f7ca319c30b01a8
Reviewed-on: https://dart-review.googlesource.com/c/86923
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 9ebb42bc9c80..b4e5eea45cd3 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -244,9 +244,9 @@ buckets {
     builders { name: "front-end-linux-release-x64" mixins: "clobber" }
     builders { name: "front-end-mac-release-x64" mixins: "clobber" mixins: "mac" }
     builders { name: "front-end-win-release-x64" mixins: "clobber" mixins: "win" mixins: "new_workflow" }
-    builders { name: "pkg-linux-release" }
-    builders { name: "pkg-mac-release" mixins: "mac" }
-    builders { name: "pkg-win-release" mixins: "win" }
+    builders { name: "pkg-linux-release" mixins: "new_workflow" }
+    builders { name: "pkg-mac-release" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "pkg-win-release" mixins: "win" mixins: "new_workflow" }
     builders { name: "pub-linux-release" }
     builders { name: "pub-mac-release" mixins: "mac" }
     builders { name: "pub-win-release" mixins: "win" }
@@ -329,9 +329,9 @@ buckets {
     builders { name: "front-end-linux-release-x64-dev" mixins: "clobber" }
     builders { name: "front-end-mac-release-x64-dev" mixins: "clobber" mixins: "mac" }
     builders { name: "front-end-win-release-x64-dev" mixins: "clobber" mixins: "win" }
-    builders { name: "pkg-linux-release-dev" }
-    builders { name: "pkg-mac-release-dev" mixins: "mac" }
-    builders { name: "pkg-win-release-dev" mixins: "win" }
+    builders { name: "pkg-linux-release-dev" mixins: "new_workflow" }
+    builders { name: "pkg-mac-release-dev" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "pkg-win-release-dev" mixins: "win" mixins: "new_workflow" }
     builders { name: "pub-linux-release-dev" }
     builders { name: "pub-mac-release-dev" mixins: "mac" }
     builders { name: "pub-win-release-dev" mixins: "win" }
@@ -414,9 +414,9 @@ buckets {
     builders { name: "front-end-linux-release-x64-stable" mixins: "clobber" }
     builders { name: "front-end-mac-release-x64-stable" mixins: "clobber" mixins: "mac" }
     builders { name: "front-end-win-release-x64-stable" mixins: "clobber" mixins: "win" }
-    builders { name: "pkg-linux-release-stable" }
-    builders { name: "pkg-mac-release-stable" mixins: "mac" }
-    builders { name: "pkg-win-release-stable" mixins: "win" }
+    builders { name: "pkg-linux-release-stable" mixins: "new_workflow" }
+    builders { name: "pkg-mac-release-stable" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "pkg-win-release-stable" mixins: "win" mixins: "new_workflow" }
     builders { name: "pub-linux-release-stable" }
     builders { name: "pub-mac-release-stable" mixins: "mac" }
     builders { name: "pub-win-release-stable" mixins: "win" }
@@ -533,9 +533,9 @@ buckets {
     builders { name: "front-end-linux-release-x64-try" mixins: "clobber" }
     builders { name: "front-end-mac-release-x64-try" mixins: "clobber" mixins: "mac" }
     builders { name: "front-end-win-release-x64-try" mixins: "clobber" mixins: "win" mixins: "new_workflow" }
-    builders { name: "pkg-linux-release-try" }
-    builders { name: "pkg-mac-release-try" mixins: "mac" }
-    builders { name: "pkg-win-release-try" mixins: "win" }
+    builders { name: "pkg-linux-release-try" mixins: "new_workflow" }
+    builders { name: "pkg-mac-release-try" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "pkg-win-release-try" mixins: "win" mixins: "new_workflow" }
     builders { name: "vm-canary-linux-debug-try" }
     builders { name: "vm-dartkb-linux-debug-x64-try" }
     builders { name: "vm-dartkb-linux-release-x64-try" }

From d71be2ac229d5eaef451f835beb3239b78a0b341 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Tue, 18 Dec 2018 15:34:11 +0000
Subject: [PATCH 229/826] Add vm-kernel-precomp-bare-linux-release-x64 builder
 to luci/milo

Adds master, dev, and stable builders, and optional try builder

Change-Id: I04e1f78bc1d00d4d3281c7738d9a930b4fc26438
Reviewed-on: https://dart-review.googlesource.com/c/87582
Reviewed-by: Martin Kustermann <kustermann@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg |  4 ++++
 luci-milo.cfg      | 25 +++++++++++++++++++++++++
 luci-notify.cfg    |  5 +++++
 luci-scheduler.cfg | 36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 70 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index b4e5eea45cd3..26f181643492 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -272,6 +272,7 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64" }
+    builders { name: "vm-kernel-precomp-bare-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-debug-x64" }
     builders { name: "vm-kernel-precomp-linux-product-x64" }
     builders { name: "vm-kernel-precomp-linux-release-simarm" }
@@ -357,6 +358,7 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-dev" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-dev" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-dev" }
+    builders { name: "vm-kernel-precomp-bare-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-product-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-dev" }
@@ -442,6 +444,7 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-stable" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-stable" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-stable" }
+    builders { name: "vm-kernel-precomp-bare-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-product-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-stable" }
@@ -557,6 +560,7 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-try" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-try" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-try" }
+    builders { name: "vm-kernel-precomp-bare-linux-release-x64-try" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-try" }
     builders { name: "vm-kernel-precomp-linux-product-x64-try" }
     builders { name: "vm-kernel-precomp-linux-release-simarm-try" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 46cb4b1a2c9d..07ba424e0388 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -256,6 +256,11 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-x64"
+    category: "vm|kernel-precomp"
+    short_name: "br"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
     category: "vm|kernel"
@@ -830,6 +835,11 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-x64"
+    category: "vm|kernel-precomp"
+    short_name: "br"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
     category: "vm|kernel"
@@ -1112,6 +1122,11 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-x64"
+    category: "vm|kernel-precomp"
+    short_name: "br"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
     category: "vm|kernel"
@@ -1516,6 +1531,11 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-x64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "br"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-dev"
     category: "vm|kernel"
@@ -1930,6 +1950,11 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "br"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-stable"
     category: "vm|kernel"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 8bee8c571961..f216e26e12c1 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -357,6 +357,11 @@ notifiers {
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
+    builders {
+        name: "vm-kernel-precomp-bare-linux-release-x64"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
     builders {
         name: "vm-kernel-precomp-linux-debug-x64"
         bucket: "ci.sandbox"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 83f2a3a3bfd0..5bdf62251db1 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -114,6 +114,7 @@ trigger {
   triggers: "vm-kernel-mac-release-x64"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
+  triggers: "vm-kernel-precomp-bare-linux-release-x64"
   triggers: "vm-kernel-precomp-linux-debug-x64"
   triggers: "vm-kernel-precomp-linux-product-x64"
   triggers: "vm-kernel-precomp-linux-release-simarm"
@@ -196,6 +197,7 @@ trigger {
   triggers: "vm-kernel-mac-release-x64-dev"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-bare-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-linux-debug-x64-dev"
   triggers: "vm-kernel-precomp-linux-product-x64-dev"
   triggers: "vm-kernel-precomp-linux-release-simarm-dev"
@@ -278,6 +280,7 @@ trigger {
   triggers: "vm-kernel-mac-release-x64-stable"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
+  triggers: "vm-kernel-precomp-bare-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-linux-debug-x64-stable"
   triggers: "vm-kernel-precomp-linux-product-x64-stable"
   triggers: "vm-kernel-precomp-linux-release-simarm-stable"
@@ -955,6 +958,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-precomp-bare-linux-release-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-bare-linux-release-x64"
+  }
+}
+
 job {
   id: "vm-kernel-precomp-linux-debug-x64"
   acl_sets: "default"
@@ -1760,6 +1774,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-precomp-bare-linux-release-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-bare-linux-release-x64-dev"
+  }
+}
+
 job {
   id: "vm-kernel-precomp-linux-debug-x64-dev"
   acl_sets: "default"
@@ -2565,6 +2590,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-precomp-bare-linux-release-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-bare-linux-release-x64-stable"
+  }
+}
+
 job {
   id: "vm-kernel-precomp-linux-debug-x64-stable"
   acl_sets: "default"

From 87c81a0564e80a859b51592c55e8ee65c113ae9f Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 19 Dec 2018 17:11:31 +0000
Subject: [PATCH 230/826] [infra] Move flutter builders to the main console

Fixes #34893

Change-Id: Ia822bdd7ed9da0bebe7547f1556512cd135bffcd
Reviewed-on: https://dart-review.googlesource.com/c/87586
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg |  2 +-
 luci-milo.cfg      | 44 +++++++++++++++++++++++++++++++++++++-------
 luci-scheduler.cfg | 24 ++++++++++++------------
 3 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 26f181643492..e42920f14622 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -206,7 +206,6 @@ buckets {
     builders { name: "analyzer-linux-release-analyzer-new" mixins: "new_workflow" }
     builders { name: "analyzer-mac-release-analyzer" mixins: "mac" }
     builders { name: "analyzer-win-release-analyzer" mixins: "win" }
-    builders { name: "flutter-analyze-analyzer" }
 
     # CI Builders for the master branch
     builders { name: "analyzer-analysis-server-linux" }
@@ -241,6 +240,7 @@ buckets {
     builders { name: "ddc-linux-release-chrome" mixins: "new_workflow" }
     builders { name: "ddc-mac-release-chrome" mixins: "mac" mixins: "new_workflow" }
     builders { name: "ddc-win-release-chrome" mixins: "win" mixins: "new_workflow" }
+    builders { name: "flutter-analyze" }
     builders { name: "front-end-linux-release-x64" mixins: "clobber" }
     builders { name: "front-end-mac-release-x64" mixins: "clobber" mixins: "mac" }
     builders { name: "front-end-win-release-x64" mixins: "clobber" mixins: "win" mixins: "new_workflow" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 07ba424e0388..7f517f1668ef 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -31,11 +31,6 @@ consoles: {
     category: "analyzer"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze-analyzer"
-    category: "analyzer"
-    short_name: "fl"
-  }
   header: {
     links: {
       name: "Consoles"
@@ -98,6 +93,16 @@ consoles: {
     category: "fasta"
     short_name: "w"
   }
+  builders {
+    name: "buildbot/client.dart.internal/flutter-engine-linux"
+    category: "flutter"
+    short_name: "3H"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
+    category: "flutter"
+    short_name: "fa"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
     category: "vm|app-kernel"
@@ -540,6 +545,16 @@ consoles: {
     category: "fasta"
     short_name: "w"
   }
+  builders {
+    name: "buildbot/client.dart.internal/flutter-engine-linux"
+    category: "flutter"
+    short_name: "3H"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
+    category: "flutter"
+    short_name: "fa"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
     category: "dart2js|d8"
@@ -982,6 +997,16 @@ consoles: {
     category: "fasta"
     short_name: "w"
   }
+  builders {
+    name: "buildbot/client.dart.internal/flutter-engine-linux"
+    category: "flutter"
+    short_name: "3H"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
+    category: "flutter"
+    short_name: "fa"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
     category: "vm|app-kernel"
@@ -2216,8 +2241,13 @@ consoles: {
   manifest_name: "REVISION"
   builders {
     name: "buildbot/client.dart.internal/flutter-engine-linux"
-    category: "3xH"
-    short_name: "f"
+    category: "flutter"
+    short_name: "3H"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
+    category: "flutter"
+    short_name: "fa"
   }
 }
 
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 5bdf62251db1..0a424b0a8f24 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -51,7 +51,6 @@ trigger {
   triggers: "analyzer-linux-release-analyzer-new"
   triggers: "analyzer-mac-release-analyzer"
   triggers: "analyzer-win-release-analyzer"
-  triggers: "flutter-analyze-analyzer"
 }
 
 trigger {
@@ -87,6 +86,7 @@ trigger {
   triggers: "ddc-linux-release-chrome"
   triggers: "ddc-mac-release-chrome"
   triggers: "ddc-win-release-chrome"
+  triggers: "flutter-analyze"
   triggers: "front-end-linux-release-x64"
   triggers: "front-end-mac-release-x64"
   triggers: "front-end-win-release-x64"
@@ -362,17 +362,6 @@ job {
   }
 }
 
-job {
-  id: "flutter-analyze-analyzer"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "flutter-analyze-analyzer"
-  }
-}
-
 # master
 
 job {
@@ -661,6 +650,17 @@ job {
   }
 }
 
+job {
+  id: "flutter-analyze"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "flutter-analyze"
+  }
+}
+
 job {
   id: "front-end-linux-release-x64"
   acl_sets: "default"

From 90b22cf5cc5d1f427f4159f0c7c50619de7bf9e2 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Fri, 21 Dec 2018 10:14:49 +0000
Subject: [PATCH 231/826] [infra] Enroll analyzer in the new workflow.

Change-Id: I9b10767aef9dbd287492e8725f6df4b687c2e398
Reviewed-on: https://dart-review.googlesource.com/c/87961
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index e42920f14622..dda5825c5ad4 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -208,10 +208,10 @@ buckets {
     builders { name: "analyzer-win-release-analyzer" mixins: "win" }
 
     # CI Builders for the master branch
-    builders { name: "analyzer-analysis-server-linux" }
+    builders { name: "analyzer-analysis-server-linux" mixins: "new_workflow" }
     builders { name: "analyzer-linux-release" mixins: "new_workflow" }
-    builders { name: "analyzer-mac-release" mixins: "mac" }
-    builders { name: "analyzer-win-release" mixins: "win" }
+    builders { name: "analyzer-mac-release" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "analyzer-win-release" mixins: "win" mixins: "new_workflow" }
     builders { name: "androidvm-linux-release-x64" mixins: "android" }
     builders { name: "app-kernel-linux-debug-x64" }
     builders { name: "app-kernel-linux-product-x64" }
@@ -295,10 +295,10 @@ buckets {
     builders { name: "vm-kernel-win-release-x64" mixins: "win" }
 
     # CI Builders for the dev branch
-    builders { name: "analyzer-analysis-server-linux-dev" }
+    builders { name: "analyzer-analysis-server-linux-dev" mixins: "new_workflow" }
     builders { name: "analyzer-linux-release-dev" mixins: "new_workflow" }
-    builders { name: "analyzer-mac-release-dev" mixins: "mac" }
-    builders { name: "analyzer-win-release-dev" mixins: "win" }
+    builders { name: "analyzer-mac-release-dev" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "analyzer-win-release-dev" mixins: "win" mixins: "new_workflow" }
     builders { name: "androidvm-linux-release-x64-dev" mixins: "android" }
     builders { name: "app-kernel-linux-debug-x64-dev" }
     builders { name: "app-kernel-linux-product-x64-dev" }
@@ -381,10 +381,10 @@ buckets {
     builders { name: "vm-kernel-win-release-x64-dev" mixins: "win" }
 
     # CI Builders for the stable branch
-    builders { name: "analyzer-analysis-server-linux-stable" }
+    builders { name: "analyzer-analysis-server-linux-stable" mixins: "new_workflow" }
     builders { name: "analyzer-linux-release-stable" mixins: "new_workflow" }
-    builders { name: "analyzer-mac-release-stable" mixins: "mac" }
-    builders { name: "analyzer-win-release-stable" mixins: "win" }
+    builders { name: "analyzer-mac-release-stable" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "analyzer-win-release-stable" mixins: "win" mixins: "new_workflow" }
     builders { name: "androidvm-linux-release-x64-stable" mixins: "android" }
     builders { name: "app-kernel-linux-debug-x64-stable" }
     builders { name: "app-kernel-linux-product-x64-stable" }
@@ -502,10 +502,10 @@ buckets {
     builders { name: "cl-win-try" mixins: "win" }
 
     # CQ / choose tryjobs builders
-    builders { name: "analyzer-analysis-server-linux-try" }
+    builders { name: "analyzer-analysis-server-linux-try" mixins: "new_workflow" }
     builders { name: "analyzer-linux-release-try" mixins: "new_workflow" }
-    builders { name: "analyzer-mac-release-try" mixins: "mac" }
-    builders { name: "analyzer-win-release-try" mixins: "win" }
+    builders { name: "analyzer-mac-release-try" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "analyzer-win-release-try" mixins: "win" mixins: "new_workflow" }
     builders { name: "app-kernel-linux-debug-x64-try" }
     builders { name: "app-kernel-linux-product-x64-try" }
     builders { name: "app-kernel-linux-release-x64-try" }

From 6cb06fd2364a25820723e828a5ff45b2b73f97f3 Mon Sep 17 00:00:00 2001
From: Alexander Aprelev <aam@google.com>
Date: Fri, 21 Dec 2018 17:15:49 +0000
Subject: [PATCH 232/826] [infra] Add pkg-linux-debug buildbot.

Follow-up to https://dart-review.googlesource.com/c/sdk/+/87921

Change-Id: I50a244f85d1e4d549f0061d2ef55e3c4dee7a41d
Reviewed-on: https://dart-review.googlesource.com/c/87922
Reviewed-by: Zach Anderson <zra@google.com>
Commit-Queue: Alexander Aprelev <aam@google.com>
---
 cr-buildbucket.cfg |  1 +
 luci-milo.cfg      | 10 ++++++++++
 luci-notify.cfg    |  5 +++++
 luci-scheduler.cfg | 12 ++++++++++++
 4 files changed, 28 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index dda5825c5ad4..b0d034e0f714 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -247,6 +247,7 @@ buckets {
     builders { name: "pkg-linux-release" mixins: "new_workflow" }
     builders { name: "pkg-mac-release" mixins: "mac" mixins: "new_workflow" }
     builders { name: "pkg-win-release" mixins: "win" mixins: "new_workflow" }
+    builders { name: "pkg-linux-debug" mixins: "new_workflow" }
     builders { name: "pub-linux-release" }
     builders { name: "pub-mac-release" mixins: "mac" }
     builders { name: "pub-win-release" mixins: "win" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 7f517f1668ef..3b82569bdd10 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -476,6 +476,11 @@ consoles: {
     category: "pkg"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
+    category: "pkg"
+    short_name: "ld"
+  }
   builders {
     # migrating to debianpackage-linux
     name: "buildbot/client.dart/debianpackage-linux-be"
@@ -680,6 +685,11 @@ consoles: {
     category: "pkg"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
+    category: "pkg"
+    short_name: "ld"
+  }
   builders {
     # migrating to debianpackage-linux
     name: "buildbot/client.dart/debianpackage-linux-be"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index f216e26e12c1..1cdcbe1867cf 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -232,6 +232,11 @@ notifiers {
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
+    builders {
+        name: "pkg-linux-debug"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
     builders {
         name: "pub-linux-release"
         bucket: "ci.sandbox"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 0a424b0a8f24..d912ab65018c 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -93,6 +93,7 @@ trigger {
   triggers: "pkg-linux-release"
   triggers: "pkg-mac-release"
   triggers: "pkg-win-release"
+  triggers: "pkg-linux-debug"
   triggers: "vm-canary-linux-debug"
   triggers: "vm-dartkb-linux-debug-x64"
   triggers: "vm-dartkb-linux-release-x64"
@@ -727,6 +728,17 @@ job {
   }
 }
 
+job {
+  id: "pkg-linux-debug"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-linux-debug"
+  }
+}
+
 job {
   id: "vm-canary-linux-debug"
   acl_sets: "default"

From 797075008895bbf80d6b2752aeffa5580357dca1 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 10 Jan 2019 13:12:49 +0000
Subject: [PATCH 233/826] [infra] Add precomp-android builders to Luci config

* Remove the discontinued androidvm builder.

Change-Id: Iea128c6e063a4a42e2737d76e791d07c20bd44da
Reviewed-on: https://dart-review.googlesource.com/c/88955
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 12 ++++-------
 luci-milo.cfg      | 54 ++++++++++++++++------------------------------
 luci-notify.cfg    | 10 ++++-----
 luci-scheduler.cfg | 36 +++++++++++++++++++++++++++++++
 4 files changed, 64 insertions(+), 48 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index b0d034e0f714..a091fc396980 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -38,11 +38,6 @@ acl_sets {
   }
 }
 
-builder_mixins {
-  name: "android"
-  # todo(athom): how should this machine be defined?
-}
-
 builder_mixins {
   name: "chocolatey"
   recipe {
@@ -212,7 +207,6 @@ buckets {
     builders { name: "analyzer-linux-release" mixins: "new_workflow" }
     builders { name: "analyzer-mac-release" mixins: "mac" mixins: "new_workflow" }
     builders { name: "analyzer-win-release" mixins: "win" mixins: "new_workflow" }
-    builders { name: "androidvm-linux-release-x64" mixins: "android" }
     builders { name: "app-kernel-linux-debug-x64" }
     builders { name: "app-kernel-linux-product-x64" }
     builders { name: "app-kernel-linux-release-x64" }
@@ -273,6 +267,7 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64" }
+    builders { name: "vm-kernel-precomp-android-release-arm" }
     builders { name: "vm-kernel-precomp-bare-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-debug-x64" }
     builders { name: "vm-kernel-precomp-linux-product-x64" }
@@ -300,7 +295,6 @@ buckets {
     builders { name: "analyzer-linux-release-dev" mixins: "new_workflow" }
     builders { name: "analyzer-mac-release-dev" mixins: "mac" mixins: "new_workflow" }
     builders { name: "analyzer-win-release-dev" mixins: "win" mixins: "new_workflow" }
-    builders { name: "androidvm-linux-release-x64-dev" mixins: "android" }
     builders { name: "app-kernel-linux-debug-x64-dev" }
     builders { name: "app-kernel-linux-product-x64-dev" }
     builders { name: "app-kernel-linux-release-x64-dev" }
@@ -359,6 +353,7 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-dev" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-dev" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-dev" }
+    builders { name: "vm-kernel-precomp-android-release-arm-dev" }
     builders { name: "vm-kernel-precomp-bare-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-product-x64-dev" }
@@ -386,7 +381,6 @@ buckets {
     builders { name: "analyzer-linux-release-stable" mixins: "new_workflow" }
     builders { name: "analyzer-mac-release-stable" mixins: "mac" mixins: "new_workflow" }
     builders { name: "analyzer-win-release-stable" mixins: "win" mixins: "new_workflow" }
-    builders { name: "androidvm-linux-release-x64-stable" mixins: "android" }
     builders { name: "app-kernel-linux-debug-x64-stable" }
     builders { name: "app-kernel-linux-product-x64-stable" }
     builders { name: "app-kernel-linux-release-x64-stable" }
@@ -445,6 +439,7 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-stable" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-stable" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-stable" }
+    builders { name: "vm-kernel-precomp-android-release-arm-stable" }
     builders { name: "vm-kernel-precomp-bare-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-product-x64-stable" }
@@ -561,6 +556,7 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-try" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-try" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-try" }
+    builders { name: "vm-kernel-precomp-android-release-arm-try" }
     builders { name: "vm-kernel-precomp-bare-linux-release-x64-try" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-try" }
     builders { name: "vm-kernel-precomp-linux-product-x64-try" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 3b82569bdd10..826c2870b9f7 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -219,22 +219,9 @@ consoles: {
     short_name: "wr"
   }
   builders {
-    # migrating to vm-kernel-precomp-android-release
-    name: "buildbot/client.dart/vm-kernel-precomp-android-release-1-3-be"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm"
     category: "vm|kernel-precomp"
-    short_name: "1an"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-android-release
-    name: "buildbot/client.dart/vm-kernel-precomp-android-release-2-3-be"
-    category: "vm|kernel-precomp"
-    short_name: "2an"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-android-release
-    name: "buildbot/client.dart/vm-kernel-precomp-android-release-3-3-be"
-    category: "vm|kernel-precomp"
-    short_name: "3an"
+    short_name: "and"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
@@ -818,22 +805,9 @@ consoles: {
     short_name: "wr"
   }
   builders {
-    # migrating to vm-kernel-precomp-android-release
-    name: "buildbot/client.dart/vm-kernel-precomp-android-release-1-3-be"
-    category: "vm|kernel-precomp"
-    short_name: "1an"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-android-release
-    name: "buildbot/client.dart/vm-kernel-precomp-android-release-2-3-be"
-    category: "vm|kernel-precomp"
-    short_name: "2an"
-  }
-  builders {
-    # migrating to vm-kernel-precomp-android-release
-    name: "buildbot/client.dart/vm-kernel-precomp-android-release-3-3-be"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm"
     category: "vm|kernel-precomp"
-    short_name: "3an"
+    short_name: "and"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
@@ -1132,6 +1106,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "wr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm"
+    category: "vm|kernel-precomp"
+    short_name: "and"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
     category: "vm|kernel-precomp"
@@ -1541,6 +1520,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "wr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm-dev"
+    category: "vm|kernel-precomp"
+    short_name: "and"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-dev"
     category: "vm|kernel-precomp"
@@ -1960,6 +1944,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "wr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm-stable"
+    category: "vm|kernel-precomp"
+    short_name: "and"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-stable"
     category: "vm|kernel-precomp"
@@ -2292,11 +2281,6 @@ consoles: {
     category: "pub"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/androidvm-linux-release-x64"
-    category: "android"
-    short_name: "vm"
-  }
   header: {
     links: {
       name: "Consoles"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 1cdcbe1867cf..434daccdca16 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -62,11 +62,6 @@ notifiers {
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
-    builders {
-        name: "androidvm-linux-release-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
     builders {
         name: "app-kernel-linux-debug-x64"
         bucket: "ci.sandbox"
@@ -362,6 +357,11 @@ notifiers {
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
+    builders {
+        name: "vm-kernel-precomp-android-release-arm"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
     builders {
         name: "vm-kernel-precomp-bare-linux-release-x64"
         bucket: "ci.sandbox"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index d912ab65018c..6c36b1519e6c 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -115,6 +115,7 @@ trigger {
   triggers: "vm-kernel-mac-release-x64"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
+  triggers: "vm-kernel-precomp-android-release-arm"
   triggers: "vm-kernel-precomp-bare-linux-release-x64"
   triggers: "vm-kernel-precomp-linux-debug-x64"
   triggers: "vm-kernel-precomp-linux-product-x64"
@@ -198,6 +199,7 @@ trigger {
   triggers: "vm-kernel-mac-release-x64-dev"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-android-release-arm-dev"
   triggers: "vm-kernel-precomp-bare-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-linux-debug-x64-dev"
   triggers: "vm-kernel-precomp-linux-product-x64-dev"
@@ -281,6 +283,7 @@ trigger {
   triggers: "vm-kernel-mac-release-x64-stable"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
+  triggers: "vm-kernel-precomp-android-release-arm-stable"
   triggers: "vm-kernel-precomp-bare-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-linux-debug-x64-stable"
   triggers: "vm-kernel-precomp-linux-product-x64-stable"
@@ -970,6 +973,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-precomp-android-release-arm"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-android-release-arm"
+  }
+}
+
 job {
   id: "vm-kernel-precomp-bare-linux-release-x64"
   acl_sets: "default"
@@ -1786,6 +1800,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-precomp-android-release-arm-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-android-release-arm-dev"
+  }
+}
+
 job {
   id: "vm-kernel-precomp-bare-linux-release-x64-dev"
   acl_sets: "default"
@@ -2602,6 +2627,17 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-precomp-android-release-arm-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-android-release-arm-stable"
+  }
+}
+
 job {
   id: "vm-kernel-precomp-bare-linux-release-x64-stable"
   acl_sets: "default"

From 26b887d34350ecc3445d57420e088ba96116cc77 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Thu, 10 Jan 2019 16:06:16 +0000
Subject: [PATCH 234/826] Add simarm(64) precompiled bare builders

Change-Id: I967e7aa57d3c30c2fd4d69bb0338f3b567d4de2f
Reviewed-on: https://dart-review.googlesource.com/c/88970
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 cr-buildbucket.cfg |  8 ++++++
 luci-milo.cfg      | 50 ++++++++++++++++++++++++++++++++
 luci-notify.cfg    | 10 +++++++
 luci-scheduler.cfg | 72 ++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 140 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index a091fc396980..8be8a97c94c2 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -268,6 +268,8 @@ buckets {
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64" }
     builders { name: "vm-kernel-precomp-android-release-arm" }
+    builders { name: "vm-kernel-precomp-bare-linux-release-simarm" }
+    builders { name: "vm-kernel-precomp-bare-linux-release-simarm64" }
     builders { name: "vm-kernel-precomp-bare-linux-release-x64" }
     builders { name: "vm-kernel-precomp-linux-debug-x64" }
     builders { name: "vm-kernel-precomp-linux-product-x64" }
@@ -354,6 +356,8 @@ buckets {
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-dev" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-android-release-arm-dev" }
+    builders { name: "vm-kernel-precomp-bare-linux-release-simarm-dev" }
+    builders { name: "vm-kernel-precomp-bare-linux-release-simarm64-dev" }
     builders { name: "vm-kernel-precomp-bare-linux-release-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-dev" }
     builders { name: "vm-kernel-precomp-linux-product-x64-dev" }
@@ -440,6 +444,8 @@ buckets {
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-stable" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-android-release-arm-stable" }
+    builders { name: "vm-kernel-precomp-bare-linux-release-simarm-stable" }
+    builders { name: "vm-kernel-precomp-bare-linux-release-simarm64-stable" }
     builders { name: "vm-kernel-precomp-bare-linux-release-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-stable" }
     builders { name: "vm-kernel-precomp-linux-product-x64-stable" }
@@ -557,6 +563,8 @@ buckets {
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-try" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-try" }
     builders { name: "vm-kernel-precomp-android-release-arm-try" }
+    builders { name: "vm-kernel-precomp-bare-linux-release-simarm-try" }
+    builders { name: "vm-kernel-precomp-bare-linux-release-simarm64-try" }
     builders { name: "vm-kernel-precomp-bare-linux-release-x64-try" }
     builders { name: "vm-kernel-precomp-linux-debug-x64-try" }
     builders { name: "vm-kernel-precomp-linux-product-x64-try" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 826c2870b9f7..6d97672b2dcd 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -253,6 +253,16 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "br"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm"
+    category: "vm|kernel-precomp"
+    short_name: "bra32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "bra64"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
     category: "vm|kernel"
@@ -839,6 +849,16 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "br"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm"
+    category: "vm|kernel-precomp"
+    short_name: "bra32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "bra64"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
     category: "vm|kernel"
@@ -1141,6 +1161,16 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "br"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm"
+    category: "vm|kernel-precomp"
+    short_name: "bra32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "bra64"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
     category: "vm|kernel"
@@ -1555,6 +1585,16 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "br"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm-dev"
+    category: "vm|kernel-precomp"
+    short_name: "bra32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "bra64"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-dev"
     category: "vm|kernel"
@@ -1979,6 +2019,16 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "br"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm-stable"
+    category: "vm|kernel-precomp"
+    short_name: "bra32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "bra64"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-stable"
     category: "vm|kernel"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 434daccdca16..6852434c5530 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -367,6 +367,16 @@ notifiers {
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
+    builders {
+        name: "vm-kernel-precomp-bare-linux-release-simarm"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-kernel-precomp-bare-linux-release-simarm64"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
     builders {
         name: "vm-kernel-precomp-linux-debug-x64"
         bucket: "ci.sandbox"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 6c36b1519e6c..b7e27026a843 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -117,6 +117,8 @@ trigger {
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
   triggers: "vm-kernel-precomp-android-release-arm"
   triggers: "vm-kernel-precomp-bare-linux-release-x64"
+  triggers: "vm-kernel-precomp-bare-linux-release-simarm"
+  triggers: "vm-kernel-precomp-bare-linux-release-simarm64"
   triggers: "vm-kernel-precomp-linux-debug-x64"
   triggers: "vm-kernel-precomp-linux-product-x64"
   triggers: "vm-kernel-precomp-linux-release-simarm"
@@ -201,6 +203,8 @@ trigger {
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-android-release-arm-dev"
   triggers: "vm-kernel-precomp-bare-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-bare-linux-release-simarm-dev"
+  triggers: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
   triggers: "vm-kernel-precomp-linux-debug-x64-dev"
   triggers: "vm-kernel-precomp-linux-product-x64-dev"
   triggers: "vm-kernel-precomp-linux-release-simarm-dev"
@@ -285,6 +289,8 @@ trigger {
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-android-release-arm-stable"
   triggers: "vm-kernel-precomp-bare-linux-release-x64-stable"
+  triggers: "vm-kernel-precomp-bare-linux-release-simarm-stable"
+  triggers: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
   triggers: "vm-kernel-precomp-linux-debug-x64-stable"
   triggers: "vm-kernel-precomp-linux-product-x64-stable"
   triggers: "vm-kernel-precomp-linux-release-simarm-stable"
@@ -995,6 +1001,28 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-precomp-bare-linux-release-simarm"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-bare-linux-release-simarm"
+  }
+}
+
+job {
+  id: "vm-kernel-precomp-bare-linux-release-simarm64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-bare-linux-release-simarm64"
+  }
+}
+
 job {
   id: "vm-kernel-precomp-linux-debug-x64"
   acl_sets: "default"
@@ -1822,6 +1850,28 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-precomp-bare-linux-release-simarm-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-bare-linux-release-simarm-dev"
+  }
+}
+
+job {
+  id: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
+  }
+}
+
 job {
   id: "vm-kernel-precomp-linux-debug-x64-dev"
   acl_sets: "default"
@@ -2649,6 +2699,28 @@ job {
   }
 }
 
+job {
+  id: "vm-kernel-precomp-bare-linux-release-simarm-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-bare-linux-release-simarm-stable"
+  }
+}
+
+job {
+  id: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
+  }
+}
+
 job {
   id: "vm-kernel-precomp-linux-debug-x64-stable"
   acl_sets: "default"

From c9664ce709ade7d38effb509fc6976391d1a701b Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 14 Jan 2019 17:33:09 +0000
Subject: [PATCH 235/826] [infra] Replace/remove faststartup builders

Context: dart2js removed the old emitter and fast startup is on by
default. This switches luci to use the non-faststartup builders.
Change-Id: I811a5bb4158726dcb0056d53ac81b266d402029c
Reviewed-on: https://dart-review.googlesource.com/c/89220
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: Sigmund Cherem <sigmund@google.com>
Commit-Queue: Sigmund Cherem <sigmund@google.com>
---
 cr-buildbucket.cfg |  31 -----------
 luci-milo.cfg      |  35 ++----------
 luci-notify.cfg    |  40 --------------
 luci-scheduler.cfg | 132 +++++++++++++++++----------------------------
 4 files changed, 53 insertions(+), 185 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 8be8a97c94c2..b01278ceefd1 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -213,14 +213,6 @@ buckets {
     builders { name: "cross-vm-linux-release-arm64" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome" mixins: "new_workflow" }
     builders { name: "dart2js-minified-strong-linux-x64-d8" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-linux-x64-chrome" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-linux-x64-firefox" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-mac-x64-chrome" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-mac-x64-safari" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-win-x64-chrome" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-win-x64-edge" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-win-x64-firefox" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-win-x64-ie11" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-hostasserts-linux-ia32-d8" mixins: "new_workflow" }
     builders { name: "dart2js-strong-linux-x64-chrome" mixins: "new_workflow" }
     builders { name: "dart2js-strong-linux-x64-firefox" mixins: "new_workflow" }
@@ -303,14 +295,6 @@ buckets {
     builders { name: "cross-vm-linux-release-arm64-dev" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome-dev" mixins: "new_workflow" }
     builders { name: "dart2js-minified-strong-linux-x64-d8-dev" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-linux-x64-chrome-dev" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-linux-x64-firefox-dev" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-mac-x64-chrome-dev" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-mac-x64-safari-dev" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-win-x64-chrome-dev" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-win-x64-edge-dev" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-win-x64-firefox-dev" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-win-x64-ie11-dev" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-hostasserts-linux-ia32-d8-dev" mixins: "new_workflow" }
     builders { name: "dart2js-strong-linux-x64-chrome-dev" mixins: "new_workflow" }
     builders { name: "dart2js-strong-linux-x64-firefox-dev" mixins: "new_workflow" }
@@ -391,14 +375,6 @@ buckets {
     builders { name: "cross-vm-linux-release-arm64-stable" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome-stable" mixins: "new_workflow" }
     builders { name: "dart2js-minified-strong-linux-x64-d8-stable" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-linux-x64-chrome-stable" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-linux-x64-firefox-stable" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-mac-x64-chrome-stable" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-mac-x64-safari-stable" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-win-x64-chrome-stable" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-win-x64-edge-stable" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-win-x64-firefox-stable" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-win-x64-ie11-stable" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-hostasserts-linux-ia32-d8-stable" mixins: "new_workflow" }
     builders { name: "dart2js-strong-linux-x64-chrome-stable" mixins: "new_workflow" }
     builders { name: "dart2js-strong-linux-x64-firefox-stable" mixins: "new_workflow" }
@@ -515,13 +491,6 @@ buckets {
     builders { name: "dart-sdk-windows-try" mixins: "sdk" mixins: "win" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome-try" mixins: "new_workflow" }
     builders { name: "dart2js-minified-strong-linux-x64-d8-try" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-linux-x64-chrome-try" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-linux-x64-firefox-try" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-mac-x64-chrome-try" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-mac-x64-safari-try" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-win-x64-chrome-try" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-win-x64-firefox-try" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-faststartup-win-x64-ie11-try" mixins: "win" mixins: "new_workflow" mixins: "new_workflow" }
     builders { name: "dart2js-strong-hostasserts-linux-ia32-d8-try" mixins: "new_workflow" }
     builders { name: "dart2js-strong-linux-x64-chrome-try" mixins: "new_workflow" }
     builders { name: "dart2js-strong-linux-x64-firefox-try" mixins: "new_workflow" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 6d97672b2dcd..aefc19916213 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -418,11 +418,6 @@ consoles: {
     category: "dart2js|chrome"
     short_name: "l"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-faststartup-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "fs"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
     category: "dart2js|firefox"
@@ -454,7 +449,7 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-faststartup-win-x64-ie11"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11"
     category: "dart2js|ms"
     short_name: "ie"
   }
@@ -637,11 +632,6 @@ consoles: {
     category: "dart2js|chrome"
     short_name: "l"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-faststartup-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "fs"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
     category: "dart2js|chrome"
@@ -663,7 +653,7 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-faststartup-win-x64-ie11"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11"
     category: "dart2js|ms"
     short_name: "ie"
   }
@@ -1326,11 +1316,6 @@ consoles: {
     category: "dart2js|chrome"
     short_name: "l"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-faststartup-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "fs"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
     category: "dart2js|chrome"
@@ -1352,7 +1337,7 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-faststartup-win-x64-ie11"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11"
     category: "dart2js|ms"
     short_name: "ie"
   }
@@ -1750,11 +1735,6 @@ consoles: {
     category: "dart2js|chrome"
     short_name: "l"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-faststartup-linux-x64-chrome-dev"
-    category: "dart2js|chrome"
-    short_name: "fs"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-dev"
     category: "dart2js|firefox"
@@ -1786,7 +1766,7 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-faststartup-win-x64-ie11-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11-dev"
     category: "dart2js|ms"
     short_name: "ie"
   }
@@ -2184,11 +2164,6 @@ consoles: {
     category: "dart2js|chrome"
     short_name: "l"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-faststartup-linux-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "fs"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-stable"
     category: "dart2js|firefox"
@@ -2220,7 +2195,7 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-faststartup-win-x64-ie11-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11-stable"
     category: "dart2js|ms"
     short_name: "ie"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 6852434c5530..bb5a57e57875 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -92,46 +92,6 @@ notifiers {
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
-    builders {
-        name: "dart2js-strong-faststartup-linux-x64-chrome"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "dart2js-strong-faststartup-linux-x64-firefox"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "dart2js-strong-faststartup-mac-x64-chrome"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "dart2js-strong-faststartup-mac-x64-safari"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "dart2js-strong-faststartup-win-x64-chrome"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "dart2js-strong-faststartup-win-x64-edge"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "dart2js-strong-faststartup-win-x64-firefox"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "dart2js-strong-faststartup-win-x64-ie11"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
     builders {
         name: "dart2js-strong-hostasserts-linux-ia32-d8"
         bucket: "ci.sandbox"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index b7e27026a843..10ccf90ec884 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -72,17 +72,16 @@ trigger {
   triggers: "dart-sdk-mac"
   triggers: "dart-sdk-win"
   triggers: "dart2js-csp-minified-linux-x64-chrome"
-  triggers: "dart2js-strong-faststartup-linux-x64-chrome"
-  triggers: "dart2js-strong-faststartup-win-x64-ie11"
+  triggers: "dart2js-minified-strong-linux-x64-d8"
+  triggers: "dart2js-strong-hostasserts-linux-ia32-d8"
   triggers: "dart2js-strong-linux-x64-chrome"
   triggers: "dart2js-strong-linux-x64-firefox"
   triggers: "dart2js-strong-mac-x64-chrome"
   triggers: "dart2js-strong-mac-x64-safari"
-  triggers: "dart2js-minified-strong-linux-x64-d8"
-  triggers: "dart2js-strong-hostasserts-linux-ia32-d8"
-  triggers: "dart2js-unit-linux-x64-release"
   triggers: "dart2js-strong-win-x64-chrome"
   triggers: "dart2js-strong-win-x64-firefox"
+  triggers: "dart2js-strong-win-x64-ie11"
+  triggers: "dart2js-unit-linux-x64-release"
   triggers: "ddc-linux-release-chrome"
   triggers: "ddc-mac-release-chrome"
   triggers: "ddc-win-release-chrome"
@@ -160,17 +159,16 @@ trigger {
   triggers: "dart-sdk-mac-dev"
   triggers: "dart-sdk-win-dev"
   triggers: "dart2js-csp-minified-linux-x64-chrome-dev"
-  triggers: "dart2js-strong-faststartup-linux-x64-chrome-dev"
-  triggers: "dart2js-strong-faststartup-win-x64-ie11-dev"
+  triggers: "dart2js-minified-strong-linux-x64-d8-dev"
+  triggers: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
   triggers: "dart2js-strong-linux-x64-chrome-dev"
   triggers: "dart2js-strong-linux-x64-firefox-dev"
   triggers: "dart2js-strong-mac-x64-chrome-dev"
   triggers: "dart2js-strong-mac-x64-safari-dev"
-  triggers: "dart2js-minified-strong-linux-x64-d8-dev"
-  triggers: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
-  triggers: "dart2js-unit-linux-x64-release-dev"
   triggers: "dart2js-strong-win-x64-chrome-dev"
   triggers: "dart2js-strong-win-x64-firefox-dev"
+  triggers: "dart2js-strong-win-x64-ie11-dev"
+  triggers: "dart2js-unit-linux-x64-release-dev"
   triggers: "ddc-linux-release-chrome-dev"
   triggers: "ddc-mac-release-chrome-dev"
   triggers: "ddc-win-release-chrome-dev"
@@ -246,17 +244,16 @@ trigger {
   triggers: "dart-sdk-mac-stable"
   triggers: "dart-sdk-win-stable"
   triggers: "dart2js-csp-minified-linux-x64-chrome-stable"
-  triggers: "dart2js-strong-faststartup-linux-x64-chrome-stable"
-  triggers: "dart2js-strong-faststartup-win-x64-ie11-stable"
+  triggers: "dart2js-minified-strong-linux-x64-d8-stable"
+  triggers: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
   triggers: "dart2js-strong-linux-x64-chrome-stable"
   triggers: "dart2js-strong-linux-x64-firefox-stable"
   triggers: "dart2js-strong-mac-x64-chrome-stable"
   triggers: "dart2js-strong-mac-x64-safari-stable"
-  triggers: "dart2js-minified-strong-linux-x64-d8-stable"
-  triggers: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
-  triggers: "dart2js-unit-linux-x64-release-stable"
   triggers: "dart2js-strong-win-x64-chrome-stable"
   triggers: "dart2js-strong-win-x64-firefox-stable"
+  triggers: "dart2js-strong-win-x64-ie11-stable"
+  triggers: "dart2js-unit-linux-x64-release-stable"
   triggers: "ddc-linux-release-chrome-stable"
   triggers: "ddc-mac-release-chrome-stable"
   triggers: "ddc-win-release-chrome-stable"
@@ -507,24 +504,24 @@ job {
 }
 
 job {
-  id: "dart2js-strong-faststartup-linux-x64-chrome"
+  id: "dart2js-minified-strong-linux-x64-d8"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-faststartup-linux-x64-chrome"
+    builder: "dart2js-minified-strong-linux-x64-d8"
   }
 }
 
 job {
-  id: "dart2js-strong-faststartup-win-x64-ie11"
+  id: "dart2js-strong-hostasserts-linux-ia32-d8"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-faststartup-win-x64-ie11"
+    builder: "dart2js-strong-hostasserts-linux-ia32-d8"
   }
 }
 
@@ -573,57 +570,46 @@ job {
 }
 
 job {
-  id: "dart2js-minified-strong-linux-x64-d8"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-minified-strong-linux-x64-d8"
-  }
-}
-
-job {
-  id: "dart2js-strong-hostasserts-linux-ia32-d8"
+  id: "dart2js-strong-win-x64-chrome"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-hostasserts-linux-ia32-d8"
+    builder: "dart2js-strong-win-x64-chrome"
   }
 }
 
 job {
-  id: "dart2js-unit-linux-x64-release"
+  id: "dart2js-strong-win-x64-firefox"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-unit-linux-x64-release"
+    builder: "dart2js-strong-win-x64-firefox"
   }
 }
 
 job {
-  id: "dart2js-strong-win-x64-chrome"
+  id: "dart2js-strong-win-x64-ie11"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-chrome"
+    builder: "dart2js-strong-win-x64-ie11"
   }
 }
 
 job {
-  id: "dart2js-strong-win-x64-firefox"
+  id: "dart2js-unit-linux-x64-release"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-firefox"
+    builder: "dart2js-unit-linux-x64-release"
   }
 }
 
@@ -1378,24 +1364,24 @@ job {
 }
 
 job {
-  id: "dart2js-strong-faststartup-linux-x64-chrome-dev"
+  id: "dart2js-minified-strong-linux-x64-d8-dev"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-faststartup-linux-x64-chrome-dev"
+    builder: "dart2js-minified-strong-linux-x64-d8-dev"
   }
 }
 
 job {
-  id: "dart2js-strong-faststartup-win-x64-ie11-dev"
+  id: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-faststartup-win-x64-ie11-dev"
+    builder: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
   }
 }
 
@@ -1444,57 +1430,46 @@ job {
 }
 
 job {
-  id: "dart2js-minified-strong-linux-x64-d8-dev"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-minified-strong-linux-x64-d8-dev"
-  }
-}
-
-job {
-  id: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
+  id: "dart2js-strong-win-x64-chrome-dev"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
+    builder: "dart2js-strong-win-x64-chrome-dev"
   }
 }
 
 job {
-  id: "dart2js-unit-linux-x64-release-dev"
+  id: "dart2js-strong-win-x64-firefox-dev"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-unit-linux-x64-release-dev"
+    builder: "dart2js-strong-win-x64-firefox-dev"
   }
 }
 
 job {
-  id: "dart2js-strong-win-x64-chrome-dev"
+  id: "dart2js-strong-win-x64-ie11-dev"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-chrome-dev"
+    builder: "dart2js-strong-win-x64-ie11-dev"
   }
 }
 
 job {
-  id: "dart2js-strong-win-x64-firefox-dev"
+  id: "dart2js-unit-linux-x64-release-dev"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-firefox-dev"
+    builder: "dart2js-unit-linux-x64-release-dev"
   }
 }
 
@@ -2227,24 +2202,24 @@ job {
 }
 
 job {
-  id: "dart2js-strong-faststartup-linux-x64-chrome-stable"
+  id: "dart2js-minified-strong-linux-x64-d8-stable"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-faststartup-linux-x64-chrome-stable"
+    builder: "dart2js-minified-strong-linux-x64-d8-stable"
   }
 }
 
 job {
-  id: "dart2js-strong-faststartup-win-x64-ie11-stable"
+  id: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-faststartup-win-x64-ie11-stable"
+    builder: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
   }
 }
 
@@ -2293,57 +2268,46 @@ job {
 }
 
 job {
-  id: "dart2js-minified-strong-linux-x64-d8-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-minified-strong-linux-x64-d8-stable"
-  }
-}
-
-job {
-  id: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
+  id: "dart2js-strong-win-x64-chrome-stable"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
+    builder: "dart2js-strong-win-x64-chrome-stable"
   }
 }
 
 job {
-  id: "dart2js-unit-linux-x64-release-stable"
+  id: "dart2js-strong-win-x64-firefox-stable"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-unit-linux-x64-release-stable"
+    builder: "dart2js-strong-win-x64-firefox-stable"
   }
 }
 
 job {
-  id: "dart2js-strong-win-x64-chrome-stable"
+  id: "dart2js-strong-win-x64-ie11-stable"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-chrome-stable"
+    builder: "dart2js-strong-win-x64-ie11-stable"
   }
 }
 
 job {
-  id: "dart2js-strong-win-x64-firefox-stable"
+  id: "dart2js-unit-linux-x64-release-stable"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-firefox-stable"
+    builder: "dart2js-unit-linux-x64-release-stable"
   }
 }
 

From 292f9798dc9e53ea6de7e5760be26ec2d9c599ac Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 15 Jan 2019 16:25:20 +0000
Subject: [PATCH 236/826] [infra] Temporarily increase shard timeout for
 android

TBR=whesse@google.com

Change-Id: Ifdb62db479177fe8891128159ba60f2d4c6b9633
Reviewed-on: https://dart-review.googlesource.com/c/89642
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index b01278ceefd1..4ba12976eaf9 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -38,6 +38,13 @@ acl_sets {
   }
 }
 
+builder_mixins {
+  name: "android"
+  recipe {
+    properties_j: "shard_timeout:5400" # 1.5h
+  }
+}
+
 builder_mixins {
   name: "chocolatey"
   recipe {
@@ -259,7 +266,7 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64" }
-    builders { name: "vm-kernel-precomp-android-release-arm" }
+    builders { name: "vm-kernel-precomp-android-release-arm" mixins: "android" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm64" }
     builders { name: "vm-kernel-precomp-bare-linux-release-x64" }
@@ -339,7 +346,7 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-dev" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-dev" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-dev" }
-    builders { name: "vm-kernel-precomp-android-release-arm-dev" }
+    builders { name: "vm-kernel-precomp-android-release-arm-dev" mixins: "android" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm-dev" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm64-dev" }
     builders { name: "vm-kernel-precomp-bare-linux-release-x64-dev" }
@@ -419,7 +426,7 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-stable" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-stable" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-stable" }
-    builders { name: "vm-kernel-precomp-android-release-arm-stable" }
+    builders { name: "vm-kernel-precomp-android-release-arm-stable" mixins: "android" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm-stable" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm64-stable" }
     builders { name: "vm-kernel-precomp-bare-linux-release-x64-stable" }
@@ -531,7 +538,7 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-try" mixins: "mac" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-try" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-try" }
-    builders { name: "vm-kernel-precomp-android-release-arm-try" }
+    builders { name: "vm-kernel-precomp-android-release-arm-try" mixins: "android" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm-try" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm64-try" }
     builders { name: "vm-kernel-precomp-bare-linux-release-x64-try" }

From f45b18e626f3326203cb64ed7f58215c51285e60 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 16 Jan 2019 16:39:57 +0000
Subject: [PATCH 237/826] [infra] Add external google builder to Luci config

TBR=whesse@google.com

Change-Id: I52dbe3263da7da85e543ad6a844c10aac1a9f435
Reviewed-on: https://dart-review.googlesource.com/c/89516
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 13 +++++++++++++
 luci-milo.cfg      |  6 +++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 4ba12976eaf9..e3544270498e 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -20,6 +20,11 @@ acl_sets {
     role: SCHEDULER
     identity: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
   }
+  acls {
+    role: SCHEDULER
+    # todo(athom): remove this once google builder is triggered automatically
+    group: "project-dart-admins"
+  }
 }
 
 acl_sets {
@@ -71,6 +76,13 @@ builder_mixins {
   }
 }
 
+builder_mixins {
+  name: "external"
+  recipe {
+    name: "dart/external"
+  }
+}
+
 builder_mixins {
   name: "forward"
   recipe {
@@ -154,6 +166,7 @@ buckets {
     builders { name: "dart-sdk-win" mixins: "win" }
     builders { name: "docker" mixins: "docker" }
     builders { name: "debianpackage-linux" mixins: "debianpackage" }
+    builders { name: "google" mixins: "external" }
 
     # CI builders that require privileged access on the dev branch
     builders { name: "dart-sdk-linux-dev" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index aefc19916213..48482c534dea 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2282,9 +2282,9 @@ consoles: {
   refs: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbot/client.dart.internal/flutter-engine-linux"
-    category: "vm|flutter"
-    short_name: "f"
+    name: "buildbucket/luci.dart.ci/google"
+    category: "external"
+    short_name: "g"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-debug-ia32-none"

From 292632369d0e0f2bbb3027c089b318421410162c Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Mon, 21 Jan 2019 12:12:55 +0000
Subject: [PATCH 238/826] Remove pub builders from the CQ/CI

Pub should mainly be tested on commits to the pub repo, not on rolls to the SDK.

Change-Id: Ib550d988de7376d258cb71f109f2f89f969ab456
Reviewed-on: https://dart-review.googlesource.com/c/88186
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg |  9 ---------
 luci-milo.cfg      | 16 +++-------------
 luci-notify.cfg    | 15 ---------------
 3 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index e3544270498e..053ebbafc520 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -254,9 +254,6 @@ buckets {
     builders { name: "pkg-mac-release" mixins: "mac" mixins: "new_workflow" }
     builders { name: "pkg-win-release" mixins: "win" mixins: "new_workflow" }
     builders { name: "pkg-linux-debug" mixins: "new_workflow" }
-    builders { name: "pub-linux-release" }
-    builders { name: "pub-mac-release" mixins: "mac" }
-    builders { name: "pub-win-release" mixins: "win" }
     builders { name: "versionchecker-linux" }
     builders { name: "vm-canary-linux-debug" }
     builders { name: "vm-dartkb-linux-debug-x64" }
@@ -334,9 +331,6 @@ buckets {
     builders { name: "pkg-linux-release-dev" mixins: "new_workflow" }
     builders { name: "pkg-mac-release-dev" mixins: "mac" mixins: "new_workflow" }
     builders { name: "pkg-win-release-dev" mixins: "win" mixins: "new_workflow" }
-    builders { name: "pub-linux-release-dev" }
-    builders { name: "pub-mac-release-dev" mixins: "mac" }
-    builders { name: "pub-win-release-dev" mixins: "win" }
     builders { name: "versionchecker-linux-dev" }
     builders { name: "vm-canary-linux-debug-dev" }
     builders { name: "vm-dartkb-linux-debug-x64-dev" }
@@ -414,9 +408,6 @@ buckets {
     builders { name: "pkg-linux-release-stable" mixins: "new_workflow" }
     builders { name: "pkg-mac-release-stable" mixins: "mac" mixins: "new_workflow" }
     builders { name: "pkg-win-release-stable" mixins: "win" mixins: "new_workflow" }
-    builders { name: "pub-linux-release-stable" }
-    builders { name: "pub-mac-release-stable" mixins: "mac" }
-    builders { name: "pub-win-release-stable" mixins: "win" }
     builders { name: "versionchecker-linux-stable" }
     builders { name: "vm-canary-linux-debug-stable" }
     builders { name: "vm-dartkb-linux-debug-x64-stable" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 48482c534dea..58486760a3ff 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2292,19 +2292,9 @@ consoles: {
     short_name: "hcd"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pub-linux-release"
-    category: "pub"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pub-mac-release"
-    category: "pub"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pub-win-release"
-    category: "pub"
-    short_name: "w"
+    name: "buildbucket/luci.dart.ci.sandbox/androidvm-linux-release-x64"
+    category: "android"
+    short_name: "vm"
   }
   header: {
     links: {
diff --git a/luci-notify.cfg b/luci-notify.cfg
index bb5a57e57875..127a1c228cfb 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -192,21 +192,6 @@ notifiers {
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
-    builders {
-        name: "pub-linux-release"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "pub-mac-release"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "pub-win-release"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
     builders {
         name: "versionchecker-linux"
         bucket: "ci.sandbox"

From cc40c23facb81dd1eac9dc1f99a22e6e46e5c40d Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Mon, 21 Jan 2019 17:26:50 +0000
Subject: [PATCH 239/826] [infra/config] Remove stray entry from bad merge

Introduced in commit of https://dart-review.googlesource.com/c/sdk/+/88186

Change-Id: I7bbc38c1a436fcd54624ec7a1a219153c33c3152
Reviewed-on: https://dart-review.googlesource.com/c/90403
Auto-Submit: William Hesse <whesse@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-milo.cfg | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 58486760a3ff..1a935f9241ea 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2291,11 +2291,6 @@ consoles: {
     category: "dart2js"
     short_name: "hcd"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/androidvm-linux-release-x64"
-    category: "android"
-    short_name: "vm"
-  }
   header: {
     links: {
       name: "Consoles"

From 2b58db3fbfed1cfec1b043014ab53f78f9d4634c Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Tue, 22 Jan 2019 15:10:09 +0000
Subject: [PATCH 240/826] [infra] Add gclient builder that checks if dart can
 be fetched.

Change-Id: I7b9d31f158b57f571a196204acab92bacfda4bb9
Reviewed-on: https://dart-review.googlesource.com/c/90486
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 11 +++++++++++
 luci-milo.cfg      | 26 ++++++++++++++++++++++++++
 luci-notify.cfg    |  5 +++++
 luci-scheduler.cfg | 36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 78 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 053ebbafc520..2c364426a888 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -90,6 +90,13 @@ builder_mixins {
   }
 }
 
+builder_mixins {
+  name: "gclient"
+  recipe {
+    name: "dart/gclient"
+  }
+}
+
 builder_mixins {
   name: "fyi"
   recipe {
@@ -250,6 +257,7 @@ buckets {
     builders { name: "front-end-linux-release-x64" mixins: "clobber" }
     builders { name: "front-end-mac-release-x64" mixins: "clobber" mixins: "mac" }
     builders { name: "front-end-win-release-x64" mixins: "clobber" mixins: "win" mixins: "new_workflow" }
+    builders { name: "gclient" mixins: "gclient" }
     builders { name: "pkg-linux-release" mixins: "new_workflow" }
     builders { name: "pkg-mac-release" mixins: "mac" mixins: "new_workflow" }
     builders { name: "pkg-win-release" mixins: "win" mixins: "new_workflow" }
@@ -328,6 +336,7 @@ buckets {
     builders { name: "front-end-linux-release-x64-dev" mixins: "clobber" }
     builders { name: "front-end-mac-release-x64-dev" mixins: "clobber" mixins: "mac" }
     builders { name: "front-end-win-release-x64-dev" mixins: "clobber" mixins: "win" }
+    builders { name: "gclient-dev" mixins: "gclient" }
     builders { name: "pkg-linux-release-dev" mixins: "new_workflow" }
     builders { name: "pkg-mac-release-dev" mixins: "mac" mixins: "new_workflow" }
     builders { name: "pkg-win-release-dev" mixins: "win" mixins: "new_workflow" }
@@ -405,6 +414,7 @@ buckets {
     builders { name: "front-end-linux-release-x64-stable" mixins: "clobber" }
     builders { name: "front-end-mac-release-x64-stable" mixins: "clobber" mixins: "mac" }
     builders { name: "front-end-win-release-x64-stable" mixins: "clobber" mixins: "win" }
+    builders { name: "gclient-stable" mixins: "gclient" }
     builders { name: "pkg-linux-release-stable" mixins: "new_workflow" }
     builders { name: "pkg-mac-release-stable" mixins: "mac" mixins: "new_workflow" }
     builders { name: "pkg-win-release-stable" mixins: "win" mixins: "new_workflow" }
@@ -518,6 +528,7 @@ buckets {
     builders { name: "front-end-linux-release-x64-try" mixins: "clobber" }
     builders { name: "front-end-mac-release-x64-try" mixins: "clobber" mixins: "mac" }
     builders { name: "front-end-win-release-x64-try" mixins: "clobber" mixins: "win" mixins: "new_workflow" }
+    builders { name: "gclient-try" mixins: "gclient" }
     builders { name: "pkg-linux-release-try" mixins: "new_workflow" }
     builders { name: "pkg-mac-release-try" mixins: "mac" mixins: "new_workflow" }
     builders { name: "pkg-win-release-try" mixins: "win" mixins: "new_workflow" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 1a935f9241ea..813dbc9fce33 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -473,6 +473,11 @@ consoles: {
     category: "pkg"
     short_name: "ld"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/gclient"
+    category: "misc"
+    short_name: "g"
+  }
   builders {
     # migrating to debianpackage-linux
     name: "buildbot/client.dart/debianpackage-linux-be"
@@ -677,6 +682,11 @@ consoles: {
     category: "pkg"
     short_name: "ld"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/gclient"
+    category: "misc"
+    short_name: "g"
+  }
   builders {
     # migrating to debianpackage-linux
     name: "buildbot/client.dart/debianpackage-linux-be"
@@ -1356,6 +1366,11 @@ consoles: {
     category: "pkg"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/gclient"
+    category: "misc"
+    short_name: "g"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/debianpackage-linux"
     category: "misc"
@@ -1785,6 +1800,11 @@ consoles: {
     category: "pkg"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/gclient-dev"
+    category: "misc"
+    short_name: "g"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/debianpackage-linux-dev"
     category: "misc"
@@ -2214,6 +2234,11 @@ consoles: {
     category: "pkg"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/gclient-stable"
+    category: "misc"
+    short_name: "g"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/debianpackage-linux-stable"
     category: "misc"
@@ -2340,6 +2365,7 @@ consoles: {
   builders { name: "buildbucket/luci.dart.try/dart2js-unit-linux-x64-release-try" }
   builders { name: "buildbucket/luci.dart.try/ddc-linux-release-chrome-try" }
   builders { name: "buildbucket/luci.dart.try/front-end-linux-release-x64-try" }
+  builders { name: "buildbucket/luci.dart.try/gclient-try" }
   builders { name: "buildbucket/luci.dart.try/pkg-linux-release-try" }
   builders { name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try" }
   builders { name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simdbc64-try" }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 127a1c228cfb..f8e92bfb5d15 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -172,6 +172,11 @@ notifiers {
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
+    builders {
+        name: "gclient"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
     builders {
         name: "pkg-linux-release"
         bucket: "ci.sandbox"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 10ccf90ec884..6e039ea800cc 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -89,6 +89,7 @@ trigger {
   triggers: "front-end-linux-release-x64"
   triggers: "front-end-mac-release-x64"
   triggers: "front-end-win-release-x64"
+  triggers: "gclient"
   triggers: "pkg-linux-release"
   triggers: "pkg-mac-release"
   triggers: "pkg-win-release"
@@ -175,6 +176,7 @@ trigger {
   triggers: "front-end-linux-release-x64-dev"
   triggers: "front-end-mac-release-x64-dev"
   triggers: "front-end-win-release-x64-dev"
+  triggers: "gclient-dev"
   triggers: "pkg-linux-release-dev"
   triggers: "pkg-mac-release-dev"
   triggers: "pkg-win-release-dev"
@@ -260,6 +262,7 @@ trigger {
   triggers: "front-end-linux-release-x64-stable"
   triggers: "front-end-mac-release-x64-stable"
   triggers: "front-end-win-release-x64-stable"
+  triggers: "gclient-stable"
   triggers: "pkg-linux-release-stable"
   triggers: "pkg-mac-release-stable"
   triggers: "pkg-win-release-stable"
@@ -690,6 +693,17 @@ job {
   }
 }
 
+job {
+  id: "gclient"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "gclient"
+  }
+}
+
 job {
   id: "pkg-linux-release"
   acl_sets: "default"
@@ -1539,6 +1553,17 @@ job {
   }
 }
 
+job {
+  id: "gclient-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "gclient-dev"
+  }
+}
+
 job {
   id: "pkg-linux-release-dev"
   acl_sets: "default"
@@ -2377,6 +2402,17 @@ job {
   }
 }
 
+job {
+  id: "gclient-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "gclient-stable"
+  }
+}
+
 job {
   id: "pkg-linux-release-stable"
   acl_sets: "default"

From 18280e8a44516c59343c58df2fa11a0d87d5d245 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 22 Jan 2019 15:19:55 +0000
Subject: [PATCH 241/826] [infra] Remove obsolete 'luci' console

* Remove all things referring to the consoles as "migration".

Change-Id: I79125214d7428a3c8c19792711c2470b4136c499
Reviewed-on: https://dart-review.googlesource.com/c/90481
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-milo.cfg | 463 +-------------------------------------------------
 1 file changed, 7 insertions(+), 456 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 813dbc9fce33..128e6029e733 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -37,17 +37,12 @@ consoles: {
       links: {
         text: "Bleeding Edge console"
         url: "/p/dart/g/be/console"
-        alt: "SDK BE Console (migration)"
+        alt: "SDK BE Console"
       }
       links: {
         text: "Alternative Bleeding Edge console"
         url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (migration, alternative)"
-      }
-      links: {
-        text: "LUCI console"
-        url: "/p/dart/g/luci/console"
-        alt: "SDK BE Console (LUCI Preview)"
+        alt: "SDK BE Console (alternative)"
       }
       links: {
         text: "Buildbot console"
@@ -74,7 +69,7 @@ consoles: {
 
 consoles: {
   id: "be"
-  name: "SDK Bleeding Edge Console (migration)"
+  name: "SDK Bleeding Edge Console"
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "refs/heads/master"
   manifest_name: "REVISION"
@@ -496,12 +491,7 @@ consoles: {
       links: {
         text: "Alternative Bleeding Edge console"
         url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (migration, alternative)"
-      }
-      links: {
-        text: "LUCI console"
-        url: "/p/dart/g/luci/console"
-        alt: "SDK BE Console (LUCI Preview)"
+        alt: "SDK BE Console (alternative)"
       }
       links: {
         text: "Buildbot console"
@@ -528,7 +518,7 @@ consoles: {
 
 consoles: {
   id: "alt"
-  name: "SDK Bleeding Edge Console (alternative, migration)"
+  name: "SDK Bleeding Edge Console (alternative)"
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "refs/heads/master"
   manifest_name: "REVISION"
@@ -950,12 +940,7 @@ consoles: {
       links: {
         text: "Bleeding Edge console"
         url: "/p/dart/g/be/console"
-        alt: "SDK BE Console (migration)"
-      }
-      links: {
-        text: "LUCI console"
-        url: "/p/dart/g/luci/console"
-        alt: "SDK BE Console (LUCI Preview)"
+        alt: "SDK BE Console"
       }
       links: {
         text: "Buildbot console"
@@ -980,440 +965,6 @@ consoles: {
   }
 }
 
-consoles: {
-  id: "luci"
-  name: "SDK Bleeding Edge Console (LUCI Preview)"
-  repo_url: "https://dart.googlesource.com/sdk/"
-  refs: "refs/heads/master"
-  manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
-    category: "fasta"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
-    category: "fasta"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
-    category: "fasta"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbot/client.dart.internal/flutter-engine-linux"
-    category: "flutter"
-    short_name: "3H"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
-    category: "flutter"
-    short_name: "fa"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
-    category: "vm|app-kernel"
-    short_name: "d64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64"
-    category: "vm|app-kernel"
-    short_name: "p64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64"
-    category: "vm|app-kernel"
-    short_name: "r64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64"
-    category: "vm|dartkb"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64"
-    category: "vm|dartkb"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
-    category: "vm|kernel"
-    short_name: "c"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
-    category: "vm|kernel"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64"
-    category: "vm|kernel"
-    short_name: "dbc"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
-    category: "vm|kernel"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
-    category: "vm|kernel"
-    short_name: "a64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64"
-    category: "vm|kernel"
-    short_name: "rbc"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32"
-    category: "vm|kernel"
-    short_name: "r32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
-    category: "vm|kernel"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
-    category: "vm|kernel"
-    short_name: "rc"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32"
-    category: "vm|kernel"
-    short_name: "d32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-simdbc64"
-    category: "vm|kernel"
-    short_name: "mds"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-simdbc64"
-    category: "vm|kernel"
-    short_name: "mrs"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
-    category: "vm|kernel"
-    short_name: "md"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
-    category: "vm|kernel"
-    short_name: "mr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
-    category: "vm|kernel"
-    short_name: "wd3"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64"
-    category: "vm|kernel"
-    short_name: "wd"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32"
-    category: "vm|kernel"
-    short_name: "wr3"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
-    category: "vm|kernel"
-    short_name: "wr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm"
-    category: "vm|kernel-precomp"
-    short_name: "and"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
-    category: "vm|kernel-precomp"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
-    category: "vm|kernel-precomp"
-    short_name: "p"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
-    category: "vm|kernel-precomp"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "a64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "br"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm"
-    category: "vm|kernel-precomp"
-    short_name: "bra32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "bra64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
-    category: "vm|kernel"
-    short_name: "o"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "ma"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "wa"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "wr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
-    category: "vm|kernel"
-    short_name: "cra"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
-    category: "vm|misc"
-    short_name: "a64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
-    category: "vm|misc"
-    short_name: "o32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
-    category: "vm|misc"
-    short_name: "o64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
-    category: "vm|product"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
-    category: "vm|product"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
-    category: "vm|product"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
-    category: "vm|reload-kernel"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
-    category: "vm|reload-kernel"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-debug-simdbc64"
-    category: "vm|reload-kernel"
-    short_name: "md"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64"
-    category: "vm|reload-kernel"
-    short_name: "mr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
-    category: "vm|reload-kernel"
-    short_name: "drb"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64"
-    category: "vm|reload-kernel"
-    short_name: "rrb"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
-    category: "dart2js|d8"
-    short_name: "ha"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
-    category: "dart2js|d8"
-    short_name: "mi"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
-    category: "dart2js|d8"
-    short_name: "u"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
-    category: "analyzer"
-    short_name: "as"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
-    category: "analyzer"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
-    category: "analyzer"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
-    category: "analyzer"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-linux"
-    category: "sdk"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac"
-    category: "sdk"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-win"
-    category: "sdk"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
-    category: "ddc"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
-    category: "ddc"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
-    category: "ddc"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
-    category: "dart2js|safari"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11"
-    category: "dart2js|ms"
-    short_name: "ie"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
-    category: "pkg"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
-    category: "pkg"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
-    category: "pkg"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/gclient"
-    category: "misc"
-    short_name: "g"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux"
-    category: "misc"
-    short_name: "dp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/versionchecker-linux"
-    category: "misc"
-    short_name: "vc"
-  }
-  header: {
-    links: {
-      name: "Consoles"
-      links: {
-        text: "SDK BE Console"
-        url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
-      }
-      links: {
-        text: "SDK Dev Console"
-        url: "/p/dart/g/dev/console"
-        alt: "SDK Dev Console"
-      }
-      links: {
-        text: "SDK Stable Console"
-        url: "/p/dart/g/stable/console"
-        alt: "SDK Stable Console"
-      }
-      links: {
-        text: "SDK FYI Console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
-      }
-      links: {
-        text: "SDK CQ Status"
-        url: "/p/dart/g/cq/builders"
-        alt: "SDK CQ Status"
-      }
-    }
-    tree_status_host: "dart-status.appspot.com"
-  }
-}
-
 consoles: {
   id: "dev"
   name: "SDK Dev Console"
@@ -1829,7 +1380,7 @@ consoles: {
         alt: "SDK Dev Console"
       }
       links: {
-        text: "dart.stable"
+        text: "SDK Stable Console"
         url: "/p/dart/g/stable/console"
         alt: "SDK Stable Console"
       }

From d2834a534ac92bf2b59ffa99721e7a8cbc7b6e12 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 22 Jan 2019 15:19:55 +0000
Subject: [PATCH 242/826] [infra] Move vm-kernel-precomp-obfuscate builder into
 the precomp category

Change-Id: I9aaa9ff820a81a29c8cd10b3f012f1b024d1ea40
Reviewed-on: https://dart-review.googlesource.com/c/90482
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-milo.cfg | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 128e6029e733..e9b6dcbc030f 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -260,7 +260,7 @@ consoles: {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
-    category: "vm|kernel"
+    category: "vm|kernel-precomp"
     short_name: "o"
   }
   builders {
@@ -851,7 +851,7 @@ consoles: {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
-    category: "vm|kernel"
+    category: "vm|kernel-precomp"
     short_name: "o"
   }
   builders {
@@ -1148,7 +1148,7 @@ consoles: {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-    category: "vm|kernel"
+    category: "vm|kernel-precomp"
     short_name: "o"
   }
   builders {
@@ -1582,7 +1582,7 @@ consoles: {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-stable"
-    category: "vm|kernel"
+    category: "vm|kernel-precomp"
     short_name: "o"
   }
   builders {

From 14aacc71708b1b852b0c2bccefbbbd0e7ef3f523 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 23 Jan 2019 08:12:09 +0000
Subject: [PATCH 243/826] [infra] Move flutter-analyze builder to the analyzer
 category

Change-Id: I7e4e599b7403e27a79a30f1a159aeb4447bc909e
Reviewed-on: https://dart-review.googlesource.com/c/90681
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-milo.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index e9b6dcbc030f..6bf1f2dd2dc0 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -95,7 +95,7 @@ consoles: {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
-    category: "flutter"
+    category: "analyzer"
     short_name: "fa"
   }
   builders {
@@ -544,7 +544,7 @@ consoles: {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
-    category: "flutter"
+    category: "analyzer"
     short_name: "fa"
   }
   builders {

From 02ae59aea453cce6524ac0518f385e9f14018323 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 23 Jan 2019 08:27:34 +0000
Subject: [PATCH 244/826] [infra] Move flutter-analyze builder next to the
 other analyzer builders

Just changing the category unintentionally re-ordered the categories.

TBR=whesse@google.com

Change-Id: I346dbd5a56701850ee6c169ca36bc17bdfda13f2
Reviewed-on: https://dart-review.googlesource.com/c/90682
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-milo.cfg | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 6bf1f2dd2dc0..c941e24890d4 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -93,11 +93,6 @@ consoles: {
     category: "flutter"
     short_name: "3H"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
-    category: "analyzer"
-    short_name: "fa"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
     category: "vm|app-kernel"
@@ -358,6 +353,11 @@ consoles: {
     category: "dart2js|d8"
     short_name: "u"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
+    category: "analyzer"
+    short_name: "fa"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
     category: "analyzer"
@@ -542,11 +542,6 @@ consoles: {
     category: "flutter"
     short_name: "3H"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
-    category: "analyzer"
-    short_name: "fa"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
     category: "dart2js|d8"
@@ -562,6 +557,11 @@ consoles: {
     category: "dart2js|d8"
     short_name: "u"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
+    category: "analyzer"
+    short_name: "fa"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
     category: "analyzer"

From 0791d41cfacdbdc8ff0ea5c1b48f15aa76a45af1 Mon Sep 17 00:00:00 2001
From: Andrii Shyshkalov <tandrii@google.com>
Date: Mon, 28 Jan 2019 13:24:00 +0000
Subject: [PATCH 245/826] [commit-queue.cfg] Create new project-scoped CQ
 config.

Autogenerated from ref-scoped cq.cfg located at:
  https://dart.googlesource.com/sdk/+/refs/heads/master/tools/infra/config/cq.cfg
  (pinned https://dart.googlesource.com/sdk/+/a5030ed92fc5974ad126d4e279f011e6e1409d1e/tools/infra/config/cq.cfg)

The new config is functionally equivalent to the old one. Upon landing, the new
config will take effect once LUCI config service picks it up. If you see
'commit-queue.cfg' in https://luci-config.appspot.com/#/projects/dart ,
then it has been picked up.

New commit-queue.cfg takes precedence over old cq.cfg, and once picked up makes
it safe to remove old cq.cfg.

See also internal PSA go/psa-migrate-to-commit-queue-cfg.

Generated-by: https://crrev.com/i/815809
Bug: chromium:916292
Change-Id: If0455ce6d09bdf3e6e3e97444ed0d1617ea30dec
Reviewed-on: https://dart-review.googlesource.com/c/91147
Reviewed-by: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg | 90 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 commit-queue.cfg

diff --git a/commit-queue.cfg b/commit-queue.cfg
new file mode 100644
index 000000000000..a94454d9c13a
--- /dev/null
+++ b/commit-queue.cfg
@@ -0,0 +1,90 @@
+# See http://luci-config.appspot.com/schemas/projects:commit-queue.cfg for the
+# documentation of this file format.
+
+cq_status_host: "chromium-cq-status.appspot.com"
+submit_options {
+  max_burst: 2
+  burst_delay {
+    seconds: 480
+  }
+}
+config_groups {
+  gerrit {
+    url: "https://dart-review.googlesource.com"
+    projects {
+      name: "sdk"
+      ref_regexp: "refs/heads/.+"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "project-dart-committers"
+      dry_run_access_list: "project-dart-tryjob-access"
+      allow_submit_with_open_deps: true
+    }
+    tree_status {
+      url: "https://dart-status.appspot.com"
+    }
+    tryjob {
+      builders {
+        name: "dart/try/analyzer-analysis-server-linux-try"
+      }
+      builders {
+        name: "dart/try/analyzer-linux-release-try"
+      }
+      builders {
+        name: "dart/try/benchmark-linux-try"
+      }
+      builders {
+        name: "dart/try/dart-sdk-windows-try"
+      }
+      builders {
+        name: "dart/try/dart2js-strong-linux-x64-chrome-try"
+      }
+      builders {
+        name: "dart/try/dart2js-minified-strong-linux-x64-d8-try"
+      }
+      builders {
+        name: "dart/try/dart2js-strong-hostasserts-linux-ia32-d8-try"
+      }
+      builders {
+        name: "dart/try/dart2js-unit-linux-x64-release-try"
+      }
+      builders {
+        name: "dart/try/ddc-linux-release-chrome-try"
+      }
+      builders {
+        name: "dart/try/front-end-linux-release-x64-try"
+      }
+      builders {
+        name: "dart/try/gclient-try"
+      }
+      builders {
+        name: "dart/try/pkg-linux-release-try"
+      }
+      builders {
+        name: "dart/try/vm-canary-linux-debug-try"
+      }
+      builders {
+        name: "dart/try/vm-kernel-linux-release-simdbc64-try"
+      }
+      builders {
+        name: "dart/try/vm-kernel-linux-release-x64-try"
+      }
+      builders {
+        name: "dart/try/vm-kernel-mac-release-x64-try"
+        experiment_percentage: 5
+      }
+      builders {
+        name: "dart/try/vm-kernel-linux-product-x64-try"
+      }
+      retry_config {
+        single_quota: 1
+        global_quota: 2
+        failure_weight: 1
+        transient_failure_weight: 1
+        timeout_weight: 2
+      }
+    }
+  }
+}

From d74aa9bf52b590bfef1a8d5d705a68b8d000ec3a Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Thu, 31 Jan 2019 12:32:43 +0000
Subject: [PATCH 246/826] [infra] Switch analyzer-0.33 builders and console to
 analyzer-stable

Bug: https://github.com/dart-lang/sdk/issues/35806
Change-Id: I05163073eabea10e01009119a3361b6ff0c5ca06
Reviewed-on: https://dart-review.googlesource.com/c/91741
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg |  9 ++++-----
 luci-milo.cfg      |  9 ++-------
 luci-scheduler.cfg | 14 +-------------
 3 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 2c364426a888..d1e10030e696 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -223,11 +223,10 @@ buckets {
     builders { name: "fuzz-linux" }
 
     # CI Builders for the analyzer branch
-    builders { name: "analyzer-analysis-server-linux-analyzer" }
-    builders { name: "analyzer-linux-release-analyzer" }
-    builders { name: "analyzer-linux-release-analyzer-new" mixins: "new_workflow" }
-    builders { name: "analyzer-mac-release-analyzer" mixins: "mac" }
-    builders { name: "analyzer-win-release-analyzer" mixins: "win" }
+    builders { name: "analyzer-analysis-server-linux-analyzer" mixins: "new_workflow"  }
+    builders { name: "analyzer-linux-release-analyzer" mixins: "new_workflow"  }
+    builders { name: "analyzer-mac-release-analyzer" mixins: "new_workflow"  mixins: "mac" }
+    builders { name: "analyzer-win-release-analyzer" mixins: "new_workflow"  mixins: "win" }
 
     # CI Builders for the master branch
     builders { name: "analyzer-analysis-server-linux" mixins: "new_workflow" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index c941e24890d4..5646c3c91e20 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2,9 +2,9 @@ logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png"
 
 consoles: {
   id: "analyzer"
-  name: "SDK Analyzer 0.33 Branch Console"
+  name: "SDK Analyzer Stable Branch Console"
   repo_url: "https://dart.googlesource.com/sdk"
-  refs: "refs/heads/analyzer-0.33"
+  refs: "refs/heads/analyzer-stable"
   manifest_name: "REVISION"
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-analyzer"
@@ -16,11 +16,6 @@ consoles: {
     category: "analyzer"
     short_name: "l"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-analyzer-new"
-    category: "analyzer"
-    short_name: "ln"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-analyzer"
     category: "analyzer"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 6e039ea800cc..b0122cbb540c 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -44,11 +44,10 @@ trigger {
   acl_sets: "default"
   gitiles: {
     repo: "https://dart.googlesource.com/sdk/"
-    refs: "refs/heads/analyzer-0.33"
+    refs: "refs/heads/analyzer-stable"
   }
   triggers: "analyzer-analysis-server-linux-analyzer"
   triggers: "analyzer-linux-release-analyzer"
-  triggers: "analyzer-linux-release-analyzer-new"
   triggers: "analyzer-mac-release-analyzer"
   triggers: "analyzer-win-release-analyzer"
 }
@@ -339,17 +338,6 @@ job {
   }
 }
 
-job {
-  id: "analyzer-linux-release-analyzer-new"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-linux-release-analyzer-new"
-  }
-}
-
 job {
   id: "analyzer-mac-release-analyzer"
   acl_sets: "default"

From 307f8ee9515918d6b4af3aa1c43711a0143abf7f Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 7 Feb 2019 08:13:49 +0000
Subject: [PATCH 247/826] [infra] Add co19_roller to buildbucket config

TBR=whesse@google.com

Change-Id: I4ad84954d3d3eedbbe3c1ddfa2a1dd2697f664c0
Reviewed-on: https://dart-review.googlesource.com/c/92262
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index d1e10030e696..6d527e4af9b4 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -57,6 +57,13 @@ builder_mixins {
   }
 }
 
+builder_mixins {
+  name: "co19"
+  recipe {
+    name: "dart/package_co19"
+  }
+}
+
 builder_mixins {
   name: "clobber"
   recipe {
@@ -168,6 +175,7 @@ buckets {
     # CI Builders that require privileged access
     builders { name: "base" mixins: "forward" }
     builders { name: "chocolatey" mixins: "chocolatey" mixins: "win" }
+    builders { name: "co19-roller" mixins: "co19" }
     builders { name: "dart-sdk-linux" }
     builders { name: "dart-sdk-mac" mixins: "mac" }
     builders { name: "dart-sdk-win" mixins: "win" }

From 82ebc522b9b8661f2a740e07c396e43d80c3746a Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Tue, 12 Feb 2019 14:33:07 +0000
Subject: [PATCH 248/826] [infra] Rename analyzer-stable branch builders to
 have branch suffix.

This change assigns systematic names to the builders for branches, where
those builders end in their branch name as the suffix. This will be used to
identify to which branch the builders belong.

Change-Id: Iab600aad26377832d4c2f26318835f32b7215dab
Reviewed-on: https://dart-review.googlesource.com/c/92742
Reviewed-by: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg |  8 ++++----
 luci-milo.cfg      |  8 ++++----
 luci-scheduler.cfg | 26 +++++++++++++-------------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 6d527e4af9b4..30c9e475f74c 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -231,10 +231,10 @@ buckets {
     builders { name: "fuzz-linux" }
 
     # CI Builders for the analyzer branch
-    builders { name: "analyzer-analysis-server-linux-analyzer" mixins: "new_workflow"  }
-    builders { name: "analyzer-linux-release-analyzer" mixins: "new_workflow"  }
-    builders { name: "analyzer-mac-release-analyzer" mixins: "new_workflow"  mixins: "mac" }
-    builders { name: "analyzer-win-release-analyzer" mixins: "new_workflow"  mixins: "win" }
+    builders { name: "analyzer-analysis-server-linux-analyzer-stable" mixins: "new_workflow"  }
+    builders { name: "analyzer-linux-release-analyzer-stable" mixins: "new_workflow"  }
+    builders { name: "analyzer-mac-release-analyzer-stable" mixins: "new_workflow"  mixins: "mac" }
+    builders { name: "analyzer-win-release-analyzer-stable" mixins: "new_workflow"  mixins: "win" }
 
     # CI Builders for the master branch
     builders { name: "analyzer-analysis-server-linux" mixins: "new_workflow" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 5646c3c91e20..4505b1c9ee3f 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -7,22 +7,22 @@ consoles: {
   refs: "refs/heads/analyzer-stable"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-analyzer"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-analyzer-stable"
     category: "analyzer"
     short_name: "as"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-analyzer"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-analyzer-stable"
     category: "analyzer"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-analyzer"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-analyzer-stable"
     category: "analyzer"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-analyzer"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-analyzer-stable"
     category: "analyzer"
     short_name: "w"
   }
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index b0122cbb540c..5c60206e80f4 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -40,16 +40,16 @@ job {
 
 # CI triggers
 trigger {
-  id: "dart-gitiles-trigger-analyzer"
+  id: "dart-gitiles-trigger-analyzer-stable"
   acl_sets: "default"
   gitiles: {
     repo: "https://dart.googlesource.com/sdk/"
     refs: "refs/heads/analyzer-stable"
   }
-  triggers: "analyzer-analysis-server-linux-analyzer"
-  triggers: "analyzer-linux-release-analyzer"
-  triggers: "analyzer-mac-release-analyzer"
-  triggers: "analyzer-win-release-analyzer"
+  triggers: "analyzer-analysis-server-linux-analyzer-stable"
+  triggers: "analyzer-linux-release-analyzer-stable"
+  triggers: "analyzer-mac-release-analyzer-stable"
+  triggers: "analyzer-win-release-analyzer-stable"
 }
 
 trigger {
@@ -317,46 +317,46 @@ trigger {
 # analyzer
 
 job {
-  id: "analyzer-analysis-server-linux-analyzer"
+  id: "analyzer-analysis-server-linux-analyzer-stable"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-analysis-server-linux-analyzer"
+    builder: "analyzer-analysis-server-linux-analyzer-stable"
   }
 }
 
 job {
-  id: "analyzer-linux-release-analyzer"
+  id: "analyzer-linux-release-analyzer-stable"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-linux-release-analyzer"
+    builder: "analyzer-linux-release-analyzer-stable"
   }
 }
 
 job {
-  id: "analyzer-mac-release-analyzer"
+  id: "analyzer-mac-release-analyzer-stable"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-mac-release-analyzer"
+    builder: "analyzer-mac-release-analyzer-stable"
   }
 }
 
 job {
-  id: "analyzer-win-release-analyzer"
+  id: "analyzer-win-release-analyzer-stable"
   acl_sets: "default"
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-win-release-analyzer"
+    builder: "analyzer-win-release-analyzer-stable"
   }
 }
 

From 0eb3ed6f1fe85b0a295a9661e9665ade284052c7 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Fri, 15 Feb 2019 09:20:17 +0000
Subject: [PATCH 249/826] [Infra] Enable new workflow on VM builders

Change-Id: I7169307471b8ab3a4d5b39df7e705ee8f2b7ab93
Reviewed-on: https://dart-review.googlesource.com/c/93224
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 392 ++++++++++++++++++++++-----------------------
 1 file changed, 196 insertions(+), 196 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 30c9e475f74c..bfbbc69a65b4 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -241,10 +241,10 @@ buckets {
     builders { name: "analyzer-linux-release" mixins: "new_workflow" }
     builders { name: "analyzer-mac-release" mixins: "mac" mixins: "new_workflow" }
     builders { name: "analyzer-win-release" mixins: "win" mixins: "new_workflow" }
-    builders { name: "app-kernel-linux-debug-x64" }
-    builders { name: "app-kernel-linux-product-x64" }
-    builders { name: "app-kernel-linux-release-x64" }
-    builders { name: "cross-vm-linux-release-arm64" }
+    builders { name: "app-kernel-linux-debug-x64" mixins: "new_workflow" }
+    builders { name: "app-kernel-linux-product-x64" mixins: "new_workflow" }
+    builders { name: "app-kernel-linux-release-x64" mixins: "new_workflow" }
+    builders { name: "cross-vm-linux-release-arm64" mixins: "new_workflow" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome" mixins: "new_workflow" }
     builders { name: "dart2js-minified-strong-linux-x64-d8" mixins: "new_workflow" }
     builders { name: "dart2js-strong-hostasserts-linux-ia32-d8" mixins: "new_workflow" }
@@ -270,61 +270,61 @@ buckets {
     builders { name: "pkg-win-release" mixins: "win" mixins: "new_workflow" }
     builders { name: "pkg-linux-debug" mixins: "new_workflow" }
     builders { name: "versionchecker-linux" }
-    builders { name: "vm-canary-linux-debug" }
-    builders { name: "vm-dartkb-linux-debug-x64" }
-    builders { name: "vm-dartkb-linux-release-x64" }
-    builders { name: "vm-kernel-asan-linux-release-x64" }
-    builders { name: "vm-kernel-checked-linux-release-x64" }
-    builders { name: "vm-kernel-linux-debug-ia32" }
-    builders { name: "vm-kernel-linux-debug-simdbc64" }
-    builders { name: "vm-kernel-linux-debug-x64" }
-    builders { name: "vm-kernel-linux-product-x64" }
-    builders { name: "vm-kernel-linux-release-ia32" }
-    builders { name: "vm-kernel-linux-release-simarm" }
-    builders { name: "vm-kernel-linux-release-simarm64" }
-    builders { name: "vm-kernel-linux-release-simdbc64" }
-    builders { name: "vm-kernel-linux-release-x64" }
-    builders { name: "vm-kernel-mac-debug-simdbc64" mixins: "mac" }
-    builders { name: "vm-kernel-mac-debug-x64" mixins: "mac" }
-    builders { name: "vm-kernel-mac-product-x64" mixins: "mac" }
-    builders { name: "vm-kernel-mac-release-simdbc64" mixins: "mac" }
-    builders { name: "vm-kernel-mac-release-x64" mixins: "mac" }
-    builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32" }
-    builders { name: "vm-kernel-optcounter-threshold-linux-release-x64" }
-    builders { name: "vm-kernel-precomp-android-release-arm" mixins: "android" }
-    builders { name: "vm-kernel-precomp-bare-linux-release-simarm" }
-    builders { name: "vm-kernel-precomp-bare-linux-release-simarm64" }
-    builders { name: "vm-kernel-precomp-bare-linux-release-x64" }
-    builders { name: "vm-kernel-precomp-linux-debug-x64" }
-    builders { name: "vm-kernel-precomp-linux-product-x64" }
-    builders { name: "vm-kernel-precomp-linux-release-simarm" }
-    builders { name: "vm-kernel-precomp-linux-release-simarm64" }
-    builders { name: "vm-kernel-precomp-linux-release-x64" }
-    builders { name: "vm-kernel-precomp-mac-release-simarm64" mixins: "mac" }
-    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64" }
-    builders { name: "vm-kernel-precomp-win-release-simarm64" mixins: "win" }
-    builders { name: "vm-kernel-precomp-win-release-x64" mixins: "win" }
-    builders { name: "vm-kernel-reload-linux-debug-x64" }
-    builders { name: "vm-kernel-reload-linux-release-x64" }
-    builders { name: "vm-kernel-reload-mac-debug-simdbc64" mixins: "mac" }
-    builders { name: "vm-kernel-reload-mac-release-simdbc64" mixins: "mac" }
-    builders { name: "vm-kernel-reload-rollback-linux-debug-x64" }
-    builders { name: "vm-kernel-reload-rollback-linux-release-x64" }
-    builders { name: "vm-kernel-win-debug-ia32" mixins: "win" }
-    builders { name: "vm-kernel-win-debug-x64" mixins: "win" }
-    builders { name: "vm-kernel-win-product-x64" mixins: "win" }
-    builders { name: "vm-kernel-win-release-ia32" mixins: "win" }
-    builders { name: "vm-kernel-win-release-x64" mixins: "win" }
+    builders { name: "vm-canary-linux-debug" mixins: "new_workflow" }
+    builders { name: "vm-dartkb-linux-debug-x64" mixins: "new_workflow" }
+    builders { name: "vm-dartkb-linux-release-x64" mixins: "new_workflow" }
+    builders { name: "vm-kernel-asan-linux-release-x64" mixins: "new_workflow" }
+    builders { name: "vm-kernel-checked-linux-release-x64" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-debug-ia32" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-debug-simdbc64" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-debug-x64" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-product-x64" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-release-ia32" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-release-simarm" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-release-simarm64" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-release-simdbc64" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-release-x64" mixins: "new_workflow" }
+    builders { name: "vm-kernel-mac-debug-simdbc64" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-mac-debug-x64" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-mac-product-x64" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-mac-release-simdbc64" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-mac-release-x64" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32" mixins: "new_workflow" }
+    builders { name: "vm-kernel-optcounter-threshold-linux-release-x64" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-android-release-arm" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-bare-linux-release-simarm" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-bare-linux-release-simarm64" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-bare-linux-release-x64" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-linux-debug-x64" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-linux-product-x64" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-linux-release-simarm" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-linux-release-simarm64" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-linux-release-x64" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-mac-release-simarm64" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-win-release-simarm64" mixins: "win" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-win-release-x64" mixins: "win" mixins: "new_workflow" }
+    builders { name: "vm-kernel-reload-linux-debug-x64" mixins: "new_workflow" }
+    builders { name: "vm-kernel-reload-linux-release-x64" mixins: "new_workflow" }
+    builders { name: "vm-kernel-reload-mac-debug-simdbc64" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-reload-mac-release-simdbc64" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-reload-rollback-linux-debug-x64" mixins: "new_workflow" }
+    builders { name: "vm-kernel-reload-rollback-linux-release-x64" mixins: "new_workflow" }
+    builders { name: "vm-kernel-win-debug-ia32" mixins: "win" mixins: "new_workflow" }
+    builders { name: "vm-kernel-win-debug-x64" mixins: "win" mixins: "new_workflow" }
+    builders { name: "vm-kernel-win-product-x64" mixins: "win" mixins: "new_workflow" }
+    builders { name: "vm-kernel-win-release-ia32" mixins: "win" mixins: "new_workflow" }
+    builders { name: "vm-kernel-win-release-x64" mixins: "win" mixins: "new_workflow" }
 
     # CI Builders for the dev branch
     builders { name: "analyzer-analysis-server-linux-dev" mixins: "new_workflow" }
     builders { name: "analyzer-linux-release-dev" mixins: "new_workflow" }
     builders { name: "analyzer-mac-release-dev" mixins: "mac" mixins: "new_workflow" }
     builders { name: "analyzer-win-release-dev" mixins: "win" mixins: "new_workflow" }
-    builders { name: "app-kernel-linux-debug-x64-dev" }
-    builders { name: "app-kernel-linux-product-x64-dev" }
-    builders { name: "app-kernel-linux-release-x64-dev" }
-    builders { name: "cross-vm-linux-release-arm64-dev" }
+    builders { name: "app-kernel-linux-debug-x64-dev" mixins: "new_workflow" }
+    builders { name: "app-kernel-linux-product-x64-dev" mixins: "new_workflow" }
+    builders { name: "app-kernel-linux-release-x64-dev" mixins: "new_workflow" }
+    builders { name: "cross-vm-linux-release-arm64-dev" mixins: "new_workflow" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome-dev" mixins: "new_workflow" }
     builders { name: "dart2js-minified-strong-linux-x64-d8-dev" mixins: "new_workflow" }
     builders { name: "dart2js-strong-hostasserts-linux-ia32-d8-dev" mixins: "new_workflow" }
@@ -348,61 +348,61 @@ buckets {
     builders { name: "pkg-mac-release-dev" mixins: "mac" mixins: "new_workflow" }
     builders { name: "pkg-win-release-dev" mixins: "win" mixins: "new_workflow" }
     builders { name: "versionchecker-linux-dev" }
-    builders { name: "vm-canary-linux-debug-dev" }
-    builders { name: "vm-dartkb-linux-debug-x64-dev" }
-    builders { name: "vm-dartkb-linux-release-x64-dev" }
-    builders { name: "vm-kernel-asan-linux-release-x64-dev" }
-    builders { name: "vm-kernel-checked-linux-release-x64-dev" }
-    builders { name: "vm-kernel-linux-debug-ia32-dev" }
-    builders { name: "vm-kernel-linux-debug-simdbc64-dev" }
-    builders { name: "vm-kernel-linux-debug-x64-dev" }
-    builders { name: "vm-kernel-linux-product-x64-dev" }
-    builders { name: "vm-kernel-linux-release-ia32-dev" }
-    builders { name: "vm-kernel-linux-release-simarm-dev" }
-    builders { name: "vm-kernel-linux-release-simarm64-dev" }
-    builders { name: "vm-kernel-linux-release-simdbc64-dev" }
-    builders { name: "vm-kernel-linux-release-x64-dev" }
-    builders { name: "vm-kernel-mac-debug-simdbc64-dev" mixins: "mac" }
-    builders { name: "vm-kernel-mac-debug-x64-dev" mixins: "mac" }
-    builders { name: "vm-kernel-mac-product-x64-dev" mixins: "mac" }
-    builders { name: "vm-kernel-mac-release-simdbc64-dev" mixins: "mac" }
-    builders { name: "vm-kernel-mac-release-x64-dev" mixins: "mac" }
-    builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-dev" }
-    builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-dev" }
-    builders { name: "vm-kernel-precomp-android-release-arm-dev" mixins: "android" }
-    builders { name: "vm-kernel-precomp-bare-linux-release-simarm-dev" }
-    builders { name: "vm-kernel-precomp-bare-linux-release-simarm64-dev" }
-    builders { name: "vm-kernel-precomp-bare-linux-release-x64-dev" }
-    builders { name: "vm-kernel-precomp-linux-debug-x64-dev" }
-    builders { name: "vm-kernel-precomp-linux-product-x64-dev" }
-    builders { name: "vm-kernel-precomp-linux-release-simarm-dev" }
-    builders { name: "vm-kernel-precomp-linux-release-simarm64-dev" }
-    builders { name: "vm-kernel-precomp-linux-release-x64-dev" }
-    builders { name: "vm-kernel-precomp-mac-release-simarm64-dev" mixins: "mac" }
-    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev" }
-    builders { name: "vm-kernel-precomp-win-release-simarm64-dev" mixins: "win" }
-    builders { name: "vm-kernel-precomp-win-release-x64-dev" mixins: "win" }
-    builders { name: "vm-kernel-reload-linux-debug-x64-dev" }
-    builders { name: "vm-kernel-reload-linux-release-x64-dev" }
-    builders { name: "vm-kernel-reload-mac-debug-simdbc64-dev" mixins: "mac" }
-    builders { name: "vm-kernel-reload-mac-release-simdbc64-dev" mixins: "mac" }
-    builders { name: "vm-kernel-reload-rollback-linux-debug-x64-dev" }
-    builders { name: "vm-kernel-reload-rollback-linux-release-x64-dev" }
-    builders { name: "vm-kernel-win-debug-ia32-dev" mixins: "win" }
-    builders { name: "vm-kernel-win-debug-x64-dev" mixins: "win" }
-    builders { name: "vm-kernel-win-product-x64-dev" mixins: "win" }
-    builders { name: "vm-kernel-win-release-ia32-dev" mixins: "win" }
-    builders { name: "vm-kernel-win-release-x64-dev" mixins: "win" }
+    builders { name: "vm-canary-linux-debug-dev" mixins: "new_workflow" }
+    builders { name: "vm-dartkb-linux-debug-x64-dev" mixins: "new_workflow" }
+    builders { name: "vm-dartkb-linux-release-x64-dev" mixins: "new_workflow" }
+    builders { name: "vm-kernel-asan-linux-release-x64-dev" mixins: "new_workflow" }
+    builders { name: "vm-kernel-checked-linux-release-x64-dev" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-debug-ia32-dev" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-debug-simdbc64-dev" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-debug-x64-dev" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-product-x64-dev" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-release-ia32-dev" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-release-simarm-dev" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-release-simarm64-dev" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-release-simdbc64-dev" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-release-x64-dev" mixins: "new_workflow" }
+    builders { name: "vm-kernel-mac-debug-simdbc64-dev" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-mac-debug-x64-dev" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-mac-product-x64-dev" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-mac-release-simdbc64-dev" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-mac-release-x64-dev" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-dev" mixins: "new_workflow" }
+    builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-dev" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-android-release-arm-dev" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-bare-linux-release-simarm-dev" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-bare-linux-release-simarm64-dev" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-bare-linux-release-x64-dev" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-linux-debug-x64-dev" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-linux-product-x64-dev" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-linux-release-simarm-dev" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-linux-release-simarm64-dev" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-linux-release-x64-dev" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-mac-release-simarm64-dev" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-win-release-simarm64-dev" mixins: "win" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-win-release-x64-dev" mixins: "win" mixins: "new_workflow" }
+    builders { name: "vm-kernel-reload-linux-debug-x64-dev" mixins: "new_workflow" }
+    builders { name: "vm-kernel-reload-linux-release-x64-dev" mixins: "new_workflow" }
+    builders { name: "vm-kernel-reload-mac-debug-simdbc64-dev" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-reload-mac-release-simdbc64-dev" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-reload-rollback-linux-debug-x64-dev" mixins: "new_workflow" }
+    builders { name: "vm-kernel-reload-rollback-linux-release-x64-dev" mixins: "new_workflow" }
+    builders { name: "vm-kernel-win-debug-ia32-dev" mixins: "win" mixins: "new_workflow" }
+    builders { name: "vm-kernel-win-debug-x64-dev" mixins: "win" mixins: "new_workflow" }
+    builders { name: "vm-kernel-win-product-x64-dev" mixins: "win" mixins: "new_workflow" }
+    builders { name: "vm-kernel-win-release-ia32-dev" mixins: "win" mixins: "new_workflow" }
+    builders { name: "vm-kernel-win-release-x64-dev" mixins: "win" mixins: "new_workflow" }
 
     # CI Builders for the stable branch
     builders { name: "analyzer-analysis-server-linux-stable" mixins: "new_workflow" }
     builders { name: "analyzer-linux-release-stable" mixins: "new_workflow" }
     builders { name: "analyzer-mac-release-stable" mixins: "mac" mixins: "new_workflow" }
     builders { name: "analyzer-win-release-stable" mixins: "win" mixins: "new_workflow" }
-    builders { name: "app-kernel-linux-debug-x64-stable" }
-    builders { name: "app-kernel-linux-product-x64-stable" }
-    builders { name: "app-kernel-linux-release-x64-stable" }
-    builders { name: "cross-vm-linux-release-arm64-stable" }
+    builders { name: "app-kernel-linux-debug-x64-stable" mixins: "new_workflow" }
+    builders { name: "app-kernel-linux-product-x64-stable" mixins: "new_workflow" }
+    builders { name: "app-kernel-linux-release-x64-stable" mixins: "new_workflow" }
+    builders { name: "cross-vm-linux-release-arm64-stable" mixins: "new_workflow" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome-stable" mixins: "new_workflow" }
     builders { name: "dart2js-minified-strong-linux-x64-d8-stable" mixins: "new_workflow" }
     builders { name: "dart2js-strong-hostasserts-linux-ia32-d8-stable" mixins: "new_workflow" }
@@ -425,52 +425,52 @@ buckets {
     builders { name: "pkg-linux-release-stable" mixins: "new_workflow" }
     builders { name: "pkg-mac-release-stable" mixins: "mac" mixins: "new_workflow" }
     builders { name: "pkg-win-release-stable" mixins: "win" mixins: "new_workflow" }
-    builders { name: "versionchecker-linux-stable" }
-    builders { name: "vm-canary-linux-debug-stable" }
-    builders { name: "vm-dartkb-linux-debug-x64-stable" }
-    builders { name: "vm-dartkb-linux-release-x64-stable" }
-    builders { name: "vm-kernel-asan-linux-release-x64-stable" }
-    builders { name: "vm-kernel-checked-linux-release-x64-stable" }
-    builders { name: "vm-kernel-linux-debug-ia32-stable" }
-    builders { name: "vm-kernel-linux-debug-simdbc64-stable" }
-    builders { name: "vm-kernel-linux-debug-x64-stable" }
-    builders { name: "vm-kernel-linux-product-x64-stable" }
-    builders { name: "vm-kernel-linux-release-ia32-stable" }
-    builders { name: "vm-kernel-linux-release-simarm-stable" }
-    builders { name: "vm-kernel-linux-release-simarm64-stable" }
-    builders { name: "vm-kernel-linux-release-simdbc64-stable" }
-    builders { name: "vm-kernel-linux-release-x64-stable" }
-    builders { name: "vm-kernel-mac-debug-simdbc64-stable" mixins: "mac" }
-    builders { name: "vm-kernel-mac-debug-x64-stable" mixins: "mac" }
-    builders { name: "vm-kernel-mac-product-x64-stable" mixins: "mac" }
-    builders { name: "vm-kernel-mac-release-simdbc64-stable" mixins: "mac" }
-    builders { name: "vm-kernel-mac-release-x64-stable" mixins: "mac" }
-    builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-stable" }
-    builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-stable" }
-    builders { name: "vm-kernel-precomp-android-release-arm-stable" mixins: "android" }
-    builders { name: "vm-kernel-precomp-bare-linux-release-simarm-stable" }
-    builders { name: "vm-kernel-precomp-bare-linux-release-simarm64-stable" }
-    builders { name: "vm-kernel-precomp-bare-linux-release-x64-stable" }
-    builders { name: "vm-kernel-precomp-linux-debug-x64-stable" }
-    builders { name: "vm-kernel-precomp-linux-product-x64-stable" }
-    builders { name: "vm-kernel-precomp-linux-release-simarm-stable" }
-    builders { name: "vm-kernel-precomp-linux-release-simarm64-stable" }
-    builders { name: "vm-kernel-precomp-linux-release-x64-stable" }
-    builders { name: "vm-kernel-precomp-mac-release-simarm64-stable" mixins: "mac" }
-    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable" }
-    builders { name: "vm-kernel-precomp-win-release-simarm64-stable" mixins: "win" }
-    builders { name: "vm-kernel-precomp-win-release-x64-stable" mixins: "win" }
-    builders { name: "vm-kernel-reload-linux-debug-x64-stable" }
-    builders { name: "vm-kernel-reload-linux-release-x64-stable" }
-    builders { name: "vm-kernel-reload-mac-debug-simdbc64-stable" mixins: "mac" }
-    builders { name: "vm-kernel-reload-mac-release-simdbc64-stable" mixins: "mac" }
-    builders { name: "vm-kernel-reload-rollback-linux-debug-x64-stable" }
-    builders { name: "vm-kernel-reload-rollback-linux-release-x64-stable" }
-    builders { name: "vm-kernel-win-debug-ia32-stable" mixins: "win" }
-    builders { name: "vm-kernel-win-debug-x64-stable" mixins: "win" }
-    builders { name: "vm-kernel-win-product-x64-stable" mixins: "win" }
-    builders { name: "vm-kernel-win-release-ia32-stable" mixins: "win" }
-    builders { name: "vm-kernel-win-release-x64-stable" mixins: "win" }
+    builders { name: "versionchecker-linux-stable" mixins: "new_workflow" }
+    builders { name: "vm-canary-linux-debug-stable" mixins: "new_workflow" }
+    builders { name: "vm-dartkb-linux-debug-x64-stable" mixins: "new_workflow" }
+    builders { name: "vm-dartkb-linux-release-x64-stable" mixins: "new_workflow" }
+    builders { name: "vm-kernel-asan-linux-release-x64-stable" mixins: "new_workflow" }
+    builders { name: "vm-kernel-checked-linux-release-x64-stable" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-debug-ia32-stable" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-debug-simdbc64-stable" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-debug-x64-stable" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-product-x64-stable" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-release-ia32-stable" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-release-simarm-stable" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-release-simarm64-stable" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-release-simdbc64-stable" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-release-x64-stable" mixins: "new_workflow" }
+    builders { name: "vm-kernel-mac-debug-simdbc64-stable" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-mac-debug-x64-stable" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-mac-product-x64-stable" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-mac-release-simdbc64-stable" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-mac-release-x64-stable" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-stable" mixins: "new_workflow" }
+    builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-stable" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-android-release-arm-stable" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-bare-linux-release-simarm-stable" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-bare-linux-release-simarm64-stable" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-bare-linux-release-x64-stable" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-linux-debug-x64-stable" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-linux-product-x64-stable" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-linux-release-simarm-stable" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-linux-release-simarm64-stable" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-linux-release-x64-stable" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-mac-release-simarm64-stable" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-win-release-simarm64-stable" mixins: "win" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-win-release-x64-stable" mixins: "win" mixins: "new_workflow" }
+    builders { name: "vm-kernel-reload-linux-debug-x64-stable" mixins: "new_workflow" }
+    builders { name: "vm-kernel-reload-linux-release-x64-stable" mixins: "new_workflow" }
+    builders { name: "vm-kernel-reload-mac-debug-simdbc64-stable" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-reload-mac-release-simdbc64-stable" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-reload-rollback-linux-debug-x64-stable" mixins: "new_workflow" }
+    builders { name: "vm-kernel-reload-rollback-linux-release-x64-stable" mixins: "new_workflow" }
+    builders { name: "vm-kernel-win-debug-ia32-stable" mixins: "win" mixins: "new_workflow" }
+    builders { name: "vm-kernel-win-debug-x64-stable" mixins: "win" mixins: "new_workflow" }
+    builders { name: "vm-kernel-win-product-x64-stable" mixins: "win" mixins: "new_workflow" }
+    builders { name: "vm-kernel-win-release-ia32-stable" mixins: "win" mixins: "new_workflow" }
+    builders { name: "vm-kernel-win-release-x64-stable" mixins: "win" mixins: "new_workflow" }
   }
 }
 
@@ -512,9 +512,9 @@ buckets {
     builders { name: "analyzer-linux-release-try" mixins: "new_workflow" }
     builders { name: "analyzer-mac-release-try" mixins: "mac" mixins: "new_workflow" }
     builders { name: "analyzer-win-release-try" mixins: "win" mixins: "new_workflow" }
-    builders { name: "app-kernel-linux-debug-x64-try" }
-    builders { name: "app-kernel-linux-product-x64-try" }
-    builders { name: "app-kernel-linux-release-x64-try" }
+    builders { name: "app-kernel-linux-debug-x64-try"  mixins: "new_workflow"}
+    builders { name: "app-kernel-linux-product-x64-try"  mixins: "new_workflow"}
+    builders { name: "app-kernel-linux-release-x64-try"  mixins: "new_workflow"}
     builders { name: "benchmark-linux-try" }
     builders { name: "dart-sdk-windows-try" mixins: "sdk" mixins: "win" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome-try" mixins: "new_workflow" }
@@ -539,50 +539,50 @@ buckets {
     builders { name: "pkg-linux-release-try" mixins: "new_workflow" }
     builders { name: "pkg-mac-release-try" mixins: "mac" mixins: "new_workflow" }
     builders { name: "pkg-win-release-try" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-canary-linux-debug-try" }
-    builders { name: "vm-dartkb-linux-debug-x64-try" }
-    builders { name: "vm-dartkb-linux-release-x64-try" }
-    builders { name: "vm-kernel-asan-linux-release-x64-try" }
-    builders { name: "vm-kernel-checked-linux-release-x64-try" }
-    builders { name: "vm-kernel-linux-debug-ia32-try" }
-    builders { name: "vm-kernel-linux-debug-simdbc64-try" }
-    builders { name: "vm-kernel-linux-debug-x64-try" }
-    builders { name: "vm-kernel-linux-product-x64-try" }
-    builders { name: "vm-kernel-linux-release-ia32-try" }
-    builders { name: "vm-kernel-linux-release-simarm-try" }
-    builders { name: "vm-kernel-linux-release-simarm64-try" }
-    builders { name: "vm-kernel-linux-release-simdbc64-try" }
-    builders { name: "vm-kernel-linux-release-x64-try" }
-    builders { name: "vm-kernel-mac-debug-simdbc64-try" mixins: "mac" }
-    builders { name: "vm-kernel-mac-debug-x64-try" mixins: "mac" }
-    builders { name: "vm-kernel-mac-product-x64-try" mixins: "mac" }
-    builders { name: "vm-kernel-mac-release-simdbc64-try" mixins: "mac" }
-    builders { name: "vm-kernel-mac-release-x64-try" mixins: "mac" }
-    builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-try" }
-    builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-try" }
-    builders { name: "vm-kernel-precomp-android-release-arm-try" mixins: "android" }
-    builders { name: "vm-kernel-precomp-bare-linux-release-simarm-try" }
-    builders { name: "vm-kernel-precomp-bare-linux-release-simarm64-try" }
-    builders { name: "vm-kernel-precomp-bare-linux-release-x64-try" }
-    builders { name: "vm-kernel-precomp-linux-debug-x64-try" }
-    builders { name: "vm-kernel-precomp-linux-product-x64-try" }
-    builders { name: "vm-kernel-precomp-linux-release-simarm-try" }
-    builders { name: "vm-kernel-precomp-linux-release-simarm64-try" }
-    builders { name: "vm-kernel-precomp-linux-release-x64-try" }
-    builders { name: "vm-kernel-precomp-mac-release-simarm64-try" mixins: "mac" }
-    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64-try" }
-    builders { name: "vm-kernel-precomp-win-release-simarm64-try" mixins: "win" }
-    builders { name: "vm-kernel-precomp-win-release-x64-try" mixins: "win" }
-    builders { name: "vm-kernel-reload-linux-debug-x64-try" }
-    builders { name: "vm-kernel-reload-linux-release-x64-try" }
-    builders { name: "vm-kernel-reload-mac-debug-simdbc64-try" mixins: "mac" }
-    builders { name: "vm-kernel-reload-mac-release-simdbc64-try" mixins: "mac" }
-    builders { name: "vm-kernel-reload-rollback-linux-debug-x64-try" }
-    builders { name: "vm-kernel-reload-rollback-linux-release-x64-try" }
-    builders { name: "vm-kernel-win-debug-ia32-try" mixins: "win" }
-    builders { name: "vm-kernel-win-debug-x64-try" mixins: "win" }
-    builders { name: "vm-kernel-win-product-x64-try" mixins: "win" }
-    builders { name: "vm-kernel-win-release-ia32-try" mixins: "win" }
-    builders { name: "vm-kernel-win-release-x64-try" mixins: "win" }
+    builders { name: "vm-canary-linux-debug-try" mixins: "new_workflow" }
+    builders { name: "vm-dartkb-linux-debug-x64-try" mixins: "new_workflow" }
+    builders { name: "vm-dartkb-linux-release-x64-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-asan-linux-release-x64-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-checked-linux-release-x64-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-debug-ia32-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-debug-simdbc64-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-debug-x64-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-product-x64-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-release-ia32-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-release-simarm-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-release-simarm64-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-release-simdbc64-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-linux-release-x64-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-mac-debug-simdbc64-try" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-mac-debug-x64-try" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-mac-product-x64-try" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-mac-release-simdbc64-try" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-mac-release-x64-try" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-android-release-arm-try" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-bare-linux-release-simarm-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-bare-linux-release-simarm64-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-bare-linux-release-x64-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-linux-debug-x64-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-linux-product-x64-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-linux-release-simarm-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-linux-release-simarm64-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-linux-release-x64-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-mac-release-simarm64-try" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-win-release-simarm64-try" mixins: "win" mixins: "new_workflow" }
+    builders { name: "vm-kernel-precomp-win-release-x64-try" mixins: "win" mixins: "new_workflow" }
+    builders { name: "vm-kernel-reload-linux-debug-x64-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-reload-linux-release-x64-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-reload-mac-debug-simdbc64-try" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-reload-mac-release-simdbc64-try" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "vm-kernel-reload-rollback-linux-debug-x64-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-reload-rollback-linux-release-x64-try" mixins: "new_workflow" }
+    builders { name: "vm-kernel-win-debug-ia32-try" mixins: "win" mixins: "new_workflow" }
+    builders { name: "vm-kernel-win-debug-x64-try" mixins: "win" mixins: "new_workflow" }
+    builders { name: "vm-kernel-win-product-x64-try" mixins: "win" mixins: "new_workflow" }
+    builders { name: "vm-kernel-win-release-ia32-try" mixins: "win" mixins: "new_workflow" }
+    builders { name: "vm-kernel-win-release-x64-try" mixins: "win" mixins: "new_workflow" }
   }
 }

From 5dd4c43e7a32b3185c9ee25ad533a289c68d39b5 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 22 Feb 2019 17:35:19 +0000
Subject: [PATCH 250/826] [infra] Don't retry tryjobs

Change-Id: I5bd6c3b95251d4e4d1021b622cf2394a89216366
Reviewed-on: https://dart-review.googlesource.com/c/93988
Reviewed-by: William Hesse <whesse@google.com>
---
 commit-queue.cfg | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index a94454d9c13a..a8f47646d143 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -79,11 +79,6 @@ config_groups {
         name: "dart/try/vm-kernel-linux-product-x64-try"
       }
       retry_config {
-        single_quota: 1
-        global_quota: 2
-        failure_weight: 1
-        transient_failure_weight: 1
-        timeout_weight: 2
       }
     }
   }

From ac3ded089bd17c6743066ac3bfbeddb02210880c Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 26 Feb 2019 17:03:25 +0000
Subject: [PATCH 251/826] [infra] Prepare Luci config for Buildbot migration

Add/fix configs for the remaining builders:
* versionchecker-linux
* debianpackage-linux
* flutter-engine-linux

Skip luci-milo configs until builders are working.
Leave schedules disabled for builders triggered by SDK commits.

Change-Id: Ic8380f57f3e30276d5ad95a4f28ef47fcabb09f0
Reviewed-on: https://dart-review.googlesource.com/c/93987
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg |   7 +--
 luci-notify.cfg    |  27 +++++++++++
 luci-scheduler.cfg | 117 ++++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 142 insertions(+), 9 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index bfbbc69a65b4..2e05742f48ef 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -182,18 +182,21 @@ buckets {
     builders { name: "docker" mixins: "docker" }
     builders { name: "debianpackage-linux" mixins: "debianpackage" }
     builders { name: "google" mixins: "external" }
+    builders { name: "versionchecker-linux" }
 
     # CI builders that require privileged access on the dev branch
     builders { name: "dart-sdk-linux-dev" }
     builders { name: "dart-sdk-mac-dev" mixins: "mac" }
     builders { name: "dart-sdk-win-dev" mixins: "win" }
     builders { name: "debianpackage-linux-dev" mixins: "debianpackage" }
+    builders { name: "versionchecker-linux-dev" }
 
     # CI builders that require privileged access on the stable branch
     builders { name: "dart-sdk-linux-stable" }
     builders { name: "dart-sdk-mac-stable" mixins: "mac" }
     builders { name: "dart-sdk-win-stable" mixins: "win" }
     builders { name: "debianpackage-linux-stable" mixins: "debianpackage" }
+    builders { name: "versionchecker-linux-stable" }
   }
 }
 
@@ -261,6 +264,7 @@ buckets {
     builders { name: "ddc-mac-release-chrome" mixins: "mac" mixins: "new_workflow" }
     builders { name: "ddc-win-release-chrome" mixins: "win" mixins: "new_workflow" }
     builders { name: "flutter-analyze" }
+    builders { name: "flutter-engine-linux" }
     builders { name: "front-end-linux-release-x64" mixins: "clobber" }
     builders { name: "front-end-mac-release-x64" mixins: "clobber" mixins: "mac" }
     builders { name: "front-end-win-release-x64" mixins: "clobber" mixins: "win" mixins: "new_workflow" }
@@ -269,7 +273,6 @@ buckets {
     builders { name: "pkg-mac-release" mixins: "mac" mixins: "new_workflow" }
     builders { name: "pkg-win-release" mixins: "win" mixins: "new_workflow" }
     builders { name: "pkg-linux-debug" mixins: "new_workflow" }
-    builders { name: "versionchecker-linux" }
     builders { name: "vm-canary-linux-debug" mixins: "new_workflow" }
     builders { name: "vm-dartkb-linux-debug-x64" mixins: "new_workflow" }
     builders { name: "vm-dartkb-linux-release-x64" mixins: "new_workflow" }
@@ -347,7 +350,6 @@ buckets {
     builders { name: "pkg-linux-release-dev" mixins: "new_workflow" }
     builders { name: "pkg-mac-release-dev" mixins: "mac" mixins: "new_workflow" }
     builders { name: "pkg-win-release-dev" mixins: "win" mixins: "new_workflow" }
-    builders { name: "versionchecker-linux-dev" }
     builders { name: "vm-canary-linux-debug-dev" mixins: "new_workflow" }
     builders { name: "vm-dartkb-linux-debug-x64-dev" mixins: "new_workflow" }
     builders { name: "vm-dartkb-linux-release-x64-dev" mixins: "new_workflow" }
@@ -425,7 +427,6 @@ buckets {
     builders { name: "pkg-linux-release-stable" mixins: "new_workflow" }
     builders { name: "pkg-mac-release-stable" mixins: "mac" mixins: "new_workflow" }
     builders { name: "pkg-win-release-stable" mixins: "win" mixins: "new_workflow" }
-    builders { name: "versionchecker-linux-stable" mixins: "new_workflow" }
     builders { name: "vm-canary-linux-debug-stable" mixins: "new_workflow" }
     builders { name: "vm-dartkb-linux-debug-x64-stable" mixins: "new_workflow" }
     builders { name: "vm-dartkb-linux-release-x64-stable" mixins: "new_workflow" }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index f8e92bfb5d15..b150ad090b10 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -41,6 +41,33 @@ notifiers {
         notify_blamelist {}
     }
 
+    # CI Builders that require privileged access
+    builders {
+        name: "dart-sdk-linux"
+        bucket: "ci"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "dart-sdk-mac"
+        bucket: "ci"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "dart-sdk-win"
+        bucket: "ci"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "debianpackage-linux"
+        bucket: "ci"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "versionchecker-linux"
+        bucket: "ci"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+
     # CI Builders for the master branch
     builders {
         name: "analyzer-analysis-server-linux"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 5c60206e80f4..020da49e9dac 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1,7 +1,7 @@
 # Defines jobs on luci-scheduler.appspot.com.
 #
 # For schema of this file and documentation see ProjectConfig message in
-# https://github.com/luci/luci-go/blob/master/scheduler/appengine/messages/cron.proto
+# https://chromium.googlesource.com/infra/luci/luci-go/+/master/scheduler/appengine/messages/config.proto
 acl_sets {
   name: "default"
   acls {
@@ -38,7 +38,33 @@ job {
   }
 }
 
-# CI triggers
+# Flutter 3xH trigger
+trigger {
+  id: "dart-gitiles-trigger-flutter"
+  acl_sets: "default"
+  gitiles: {
+    repo: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
+    refs: "refs/heads/master"
+  }
+  triggers: "flutter-engine-linux"
+}
+
+job {
+  id: "flutter-engine-linux"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "flutter-engine-linux"
+  }
+  triggering_policy: {
+    max_concurrent_invocations: 5
+    max_batch_size: 1
+  }
+}
+
+# analyzer-stable CI triggers
 trigger {
   id: "dart-gitiles-trigger-analyzer-stable"
   acl_sets: "default"
@@ -52,6 +78,7 @@ trigger {
   triggers: "analyzer-win-release-analyzer-stable"
 }
 
+# CI triggers
 trigger {
   id: "dart-gitiles-trigger-master"
   acl_sets: "default"
@@ -84,15 +111,17 @@ trigger {
   triggers: "ddc-linux-release-chrome"
   triggers: "ddc-mac-release-chrome"
   triggers: "ddc-win-release-chrome"
+  triggers: "debianpackage-linux"
   triggers: "flutter-analyze"
   triggers: "front-end-linux-release-x64"
   triggers: "front-end-mac-release-x64"
   triggers: "front-end-win-release-x64"
   triggers: "gclient"
+  triggers: "pkg-linux-debug"
   triggers: "pkg-linux-release"
   triggers: "pkg-mac-release"
   triggers: "pkg-win-release"
-  triggers: "pkg-linux-debug"
+  triggers: "versionchecker-linux"
   triggers: "vm-canary-linux-debug"
   triggers: "vm-dartkb-linux-debug-x64"
   triggers: "vm-dartkb-linux-release-x64"
@@ -172,6 +201,7 @@ trigger {
   triggers: "ddc-linux-release-chrome-dev"
   triggers: "ddc-mac-release-chrome-dev"
   triggers: "ddc-win-release-chrome-dev"
+  triggers: "debianpackage-linux-dev"
   triggers: "front-end-linux-release-x64-dev"
   triggers: "front-end-mac-release-x64-dev"
   triggers: "front-end-win-release-x64-dev"
@@ -179,6 +209,7 @@ trigger {
   triggers: "pkg-linux-release-dev"
   triggers: "pkg-mac-release-dev"
   triggers: "pkg-win-release-dev"
+  triggers: "versionchecker-linux-dev"
   triggers: "vm-canary-linux-debug-dev"
   triggers: "vm-dartkb-linux-debug-x64-dev"
   triggers: "vm-dartkb-linux-release-x64-dev"
@@ -258,6 +289,7 @@ trigger {
   triggers: "ddc-linux-release-chrome-stable"
   triggers: "ddc-mac-release-chrome-stable"
   triggers: "ddc-win-release-chrome-stable"
+  triggers: "debianpackage-linux-stable"
   triggers: "front-end-linux-release-x64-stable"
   triggers: "front-end-mac-release-x64-stable"
   triggers: "front-end-win-release-x64-stable"
@@ -265,6 +297,7 @@ trigger {
   triggers: "pkg-linux-release-stable"
   triggers: "pkg-mac-release-stable"
   triggers: "pkg-win-release-stable"
+  triggers: "versionchecker-linux-stable"
   triggers: "vm-canary-linux-debug-stable"
   triggers: "vm-dartkb-linux-debug-x64-stable"
   triggers: "vm-dartkb-linux-release-x64-stable"
@@ -637,6 +670,18 @@ job {
   }
 }
 
+job {
+  id: "debianpackage-linux"
+  acl_sets: "default"
+  disabled: true
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "debianpackage-linux"
+  }
+}
+
 job {
   id: "flutter-analyze"
   acl_sets: "default"
@@ -692,6 +737,17 @@ job {
   }
 }
 
+job {
+  id: "pkg-linux-debug"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-linux-debug"
+  }
+}
+
 job {
   id: "pkg-linux-release"
   acl_sets: "default"
@@ -726,13 +782,14 @@ job {
 }
 
 job {
-  id: "pkg-linux-debug"
+  id: "versionchecker-linux"
   acl_sets: "default"
+  disabled: true
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-linux-debug"
+    bucket: "luci.dart.ci"
+    builder: "versionchecker-linux"
   }
 }
 
@@ -1508,6 +1565,18 @@ job {
   }
 }
 
+job {
+  id: "debianpackage-linux-dev"
+  acl_sets: "default"
+  disabled: true
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "debianpackage-linux-dev"
+  }
+}
+
 job {
   id: "front-end-linux-release-x64-dev"
   acl_sets: "default"
@@ -1585,6 +1654,18 @@ job {
   }
 }
 
+job {
+  id: "versionchecker-linux-dev"
+  acl_sets: "default"
+  disabled: true
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "versionchecker-linux-dev"
+  }
+}
+
 job {
   id: "vm-canary-linux-debug-dev"
   acl_sets: "default"
@@ -2357,6 +2438,18 @@ job {
   }
 }
 
+job {
+  id: "debianpackage-linux-stable"
+  acl_sets: "default"
+  disabled: true
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "debianpackage-linux-stable"
+  }
+}
+
 job {
   id: "front-end-linux-release-x64-stable"
   acl_sets: "default"
@@ -2434,6 +2527,18 @@ job {
   }
 }
 
+job {
+  id: "versionchecker-linux-stable"
+  acl_sets: "default"
+  disabled: true
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "versionchecker-linux-stable"
+  }
+}
+
 job {
   id: "vm-canary-linux-debug-stable"
   acl_sets: "default"

From eb53267194d7272af3c9e677e152b3e0283d5a99 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 28 Feb 2019 07:43:48 +0000
Subject: [PATCH 252/826] [infra] Add 3xH Flutter, Engine & SDK linearized
 history builder

* Add triggers for all three repos.
* Job uses max_batch_size=1 to avoid merging.
* Use correct recipe for flutter-engine-linux builder.

TBR=whesse@google.com

Change-Id: I5f38a2a3f8153260935c4bb2c2f96c0d773bc683
Reviewed-on: https://dart-review.googlesource.com/c/94550
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 18 +++++++++++++++++-
 luci-scheduler.cfg | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 2e05742f48ef..c64ce20e3fe3 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -90,6 +90,13 @@ builder_mixins {
   }
 }
 
+builder_mixins {
+  name: "flutter"
+  recipe {
+    name: "dart/flutter_engine"
+  }
+}
+
 builder_mixins {
   name: "forward"
   recipe {
@@ -111,6 +118,14 @@ builder_mixins {
   }
 }
 
+builder_mixins {
+  name: "linearize"
+  recipe {
+    name: "dart/linearize"
+    properties: "repo:https://dart.googlesource.com/linear_sdk_flutter_engine.git"
+  }
+}
+
 builder_mixins {
   name: "mac"
   dimensions: "os:Mac"
@@ -182,6 +197,7 @@ buckets {
     builders { name: "docker" mixins: "docker" }
     builders { name: "debianpackage-linux" mixins: "debianpackage" }
     builders { name: "google" mixins: "external" }
+    builders { name: "linearize-flutter" mixins: "linearize" }
     builders { name: "versionchecker-linux" }
 
     # CI builders that require privileged access on the dev branch
@@ -264,7 +280,7 @@ buckets {
     builders { name: "ddc-mac-release-chrome" mixins: "mac" mixins: "new_workflow" }
     builders { name: "ddc-win-release-chrome" mixins: "win" mixins: "new_workflow" }
     builders { name: "flutter-analyze" }
-    builders { name: "flutter-engine-linux" }
+    builders { name: "flutter-engine-linux" mixins: "flutter" }
     builders { name: "front-end-linux-release-x64" mixins: "clobber" }
     builders { name: "front-end-mac-release-x64" mixins: "clobber" mixins: "mac" }
     builders { name: "front-end-win-release-x64" mixins: "clobber" mixins: "win" mixins: "new_workflow" }
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 020da49e9dac..b58e064a2be2 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -64,6 +64,41 @@ job {
   }
 }
 
+# Flutter linearized history
+trigger {
+  id: "dart-flutter-engine-trigger"
+  acl_sets: "default"
+  gitiles: {
+    repo: "https://dart.googlesource.com/external/github.com/flutter/engine"
+    refs: "refs/heads/master"
+  }
+  triggers: "linearize-flutter"
+}
+
+trigger {
+  id: "dart-flutter-flutter-trigger"
+  acl_sets: "default"
+  gitiles: {
+    repo: "https://dart.googlesource.com/external/github.com/flutter/flutter"
+    refs: "refs/heads/master"
+  }
+  triggers: "linearize-flutter"
+}
+
+job {
+  id: "linearize-flutter"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "linearize-flutter"
+  }
+  triggering_policy: {
+    max_batch_size: 1
+  }
+}
+
 # analyzer-stable CI triggers
 trigger {
   id: "dart-gitiles-trigger-analyzer-stable"
@@ -117,6 +152,7 @@ trigger {
   triggers: "front-end-mac-release-x64"
   triggers: "front-end-win-release-x64"
   triggers: "gclient"
+  triggers: "linearize-flutter"
   triggers: "pkg-linux-debug"
   triggers: "pkg-linux-release"
   triggers: "pkg-mac-release"

From 42118eb42a097835d2dfb5fe15649ea8c1bc1a38 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 1 Mar 2019 06:46:56 +0000
Subject: [PATCH 253/826] [infra] Experiment with 3xH consoles on Luci

* Add new builder to existing Flutter console.
* Add new linear history console.

TBR=whesse@google.com

Change-Id: I4b255aafd2c58925325fbbdafd66b74efe08eab4
Reviewed-on: https://dart-review.googlesource.com/c/94862
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-milo.cfg | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 4505b1c9ee3f..8ee1908f462c 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -1835,10 +1835,15 @@ consoles: {
   refs: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbot/client.dart.internal/flutter-engine-linux"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
     category: "flutter"
     short_name: "3H"
   }
+  builders {
+    name: "buildbot/client.dart.internal/flutter-engine-linux"
+    category: "flutter"
+    short_name: "3H_"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
     category: "flutter"
@@ -1846,6 +1851,19 @@ consoles: {
   }
 }
 
+consoles: {
+  id: "linear"
+  name: "Dart/Flutter Linear History Console"
+  repo_url: "https://dart.googlesource.com/linear_sdk_flutter_engine"
+  refs: "refs/heads/master"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
+    category: "flutter"
+    short_name: "3H"
+  }
+}
+
 consoles: {
   id: "fyi"
   name: "SDK FYI Console"

From 18b7b1984175e36f7ba32cc4404d9e6bda4fec5f Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 1 Mar 2019 15:53:11 +0000
Subject: [PATCH 254/826] [infra] Remove all the buildbot references from the
 Luci config

Change-Id: Id2ee6267bf93aa1e75bc4310891230028889b8e4
Reviewed-on: https://dart-review.googlesource.com/c/95029
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg |  2 +-
 luci-milo.cfg      | 36 ++++++------------------------------
 2 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index c64ce20e3fe3..b9d4a41db1df 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1,5 +1,5 @@
 # Defines buckets on cr-buildbucket.appspot.com, used to schedule builds
-# on buildbot. In particular, CQ uses some of these buckets to schedule tryjobs.
+# on Luci. In particular, CQ uses some of these buckets to schedule tryjobs.
 #
 # See http://luci-config.appspot.com/schemas/projects:buildbucket.cfg for
 # schema of this file and documentation.
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 8ee1908f462c..7b6cc1fe13f8 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -39,11 +39,6 @@ consoles: {
         url: "/p/dart/g/alt/console"
         alt: "SDK BE Console (alternative)"
       }
-      links: {
-        text: "Buildbot console"
-        url: "https://uberchromegw.corp.google.com/i/client.dart/console"
-        alt: "Buildbot Console"
-      }
       links: {
         text: "FYI console"
         url: "/p/dart/g/fyi/console"
@@ -84,7 +79,7 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbot/client.dart.internal/flutter-engine-linux"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
     category: "flutter"
     short_name: "3H"
   }
@@ -469,14 +464,12 @@ consoles: {
     short_name: "g"
   }
   builders {
-    # migrating to debianpackage-linux
-    name: "buildbot/client.dart/debianpackage-linux-be"
+    name: "buildbucket/luci.dart.ci.sandbox/debianpackage-linux"
     category: "misc"
     short_name: "dp"
   }
   builders {
-    # migrating to versionchecker-linux
-    name: "buildbot/client.dart/versionchecker-linux-be"
+    name: "buildbucket/luci.dart.ci.sandbox/versionchecker-linux"
     category: "misc"
     short_name: "vc"
   }
@@ -488,11 +481,6 @@ consoles: {
         url: "/p/dart/g/alt/console"
         alt: "SDK BE Console (alternative)"
       }
-      links: {
-        text: "Buildbot console"
-        url: "https://uberchromegw.corp.google.com/i/client.dart/console"
-        alt: "Buildbot Console"
-      }
       links: {
         text: "FYI console"
         url: "/p/dart/g/fyi/console"
@@ -533,7 +521,7 @@ consoles: {
     short_name: "w"
   }
   builders {
-    name: "buildbot/client.dart.internal/flutter-engine-linux"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
     category: "flutter"
     short_name: "3H"
   }
@@ -673,14 +661,12 @@ consoles: {
     short_name: "g"
   }
   builders {
-    # migrating to debianpackage-linux
-    name: "buildbot/client.dart/debianpackage-linux-be"
+    name: "buildbucket/luci.dart.ci.sandbox/debianpackage-linux-be"
     category: "misc"
     short_name: "dp"
   }
   builders {
-    # migrating to versionchecker-linux
-    name: "buildbot/client.dart/versionchecker-linux-be"
+    name: "buildbucket/luci.dart.ci.sandbox/versionchecker-linux-be"
     category: "misc"
     short_name: "vc"
   }
@@ -937,11 +923,6 @@ consoles: {
         url: "/p/dart/g/be/console"
         alt: "SDK BE Console"
       }
-      links: {
-        text: "Buildbot console"
-        url: "https://uberchromegw.corp.google.com/i/client.dart/console"
-        alt: "Buildbot Console"
-      }
       links: {
         text: "FYI console"
         url: "/p/dart/g/fyi/console"
@@ -1839,11 +1820,6 @@ consoles: {
     category: "flutter"
     short_name: "3H"
   }
-  builders {
-    name: "buildbot/client.dart.internal/flutter-engine-linux"
-    category: "flutter"
-    short_name: "3H_"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
     category: "flutter"

From 897ebaaefcf03232ef90d4f72b3db8e7791d472c Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 11 Mar 2019 13:36:59 +0000
Subject: [PATCH 255/826] [infra] Enable debianpackage and versionchecker
 builders

TBR=whesse@google.com

Change-Id: I2b9eac0331b6653c259dfbb3c707742fd6650e5f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/96301
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-scheduler.cfg | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index b58e064a2be2..b5ffbbfabf42 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -709,7 +709,6 @@ job {
 job {
   id: "debianpackage-linux"
   acl_sets: "default"
-  disabled: true
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
@@ -820,7 +819,6 @@ job {
 job {
   id: "versionchecker-linux"
   acl_sets: "default"
-  disabled: true
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
@@ -1604,7 +1602,6 @@ job {
 job {
   id: "debianpackage-linux-dev"
   acl_sets: "default"
-  disabled: true
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
@@ -1693,7 +1690,6 @@ job {
 job {
   id: "versionchecker-linux-dev"
   acl_sets: "default"
-  disabled: true
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
@@ -2477,7 +2473,6 @@ job {
 job {
   id: "debianpackage-linux-stable"
   acl_sets: "default"
-  disabled: true
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
@@ -2566,7 +2561,6 @@ job {
 job {
   id: "versionchecker-linux-stable"
   acl_sets: "default"
-  disabled: true
   schedule: "triggered"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"

From 5e2baac037c4cca2b2b8ac480812c01d8e211e7f Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 11 Mar 2019 18:25:57 +0000
Subject: [PATCH 256/826] [infra] Fix consoles to display versionchecker and
 debianpackage builders

TBR=whesse@google.com

Change-Id: I3d8cc4bae3610252abde65e3df7033c24ca1ea9f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/96440
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-milo.cfg | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 7b6cc1fe13f8..f71be3a90992 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -464,12 +464,12 @@ consoles: {
     short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/debianpackage-linux"
+    name: "buildbucket/luci.dart.ci/debianpackage-linux"
     category: "misc"
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/versionchecker-linux"
+    name: "buildbucket/luci.dart.ci/versionchecker-linux"
     category: "misc"
     short_name: "vc"
   }
@@ -661,12 +661,12 @@ consoles: {
     short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/debianpackage-linux-be"
+    name: "buildbucket/luci.dart.ci/debianpackage-linux"
     category: "misc"
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/versionchecker-linux-be"
+    name: "buildbucket/luci.dart.ci/versionchecker-linux"
     category: "misc"
     short_name: "vc"
   }
@@ -1338,7 +1338,7 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/versionchecker-linux-dev"
+    name: "buildbucket/luci.dart.ci/versionchecker-linux-dev"
     category: "misc"
     short_name: "vc"
   }
@@ -1772,7 +1772,7 @@ consoles: {
     short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/versionchecker-linux-stable"
+    name: "buildbucket/luci.dart.ci/versionchecker-linux-stable"
     category: "misc"
     short_name: "vc"
   }

From a7cf6cb48873e4b44a0d57aa8b842274a0479ea9 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 13 Mar 2019 12:04:13 +0000
Subject: [PATCH 257/826] [infra] Move debianpackage builder to infra notifiers

* Docker is flaky, so let's not spam people about that.
* Switched infra notifier to on_new_failure.

Change-Id: Ic15b72648e97e9881cddc2b1cee4f993ac7443cd
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/96681
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 luci-notify.cfg | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/luci-notify.cfg b/luci-notify.cfg
index b150ad090b10..f31c53adcc5e 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -13,19 +13,23 @@ notifiers {
     notifications {
         on_change: false
         on_success: false
-        on_failure: true
-        on_new_failure: false
+        on_failure: false
+        on_new_failure: true
         email {
             recipients: "athom@google.com"
             recipients: "sortie@google.com"
             recipients: "whesse@google.com"
         }
     }
-
     builders {
         name: "base"
         bucket: "ci"
     }
+    builders {
+        name: "debianpackage-linux"
+        bucket: "ci"
+        repository: "https://dart.googlesource.com/sdk"
+    }
 }
 
 notifiers {
@@ -57,11 +61,6 @@ notifiers {
         bucket: "ci"
         repository: "https://dart.googlesource.com/sdk"
     }
-    builders {
-        name: "debianpackage-linux"
-        bucket: "ci"
-        repository: "https://dart.googlesource.com/sdk"
-    }
     builders {
         name: "versionchecker-linux"
         bucket: "ci"

From 0b653be33fe23b125d41d13d9be9354a8dda529a Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Fri, 22 Mar 2019 13:27:19 +0000
Subject: [PATCH 258/826] [infra] Triple the number of concurrent flutter-3H
 builds.

TBR: athom@google.com
Change-Id: I8e79c77b7e50d62fb8f353581d0ceb7723a342c3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/97629
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-scheduler.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index b5ffbbfabf42..fe7e79ad575e 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -59,7 +59,7 @@ job {
     builder: "flutter-engine-linux"
   }
   triggering_policy: {
-    max_concurrent_invocations: 5
+    max_concurrent_invocations: 15
     max_batch_size: 1
   }
 }

From fb3e56cdedcd3e950dddf1fb3d8ee517fe5de340 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Mon, 25 Mar 2019 12:58:18 +0000
Subject: [PATCH 259/826] [infra] Link to new workflow documentation in luci
 notify emails.

Change-Id: Ib3f87361c636f4cc74dee607450baf50c7b02a46
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/97635
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-notify/email-templates/default.template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/luci-notify/email-templates/default.template b/luci-notify/email-templates/default.template
index 3cc46bfcee21..4fd448a17036 100644
--- a/luci-notify/email-templates/default.template
+++ b/luci-notify/email-templates/default.template
@@ -17,6 +17,10 @@ Failed Steps:
 {{ end -}}
 {{ end -}}
 </ul>
+See the documentation at
+<a href="https://goto.google.com/dart-status-file-free-workflow">
+go/dart-status-file-free-workflow
+</a>.
 <br />
 Completed at: {{ .Build.EndTime | time }}
 {{ end -}}

From 9d594ac4dbbbc635e902987858ae77a1333a8987 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Mon, 25 Mar 2019 15:41:27 +0000
Subject: [PATCH 260/826] [infra] Fix trailing space in luci-notify
 documentation link.

Change-Id: I5a03734004558ad6f1fa1d00ad5e47b8c574098a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/97800
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-notify/email-templates/default.template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/luci-notify/email-templates/default.template b/luci-notify/email-templates/default.template
index 4fd448a17036..b1da9f4c96cf 100644
--- a/luci-notify/email-templates/default.template
+++ b/luci-notify/email-templates/default.template
@@ -19,8 +19,7 @@ Failed Steps:
 </ul>
 See the documentation at
 <a href="https://goto.google.com/dart-status-file-free-workflow">
-go/dart-status-file-free-workflow
-</a>.
+go/dart-status-file-free-workflow</a>.
 <br />
 Completed at: {{ .Build.EndTime | time }}
 {{ end -}}

From fbd7a9d354656d8b3760f31a24b41b1de1ca5b43 Mon Sep 17 00:00:00 2001
From: Samir Jindel <sjindel@google.com>
Date: Tue, 26 Mar 2019 09:01:09 +0000
Subject: [PATCH 261/826] [infra] Add new bots for testing FFI on Android.

Change-Id: I9c3bb1fce5e898c4fb5642c59fec99f1394b961d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/97513
Reviewed-by: William Hesse <whesse@google.com>
Auto-Submit: Samir Jindel <sjindel@google.com>
---
 cr-buildbucket.cfg |  24 +++++
 luci-milo.cfg      | 120 +++++++++++++++++++++++++
 luci-notify.cfg    |  30 +++++++
 luci-scheduler.cfg | 216 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 390 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index b9d4a41db1df..9f446eda325a 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -310,6 +310,12 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64" mixins: "mac" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-debug-arm64" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-debug-arm" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-release-arm64" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-release-arm" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-product-arm64" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-product-arm" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-android-release-arm" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm64" mixins: "new_workflow" }
@@ -387,6 +393,12 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-dev" mixins: "mac" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-dev" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-dev" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-debug-arm64-dev" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-debug-arm-dev" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-release-arm64-dev" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-release-arm-dev" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-product-arm64-dev" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-product-arm-dev" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-android-release-arm-dev" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm-dev" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm64-dev" mixins: "new_workflow" }
@@ -464,6 +476,12 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-stable" mixins: "mac" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-stable" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-stable" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-debug-arm64-stable" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-debug-arm-stable" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-release-arm64-stable" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-release-arm-stable" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-product-arm64-stable" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-product-arm-stable" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-android-release-arm-stable" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm-stable" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm64-stable" mixins: "new_workflow" }
@@ -577,6 +595,12 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-try" mixins: "mac" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-try" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-try" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-debug-arm64-try" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-debug-arm-try" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-release-arm64-try" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-release-arm-try" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-product-arm64-try" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-product-arm-try" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-android-release-arm-try" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm-try" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm64-try" mixins: "new_workflow" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index f71be3a90992..9dc9a12ffb59 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -328,6 +328,36 @@ consoles: {
     category: "vm|reload-kernel"
     short_name: "rrb"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64"
+    category: "vm|ffi"
+    short_name: "d64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
+    category: "vm|ffi"
+    short_name: "d32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64"
+    category: "vm|ffi"
+    short_name: "r64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm"
+    category: "vm|ffi"
+    short_name: "r32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64"
+    category: "vm|ffi"
+    short_name: "p64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm"
+    category: "vm|ffi"
+    short_name: "p32"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
     category: "dart2js|d8"
@@ -915,6 +945,36 @@ consoles: {
     category: "vm|reload-kernel"
     short_name: "rrb"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64"
+    category: "vm|ffi"
+    short_name: "d64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
+    category: "vm|ffi"
+    short_name: "d32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64"
+    category: "vm|ffi"
+    short_name: "r64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm"
+    category: "vm|ffi"
+    short_name: "r32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64"
+    category: "vm|ffi"
+    short_name: "p64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm"
+    category: "vm|ffi"
+    short_name: "p32"
+  }
   header: {
     links: {
       name: "Consoles"
@@ -1207,6 +1267,36 @@ consoles: {
     category: "vm|reload-kernel"
     short_name: "rrb"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64-dev"
+    category: "vm|ffi"
+    short_name: "d64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-dev"
+    category: "vm|ffi"
+    short_name: "d32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64-dev"
+    category: "vm|ffi"
+    short_name: "r64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-dev"
+    category: "vm|ffi"
+    short_name: "r32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64-dev"
+    category: "vm|ffi"
+    short_name: "p64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-dev"
+    category: "vm|ffi"
+    short_name: "p32"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-dev"
     category: "dart2js|d8"
@@ -1641,6 +1731,36 @@ consoles: {
     category: "vm|reload-kernel"
     short_name: "rrb"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64-stable"
+    category: "vm|ffi"
+    short_name: "d64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-stable"
+    category: "vm|ffi"
+    short_name: "d32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64-stable"
+    category: "vm|ffi"
+    short_name: "r64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-stable"
+    category: "vm|ffi"
+    short_name: "r32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64-stable"
+    category: "vm|ffi"
+    short_name: "p64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-stable"
+    category: "vm|ffi"
+    short_name: "p32"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-stable"
     category: "dart2js|d8"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index f31c53adcc5e..5ac56bd65d0f 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -453,6 +453,36 @@ notifiers {
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
+    builders {
+        name: "vm-ffi-android-debug-arm64"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-ffi-android-debug-arm"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-ffi-android-release-arm64"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-ffi-android-release-arm"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-ffi-android-product-arm64"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-ffi-android-product-arm"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
 }
 
 notifiers {
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index fe7e79ad575e..fec4b85970fe 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -203,6 +203,12 @@ trigger {
   triggers: "vm-kernel-win-product-x64"
   triggers: "vm-kernel-win-release-ia32"
   triggers: "vm-kernel-win-release-x64"
+  triggers: "vm-ffi-android-debug-arm64"
+  triggers: "vm-ffi-android-debug-arm"
+  triggers: "vm-ffi-android-release-arm64"
+  triggers: "vm-ffi-android-release-arm"
+  triggers: "vm-ffi-android-product-arm64"
+  triggers: "vm-ffi-android-product-arm"
 }
 
 trigger {
@@ -291,6 +297,12 @@ trigger {
   triggers: "vm-kernel-win-product-x64-dev"
   triggers: "vm-kernel-win-release-ia32-dev"
   triggers: "vm-kernel-win-release-x64-dev"
+  triggers: "vm-ffi-android-debug-arm64-dev"
+  triggers: "vm-ffi-android-debug-arm-dev"
+  triggers: "vm-ffi-android-release-arm64-dev"
+  triggers: "vm-ffi-android-release-arm-dev"
+  triggers: "vm-ffi-android-product-arm64-dev"
+  triggers: "vm-ffi-android-product-arm-dev"
 }
 
 trigger {
@@ -379,6 +391,12 @@ trigger {
   triggers: "vm-kernel-win-product-x64-stable"
   triggers: "vm-kernel-win-release-ia32-stable"
   triggers: "vm-kernel-win-release-x64-stable"
+  triggers: "vm-ffi-android-debug-arm64-stable"
+  triggers: "vm-ffi-android-debug-arm-stable"
+  triggers: "vm-ffi-android-release-arm64-stable"
+  triggers: "vm-ffi-android-release-arm-stable"
+  triggers: "vm-ffi-android-product-arm64-stable"
+  triggers: "vm-ffi-android-product-arm-stable"
 }
 
 # CI jobs
@@ -1322,6 +1340,72 @@ job {
   }
 }
 
+job {
+  id: "vm-ffi-android-debug-arm64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-debug-arm64"
+  }
+}
+
+job {
+  id: "vm-ffi-android-debug-arm"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-debug-arm"
+  }
+}
+
+job {
+  id: "vm-ffi-android-release-arm64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-release-arm64"
+  }
+}
+
+job {
+  id: "vm-ffi-android-release-arm"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-release-arm"
+  }
+}
+
+job {
+  id: "vm-ffi-android-product-arm64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-product-arm64"
+  }
+}
+
+job {
+  id: "vm-ffi-android-product-arm"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-product-arm"
+  }
+}
+
 # dev
 
 job {
@@ -2193,6 +2277,72 @@ job {
   }
 }
 
+job {
+  id: "vm-ffi-android-debug-arm64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-debug-arm64-dev"
+  }
+}
+
+job {
+  id: "vm-ffi-android-debug-arm-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-debug-arm-dev"
+  }
+}
+
+job {
+  id: "vm-ffi-android-release-arm64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-release-arm64-dev"
+  }
+}
+
+job {
+  id: "vm-ffi-android-release-arm-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-release-arm-dev"
+  }
+}
+
+job {
+  id: "vm-ffi-android-product-arm64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-product-arm64-dev"
+  }
+}
+
+job {
+  id: "vm-ffi-android-product-arm-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-product-arm-dev"
+  }
+}
+
 # stable
 
 job {
@@ -3063,3 +3213,69 @@ job {
     builder: "vm-kernel-win-release-x64-stable"
   }
 }
+
+job {
+  id: "vm-ffi-android-debug-arm64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-debug-arm64-stable"
+  }
+}
+
+job {
+  id: "vm-ffi-android-debug-arm-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-debug-arm-stable"
+  }
+}
+
+job {
+  id: "vm-ffi-android-release-arm64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-release-arm64-stable"
+  }
+}
+
+job {
+  id: "vm-ffi-android-release-arm-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-release-arm-stable"
+  }
+}
+
+job {
+  id: "vm-ffi-android-product-arm64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-product-arm64-stable"
+  }
+}
+
+job {
+  id: "vm-ffi-android-product-arm-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-product-arm-stable"
+  }
+}

From d5e0e428c5d02baa52e2f894a0cf8df4b2280de2 Mon Sep 17 00:00:00 2001
From: Samir Jindel <sjindel@google.com>
Date: Tue, 26 Mar 2019 15:03:35 +0000
Subject: [PATCH 262/826] [infra] Don't trigger Android-ARM64 bots since the
 hardware is not available yet.

Change-Id: I190d176396c17d3ea78bc1b112644412597dadae
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/97932
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 12 ----------
 luci-milo.cfg      | 60 ----------------------------------------------
 luci-notify.cfg    | 15 ------------
 luci-scheduler.cfg |  9 -------
 4 files changed, 96 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 9f446eda325a..b3dc726a5bf7 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -310,11 +310,8 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64" mixins: "mac" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-debug-arm64" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-ffi-android-debug-arm" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-release-arm64" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-ffi-android-release-arm" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-product-arm64" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-ffi-android-product-arm" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-android-release-arm" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm" mixins: "new_workflow" }
@@ -393,11 +390,8 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-dev" mixins: "mac" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-dev" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-dev" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-debug-arm64-dev" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-ffi-android-debug-arm-dev" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-release-arm64-dev" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-ffi-android-release-arm-dev" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-product-arm64-dev" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-ffi-android-product-arm-dev" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-android-release-arm-dev" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm-dev" mixins: "new_workflow" }
@@ -476,11 +470,8 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-stable" mixins: "mac" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-stable" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-stable" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-debug-arm64-stable" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-ffi-android-debug-arm-stable" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-release-arm64-stable" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-ffi-android-release-arm-stable" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-product-arm64-stable" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-ffi-android-product-arm-stable" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-android-release-arm-stable" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm-stable" mixins: "new_workflow" }
@@ -595,11 +586,8 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-try" mixins: "mac" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-try" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-try" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-debug-arm64-try" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-ffi-android-debug-arm-try" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-release-arm64-try" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-ffi-android-release-arm-try" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-product-arm64-try" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-ffi-android-product-arm-try" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-android-release-arm-try" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm-try" mixins: "new_workflow" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 9dc9a12ffb59..7ac53993f741 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -328,31 +328,16 @@ consoles: {
     category: "vm|reload-kernel"
     short_name: "rrb"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64"
-    category: "vm|ffi"
-    short_name: "d64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
     category: "vm|ffi"
     short_name: "d32"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64"
-    category: "vm|ffi"
-    short_name: "r64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm"
     category: "vm|ffi"
     short_name: "r32"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64"
-    category: "vm|ffi"
-    short_name: "p64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm"
     category: "vm|ffi"
@@ -945,31 +930,16 @@ consoles: {
     category: "vm|reload-kernel"
     short_name: "rrb"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64"
-    category: "vm|ffi"
-    short_name: "d64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
     category: "vm|ffi"
     short_name: "d32"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64"
-    category: "vm|ffi"
-    short_name: "r64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm"
     category: "vm|ffi"
     short_name: "r32"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64"
-    category: "vm|ffi"
-    short_name: "p64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm"
     category: "vm|ffi"
@@ -1267,31 +1237,16 @@ consoles: {
     category: "vm|reload-kernel"
     short_name: "rrb"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64-dev"
-    category: "vm|ffi"
-    short_name: "d64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-dev"
     category: "vm|ffi"
     short_name: "d32"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64-dev"
-    category: "vm|ffi"
-    short_name: "r64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-dev"
     category: "vm|ffi"
     short_name: "r32"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64-dev"
-    category: "vm|ffi"
-    short_name: "p64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-dev"
     category: "vm|ffi"
@@ -1731,31 +1686,16 @@ consoles: {
     category: "vm|reload-kernel"
     short_name: "rrb"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64-stable"
-    category: "vm|ffi"
-    short_name: "d64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-stable"
     category: "vm|ffi"
     short_name: "d32"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64-stable"
-    category: "vm|ffi"
-    short_name: "r64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-stable"
     category: "vm|ffi"
     short_name: "r32"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64-stable"
-    category: "vm|ffi"
-    short_name: "p64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-stable"
     category: "vm|ffi"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 5ac56bd65d0f..32b4a720013c 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -453,31 +453,16 @@ notifiers {
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
-    builders {
-        name: "vm-ffi-android-debug-arm64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
     builders {
         name: "vm-ffi-android-debug-arm"
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
-    builders {
-        name: "vm-ffi-android-release-arm64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
     builders {
         name: "vm-ffi-android-release-arm"
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
-    builders {
-        name: "vm-ffi-android-product-arm64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
     builders {
         name: "vm-ffi-android-product-arm"
         bucket: "ci.sandbox"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index fec4b85970fe..6f958a914dee 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -203,11 +203,8 @@ trigger {
   triggers: "vm-kernel-win-product-x64"
   triggers: "vm-kernel-win-release-ia32"
   triggers: "vm-kernel-win-release-x64"
-  triggers: "vm-ffi-android-debug-arm64"
   triggers: "vm-ffi-android-debug-arm"
-  triggers: "vm-ffi-android-release-arm64"
   triggers: "vm-ffi-android-release-arm"
-  triggers: "vm-ffi-android-product-arm64"
   triggers: "vm-ffi-android-product-arm"
 }
 
@@ -297,11 +294,8 @@ trigger {
   triggers: "vm-kernel-win-product-x64-dev"
   triggers: "vm-kernel-win-release-ia32-dev"
   triggers: "vm-kernel-win-release-x64-dev"
-  triggers: "vm-ffi-android-debug-arm64-dev"
   triggers: "vm-ffi-android-debug-arm-dev"
-  triggers: "vm-ffi-android-release-arm64-dev"
   triggers: "vm-ffi-android-release-arm-dev"
-  triggers: "vm-ffi-android-product-arm64-dev"
   triggers: "vm-ffi-android-product-arm-dev"
 }
 
@@ -391,11 +385,8 @@ trigger {
   triggers: "vm-kernel-win-product-x64-stable"
   triggers: "vm-kernel-win-release-ia32-stable"
   triggers: "vm-kernel-win-release-x64-stable"
-  triggers: "vm-ffi-android-debug-arm64-stable"
   triggers: "vm-ffi-android-debug-arm-stable"
-  triggers: "vm-ffi-android-release-arm64-stable"
   triggers: "vm-ffi-android-release-arm-stable"
-  triggers: "vm-ffi-android-product-arm64-stable"
   triggers: "vm-ffi-android-product-arm-stable"
 }
 

From b83baa02f360d98abcd03ca9c22f0d3a82825e1e Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 1 Apr 2019 07:41:02 +0000
Subject: [PATCH 263/826] [infra] Temporarily remove broken front-end builder
 from the CQ

TBR=whesse@google.com

Change-Id: Ib6643e196ccb18718fbedbe5435e69877c16af1a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/98351
Reviewed-by: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index a8f47646d143..dc9729ec2b14 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -55,7 +55,8 @@ config_groups {
       }
       builders {
         name: "dart/try/front-end-linux-release-x64-try"
-      }
+        experiment_percentage: 100
+       }
       builders {
         name: "dart/try/gclient-try"
       }

From 05891e93dcdd1bf4b36bafb17415dba04e120bbe Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 1 Apr 2019 18:53:59 +0000
Subject: [PATCH 264/826] Revert "[infra] Temporarily remove broken front-end
 builder from the CQ"

This reverts commit b83baa02f360d98abcd03ca9c22f0d3a82825e1e.

Reason for revert: Red bot fixed on master.

Original change's description:
> [infra] Temporarily remove broken front-end builder from the CQ
>
> TBR=whesse@google.com
>
> Change-Id: Ib6643e196ccb18718fbedbe5435e69877c16af1a
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/98351
> Reviewed-by: Alexander Thomas <athom@google.com>

TBR=whesse@google.com,athom@google.com

Change-Id: I013c7f3eaa4d02f5214fd35dea72d863ad90b625
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/98337
Reviewed-by: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index dc9729ec2b14..a8f47646d143 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -55,8 +55,7 @@ config_groups {
       }
       builders {
         name: "dart/try/front-end-linux-release-x64-try"
-        experiment_percentage: 100
-       }
+      }
       builders {
         name: "dart/try/gclient-try"
       }

From daab7320257f1864859176ca7a74603122e90a11 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 1 Apr 2019 19:40:37 +0000
Subject: [PATCH 265/826] [infra] Add additional dartkb builders

Change-Id: Ica033a2093f429bd24e6d7d491f4ef88905c6e23
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/98016
Reviewed-by: William Hesse <whesse@google.com>
Reviewed-by: Ryan Macnak <rmacnak@google.com>
---
 cr-buildbucket.cfg |  16 +++++
 luci-milo.cfg      |  80 +++++++++++++++++++++++++
 luci-notify.cfg    |  24 +++++++-
 luci-scheduler.cfg | 144 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 262 insertions(+), 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index b3dc726a5bf7..c072ac67566b 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -290,7 +290,11 @@ buckets {
     builders { name: "pkg-win-release" mixins: "win" mixins: "new_workflow" }
     builders { name: "pkg-linux-debug" mixins: "new_workflow" }
     builders { name: "vm-canary-linux-debug" mixins: "new_workflow" }
+    builders { name: "vm-dartkb-linux-debug-simarm64" mixins: "new_workflow" }
     builders { name: "vm-dartkb-linux-debug-x64" mixins: "new_workflow" }
+    builders { name: "vm-dartkb-linux-product-simarm64" mixins: "new_workflow" }
+    builders { name: "vm-dartkb-linux-product-x64" mixins: "new_workflow" }
+    builders { name: "vm-dartkb-linux-release-simarm64" mixins: "new_workflow" }
     builders { name: "vm-dartkb-linux-release-x64" mixins: "new_workflow" }
     builders { name: "vm-kernel-asan-linux-release-x64" mixins: "new_workflow" }
     builders { name: "vm-kernel-checked-linux-release-x64" mixins: "new_workflow" }
@@ -370,7 +374,11 @@ buckets {
     builders { name: "pkg-mac-release-dev" mixins: "mac" mixins: "new_workflow" }
     builders { name: "pkg-win-release-dev" mixins: "win" mixins: "new_workflow" }
     builders { name: "vm-canary-linux-debug-dev" mixins: "new_workflow" }
+    builders { name: "vm-dartkb-linux-debug-simarm64-dev" mixins: "new_workflow" }
     builders { name: "vm-dartkb-linux-debug-x64-dev" mixins: "new_workflow" }
+    builders { name: "vm-dartkb-linux-product-simarm64-dev" mixins: "new_workflow" }
+    builders { name: "vm-dartkb-linux-product-x64-dev" mixins: "new_workflow" }
+    builders { name: "vm-dartkb-linux-release-simarm64-dev" mixins: "new_workflow" }
     builders { name: "vm-dartkb-linux-release-x64-dev" mixins: "new_workflow" }
     builders { name: "vm-kernel-asan-linux-release-x64-dev" mixins: "new_workflow" }
     builders { name: "vm-kernel-checked-linux-release-x64-dev" mixins: "new_workflow" }
@@ -450,7 +458,11 @@ buckets {
     builders { name: "pkg-mac-release-stable" mixins: "mac" mixins: "new_workflow" }
     builders { name: "pkg-win-release-stable" mixins: "win" mixins: "new_workflow" }
     builders { name: "vm-canary-linux-debug-stable" mixins: "new_workflow" }
+    builders { name: "vm-dartkb-linux-debug-simarm64-stable" mixins: "new_workflow" }
     builders { name: "vm-dartkb-linux-debug-x64-stable" mixins: "new_workflow" }
+    builders { name: "vm-dartkb-linux-product-simarm64-stable" mixins: "new_workflow" }
+    builders { name: "vm-dartkb-linux-product-x64-stable" mixins: "new_workflow" }
+    builders { name: "vm-dartkb-linux-release-simarm64-stable" mixins: "new_workflow" }
     builders { name: "vm-dartkb-linux-release-x64-stable" mixins: "new_workflow" }
     builders { name: "vm-kernel-asan-linux-release-x64-stable" mixins: "new_workflow" }
     builders { name: "vm-kernel-checked-linux-release-x64-stable" mixins: "new_workflow" }
@@ -566,7 +578,11 @@ buckets {
     builders { name: "pkg-mac-release-try" mixins: "mac" mixins: "new_workflow" }
     builders { name: "pkg-win-release-try" mixins: "win" mixins: "new_workflow" }
     builders { name: "vm-canary-linux-debug-try" mixins: "new_workflow" }
+    builders { name: "vm-dartkb-linux-debug-simarm64-try" mixins: "new_workflow" }
     builders { name: "vm-dartkb-linux-debug-x64-try" mixins: "new_workflow" }
+    builders { name: "vm-dartkb-linux-product-simarm64-try" mixins: "new_workflow" }
+    builders { name: "vm-dartkb-linux-product-x64-try" mixins: "new_workflow" }
+    builders { name: "vm-dartkb-linux-release-simarm64-try" mixins: "new_workflow" }
     builders { name: "vm-dartkb-linux-release-x64-try" mixins: "new_workflow" }
     builders { name: "vm-kernel-asan-linux-release-x64-try" mixins: "new_workflow" }
     builders { name: "vm-kernel-checked-linux-release-x64-try" mixins: "new_workflow" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 7ac53993f741..6f394a4c0e77 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -98,11 +98,31 @@ consoles: {
     category: "vm|app-kernel"
     short_name: "r64"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-simarm64"
+    category: "vm|dartkb"
+    short_name: "sd"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64"
     category: "vm|dartkb"
     short_name: "d"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-simarm64"
+    category: "vm|dartkb"
+    short_name: "sp"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-x64"
+    category: "vm|dartkb"
+    short_name: "p"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64"
+    category: "vm|dartkb"
+    short_name: "sr"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64"
     category: "vm|dartkb"
@@ -700,11 +720,31 @@ consoles: {
     category: "vm|app-kernel"
     short_name: "r64"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-simarm64"
+    category: "vm|dartkb"
+    short_name: "sd"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64"
     category: "vm|dartkb"
     short_name: "d"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-simarm64"
+    category: "vm|dartkb"
+    short_name: "sp"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-x64"
+    category: "vm|dartkb"
+    short_name: "p"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64"
+    category: "vm|dartkb"
+    short_name: "sr"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64"
     category: "vm|dartkb"
@@ -1007,11 +1047,31 @@ consoles: {
     category: "vm|app-kernel"
     short_name: "r64"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-simarm64-dev"
+    category: "vm|dartkb"
+    short_name: "sd"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64-dev"
     category: "vm|dartkb"
     short_name: "d"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-simarm64-dev"
+    category: "vm|dartkb"
+    short_name: "sp"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-x64-dev"
+    category: "vm|dartkb"
+    short_name: "p"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64-dev"
+    category: "vm|dartkb"
+    short_name: "sr"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-dev"
     category: "vm|dartkb"
@@ -1456,11 +1516,31 @@ consoles: {
     category: "vm|app-kernel"
     short_name: "r64"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-simarm64-stable"
+    category: "vm|dartkb"
+    short_name: "sd"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64-stable"
     category: "vm|dartkb"
     short_name: "d"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-simarm64-stable"
+    category: "vm|dartkb"
+    short_name: "sp"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-x64-stable"
+    category: "vm|dartkb"
+    short_name: "p"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64-stable"
+    category: "vm|dartkb"
+    short_name: "sr"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-stable"
     category: "vm|dartkb"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 32b4a720013c..9a58ae4b030c 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -234,12 +234,32 @@ notifiers {
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
-        name: "vm-dartkb-linux-debug-x64"
+        name: "vm-dartkb-linux-debug-simarm64-try"
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
     builders {
-        name: "vm-dartkb-linux-release-x64"
+        name: "vm-dartkb-linux-debug-x64-try"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-dartkb-linux-product-simarm64-try"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-dartkb-linux-product-x64-try"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-dartkb-linux-release-simarm64-try"
+        bucket: "ci.sandbox"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+    builders {
+        name: "vm-dartkb-linux-release-x64-try"
         bucket: "ci.sandbox"
         repository: "https://dart.googlesource.com/sdk"
     }
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 6f958a914dee..fc9f2ba87c5e 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -159,7 +159,11 @@ trigger {
   triggers: "pkg-win-release"
   triggers: "versionchecker-linux"
   triggers: "vm-canary-linux-debug"
+  triggers: "vm-dartkb-linux-debug-simarm64"
   triggers: "vm-dartkb-linux-debug-x64"
+  triggers: "vm-dartkb-linux-product-simarm64"
+  triggers: "vm-dartkb-linux-product-x64"
+  triggers: "vm-dartkb-linux-release-simarm64"
   triggers: "vm-dartkb-linux-release-x64"
   triggers: "vm-kernel-asan-linux-release-x64"
   triggers: "vm-kernel-checked-linux-release-x64"
@@ -250,7 +254,11 @@ trigger {
   triggers: "pkg-win-release-dev"
   triggers: "versionchecker-linux-dev"
   triggers: "vm-canary-linux-debug-dev"
+  triggers: "vm-dartkb-linux-debug-simarm64-dev"
   triggers: "vm-dartkb-linux-debug-x64-dev"
+  triggers: "vm-dartkb-linux-product-simarm64-dev"
+  triggers: "vm-dartkb-linux-product-x64-dev"
+  triggers: "vm-dartkb-linux-release-simarm64-dev"
   triggers: "vm-dartkb-linux-release-x64-dev"
   triggers: "vm-kernel-asan-linux-release-x64-dev"
   triggers: "vm-kernel-checked-linux-release-x64-dev"
@@ -341,7 +349,11 @@ trigger {
   triggers: "pkg-win-release-stable"
   triggers: "versionchecker-linux-stable"
   triggers: "vm-canary-linux-debug-stable"
+  triggers: "vm-dartkb-linux-debug-simarm64-stable"
   triggers: "vm-dartkb-linux-debug-x64-stable"
+  triggers: "vm-dartkb-linux-product-simarm64-stable"
+  triggers: "vm-dartkb-linux-product-x64-stable"
+  triggers: "vm-dartkb-linux-release-simarm64-stable"
   triggers: "vm-dartkb-linux-release-x64-stable"
   triggers: "vm-kernel-asan-linux-release-x64-stable"
   triggers: "vm-kernel-checked-linux-release-x64-stable"
@@ -847,6 +859,17 @@ job {
   }
 }
 
+job {
+  id: "vm-dartkb-linux-debug-simarm64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-debug-simarm64"
+  }
+}
+
 job {
   id: "vm-dartkb-linux-debug-x64"
   acl_sets: "default"
@@ -858,6 +881,39 @@ job {
   }
 }
 
+job {
+  id: "vm-dartkb-linux-product-simarm64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-product-simarm64"
+  }
+}
+
+job {
+  id: "vm-dartkb-linux-product-x64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-product-x64"
+  }
+}
+
+job {
+  id: "vm-dartkb-linux-release-simarm64"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-release-simarm64"
+  }
+}
+
 job {
   id: "vm-dartkb-linux-release-x64"
   acl_sets: "default"
@@ -1784,6 +1840,17 @@ job {
   }
 }
 
+job {
+  id: "vm-dartkb-linux-debug-simarm64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-debug-simarm64-dev"
+  }
+}
+
 job {
   id: "vm-dartkb-linux-debug-x64-dev"
   acl_sets: "default"
@@ -1795,6 +1862,39 @@ job {
   }
 }
 
+job {
+  id: "vm-dartkb-linux-product-simarm64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-product-simarm64-dev"
+  }
+}
+
+job {
+  id: "vm-dartkb-linux-product-x64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-product-x64-dev"
+  }
+}
+
+job {
+  id: "vm-dartkb-linux-release-simarm64-dev"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-release-simarm64-dev"
+  }
+}
+
 job {
   id: "vm-dartkb-linux-release-x64-dev"
   acl_sets: "default"
@@ -2721,6 +2821,17 @@ job {
   }
 }
 
+job {
+  id: "vm-dartkb-linux-debug-simarm64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-debug-simarm64-stable"
+  }
+}
+
 job {
   id: "vm-dartkb-linux-debug-x64-stable"
   acl_sets: "default"
@@ -2732,6 +2843,39 @@ job {
   }
 }
 
+job {
+  id: "vm-dartkb-linux-product-simarm64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-product-simarm64-stable"
+  }
+}
+
+job {
+  id: "vm-dartkb-linux-product-x64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-product-x64-stable"
+  }
+}
+
+job {
+  id: "vm-dartkb-linux-release-simarm64-stable"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-release-simarm64-stable"
+  }
+}
+
 job {
   id: "vm-dartkb-linux-release-x64-stable"
   acl_sets: "default"

From 5eef65bf473af229b7729ce40e3da7b72ed17ca5 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Wed, 3 Apr 2019 09:22:50 +0000
Subject: [PATCH 266/826] [infra] Change windows sdk try builder to use
 standard recipe.

Change-Id: I7828b237e494ca30c42646d3bccbea67db7e0d08
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/98464
Reviewed-by: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg   |  2 +-
 cr-buildbucket.cfg | 22 ++++++----------------
 luci-milo.cfg      |  2 +-
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index a8f47646d143..70459cc1b372 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -36,7 +36,7 @@ config_groups {
         name: "dart/try/benchmark-linux-try"
       }
       builders {
-        name: "dart/try/dart-sdk-windows-try"
+        name: "dart/try/dart-sdk-win-try"
       }
       builders {
         name: "dart/try/dart2js-strong-linux-x64-chrome-try"
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index c072ac67566b..3adf57d5f082 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -71,11 +71,6 @@ builder_mixins {
   }
 }
 
-builder_mixins {
-  name: "debianpackage"
-  # todo(athom): how should this machine be defined?
-}
-
 builder_mixins {
   name: "docker"
   recipe {
@@ -131,13 +126,6 @@ builder_mixins {
   dimensions: "os:Mac"
 }
 
-builder_mixins {
-  name: "sdk"
-  recipe {
-    name: "dart/sdk_swarming"
-  }
-}
-
 builder_mixins {
   name: "slow"
   execution_timeout_secs: 21600 # 6h
@@ -195,7 +183,7 @@ buckets {
     builders { name: "dart-sdk-mac" mixins: "mac" }
     builders { name: "dart-sdk-win" mixins: "win" }
     builders { name: "docker" mixins: "docker" }
-    builders { name: "debianpackage-linux" mixins: "debianpackage" }
+    builders { name: "debianpackage-linux" }
     builders { name: "google" mixins: "external" }
     builders { name: "linearize-flutter" mixins: "linearize" }
     builders { name: "versionchecker-linux" }
@@ -204,14 +192,14 @@ buckets {
     builders { name: "dart-sdk-linux-dev" }
     builders { name: "dart-sdk-mac-dev" mixins: "mac" }
     builders { name: "dart-sdk-win-dev" mixins: "win" }
-    builders { name: "debianpackage-linux-dev" mixins: "debianpackage" }
+    builders { name: "debianpackage-linux-dev" }
     builders { name: "versionchecker-linux-dev" }
 
     # CI builders that require privileged access on the stable branch
     builders { name: "dart-sdk-linux-stable" }
     builders { name: "dart-sdk-mac-stable" mixins: "mac" }
     builders { name: "dart-sdk-win-stable" mixins: "win" }
-    builders { name: "debianpackage-linux-stable" mixins: "debianpackage" }
+    builders { name: "debianpackage-linux-stable" }
     builders { name: "versionchecker-linux-stable" }
   }
 }
@@ -554,7 +542,9 @@ buckets {
     builders { name: "app-kernel-linux-product-x64-try"  mixins: "new_workflow"}
     builders { name: "app-kernel-linux-release-x64-try"  mixins: "new_workflow"}
     builders { name: "benchmark-linux-try" }
-    builders { name: "dart-sdk-windows-try" mixins: "sdk" mixins: "win" }
+    builders { name: "dart-sdk-linux-try" }
+    builders { name: "dart-sdk-mac-try" mixins: "mac" }
+    builders { name: "dart-sdk-win-try" mixins: "win" }
     builders { name: "dart2js-csp-minified-linux-x64-chrome-try" mixins: "new_workflow" }
     builders { name: "dart2js-minified-strong-linux-x64-d8-try" mixins: "new_workflow" }
     builders { name: "dart2js-strong-hostasserts-linux-ia32-d8-try" mixins: "new_workflow" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 6f394a4c0e77..1c113452b09c 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2038,7 +2038,7 @@ consoles: {
   manifest_name: "PATCHED"
   builders { name: "buildbucket/luci.dart.try/analyzer-linux-release-try" }
   builders { name: "buildbucket/luci.dart.try/benchmark-linux-try" }
-  builders { name: "buildbucket/luci.dart.try/dart-sdk-windows-try" }
+  builders { name: "buildbucket/luci.dart.try/dart-sdk-win-try" }
   builders { name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-chrome-try" }
   builders { name: "buildbucket/luci.dart.try/dart2js-minified-strong-linux-x64-d8-try" }
   builders { name: "buildbucket/luci.dart.try/dart2js-strong-hostasserts-linux-ia32-d8-try" }

From 38d7c5676ba4f792f170fba539f66ac3be69d578 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 3 Apr 2019 20:29:46 +0000
Subject: [PATCH 267/826] Revert "[infra] Triple the number of concurrent
 flutter-3H builds."

This reverts commit 0b653be33fe23b125d41d13d9be9354a8dda529a.

Reason for revert: This used too much of our capacity during peak times.

Original change's description:
> [infra] Triple the number of concurrent flutter-3H builds.
>
> TBR: athom@google.com
> Change-Id: I8e79c77b7e50d62fb8f353581d0ceb7723a342c3
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/97629
> Reviewed-by: William Hesse <whesse@google.com>

TBR=whesse@google.com,athom@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: Iadd2ae2c1ad17fb1755bd6562258234d3af43809
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/98572
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-scheduler.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index fc9f2ba87c5e..4d82058956b7 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -59,7 +59,7 @@ job {
     builder: "flutter-engine-linux"
   }
   triggering_policy: {
-    max_concurrent_invocations: 15
+    max_concurrent_invocations: 5
     max_batch_size: 1
   }
 }

From e29a8650a09542311f1e325a176ae79c9bb25120 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 8 Apr 2019 20:14:04 +0000
Subject: [PATCH 268/826] [infra] Remove obsolete refs.cfg

This is no longer necessary now that cq.cfg on master is no longer used.

TBR=whesse@google.com

Change-Id: I5dc7bc872afc743177855b9e366b9c1230a3a516
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/98849
Reviewed-by: Alexander Thomas <athom@google.com>
---
 refs.cfg | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 refs.cfg

diff --git a/refs.cfg b/refs.cfg
deleted file mode 100644
index 6cceaff29b30..000000000000
--- a/refs.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-# Schema of this file:
-# https://luci-config.appspot.com/schemas/projects:refs.cfg
-refs {
-  name: "refs/heads/master"
-  config_path: "tools/infra/config"
-}

From 867cef0cbd0e6e21a45d06a41611198c372e0d65 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 10 Apr 2019 08:09:07 +0000
Subject: [PATCH 269/826] [infra] Add flutter-analyze builder to the CQ

This will add the builder to the default CQ for commits that modify any
files matching these patterns:
DEPS
pkg/analysis_server/.+
pkg/analysis_server_client/.+
pkg/analyzer/.+
pkg/analyzer_plugin/.+
pkg/front_end/.+
pkg/meta/.+
pkg/telemetry/.+

Change-Id: I34c7158f2f54e00d1e36cd80a0c96aa0ae831aae
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/98856
Reviewed-by: Devon Carew <devoncarew@google.com>
---
 commit-queue.cfg | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 70459cc1b372..b2cfc04fe6b2 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -32,6 +32,17 @@ config_groups {
       builders {
         name: "dart/try/analyzer-linux-release-try"
       }
+      builders {
+        name: "dart/try/flutter-analyze-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/pkg/analysis_server/.+"
+        location_regexp: ".+/[+]/pkg/analysis_server_client/.+"
+        location_regexp: ".+/[+]/pkg/analyzer/.+"
+        location_regexp: ".+/[+]/pkg/analyzer_plugin/.+"
+        location_regexp: ".+/[+]/pkg/front_end/.+"
+        location_regexp: ".+/[+]/pkg/meta/.+"
+        location_regexp: ".+/[+]/pkg/telemetry/.+"
+      }
       builders {
         name: "dart/try/benchmark-linux-try"
       }

From d612f481d0281f8f0fc103589e641aee8d888c60 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 11 Apr 2019 17:07:12 +0000
Subject: [PATCH 270/826] [infra] Add flutter-frontend builder to Luci config

TBR=jensj@google.com

Change-Id: Id44a623986dea7a98d457904f15d7661c159671d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/99165
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg |  2 ++
 luci-milo.cfg      | 10 ++++++++++
 luci-scheduler.cfg | 12 ++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 3adf57d5f082..8b14c565215f 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -268,6 +268,7 @@ buckets {
     builders { name: "ddc-mac-release-chrome" mixins: "mac" mixins: "new_workflow" }
     builders { name: "ddc-win-release-chrome" mixins: "win" mixins: "new_workflow" }
     builders { name: "flutter-analyze" }
+    builders { name: "flutter-frontend" }
     builders { name: "flutter-engine-linux" mixins: "flutter" }
     builders { name: "front-end-linux-release-x64" mixins: "clobber" }
     builders { name: "front-end-mac-release-x64" mixins: "clobber" mixins: "mac" }
@@ -560,6 +561,7 @@ buckets {
     builders { name: "ddc-mac-release-chrome-try" mixins: "mac" mixins: "new_workflow" }
     builders { name: "ddc-win-release-chrome-try" mixins: "win" mixins: "new_workflow" }
     builders { name: "flutter-analyze-try" }
+    builders { name: "flutter-frontend-try" }
     builders { name: "front-end-linux-release-x64-try" mixins: "clobber" }
     builders { name: "front-end-mac-release-x64-try" mixins: "clobber" mixins: "mac" }
     builders { name: "front-end-win-release-x64-try" mixins: "clobber" mixins: "win" mixins: "new_workflow" }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 1c113452b09c..83a5dbc75663 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -78,6 +78,11 @@ consoles: {
     category: "fasta"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
+    category: "fasta"
+    short_name: "fl"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
     category: "flutter"
@@ -555,6 +560,11 @@ consoles: {
     category: "fasta"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
+    category: "fasta"
+    short_name: "fl"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
     category: "flutter"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 4d82058956b7..e7a2d014adef 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -148,6 +148,7 @@ trigger {
   triggers: "ddc-win-release-chrome"
   triggers: "debianpackage-linux"
   triggers: "flutter-analyze"
+  triggers: "flutter-frontend"
   triggers: "front-end-linux-release-x64"
   triggers: "front-end-mac-release-x64"
   triggers: "front-end-win-release-x64"
@@ -749,6 +750,17 @@ job {
   }
 }
 
+job {
+  id: "flutter-frontend"
+  acl_sets: "default"
+  schedule: "triggered"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "flutter-frontend"
+  }
+}
+
 job {
   id: "front-end-linux-release-x64"
   acl_sets: "default"

From 54d97543757bf8a9470420d7758c689f74ce94b6 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 11 Apr 2019 17:26:26 +0000
Subject: [PATCH 271/826] [infra] Re-organize flutter consoles

* Add flutter-frontend to flutter console.
* Rename linear to flutter-hhh and add the console to the main consoles.
* Remove 3xH builder from flutter console to show it only once.

TBR=whesse@google.com

Change-Id: I20456aeaacb8fcfac970e3acbb829ee8201c90ce
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/99145
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-milo.cfg | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 83a5dbc75663..a82a81de3ec0 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -534,6 +534,7 @@ consoles: {
     }
     console_groups: {
       console_ids: "dart/flutter"
+      console_ids: "dart/flutter-hhh"
     }
     tree_status_host: "dart-status.appspot.com"
   }
@@ -1016,6 +1017,7 @@ consoles: {
     }
     console_groups: {
       console_ids: "dart/flutter"
+      console_ids: "dart/flutter-hhh"
     }
     tree_status_host: "dart-status.appspot.com"
   }
@@ -1965,20 +1967,20 @@ consoles: {
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
-    category: "flutter"
-    short_name: "3H"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
     category: "flutter"
     short_name: "fa"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
+    category: "fasta"
+    short_name: "fl"
+  }
 }
 
 consoles: {
-  id: "linear"
+  id: "flutter-hhh"
   name: "Dart/Flutter Linear History Console"
   repo_url: "https://dart.googlesource.com/linear_sdk_flutter_engine"
   refs: "refs/heads/master"

From 8c8e86c7b0826a16a583bac2c8b30f744156f105 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 12 Apr 2019 18:59:28 +0000
Subject: [PATCH 272/826] Reland "[infra] Temporarily remove broken front-end
 builder from the CQ"

This is a reland of b83baa02f360d98abcd03ca9c22f0d3a82825e1e

Original change's description:
> [infra] Temporarily remove broken front-end builder from the CQ
>
> TBR=whesse@google.com
>
> Change-Id: Ib6643e196ccb18718fbedbe5435e69877c16af1a
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/98351
> Reviewed-by: Alexander Thomas <athom@google.com>

Change-Id: Iae2c627dca6785439321fe68f8a392dc9044d53f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/99151
Reviewed-by: Vyacheslav Egorov <vegorov@google.com>
---
 commit-queue.cfg | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index b2cfc04fe6b2..9e97792e180d 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -66,7 +66,8 @@ config_groups {
       }
       builders {
         name: "dart/try/front-end-linux-release-x64-try"
-      }
+        experiment_percentage: 100
+       }
       builders {
         name: "dart/try/gclient-try"
       }

From 2bf00c20931e045ba17951170d295ccb1b0ec0f9 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 16 Apr 2019 15:07:17 +0000
Subject: [PATCH 273/826] Revert "Reland "[infra] Temporarily remove broken
 front-end builder from the CQ""

This reverts commit 8c8e86c7b0826a16a583bac2c8b30f744156f105.

Reason for revert: The builder is green on CI now.

Original change's description:
> Reland "[infra] Temporarily remove broken front-end builder from the CQ"
>
> This is a reland of b83baa02f360d98abcd03ca9c22f0d3a82825e1e
>
> Original change's description:
> > [infra] Temporarily remove broken front-end builder from the CQ
> >
> > TBR=whesse@google.com
> >
> > Change-Id: Ib6643e196ccb18718fbedbe5435e69877c16af1a
> > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/98351
> > Reviewed-by: Alexander Thomas <athom@google.com>
>
> Change-Id: Iae2c627dca6785439321fe68f8a392dc9044d53f
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/99151
> Reviewed-by: Vyacheslav Egorov <vegorov@google.com>

TBR=whesse@google.com,vegorov@google.com,athom@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: I0cbeccce7875395bab504b690972ac9005a12209
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/99468
Reviewed-by: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 9e97792e180d..b2cfc04fe6b2 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -66,8 +66,7 @@ config_groups {
       }
       builders {
         name: "dart/try/front-end-linux-release-x64-try"
-        experiment_percentage: 100
-       }
+      }
       builders {
         name: "dart/try/gclient-try"
       }

From 9ca7d1e35265b8ba2ef9d2eaf0c51e49a4cce70c Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 1 May 2019 12:50:46 +0000
Subject: [PATCH 274/826] [infra] Enroll the remaining front-end builders in
 the new workflow

Change-Id: If6c37695059b0d9e7aed9f4d81586b84b95bf407
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/100962
Reviewed-by: Jonas Termansen <sortie@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 8b14c565215f..131fba4b6ce2 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -269,9 +269,9 @@ buckets {
     builders { name: "ddc-win-release-chrome" mixins: "win" mixins: "new_workflow" }
     builders { name: "flutter-analyze" }
     builders { name: "flutter-frontend" }
-    builders { name: "flutter-engine-linux" mixins: "flutter" }
-    builders { name: "front-end-linux-release-x64" mixins: "clobber" }
-    builders { name: "front-end-mac-release-x64" mixins: "clobber" mixins: "mac" }
+    builders { name: "flutter-engine-linux" mixins: "flutter"}
+    builders { name: "front-end-linux-release-x64" mixins: "clobber" mixins: "new_workflow" }
+    builders { name: "front-end-mac-release-x64" mixins: "clobber" mixins: "mac" mixins: "new_workflow" }
     builders { name: "front-end-win-release-x64" mixins: "clobber" mixins: "win" mixins: "new_workflow" }
     builders { name: "gclient" mixins: "gclient" }
     builders { name: "pkg-linux-release" mixins: "new_workflow" }
@@ -355,9 +355,9 @@ buckets {
     builders { name: "ddc-linux-release-chrome-dev" mixins: "new_workflow" }
     builders { name: "ddc-mac-release-chrome-dev" mixins: "mac" mixins: "new_workflow" }
     builders { name: "ddc-win-release-chrome-dev" mixins: "win" mixins: "new_workflow" }
-    builders { name: "front-end-linux-release-x64-dev" mixins: "clobber" }
-    builders { name: "front-end-mac-release-x64-dev" mixins: "clobber" mixins: "mac" }
-    builders { name: "front-end-win-release-x64-dev" mixins: "clobber" mixins: "win" }
+    builders { name: "front-end-linux-release-x64-dev" mixins: "clobber" mixins: "new_workflow" }
+    builders { name: "front-end-mac-release-x64-dev" mixins: "clobber" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "front-end-win-release-x64-dev" mixins: "clobber" mixins: "win" mixins: "new_workflow" }
     builders { name: "gclient-dev" mixins: "gclient" }
     builders { name: "pkg-linux-release-dev" mixins: "new_workflow" }
     builders { name: "pkg-mac-release-dev" mixins: "mac" mixins: "new_workflow" }
@@ -439,9 +439,9 @@ buckets {
     builders { name: "ddc-linux-release-chrome-stable" mixins: "new_workflow" }
     builders { name: "ddc-mac-release-chrome-stable" mixins: "mac" mixins: "new_workflow" }
     builders { name: "ddc-win-release-chrome-stable" mixins: "win" mixins: "new_workflow" }
-    builders { name: "front-end-linux-release-x64-stable" mixins: "clobber" }
-    builders { name: "front-end-mac-release-x64-stable" mixins: "clobber" mixins: "mac" }
-    builders { name: "front-end-win-release-x64-stable" mixins: "clobber" mixins: "win" }
+    builders { name: "front-end-linux-release-x64-stable" mixins: "clobber" mixins: "new_workflow" }
+    builders { name: "front-end-mac-release-x64-stable" mixins: "clobber" mixins: "mac" mixins: "new_workflow" }
+    builders { name: "front-end-win-release-x64-stable" mixins: "clobber" mixins: "win" mixins: "new_workflow" }
     builders { name: "gclient-stable" mixins: "gclient" }
     builders { name: "pkg-linux-release-stable" mixins: "new_workflow" }
     builders { name: "pkg-mac-release-stable" mixins: "mac" mixins: "new_workflow" }
@@ -562,8 +562,8 @@ buckets {
     builders { name: "ddc-win-release-chrome-try" mixins: "win" mixins: "new_workflow" }
     builders { name: "flutter-analyze-try" }
     builders { name: "flutter-frontend-try" }
-    builders { name: "front-end-linux-release-x64-try" mixins: "clobber" }
-    builders { name: "front-end-mac-release-x64-try" mixins: "clobber" mixins: "mac" }
+    builders { name: "front-end-linux-release-x64-try" mixins: "clobber" mixins: "new_workflow" }
+    builders { name: "front-end-mac-release-x64-try" mixins: "clobber" mixins: "mac" mixins: "new_workflow" }
     builders { name: "front-end-win-release-x64-try" mixins: "clobber" mixins: "win" mixins: "new_workflow" }
     builders { name: "gclient-try" mixins: "gclient" }
     builders { name: "pkg-linux-release-try" mixins: "new_workflow" }

From 20a1103538249ceb59abae269969cc30efcd2f87 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 2 May 2019 07:08:42 +0000
Subject: [PATCH 275/826] [infra] Migrate Luci config to starlark

* Fixes inconsistencies discovered while converting to starlark.

To regenerate the config, run: ./main.star

Documentation for lucicfg is here:
https://chromium.googlesource.com/infra/luci/luci-go/+/refs/heads/master/lucicfg/doc/README.md

Change-Id: I7f8f033162cb1117215d6763575c7e8956ea710c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/99520
Reviewed-by: William Hesse <whesse@google.com>
---
 PRESUBMIT.py                 |   16 +-
 console-header.textpb        |   28 +
 cr-buildbucket.cfg           |   51 +-
 generated/commit-queue.cfg   |   98 +
 generated/cr-buildbucket.cfg | 7991 ++++++++++++++++++++++++++++++++++
 generated/luci-logdog.cfg    |    9 +
 generated/luci-milo.cfg      | 2072 +++++++++
 generated/luci-notify.cfg    | 1368 ++++++
 generated/luci-scheduler.cfg | 3050 +++++++++++++
 generated/project.cfg        |    8 +
 luci-milo.cfg                |  360 +-
 luci-notify.cfg              |  224 +-
 luci-scheduler.cfg           |   10 +-
 main.star                    |  738 ++++
 14 files changed, 15689 insertions(+), 334 deletions(-)
 create mode 100644 console-header.textpb
 create mode 100644 generated/commit-queue.cfg
 create mode 100644 generated/cr-buildbucket.cfg
 create mode 100644 generated/luci-logdog.cfg
 create mode 100644 generated/luci-milo.cfg
 create mode 100644 generated/luci-notify.cfg
 create mode 100644 generated/luci-scheduler.cfg
 create mode 100644 generated/project.cfg
 create mode 100755 main.star

diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 51b514c08fc1..9861fb0d818d 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -2,8 +2,20 @@
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
+
 def CheckChangeOnUpload(input_api, output_api):
-  return input_api.canned_checks.CheckChangedLUCIConfigs(input_api, output_api)
+    return _CommonChecks(input_api, output_api)
+
 
 def CheckChangeOnCommit(input_api, output_api):
-  return input_api.canned_checks.CheckChangedLUCIConfigs(input_api, output_api)
+    return _CommonChecks(input_api, output_api)
+
+
+def _CommonChecks(input_api, output_api):
+    tests = input_api.canned_checks.CheckLucicfgGenOutput(
+        input_api, output_api, "main.star")
+    results = []
+    results.extend(
+        input_api.canned_checks.CheckChangedLUCIConfigs(input_api, output_api))
+    results.extend(input_api.RunTests(tests))
+    return results
diff --git a/console-header.textpb b/console-header.textpb
new file mode 100644
index 000000000000..b6c4b8eed23f
--- /dev/null
+++ b/console-header.textpb
@@ -0,0 +1,28 @@
+links: {
+    name: "Consoles"
+    links: {
+        text: "Bleeding Edge console"
+        url: "/p/dart/g/be/console"
+        alt: "SDK BE Console"
+    }
+    links: {
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (alternative)"
+    }
+    links: {
+        text: "FYI console"
+        url: "/p/dart/g/fyi/console"
+        alt: "SDK FYI Console"
+    }
+    links: {
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+    }
+}
+console_groups: {
+    console_ids: "dart/flutter"
+    console_ids: "dart/flutter-hhh"
+}
+tree_status_host: "dart-status.appspot.com"
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 131fba4b6ce2..ffbe868cf28a 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -106,13 +106,6 @@ builder_mixins {
   }
 }
 
-builder_mixins {
-  name: "fyi"
-  recipe {
-    properties: "mastername:client.dart.fyi"
-  }
-}
-
 builder_mixins {
   name: "linearize"
   recipe {
@@ -148,14 +141,12 @@ builder_mixins {
 
 buckets {
   # CI Builders that require special permissions
-  name: "luci.dart.ci"
+  name: "ci"
   acl_sets: "ci"
 
   swarming {
     hostname: "chromium-swarm.appspot.com"
-    url_format: "https://ci.chromium.org/swarming/task/{task_id}"
     builder_defaults {
-      category: "Dart CI"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       build_numbers: YES
@@ -169,7 +160,6 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties: "clobber:true"
-        properties: "mastername:client.dart"
         name: "dart/neo"
       }
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -206,17 +196,15 @@ buckets {
 
 buckets {
   # CI Builders that only require try permissions
-  name: "luci.dart.ci.sandbox"
+  name: "ci.sandbox"
   acl_sets: "ci"
 
   swarming {
     hostname: "chromium-swarm.appspot.com"
-    url_format: "https://ci.chromium.org/swarming/task/{task_id}"
     builder_defaults {
-      category: "Dart CI (Sandboxed)"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:try"
       build_numbers: YES
       priority: 50
       swarming_tags: "vpython:native-python-wrapper"
@@ -228,7 +216,6 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties: "clobber:true"
-        properties: "mastername:client.dart"
         name: "dart/neo"
       }
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -260,7 +247,6 @@ buckets {
     builders { name: "dart2js-strong-mac-x64-chrome" mixins: "mac" mixins: "new_workflow" }
     builders { name: "dart2js-strong-mac-x64-safari" mixins: "mac" mixins: "new_workflow" }
     builders { name: "dart2js-strong-win-x64-chrome" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-win-x64-edge" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-win-x64-firefox" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-win-x64-ie11" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-unit-linux-x64-release" mixins: "new_workflow" }
@@ -303,9 +289,9 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64" mixins: "mac" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-debug-arm" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-release-arm" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-product-arm" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-debug-arm" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-release-arm" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-product-arm" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-android-release-arm" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm64" mixins: "new_workflow" }
@@ -348,7 +334,6 @@ buckets {
     builders { name: "dart2js-strong-mac-x64-chrome-dev" mixins: "mac" mixins: "new_workflow" }
     builders { name: "dart2js-strong-mac-x64-safari-dev" mixins: "mac" mixins: "new_workflow" }
     builders { name: "dart2js-strong-win-x64-chrome-dev" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-win-x64-edge-dev" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-win-x64-firefox-dev" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-win-x64-ie11-dev" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-unit-linux-x64-release-dev" mixins: "new_workflow" }
@@ -387,9 +372,9 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-dev" mixins: "mac" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-dev" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-dev" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-debug-arm-dev" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-release-arm-dev" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-product-arm-dev" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-debug-arm-dev" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-release-arm-dev" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-product-arm-dev" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-android-release-arm-dev" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm-dev" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm64-dev" mixins: "new_workflow" }
@@ -432,7 +417,6 @@ buckets {
     builders { name: "dart2js-strong-mac-x64-chrome-stable" mixins: "mac" mixins: "new_workflow" }
     builders { name: "dart2js-strong-mac-x64-safari-stable" mixins: "mac" mixins: "new_workflow" }
     builders { name: "dart2js-strong-win-x64-chrome-stable" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-win-x64-edge-stable" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-win-x64-firefox-stable" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-win-x64-ie11-stable" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-unit-linux-x64-release-stable" mixins: "new_workflow" }
@@ -471,9 +455,9 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-stable" mixins: "mac" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-stable" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-stable" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-debug-arm-stable" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-release-arm-stable" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-product-arm-stable" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-debug-arm-stable" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-release-arm-stable" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-product-arm-stable" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-android-release-arm-stable" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm-stable" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm64-stable" mixins: "new_workflow" }
@@ -502,14 +486,12 @@ buckets {
 }
 
 buckets {
-  name: "luci.dart.try"
+  name: "try"
   acl_sets: "try"
 
   swarming {
     hostname: "chromium-swarm.appspot.com"
-    url_format: "https://ci.chromium.org/swarming/task/{task_id}"
     builder_defaults {
-      category: "Dart Try"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       build_numbers: YES
@@ -523,7 +505,6 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties: "clobber:true"
-        properties: "mastername:dart.try"
         name: "dart/neo"
       }
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -594,9 +575,9 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-try" mixins: "mac" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-try" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-try" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-debug-arm-try" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-release-arm-try" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-product-arm-try" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-debug-arm-try" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-release-arm-try" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-product-arm-try" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-android-release-arm-try" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm-try" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm64-try" mixins: "new_workflow" }
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
new file mode 100644
index 000000000000..e14f992df8a0
--- /dev/null
+++ b/generated/commit-queue.cfg
@@ -0,0 +1,98 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see Config message:
+#   https://luci-config.appspot.com/schemas/projects:commit-queue.cfg
+
+submit_options: <
+  max_burst: 2
+  burst_delay: <
+    seconds: 480
+  >
+>
+config_groups: <
+  gerrit: <
+    url: "https://dart-review.googlesource.com"
+    projects: <
+      name: "sdk"
+      ref_regexp: "refs/heads/.+"
+    >
+  >
+  verifiers: <
+    gerrit_cq_ability: <
+      committer_list: "project-dart-committers"
+      dry_run_access_list: "project-dart-tryjob-access"
+      allow_submit_with_open_deps: true
+    >
+    tree_status: <
+      url: "https://dart-status.appspot.com"
+    >
+    tryjob: <
+      builders: <
+        name: "dart/try/analyzer-analysis-server-linux-try"
+      >
+      builders: <
+        name: "dart/try/analyzer-linux-release-try"
+      >
+      builders: <
+        name: "dart/try/benchmark-linux-try"
+      >
+      builders: <
+        name: "dart/try/dart-sdk-win-try"
+      >
+      builders: <
+        name: "dart/try/dart2js-minified-strong-linux-x64-d8-try"
+      >
+      builders: <
+        name: "dart/try/dart2js-strong-hostasserts-linux-ia32-d8-try"
+      >
+      builders: <
+        name: "dart/try/dart2js-strong-linux-x64-chrome-try"
+      >
+      builders: <
+        name: "dart/try/dart2js-unit-linux-x64-release-try"
+      >
+      builders: <
+        name: "dart/try/ddc-linux-release-chrome-try"
+      >
+      builders: <
+        name: "dart/try/flutter-analyze-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/pkg/analysis_server/.+"
+        location_regexp: ".+/[+]/pkg/analysis_server_client/.+"
+        location_regexp: ".+/[+]/pkg/analyzer/.+"
+        location_regexp: ".+/[+]/pkg/analyzer_plugin/.+"
+        location_regexp: ".+/[+]/pkg/front_end/.+"
+        location_regexp: ".+/[+]/pkg/meta/.+"
+        location_regexp: ".+/[+]/pkg/telemetry/.+"
+      >
+      builders: <
+        name: "dart/try/front-end-linux-release-x64-try"
+      >
+      builders: <
+        name: "dart/try/gclient-try"
+      >
+      builders: <
+        name: "dart/try/pkg-linux-release-try"
+      >
+      builders: <
+        name: "dart/try/vm-canary-linux-debug-try"
+      >
+      builders: <
+        name: "dart/try/vm-kernel-linux-product-x64-try"
+      >
+      builders: <
+        name: "dart/try/vm-kernel-linux-release-simdbc64-try"
+      >
+      builders: <
+        name: "dart/try/vm-kernel-linux-release-x64-try"
+      >
+      builders: <
+        name: "dart/try/vm-kernel-mac-release-x64-try"
+        experiment_percentage: 5
+      >
+      retry_config: <
+      >
+    >
+  >
+>
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
new file mode 100644
index 000000000000..c38f63dd0b05
--- /dev/null
+++ b/generated/cr-buildbucket.cfg
@@ -0,0 +1,7991 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see BuildbucketCfg message:
+#   https://luci-config.appspot.com/schemas/projects:buildbucket.cfg
+
+buckets: <
+  name: "ci"
+  acls: <
+    group: "all"
+  >
+  acls: <
+    role: SCHEDULER
+    identity: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+  >
+  acls: <
+    role: SCHEDULER
+    identity: "user:luci-scheduler@appspot.gserviceaccount.com"
+  >
+  acls: <
+    role: SCHEDULER
+    group: "project-dart-admins"
+  >
+  swarming: <
+    builders: <
+      name: "base"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      recipe: <
+        name: "dart/forward_branch"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "chocolatey"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      recipe: <
+        name: "dart/chocolatey"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "co19-roller"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      recipe: <
+        name: "dart/package_co19"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart-sdk-linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart-sdk-linux-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart-sdk-linux-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart-sdk-mac"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart-sdk-mac-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart-sdk-mac-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart-sdk-win"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart-sdk-win-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart-sdk-win-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "debianpackage-linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "debianpackage-linux-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "debianpackage-linux-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "docker"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      recipe: <
+        name: "dart/docker"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "google"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      recipe: <
+        name: "dart/external"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "linearize-flutter"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      recipe: <
+        name: "dart/linearize"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "repo:\"https://dart.googlesource.com/linear_sdk_flutter_engine.git\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "versionchecker-linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "versionchecker-linux-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "versionchecker-linux-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+  >
+>
+buckets: <
+  name: "ci.sandbox"
+  acls: <
+    group: "all"
+  >
+  acls: <
+    role: SCHEDULER
+    identity: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+  >
+  acls: <
+    role: SCHEDULER
+    identity: "user:luci-scheduler@appspot.gserviceaccount.com"
+  >
+  acls: <
+    role: SCHEDULER
+    group: "project-dart-admins"
+  >
+  swarming: <
+    builders: <
+      name: "analyzer-analysis-server-linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-analysis-server-linux-analyzer-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-analysis-server-linux-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-analysis-server-linux-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-linux-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-linux-release-analyzer-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-linux-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-linux-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-mac-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-mac-release-analyzer-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-mac-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-mac-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-win-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-win-release-analyzer-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-win-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-win-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "app-kernel-linux-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "app-kernel-linux-debug-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "app-kernel-linux-debug-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "app-kernel-linux-product-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "app-kernel-linux-product-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "app-kernel-linux-product-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "app-kernel-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "app-kernel-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "app-kernel-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "cross-vm-linux-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "cross-vm-linux-release-arm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "cross-vm-linux-release-arm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-csp-minified-linux-x64-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-csp-minified-linux-x64-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-csp-minified-linux-x64-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-minified-strong-linux-x64-d8"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-minified-strong-linux-x64-d8-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-minified-strong-linux-x64-d8-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-hostasserts-linux-ia32-d8"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-linux-x64-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-linux-x64-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-linux-x64-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-linux-x64-firefox"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-linux-x64-firefox-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-linux-x64-firefox-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-mac-x64-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-mac-x64-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-mac-x64-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-mac-x64-safari"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-mac-x64-safari-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-mac-x64-safari-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-firefox"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-firefox-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-firefox-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-ie11"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-ie11-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-ie11-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-unit-linux-x64-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-unit-linux-x64-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-unit-linux-x64-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-linux-release-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-linux-release-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-linux-release-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-mac-release-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-mac-release-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-mac-release-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-win-release-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-win-release-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-win-release-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "flutter-analyze"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "flutter-engine-linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/flutter_engine"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "flutter-frontend"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-mac-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-mac-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-mac-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-win-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-win-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-win-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "fuzz-linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "gclient"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/gclient"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "gclient-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/gclient"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "gclient-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/gclient"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-linux-debug"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-linux-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-linux-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-linux-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-mac-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-mac-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-mac-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-win-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-win-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-win-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-canary-linux-debug"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-canary-linux-debug-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-canary-linux-debug-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-debug-simarm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-debug-simarm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-debug-simarm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-debug-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-debug-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-product-simarm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-product-simarm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-product-simarm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-product-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-product-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-product-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-release-simarm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-release-simarm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-release-simarm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-debug-arm"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-debug-arm-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-debug-arm-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-product-arm"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-product-arm-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-product-arm-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-release-arm"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-release-arm-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-release-arm-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-asan-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-asan-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-asan-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-checked-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-checked-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-checked-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-debug-ia32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-debug-ia32-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-debug-ia32-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-debug-simdbc64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-debug-simdbc64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-debug-simdbc64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-debug-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-debug-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-product-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-product-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-product-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-ia32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-ia32-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-ia32-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-simarm"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-simarm-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-simarm-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-simarm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-simarm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-simarm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-simdbc64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-simdbc64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-simdbc64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-debug-simdbc64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-debug-simdbc64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-debug-simdbc64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-debug-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-debug-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-product-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-product-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-product-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-release-simdbc64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-release-simdbc64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-release-simdbc64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-optcounter-threshold-linux-release-ia32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-optcounter-threshold-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-android-release-arm"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "shard_timeout:5400"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-android-release-arm-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "shard_timeout:5400"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-android-release-arm-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "shard_timeout:5400"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-simarm"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-simarm-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-simarm-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-simarm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-debug-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-debug-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-product-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-product-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-product-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-release-simarm"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-release-simarm-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-release-simarm-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-release-simarm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-release-simarm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-release-simarm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-mac-release-simarm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-mac-release-simarm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-mac-release-simarm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-win-release-simarm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-win-release-simarm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-win-release-simarm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-win-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-win-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-win-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-linux-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-linux-debug-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-linux-debug-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-mac-debug-simdbc64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-mac-debug-simdbc64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-mac-debug-simdbc64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-mac-release-simdbc64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-mac-release-simdbc64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-mac-release-simdbc64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-rollback-linux-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-rollback-linux-debug-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-rollback-linux-debug-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-rollback-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-rollback-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-rollback-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-debug-ia32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-debug-ia32-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-debug-ia32-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-debug-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-debug-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-product-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-product-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-product-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-release-ia32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-release-ia32-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-release-ia32-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+  >
+>
+buckets: <
+  name: "try"
+  acls: <
+    group: "all"
+  >
+  acls: <
+    role: SCHEDULER
+    group: "project-dart-admins"
+  >
+  acls: <
+    role: SCHEDULER
+    group: "project-dart-tryjob-access"
+  >
+  acls: <
+    role: SCHEDULER
+    group: "service-account-cq"
+  >
+  swarming: <
+    builders: <
+      name: "analyzer-analysis-server-linux-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-linux-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-mac-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-win-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "app-kernel-linux-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "app-kernel-linux-product-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "app-kernel-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "benchmark-linux-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "cl-linux-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "cl-mac-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "cl-win-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart-sdk-linux-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart-sdk-mac-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart-sdk-win-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-csp-minified-linux-x64-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-minified-strong-linux-x64-d8-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-hostasserts-linux-ia32-d8-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-linux-x64-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-linux-x64-firefox-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-mac-x64-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-mac-x64-safari-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-firefox-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-ie11-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-unit-linux-x64-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-linux-release-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-mac-release-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-win-release-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "flutter-analyze-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "flutter-frontend-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-mac-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-win-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "gclient-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/gclient"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-linux-debug-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-linux-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-mac-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-win-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-canary-linux-debug-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-debug-simarm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-product-simarm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-product-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-release-simarm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-debug-arm-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-product-arm-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-release-arm-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-asan-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-checked-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-debug-ia32-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-debug-simdbc64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-product-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-ia32-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-simarm-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-simarm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-simdbc64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-debug-simdbc64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-product-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-release-simdbc64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-optcounter-threshold-linux-release-ia32-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-optcounter-threshold-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-android-release-arm-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "shard_timeout:5400"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-simarm-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-simarm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-product-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-release-simarm-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-release-simarm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-mac-release-simarm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-win-release-simarm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-win-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-linux-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-mac-debug-simdbc64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-mac-release-simdbc64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-rollback-linux-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-rollback-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-debug-ia32-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-product-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-release-ia32-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+  >
+>
diff --git a/generated/luci-logdog.cfg b/generated/luci-logdog.cfg
new file mode 100644
index 000000000000..adc75bef4980
--- /dev/null
+++ b/generated/luci-logdog.cfg
@@ -0,0 +1,9 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see ProjectConfig message:
+#   https://luci-config.appspot.com/schemas/projects:luci-logdog.cfg
+
+reader_auth_groups: "all"
+writer_auth_groups: "luci-logdog-chromium-writers"
+archive_gs_bucket: "chromium-luci-logdog"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
new file mode 100644
index 000000000000..b08510b1d050
--- /dev/null
+++ b/generated/luci-milo.cfg
@@ -0,0 +1,2072 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see Project message:
+#   https://luci-config.appspot.com/schemas/projects:luci-milo.cfg
+
+consoles: <
+  id: "analyzer-stable"
+  name: "SDK Analyzer Stable Branch Console"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/analyzer-stable"
+  manifest_name: "REVISION"
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-analyzer-stable"
+    category: "analyzer"
+    short_name: "as"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-analyzer-stable"
+    category: "analyzer"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-analyzer-stable"
+    category: "analyzer"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-analyzer-stable"
+    category: "analyzer"
+    short_name: "w"
+  >
+  header: <
+    links: <
+      name: "Consoles"
+      links: <
+        text: "Bleeding Edge console"
+        url: "/p/dart/g/be/console"
+        alt: "SDK BE Console"
+      >
+      links: <
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (alternative)"
+      >
+      links: <
+        text: "FYI console"
+        url: "/p/dart/g/fyi/console"
+        alt: "SDK FYI Console"
+      >
+      links: <
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      >
+    >
+    console_groups: <
+      console_ids: "dart/flutter"
+      console_ids: "dart/flutter-hhh"
+    >
+    tree_status_host: "dart-status.appspot.com"
+  >
+>
+consoles: <
+  id: "be"
+  name: "SDK Bleeding Edge Console"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
+    category: "fasta"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
+    category: "fasta"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
+    category: "fasta"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
+    category: "fasta"
+    short_name: "fl"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
+    category: "flutter"
+    short_name: "3H"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
+    category: "vm|app-kernel"
+    short_name: "d64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64"
+    category: "vm|app-kernel"
+    short_name: "p64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64"
+    category: "vm|app-kernel"
+    short_name: "r64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-simarm64"
+    category: "vm|dartkb"
+    short_name: "sd"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64"
+    category: "vm|dartkb"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-simarm64"
+    category: "vm|dartkb"
+    short_name: "sp"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-x64"
+    category: "vm|dartkb"
+    short_name: "p"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64"
+    category: "vm|dartkb"
+    short_name: "sr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64"
+    category: "vm|dartkb"
+    short_name: "r"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
+    category: "vm|kernel"
+    short_name: "c"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
+    category: "vm|kernel"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64"
+    category: "vm|kernel"
+    short_name: "dbc"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
+    category: "vm|kernel"
+    short_name: "a32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
+    category: "vm|kernel"
+    short_name: "a64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64"
+    category: "vm|kernel"
+    short_name: "rbc"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32"
+    category: "vm|kernel"
+    short_name: "r32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "r"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "rc"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32"
+    category: "vm|kernel"
+    short_name: "d32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-simdbc64"
+    category: "vm|kernel"
+    short_name: "mds"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-simdbc64"
+    category: "vm|kernel"
+    short_name: "mrs"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
+    category: "vm|kernel"
+    short_name: "md"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
+    category: "vm|kernel"
+    short_name: "mr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
+    category: "vm|kernel"
+    short_name: "wd3"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64"
+    category: "vm|kernel"
+    short_name: "wd"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32"
+    category: "vm|kernel"
+    short_name: "wr3"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
+    category: "vm|kernel"
+    short_name: "wr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
+    category: "vm|kernel"
+    short_name: "cra"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm"
+    category: "vm|kernel-precomp"
+    short_name: "and"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
+    category: "vm|kernel-precomp"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
+    category: "vm|kernel-precomp"
+    short_name: "p"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
+    category: "vm|kernel-precomp"
+    short_name: "a32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "a64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
+    category: "vm|kernel-precomp"
+    short_name: "r"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-x64"
+    category: "vm|kernel-precomp"
+    short_name: "br"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm"
+    category: "vm|kernel-precomp"
+    short_name: "bra32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "bra64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
+    category: "vm|kernel-precomp"
+    short_name: "o"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "ma"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "wa"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
+    category: "vm|kernel-precomp"
+    short_name: "wr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "a64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
+    category: "vm|misc"
+    short_name: "o32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
+    category: "vm|misc"
+    short_name: "o64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
+    category: "vm|product"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
+    category: "vm|product"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
+    category: "vm|product"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
+    category: "vm|reload-kernel"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
+    category: "vm|reload-kernel"
+    short_name: "r"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-debug-simdbc64"
+    category: "vm|reload-kernel"
+    short_name: "md"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64"
+    category: "vm|reload-kernel"
+    short_name: "mr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
+    category: "vm|reload-kernel"
+    short_name: "drb"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64"
+    category: "vm|reload-kernel"
+    short_name: "rrb"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
+    category: "vm|ffi"
+    short_name: "d32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm"
+    category: "vm|ffi"
+    short_name: "r32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm"
+    category: "vm|ffi"
+    short_name: "p32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
+    category: "dart2js|d8"
+    short_name: "ha"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
+    category: "dart2js|d8"
+    short_name: "mi"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
+    category: "dart2js|d8"
+    short_name: "u"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "csp"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
+    category: "dart2js|safari"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11"
+    category: "dart2js|ms"
+    short_name: "ie"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
+    category: "analyzer"
+    short_name: "fa"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
+    category: "analyzer"
+    short_name: "as"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
+    category: "analyzer"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
+    category: "analyzer"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
+    category: "analyzer"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/dart-sdk-linux"
+    category: "sdk"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac"
+    category: "sdk"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/dart-sdk-win"
+    category: "sdk"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
+    category: "ddc"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
+    category: "ddc"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
+    category: "ddc"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
+    category: "pkg"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
+    category: "pkg"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
+    category: "pkg"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
+    category: "pkg"
+    short_name: "ld"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/gclient"
+    category: "misc"
+    short_name: "g"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/debianpackage-linux"
+    category: "misc"
+    short_name: "dp"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/versionchecker-linux"
+    category: "misc"
+    short_name: "vc"
+  >
+  header: <
+    links: <
+      name: "Consoles"
+      links: <
+        text: "Bleeding Edge console"
+        url: "/p/dart/g/be/console"
+        alt: "SDK BE Console"
+      >
+      links: <
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (alternative)"
+      >
+      links: <
+        text: "FYI console"
+        url: "/p/dart/g/fyi/console"
+        alt: "SDK FYI Console"
+      >
+      links: <
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      >
+    >
+    console_groups: <
+      console_ids: "dart/flutter"
+      console_ids: "dart/flutter-hhh"
+    >
+    tree_status_host: "dart-status.appspot.com"
+  >
+>
+consoles: <
+  id: "alt"
+  name: "SDK Bleeding Edge Console (alternative)"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
+    category: "fasta"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
+    category: "fasta"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
+    category: "fasta"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
+    category: "fasta"
+    short_name: "fl"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
+    category: "flutter"
+    short_name: "3H"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
+    category: "dart2js|d8"
+    short_name: "ha"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
+    category: "dart2js|d8"
+    short_name: "mi"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
+    category: "dart2js|d8"
+    short_name: "u"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "csp"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
+    category: "dart2js|safari"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11"
+    category: "dart2js|ms"
+    short_name: "ie"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
+    category: "analyzer"
+    short_name: "fa"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
+    category: "analyzer"
+    short_name: "as"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
+    category: "analyzer"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
+    category: "analyzer"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
+    category: "analyzer"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/dart-sdk-linux"
+    category: "sdk"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac"
+    category: "sdk"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/dart-sdk-win"
+    category: "sdk"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
+    category: "ddc"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
+    category: "ddc"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
+    category: "ddc"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
+    category: "pkg"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
+    category: "pkg"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
+    category: "pkg"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
+    category: "pkg"
+    short_name: "ld"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/gclient"
+    category: "misc"
+    short_name: "g"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/debianpackage-linux"
+    category: "misc"
+    short_name: "dp"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/versionchecker-linux"
+    category: "misc"
+    short_name: "vc"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
+    category: "vm|app-kernel"
+    short_name: "d64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64"
+    category: "vm|app-kernel"
+    short_name: "p64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64"
+    category: "vm|app-kernel"
+    short_name: "r64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-simarm64"
+    category: "vm|dartkb"
+    short_name: "sd"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64"
+    category: "vm|dartkb"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-simarm64"
+    category: "vm|dartkb"
+    short_name: "sp"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-x64"
+    category: "vm|dartkb"
+    short_name: "p"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64"
+    category: "vm|dartkb"
+    short_name: "sr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64"
+    category: "vm|dartkb"
+    short_name: "r"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
+    category: "vm|kernel"
+    short_name: "c"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
+    category: "vm|kernel"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64"
+    category: "vm|kernel"
+    short_name: "dbc"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
+    category: "vm|kernel"
+    short_name: "a32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
+    category: "vm|kernel"
+    short_name: "a64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64"
+    category: "vm|kernel"
+    short_name: "rbc"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32"
+    category: "vm|kernel"
+    short_name: "r32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "r"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "rc"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32"
+    category: "vm|kernel"
+    short_name: "d32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-simdbc64"
+    category: "vm|kernel"
+    short_name: "mds"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-simdbc64"
+    category: "vm|kernel"
+    short_name: "mrs"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
+    category: "vm|kernel"
+    short_name: "md"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
+    category: "vm|kernel"
+    short_name: "mr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
+    category: "vm|kernel"
+    short_name: "wd3"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64"
+    category: "vm|kernel"
+    short_name: "wd"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32"
+    category: "vm|kernel"
+    short_name: "wr3"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
+    category: "vm|kernel"
+    short_name: "wr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
+    category: "vm|kernel"
+    short_name: "cra"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm"
+    category: "vm|kernel-precomp"
+    short_name: "and"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
+    category: "vm|kernel-precomp"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
+    category: "vm|kernel-precomp"
+    short_name: "p"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
+    category: "vm|kernel-precomp"
+    short_name: "a32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "a64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
+    category: "vm|kernel-precomp"
+    short_name: "r"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-x64"
+    category: "vm|kernel-precomp"
+    short_name: "br"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm"
+    category: "vm|kernel-precomp"
+    short_name: "bra32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "bra64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
+    category: "vm|kernel-precomp"
+    short_name: "o"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "ma"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "wa"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
+    category: "vm|kernel-precomp"
+    short_name: "wr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "a64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
+    category: "vm|misc"
+    short_name: "o32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
+    category: "vm|misc"
+    short_name: "o64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
+    category: "vm|product"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
+    category: "vm|product"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
+    category: "vm|product"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
+    category: "vm|reload-kernel"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
+    category: "vm|reload-kernel"
+    short_name: "r"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-debug-simdbc64"
+    category: "vm|reload-kernel"
+    short_name: "md"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64"
+    category: "vm|reload-kernel"
+    short_name: "mr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
+    category: "vm|reload-kernel"
+    short_name: "drb"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64"
+    category: "vm|reload-kernel"
+    short_name: "rrb"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
+    category: "vm|ffi"
+    short_name: "d32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm"
+    category: "vm|ffi"
+    short_name: "r32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm"
+    category: "vm|ffi"
+    short_name: "p32"
+  >
+  header: <
+    links: <
+      name: "Consoles"
+      links: <
+        text: "Bleeding Edge console"
+        url: "/p/dart/g/be/console"
+        alt: "SDK BE Console"
+      >
+      links: <
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (alternative)"
+      >
+      links: <
+        text: "FYI console"
+        url: "/p/dart/g/fyi/console"
+        alt: "SDK FYI Console"
+      >
+      links: <
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      >
+    >
+    console_groups: <
+      console_ids: "dart/flutter"
+      console_ids: "dart/flutter-hhh"
+    >
+    tree_status_host: "dart-status.appspot.com"
+  >
+>
+consoles: <
+  id: "dev"
+  name: "SDK Dev Console"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/dev"
+  manifest_name: "REVISION"
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-dev"
+    category: "fasta"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-dev"
+    category: "fasta"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-dev"
+    category: "fasta"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-dev"
+    category: "vm|app-kernel"
+    short_name: "d64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64-dev"
+    category: "vm|app-kernel"
+    short_name: "p64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-dev"
+    category: "vm|app-kernel"
+    short_name: "r64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-simarm64-dev"
+    category: "vm|dartkb"
+    short_name: "sd"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64-dev"
+    category: "vm|dartkb"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-simarm64-dev"
+    category: "vm|dartkb"
+    short_name: "sp"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-x64-dev"
+    category: "vm|dartkb"
+    short_name: "p"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64-dev"
+    category: "vm|dartkb"
+    short_name: "sr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-dev"
+    category: "vm|dartkb"
+    short_name: "r"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-dev"
+    category: "vm|kernel"
+    short_name: "c"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-dev"
+    category: "vm|kernel"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64-dev"
+    category: "vm|kernel"
+    short_name: "dbc"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-dev"
+    category: "vm|kernel"
+    short_name: "a32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-dev"
+    category: "vm|kernel"
+    short_name: "a64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64-dev"
+    category: "vm|kernel"
+    short_name: "rbc"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32-dev"
+    category: "vm|kernel"
+    short_name: "r32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-dev"
+    category: "vm|kernel"
+    short_name: "r"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-dev"
+    category: "vm|kernel"
+    short_name: "rc"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32-dev"
+    category: "vm|kernel"
+    short_name: "d32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-simdbc64-dev"
+    category: "vm|kernel"
+    short_name: "mds"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-simdbc64-dev"
+    category: "vm|kernel"
+    short_name: "mrs"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-dev"
+    category: "vm|kernel"
+    short_name: "md"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-dev"
+    category: "vm|kernel"
+    short_name: "mr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32-dev"
+    category: "vm|kernel"
+    short_name: "wd3"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-dev"
+    category: "vm|kernel"
+    short_name: "wd"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32-dev"
+    category: "vm|kernel"
+    short_name: "wr3"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-dev"
+    category: "vm|kernel"
+    short_name: "wr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-dev"
+    category: "vm|kernel"
+    short_name: "cra"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm-dev"
+    category: "vm|kernel-precomp"
+    short_name: "and"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "p"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-dev"
+    category: "vm|kernel-precomp"
+    short_name: "a32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "a64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "r"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-x64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "br"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm-dev"
+    category: "vm|kernel-precomp"
+    short_name: "bra32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "bra64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "o"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "ma"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-simarm64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "wa"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "wr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-dev"
+    category: "vm|misc"
+    short_name: "a64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32-dev"
+    category: "vm|misc"
+    short_name: "o32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-dev"
+    category: "vm|misc"
+    short_name: "o64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64-dev"
+    category: "vm|product"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64-dev"
+    category: "vm|product"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64-dev"
+    category: "vm|product"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64-dev"
+    category: "vm|reload-kernel"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64-dev"
+    category: "vm|reload-kernel"
+    short_name: "r"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-debug-simdbc64-dev"
+    category: "vm|reload-kernel"
+    short_name: "md"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64-dev"
+    category: "vm|reload-kernel"
+    short_name: "mr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64-dev"
+    category: "vm|reload-kernel"
+    short_name: "drb"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64-dev"
+    category: "vm|reload-kernel"
+    short_name: "rrb"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-dev"
+    category: "vm|ffi"
+    short_name: "d32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-dev"
+    category: "vm|ffi"
+    short_name: "r32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-dev"
+    category: "vm|ffi"
+    short_name: "p32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-dev"
+    category: "dart2js|d8"
+    short_name: "ha"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-dev"
+    category: "dart2js|d8"
+    short_name: "mi"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-dev"
+    category: "dart2js|d8"
+    short_name: "u"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-dev"
+    category: "dart2js|chrome"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-dev"
+    category: "dart2js|chrome"
+    short_name: "csp"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-dev"
+    category: "dart2js|chrome"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-dev"
+    category: "dart2js|chrome"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-dev"
+    category: "dart2js|firefox"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox-dev"
+    category: "dart2js|firefox"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-dev"
+    category: "dart2js|safari"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11-dev"
+    category: "dart2js|ms"
+    short_name: "ie"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-dev"
+    category: "analyzer"
+    short_name: "as"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-dev"
+    category: "analyzer"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-dev"
+    category: "analyzer"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-dev"
+    category: "analyzer"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/dart-sdk-linux-dev"
+    category: "sdk"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-dev"
+    category: "sdk"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/dart-sdk-win-dev"
+    category: "sdk"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-dev"
+    category: "ddc"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-dev"
+    category: "ddc"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-dev"
+    category: "ddc"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
+    category: "pkg"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-dev"
+    category: "pkg"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-dev"
+    category: "pkg"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/gclient-dev"
+    category: "misc"
+    short_name: "g"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/debianpackage-linux-dev"
+    category: "misc"
+    short_name: "dp"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/versionchecker-linux-dev"
+    category: "misc"
+    short_name: "vc"
+  >
+  header: <
+    links: <
+      name: "Consoles"
+      links: <
+        text: "Bleeding Edge console"
+        url: "/p/dart/g/be/console"
+        alt: "SDK BE Console"
+      >
+      links: <
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (alternative)"
+      >
+      links: <
+        text: "FYI console"
+        url: "/p/dart/g/fyi/console"
+        alt: "SDK FYI Console"
+      >
+      links: <
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      >
+    >
+    console_groups: <
+      console_ids: "dart/flutter"
+      console_ids: "dart/flutter-hhh"
+    >
+    tree_status_host: "dart-status.appspot.com"
+  >
+>
+consoles: <
+  id: "stable"
+  name: "SDK Stable Console"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/stable"
+  manifest_name: "REVISION"
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-stable"
+    category: "fasta"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-stable"
+    category: "fasta"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-stable"
+    category: "fasta"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-stable"
+    category: "vm|app-kernel"
+    short_name: "d64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64-stable"
+    category: "vm|app-kernel"
+    short_name: "p64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-stable"
+    category: "vm|app-kernel"
+    short_name: "r64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-simarm64-stable"
+    category: "vm|dartkb"
+    short_name: "sd"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64-stable"
+    category: "vm|dartkb"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-simarm64-stable"
+    category: "vm|dartkb"
+    short_name: "sp"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-x64-stable"
+    category: "vm|dartkb"
+    short_name: "p"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64-stable"
+    category: "vm|dartkb"
+    short_name: "sr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-stable"
+    category: "vm|dartkb"
+    short_name: "r"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-stable"
+    category: "vm|kernel"
+    short_name: "c"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-stable"
+    category: "vm|kernel"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64-stable"
+    category: "vm|kernel"
+    short_name: "dbc"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-stable"
+    category: "vm|kernel"
+    short_name: "a32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-stable"
+    category: "vm|kernel"
+    short_name: "a64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64-stable"
+    category: "vm|kernel"
+    short_name: "rbc"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32-stable"
+    category: "vm|kernel"
+    short_name: "r32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-stable"
+    category: "vm|kernel"
+    short_name: "r"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-stable"
+    category: "vm|kernel"
+    short_name: "rc"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32-stable"
+    category: "vm|kernel"
+    short_name: "d32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-simdbc64-stable"
+    category: "vm|kernel"
+    short_name: "mds"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-simdbc64-stable"
+    category: "vm|kernel"
+    short_name: "mrs"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-stable"
+    category: "vm|kernel"
+    short_name: "md"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-stable"
+    category: "vm|kernel"
+    short_name: "mr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32-stable"
+    category: "vm|kernel"
+    short_name: "wd3"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-stable"
+    category: "vm|kernel"
+    short_name: "wd"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32-stable"
+    category: "vm|kernel"
+    short_name: "wr3"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-stable"
+    category: "vm|kernel"
+    short_name: "wr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-stable"
+    category: "vm|kernel"
+    short_name: "cra"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm-stable"
+    category: "vm|kernel-precomp"
+    short_name: "and"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "p"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-stable"
+    category: "vm|kernel-precomp"
+    short_name: "a32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "a64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "r"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "br"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm-stable"
+    category: "vm|kernel-precomp"
+    short_name: "bra32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "bra64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "o"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "ma"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-simarm64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "wa"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "wr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-stable"
+    category: "vm|misc"
+    short_name: "a64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32-stable"
+    category: "vm|misc"
+    short_name: "o32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-stable"
+    category: "vm|misc"
+    short_name: "o64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64-stable"
+    category: "vm|product"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64-stable"
+    category: "vm|product"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64-stable"
+    category: "vm|product"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64-stable"
+    category: "vm|reload-kernel"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64-stable"
+    category: "vm|reload-kernel"
+    short_name: "r"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-debug-simdbc64-stable"
+    category: "vm|reload-kernel"
+    short_name: "md"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64-stable"
+    category: "vm|reload-kernel"
+    short_name: "mr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64-stable"
+    category: "vm|reload-kernel"
+    short_name: "drb"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64-stable"
+    category: "vm|reload-kernel"
+    short_name: "rrb"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-stable"
+    category: "vm|ffi"
+    short_name: "d32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-stable"
+    category: "vm|ffi"
+    short_name: "r32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-stable"
+    category: "vm|ffi"
+    short_name: "p32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-stable"
+    category: "dart2js|d8"
+    short_name: "ha"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-stable"
+    category: "dart2js|d8"
+    short_name: "mi"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-stable"
+    category: "dart2js|d8"
+    short_name: "u"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "csp"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-stable"
+    category: "dart2js|firefox"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox-stable"
+    category: "dart2js|firefox"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-stable"
+    category: "dart2js|safari"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11-stable"
+    category: "dart2js|ms"
+    short_name: "ie"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-stable"
+    category: "analyzer"
+    short_name: "as"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-stable"
+    category: "analyzer"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-stable"
+    category: "analyzer"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-stable"
+    category: "analyzer"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/dart-sdk-linux-stable"
+    category: "sdk"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-stable"
+    category: "sdk"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/dart-sdk-win-stable"
+    category: "sdk"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-stable"
+    category: "ddc"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-stable"
+    category: "ddc"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-stable"
+    category: "ddc"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
+    category: "pkg"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-stable"
+    category: "pkg"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-stable"
+    category: "pkg"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/gclient-stable"
+    category: "misc"
+    short_name: "g"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/debianpackage-linux-stable"
+    category: "misc"
+    short_name: "dp"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/versionchecker-linux-stable"
+    category: "misc"
+    short_name: "vc"
+  >
+  header: <
+    links: <
+      name: "Consoles"
+      links: <
+        text: "Bleeding Edge console"
+        url: "/p/dart/g/be/console"
+        alt: "SDK BE Console"
+      >
+      links: <
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (alternative)"
+      >
+      links: <
+        text: "FYI console"
+        url: "/p/dart/g/fyi/console"
+        alt: "SDK FYI Console"
+      >
+      links: <
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      >
+    >
+    console_groups: <
+      console_ids: "dart/flutter"
+      console_ids: "dart/flutter-hhh"
+    >
+    tree_status_host: "dart-status.appspot.com"
+  >
+>
+consoles: <
+  id: "flutter"
+  name: "Dart/Flutter Console"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
+    category: "analyzer"
+    short_name: "fa"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
+    category: "fasta"
+    short_name: "fl"
+  >
+>
+consoles: <
+  id: "flutter-hhh"
+  name: "Dart/Flutter Linear History Console"
+  repo_url: "https://dart.googlesource.com/linear_sdk_flutter_engine"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
+    category: "flutter"
+    short_name: "3H"
+  >
+>
+consoles: <
+  id: "fyi"
+  name: "SDK FYI Console"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
+  builders: <
+    name: "buildbucket/luci.dart.ci/google"
+    category: "external"
+    short_name: "g"
+  >
+>
+consoles: <
+  id: "cq"
+  name: "SDK CQ Console"
+  builders: <
+    name: "buildbucket/luci.dart.try/front-end-linux-release-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simdbc64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-mac-release-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-product-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/dart2js-strong-hostasserts-linux-ia32-d8-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/dart2js-minified-strong-linux-x64-d8-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/dart2js-unit-linux-x64-release-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-chrome-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/flutter-analyze-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/analyzer-analysis-server-linux-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/analyzer-linux-release-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/dart-sdk-win-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/ddc-linux-release-chrome-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/pkg-linux-release-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/gclient-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/benchmark-linux-try"
+  >
+  builder_view_only: true
+>
+logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
new file mode 100644
index 000000000000..ba7d8586d9b8
--- /dev/null
+++ b/generated/luci-notify.cfg
@@ -0,0 +1,1368 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see ProjectConfig message:
+#   https://luci-config.appspot.com/schemas/projects:luci-notify.cfg
+
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    >
+  >
+  builders: <
+    bucket: "ci"
+    name: "base"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci"
+    name: "dart-sdk-linux"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci"
+    name: "dart-sdk-mac"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci"
+    name: "dart-sdk-win"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    >
+  >
+  builders: <
+    bucket: "ci"
+    name: "debianpackage-linux"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    >
+  >
+  builders: <
+    bucket: "ci"
+    name: "linearize-flutter"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci"
+    name: "versionchecker-linux"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "analyzer-analysis-server-linux"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "analyzer-linux-release"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "analyzer-mac-release"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "analyzer-win-release"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "app-kernel-linux-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "app-kernel-linux-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "app-kernel-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "cross-vm-linux-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "dart2js-csp-minified-linux-x64-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "dart2js-minified-strong-linux-x64-d8"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "dart2js-strong-hostasserts-linux-ia32-d8"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "dart2js-strong-linux-x64-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "dart2js-strong-linux-x64-firefox"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "dart2js-strong-mac-x64-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "dart2js-strong-mac-x64-safari"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "dart2js-strong-win-x64-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "dart2js-strong-win-x64-firefox"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "dart2js-strong-win-x64-ie11"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "dart2js-unit-linux-x64-release"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "ddc-linux-release-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "ddc-mac-release-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "ddc-win-release-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "flutter-engine-linux"
+    repository: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "front-end-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "front-end-mac-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "front-end-win-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_success: true
+    on_failure: true
+    email: <
+      recipients: "ajcbik@google.com"
+      recipients: "athom@google.com"
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "fuzz-linux"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "gclient"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "pkg-linux-debug"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "pkg-linux-release"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "pkg-mac-release"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "pkg-win-release"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-canary-linux-debug"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-dartkb-linux-debug-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-dartkb-linux-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-dartkb-linux-product-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-dartkb-linux-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-dartkb-linux-release-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-dartkb-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-ffi-android-debug-arm"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-ffi-android-product-arm"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-ffi-android-release-arm"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-asan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-checked-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-debug-ia32"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-debug-simdbc64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-release-ia32"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-release-simarm"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-release-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-release-simdbc64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-mac-debug-simdbc64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-mac-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-mac-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-mac-release-simdbc64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-mac-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-optcounter-threshold-linux-release-ia32"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-optcounter-threshold-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-android-release-arm"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-bare-linux-release-simarm"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-bare-linux-release-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-bare-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-linux-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-linux-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-linux-release-simarm"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-linux-release-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-mac-release-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-obfuscate-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-win-release-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-win-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-reload-linux-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-reload-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-reload-mac-debug-simdbc64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-reload-mac-release-simdbc64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-reload-rollback-linux-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-reload-rollback-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-win-debug-ia32"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-win-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-win-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-win-release-ia32"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-win-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
new file mode 100644
index 000000000000..af9b3624e215
--- /dev/null
+++ b/generated/luci-scheduler.cfg
@@ -0,0 +1,3050 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see ProjectConfig message:
+#   https://luci-config.appspot.com/schemas/projects:luci-scheduler.cfg
+
+job: <
+  id: "analyzer-analysis-server-linux"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-analysis-server-linux"
+  >
+>
+job: <
+  id: "analyzer-analysis-server-linux-analyzer-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-analysis-server-linux-analyzer-stable"
+  >
+>
+job: <
+  id: "analyzer-analysis-server-linux-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-analysis-server-linux-dev"
+  >
+>
+job: <
+  id: "analyzer-analysis-server-linux-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-analysis-server-linux-stable"
+  >
+>
+job: <
+  id: "analyzer-linux-release"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-linux-release"
+  >
+>
+job: <
+  id: "analyzer-linux-release-analyzer-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-linux-release-analyzer-stable"
+  >
+>
+job: <
+  id: "analyzer-linux-release-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-linux-release-dev"
+  >
+>
+job: <
+  id: "analyzer-linux-release-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-linux-release-stable"
+  >
+>
+job: <
+  id: "analyzer-mac-release"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-mac-release"
+  >
+>
+job: <
+  id: "analyzer-mac-release-analyzer-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-mac-release-analyzer-stable"
+  >
+>
+job: <
+  id: "analyzer-mac-release-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-mac-release-dev"
+  >
+>
+job: <
+  id: "analyzer-mac-release-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-mac-release-stable"
+  >
+>
+job: <
+  id: "analyzer-win-release"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-win-release"
+  >
+>
+job: <
+  id: "analyzer-win-release-analyzer-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-win-release-analyzer-stable"
+  >
+>
+job: <
+  id: "analyzer-win-release-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-win-release-dev"
+  >
+>
+job: <
+  id: "analyzer-win-release-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-win-release-stable"
+  >
+>
+job: <
+  id: "app-kernel-linux-debug-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-debug-x64"
+  >
+>
+job: <
+  id: "app-kernel-linux-debug-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-debug-x64-dev"
+  >
+>
+job: <
+  id: "app-kernel-linux-debug-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-debug-x64-stable"
+  >
+>
+job: <
+  id: "app-kernel-linux-product-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-product-x64"
+  >
+>
+job: <
+  id: "app-kernel-linux-product-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-product-x64-dev"
+  >
+>
+job: <
+  id: "app-kernel-linux-product-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-product-x64-stable"
+  >
+>
+job: <
+  id: "app-kernel-linux-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-release-x64"
+  >
+>
+job: <
+  id: "app-kernel-linux-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "app-kernel-linux-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-release-x64-stable"
+  >
+>
+job: <
+  id: "base"
+  schedule: "with 10m interval"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "base"
+  >
+>
+job: <
+  id: "cross-vm-linux-release-arm64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "cross-vm-linux-release-arm64"
+  >
+>
+job: <
+  id: "cross-vm-linux-release-arm64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "cross-vm-linux-release-arm64-dev"
+  >
+>
+job: <
+  id: "cross-vm-linux-release-arm64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "cross-vm-linux-release-arm64-stable"
+  >
+>
+job: <
+  id: "dart-sdk-linux"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-linux"
+  >
+>
+job: <
+  id: "dart-sdk-linux-dev"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-linux-dev"
+  >
+>
+job: <
+  id: "dart-sdk-linux-stable"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-linux-stable"
+  >
+>
+job: <
+  id: "dart-sdk-mac"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-mac"
+  >
+>
+job: <
+  id: "dart-sdk-mac-dev"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-mac-dev"
+  >
+>
+job: <
+  id: "dart-sdk-mac-stable"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-mac-stable"
+  >
+>
+job: <
+  id: "dart-sdk-win"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-win"
+  >
+>
+job: <
+  id: "dart-sdk-win-dev"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-win-dev"
+  >
+>
+job: <
+  id: "dart-sdk-win-stable"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-win-stable"
+  >
+>
+job: <
+  id: "dart2js-csp-minified-linux-x64-chrome"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-csp-minified-linux-x64-chrome"
+  >
+>
+job: <
+  id: "dart2js-csp-minified-linux-x64-chrome-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-csp-minified-linux-x64-chrome-dev"
+  >
+>
+job: <
+  id: "dart2js-csp-minified-linux-x64-chrome-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-csp-minified-linux-x64-chrome-stable"
+  >
+>
+job: <
+  id: "dart2js-minified-strong-linux-x64-d8"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-minified-strong-linux-x64-d8"
+  >
+>
+job: <
+  id: "dart2js-minified-strong-linux-x64-d8-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-minified-strong-linux-x64-d8-dev"
+  >
+>
+job: <
+  id: "dart2js-minified-strong-linux-x64-d8-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-minified-strong-linux-x64-d8-stable"
+  >
+>
+job: <
+  id: "dart2js-strong-hostasserts-linux-ia32-d8"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-hostasserts-linux-ia32-d8"
+  >
+>
+job: <
+  id: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
+  >
+>
+job: <
+  id: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
+  >
+>
+job: <
+  id: "dart2js-strong-linux-x64-chrome"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-linux-x64-chrome"
+  >
+>
+job: <
+  id: "dart2js-strong-linux-x64-chrome-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-linux-x64-chrome-dev"
+  >
+>
+job: <
+  id: "dart2js-strong-linux-x64-chrome-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-linux-x64-chrome-stable"
+  >
+>
+job: <
+  id: "dart2js-strong-linux-x64-firefox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-linux-x64-firefox"
+  >
+>
+job: <
+  id: "dart2js-strong-linux-x64-firefox-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-linux-x64-firefox-dev"
+  >
+>
+job: <
+  id: "dart2js-strong-linux-x64-firefox-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-linux-x64-firefox-stable"
+  >
+>
+job: <
+  id: "dart2js-strong-mac-x64-chrome"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-mac-x64-chrome"
+  >
+>
+job: <
+  id: "dart2js-strong-mac-x64-chrome-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-mac-x64-chrome-dev"
+  >
+>
+job: <
+  id: "dart2js-strong-mac-x64-chrome-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-mac-x64-chrome-stable"
+  >
+>
+job: <
+  id: "dart2js-strong-mac-x64-safari"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-mac-x64-safari"
+  >
+>
+job: <
+  id: "dart2js-strong-mac-x64-safari-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-mac-x64-safari-dev"
+  >
+>
+job: <
+  id: "dart2js-strong-mac-x64-safari-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-mac-x64-safari-stable"
+  >
+>
+job: <
+  id: "dart2js-strong-win-x64-chrome"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-win-x64-chrome"
+  >
+>
+job: <
+  id: "dart2js-strong-win-x64-chrome-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-win-x64-chrome-dev"
+  >
+>
+job: <
+  id: "dart2js-strong-win-x64-chrome-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-win-x64-chrome-stable"
+  >
+>
+job: <
+  id: "dart2js-strong-win-x64-firefox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-win-x64-firefox"
+  >
+>
+job: <
+  id: "dart2js-strong-win-x64-firefox-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-win-x64-firefox-dev"
+  >
+>
+job: <
+  id: "dart2js-strong-win-x64-firefox-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-win-x64-firefox-stable"
+  >
+>
+job: <
+  id: "dart2js-strong-win-x64-ie11"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-win-x64-ie11"
+  >
+>
+job: <
+  id: "dart2js-strong-win-x64-ie11-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-win-x64-ie11-dev"
+  >
+>
+job: <
+  id: "dart2js-strong-win-x64-ie11-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-win-x64-ie11-stable"
+  >
+>
+job: <
+  id: "dart2js-unit-linux-x64-release"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-unit-linux-x64-release"
+  >
+>
+job: <
+  id: "dart2js-unit-linux-x64-release-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-unit-linux-x64-release-dev"
+  >
+>
+job: <
+  id: "dart2js-unit-linux-x64-release-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-unit-linux-x64-release-stable"
+  >
+>
+job: <
+  id: "ddc-linux-release-chrome"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddc-linux-release-chrome"
+  >
+>
+job: <
+  id: "ddc-linux-release-chrome-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddc-linux-release-chrome-dev"
+  >
+>
+job: <
+  id: "ddc-linux-release-chrome-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddc-linux-release-chrome-stable"
+  >
+>
+job: <
+  id: "ddc-mac-release-chrome"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddc-mac-release-chrome"
+  >
+>
+job: <
+  id: "ddc-mac-release-chrome-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddc-mac-release-chrome-dev"
+  >
+>
+job: <
+  id: "ddc-mac-release-chrome-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddc-mac-release-chrome-stable"
+  >
+>
+job: <
+  id: "ddc-win-release-chrome"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddc-win-release-chrome"
+  >
+>
+job: <
+  id: "ddc-win-release-chrome-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddc-win-release-chrome-dev"
+  >
+>
+job: <
+  id: "ddc-win-release-chrome-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddc-win-release-chrome-stable"
+  >
+>
+job: <
+  id: "debianpackage-linux"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "debianpackage-linux"
+  >
+>
+job: <
+  id: "debianpackage-linux-dev"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "debianpackage-linux-dev"
+  >
+>
+job: <
+  id: "debianpackage-linux-stable"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "debianpackage-linux-stable"
+  >
+>
+job: <
+  id: "flutter-analyze"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "flutter-analyze"
+  >
+>
+job: <
+  id: "flutter-engine-linux"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  triggering_policy: <
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 5
+    max_batch_size: 1
+  >
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "flutter-engine-linux"
+  >
+>
+job: <
+  id: "flutter-frontend"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "flutter-frontend"
+  >
+>
+job: <
+  id: "front-end-linux-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-linux-release-x64"
+  >
+>
+job: <
+  id: "front-end-linux-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "front-end-linux-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-linux-release-x64-stable"
+  >
+>
+job: <
+  id: "front-end-mac-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-mac-release-x64"
+  >
+>
+job: <
+  id: "front-end-mac-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-mac-release-x64-dev"
+  >
+>
+job: <
+  id: "front-end-mac-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-mac-release-x64-stable"
+  >
+>
+job: <
+  id: "front-end-win-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-win-release-x64"
+  >
+>
+job: <
+  id: "front-end-win-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-win-release-x64-dev"
+  >
+>
+job: <
+  id: "front-end-win-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-win-release-x64-stable"
+  >
+>
+job: <
+  id: "fuzz-linux"
+  schedule: "0 3 * * *"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "fuzz-linux"
+  >
+>
+job: <
+  id: "gclient"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "gclient"
+  >
+>
+job: <
+  id: "gclient-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "gclient-dev"
+  >
+>
+job: <
+  id: "gclient-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "gclient-stable"
+  >
+>
+job: <
+  id: "linearize-flutter"
+  schedule: "triggered"
+  acl_sets: "ci"
+  triggering_policy: <
+    kind: GREEDY_BATCHING
+    max_batch_size: 1
+  >
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "linearize-flutter"
+  >
+>
+job: <
+  id: "pkg-linux-debug"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-linux-debug"
+  >
+>
+job: <
+  id: "pkg-linux-release"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-linux-release"
+  >
+>
+job: <
+  id: "pkg-linux-release-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-linux-release-dev"
+  >
+>
+job: <
+  id: "pkg-linux-release-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-linux-release-stable"
+  >
+>
+job: <
+  id: "pkg-mac-release"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-mac-release"
+  >
+>
+job: <
+  id: "pkg-mac-release-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-mac-release-dev"
+  >
+>
+job: <
+  id: "pkg-mac-release-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-mac-release-stable"
+  >
+>
+job: <
+  id: "pkg-win-release"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-win-release"
+  >
+>
+job: <
+  id: "pkg-win-release-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-win-release-dev"
+  >
+>
+job: <
+  id: "pkg-win-release-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-win-release-stable"
+  >
+>
+job: <
+  id: "versionchecker-linux"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "versionchecker-linux"
+  >
+>
+job: <
+  id: "versionchecker-linux-dev"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "versionchecker-linux-dev"
+  >
+>
+job: <
+  id: "versionchecker-linux-stable"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "versionchecker-linux-stable"
+  >
+>
+job: <
+  id: "vm-canary-linux-debug"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-canary-linux-debug"
+  >
+>
+job: <
+  id: "vm-canary-linux-debug-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-canary-linux-debug-dev"
+  >
+>
+job: <
+  id: "vm-canary-linux-debug-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-canary-linux-debug-stable"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-debug-simarm64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-debug-simarm64"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-debug-simarm64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-debug-simarm64-dev"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-debug-simarm64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-debug-simarm64-stable"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-debug-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-debug-x64"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-debug-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-debug-x64-dev"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-debug-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-debug-x64-stable"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-product-simarm64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-product-simarm64"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-product-simarm64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-product-simarm64-dev"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-product-simarm64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-product-simarm64-stable"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-product-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-product-x64"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-product-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-product-x64-dev"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-product-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-product-x64-stable"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-release-simarm64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-release-simarm64"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-release-simarm64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-release-simarm64-dev"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-release-simarm64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-release-simarm64-stable"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-release-x64-stable"
+  >
+>
+job: <
+  id: "vm-ffi-android-debug-arm"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-debug-arm"
+  >
+>
+job: <
+  id: "vm-ffi-android-debug-arm-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-debug-arm-dev"
+  >
+>
+job: <
+  id: "vm-ffi-android-debug-arm-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-debug-arm-stable"
+  >
+>
+job: <
+  id: "vm-ffi-android-product-arm"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-product-arm"
+  >
+>
+job: <
+  id: "vm-ffi-android-product-arm-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-product-arm-dev"
+  >
+>
+job: <
+  id: "vm-ffi-android-product-arm-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-product-arm-stable"
+  >
+>
+job: <
+  id: "vm-ffi-android-release-arm"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-release-arm"
+  >
+>
+job: <
+  id: "vm-ffi-android-release-arm-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-release-arm-dev"
+  >
+>
+job: <
+  id: "vm-ffi-android-release-arm-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-release-arm-stable"
+  >
+>
+job: <
+  id: "vm-kernel-asan-linux-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-asan-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-asan-linux-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-asan-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-asan-linux-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-asan-linux-release-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-checked-linux-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-checked-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-checked-linux-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-checked-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-checked-linux-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-checked-linux-release-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-linux-debug-ia32"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-ia32"
+  >
+>
+job: <
+  id: "vm-kernel-linux-debug-ia32-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-ia32-dev"
+  >
+>
+job: <
+  id: "vm-kernel-linux-debug-ia32-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-ia32-stable"
+  >
+>
+job: <
+  id: "vm-kernel-linux-debug-simdbc64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-simdbc64"
+  >
+>
+job: <
+  id: "vm-kernel-linux-debug-simdbc64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-simdbc64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-linux-debug-simdbc64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-simdbc64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-linux-debug-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-x64"
+  >
+>
+job: <
+  id: "vm-kernel-linux-debug-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-linux-debug-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-linux-product-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-product-x64"
+  >
+>
+job: <
+  id: "vm-kernel-linux-product-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-product-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-linux-product-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-product-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-ia32"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-ia32"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-ia32-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-ia32-dev"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-ia32-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-ia32-stable"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-simarm"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-simarm"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-simarm-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-simarm-dev"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-simarm-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-simarm-stable"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-simarm64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-simarm64"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-simarm64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-simarm64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-simarm64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-simarm64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-simdbc64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-simdbc64"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-simdbc64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-simdbc64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-simdbc64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-simdbc64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-mac-debug-simdbc64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-debug-simdbc64"
+  >
+>
+job: <
+  id: "vm-kernel-mac-debug-simdbc64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-debug-simdbc64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-mac-debug-simdbc64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-debug-simdbc64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-mac-debug-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-debug-x64"
+  >
+>
+job: <
+  id: "vm-kernel-mac-debug-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-debug-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-mac-debug-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-debug-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-mac-product-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-product-x64"
+  >
+>
+job: <
+  id: "vm-kernel-mac-product-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-product-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-mac-product-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-product-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-mac-release-simdbc64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-release-simdbc64"
+  >
+>
+job: <
+  id: "vm-kernel-mac-release-simdbc64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-release-simdbc64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-mac-release-simdbc64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-release-simdbc64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-mac-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-mac-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-mac-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-release-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-optcounter-threshold-linux-release-ia32"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-optcounter-threshold-linux-release-ia32"
+  >
+>
+job: <
+  id: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
+  >
+>
+job: <
+  id: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
+  >
+>
+job: <
+  id: "vm-kernel-optcounter-threshold-linux-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-optcounter-threshold-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-android-release-arm"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-android-release-arm"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-android-release-arm-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-android-release-arm-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-android-release-arm-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-android-release-arm-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-bare-linux-release-simarm"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-bare-linux-release-simarm"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-bare-linux-release-simarm-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-bare-linux-release-simarm-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-bare-linux-release-simarm-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-bare-linux-release-simarm-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-bare-linux-release-simarm64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-bare-linux-release-simarm64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-bare-linux-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-bare-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-bare-linux-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-bare-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-bare-linux-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-bare-linux-release-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-debug-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-debug-x64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-debug-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-debug-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-debug-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-debug-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-product-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-product-x64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-product-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-product-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-product-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-product-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-release-simarm"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-simarm"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-release-simarm-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-simarm-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-release-simarm-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-simarm-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-release-simarm64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-simarm64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-release-simarm64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-simarm64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-release-simarm64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-simarm64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-mac-release-simarm64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-mac-release-simarm64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-mac-release-simarm64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-mac-release-simarm64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-mac-release-simarm64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-mac-release-simarm64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-obfuscate-linux-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-obfuscate-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-win-release-simarm64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-win-release-simarm64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-win-release-simarm64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-win-release-simarm64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-win-release-simarm64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-win-release-simarm64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-win-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-win-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-win-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-win-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-win-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-win-release-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-reload-linux-debug-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-linux-debug-x64"
+  >
+>
+job: <
+  id: "vm-kernel-reload-linux-debug-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-linux-debug-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-reload-linux-debug-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-linux-debug-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-reload-linux-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-reload-linux-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-reload-linux-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-linux-release-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-reload-mac-debug-simdbc64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-mac-debug-simdbc64"
+  >
+>
+job: <
+  id: "vm-kernel-reload-mac-debug-simdbc64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-mac-debug-simdbc64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-reload-mac-debug-simdbc64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-mac-debug-simdbc64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-reload-mac-release-simdbc64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-mac-release-simdbc64"
+  >
+>
+job: <
+  id: "vm-kernel-reload-mac-release-simdbc64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-mac-release-simdbc64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-reload-mac-release-simdbc64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-mac-release-simdbc64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-reload-rollback-linux-debug-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-rollback-linux-debug-x64"
+  >
+>
+job: <
+  id: "vm-kernel-reload-rollback-linux-debug-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-rollback-linux-debug-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-reload-rollback-linux-debug-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-rollback-linux-debug-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-reload-rollback-linux-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-rollback-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-reload-rollback-linux-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-rollback-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-reload-rollback-linux-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-rollback-linux-release-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-win-debug-ia32"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-debug-ia32"
+  >
+>
+job: <
+  id: "vm-kernel-win-debug-ia32-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-debug-ia32-dev"
+  >
+>
+job: <
+  id: "vm-kernel-win-debug-ia32-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-debug-ia32-stable"
+  >
+>
+job: <
+  id: "vm-kernel-win-debug-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-debug-x64"
+  >
+>
+job: <
+  id: "vm-kernel-win-debug-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-debug-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-win-debug-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-debug-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-win-product-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-product-x64"
+  >
+>
+job: <
+  id: "vm-kernel-win-product-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-product-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-win-product-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-product-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-win-release-ia32"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-release-ia32"
+  >
+>
+job: <
+  id: "vm-kernel-win-release-ia32-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-release-ia32-dev"
+  >
+>
+job: <
+  id: "vm-kernel-win-release-ia32-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-release-ia32-stable"
+  >
+>
+job: <
+  id: "vm-kernel-win-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-win-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-win-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-release-x64-stable"
+  >
+>
+trigger: <
+  id: "dart-flutter-engine-trigger"
+  acl_sets: "ci"
+  triggers: "linearize-flutter"
+  gitiles: <
+    repo: "https://dart.googlesource.com/external/github.com/flutter/engine"
+    refs: "regexp:refs/heads/master"
+  >
+>
+trigger: <
+  id: "dart-flutter-flutter-trigger"
+  acl_sets: "ci"
+  triggers: "linearize-flutter"
+  gitiles: <
+    repo: "https://dart.googlesource.com/external/github.com/flutter/flutter"
+    refs: "regexp:refs/heads/master"
+  >
+>
+trigger: <
+  id: "dart-gitiles-trigger-analyzer-stable"
+  acl_sets: "ci"
+  triggers: "analyzer-analysis-server-linux-analyzer-stable"
+  triggers: "analyzer-linux-release-analyzer-stable"
+  triggers: "analyzer-mac-release-analyzer-stable"
+  triggers: "analyzer-win-release-analyzer-stable"
+  gitiles: <
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/analyzer-stable"
+  >
+>
+trigger: <
+  id: "dart-gitiles-trigger-dev"
+  acl_sets: "ci"
+  triggers: "dart-sdk-linux-dev"
+  triggers: "dart-sdk-mac-dev"
+  triggers: "dart-sdk-win-dev"
+  triggers: "debianpackage-linux-dev"
+  triggers: "versionchecker-linux-dev"
+  triggers: "analyzer-analysis-server-linux-dev"
+  triggers: "analyzer-linux-release-dev"
+  triggers: "analyzer-mac-release-dev"
+  triggers: "analyzer-win-release-dev"
+  triggers: "app-kernel-linux-debug-x64-dev"
+  triggers: "app-kernel-linux-product-x64-dev"
+  triggers: "app-kernel-linux-release-x64-dev"
+  triggers: "cross-vm-linux-release-arm64-dev"
+  triggers: "dart2js-csp-minified-linux-x64-chrome-dev"
+  triggers: "dart2js-minified-strong-linux-x64-d8-dev"
+  triggers: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
+  triggers: "dart2js-strong-linux-x64-chrome-dev"
+  triggers: "dart2js-strong-linux-x64-firefox-dev"
+  triggers: "dart2js-strong-mac-x64-chrome-dev"
+  triggers: "dart2js-strong-mac-x64-safari-dev"
+  triggers: "dart2js-strong-win-x64-chrome-dev"
+  triggers: "dart2js-strong-win-x64-firefox-dev"
+  triggers: "dart2js-strong-win-x64-ie11-dev"
+  triggers: "dart2js-unit-linux-x64-release-dev"
+  triggers: "ddc-linux-release-chrome-dev"
+  triggers: "ddc-mac-release-chrome-dev"
+  triggers: "ddc-win-release-chrome-dev"
+  triggers: "front-end-linux-release-x64-dev"
+  triggers: "front-end-mac-release-x64-dev"
+  triggers: "front-end-win-release-x64-dev"
+  triggers: "gclient-dev"
+  triggers: "pkg-linux-release-dev"
+  triggers: "pkg-mac-release-dev"
+  triggers: "pkg-win-release-dev"
+  triggers: "vm-canary-linux-debug-dev"
+  triggers: "vm-dartkb-linux-debug-simarm64-dev"
+  triggers: "vm-dartkb-linux-debug-x64-dev"
+  triggers: "vm-dartkb-linux-product-simarm64-dev"
+  triggers: "vm-dartkb-linux-product-x64-dev"
+  triggers: "vm-dartkb-linux-release-simarm64-dev"
+  triggers: "vm-dartkb-linux-release-x64-dev"
+  triggers: "vm-ffi-android-debug-arm-dev"
+  triggers: "vm-ffi-android-product-arm-dev"
+  triggers: "vm-ffi-android-release-arm-dev"
+  triggers: "vm-kernel-asan-linux-release-x64-dev"
+  triggers: "vm-kernel-checked-linux-release-x64-dev"
+  triggers: "vm-kernel-linux-debug-ia32-dev"
+  triggers: "vm-kernel-linux-debug-simdbc64-dev"
+  triggers: "vm-kernel-linux-debug-x64-dev"
+  triggers: "vm-kernel-linux-product-x64-dev"
+  triggers: "vm-kernel-linux-release-ia32-dev"
+  triggers: "vm-kernel-linux-release-simarm-dev"
+  triggers: "vm-kernel-linux-release-simarm64-dev"
+  triggers: "vm-kernel-linux-release-simdbc64-dev"
+  triggers: "vm-kernel-linux-release-x64-dev"
+  triggers: "vm-kernel-mac-debug-simdbc64-dev"
+  triggers: "vm-kernel-mac-debug-x64-dev"
+  triggers: "vm-kernel-mac-product-x64-dev"
+  triggers: "vm-kernel-mac-release-simdbc64-dev"
+  triggers: "vm-kernel-mac-release-x64-dev"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-android-release-arm-dev"
+  triggers: "vm-kernel-precomp-bare-linux-release-simarm-dev"
+  triggers: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-bare-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-linux-debug-x64-dev"
+  triggers: "vm-kernel-precomp-linux-product-x64-dev"
+  triggers: "vm-kernel-precomp-linux-release-simarm-dev"
+  triggers: "vm-kernel-precomp-linux-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-mac-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-win-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-win-release-x64-dev"
+  triggers: "vm-kernel-reload-linux-debug-x64-dev"
+  triggers: "vm-kernel-reload-linux-release-x64-dev"
+  triggers: "vm-kernel-reload-mac-debug-simdbc64-dev"
+  triggers: "vm-kernel-reload-mac-release-simdbc64-dev"
+  triggers: "vm-kernel-reload-rollback-linux-debug-x64-dev"
+  triggers: "vm-kernel-reload-rollback-linux-release-x64-dev"
+  triggers: "vm-kernel-win-debug-ia32-dev"
+  triggers: "vm-kernel-win-debug-x64-dev"
+  triggers: "vm-kernel-win-product-x64-dev"
+  triggers: "vm-kernel-win-release-ia32-dev"
+  triggers: "vm-kernel-win-release-x64-dev"
+  gitiles: <
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/dev"
+  >
+>
+trigger: <
+  id: "dart-gitiles-trigger-flutter"
+  acl_sets: "ci"
+  triggers: "flutter-engine-linux"
+  gitiles: <
+    repo: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
+    refs: "regexp:refs/heads/master"
+  >
+>
+trigger: <
+  id: "dart-gitiles-trigger-master"
+  acl_sets: "ci"
+  triggers: "dart-sdk-linux"
+  triggers: "dart-sdk-mac"
+  triggers: "dart-sdk-win"
+  triggers: "debianpackage-linux"
+  triggers: "linearize-flutter"
+  triggers: "versionchecker-linux"
+  triggers: "analyzer-analysis-server-linux"
+  triggers: "analyzer-linux-release"
+  triggers: "analyzer-mac-release"
+  triggers: "analyzer-win-release"
+  triggers: "app-kernel-linux-debug-x64"
+  triggers: "app-kernel-linux-product-x64"
+  triggers: "app-kernel-linux-release-x64"
+  triggers: "cross-vm-linux-release-arm64"
+  triggers: "dart2js-csp-minified-linux-x64-chrome"
+  triggers: "dart2js-minified-strong-linux-x64-d8"
+  triggers: "dart2js-strong-hostasserts-linux-ia32-d8"
+  triggers: "dart2js-strong-linux-x64-chrome"
+  triggers: "dart2js-strong-linux-x64-firefox"
+  triggers: "dart2js-strong-mac-x64-chrome"
+  triggers: "dart2js-strong-mac-x64-safari"
+  triggers: "dart2js-strong-win-x64-chrome"
+  triggers: "dart2js-strong-win-x64-firefox"
+  triggers: "dart2js-strong-win-x64-ie11"
+  triggers: "dart2js-unit-linux-x64-release"
+  triggers: "ddc-linux-release-chrome"
+  triggers: "ddc-mac-release-chrome"
+  triggers: "ddc-win-release-chrome"
+  triggers: "flutter-analyze"
+  triggers: "flutter-frontend"
+  triggers: "front-end-linux-release-x64"
+  triggers: "front-end-mac-release-x64"
+  triggers: "front-end-win-release-x64"
+  triggers: "gclient"
+  triggers: "pkg-linux-debug"
+  triggers: "pkg-linux-release"
+  triggers: "pkg-mac-release"
+  triggers: "pkg-win-release"
+  triggers: "vm-canary-linux-debug"
+  triggers: "vm-dartkb-linux-debug-simarm64"
+  triggers: "vm-dartkb-linux-debug-x64"
+  triggers: "vm-dartkb-linux-product-simarm64"
+  triggers: "vm-dartkb-linux-product-x64"
+  triggers: "vm-dartkb-linux-release-simarm64"
+  triggers: "vm-dartkb-linux-release-x64"
+  triggers: "vm-ffi-android-debug-arm"
+  triggers: "vm-ffi-android-product-arm"
+  triggers: "vm-ffi-android-release-arm"
+  triggers: "vm-kernel-asan-linux-release-x64"
+  triggers: "vm-kernel-checked-linux-release-x64"
+  triggers: "vm-kernel-linux-debug-ia32"
+  triggers: "vm-kernel-linux-debug-simdbc64"
+  triggers: "vm-kernel-linux-debug-x64"
+  triggers: "vm-kernel-linux-product-x64"
+  triggers: "vm-kernel-linux-release-ia32"
+  triggers: "vm-kernel-linux-release-simarm"
+  triggers: "vm-kernel-linux-release-simarm64"
+  triggers: "vm-kernel-linux-release-simdbc64"
+  triggers: "vm-kernel-linux-release-x64"
+  triggers: "vm-kernel-mac-debug-simdbc64"
+  triggers: "vm-kernel-mac-debug-x64"
+  triggers: "vm-kernel-mac-product-x64"
+  triggers: "vm-kernel-mac-release-simdbc64"
+  triggers: "vm-kernel-mac-release-x64"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
+  triggers: "vm-kernel-precomp-android-release-arm"
+  triggers: "vm-kernel-precomp-bare-linux-release-simarm"
+  triggers: "vm-kernel-precomp-bare-linux-release-simarm64"
+  triggers: "vm-kernel-precomp-bare-linux-release-x64"
+  triggers: "vm-kernel-precomp-linux-debug-x64"
+  triggers: "vm-kernel-precomp-linux-product-x64"
+  triggers: "vm-kernel-precomp-linux-release-simarm"
+  triggers: "vm-kernel-precomp-linux-release-simarm64"
+  triggers: "vm-kernel-precomp-linux-release-x64"
+  triggers: "vm-kernel-precomp-mac-release-simarm64"
+  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64"
+  triggers: "vm-kernel-precomp-win-release-simarm64"
+  triggers: "vm-kernel-precomp-win-release-x64"
+  triggers: "vm-kernel-reload-linux-debug-x64"
+  triggers: "vm-kernel-reload-linux-release-x64"
+  triggers: "vm-kernel-reload-mac-debug-simdbc64"
+  triggers: "vm-kernel-reload-mac-release-simdbc64"
+  triggers: "vm-kernel-reload-rollback-linux-debug-x64"
+  triggers: "vm-kernel-reload-rollback-linux-release-x64"
+  triggers: "vm-kernel-win-debug-ia32"
+  triggers: "vm-kernel-win-debug-x64"
+  triggers: "vm-kernel-win-product-x64"
+  triggers: "vm-kernel-win-release-ia32"
+  triggers: "vm-kernel-win-release-x64"
+  gitiles: <
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/master"
+  >
+>
+trigger: <
+  id: "dart-gitiles-trigger-stable"
+  acl_sets: "ci"
+  triggers: "dart-sdk-linux-stable"
+  triggers: "dart-sdk-mac-stable"
+  triggers: "dart-sdk-win-stable"
+  triggers: "debianpackage-linux-stable"
+  triggers: "versionchecker-linux-stable"
+  triggers: "analyzer-analysis-server-linux-stable"
+  triggers: "analyzer-linux-release-stable"
+  triggers: "analyzer-mac-release-stable"
+  triggers: "analyzer-win-release-stable"
+  triggers: "app-kernel-linux-debug-x64-stable"
+  triggers: "app-kernel-linux-product-x64-stable"
+  triggers: "app-kernel-linux-release-x64-stable"
+  triggers: "cross-vm-linux-release-arm64-stable"
+  triggers: "dart2js-csp-minified-linux-x64-chrome-stable"
+  triggers: "dart2js-minified-strong-linux-x64-d8-stable"
+  triggers: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
+  triggers: "dart2js-strong-linux-x64-chrome-stable"
+  triggers: "dart2js-strong-linux-x64-firefox-stable"
+  triggers: "dart2js-strong-mac-x64-chrome-stable"
+  triggers: "dart2js-strong-mac-x64-safari-stable"
+  triggers: "dart2js-strong-win-x64-chrome-stable"
+  triggers: "dart2js-strong-win-x64-firefox-stable"
+  triggers: "dart2js-strong-win-x64-ie11-stable"
+  triggers: "dart2js-unit-linux-x64-release-stable"
+  triggers: "ddc-linux-release-chrome-stable"
+  triggers: "ddc-mac-release-chrome-stable"
+  triggers: "ddc-win-release-chrome-stable"
+  triggers: "front-end-linux-release-x64-stable"
+  triggers: "front-end-mac-release-x64-stable"
+  triggers: "front-end-win-release-x64-stable"
+  triggers: "gclient-stable"
+  triggers: "pkg-linux-release-stable"
+  triggers: "pkg-mac-release-stable"
+  triggers: "pkg-win-release-stable"
+  triggers: "vm-canary-linux-debug-stable"
+  triggers: "vm-dartkb-linux-debug-simarm64-stable"
+  triggers: "vm-dartkb-linux-debug-x64-stable"
+  triggers: "vm-dartkb-linux-product-simarm64-stable"
+  triggers: "vm-dartkb-linux-product-x64-stable"
+  triggers: "vm-dartkb-linux-release-simarm64-stable"
+  triggers: "vm-dartkb-linux-release-x64-stable"
+  triggers: "vm-ffi-android-debug-arm-stable"
+  triggers: "vm-ffi-android-product-arm-stable"
+  triggers: "vm-ffi-android-release-arm-stable"
+  triggers: "vm-kernel-asan-linux-release-x64-stable"
+  triggers: "vm-kernel-checked-linux-release-x64-stable"
+  triggers: "vm-kernel-linux-debug-ia32-stable"
+  triggers: "vm-kernel-linux-debug-simdbc64-stable"
+  triggers: "vm-kernel-linux-debug-x64-stable"
+  triggers: "vm-kernel-linux-product-x64-stable"
+  triggers: "vm-kernel-linux-release-ia32-stable"
+  triggers: "vm-kernel-linux-release-simarm-stable"
+  triggers: "vm-kernel-linux-release-simarm64-stable"
+  triggers: "vm-kernel-linux-release-simdbc64-stable"
+  triggers: "vm-kernel-linux-release-x64-stable"
+  triggers: "vm-kernel-mac-debug-simdbc64-stable"
+  triggers: "vm-kernel-mac-debug-x64-stable"
+  triggers: "vm-kernel-mac-product-x64-stable"
+  triggers: "vm-kernel-mac-release-simdbc64-stable"
+  triggers: "vm-kernel-mac-release-x64-stable"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
+  triggers: "vm-kernel-precomp-android-release-arm-stable"
+  triggers: "vm-kernel-precomp-bare-linux-release-simarm-stable"
+  triggers: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
+  triggers: "vm-kernel-precomp-bare-linux-release-x64-stable"
+  triggers: "vm-kernel-precomp-linux-debug-x64-stable"
+  triggers: "vm-kernel-precomp-linux-product-x64-stable"
+  triggers: "vm-kernel-precomp-linux-release-simarm-stable"
+  triggers: "vm-kernel-precomp-linux-release-simarm64-stable"
+  triggers: "vm-kernel-precomp-linux-release-x64-stable"
+  triggers: "vm-kernel-precomp-mac-release-simarm64-stable"
+  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+  triggers: "vm-kernel-precomp-win-release-simarm64-stable"
+  triggers: "vm-kernel-precomp-win-release-x64-stable"
+  triggers: "vm-kernel-reload-linux-debug-x64-stable"
+  triggers: "vm-kernel-reload-linux-release-x64-stable"
+  triggers: "vm-kernel-reload-mac-debug-simdbc64-stable"
+  triggers: "vm-kernel-reload-mac-release-simdbc64-stable"
+  triggers: "vm-kernel-reload-rollback-linux-debug-x64-stable"
+  triggers: "vm-kernel-reload-rollback-linux-release-x64-stable"
+  triggers: "vm-kernel-win-debug-ia32-stable"
+  triggers: "vm-kernel-win-debug-x64-stable"
+  triggers: "vm-kernel-win-product-x64-stable"
+  triggers: "vm-kernel-win-release-ia32-stable"
+  triggers: "vm-kernel-win-release-x64-stable"
+  gitiles: <
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/stable"
+  >
+>
+acl_sets: <
+  name: "ci"
+  acls: <
+    role: OWNER
+    granted_to: "group:project-dart-admins"
+  >
+  acls: <
+    granted_to: "group:all"
+  >
+>
+acl_sets: <
+  name: "ci.sandbox"
+  acls: <
+    role: OWNER
+    granted_to: "group:project-dart-admins"
+  >
+  acls: <
+    granted_to: "group:all"
+  >
+>
diff --git a/generated/project.cfg b/generated/project.cfg
new file mode 100644
index 000000000000..aa62c97e4b8b
--- /dev/null
+++ b/generated/project.cfg
@@ -0,0 +1,8 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see ProjectCfg message:
+#   https://luci-config.appspot.com/schemas/projects:project.cfg
+
+name: "dart"
+access: "group:all"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index a82a81de3ec0..3e3425a1f729 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -223,6 +223,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "wr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
+    category: "vm|kernel"
+    short_name: "cra"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm"
     category: "vm|kernel-precomp"
@@ -288,11 +293,6 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
-    category: "vm|kernel"
-    short_name: "cra"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
     category: "vm|misc"
@@ -383,6 +383,46 @@ consoles: {
     category: "dart2js|d8"
     short_name: "u"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "csp"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
+    category: "dart2js|safari"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11"
+    category: "dart2js|ms"
+    short_name: "ie"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
     category: "analyzer"
@@ -438,46 +478,6 @@ consoles: {
     category: "ddc"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
-    category: "dart2js|safari"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11"
-    category: "dart2js|ms"
-    short_name: "ie"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
@@ -586,6 +586,46 @@ consoles: {
     category: "dart2js|d8"
     short_name: "u"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "csp"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
+    category: "dart2js|safari"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11"
+    category: "dart2js|ms"
+    short_name: "ie"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
     category: "analyzer"
@@ -641,46 +681,6 @@ consoles: {
     category: "ddc"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
-    category: "dart2js|safari"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11"
-    category: "dart2js|ms"
-    short_name: "ie"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
@@ -851,6 +851,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "wr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
+    category: "vm|kernel"
+    short_name: "cra"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm"
     category: "vm|kernel-precomp"
@@ -916,11 +921,6 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
-    category: "vm|kernel"
-    short_name: "cra"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
     category: "vm|misc"
@@ -1179,6 +1179,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "wr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-dev"
+    category: "vm|kernel"
+    short_name: "cra"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm-dev"
     category: "vm|kernel-precomp"
@@ -1244,11 +1249,6 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-dev"
-    category: "vm|kernel"
-    short_name: "cra"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-dev"
     category: "vm|misc"
@@ -1339,6 +1339,46 @@ consoles: {
     category: "dart2js|d8"
     short_name: "u"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-dev"
+    category: "dart2js|chrome"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-dev"
+    category: "dart2js|chrome"
+    short_name: "csp"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-dev"
+    category: "dart2js|chrome"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-dev"
+    category: "dart2js|chrome"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-dev"
+    category: "dart2js|firefox"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox-dev"
+    category: "dart2js|firefox"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-dev"
+    category: "dart2js|safari"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11-dev"
+    category: "dart2js|ms"
+    short_name: "ie"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-dev"
     category: "analyzer"
@@ -1389,46 +1429,6 @@ consoles: {
     category: "ddc"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-dev"
-    category: "dart2js|chrome"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-dev"
-    category: "dart2js|firefox"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-dev"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-dev"
-    category: "dart2js|chrome"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-dev"
-    category: "dart2js|safari"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-dev"
-    category: "dart2js|chrome"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox-dev"
-    category: "dart2js|firefox"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11-dev"
-    category: "dart2js|ms"
-    short_name: "ie"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
     category: "pkg"
@@ -1648,6 +1648,11 @@ consoles: {
     category: "vm|kernel"
     short_name: "wr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-stable"
+    category: "vm|kernel"
+    short_name: "cra"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm-stable"
     category: "vm|kernel-precomp"
@@ -1713,11 +1718,6 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-stable"
-    category: "vm|kernel"
-    short_name: "cra"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-stable"
     category: "vm|misc"
@@ -1808,6 +1808,46 @@ consoles: {
     category: "dart2js|d8"
     short_name: "u"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-stable"
+    category: "dart2js|firefox"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "csp"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-stable"
+    category: "dart2js|safari"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox-stable"
+    category: "dart2js|firefox"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11-stable"
+    category: "dart2js|ms"
+    short_name: "ie"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-stable"
     category: "analyzer"
@@ -1858,46 +1898,6 @@ consoles: {
     category: "ddc"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-stable"
-    category: "dart2js|firefox"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-stable"
-    category: "dart2js|safari"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox-stable"
-    category: "dart2js|firefox"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11-stable"
-    category: "dart2js|ms"
-    short_name: "ie"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
     category: "pkg"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 9a58ae4b030c..795fe04d442f 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -8,30 +8,6 @@
 # on_change  = Whenever the build status changes.
 # on_success = On every build success.
 # on_failure = On every build failure.
-notifiers {
-    name: "infra"
-    notifications {
-        on_change: false
-        on_success: false
-        on_failure: false
-        on_new_failure: true
-        email {
-            recipients: "athom@google.com"
-            recipients: "sortie@google.com"
-            recipients: "whesse@google.com"
-        }
-    }
-    builders {
-        name: "base"
-        bucket: "ci"
-    }
-    builders {
-        name: "debianpackage-linux"
-        bucket: "ci"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-}
-
 notifiers {
     name: "dart"
     notifications {
@@ -49,444 +25,468 @@ notifiers {
     builders {
         name: "dart-sdk-linux"
         bucket: "ci"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "dart-sdk-mac"
         bucket: "ci"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "dart-sdk-win"
         bucket: "ci"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "versionchecker-linux"
         bucket: "ci"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
 
     # CI Builders for the master branch
     builders {
         name: "analyzer-analysis-server-linux"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "analyzer-linux-release"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "analyzer-mac-release"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "analyzer-win-release"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "app-kernel-linux-debug-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "app-kernel-linux-product-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "app-kernel-linux-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "cross-vm-linux-release-arm64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "dart2js-csp-minified-linux-x64-chrome"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "dart2js-minified-strong-linux-x64-d8"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "dart2js-strong-hostasserts-linux-ia32-d8"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "dart2js-strong-linux-x64-chrome"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "dart2js-strong-linux-x64-firefox"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "dart2js-strong-mac-x64-chrome"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "dart2js-strong-mac-x64-safari"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "dart2js-strong-win-x64-chrome"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "dart2js-strong-win-x64-edge"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "dart2js-strong-win-x64-firefox"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "dart2js-strong-win-x64-ie11"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "dart2js-unit-linux-x64-release"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "ddc-linux-release-chrome"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "ddc-mac-release-chrome"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "ddc-win-release-chrome"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "front-end-linux-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "front-end-mac-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "front-end-win-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "gclient"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "pkg-linux-release"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "pkg-mac-release"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "pkg-win-release"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "pkg-linux-debug"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "versionchecker-linux"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-canary-linux-debug"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-dartkb-linux-debug-simarm64-try"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-dartkb-linux-debug-x64-try"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-dartkb-linux-product-simarm64-try"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-dartkb-linux-product-x64-try"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-dartkb-linux-release-simarm64-try"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-dartkb-linux-release-x64-try"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-asan-linux-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-checked-linux-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-linux-debug-ia32"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-linux-debug-simdbc64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-linux-debug-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-linux-product-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-linux-release-ia32"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-linux-release-simarm"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-linux-release-simarm64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-linux-release-simdbc64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-linux-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-mac-debug-simdbc64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-mac-debug-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-mac-product-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-mac-release-simdbc64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-mac-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-optcounter-threshold-linux-release-ia32"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-optcounter-threshold-linux-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-precomp-android-release-arm"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-precomp-bare-linux-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-precomp-bare-linux-release-simarm"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-precomp-bare-linux-release-simarm64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-precomp-linux-debug-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-precomp-linux-product-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-precomp-linux-release-simarm"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-precomp-linux-release-simarm64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-precomp-linux-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-precomp-mac-release-simarm64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-precomp-obfuscate-linux-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-precomp-win-release-simarm64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-precomp-win-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-reload-linux-debug-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-reload-linux-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-reload-mac-debug-simdbc64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-reload-mac-release-simdbc64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-reload-rollback-linux-debug-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-reload-rollback-linux-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-win-debug-ia32"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-win-debug-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-win-product-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-win-release-ia32"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-kernel-win-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-ffi-android-debug-arm"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-ffi-android-release-arm"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
     }
     builders {
         name: "vm-ffi-android-product-arm"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
+        repository: "https://dart.googlesource.com/sdk/"
+    }
+}
+
+notifiers {
+    name: "infra"
+    notifications {
+        on_change: false
+        on_success: false
+        on_failure: false
+        on_new_failure: true
+        email {
+            recipients: "athom@google.com"
+            recipients: "sortie@google.com"
+            recipients: "whesse@google.com"
+        }
+    }
+    builders {
+        name: "base"
+        bucket: "ci"
+    }
+    builders {
+        name: "debianpackage-linux"
+        bucket: "ci"
+        repository: "https://dart.googlesource.com/sdk/"
     }
 }
 
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index e7a2d014adef..67912166b68a 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -10,7 +10,7 @@ acl_sets {
   }
   acls {
     role: OWNER
-    granted_to: "group:project-dart-committers"
+    granted_to: "group:project-dart-admins"
   }
 }
 
@@ -104,7 +104,7 @@ trigger {
   id: "dart-gitiles-trigger-analyzer-stable"
   acl_sets: "default"
   gitiles: {
-    repo: "https://dart.googlesource.com/sdk/"
+    repo: "https://dart.googlesource.com/sdk"
     refs: "refs/heads/analyzer-stable"
   }
   triggers: "analyzer-analysis-server-linux-analyzer-stable"
@@ -118,7 +118,7 @@ trigger {
   id: "dart-gitiles-trigger-master"
   acl_sets: "default"
   gitiles: {
-    repo: "https://dart.googlesource.com/sdk/"
+    repo: "https://dart.googlesource.com/sdk"
     refs: "refs/heads/master"
   }
   triggers: "analyzer-analysis-server-linux"
@@ -217,7 +217,7 @@ trigger {
   id: "dart-gitiles-trigger-dev"
   acl_sets: "default"
   gitiles: {
-    repo: "https://dart.googlesource.com/sdk/"
+    repo: "https://dart.googlesource.com/sdk"
     refs: "refs/heads/dev"
   }
   triggers: "analyzer-analysis-server-linux-dev"
@@ -312,7 +312,7 @@ trigger {
   id: "dart-gitiles-trigger-stable"
   acl_sets: "default"
   gitiles: {
-    repo: "https://dart.googlesource.com/sdk/"
+    repo: "https://dart.googlesource.com/sdk"
     refs: "refs/heads/stable"
   }
   triggers: "analyzer-analysis-server-linux-stable"
diff --git a/main.star b/main.star
new file mode 100755
index 000000000000..273445e2e582
--- /dev/null
+++ b/main.star
@@ -0,0 +1,738 @@
+#!/usr/bin/env lucicfg
+
+# Copyright (c) 2019 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+#
+# https://chromium.googlesource.com/infra/luci/luci-go/+/master/lucicfg/doc/
+
+DART_GIT = "https://dart.googlesource.com/sdk"
+DART_GERRIT = "https://dart-review.googlesource.com/sdk"
+
+RELEASE_CHANNELS = ["dev", "stable"]
+CHANNELS = RELEASE_CHANNELS + ["try"]
+ANALYZER_CHANNELS = ["analyzer-stable"] + CHANNELS
+
+
+def mac():
+    return {"os": "Mac"}
+
+
+def windows():
+    return {"os": "Windows"}
+
+
+CI_ACCOUNT = "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+TRY_ACCOUNT = "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+CI_TRIGGERERS = ["luci-scheduler@appspot.gserviceaccount.com", CI_ACCOUNT]
+
+luci.project(
+    name="dart",
+    buildbucket="cr-buildbucket.appspot.com",
+    logdog="luci-logdog.appspot.com",
+    milo="luci-milo.appspot.com",
+    notify="luci-notify.appspot.com",
+    scheduler="luci-scheduler.appspot.com",
+    swarming="chromium-swarm.appspot.com",
+    acls=[
+        acl.entry(
+            [
+                acl.BUILDBUCKET_READER, acl.LOGDOG_READER,
+                acl.PROJECT_CONFIGS_READER, acl.SCHEDULER_READER
+            ],
+            groups=["all"],
+        ),
+        acl.entry(acl.LOGDOG_WRITER, groups=["luci-logdog-chromium-writers"]),
+        acl.entry([acl.SCHEDULER_OWNER, acl.BUILDBUCKET_TRIGGERER],
+                  groups=["project-dart-admins"]),
+        acl.entry(acl.CQ_COMMITTER, groups=["project-dart-committers"]),
+        acl.entry(acl.CQ_DRY_RUNNER, groups=["project-dart-tryjob-access"]),
+    ],
+)
+
+luci.milo(
+    logo="https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png",
+)
+
+luci.console_view(
+    name="analyzer-stable",
+    repo="https://dart.googlesource.com/sdk",
+    title="SDK Analyzer Stable Branch Console",
+    refs=["refs/heads/analyzer-stable"],
+    header="console-header.textpb",
+)
+
+luci.console_view(
+    name="be",
+    repo="https://dart.googlesource.com/sdk",
+    title="SDK Bleeding Edge Console",
+    refs=["refs/heads/master"],
+    header="console-header.textpb",
+)
+
+luci.console_view(
+    name="alt",
+    repo="https://dart.googlesource.com/sdk",
+    title="SDK Bleeding Edge Console (alternative)",
+    refs=["refs/heads/master"],
+    header="console-header.textpb",
+)
+
+luci.console_view(
+    name="dev",
+    repo="https://dart.googlesource.com/sdk",
+    title="SDK Dev Console",
+    refs=["refs/heads/dev"],
+    header="console-header.textpb",
+)
+
+luci.console_view(
+    name="stable",
+    repo="https://dart.googlesource.com/sdk",
+    title="SDK Stable Console",
+    refs=["refs/heads/stable"],
+    header="console-header.textpb",
+)
+
+luci.console_view(
+    name="flutter",
+    repo=DART_GIT,
+    title="Dart/Flutter Console",
+    refs=["refs/heads/master"],
+)
+
+luci.console_view(
+    name="flutter-hhh",
+    repo="https://dart.googlesource.com/linear_sdk_flutter_engine",
+    title="Dart/Flutter Linear History Console",
+    refs=["refs/heads/master"],
+)
+
+luci.console_view(
+    name="fyi",
+    repo=DART_GIT,
+    title="SDK FYI Console",
+    refs=["refs/heads/master"],
+)
+
+luci.list_view(
+    name="cq",
+    title="SDK CQ Console",
+)
+
+luci.logdog(gs_bucket="chromium-luci-logdog")
+
+luci.bucket(
+    name="ci",
+    acls=[
+        acl.entry(acl.BUILDBUCKET_TRIGGERER, users=CI_TRIGGERERS),
+    ],
+)
+luci.bucket(
+    name="ci.sandbox",
+    acls=[
+        acl.entry(acl.BUILDBUCKET_TRIGGERER, users=CI_TRIGGERERS),
+    ],
+)
+luci.bucket(
+    name="try",
+    acls=[
+        acl.entry(acl.BUILDBUCKET_TRIGGERER,
+                  groups=["project-dart-tryjob-access", "service-account-cq"]),
+    ],
+)
+
+luci.gitiles_poller(
+    name="dart-gitiles-trigger-flutter",
+    bucket="ci",
+    repo="https://dart.googlesource.com/linear_sdk_flutter_engine/",
+    refs=["refs/heads/master"],
+)
+
+luci.gitiles_poller(
+    name="dart-gitiles-trigger-master",
+    bucket="ci",
+    repo=DART_GIT,
+    refs=["refs/heads/master"],
+)
+
+luci.gitiles_poller(
+    name="dart-gitiles-trigger-dev",
+    bucket="ci",
+    repo=DART_GIT,
+    refs=["refs/heads/dev"],
+)
+
+luci.gitiles_poller(
+    name="dart-gitiles-trigger-stable",
+    bucket="ci",
+    repo=DART_GIT,
+    refs=["refs/heads/stable"],
+)
+
+luci.gitiles_poller(
+    name="dart-gitiles-trigger-analyzer-stable",
+    bucket="ci",
+    repo=DART_GIT,
+    refs=["refs/heads/analyzer-stable"],
+)
+
+luci.gitiles_poller(
+    name="dart-flutter-engine-trigger",
+    bucket="ci",
+    repo="https://dart.googlesource.com/external/github.com/flutter/engine",
+    refs=["refs/heads/master"],
+)
+
+luci.gitiles_poller(
+    name="dart-flutter-flutter-trigger",
+    bucket="ci",
+    repo="https://dart.googlesource.com/external/github.com/flutter/flutter",
+    refs=["refs/heads/master"],
+)
+
+luci.notifier(name="infra",
+              on_new_failure=True,
+              notify_emails=[
+                  "athom@google.com", "sortie@google.com", "whesse@google.com"
+              ])
+
+luci.notifier(name="dart",
+              on_new_failure=True,
+              notify_emails=["athom@google.com"],
+              notify_blamelist=True)
+
+luci.notifier(name="dart-fuzz-testing",
+              on_success=True,
+              on_failure=True,
+              notify_emails=["ajcbik@google.com", "athom@google.com"])
+
+luci.cq(
+    submit_max_burst=2,
+    submit_burst_delay=8 * time.minute,
+)
+
+luci.cq_group(
+    name="sdk",
+    watch=cq.refset(DART_GERRIT, refs=["refs/heads/.+"]),
+    allow_submit_with_open_deps=True,
+    tree_status_host="dart-status.appspot.com",
+    retry_config=cq.RETRY_NONE,
+    verifiers=None,
+)
+
+
+def dart_recipe(name):
+    return luci.recipe(
+        name="dart/" + name,
+        cipd_package=
+        "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",
+    )
+
+
+def dart_try_builder(name,
+                     recipe="neo",
+                     dimensions={},
+                     experiment_percentage=None,
+                     location_regexp=None,
+                     properties={},
+                     on_cq=False):
+    dimensions.setdefault("os", "Linux")
+    dimensions.setdefault("cpu", "x86-64")
+    properties.setdefault("clobber", "true")
+    builder = name + "-try"
+
+    luci.builder(
+        name=builder,
+        build_numbers=True,
+        bucket="try",
+        caches=[swarming.cache("browsers")],
+        dimensions=dimensions,
+        executable=dart_recipe(recipe),
+        priority=30,
+        properties=properties,
+        service_account=TRY_ACCOUNT,
+        swarming_tags=["vpython:native-python-wrapper"],
+    )
+    if on_cq:
+        luci.cq_tryjob_verifier(builder=builder,
+                                cq_group='sdk',
+                                experiment_percentage=experiment_percentage,
+                                location_regexp=location_regexp)
+        luci.list_view_entry(
+            list_view="cq",
+            builder=builder,
+        )
+
+
+postponed_alt_console_entries = []
+
+
+def dart_builder(name,
+                 bucket,
+                 recipe="neo",
+                 enabled=True,
+                 category=None,
+                 channels=[],
+                 dimensions={},
+                 cpu="x86-64",
+                 fyi=False,
+                 notifies="dart",
+                 priority=50,
+                 properties={},
+                 schedule="triggered",
+                 service_account=TRY_ACCOUNT,
+                 triggered_by=None,
+                 triggering_policy=None,
+                 on_cq=False,
+                 experiment_percentage=None,
+                 location_regexp=None):
+    dimensions.setdefault("os", "Linux")
+    dimensions.update({"cpu": cpu})
+    properties.setdefault("clobber", "true")
+
+    def builder(channel=None):
+        if channel == "try":
+            dart_try_builder(name,
+                             recipe=recipe,
+                             dimensions=dimensions,
+                             properties=properties,
+                             on_cq=on_cq,
+                             experiment_percentage=experiment_percentage,
+                             location_regexp=location_regexp)
+        else:
+            builder = name + "-" + channel if channel else name
+            luci.builder(
+                name=builder,
+                build_numbers=True,
+                bucket=bucket,
+                caches=[swarming.cache("browsers")],
+                dimensions=dimensions,
+                executable=dart_recipe(recipe),
+                priority=priority,
+                properties=properties,
+                notifies=[notifies]
+                if notifies and not channel and enabled else None,
+                schedule=schedule if enabled else None,
+                service_account=service_account,
+                swarming_tags=["vpython:native-python-wrapper"],
+                triggered_by=triggered_by or
+                (["dart-gitiles-trigger-" + (channel if channel else "master")]
+                 if enabled and schedule == "triggered" else None),
+                triggering_policy=triggering_policy)
+            if category:
+                console_category, _, short_name = category.rpartition("|")
+                toplevel_category, _, _ = console_category.partition("|")
+                console = channel or "be" if not fyi else "fyi"
+                luci.console_view_entry(
+                    builder=builder,
+                    short_name=short_name,
+                    category=console_category,
+                    console_view=console,
+                )
+                if console == "be":
+                    if toplevel_category == "vm":
+                        postponed_alt_console_entries.append({
+                            "builder":
+                            builder,
+                            "short_name":
+                            short_name,
+                            "category":
+                            console_category,
+                        })
+                    else:
+                        luci.console_view_entry(
+                            builder=builder,
+                            short_name=short_name,
+                            category=console_category,
+                            console_view="alt",
+                        )
+
+    builder()
+    for channel in channels:
+        if enabled:
+            builder(channel)
+
+
+def dart_ci_builder(name, **kwargs):
+    dart_builder(name,
+                 bucket="ci",
+                 service_account=CI_ACCOUNT,
+                 **kwargs)
+
+
+def dart_ci_sandbox_builder(name,
+                            channels=CHANNELS,
+                            dimensions={},
+                            properties={},
+                            **kwargs):
+
+    if not properties.setdefault("new_workflow_enabled", True):
+        properties.pop("new_workflow_enabled")
+    dimensions.setdefault("pool", "try")
+
+    dart_builder(name,
+                 bucket="ci.sandbox",
+                 channels=channels,
+                 dimensions=dimensions,
+                 properties=properties,
+                 service_account=TRY_ACCOUNT,
+                 **kwargs)
+
+
+# fasta
+dart_ci_sandbox_builder("front-end-linux-release-x64",
+                        category="fasta|l",
+                        on_cq=True)
+dart_ci_sandbox_builder("front-end-mac-release-x64",
+                        category="fasta|m",
+                        dimensions=mac())
+dart_ci_sandbox_builder("front-end-win-release-x64",
+                        category="fasta|w",
+                        dimensions=windows())
+dart_ci_sandbox_builder("flutter-frontend",
+                        category="fasta|fl",
+                        channels=["try"],
+                        properties={"new_workflow_enabled": False},
+                        notifies=None)
+
+# flutter
+dart_ci_sandbox_builder(
+    "flutter-engine-linux",
+    recipe="flutter_engine",
+    category="flutter|3H",
+    channels=[],
+    properties={"new_workflow_enabled": False},
+    triggered_by=["dart-gitiles-trigger-flutter"],
+    triggering_policy=scheduler.greedy_batching(max_concurrent_invocations=5,
+                                                max_batch_size=1),
+)
+
+# vm|app-kernel
+dart_ci_sandbox_builder("app-kernel-linux-debug-x64",
+                        category="vm|app-kernel|d64")
+dart_ci_sandbox_builder("app-kernel-linux-product-x64",
+                        category="vm|app-kernel|p64")
+dart_ci_sandbox_builder("app-kernel-linux-release-x64",
+                        category="vm|app-kernel|r64")
+
+# vm|dartkb
+dart_ci_sandbox_builder("vm-dartkb-linux-debug-simarm64",
+                        category="vm|dartkb|sd")
+dart_ci_sandbox_builder("vm-dartkb-linux-debug-x64", category="vm|dartkb|d")
+dart_ci_sandbox_builder("vm-dartkb-linux-product-simarm64",
+                        category="vm|dartkb|sp")
+dart_ci_sandbox_builder("vm-dartkb-linux-product-x64", category="vm|dartkb|p")
+dart_ci_sandbox_builder("vm-dartkb-linux-release-simarm64",
+                        category="vm|dartkb|sr")
+dart_ci_sandbox_builder("vm-dartkb-linux-release-x64", category="vm|dartkb|r")
+
+#vm|kernel
+dart_ci_sandbox_builder("vm-canary-linux-debug",
+                        category="vm|kernel|c",
+                        on_cq=True)
+dart_ci_sandbox_builder("vm-kernel-linux-debug-x64", category="vm|kernel|d")
+dart_ci_sandbox_builder("vm-kernel-linux-debug-simdbc64",
+                        category="vm|kernel|dbc")
+dart_ci_sandbox_builder("vm-kernel-linux-release-simarm",
+                        category="vm|kernel|a32")
+dart_ci_sandbox_builder("vm-kernel-linux-release-simarm64",
+                        category="vm|kernel|a64")
+dart_ci_sandbox_builder("vm-kernel-linux-release-simdbc64",
+                        category="vm|kernel|rbc",
+                        on_cq=True)
+dart_ci_sandbox_builder("vm-kernel-linux-release-ia32",
+                        category="vm|kernel|r32")
+dart_ci_sandbox_builder("vm-kernel-linux-release-x64",
+                        category="vm|kernel|r",
+                        on_cq=True)
+dart_ci_sandbox_builder("vm-kernel-checked-linux-release-x64",
+                        category="vm|kernel|rc")
+dart_ci_sandbox_builder("vm-kernel-linux-debug-ia32", category="vm|kernel|d32")
+dart_ci_sandbox_builder("vm-kernel-mac-debug-simdbc64",
+                        category="vm|kernel|mds",
+                        dimensions=mac())
+dart_ci_sandbox_builder("vm-kernel-mac-release-simdbc64",
+                        category="vm|kernel|mrs",
+                        dimensions=mac())
+dart_ci_sandbox_builder("vm-kernel-mac-debug-x64",
+                        category="vm|kernel|md",
+                        dimensions=mac())
+dart_ci_sandbox_builder("vm-kernel-mac-release-x64",
+                        category="vm|kernel|mr",
+                        dimensions=mac(),
+                        on_cq=True,
+                        experiment_percentage=5)
+dart_ci_sandbox_builder("vm-kernel-win-debug-ia32",
+                        category="vm|kernel|wd3",
+                        dimensions=windows())
+dart_ci_sandbox_builder("vm-kernel-win-debug-x64",
+                        category="vm|kernel|wd",
+                        dimensions=windows())
+dart_ci_sandbox_builder("vm-kernel-win-release-ia32",
+                        category="vm|kernel|wr3",
+                        dimensions=windows())
+dart_ci_sandbox_builder("vm-kernel-win-release-x64",
+                        category="vm|kernel|wr",
+                        dimensions=windows())
+dart_ci_sandbox_builder("cross-vm-linux-release-arm64",
+                        category="vm|kernel|cra",
+                        channels=RELEASE_CHANNELS)
+
+# vm|kernel-precomp
+dart_ci_sandbox_builder("vm-kernel-precomp-android-release-arm",
+                        category="vm|kernel-precomp|and",
+                        properties={"shard_timeout": 5400})  # 1.5h
+dart_ci_sandbox_builder("vm-kernel-precomp-linux-debug-x64",
+                        category="vm|kernel-precomp|d")
+dart_ci_sandbox_builder("vm-kernel-precomp-linux-product-x64",
+                        category="vm|kernel-precomp|p")
+dart_ci_sandbox_builder("vm-kernel-precomp-linux-release-simarm",
+                        category="vm|kernel-precomp|a32")
+dart_ci_sandbox_builder("vm-kernel-precomp-linux-release-simarm64",
+                        category="vm|kernel-precomp|a64")
+dart_ci_sandbox_builder("vm-kernel-precomp-linux-release-x64",
+                        category="vm|kernel-precomp|r")
+dart_ci_sandbox_builder("vm-kernel-precomp-bare-linux-release-x64",
+                        category="vm|kernel-precomp|br")
+dart_ci_sandbox_builder("vm-kernel-precomp-bare-linux-release-simarm",
+                        category="vm|kernel-precomp|bra32")
+dart_ci_sandbox_builder("vm-kernel-precomp-bare-linux-release-simarm64",
+                        category="vm|kernel-precomp|bra64")
+dart_ci_sandbox_builder("vm-kernel-precomp-obfuscate-linux-release-x64",
+                        category="vm|kernel-precomp|o")
+dart_ci_sandbox_builder("vm-kernel-precomp-mac-release-simarm64",
+                        category="vm|kernel-precomp|ma",
+                        dimensions=mac())
+dart_ci_sandbox_builder("vm-kernel-precomp-win-release-simarm64",
+                        category="vm|kernel-precomp|wa",
+                        dimensions=windows())
+dart_ci_sandbox_builder("vm-kernel-precomp-win-release-x64",
+                        category="vm|kernel-precomp|wr",
+                        dimensions=windows())
+
+# vm|misc
+dart_ci_sandbox_builder("vm-kernel-asan-linux-release-x64",
+                        category="vm|misc|a64")
+dart_ci_sandbox_builder("vm-kernel-optcounter-threshold-linux-release-ia32",
+                        category="vm|misc|o32")
+dart_ci_sandbox_builder("vm-kernel-optcounter-threshold-linux-release-x64",
+                        category="vm|misc|o64")
+
+# vm|product
+dart_ci_sandbox_builder("vm-kernel-linux-product-x64",
+                        category="vm|product|l",
+                        on_cq=True)
+dart_ci_sandbox_builder("vm-kernel-mac-product-x64",
+                        category="vm|product|m",
+                        dimensions=mac())
+dart_ci_sandbox_builder("vm-kernel-win-product-x64",
+                        category="vm|product|w",
+                        dimensions=windows())
+
+# vm|reload-kernel
+dart_ci_sandbox_builder("vm-kernel-reload-linux-debug-x64",
+                        category="vm|reload-kernel|d")
+dart_ci_sandbox_builder("vm-kernel-reload-linux-release-x64",
+                        category="vm|reload-kernel|r")
+dart_ci_sandbox_builder("vm-kernel-reload-mac-debug-simdbc64",
+                        category="vm|reload-kernel|md",
+                        dimensions=mac())
+dart_ci_sandbox_builder("vm-kernel-reload-mac-release-simdbc64",
+                        category="vm|reload-kernel|mr",
+                        dimensions=mac())
+dart_ci_sandbox_builder("vm-kernel-reload-rollback-linux-debug-x64",
+                        category="vm|reload-kernel|drb")
+dart_ci_sandbox_builder("vm-kernel-reload-rollback-linux-release-x64",
+                        category="vm|reload-kernel|rrb")
+# vm|ffi
+dart_ci_sandbox_builder("vm-ffi-android-debug-arm", category="vm|ffi|d32")
+dart_ci_sandbox_builder("vm-ffi-android-release-arm", category="vm|ffi|r32")
+dart_ci_sandbox_builder("vm-ffi-android-product-arm", category="vm|ffi|p32")
+
+# dart2js
+dart_ci_sandbox_builder("dart2js-strong-hostasserts-linux-ia32-d8",
+                        category="dart2js|d8|ha",
+                        on_cq=True)
+dart_ci_sandbox_builder("dart2js-minified-strong-linux-x64-d8",
+                        category="dart2js|d8|mi",
+                        on_cq=True)
+dart_ci_sandbox_builder("dart2js-unit-linux-x64-release",
+                        category="dart2js|d8|u",
+                        on_cq=True)
+dart_ci_sandbox_builder("dart2js-strong-linux-x64-chrome",
+                        category="dart2js|chrome|l",
+                        on_cq=True)
+dart_ci_sandbox_builder("dart2js-csp-minified-linux-x64-chrome",
+                        category="dart2js|chrome|csp")
+dart_ci_sandbox_builder("dart2js-strong-mac-x64-chrome",
+                        category="dart2js|chrome|m",
+                        dimensions=mac())
+dart_ci_sandbox_builder("dart2js-strong-win-x64-chrome",
+                        category="dart2js|chrome|w",
+                        dimensions=windows())
+dart_ci_sandbox_builder("dart2js-strong-linux-x64-firefox",
+                        category="dart2js|firefox|l")
+dart_ci_sandbox_builder("dart2js-strong-win-x64-firefox",
+                        category="dart2js|firefox|w",
+                        dimensions=windows())
+dart_ci_sandbox_builder("dart2js-strong-mac-x64-safari",
+                        category="dart2js|safari|m",
+                        dimensions=mac())
+dart_ci_sandbox_builder("dart2js-strong-win-x64-ie11",
+                        category="dart2js|ms|ie",
+                        dimensions=windows())
+
+# analyzer
+dart_ci_sandbox_builder("flutter-analyze",
+                        category="analyzer|fa",
+                        channels=["try"],
+                        properties={"new_workflow_enabled": False},
+                        notifies=None,
+                        on_cq=True,
+                        location_regexp=[
+                            ".+/[+]/DEPS",
+                            ".+/[+]/pkg/analysis_server/.+",
+                            ".+/[+]/pkg/analysis_server_client/.+",
+                            ".+/[+]/pkg/analyzer/.+",
+                            ".+/[+]/pkg/analyzer_plugin/.+",
+                            ".+/[+]/pkg/front_end/.+",
+                            ".+/[+]/pkg/meta/.+",
+                            ".+/[+]/pkg/telemetry/.+",
+                        ])
+dart_ci_sandbox_builder("analyzer-analysis-server-linux",
+                        category="analyzer|as",
+                        channels=ANALYZER_CHANNELS,
+                        on_cq=True)
+dart_ci_sandbox_builder("analyzer-linux-release",
+                        category="analyzer|l",
+                        on_cq=True,
+                        channels=ANALYZER_CHANNELS)
+dart_ci_sandbox_builder("analyzer-mac-release",
+                        category="analyzer|m",
+                        dimensions=mac(),
+                        channels=ANALYZER_CHANNELS)
+dart_ci_sandbox_builder("analyzer-win-release",
+                        category="analyzer|w",
+                        dimensions=windows(),
+                        channels=ANALYZER_CHANNELS)
+
+# sdk
+dart_ci_builder("dart-sdk-linux", category="sdk|l", channels=CHANNELS)
+dart_ci_builder("dart-sdk-mac",
+                category="sdk|m",
+                channels=CHANNELS,
+                dimensions=mac())
+dart_ci_builder("dart-sdk-win",
+                category="sdk|w",
+                channels=CHANNELS,
+                dimensions=windows(),
+                on_cq=True)
+
+# ddc
+dart_ci_sandbox_builder("ddc-linux-release-chrome",
+                        category="ddc|l",
+                        on_cq=True)
+dart_ci_sandbox_builder("ddc-mac-release-chrome",
+                        category="ddc|m",
+                        dimensions=mac())
+dart_ci_sandbox_builder("ddc-win-release-chrome",
+                        category="ddc|w",
+                        dimensions=windows())
+
+# pkg
+dart_ci_sandbox_builder("pkg-linux-release", category="pkg|l", on_cq=True)
+dart_ci_sandbox_builder("pkg-mac-release", category="pkg|m", dimensions=mac())
+dart_ci_sandbox_builder("pkg-win-release",
+                        category="pkg|w",
+                        dimensions=windows())
+dart_ci_sandbox_builder("pkg-linux-debug", category="pkg|ld", channels=["try"])
+
+# misc
+dart_ci_sandbox_builder("gclient",
+                        recipe="gclient",
+                        category="misc|g",
+                        properties={"new_workflow_enabled": False},
+                        on_cq=True)
+dart_ci_builder("debianpackage-linux",
+                category="misc|dp",
+                channels=RELEASE_CHANNELS,
+                notifies="infra")
+dart_ci_builder("versionchecker-linux",
+                category="misc|vc",
+                channels=RELEASE_CHANNELS)
+
+# external
+dart_ci_builder("google",
+                recipe="external",
+                category="external|g",
+                enabled=False,
+                fyi=True)
+
+# infra
+dart_ci_builder("base",
+                recipe="forward_branch",
+                schedule="with 10m interval",
+                notifies="infra")
+dart_ci_builder("chocolatey",
+                recipe="chocolatey",
+                enabled=False,
+                dimensions=windows())
+dart_ci_builder("co19-roller", recipe="package_co19", enabled=False)
+dart_ci_builder("docker", recipe="docker", enabled=False)
+dart_ci_builder(
+    "linearize-flutter",
+    recipe="linearize",
+    properties={
+        "repo": "https://dart.googlesource.com/linear_sdk_flutter_engine.git"
+    },
+    notifies="infra",
+    triggered_by=[
+        "dart-gitiles-trigger-master", "dart-flutter-engine-trigger",
+        "dart-flutter-flutter-trigger"
+    ],
+    triggering_policy=scheduler.greedy_batching(max_batch_size=1),
+)
+
+# Fuzz testing builders
+dart_ci_sandbox_builder("fuzz-linux",
+                        channels=[],
+                        notifies="dart-fuzz-testing",
+                        properties={"new_workflow_enabled": False},
+                        schedule="0 3 * * *")
+
+# Try only builders
+dart_try_builder("cl-linux")
+dart_try_builder("cl-mac", dimensions=mac())
+dart_try_builder("cl-win", dimensions=windows())
+dart_try_builder("benchmark-linux", on_cq=True)
+
+
+def add_postponed_alt_console_entries():
+    for entry in postponed_alt_console_entries:
+        luci.console_view_entry(console_view="alt", **entry)
+
+
+add_postponed_alt_console_entries()
+
+# Flutter consoles
+luci.console_view_entry(
+    builder="flutter-analyze",
+    short_name="fa",
+    category="analyzer",
+    console_view="flutter",
+)
+
+luci.console_view_entry(
+    builder="flutter-frontend",
+    short_name="fl",
+    category="fasta",
+    console_view="flutter",
+)
+
+luci.console_view_entry(
+    builder="flutter-engine-linux",
+    short_name="3H",
+    category="flutter",
+    console_view="flutter-hhh",
+)

From 07ca863ce56ab1c103f0f2d599d953f3b6be8cda Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 2 May 2019 08:23:50 +0000
Subject: [PATCH 276/826] Revert "[infra] Migrate Luci config to starlark"

This reverts commit 20a1103538249ceb59abae269969cc30efcd2f87.

Reason for revert: Maybe caused the troubles on the HHH flutter builder.

Original change's description:
> [infra] Migrate Luci config to starlark
>
> * Fixes inconsistencies discovered while converting to starlark.
>
> To regenerate the config, run: ./main.star
>
> Documentation for lucicfg is here:
> https://chromium.googlesource.com/infra/luci/luci-go/+/refs/heads/master/lucicfg/doc/README.md
>
> Change-Id: I7f8f033162cb1117215d6763575c7e8956ea710c
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/99520
> Reviewed-by: William Hesse <whesse@google.com>

TBR=whesse@google.com,athom@google.com

Change-Id: Icc41a1a580c8dedf22eff1a9c6ea246c7a29ff7d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/100965
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 PRESUBMIT.py                 |   16 +-
 console-header.textpb        |   28 -
 cr-buildbucket.cfg           |   51 +-
 generated/commit-queue.cfg   |   98 -
 generated/cr-buildbucket.cfg | 7991 ----------------------------------
 generated/luci-logdog.cfg    |    9 -
 generated/luci-milo.cfg      | 2072 ---------
 generated/luci-notify.cfg    | 1368 ------
 generated/luci-scheduler.cfg | 3050 -------------
 generated/project.cfg        |    8 -
 luci-milo.cfg                |  360 +-
 luci-notify.cfg              |  224 +-
 luci-scheduler.cfg           |   10 +-
 main.star                    |  738 ----
 14 files changed, 334 insertions(+), 15689 deletions(-)
 delete mode 100644 console-header.textpb
 delete mode 100644 generated/commit-queue.cfg
 delete mode 100644 generated/cr-buildbucket.cfg
 delete mode 100644 generated/luci-logdog.cfg
 delete mode 100644 generated/luci-milo.cfg
 delete mode 100644 generated/luci-notify.cfg
 delete mode 100644 generated/luci-scheduler.cfg
 delete mode 100644 generated/project.cfg
 delete mode 100755 main.star

diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 9861fb0d818d..51b514c08fc1 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -2,20 +2,8 @@
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
-
 def CheckChangeOnUpload(input_api, output_api):
-    return _CommonChecks(input_api, output_api)
-
+  return input_api.canned_checks.CheckChangedLUCIConfigs(input_api, output_api)
 
 def CheckChangeOnCommit(input_api, output_api):
-    return _CommonChecks(input_api, output_api)
-
-
-def _CommonChecks(input_api, output_api):
-    tests = input_api.canned_checks.CheckLucicfgGenOutput(
-        input_api, output_api, "main.star")
-    results = []
-    results.extend(
-        input_api.canned_checks.CheckChangedLUCIConfigs(input_api, output_api))
-    results.extend(input_api.RunTests(tests))
-    return results
+  return input_api.canned_checks.CheckChangedLUCIConfigs(input_api, output_api)
diff --git a/console-header.textpb b/console-header.textpb
deleted file mode 100644
index b6c4b8eed23f..000000000000
--- a/console-header.textpb
+++ /dev/null
@@ -1,28 +0,0 @@
-links: {
-    name: "Consoles"
-    links: {
-        text: "Bleeding Edge console"
-        url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
-    }
-    links: {
-        text: "Alternative Bleeding Edge console"
-        url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
-    }
-    links: {
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
-    }
-    links: {
-        text: "SDK CQ Status"
-        url: "/p/dart/g/cq/builders"
-        alt: "SDK CQ Status"
-    }
-}
-console_groups: {
-    console_ids: "dart/flutter"
-    console_ids: "dart/flutter-hhh"
-}
-tree_status_host: "dart-status.appspot.com"
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index ffbe868cf28a..131fba4b6ce2 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -106,6 +106,13 @@ builder_mixins {
   }
 }
 
+builder_mixins {
+  name: "fyi"
+  recipe {
+    properties: "mastername:client.dart.fyi"
+  }
+}
+
 builder_mixins {
   name: "linearize"
   recipe {
@@ -141,12 +148,14 @@ builder_mixins {
 
 buckets {
   # CI Builders that require special permissions
-  name: "ci"
+  name: "luci.dart.ci"
   acl_sets: "ci"
 
   swarming {
     hostname: "chromium-swarm.appspot.com"
+    url_format: "https://ci.chromium.org/swarming/task/{task_id}"
     builder_defaults {
+      category: "Dart CI"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       build_numbers: YES
@@ -160,6 +169,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties: "clobber:true"
+        properties: "mastername:client.dart"
         name: "dart/neo"
       }
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -196,15 +206,17 @@ buckets {
 
 buckets {
   # CI Builders that only require try permissions
-  name: "ci.sandbox"
+  name: "luci.dart.ci.sandbox"
   acl_sets: "ci"
 
   swarming {
     hostname: "chromium-swarm.appspot.com"
+    url_format: "https://ci.chromium.org/swarming/task/{task_id}"
     builder_defaults {
+      category: "Dart CI (Sandboxed)"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
-      dimensions: "pool:try"
+      dimensions: "pool:luci.dart.try"
       build_numbers: YES
       priority: 50
       swarming_tags: "vpython:native-python-wrapper"
@@ -216,6 +228,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties: "clobber:true"
+        properties: "mastername:client.dart"
         name: "dart/neo"
       }
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -247,6 +260,7 @@ buckets {
     builders { name: "dart2js-strong-mac-x64-chrome" mixins: "mac" mixins: "new_workflow" }
     builders { name: "dart2js-strong-mac-x64-safari" mixins: "mac" mixins: "new_workflow" }
     builders { name: "dart2js-strong-win-x64-chrome" mixins: "win" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-win-x64-edge" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-win-x64-firefox" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-win-x64-ie11" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-unit-linux-x64-release" mixins: "new_workflow" }
@@ -289,9 +303,9 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64" mixins: "mac" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-debug-arm" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-release-arm" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-product-arm" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-debug-arm" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-release-arm" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-product-arm" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-android-release-arm" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm64" mixins: "new_workflow" }
@@ -334,6 +348,7 @@ buckets {
     builders { name: "dart2js-strong-mac-x64-chrome-dev" mixins: "mac" mixins: "new_workflow" }
     builders { name: "dart2js-strong-mac-x64-safari-dev" mixins: "mac" mixins: "new_workflow" }
     builders { name: "dart2js-strong-win-x64-chrome-dev" mixins: "win" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-win-x64-edge-dev" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-win-x64-firefox-dev" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-win-x64-ie11-dev" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-unit-linux-x64-release-dev" mixins: "new_workflow" }
@@ -372,9 +387,9 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-dev" mixins: "mac" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-dev" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-dev" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-debug-arm-dev" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-release-arm-dev" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-product-arm-dev" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-debug-arm-dev" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-release-arm-dev" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-product-arm-dev" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-android-release-arm-dev" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm-dev" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm64-dev" mixins: "new_workflow" }
@@ -417,6 +432,7 @@ buckets {
     builders { name: "dart2js-strong-mac-x64-chrome-stable" mixins: "mac" mixins: "new_workflow" }
     builders { name: "dart2js-strong-mac-x64-safari-stable" mixins: "mac" mixins: "new_workflow" }
     builders { name: "dart2js-strong-win-x64-chrome-stable" mixins: "win" mixins: "new_workflow" }
+    builders { name: "dart2js-strong-win-x64-edge-stable" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-win-x64-firefox-stable" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-strong-win-x64-ie11-stable" mixins: "win" mixins: "new_workflow" }
     builders { name: "dart2js-unit-linux-x64-release-stable" mixins: "new_workflow" }
@@ -455,9 +471,9 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-stable" mixins: "mac" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-stable" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-stable" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-debug-arm-stable" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-release-arm-stable" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-product-arm-stable" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-debug-arm-stable" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-release-arm-stable" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-product-arm-stable" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-android-release-arm-stable" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm-stable" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm64-stable" mixins: "new_workflow" }
@@ -486,12 +502,14 @@ buckets {
 }
 
 buckets {
-  name: "try"
+  name: "luci.dart.try"
   acl_sets: "try"
 
   swarming {
     hostname: "chromium-swarm.appspot.com"
+    url_format: "https://ci.chromium.org/swarming/task/{task_id}"
     builder_defaults {
+      category: "Dart Try"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
       build_numbers: YES
@@ -505,6 +523,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties: "clobber:true"
+        properties: "mastername:dart.try"
         name: "dart/neo"
       }
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -575,9 +594,9 @@ buckets {
     builders { name: "vm-kernel-mac-release-x64-try" mixins: "mac" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-try" mixins: "new_workflow" }
     builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-try" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-debug-arm-try" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-release-arm-try" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-product-arm-try" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-debug-arm-try" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-release-arm-try" mixins: "android" mixins: "new_workflow" }
+    builders { name: "vm-ffi-android-product-arm-try" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-android-release-arm-try" mixins: "android" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm-try" mixins: "new_workflow" }
     builders { name: "vm-kernel-precomp-bare-linux-release-simarm64-try" mixins: "new_workflow" }
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
deleted file mode 100644
index e14f992df8a0..000000000000
--- a/generated/commit-queue.cfg
+++ /dev/null
@@ -1,98 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-#
-# For the schema of this file, see Config message:
-#   https://luci-config.appspot.com/schemas/projects:commit-queue.cfg
-
-submit_options: <
-  max_burst: 2
-  burst_delay: <
-    seconds: 480
-  >
->
-config_groups: <
-  gerrit: <
-    url: "https://dart-review.googlesource.com"
-    projects: <
-      name: "sdk"
-      ref_regexp: "refs/heads/.+"
-    >
-  >
-  verifiers: <
-    gerrit_cq_ability: <
-      committer_list: "project-dart-committers"
-      dry_run_access_list: "project-dart-tryjob-access"
-      allow_submit_with_open_deps: true
-    >
-    tree_status: <
-      url: "https://dart-status.appspot.com"
-    >
-    tryjob: <
-      builders: <
-        name: "dart/try/analyzer-analysis-server-linux-try"
-      >
-      builders: <
-        name: "dart/try/analyzer-linux-release-try"
-      >
-      builders: <
-        name: "dart/try/benchmark-linux-try"
-      >
-      builders: <
-        name: "dart/try/dart-sdk-win-try"
-      >
-      builders: <
-        name: "dart/try/dart2js-minified-strong-linux-x64-d8-try"
-      >
-      builders: <
-        name: "dart/try/dart2js-strong-hostasserts-linux-ia32-d8-try"
-      >
-      builders: <
-        name: "dart/try/dart2js-strong-linux-x64-chrome-try"
-      >
-      builders: <
-        name: "dart/try/dart2js-unit-linux-x64-release-try"
-      >
-      builders: <
-        name: "dart/try/ddc-linux-release-chrome-try"
-      >
-      builders: <
-        name: "dart/try/flutter-analyze-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/pkg/analysis_server/.+"
-        location_regexp: ".+/[+]/pkg/analysis_server_client/.+"
-        location_regexp: ".+/[+]/pkg/analyzer/.+"
-        location_regexp: ".+/[+]/pkg/analyzer_plugin/.+"
-        location_regexp: ".+/[+]/pkg/front_end/.+"
-        location_regexp: ".+/[+]/pkg/meta/.+"
-        location_regexp: ".+/[+]/pkg/telemetry/.+"
-      >
-      builders: <
-        name: "dart/try/front-end-linux-release-x64-try"
-      >
-      builders: <
-        name: "dart/try/gclient-try"
-      >
-      builders: <
-        name: "dart/try/pkg-linux-release-try"
-      >
-      builders: <
-        name: "dart/try/vm-canary-linux-debug-try"
-      >
-      builders: <
-        name: "dart/try/vm-kernel-linux-product-x64-try"
-      >
-      builders: <
-        name: "dart/try/vm-kernel-linux-release-simdbc64-try"
-      >
-      builders: <
-        name: "dart/try/vm-kernel-linux-release-x64-try"
-      >
-      builders: <
-        name: "dart/try/vm-kernel-mac-release-x64-try"
-        experiment_percentage: 5
-      >
-      retry_config: <
-      >
-    >
-  >
->
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
deleted file mode 100644
index c38f63dd0b05..000000000000
--- a/generated/cr-buildbucket.cfg
+++ /dev/null
@@ -1,7991 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-#
-# For the schema of this file, see BuildbucketCfg message:
-#   https://luci-config.appspot.com/schemas/projects:buildbucket.cfg
-
-buckets: <
-  name: "ci"
-  acls: <
-    group: "all"
-  >
-  acls: <
-    role: SCHEDULER
-    identity: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-  >
-  acls: <
-    role: SCHEDULER
-    identity: "user:luci-scheduler@appspot.gserviceaccount.com"
-  >
-  acls: <
-    role: SCHEDULER
-    group: "project-dart-admins"
-  >
-  swarming: <
-    builders: <
-      name: "base"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      recipe: <
-        name: "dart/forward_branch"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "chocolatey"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      recipe: <
-        name: "dart/chocolatey"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "co19-roller"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      recipe: <
-        name: "dart/package_co19"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart-sdk-linux"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart-sdk-linux-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart-sdk-linux-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart-sdk-mac"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart-sdk-mac-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart-sdk-mac-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart-sdk-win"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart-sdk-win-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart-sdk-win-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "debianpackage-linux"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "debianpackage-linux-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "debianpackage-linux-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "docker"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      recipe: <
-        name: "dart/docker"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "google"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      recipe: <
-        name: "dart/external"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "linearize-flutter"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      recipe: <
-        name: "dart/linearize"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "repo:\"https://dart.googlesource.com/linear_sdk_flutter_engine.git\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "versionchecker-linux"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "versionchecker-linux-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "versionchecker-linux-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-  >
->
-buckets: <
-  name: "ci.sandbox"
-  acls: <
-    group: "all"
-  >
-  acls: <
-    role: SCHEDULER
-    identity: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-  >
-  acls: <
-    role: SCHEDULER
-    identity: "user:luci-scheduler@appspot.gserviceaccount.com"
-  >
-  acls: <
-    role: SCHEDULER
-    group: "project-dart-admins"
-  >
-  swarming: <
-    builders: <
-      name: "analyzer-analysis-server-linux"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "analyzer-analysis-server-linux-analyzer-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "analyzer-analysis-server-linux-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "analyzer-analysis-server-linux-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "analyzer-linux-release"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "analyzer-linux-release-analyzer-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "analyzer-linux-release-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "analyzer-linux-release-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "analyzer-mac-release"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "analyzer-mac-release-analyzer-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "analyzer-mac-release-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "analyzer-mac-release-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "analyzer-win-release"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "analyzer-win-release-analyzer-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "analyzer-win-release-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "analyzer-win-release-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "app-kernel-linux-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "app-kernel-linux-debug-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "app-kernel-linux-debug-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "app-kernel-linux-product-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "app-kernel-linux-product-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "app-kernel-linux-product-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "app-kernel-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "app-kernel-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "app-kernel-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "cross-vm-linux-release-arm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "cross-vm-linux-release-arm64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "cross-vm-linux-release-arm64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-csp-minified-linux-x64-chrome"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-csp-minified-linux-x64-chrome-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-csp-minified-linux-x64-chrome-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-minified-strong-linux-x64-d8"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-minified-strong-linux-x64-d8-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-minified-strong-linux-x64-d8-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-hostasserts-linux-ia32-d8"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-linux-x64-chrome"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-linux-x64-chrome-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-linux-x64-chrome-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-linux-x64-firefox"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-linux-x64-firefox-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-linux-x64-firefox-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-mac-x64-chrome"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-mac-x64-chrome-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-mac-x64-chrome-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-mac-x64-safari"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-mac-x64-safari-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-mac-x64-safari-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-win-x64-chrome"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-win-x64-chrome-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-win-x64-chrome-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-win-x64-firefox"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-win-x64-firefox-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-win-x64-firefox-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-win-x64-ie11"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-win-x64-ie11-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-win-x64-ie11-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-unit-linux-x64-release"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-unit-linux-x64-release-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-unit-linux-x64-release-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "ddc-linux-release-chrome"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "ddc-linux-release-chrome-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "ddc-linux-release-chrome-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "ddc-mac-release-chrome"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "ddc-mac-release-chrome-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "ddc-mac-release-chrome-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "ddc-win-release-chrome"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "ddc-win-release-chrome-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "ddc-win-release-chrome-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "flutter-analyze"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "flutter-engine-linux"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/flutter_engine"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "flutter-frontend"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "front-end-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "front-end-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "front-end-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "front-end-mac-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "front-end-mac-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "front-end-mac-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "front-end-win-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "front-end-win-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "front-end-win-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "fuzz-linux"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "gclient"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/gclient"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "gclient-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/gclient"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "gclient-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/gclient"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "pkg-linux-debug"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "pkg-linux-release"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "pkg-linux-release-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "pkg-linux-release-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "pkg-mac-release"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "pkg-mac-release-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "pkg-mac-release-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "pkg-win-release"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "pkg-win-release-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "pkg-win-release-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-canary-linux-debug"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-canary-linux-debug-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-canary-linux-debug-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-dartkb-linux-debug-simarm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-dartkb-linux-debug-simarm64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-dartkb-linux-debug-simarm64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-dartkb-linux-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-dartkb-linux-debug-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-dartkb-linux-debug-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-dartkb-linux-product-simarm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-dartkb-linux-product-simarm64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-dartkb-linux-product-simarm64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-dartkb-linux-product-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-dartkb-linux-product-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-dartkb-linux-product-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-dartkb-linux-release-simarm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-dartkb-linux-release-simarm64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-dartkb-linux-release-simarm64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-dartkb-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-dartkb-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-dartkb-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-ffi-android-debug-arm"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-ffi-android-debug-arm-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-ffi-android-debug-arm-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-ffi-android-product-arm"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-ffi-android-product-arm-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-ffi-android-product-arm-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-ffi-android-release-arm"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-ffi-android-release-arm-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-ffi-android-release-arm-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-asan-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-asan-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-asan-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-checked-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-checked-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-checked-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-debug-ia32"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-debug-ia32-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-debug-ia32-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-debug-simdbc64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-debug-simdbc64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-debug-simdbc64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-debug-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-debug-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-product-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-product-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-product-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-release-ia32"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-release-ia32-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-release-ia32-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-release-simarm"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-release-simarm-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-release-simarm-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-release-simarm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-release-simarm64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-release-simarm64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-release-simdbc64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-release-simdbc64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-release-simdbc64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-mac-debug-simdbc64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-mac-debug-simdbc64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-mac-debug-simdbc64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-mac-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-mac-debug-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-mac-debug-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-mac-product-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-mac-product-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-mac-product-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-mac-release-simdbc64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-mac-release-simdbc64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-mac-release-simdbc64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-mac-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-mac-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-mac-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-ia32"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-android-release-arm"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "shard_timeout:5400"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-android-release-arm-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "shard_timeout:5400"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-android-release-arm-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "shard_timeout:5400"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-bare-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-bare-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-bare-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-linux-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-linux-debug-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-linux-debug-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-linux-product-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-linux-product-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-linux-product-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-linux-release-simarm"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-linux-release-simarm-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-linux-release-simarm-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-linux-release-simarm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-linux-release-simarm64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-linux-release-simarm64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-mac-release-simarm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-mac-release-simarm64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-mac-release-simarm64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-win-release-simarm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-win-release-simarm64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-win-release-simarm64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-win-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-win-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-win-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-linux-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-linux-debug-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-linux-debug-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-mac-debug-simdbc64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-mac-debug-simdbc64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-mac-debug-simdbc64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-mac-release-simdbc64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-mac-release-simdbc64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-mac-release-simdbc64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-rollback-linux-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-rollback-linux-debug-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-rollback-linux-debug-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-rollback-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-rollback-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-rollback-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-debug-ia32"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-debug-ia32-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-debug-ia32-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-debug-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-debug-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-product-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-product-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-product-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-release-ia32"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-release-ia32-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-release-ia32-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-  >
->
-buckets: <
-  name: "try"
-  acls: <
-    group: "all"
-  >
-  acls: <
-    role: SCHEDULER
-    group: "project-dart-admins"
-  >
-  acls: <
-    role: SCHEDULER
-    group: "project-dart-tryjob-access"
-  >
-  acls: <
-    role: SCHEDULER
-    group: "service-account-cq"
-  >
-  swarming: <
-    builders: <
-      name: "analyzer-analysis-server-linux-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "analyzer-linux-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "analyzer-mac-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "analyzer-win-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "app-kernel-linux-debug-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "app-kernel-linux-product-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "app-kernel-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "benchmark-linux-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "cl-linux-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "cl-mac-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "cl-win-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart-sdk-linux-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart-sdk-mac-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart-sdk-win-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-csp-minified-linux-x64-chrome-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-minified-strong-linux-x64-d8-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-hostasserts-linux-ia32-d8-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-linux-x64-chrome-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-linux-x64-firefox-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-mac-x64-chrome-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-mac-x64-safari-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-win-x64-chrome-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-win-x64-firefox-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-win-x64-ie11-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-unit-linux-x64-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "ddc-linux-release-chrome-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "ddc-mac-release-chrome-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "ddc-win-release-chrome-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "flutter-analyze-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "flutter-frontend-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "front-end-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "front-end-mac-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "front-end-win-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "gclient-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/gclient"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "pkg-linux-debug-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "pkg-linux-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "pkg-mac-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "pkg-win-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-canary-linux-debug-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-dartkb-linux-debug-simarm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-dartkb-linux-debug-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-dartkb-linux-product-simarm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-dartkb-linux-product-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-dartkb-linux-release-simarm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-dartkb-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-ffi-android-debug-arm-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-ffi-android-product-arm-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-ffi-android-release-arm-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-asan-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-checked-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-debug-ia32-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-debug-simdbc64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-debug-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-product-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-release-ia32-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-release-simarm-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-release-simarm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-release-simdbc64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-mac-debug-simdbc64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-mac-debug-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-mac-product-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-mac-release-simdbc64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-mac-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-ia32-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-android-release-arm-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "shard_timeout:5400"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-bare-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-linux-debug-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-linux-product-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-linux-release-simarm-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-linux-release-simarm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-mac-release-simarm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-win-release-simarm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-win-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-linux-debug-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-mac-debug-simdbc64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-mac-release-simdbc64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-rollback-linux-debug-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-rollback-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-debug-ia32-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-debug-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-product-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-release-ia32-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-  >
->
diff --git a/generated/luci-logdog.cfg b/generated/luci-logdog.cfg
deleted file mode 100644
index adc75bef4980..000000000000
--- a/generated/luci-logdog.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-#
-# For the schema of this file, see ProjectConfig message:
-#   https://luci-config.appspot.com/schemas/projects:luci-logdog.cfg
-
-reader_auth_groups: "all"
-writer_auth_groups: "luci-logdog-chromium-writers"
-archive_gs_bucket: "chromium-luci-logdog"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
deleted file mode 100644
index b08510b1d050..000000000000
--- a/generated/luci-milo.cfg
+++ /dev/null
@@ -1,2072 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-#
-# For the schema of this file, see Project message:
-#   https://luci-config.appspot.com/schemas/projects:luci-milo.cfg
-
-consoles: <
-  id: "analyzer-stable"
-  name: "SDK Analyzer Stable Branch Console"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/analyzer-stable"
-  manifest_name: "REVISION"
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-analyzer-stable"
-    category: "analyzer"
-    short_name: "as"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-analyzer-stable"
-    category: "analyzer"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-analyzer-stable"
-    category: "analyzer"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-analyzer-stable"
-    category: "analyzer"
-    short_name: "w"
-  >
-  header: <
-    links: <
-      name: "Consoles"
-      links: <
-        text: "Bleeding Edge console"
-        url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
-      >
-      links: <
-        text: "Alternative Bleeding Edge console"
-        url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
-      >
-      links: <
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
-      >
-      links: <
-        text: "SDK CQ Status"
-        url: "/p/dart/g/cq/builders"
-        alt: "SDK CQ Status"
-      >
-    >
-    console_groups: <
-      console_ids: "dart/flutter"
-      console_ids: "dart/flutter-hhh"
-    >
-    tree_status_host: "dart-status.appspot.com"
-  >
->
-consoles: <
-  id: "be"
-  name: "SDK Bleeding Edge Console"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/master"
-  manifest_name: "REVISION"
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
-    category: "fasta"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
-    category: "fasta"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
-    category: "fasta"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
-    category: "fasta"
-    short_name: "fl"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
-    category: "flutter"
-    short_name: "3H"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
-    category: "vm|app-kernel"
-    short_name: "d64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64"
-    category: "vm|app-kernel"
-    short_name: "p64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64"
-    category: "vm|app-kernel"
-    short_name: "r64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-simarm64"
-    category: "vm|dartkb"
-    short_name: "sd"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64"
-    category: "vm|dartkb"
-    short_name: "d"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-simarm64"
-    category: "vm|dartkb"
-    short_name: "sp"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-x64"
-    category: "vm|dartkb"
-    short_name: "p"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64"
-    category: "vm|dartkb"
-    short_name: "sr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64"
-    category: "vm|dartkb"
-    short_name: "r"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
-    category: "vm|kernel"
-    short_name: "c"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
-    category: "vm|kernel"
-    short_name: "d"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64"
-    category: "vm|kernel"
-    short_name: "dbc"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
-    category: "vm|kernel"
-    short_name: "a32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
-    category: "vm|kernel"
-    short_name: "a64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64"
-    category: "vm|kernel"
-    short_name: "rbc"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32"
-    category: "vm|kernel"
-    short_name: "r32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
-    category: "vm|kernel"
-    short_name: "r"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
-    category: "vm|kernel"
-    short_name: "rc"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32"
-    category: "vm|kernel"
-    short_name: "d32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-simdbc64"
-    category: "vm|kernel"
-    short_name: "mds"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-simdbc64"
-    category: "vm|kernel"
-    short_name: "mrs"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
-    category: "vm|kernel"
-    short_name: "md"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
-    category: "vm|kernel"
-    short_name: "mr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
-    category: "vm|kernel"
-    short_name: "wd3"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64"
-    category: "vm|kernel"
-    short_name: "wd"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32"
-    category: "vm|kernel"
-    short_name: "wr3"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
-    category: "vm|kernel"
-    short_name: "wr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
-    category: "vm|kernel"
-    short_name: "cra"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm"
-    category: "vm|kernel-precomp"
-    short_name: "and"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
-    category: "vm|kernel-precomp"
-    short_name: "d"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
-    category: "vm|kernel-precomp"
-    short_name: "p"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
-    category: "vm|kernel-precomp"
-    short_name: "a32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "a64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "r"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "br"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm"
-    category: "vm|kernel-precomp"
-    short_name: "bra32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "bra64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "o"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "ma"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "wa"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "wr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
-    category: "vm|misc"
-    short_name: "a64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
-    category: "vm|misc"
-    short_name: "o32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
-    category: "vm|misc"
-    short_name: "o64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
-    category: "vm|product"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
-    category: "vm|product"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
-    category: "vm|product"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
-    category: "vm|reload-kernel"
-    short_name: "d"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
-    category: "vm|reload-kernel"
-    short_name: "r"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-debug-simdbc64"
-    category: "vm|reload-kernel"
-    short_name: "md"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64"
-    category: "vm|reload-kernel"
-    short_name: "mr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
-    category: "vm|reload-kernel"
-    short_name: "drb"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64"
-    category: "vm|reload-kernel"
-    short_name: "rrb"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
-    category: "vm|ffi"
-    short_name: "d32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm"
-    category: "vm|ffi"
-    short_name: "r32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm"
-    category: "vm|ffi"
-    short_name: "p32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
-    category: "dart2js|d8"
-    short_name: "ha"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
-    category: "dart2js|d8"
-    short_name: "mi"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
-    category: "dart2js|d8"
-    short_name: "u"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
-    category: "dart2js|safari"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11"
-    category: "dart2js|ms"
-    short_name: "ie"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
-    category: "analyzer"
-    short_name: "fa"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
-    category: "analyzer"
-    short_name: "as"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
-    category: "analyzer"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
-    category: "analyzer"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
-    category: "analyzer"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci/dart-sdk-linux"
-    category: "sdk"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac"
-    category: "sdk"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci/dart-sdk-win"
-    category: "sdk"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
-    category: "ddc"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
-    category: "ddc"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
-    category: "ddc"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
-    category: "pkg"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
-    category: "pkg"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
-    category: "pkg"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
-    category: "pkg"
-    short_name: "ld"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/gclient"
-    category: "misc"
-    short_name: "g"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci/debianpackage-linux"
-    category: "misc"
-    short_name: "dp"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci/versionchecker-linux"
-    category: "misc"
-    short_name: "vc"
-  >
-  header: <
-    links: <
-      name: "Consoles"
-      links: <
-        text: "Bleeding Edge console"
-        url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
-      >
-      links: <
-        text: "Alternative Bleeding Edge console"
-        url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
-      >
-      links: <
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
-      >
-      links: <
-        text: "SDK CQ Status"
-        url: "/p/dart/g/cq/builders"
-        alt: "SDK CQ Status"
-      >
-    >
-    console_groups: <
-      console_ids: "dart/flutter"
-      console_ids: "dart/flutter-hhh"
-    >
-    tree_status_host: "dart-status.appspot.com"
-  >
->
-consoles: <
-  id: "alt"
-  name: "SDK Bleeding Edge Console (alternative)"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/master"
-  manifest_name: "REVISION"
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
-    category: "fasta"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
-    category: "fasta"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
-    category: "fasta"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
-    category: "fasta"
-    short_name: "fl"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
-    category: "flutter"
-    short_name: "3H"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
-    category: "dart2js|d8"
-    short_name: "ha"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
-    category: "dart2js|d8"
-    short_name: "mi"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
-    category: "dart2js|d8"
-    short_name: "u"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
-    category: "dart2js|safari"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11"
-    category: "dart2js|ms"
-    short_name: "ie"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
-    category: "analyzer"
-    short_name: "fa"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
-    category: "analyzer"
-    short_name: "as"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
-    category: "analyzer"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
-    category: "analyzer"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
-    category: "analyzer"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci/dart-sdk-linux"
-    category: "sdk"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac"
-    category: "sdk"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci/dart-sdk-win"
-    category: "sdk"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
-    category: "ddc"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
-    category: "ddc"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
-    category: "ddc"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
-    category: "pkg"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
-    category: "pkg"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
-    category: "pkg"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
-    category: "pkg"
-    short_name: "ld"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/gclient"
-    category: "misc"
-    short_name: "g"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci/debianpackage-linux"
-    category: "misc"
-    short_name: "dp"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci/versionchecker-linux"
-    category: "misc"
-    short_name: "vc"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
-    category: "vm|app-kernel"
-    short_name: "d64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64"
-    category: "vm|app-kernel"
-    short_name: "p64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64"
-    category: "vm|app-kernel"
-    short_name: "r64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-simarm64"
-    category: "vm|dartkb"
-    short_name: "sd"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64"
-    category: "vm|dartkb"
-    short_name: "d"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-simarm64"
-    category: "vm|dartkb"
-    short_name: "sp"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-x64"
-    category: "vm|dartkb"
-    short_name: "p"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64"
-    category: "vm|dartkb"
-    short_name: "sr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64"
-    category: "vm|dartkb"
-    short_name: "r"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
-    category: "vm|kernel"
-    short_name: "c"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
-    category: "vm|kernel"
-    short_name: "d"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64"
-    category: "vm|kernel"
-    short_name: "dbc"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
-    category: "vm|kernel"
-    short_name: "a32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
-    category: "vm|kernel"
-    short_name: "a64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64"
-    category: "vm|kernel"
-    short_name: "rbc"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32"
-    category: "vm|kernel"
-    short_name: "r32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
-    category: "vm|kernel"
-    short_name: "r"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
-    category: "vm|kernel"
-    short_name: "rc"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32"
-    category: "vm|kernel"
-    short_name: "d32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-simdbc64"
-    category: "vm|kernel"
-    short_name: "mds"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-simdbc64"
-    category: "vm|kernel"
-    short_name: "mrs"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
-    category: "vm|kernel"
-    short_name: "md"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
-    category: "vm|kernel"
-    short_name: "mr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
-    category: "vm|kernel"
-    short_name: "wd3"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64"
-    category: "vm|kernel"
-    short_name: "wd"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32"
-    category: "vm|kernel"
-    short_name: "wr3"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
-    category: "vm|kernel"
-    short_name: "wr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
-    category: "vm|kernel"
-    short_name: "cra"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm"
-    category: "vm|kernel-precomp"
-    short_name: "and"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
-    category: "vm|kernel-precomp"
-    short_name: "d"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
-    category: "vm|kernel-precomp"
-    short_name: "p"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
-    category: "vm|kernel-precomp"
-    short_name: "a32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "a64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "r"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "br"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm"
-    category: "vm|kernel-precomp"
-    short_name: "bra32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "bra64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "o"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "ma"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "wa"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "wr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
-    category: "vm|misc"
-    short_name: "a64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
-    category: "vm|misc"
-    short_name: "o32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
-    category: "vm|misc"
-    short_name: "o64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
-    category: "vm|product"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
-    category: "vm|product"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
-    category: "vm|product"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
-    category: "vm|reload-kernel"
-    short_name: "d"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
-    category: "vm|reload-kernel"
-    short_name: "r"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-debug-simdbc64"
-    category: "vm|reload-kernel"
-    short_name: "md"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64"
-    category: "vm|reload-kernel"
-    short_name: "mr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
-    category: "vm|reload-kernel"
-    short_name: "drb"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64"
-    category: "vm|reload-kernel"
-    short_name: "rrb"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
-    category: "vm|ffi"
-    short_name: "d32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm"
-    category: "vm|ffi"
-    short_name: "r32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm"
-    category: "vm|ffi"
-    short_name: "p32"
-  >
-  header: <
-    links: <
-      name: "Consoles"
-      links: <
-        text: "Bleeding Edge console"
-        url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
-      >
-      links: <
-        text: "Alternative Bleeding Edge console"
-        url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
-      >
-      links: <
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
-      >
-      links: <
-        text: "SDK CQ Status"
-        url: "/p/dart/g/cq/builders"
-        alt: "SDK CQ Status"
-      >
-    >
-    console_groups: <
-      console_ids: "dart/flutter"
-      console_ids: "dart/flutter-hhh"
-    >
-    tree_status_host: "dart-status.appspot.com"
-  >
->
-consoles: <
-  id: "dev"
-  name: "SDK Dev Console"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/dev"
-  manifest_name: "REVISION"
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-dev"
-    category: "fasta"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-dev"
-    category: "fasta"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-dev"
-    category: "fasta"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-dev"
-    category: "vm|app-kernel"
-    short_name: "d64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64-dev"
-    category: "vm|app-kernel"
-    short_name: "p64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-dev"
-    category: "vm|app-kernel"
-    short_name: "r64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-simarm64-dev"
-    category: "vm|dartkb"
-    short_name: "sd"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64-dev"
-    category: "vm|dartkb"
-    short_name: "d"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-simarm64-dev"
-    category: "vm|dartkb"
-    short_name: "sp"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-x64-dev"
-    category: "vm|dartkb"
-    short_name: "p"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64-dev"
-    category: "vm|dartkb"
-    short_name: "sr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-dev"
-    category: "vm|dartkb"
-    short_name: "r"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-dev"
-    category: "vm|kernel"
-    short_name: "c"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-dev"
-    category: "vm|kernel"
-    short_name: "d"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64-dev"
-    category: "vm|kernel"
-    short_name: "dbc"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-dev"
-    category: "vm|kernel"
-    short_name: "a32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-dev"
-    category: "vm|kernel"
-    short_name: "a64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64-dev"
-    category: "vm|kernel"
-    short_name: "rbc"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32-dev"
-    category: "vm|kernel"
-    short_name: "r32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-dev"
-    category: "vm|kernel"
-    short_name: "r"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-dev"
-    category: "vm|kernel"
-    short_name: "rc"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32-dev"
-    category: "vm|kernel"
-    short_name: "d32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-simdbc64-dev"
-    category: "vm|kernel"
-    short_name: "mds"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-simdbc64-dev"
-    category: "vm|kernel"
-    short_name: "mrs"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-dev"
-    category: "vm|kernel"
-    short_name: "md"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-dev"
-    category: "vm|kernel"
-    short_name: "mr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32-dev"
-    category: "vm|kernel"
-    short_name: "wd3"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-dev"
-    category: "vm|kernel"
-    short_name: "wd"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32-dev"
-    category: "vm|kernel"
-    short_name: "wr3"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-dev"
-    category: "vm|kernel"
-    short_name: "wr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-dev"
-    category: "vm|kernel"
-    short_name: "cra"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm-dev"
-    category: "vm|kernel-precomp"
-    short_name: "and"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "d"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "p"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-dev"
-    category: "vm|kernel-precomp"
-    short_name: "a32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "a64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "r"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "br"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm-dev"
-    category: "vm|kernel-precomp"
-    short_name: "bra32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "bra64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "o"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "ma"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-simarm64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "wa"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "wr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-dev"
-    category: "vm|misc"
-    short_name: "a64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32-dev"
-    category: "vm|misc"
-    short_name: "o32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-dev"
-    category: "vm|misc"
-    short_name: "o64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64-dev"
-    category: "vm|product"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64-dev"
-    category: "vm|product"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64-dev"
-    category: "vm|product"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64-dev"
-    category: "vm|reload-kernel"
-    short_name: "d"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64-dev"
-    category: "vm|reload-kernel"
-    short_name: "r"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-debug-simdbc64-dev"
-    category: "vm|reload-kernel"
-    short_name: "md"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64-dev"
-    category: "vm|reload-kernel"
-    short_name: "mr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64-dev"
-    category: "vm|reload-kernel"
-    short_name: "drb"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64-dev"
-    category: "vm|reload-kernel"
-    short_name: "rrb"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-dev"
-    category: "vm|ffi"
-    short_name: "d32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-dev"
-    category: "vm|ffi"
-    short_name: "r32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-dev"
-    category: "vm|ffi"
-    short_name: "p32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-dev"
-    category: "dart2js|d8"
-    short_name: "ha"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-dev"
-    category: "dart2js|d8"
-    short_name: "mi"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-dev"
-    category: "dart2js|d8"
-    short_name: "u"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-dev"
-    category: "dart2js|chrome"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-dev"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-dev"
-    category: "dart2js|chrome"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-dev"
-    category: "dart2js|chrome"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-dev"
-    category: "dart2js|firefox"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox-dev"
-    category: "dart2js|firefox"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-dev"
-    category: "dart2js|safari"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11-dev"
-    category: "dart2js|ms"
-    short_name: "ie"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-dev"
-    category: "analyzer"
-    short_name: "as"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-dev"
-    category: "analyzer"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-dev"
-    category: "analyzer"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-dev"
-    category: "analyzer"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci/dart-sdk-linux-dev"
-    category: "sdk"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-dev"
-    category: "sdk"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci/dart-sdk-win-dev"
-    category: "sdk"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-dev"
-    category: "ddc"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-dev"
-    category: "ddc"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-dev"
-    category: "ddc"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
-    category: "pkg"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-dev"
-    category: "pkg"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-dev"
-    category: "pkg"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/gclient-dev"
-    category: "misc"
-    short_name: "g"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci/debianpackage-linux-dev"
-    category: "misc"
-    short_name: "dp"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci/versionchecker-linux-dev"
-    category: "misc"
-    short_name: "vc"
-  >
-  header: <
-    links: <
-      name: "Consoles"
-      links: <
-        text: "Bleeding Edge console"
-        url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
-      >
-      links: <
-        text: "Alternative Bleeding Edge console"
-        url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
-      >
-      links: <
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
-      >
-      links: <
-        text: "SDK CQ Status"
-        url: "/p/dart/g/cq/builders"
-        alt: "SDK CQ Status"
-      >
-    >
-    console_groups: <
-      console_ids: "dart/flutter"
-      console_ids: "dart/flutter-hhh"
-    >
-    tree_status_host: "dart-status.appspot.com"
-  >
->
-consoles: <
-  id: "stable"
-  name: "SDK Stable Console"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/stable"
-  manifest_name: "REVISION"
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-stable"
-    category: "fasta"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-stable"
-    category: "fasta"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-stable"
-    category: "fasta"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-stable"
-    category: "vm|app-kernel"
-    short_name: "d64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64-stable"
-    category: "vm|app-kernel"
-    short_name: "p64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-stable"
-    category: "vm|app-kernel"
-    short_name: "r64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-simarm64-stable"
-    category: "vm|dartkb"
-    short_name: "sd"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64-stable"
-    category: "vm|dartkb"
-    short_name: "d"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-simarm64-stable"
-    category: "vm|dartkb"
-    short_name: "sp"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-x64-stable"
-    category: "vm|dartkb"
-    short_name: "p"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64-stable"
-    category: "vm|dartkb"
-    short_name: "sr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-stable"
-    category: "vm|dartkb"
-    short_name: "r"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-stable"
-    category: "vm|kernel"
-    short_name: "c"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-stable"
-    category: "vm|kernel"
-    short_name: "d"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64-stable"
-    category: "vm|kernel"
-    short_name: "dbc"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-stable"
-    category: "vm|kernel"
-    short_name: "a32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-stable"
-    category: "vm|kernel"
-    short_name: "a64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64-stable"
-    category: "vm|kernel"
-    short_name: "rbc"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32-stable"
-    category: "vm|kernel"
-    short_name: "r32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-stable"
-    category: "vm|kernel"
-    short_name: "r"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-stable"
-    category: "vm|kernel"
-    short_name: "rc"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32-stable"
-    category: "vm|kernel"
-    short_name: "d32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-simdbc64-stable"
-    category: "vm|kernel"
-    short_name: "mds"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-simdbc64-stable"
-    category: "vm|kernel"
-    short_name: "mrs"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-stable"
-    category: "vm|kernel"
-    short_name: "md"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-stable"
-    category: "vm|kernel"
-    short_name: "mr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32-stable"
-    category: "vm|kernel"
-    short_name: "wd3"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-stable"
-    category: "vm|kernel"
-    short_name: "wd"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32-stable"
-    category: "vm|kernel"
-    short_name: "wr3"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-stable"
-    category: "vm|kernel"
-    short_name: "wr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-stable"
-    category: "vm|kernel"
-    short_name: "cra"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm-stable"
-    category: "vm|kernel-precomp"
-    short_name: "and"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "d"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "p"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-stable"
-    category: "vm|kernel-precomp"
-    short_name: "a32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "a64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "r"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-x64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "br"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm-stable"
-    category: "vm|kernel-precomp"
-    short_name: "bra32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "bra64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "o"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "ma"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-simarm64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "wa"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "wr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-stable"
-    category: "vm|misc"
-    short_name: "a64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32-stable"
-    category: "vm|misc"
-    short_name: "o32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-stable"
-    category: "vm|misc"
-    short_name: "o64"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64-stable"
-    category: "vm|product"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64-stable"
-    category: "vm|product"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64-stable"
-    category: "vm|product"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64-stable"
-    category: "vm|reload-kernel"
-    short_name: "d"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64-stable"
-    category: "vm|reload-kernel"
-    short_name: "r"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-debug-simdbc64-stable"
-    category: "vm|reload-kernel"
-    short_name: "md"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64-stable"
-    category: "vm|reload-kernel"
-    short_name: "mr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64-stable"
-    category: "vm|reload-kernel"
-    short_name: "drb"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64-stable"
-    category: "vm|reload-kernel"
-    short_name: "rrb"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-stable"
-    category: "vm|ffi"
-    short_name: "d32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-stable"
-    category: "vm|ffi"
-    short_name: "r32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-stable"
-    category: "vm|ffi"
-    short_name: "p32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-stable"
-    category: "dart2js|d8"
-    short_name: "ha"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-stable"
-    category: "dart2js|d8"
-    short_name: "mi"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-stable"
-    category: "dart2js|d8"
-    short_name: "u"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-stable"
-    category: "dart2js|firefox"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox-stable"
-    category: "dart2js|firefox"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-stable"
-    category: "dart2js|safari"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11-stable"
-    category: "dart2js|ms"
-    short_name: "ie"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-stable"
-    category: "analyzer"
-    short_name: "as"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-stable"
-    category: "analyzer"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-stable"
-    category: "analyzer"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-stable"
-    category: "analyzer"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci/dart-sdk-linux-stable"
-    category: "sdk"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-stable"
-    category: "sdk"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci/dart-sdk-win-stable"
-    category: "sdk"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-stable"
-    category: "ddc"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-stable"
-    category: "ddc"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-stable"
-    category: "ddc"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
-    category: "pkg"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-stable"
-    category: "pkg"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-stable"
-    category: "pkg"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/gclient-stable"
-    category: "misc"
-    short_name: "g"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci/debianpackage-linux-stable"
-    category: "misc"
-    short_name: "dp"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci/versionchecker-linux-stable"
-    category: "misc"
-    short_name: "vc"
-  >
-  header: <
-    links: <
-      name: "Consoles"
-      links: <
-        text: "Bleeding Edge console"
-        url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
-      >
-      links: <
-        text: "Alternative Bleeding Edge console"
-        url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
-      >
-      links: <
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
-      >
-      links: <
-        text: "SDK CQ Status"
-        url: "/p/dart/g/cq/builders"
-        alt: "SDK CQ Status"
-      >
-    >
-    console_groups: <
-      console_ids: "dart/flutter"
-      console_ids: "dart/flutter-hhh"
-    >
-    tree_status_host: "dart-status.appspot.com"
-  >
->
-consoles: <
-  id: "flutter"
-  name: "Dart/Flutter Console"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/master"
-  manifest_name: "REVISION"
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
-    category: "analyzer"
-    short_name: "fa"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
-    category: "fasta"
-    short_name: "fl"
-  >
->
-consoles: <
-  id: "flutter-hhh"
-  name: "Dart/Flutter Linear History Console"
-  repo_url: "https://dart.googlesource.com/linear_sdk_flutter_engine"
-  refs: "regexp:refs/heads/master"
-  manifest_name: "REVISION"
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
-    category: "flutter"
-    short_name: "3H"
-  >
->
-consoles: <
-  id: "fyi"
-  name: "SDK FYI Console"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/master"
-  manifest_name: "REVISION"
-  builders: <
-    name: "buildbucket/luci.dart.ci/google"
-    category: "external"
-    short_name: "g"
-  >
->
-consoles: <
-  id: "cq"
-  name: "SDK CQ Console"
-  builders: <
-    name: "buildbucket/luci.dart.try/front-end-linux-release-x64-try"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simdbc64-try"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.try/vm-kernel-mac-release-x64-try"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-product-x64-try"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.try/dart2js-strong-hostasserts-linux-ia32-d8-try"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.try/dart2js-minified-strong-linux-x64-d8-try"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.try/dart2js-unit-linux-x64-release-try"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-chrome-try"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.try/flutter-analyze-try"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.try/analyzer-analysis-server-linux-try"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.try/analyzer-linux-release-try"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.try/dart-sdk-win-try"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.try/ddc-linux-release-chrome-try"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.try/pkg-linux-release-try"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.try/gclient-try"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.try/benchmark-linux-try"
-  >
-  builder_view_only: true
->
-logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
deleted file mode 100644
index ba7d8586d9b8..000000000000
--- a/generated/luci-notify.cfg
+++ /dev/null
@@ -1,1368 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-#
-# For the schema of this file, see ProjectConfig message:
-#   https://luci-config.appspot.com/schemas/projects:luci-notify.cfg
-
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    >
-  >
-  builders: <
-    bucket: "ci"
-    name: "base"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci"
-    name: "dart-sdk-linux"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci"
-    name: "dart-sdk-mac"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci"
-    name: "dart-sdk-win"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    >
-  >
-  builders: <
-    bucket: "ci"
-    name: "debianpackage-linux"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    >
-  >
-  builders: <
-    bucket: "ci"
-    name: "linearize-flutter"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci"
-    name: "versionchecker-linux"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "analyzer-analysis-server-linux"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "analyzer-linux-release"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "analyzer-mac-release"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "analyzer-win-release"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "app-kernel-linux-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "app-kernel-linux-product-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "app-kernel-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "cross-vm-linux-release-arm64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "dart2js-csp-minified-linux-x64-chrome"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "dart2js-minified-strong-linux-x64-d8"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "dart2js-strong-hostasserts-linux-ia32-d8"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "dart2js-strong-linux-x64-chrome"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "dart2js-strong-linux-x64-firefox"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "dart2js-strong-mac-x64-chrome"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "dart2js-strong-mac-x64-safari"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "dart2js-strong-win-x64-chrome"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "dart2js-strong-win-x64-firefox"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "dart2js-strong-win-x64-ie11"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "dart2js-unit-linux-x64-release"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "ddc-linux-release-chrome"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "ddc-mac-release-chrome"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "ddc-win-release-chrome"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "flutter-engine-linux"
-    repository: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "front-end-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "front-end-mac-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "front-end-win-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_success: true
-    on_failure: true
-    email: <
-      recipients: "ajcbik@google.com"
-      recipients: "athom@google.com"
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "fuzz-linux"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "gclient"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "pkg-linux-debug"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "pkg-linux-release"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "pkg-mac-release"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "pkg-win-release"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-canary-linux-debug"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-dartkb-linux-debug-simarm64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-dartkb-linux-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-dartkb-linux-product-simarm64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-dartkb-linux-product-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-dartkb-linux-release-simarm64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-dartkb-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-ffi-android-debug-arm"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-ffi-android-product-arm"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-ffi-android-release-arm"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-asan-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-checked-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-debug-ia32"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-debug-simdbc64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-product-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-release-ia32"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-release-simarm"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-release-simarm64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-release-simdbc64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-mac-debug-simdbc64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-mac-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-mac-product-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-mac-release-simdbc64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-mac-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-optcounter-threshold-linux-release-ia32"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-optcounter-threshold-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-android-release-arm"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-bare-linux-release-simarm"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-bare-linux-release-simarm64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-bare-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-product-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-release-simarm"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-release-simarm64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-mac-release-simarm64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-obfuscate-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-win-release-simarm64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-win-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-reload-linux-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-reload-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-reload-mac-debug-simdbc64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-reload-mac-release-simdbc64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-reload-rollback-linux-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-reload-rollback-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-win-debug-ia32"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-win-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-win-product-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-win-release-ia32"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-win-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
deleted file mode 100644
index af9b3624e215..000000000000
--- a/generated/luci-scheduler.cfg
+++ /dev/null
@@ -1,3050 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-#
-# For the schema of this file, see ProjectConfig message:
-#   https://luci-config.appspot.com/schemas/projects:luci-scheduler.cfg
-
-job: <
-  id: "analyzer-analysis-server-linux"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-analysis-server-linux"
-  >
->
-job: <
-  id: "analyzer-analysis-server-linux-analyzer-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-analysis-server-linux-analyzer-stable"
-  >
->
-job: <
-  id: "analyzer-analysis-server-linux-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-analysis-server-linux-dev"
-  >
->
-job: <
-  id: "analyzer-analysis-server-linux-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-analysis-server-linux-stable"
-  >
->
-job: <
-  id: "analyzer-linux-release"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-linux-release"
-  >
->
-job: <
-  id: "analyzer-linux-release-analyzer-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-linux-release-analyzer-stable"
-  >
->
-job: <
-  id: "analyzer-linux-release-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-linux-release-dev"
-  >
->
-job: <
-  id: "analyzer-linux-release-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-linux-release-stable"
-  >
->
-job: <
-  id: "analyzer-mac-release"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-mac-release"
-  >
->
-job: <
-  id: "analyzer-mac-release-analyzer-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-mac-release-analyzer-stable"
-  >
->
-job: <
-  id: "analyzer-mac-release-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-mac-release-dev"
-  >
->
-job: <
-  id: "analyzer-mac-release-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-mac-release-stable"
-  >
->
-job: <
-  id: "analyzer-win-release"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-win-release"
-  >
->
-job: <
-  id: "analyzer-win-release-analyzer-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-win-release-analyzer-stable"
-  >
->
-job: <
-  id: "analyzer-win-release-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-win-release-dev"
-  >
->
-job: <
-  id: "analyzer-win-release-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-win-release-stable"
-  >
->
-job: <
-  id: "app-kernel-linux-debug-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-debug-x64"
-  >
->
-job: <
-  id: "app-kernel-linux-debug-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-debug-x64-dev"
-  >
->
-job: <
-  id: "app-kernel-linux-debug-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-debug-x64-stable"
-  >
->
-job: <
-  id: "app-kernel-linux-product-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-product-x64"
-  >
->
-job: <
-  id: "app-kernel-linux-product-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-product-x64-dev"
-  >
->
-job: <
-  id: "app-kernel-linux-product-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-product-x64-stable"
-  >
->
-job: <
-  id: "app-kernel-linux-release-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-release-x64"
-  >
->
-job: <
-  id: "app-kernel-linux-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-release-x64-dev"
-  >
->
-job: <
-  id: "app-kernel-linux-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-release-x64-stable"
-  >
->
-job: <
-  id: "base"
-  schedule: "with 10m interval"
-  acl_sets: "ci"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "base"
-  >
->
-job: <
-  id: "cross-vm-linux-release-arm64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "cross-vm-linux-release-arm64"
-  >
->
-job: <
-  id: "cross-vm-linux-release-arm64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "cross-vm-linux-release-arm64-dev"
-  >
->
-job: <
-  id: "cross-vm-linux-release-arm64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "cross-vm-linux-release-arm64-stable"
-  >
->
-job: <
-  id: "dart-sdk-linux"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-linux"
-  >
->
-job: <
-  id: "dart-sdk-linux-dev"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-linux-dev"
-  >
->
-job: <
-  id: "dart-sdk-linux-stable"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-linux-stable"
-  >
->
-job: <
-  id: "dart-sdk-mac"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-mac"
-  >
->
-job: <
-  id: "dart-sdk-mac-dev"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-mac-dev"
-  >
->
-job: <
-  id: "dart-sdk-mac-stable"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-mac-stable"
-  >
->
-job: <
-  id: "dart-sdk-win"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-win"
-  >
->
-job: <
-  id: "dart-sdk-win-dev"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-win-dev"
-  >
->
-job: <
-  id: "dart-sdk-win-stable"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-win-stable"
-  >
->
-job: <
-  id: "dart2js-csp-minified-linux-x64-chrome"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-csp-minified-linux-x64-chrome"
-  >
->
-job: <
-  id: "dart2js-csp-minified-linux-x64-chrome-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-csp-minified-linux-x64-chrome-dev"
-  >
->
-job: <
-  id: "dart2js-csp-minified-linux-x64-chrome-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-csp-minified-linux-x64-chrome-stable"
-  >
->
-job: <
-  id: "dart2js-minified-strong-linux-x64-d8"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-minified-strong-linux-x64-d8"
-  >
->
-job: <
-  id: "dart2js-minified-strong-linux-x64-d8-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-minified-strong-linux-x64-d8-dev"
-  >
->
-job: <
-  id: "dart2js-minified-strong-linux-x64-d8-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-minified-strong-linux-x64-d8-stable"
-  >
->
-job: <
-  id: "dart2js-strong-hostasserts-linux-ia32-d8"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-hostasserts-linux-ia32-d8"
-  >
->
-job: <
-  id: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
-  >
->
-job: <
-  id: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
-  >
->
-job: <
-  id: "dart2js-strong-linux-x64-chrome"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-linux-x64-chrome"
-  >
->
-job: <
-  id: "dart2js-strong-linux-x64-chrome-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-linux-x64-chrome-dev"
-  >
->
-job: <
-  id: "dart2js-strong-linux-x64-chrome-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-linux-x64-chrome-stable"
-  >
->
-job: <
-  id: "dart2js-strong-linux-x64-firefox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-linux-x64-firefox"
-  >
->
-job: <
-  id: "dart2js-strong-linux-x64-firefox-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-linux-x64-firefox-dev"
-  >
->
-job: <
-  id: "dart2js-strong-linux-x64-firefox-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-linux-x64-firefox-stable"
-  >
->
-job: <
-  id: "dart2js-strong-mac-x64-chrome"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-mac-x64-chrome"
-  >
->
-job: <
-  id: "dart2js-strong-mac-x64-chrome-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-mac-x64-chrome-dev"
-  >
->
-job: <
-  id: "dart2js-strong-mac-x64-chrome-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-mac-x64-chrome-stable"
-  >
->
-job: <
-  id: "dart2js-strong-mac-x64-safari"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-mac-x64-safari"
-  >
->
-job: <
-  id: "dart2js-strong-mac-x64-safari-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-mac-x64-safari-dev"
-  >
->
-job: <
-  id: "dart2js-strong-mac-x64-safari-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-mac-x64-safari-stable"
-  >
->
-job: <
-  id: "dart2js-strong-win-x64-chrome"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-chrome"
-  >
->
-job: <
-  id: "dart2js-strong-win-x64-chrome-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-chrome-dev"
-  >
->
-job: <
-  id: "dart2js-strong-win-x64-chrome-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-chrome-stable"
-  >
->
-job: <
-  id: "dart2js-strong-win-x64-firefox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-firefox"
-  >
->
-job: <
-  id: "dart2js-strong-win-x64-firefox-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-firefox-dev"
-  >
->
-job: <
-  id: "dart2js-strong-win-x64-firefox-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-firefox-stable"
-  >
->
-job: <
-  id: "dart2js-strong-win-x64-ie11"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-ie11"
-  >
->
-job: <
-  id: "dart2js-strong-win-x64-ie11-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-ie11-dev"
-  >
->
-job: <
-  id: "dart2js-strong-win-x64-ie11-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-ie11-stable"
-  >
->
-job: <
-  id: "dart2js-unit-linux-x64-release"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-unit-linux-x64-release"
-  >
->
-job: <
-  id: "dart2js-unit-linux-x64-release-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-unit-linux-x64-release-dev"
-  >
->
-job: <
-  id: "dart2js-unit-linux-x64-release-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-unit-linux-x64-release-stable"
-  >
->
-job: <
-  id: "ddc-linux-release-chrome"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-linux-release-chrome"
-  >
->
-job: <
-  id: "ddc-linux-release-chrome-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-linux-release-chrome-dev"
-  >
->
-job: <
-  id: "ddc-linux-release-chrome-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-linux-release-chrome-stable"
-  >
->
-job: <
-  id: "ddc-mac-release-chrome"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-mac-release-chrome"
-  >
->
-job: <
-  id: "ddc-mac-release-chrome-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-mac-release-chrome-dev"
-  >
->
-job: <
-  id: "ddc-mac-release-chrome-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-mac-release-chrome-stable"
-  >
->
-job: <
-  id: "ddc-win-release-chrome"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-win-release-chrome"
-  >
->
-job: <
-  id: "ddc-win-release-chrome-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-win-release-chrome-dev"
-  >
->
-job: <
-  id: "ddc-win-release-chrome-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-win-release-chrome-stable"
-  >
->
-job: <
-  id: "debianpackage-linux"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "debianpackage-linux"
-  >
->
-job: <
-  id: "debianpackage-linux-dev"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "debianpackage-linux-dev"
-  >
->
-job: <
-  id: "debianpackage-linux-stable"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "debianpackage-linux-stable"
-  >
->
-job: <
-  id: "flutter-analyze"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "flutter-analyze"
-  >
->
-job: <
-  id: "flutter-engine-linux"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  triggering_policy: <
-    kind: GREEDY_BATCHING
-    max_concurrent_invocations: 5
-    max_batch_size: 1
-  >
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "flutter-engine-linux"
-  >
->
-job: <
-  id: "flutter-frontend"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "flutter-frontend"
-  >
->
-job: <
-  id: "front-end-linux-release-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-linux-release-x64"
-  >
->
-job: <
-  id: "front-end-linux-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-linux-release-x64-dev"
-  >
->
-job: <
-  id: "front-end-linux-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-linux-release-x64-stable"
-  >
->
-job: <
-  id: "front-end-mac-release-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-mac-release-x64"
-  >
->
-job: <
-  id: "front-end-mac-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-mac-release-x64-dev"
-  >
->
-job: <
-  id: "front-end-mac-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-mac-release-x64-stable"
-  >
->
-job: <
-  id: "front-end-win-release-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-win-release-x64"
-  >
->
-job: <
-  id: "front-end-win-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-win-release-x64-dev"
-  >
->
-job: <
-  id: "front-end-win-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-win-release-x64-stable"
-  >
->
-job: <
-  id: "fuzz-linux"
-  schedule: "0 3 * * *"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "fuzz-linux"
-  >
->
-job: <
-  id: "gclient"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "gclient"
-  >
->
-job: <
-  id: "gclient-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "gclient-dev"
-  >
->
-job: <
-  id: "gclient-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "gclient-stable"
-  >
->
-job: <
-  id: "linearize-flutter"
-  schedule: "triggered"
-  acl_sets: "ci"
-  triggering_policy: <
-    kind: GREEDY_BATCHING
-    max_batch_size: 1
-  >
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "linearize-flutter"
-  >
->
-job: <
-  id: "pkg-linux-debug"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-linux-debug"
-  >
->
-job: <
-  id: "pkg-linux-release"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-linux-release"
-  >
->
-job: <
-  id: "pkg-linux-release-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-linux-release-dev"
-  >
->
-job: <
-  id: "pkg-linux-release-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-linux-release-stable"
-  >
->
-job: <
-  id: "pkg-mac-release"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-mac-release"
-  >
->
-job: <
-  id: "pkg-mac-release-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-mac-release-dev"
-  >
->
-job: <
-  id: "pkg-mac-release-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-mac-release-stable"
-  >
->
-job: <
-  id: "pkg-win-release"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-win-release"
-  >
->
-job: <
-  id: "pkg-win-release-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-win-release-dev"
-  >
->
-job: <
-  id: "pkg-win-release-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-win-release-stable"
-  >
->
-job: <
-  id: "versionchecker-linux"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "versionchecker-linux"
-  >
->
-job: <
-  id: "versionchecker-linux-dev"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "versionchecker-linux-dev"
-  >
->
-job: <
-  id: "versionchecker-linux-stable"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "versionchecker-linux-stable"
-  >
->
-job: <
-  id: "vm-canary-linux-debug"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-canary-linux-debug"
-  >
->
-job: <
-  id: "vm-canary-linux-debug-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-canary-linux-debug-dev"
-  >
->
-job: <
-  id: "vm-canary-linux-debug-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-canary-linux-debug-stable"
-  >
->
-job: <
-  id: "vm-dartkb-linux-debug-simarm64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-debug-simarm64"
-  >
->
-job: <
-  id: "vm-dartkb-linux-debug-simarm64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-debug-simarm64-dev"
-  >
->
-job: <
-  id: "vm-dartkb-linux-debug-simarm64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-debug-simarm64-stable"
-  >
->
-job: <
-  id: "vm-dartkb-linux-debug-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-debug-x64"
-  >
->
-job: <
-  id: "vm-dartkb-linux-debug-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-debug-x64-dev"
-  >
->
-job: <
-  id: "vm-dartkb-linux-debug-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-debug-x64-stable"
-  >
->
-job: <
-  id: "vm-dartkb-linux-product-simarm64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-product-simarm64"
-  >
->
-job: <
-  id: "vm-dartkb-linux-product-simarm64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-product-simarm64-dev"
-  >
->
-job: <
-  id: "vm-dartkb-linux-product-simarm64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-product-simarm64-stable"
-  >
->
-job: <
-  id: "vm-dartkb-linux-product-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-product-x64"
-  >
->
-job: <
-  id: "vm-dartkb-linux-product-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-product-x64-dev"
-  >
->
-job: <
-  id: "vm-dartkb-linux-product-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-product-x64-stable"
-  >
->
-job: <
-  id: "vm-dartkb-linux-release-simarm64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-simarm64"
-  >
->
-job: <
-  id: "vm-dartkb-linux-release-simarm64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-simarm64-dev"
-  >
->
-job: <
-  id: "vm-dartkb-linux-release-simarm64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-simarm64-stable"
-  >
->
-job: <
-  id: "vm-dartkb-linux-release-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-x64"
-  >
->
-job: <
-  id: "vm-dartkb-linux-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-x64-dev"
-  >
->
-job: <
-  id: "vm-dartkb-linux-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-x64-stable"
-  >
->
-job: <
-  id: "vm-ffi-android-debug-arm"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-debug-arm"
-  >
->
-job: <
-  id: "vm-ffi-android-debug-arm-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-debug-arm-dev"
-  >
->
-job: <
-  id: "vm-ffi-android-debug-arm-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-debug-arm-stable"
-  >
->
-job: <
-  id: "vm-ffi-android-product-arm"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-product-arm"
-  >
->
-job: <
-  id: "vm-ffi-android-product-arm-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-product-arm-dev"
-  >
->
-job: <
-  id: "vm-ffi-android-product-arm-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-product-arm-stable"
-  >
->
-job: <
-  id: "vm-ffi-android-release-arm"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-release-arm"
-  >
->
-job: <
-  id: "vm-ffi-android-release-arm-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-release-arm-dev"
-  >
->
-job: <
-  id: "vm-ffi-android-release-arm-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-release-arm-stable"
-  >
->
-job: <
-  id: "vm-kernel-asan-linux-release-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-asan-linux-release-x64"
-  >
->
-job: <
-  id: "vm-kernel-asan-linux-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-asan-linux-release-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-asan-linux-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-asan-linux-release-x64-stable"
-  >
->
-job: <
-  id: "vm-kernel-checked-linux-release-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-checked-linux-release-x64"
-  >
->
-job: <
-  id: "vm-kernel-checked-linux-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-checked-linux-release-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-checked-linux-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-checked-linux-release-x64-stable"
-  >
->
-job: <
-  id: "vm-kernel-linux-debug-ia32"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-ia32"
-  >
->
-job: <
-  id: "vm-kernel-linux-debug-ia32-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-ia32-dev"
-  >
->
-job: <
-  id: "vm-kernel-linux-debug-ia32-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-ia32-stable"
-  >
->
-job: <
-  id: "vm-kernel-linux-debug-simdbc64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-simdbc64"
-  >
->
-job: <
-  id: "vm-kernel-linux-debug-simdbc64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-simdbc64-dev"
-  >
->
-job: <
-  id: "vm-kernel-linux-debug-simdbc64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-simdbc64-stable"
-  >
->
-job: <
-  id: "vm-kernel-linux-debug-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-x64"
-  >
->
-job: <
-  id: "vm-kernel-linux-debug-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-linux-debug-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-x64-stable"
-  >
->
-job: <
-  id: "vm-kernel-linux-product-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-product-x64"
-  >
->
-job: <
-  id: "vm-kernel-linux-product-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-product-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-linux-product-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-product-x64-stable"
-  >
->
-job: <
-  id: "vm-kernel-linux-release-ia32"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-ia32"
-  >
->
-job: <
-  id: "vm-kernel-linux-release-ia32-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-ia32-dev"
-  >
->
-job: <
-  id: "vm-kernel-linux-release-ia32-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-ia32-stable"
-  >
->
-job: <
-  id: "vm-kernel-linux-release-simarm"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm"
-  >
->
-job: <
-  id: "vm-kernel-linux-release-simarm-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm-dev"
-  >
->
-job: <
-  id: "vm-kernel-linux-release-simarm-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm-stable"
-  >
->
-job: <
-  id: "vm-kernel-linux-release-simarm64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm64"
-  >
->
-job: <
-  id: "vm-kernel-linux-release-simarm64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm64-dev"
-  >
->
-job: <
-  id: "vm-kernel-linux-release-simarm64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm64-stable"
-  >
->
-job: <
-  id: "vm-kernel-linux-release-simdbc64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simdbc64"
-  >
->
-job: <
-  id: "vm-kernel-linux-release-simdbc64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simdbc64-dev"
-  >
->
-job: <
-  id: "vm-kernel-linux-release-simdbc64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simdbc64-stable"
-  >
->
-job: <
-  id: "vm-kernel-linux-release-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-x64"
-  >
->
-job: <
-  id: "vm-kernel-linux-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-linux-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-x64-stable"
-  >
->
-job: <
-  id: "vm-kernel-mac-debug-simdbc64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-debug-simdbc64"
-  >
->
-job: <
-  id: "vm-kernel-mac-debug-simdbc64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-debug-simdbc64-dev"
-  >
->
-job: <
-  id: "vm-kernel-mac-debug-simdbc64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-debug-simdbc64-stable"
-  >
->
-job: <
-  id: "vm-kernel-mac-debug-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-debug-x64"
-  >
->
-job: <
-  id: "vm-kernel-mac-debug-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-debug-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-mac-debug-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-debug-x64-stable"
-  >
->
-job: <
-  id: "vm-kernel-mac-product-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-product-x64"
-  >
->
-job: <
-  id: "vm-kernel-mac-product-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-product-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-mac-product-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-product-x64-stable"
-  >
->
-job: <
-  id: "vm-kernel-mac-release-simdbc64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-release-simdbc64"
-  >
->
-job: <
-  id: "vm-kernel-mac-release-simdbc64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-release-simdbc64-dev"
-  >
->
-job: <
-  id: "vm-kernel-mac-release-simdbc64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-release-simdbc64-stable"
-  >
->
-job: <
-  id: "vm-kernel-mac-release-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-release-x64"
-  >
->
-job: <
-  id: "vm-kernel-mac-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-release-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-mac-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-release-x64-stable"
-  >
->
-job: <
-  id: "vm-kernel-optcounter-threshold-linux-release-ia32"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-optcounter-threshold-linux-release-ia32"
-  >
->
-job: <
-  id: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
-  >
->
-job: <
-  id: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
-  >
->
-job: <
-  id: "vm-kernel-optcounter-threshold-linux-release-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-optcounter-threshold-linux-release-x64"
-  >
->
-job: <
-  id: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
-  >
->
-job: <
-  id: "vm-kernel-precomp-android-release-arm"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm"
-  >
->
-job: <
-  id: "vm-kernel-precomp-android-release-arm-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm-dev"
-  >
->
-job: <
-  id: "vm-kernel-precomp-android-release-arm-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm-stable"
-  >
->
-job: <
-  id: "vm-kernel-precomp-bare-linux-release-simarm"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-bare-linux-release-simarm"
-  >
->
-job: <
-  id: "vm-kernel-precomp-bare-linux-release-simarm-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-bare-linux-release-simarm-dev"
-  >
->
-job: <
-  id: "vm-kernel-precomp-bare-linux-release-simarm-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-bare-linux-release-simarm-stable"
-  >
->
-job: <
-  id: "vm-kernel-precomp-bare-linux-release-simarm64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-bare-linux-release-simarm64"
-  >
->
-job: <
-  id: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
-  >
->
-job: <
-  id: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
-  >
->
-job: <
-  id: "vm-kernel-precomp-bare-linux-release-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-bare-linux-release-x64"
-  >
->
-job: <
-  id: "vm-kernel-precomp-bare-linux-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-bare-linux-release-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-precomp-bare-linux-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-bare-linux-release-x64-stable"
-  >
->
-job: <
-  id: "vm-kernel-precomp-linux-debug-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64"
-  >
->
-job: <
-  id: "vm-kernel-precomp-linux-debug-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-precomp-linux-debug-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64-stable"
-  >
->
-job: <
-  id: "vm-kernel-precomp-linux-product-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-product-x64"
-  >
->
-job: <
-  id: "vm-kernel-precomp-linux-product-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-product-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-precomp-linux-product-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-product-x64-stable"
-  >
->
-job: <
-  id: "vm-kernel-precomp-linux-release-simarm"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm"
-  >
->
-job: <
-  id: "vm-kernel-precomp-linux-release-simarm-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm-dev"
-  >
->
-job: <
-  id: "vm-kernel-precomp-linux-release-simarm-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm-stable"
-  >
->
-job: <
-  id: "vm-kernel-precomp-linux-release-simarm64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm64"
-  >
->
-job: <
-  id: "vm-kernel-precomp-linux-release-simarm64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm64-dev"
-  >
->
-job: <
-  id: "vm-kernel-precomp-linux-release-simarm64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm64-stable"
-  >
->
-job: <
-  id: "vm-kernel-precomp-linux-release-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-x64"
-  >
->
-job: <
-  id: "vm-kernel-precomp-linux-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-precomp-linux-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-x64-stable"
-  >
->
-job: <
-  id: "vm-kernel-precomp-mac-release-simarm64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-mac-release-simarm64"
-  >
->
-job: <
-  id: "vm-kernel-precomp-mac-release-simarm64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-mac-release-simarm64-dev"
-  >
->
-job: <
-  id: "vm-kernel-precomp-mac-release-simarm64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-mac-release-simarm64-stable"
-  >
->
-job: <
-  id: "vm-kernel-precomp-obfuscate-linux-release-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-obfuscate-linux-release-x64"
-  >
->
-job: <
-  id: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
-  >
->
-job: <
-  id: "vm-kernel-precomp-win-release-simarm64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-simarm64"
-  >
->
-job: <
-  id: "vm-kernel-precomp-win-release-simarm64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-simarm64-dev"
-  >
->
-job: <
-  id: "vm-kernel-precomp-win-release-simarm64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-simarm64-stable"
-  >
->
-job: <
-  id: "vm-kernel-precomp-win-release-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-x64"
-  >
->
-job: <
-  id: "vm-kernel-precomp-win-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-precomp-win-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-x64-stable"
-  >
->
-job: <
-  id: "vm-kernel-reload-linux-debug-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-linux-debug-x64"
-  >
->
-job: <
-  id: "vm-kernel-reload-linux-debug-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-linux-debug-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-reload-linux-debug-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-linux-debug-x64-stable"
-  >
->
-job: <
-  id: "vm-kernel-reload-linux-release-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-linux-release-x64"
-  >
->
-job: <
-  id: "vm-kernel-reload-linux-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-linux-release-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-reload-linux-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-linux-release-x64-stable"
-  >
->
-job: <
-  id: "vm-kernel-reload-mac-debug-simdbc64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-mac-debug-simdbc64"
-  >
->
-job: <
-  id: "vm-kernel-reload-mac-debug-simdbc64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-mac-debug-simdbc64-dev"
-  >
->
-job: <
-  id: "vm-kernel-reload-mac-debug-simdbc64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-mac-debug-simdbc64-stable"
-  >
->
-job: <
-  id: "vm-kernel-reload-mac-release-simdbc64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-mac-release-simdbc64"
-  >
->
-job: <
-  id: "vm-kernel-reload-mac-release-simdbc64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-mac-release-simdbc64-dev"
-  >
->
-job: <
-  id: "vm-kernel-reload-mac-release-simdbc64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-mac-release-simdbc64-stable"
-  >
->
-job: <
-  id: "vm-kernel-reload-rollback-linux-debug-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-debug-x64"
-  >
->
-job: <
-  id: "vm-kernel-reload-rollback-linux-debug-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-debug-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-reload-rollback-linux-debug-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-debug-x64-stable"
-  >
->
-job: <
-  id: "vm-kernel-reload-rollback-linux-release-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-release-x64"
-  >
->
-job: <
-  id: "vm-kernel-reload-rollback-linux-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-release-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-reload-rollback-linux-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-release-x64-stable"
-  >
->
-job: <
-  id: "vm-kernel-win-debug-ia32"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-debug-ia32"
-  >
->
-job: <
-  id: "vm-kernel-win-debug-ia32-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-debug-ia32-dev"
-  >
->
-job: <
-  id: "vm-kernel-win-debug-ia32-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-debug-ia32-stable"
-  >
->
-job: <
-  id: "vm-kernel-win-debug-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-debug-x64"
-  >
->
-job: <
-  id: "vm-kernel-win-debug-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-debug-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-win-debug-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-debug-x64-stable"
-  >
->
-job: <
-  id: "vm-kernel-win-product-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-product-x64"
-  >
->
-job: <
-  id: "vm-kernel-win-product-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-product-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-win-product-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-product-x64-stable"
-  >
->
-job: <
-  id: "vm-kernel-win-release-ia32"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-release-ia32"
-  >
->
-job: <
-  id: "vm-kernel-win-release-ia32-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-release-ia32-dev"
-  >
->
-job: <
-  id: "vm-kernel-win-release-ia32-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-release-ia32-stable"
-  >
->
-job: <
-  id: "vm-kernel-win-release-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-release-x64"
-  >
->
-job: <
-  id: "vm-kernel-win-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-release-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-win-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-release-x64-stable"
-  >
->
-trigger: <
-  id: "dart-flutter-engine-trigger"
-  acl_sets: "ci"
-  triggers: "linearize-flutter"
-  gitiles: <
-    repo: "https://dart.googlesource.com/external/github.com/flutter/engine"
-    refs: "regexp:refs/heads/master"
-  >
->
-trigger: <
-  id: "dart-flutter-flutter-trigger"
-  acl_sets: "ci"
-  triggers: "linearize-flutter"
-  gitiles: <
-    repo: "https://dart.googlesource.com/external/github.com/flutter/flutter"
-    refs: "regexp:refs/heads/master"
-  >
->
-trigger: <
-  id: "dart-gitiles-trigger-analyzer-stable"
-  acl_sets: "ci"
-  triggers: "analyzer-analysis-server-linux-analyzer-stable"
-  triggers: "analyzer-linux-release-analyzer-stable"
-  triggers: "analyzer-mac-release-analyzer-stable"
-  triggers: "analyzer-win-release-analyzer-stable"
-  gitiles: <
-    repo: "https://dart.googlesource.com/sdk"
-    refs: "regexp:refs/heads/analyzer-stable"
-  >
->
-trigger: <
-  id: "dart-gitiles-trigger-dev"
-  acl_sets: "ci"
-  triggers: "dart-sdk-linux-dev"
-  triggers: "dart-sdk-mac-dev"
-  triggers: "dart-sdk-win-dev"
-  triggers: "debianpackage-linux-dev"
-  triggers: "versionchecker-linux-dev"
-  triggers: "analyzer-analysis-server-linux-dev"
-  triggers: "analyzer-linux-release-dev"
-  triggers: "analyzer-mac-release-dev"
-  triggers: "analyzer-win-release-dev"
-  triggers: "app-kernel-linux-debug-x64-dev"
-  triggers: "app-kernel-linux-product-x64-dev"
-  triggers: "app-kernel-linux-release-x64-dev"
-  triggers: "cross-vm-linux-release-arm64-dev"
-  triggers: "dart2js-csp-minified-linux-x64-chrome-dev"
-  triggers: "dart2js-minified-strong-linux-x64-d8-dev"
-  triggers: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
-  triggers: "dart2js-strong-linux-x64-chrome-dev"
-  triggers: "dart2js-strong-linux-x64-firefox-dev"
-  triggers: "dart2js-strong-mac-x64-chrome-dev"
-  triggers: "dart2js-strong-mac-x64-safari-dev"
-  triggers: "dart2js-strong-win-x64-chrome-dev"
-  triggers: "dart2js-strong-win-x64-firefox-dev"
-  triggers: "dart2js-strong-win-x64-ie11-dev"
-  triggers: "dart2js-unit-linux-x64-release-dev"
-  triggers: "ddc-linux-release-chrome-dev"
-  triggers: "ddc-mac-release-chrome-dev"
-  triggers: "ddc-win-release-chrome-dev"
-  triggers: "front-end-linux-release-x64-dev"
-  triggers: "front-end-mac-release-x64-dev"
-  triggers: "front-end-win-release-x64-dev"
-  triggers: "gclient-dev"
-  triggers: "pkg-linux-release-dev"
-  triggers: "pkg-mac-release-dev"
-  triggers: "pkg-win-release-dev"
-  triggers: "vm-canary-linux-debug-dev"
-  triggers: "vm-dartkb-linux-debug-simarm64-dev"
-  triggers: "vm-dartkb-linux-debug-x64-dev"
-  triggers: "vm-dartkb-linux-product-simarm64-dev"
-  triggers: "vm-dartkb-linux-product-x64-dev"
-  triggers: "vm-dartkb-linux-release-simarm64-dev"
-  triggers: "vm-dartkb-linux-release-x64-dev"
-  triggers: "vm-ffi-android-debug-arm-dev"
-  triggers: "vm-ffi-android-product-arm-dev"
-  triggers: "vm-ffi-android-release-arm-dev"
-  triggers: "vm-kernel-asan-linux-release-x64-dev"
-  triggers: "vm-kernel-checked-linux-release-x64-dev"
-  triggers: "vm-kernel-linux-debug-ia32-dev"
-  triggers: "vm-kernel-linux-debug-simdbc64-dev"
-  triggers: "vm-kernel-linux-debug-x64-dev"
-  triggers: "vm-kernel-linux-product-x64-dev"
-  triggers: "vm-kernel-linux-release-ia32-dev"
-  triggers: "vm-kernel-linux-release-simarm-dev"
-  triggers: "vm-kernel-linux-release-simarm64-dev"
-  triggers: "vm-kernel-linux-release-simdbc64-dev"
-  triggers: "vm-kernel-linux-release-x64-dev"
-  triggers: "vm-kernel-mac-debug-simdbc64-dev"
-  triggers: "vm-kernel-mac-debug-x64-dev"
-  triggers: "vm-kernel-mac-product-x64-dev"
-  triggers: "vm-kernel-mac-release-simdbc64-dev"
-  triggers: "vm-kernel-mac-release-x64-dev"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-android-release-arm-dev"
-  triggers: "vm-kernel-precomp-bare-linux-release-simarm-dev"
-  triggers: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
-  triggers: "vm-kernel-precomp-bare-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-linux-debug-x64-dev"
-  triggers: "vm-kernel-precomp-linux-product-x64-dev"
-  triggers: "vm-kernel-precomp-linux-release-simarm-dev"
-  triggers: "vm-kernel-precomp-linux-release-simarm64-dev"
-  triggers: "vm-kernel-precomp-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-mac-release-simarm64-dev"
-  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-win-release-simarm64-dev"
-  triggers: "vm-kernel-precomp-win-release-x64-dev"
-  triggers: "vm-kernel-reload-linux-debug-x64-dev"
-  triggers: "vm-kernel-reload-linux-release-x64-dev"
-  triggers: "vm-kernel-reload-mac-debug-simdbc64-dev"
-  triggers: "vm-kernel-reload-mac-release-simdbc64-dev"
-  triggers: "vm-kernel-reload-rollback-linux-debug-x64-dev"
-  triggers: "vm-kernel-reload-rollback-linux-release-x64-dev"
-  triggers: "vm-kernel-win-debug-ia32-dev"
-  triggers: "vm-kernel-win-debug-x64-dev"
-  triggers: "vm-kernel-win-product-x64-dev"
-  triggers: "vm-kernel-win-release-ia32-dev"
-  triggers: "vm-kernel-win-release-x64-dev"
-  gitiles: <
-    repo: "https://dart.googlesource.com/sdk"
-    refs: "regexp:refs/heads/dev"
-  >
->
-trigger: <
-  id: "dart-gitiles-trigger-flutter"
-  acl_sets: "ci"
-  triggers: "flutter-engine-linux"
-  gitiles: <
-    repo: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
-    refs: "regexp:refs/heads/master"
-  >
->
-trigger: <
-  id: "dart-gitiles-trigger-master"
-  acl_sets: "ci"
-  triggers: "dart-sdk-linux"
-  triggers: "dart-sdk-mac"
-  triggers: "dart-sdk-win"
-  triggers: "debianpackage-linux"
-  triggers: "linearize-flutter"
-  triggers: "versionchecker-linux"
-  triggers: "analyzer-analysis-server-linux"
-  triggers: "analyzer-linux-release"
-  triggers: "analyzer-mac-release"
-  triggers: "analyzer-win-release"
-  triggers: "app-kernel-linux-debug-x64"
-  triggers: "app-kernel-linux-product-x64"
-  triggers: "app-kernel-linux-release-x64"
-  triggers: "cross-vm-linux-release-arm64"
-  triggers: "dart2js-csp-minified-linux-x64-chrome"
-  triggers: "dart2js-minified-strong-linux-x64-d8"
-  triggers: "dart2js-strong-hostasserts-linux-ia32-d8"
-  triggers: "dart2js-strong-linux-x64-chrome"
-  triggers: "dart2js-strong-linux-x64-firefox"
-  triggers: "dart2js-strong-mac-x64-chrome"
-  triggers: "dart2js-strong-mac-x64-safari"
-  triggers: "dart2js-strong-win-x64-chrome"
-  triggers: "dart2js-strong-win-x64-firefox"
-  triggers: "dart2js-strong-win-x64-ie11"
-  triggers: "dart2js-unit-linux-x64-release"
-  triggers: "ddc-linux-release-chrome"
-  triggers: "ddc-mac-release-chrome"
-  triggers: "ddc-win-release-chrome"
-  triggers: "flutter-analyze"
-  triggers: "flutter-frontend"
-  triggers: "front-end-linux-release-x64"
-  triggers: "front-end-mac-release-x64"
-  triggers: "front-end-win-release-x64"
-  triggers: "gclient"
-  triggers: "pkg-linux-debug"
-  triggers: "pkg-linux-release"
-  triggers: "pkg-mac-release"
-  triggers: "pkg-win-release"
-  triggers: "vm-canary-linux-debug"
-  triggers: "vm-dartkb-linux-debug-simarm64"
-  triggers: "vm-dartkb-linux-debug-x64"
-  triggers: "vm-dartkb-linux-product-simarm64"
-  triggers: "vm-dartkb-linux-product-x64"
-  triggers: "vm-dartkb-linux-release-simarm64"
-  triggers: "vm-dartkb-linux-release-x64"
-  triggers: "vm-ffi-android-debug-arm"
-  triggers: "vm-ffi-android-product-arm"
-  triggers: "vm-ffi-android-release-arm"
-  triggers: "vm-kernel-asan-linux-release-x64"
-  triggers: "vm-kernel-checked-linux-release-x64"
-  triggers: "vm-kernel-linux-debug-ia32"
-  triggers: "vm-kernel-linux-debug-simdbc64"
-  triggers: "vm-kernel-linux-debug-x64"
-  triggers: "vm-kernel-linux-product-x64"
-  triggers: "vm-kernel-linux-release-ia32"
-  triggers: "vm-kernel-linux-release-simarm"
-  triggers: "vm-kernel-linux-release-simarm64"
-  triggers: "vm-kernel-linux-release-simdbc64"
-  triggers: "vm-kernel-linux-release-x64"
-  triggers: "vm-kernel-mac-debug-simdbc64"
-  triggers: "vm-kernel-mac-debug-x64"
-  triggers: "vm-kernel-mac-product-x64"
-  triggers: "vm-kernel-mac-release-simdbc64"
-  triggers: "vm-kernel-mac-release-x64"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
-  triggers: "vm-kernel-precomp-android-release-arm"
-  triggers: "vm-kernel-precomp-bare-linux-release-simarm"
-  triggers: "vm-kernel-precomp-bare-linux-release-simarm64"
-  triggers: "vm-kernel-precomp-bare-linux-release-x64"
-  triggers: "vm-kernel-precomp-linux-debug-x64"
-  triggers: "vm-kernel-precomp-linux-product-x64"
-  triggers: "vm-kernel-precomp-linux-release-simarm"
-  triggers: "vm-kernel-precomp-linux-release-simarm64"
-  triggers: "vm-kernel-precomp-linux-release-x64"
-  triggers: "vm-kernel-precomp-mac-release-simarm64"
-  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64"
-  triggers: "vm-kernel-precomp-win-release-simarm64"
-  triggers: "vm-kernel-precomp-win-release-x64"
-  triggers: "vm-kernel-reload-linux-debug-x64"
-  triggers: "vm-kernel-reload-linux-release-x64"
-  triggers: "vm-kernel-reload-mac-debug-simdbc64"
-  triggers: "vm-kernel-reload-mac-release-simdbc64"
-  triggers: "vm-kernel-reload-rollback-linux-debug-x64"
-  triggers: "vm-kernel-reload-rollback-linux-release-x64"
-  triggers: "vm-kernel-win-debug-ia32"
-  triggers: "vm-kernel-win-debug-x64"
-  triggers: "vm-kernel-win-product-x64"
-  triggers: "vm-kernel-win-release-ia32"
-  triggers: "vm-kernel-win-release-x64"
-  gitiles: <
-    repo: "https://dart.googlesource.com/sdk"
-    refs: "regexp:refs/heads/master"
-  >
->
-trigger: <
-  id: "dart-gitiles-trigger-stable"
-  acl_sets: "ci"
-  triggers: "dart-sdk-linux-stable"
-  triggers: "dart-sdk-mac-stable"
-  triggers: "dart-sdk-win-stable"
-  triggers: "debianpackage-linux-stable"
-  triggers: "versionchecker-linux-stable"
-  triggers: "analyzer-analysis-server-linux-stable"
-  triggers: "analyzer-linux-release-stable"
-  triggers: "analyzer-mac-release-stable"
-  triggers: "analyzer-win-release-stable"
-  triggers: "app-kernel-linux-debug-x64-stable"
-  triggers: "app-kernel-linux-product-x64-stable"
-  triggers: "app-kernel-linux-release-x64-stable"
-  triggers: "cross-vm-linux-release-arm64-stable"
-  triggers: "dart2js-csp-minified-linux-x64-chrome-stable"
-  triggers: "dart2js-minified-strong-linux-x64-d8-stable"
-  triggers: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
-  triggers: "dart2js-strong-linux-x64-chrome-stable"
-  triggers: "dart2js-strong-linux-x64-firefox-stable"
-  triggers: "dart2js-strong-mac-x64-chrome-stable"
-  triggers: "dart2js-strong-mac-x64-safari-stable"
-  triggers: "dart2js-strong-win-x64-chrome-stable"
-  triggers: "dart2js-strong-win-x64-firefox-stable"
-  triggers: "dart2js-strong-win-x64-ie11-stable"
-  triggers: "dart2js-unit-linux-x64-release-stable"
-  triggers: "ddc-linux-release-chrome-stable"
-  triggers: "ddc-mac-release-chrome-stable"
-  triggers: "ddc-win-release-chrome-stable"
-  triggers: "front-end-linux-release-x64-stable"
-  triggers: "front-end-mac-release-x64-stable"
-  triggers: "front-end-win-release-x64-stable"
-  triggers: "gclient-stable"
-  triggers: "pkg-linux-release-stable"
-  triggers: "pkg-mac-release-stable"
-  triggers: "pkg-win-release-stable"
-  triggers: "vm-canary-linux-debug-stable"
-  triggers: "vm-dartkb-linux-debug-simarm64-stable"
-  triggers: "vm-dartkb-linux-debug-x64-stable"
-  triggers: "vm-dartkb-linux-product-simarm64-stable"
-  triggers: "vm-dartkb-linux-product-x64-stable"
-  triggers: "vm-dartkb-linux-release-simarm64-stable"
-  triggers: "vm-dartkb-linux-release-x64-stable"
-  triggers: "vm-ffi-android-debug-arm-stable"
-  triggers: "vm-ffi-android-product-arm-stable"
-  triggers: "vm-ffi-android-release-arm-stable"
-  triggers: "vm-kernel-asan-linux-release-x64-stable"
-  triggers: "vm-kernel-checked-linux-release-x64-stable"
-  triggers: "vm-kernel-linux-debug-ia32-stable"
-  triggers: "vm-kernel-linux-debug-simdbc64-stable"
-  triggers: "vm-kernel-linux-debug-x64-stable"
-  triggers: "vm-kernel-linux-product-x64-stable"
-  triggers: "vm-kernel-linux-release-ia32-stable"
-  triggers: "vm-kernel-linux-release-simarm-stable"
-  triggers: "vm-kernel-linux-release-simarm64-stable"
-  triggers: "vm-kernel-linux-release-simdbc64-stable"
-  triggers: "vm-kernel-linux-release-x64-stable"
-  triggers: "vm-kernel-mac-debug-simdbc64-stable"
-  triggers: "vm-kernel-mac-debug-x64-stable"
-  triggers: "vm-kernel-mac-product-x64-stable"
-  triggers: "vm-kernel-mac-release-simdbc64-stable"
-  triggers: "vm-kernel-mac-release-x64-stable"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-android-release-arm-stable"
-  triggers: "vm-kernel-precomp-bare-linux-release-simarm-stable"
-  triggers: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
-  triggers: "vm-kernel-precomp-bare-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-linux-debug-x64-stable"
-  triggers: "vm-kernel-precomp-linux-product-x64-stable"
-  triggers: "vm-kernel-precomp-linux-release-simarm-stable"
-  triggers: "vm-kernel-precomp-linux-release-simarm64-stable"
-  triggers: "vm-kernel-precomp-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-mac-release-simarm64-stable"
-  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-win-release-simarm64-stable"
-  triggers: "vm-kernel-precomp-win-release-x64-stable"
-  triggers: "vm-kernel-reload-linux-debug-x64-stable"
-  triggers: "vm-kernel-reload-linux-release-x64-stable"
-  triggers: "vm-kernel-reload-mac-debug-simdbc64-stable"
-  triggers: "vm-kernel-reload-mac-release-simdbc64-stable"
-  triggers: "vm-kernel-reload-rollback-linux-debug-x64-stable"
-  triggers: "vm-kernel-reload-rollback-linux-release-x64-stable"
-  triggers: "vm-kernel-win-debug-ia32-stable"
-  triggers: "vm-kernel-win-debug-x64-stable"
-  triggers: "vm-kernel-win-product-x64-stable"
-  triggers: "vm-kernel-win-release-ia32-stable"
-  triggers: "vm-kernel-win-release-x64-stable"
-  gitiles: <
-    repo: "https://dart.googlesource.com/sdk"
-    refs: "regexp:refs/heads/stable"
-  >
->
-acl_sets: <
-  name: "ci"
-  acls: <
-    role: OWNER
-    granted_to: "group:project-dart-admins"
-  >
-  acls: <
-    granted_to: "group:all"
-  >
->
-acl_sets: <
-  name: "ci.sandbox"
-  acls: <
-    role: OWNER
-    granted_to: "group:project-dart-admins"
-  >
-  acls: <
-    granted_to: "group:all"
-  >
->
diff --git a/generated/project.cfg b/generated/project.cfg
deleted file mode 100644
index aa62c97e4b8b..000000000000
--- a/generated/project.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-#
-# For the schema of this file, see ProjectCfg message:
-#   https://luci-config.appspot.com/schemas/projects:project.cfg
-
-name: "dart"
-access: "group:all"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 3e3425a1f729..a82a81de3ec0 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -223,11 +223,6 @@ consoles: {
     category: "vm|kernel"
     short_name: "wr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
-    category: "vm|kernel"
-    short_name: "cra"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm"
     category: "vm|kernel-precomp"
@@ -293,6 +288,11 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
+    category: "vm|kernel"
+    short_name: "cra"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
     category: "vm|misc"
@@ -383,46 +383,6 @@ consoles: {
     category: "dart2js|d8"
     short_name: "u"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
-    category: "dart2js|safari"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11"
-    category: "dart2js|ms"
-    short_name: "ie"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
     category: "analyzer"
@@ -478,6 +438,46 @@ consoles: {
     category: "ddc"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "csp"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
+    category: "dart2js|safari"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11"
+    category: "dart2js|ms"
+    short_name: "ie"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
@@ -586,46 +586,6 @@ consoles: {
     category: "dart2js|d8"
     short_name: "u"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
-    category: "dart2js|safari"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11"
-    category: "dart2js|ms"
-    short_name: "ie"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
     category: "analyzer"
@@ -681,6 +641,46 @@ consoles: {
     category: "ddc"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "csp"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
+    category: "dart2js|safari"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11"
+    category: "dart2js|ms"
+    short_name: "ie"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
@@ -851,11 +851,6 @@ consoles: {
     category: "vm|kernel"
     short_name: "wr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
-    category: "vm|kernel"
-    short_name: "cra"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm"
     category: "vm|kernel-precomp"
@@ -921,6 +916,11 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
+    category: "vm|kernel"
+    short_name: "cra"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
     category: "vm|misc"
@@ -1179,11 +1179,6 @@ consoles: {
     category: "vm|kernel"
     short_name: "wr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-dev"
-    category: "vm|kernel"
-    short_name: "cra"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm-dev"
     category: "vm|kernel-precomp"
@@ -1249,6 +1244,11 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-dev"
+    category: "vm|kernel"
+    short_name: "cra"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-dev"
     category: "vm|misc"
@@ -1339,46 +1339,6 @@ consoles: {
     category: "dart2js|d8"
     short_name: "u"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-dev"
-    category: "dart2js|chrome"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-dev"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-dev"
-    category: "dart2js|chrome"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-dev"
-    category: "dart2js|chrome"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-dev"
-    category: "dart2js|firefox"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox-dev"
-    category: "dart2js|firefox"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-dev"
-    category: "dart2js|safari"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11-dev"
-    category: "dart2js|ms"
-    short_name: "ie"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-dev"
     category: "analyzer"
@@ -1429,6 +1389,46 @@ consoles: {
     category: "ddc"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-dev"
+    category: "dart2js|chrome"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-dev"
+    category: "dart2js|firefox"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-dev"
+    category: "dart2js|chrome"
+    short_name: "csp"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-dev"
+    category: "dart2js|chrome"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-dev"
+    category: "dart2js|safari"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-dev"
+    category: "dart2js|chrome"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox-dev"
+    category: "dart2js|firefox"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11-dev"
+    category: "dart2js|ms"
+    short_name: "ie"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
     category: "pkg"
@@ -1648,11 +1648,6 @@ consoles: {
     category: "vm|kernel"
     short_name: "wr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-stable"
-    category: "vm|kernel"
-    short_name: "cra"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm-stable"
     category: "vm|kernel-precomp"
@@ -1718,6 +1713,11 @@ consoles: {
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-stable"
+    category: "vm|kernel"
+    short_name: "cra"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-stable"
     category: "vm|misc"
@@ -1808,46 +1808,6 @@ consoles: {
     category: "dart2js|d8"
     short_name: "u"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-stable"
-    category: "dart2js|firefox"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-stable"
-    category: "dart2js|safari"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox-stable"
-    category: "dart2js|firefox"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11-stable"
-    category: "dart2js|ms"
-    short_name: "ie"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-stable"
     category: "analyzer"
@@ -1898,6 +1858,46 @@ consoles: {
     category: "ddc"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-stable"
+    category: "dart2js|firefox"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "csp"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-stable"
+    category: "dart2js|safari"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox-stable"
+    category: "dart2js|firefox"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11-stable"
+    category: "dart2js|ms"
+    short_name: "ie"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
     category: "pkg"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 795fe04d442f..9a58ae4b030c 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -8,6 +8,30 @@
 # on_change  = Whenever the build status changes.
 # on_success = On every build success.
 # on_failure = On every build failure.
+notifiers {
+    name: "infra"
+    notifications {
+        on_change: false
+        on_success: false
+        on_failure: false
+        on_new_failure: true
+        email {
+            recipients: "athom@google.com"
+            recipients: "sortie@google.com"
+            recipients: "whesse@google.com"
+        }
+    }
+    builders {
+        name: "base"
+        bucket: "ci"
+    }
+    builders {
+        name: "debianpackage-linux"
+        bucket: "ci"
+        repository: "https://dart.googlesource.com/sdk"
+    }
+}
+
 notifiers {
     name: "dart"
     notifications {
@@ -25,468 +49,444 @@ notifiers {
     builders {
         name: "dart-sdk-linux"
         bucket: "ci"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart-sdk-mac"
         bucket: "ci"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart-sdk-win"
         bucket: "ci"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "versionchecker-linux"
         bucket: "ci"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
 
     # CI Builders for the master branch
     builders {
         name: "analyzer-analysis-server-linux"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "analyzer-linux-release"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "analyzer-mac-release"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "analyzer-win-release"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "app-kernel-linux-debug-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "app-kernel-linux-product-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "app-kernel-linux-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "cross-vm-linux-release-arm64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-csp-minified-linux-x64-chrome"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-minified-strong-linux-x64-d8"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-strong-hostasserts-linux-ia32-d8"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-strong-linux-x64-chrome"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-strong-linux-x64-firefox"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-strong-mac-x64-chrome"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-strong-mac-x64-safari"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-strong-win-x64-chrome"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-strong-win-x64-edge"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-strong-win-x64-firefox"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-strong-win-x64-ie11"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "dart2js-unit-linux-x64-release"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "ddc-linux-release-chrome"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "ddc-mac-release-chrome"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "ddc-win-release-chrome"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "front-end-linux-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "front-end-mac-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "front-end-win-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "gclient"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "pkg-linux-release"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "pkg-mac-release"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "pkg-win-release"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "pkg-linux-debug"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "versionchecker-linux"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-canary-linux-debug"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-dartkb-linux-debug-simarm64-try"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-dartkb-linux-debug-x64-try"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-dartkb-linux-product-simarm64-try"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-dartkb-linux-product-x64-try"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-dartkb-linux-release-simarm64-try"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-dartkb-linux-release-x64-try"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-asan-linux-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-checked-linux-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-linux-debug-ia32"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-linux-debug-simdbc64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-linux-debug-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-linux-product-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-linux-release-ia32"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-linux-release-simarm"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-linux-release-simarm64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-linux-release-simdbc64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-linux-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-mac-debug-simdbc64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-mac-debug-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-mac-product-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-mac-release-simdbc64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-mac-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-optcounter-threshold-linux-release-ia32"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-optcounter-threshold-linux-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-precomp-android-release-arm"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-precomp-bare-linux-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-precomp-bare-linux-release-simarm"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-precomp-bare-linux-release-simarm64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-precomp-linux-debug-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-precomp-linux-product-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-precomp-linux-release-simarm"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-precomp-linux-release-simarm64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-precomp-linux-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-precomp-mac-release-simarm64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-precomp-obfuscate-linux-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-precomp-win-release-simarm64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-precomp-win-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-reload-linux-debug-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-reload-linux-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-reload-mac-debug-simdbc64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-reload-mac-release-simdbc64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-reload-rollback-linux-debug-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-reload-rollback-linux-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-win-debug-ia32"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-win-debug-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-win-product-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-win-release-ia32"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-kernel-win-release-x64"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-ffi-android-debug-arm"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-ffi-android-release-arm"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
     builders {
         name: "vm-ffi-android-product-arm"
         bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk/"
-    }
-}
-
-notifiers {
-    name: "infra"
-    notifications {
-        on_change: false
-        on_success: false
-        on_failure: false
-        on_new_failure: true
-        email {
-            recipients: "athom@google.com"
-            recipients: "sortie@google.com"
-            recipients: "whesse@google.com"
-        }
-    }
-    builders {
-        name: "base"
-        bucket: "ci"
-    }
-    builders {
-        name: "debianpackage-linux"
-        bucket: "ci"
-        repository: "https://dart.googlesource.com/sdk/"
+        repository: "https://dart.googlesource.com/sdk"
     }
 }
 
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 67912166b68a..e7a2d014adef 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -10,7 +10,7 @@ acl_sets {
   }
   acls {
     role: OWNER
-    granted_to: "group:project-dart-admins"
+    granted_to: "group:project-dart-committers"
   }
 }
 
@@ -104,7 +104,7 @@ trigger {
   id: "dart-gitiles-trigger-analyzer-stable"
   acl_sets: "default"
   gitiles: {
-    repo: "https://dart.googlesource.com/sdk"
+    repo: "https://dart.googlesource.com/sdk/"
     refs: "refs/heads/analyzer-stable"
   }
   triggers: "analyzer-analysis-server-linux-analyzer-stable"
@@ -118,7 +118,7 @@ trigger {
   id: "dart-gitiles-trigger-master"
   acl_sets: "default"
   gitiles: {
-    repo: "https://dart.googlesource.com/sdk"
+    repo: "https://dart.googlesource.com/sdk/"
     refs: "refs/heads/master"
   }
   triggers: "analyzer-analysis-server-linux"
@@ -217,7 +217,7 @@ trigger {
   id: "dart-gitiles-trigger-dev"
   acl_sets: "default"
   gitiles: {
-    repo: "https://dart.googlesource.com/sdk"
+    repo: "https://dart.googlesource.com/sdk/"
     refs: "refs/heads/dev"
   }
   triggers: "analyzer-analysis-server-linux-dev"
@@ -312,7 +312,7 @@ trigger {
   id: "dart-gitiles-trigger-stable"
   acl_sets: "default"
   gitiles: {
-    repo: "https://dart.googlesource.com/sdk"
+    repo: "https://dart.googlesource.com/sdk/"
     refs: "refs/heads/stable"
   }
   triggers: "analyzer-analysis-server-linux-stable"
diff --git a/main.star b/main.star
deleted file mode 100755
index 273445e2e582..000000000000
--- a/main.star
+++ /dev/null
@@ -1,738 +0,0 @@
-#!/usr/bin/env lucicfg
-
-# Copyright (c) 2019 The Dart project authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-#
-# https://chromium.googlesource.com/infra/luci/luci-go/+/master/lucicfg/doc/
-
-DART_GIT = "https://dart.googlesource.com/sdk"
-DART_GERRIT = "https://dart-review.googlesource.com/sdk"
-
-RELEASE_CHANNELS = ["dev", "stable"]
-CHANNELS = RELEASE_CHANNELS + ["try"]
-ANALYZER_CHANNELS = ["analyzer-stable"] + CHANNELS
-
-
-def mac():
-    return {"os": "Mac"}
-
-
-def windows():
-    return {"os": "Windows"}
-
-
-CI_ACCOUNT = "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-TRY_ACCOUNT = "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-CI_TRIGGERERS = ["luci-scheduler@appspot.gserviceaccount.com", CI_ACCOUNT]
-
-luci.project(
-    name="dart",
-    buildbucket="cr-buildbucket.appspot.com",
-    logdog="luci-logdog.appspot.com",
-    milo="luci-milo.appspot.com",
-    notify="luci-notify.appspot.com",
-    scheduler="luci-scheduler.appspot.com",
-    swarming="chromium-swarm.appspot.com",
-    acls=[
-        acl.entry(
-            [
-                acl.BUILDBUCKET_READER, acl.LOGDOG_READER,
-                acl.PROJECT_CONFIGS_READER, acl.SCHEDULER_READER
-            ],
-            groups=["all"],
-        ),
-        acl.entry(acl.LOGDOG_WRITER, groups=["luci-logdog-chromium-writers"]),
-        acl.entry([acl.SCHEDULER_OWNER, acl.BUILDBUCKET_TRIGGERER],
-                  groups=["project-dart-admins"]),
-        acl.entry(acl.CQ_COMMITTER, groups=["project-dart-committers"]),
-        acl.entry(acl.CQ_DRY_RUNNER, groups=["project-dart-tryjob-access"]),
-    ],
-)
-
-luci.milo(
-    logo="https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png",
-)
-
-luci.console_view(
-    name="analyzer-stable",
-    repo="https://dart.googlesource.com/sdk",
-    title="SDK Analyzer Stable Branch Console",
-    refs=["refs/heads/analyzer-stable"],
-    header="console-header.textpb",
-)
-
-luci.console_view(
-    name="be",
-    repo="https://dart.googlesource.com/sdk",
-    title="SDK Bleeding Edge Console",
-    refs=["refs/heads/master"],
-    header="console-header.textpb",
-)
-
-luci.console_view(
-    name="alt",
-    repo="https://dart.googlesource.com/sdk",
-    title="SDK Bleeding Edge Console (alternative)",
-    refs=["refs/heads/master"],
-    header="console-header.textpb",
-)
-
-luci.console_view(
-    name="dev",
-    repo="https://dart.googlesource.com/sdk",
-    title="SDK Dev Console",
-    refs=["refs/heads/dev"],
-    header="console-header.textpb",
-)
-
-luci.console_view(
-    name="stable",
-    repo="https://dart.googlesource.com/sdk",
-    title="SDK Stable Console",
-    refs=["refs/heads/stable"],
-    header="console-header.textpb",
-)
-
-luci.console_view(
-    name="flutter",
-    repo=DART_GIT,
-    title="Dart/Flutter Console",
-    refs=["refs/heads/master"],
-)
-
-luci.console_view(
-    name="flutter-hhh",
-    repo="https://dart.googlesource.com/linear_sdk_flutter_engine",
-    title="Dart/Flutter Linear History Console",
-    refs=["refs/heads/master"],
-)
-
-luci.console_view(
-    name="fyi",
-    repo=DART_GIT,
-    title="SDK FYI Console",
-    refs=["refs/heads/master"],
-)
-
-luci.list_view(
-    name="cq",
-    title="SDK CQ Console",
-)
-
-luci.logdog(gs_bucket="chromium-luci-logdog")
-
-luci.bucket(
-    name="ci",
-    acls=[
-        acl.entry(acl.BUILDBUCKET_TRIGGERER, users=CI_TRIGGERERS),
-    ],
-)
-luci.bucket(
-    name="ci.sandbox",
-    acls=[
-        acl.entry(acl.BUILDBUCKET_TRIGGERER, users=CI_TRIGGERERS),
-    ],
-)
-luci.bucket(
-    name="try",
-    acls=[
-        acl.entry(acl.BUILDBUCKET_TRIGGERER,
-                  groups=["project-dart-tryjob-access", "service-account-cq"]),
-    ],
-)
-
-luci.gitiles_poller(
-    name="dart-gitiles-trigger-flutter",
-    bucket="ci",
-    repo="https://dart.googlesource.com/linear_sdk_flutter_engine/",
-    refs=["refs/heads/master"],
-)
-
-luci.gitiles_poller(
-    name="dart-gitiles-trigger-master",
-    bucket="ci",
-    repo=DART_GIT,
-    refs=["refs/heads/master"],
-)
-
-luci.gitiles_poller(
-    name="dart-gitiles-trigger-dev",
-    bucket="ci",
-    repo=DART_GIT,
-    refs=["refs/heads/dev"],
-)
-
-luci.gitiles_poller(
-    name="dart-gitiles-trigger-stable",
-    bucket="ci",
-    repo=DART_GIT,
-    refs=["refs/heads/stable"],
-)
-
-luci.gitiles_poller(
-    name="dart-gitiles-trigger-analyzer-stable",
-    bucket="ci",
-    repo=DART_GIT,
-    refs=["refs/heads/analyzer-stable"],
-)
-
-luci.gitiles_poller(
-    name="dart-flutter-engine-trigger",
-    bucket="ci",
-    repo="https://dart.googlesource.com/external/github.com/flutter/engine",
-    refs=["refs/heads/master"],
-)
-
-luci.gitiles_poller(
-    name="dart-flutter-flutter-trigger",
-    bucket="ci",
-    repo="https://dart.googlesource.com/external/github.com/flutter/flutter",
-    refs=["refs/heads/master"],
-)
-
-luci.notifier(name="infra",
-              on_new_failure=True,
-              notify_emails=[
-                  "athom@google.com", "sortie@google.com", "whesse@google.com"
-              ])
-
-luci.notifier(name="dart",
-              on_new_failure=True,
-              notify_emails=["athom@google.com"],
-              notify_blamelist=True)
-
-luci.notifier(name="dart-fuzz-testing",
-              on_success=True,
-              on_failure=True,
-              notify_emails=["ajcbik@google.com", "athom@google.com"])
-
-luci.cq(
-    submit_max_burst=2,
-    submit_burst_delay=8 * time.minute,
-)
-
-luci.cq_group(
-    name="sdk",
-    watch=cq.refset(DART_GERRIT, refs=["refs/heads/.+"]),
-    allow_submit_with_open_deps=True,
-    tree_status_host="dart-status.appspot.com",
-    retry_config=cq.RETRY_NONE,
-    verifiers=None,
-)
-
-
-def dart_recipe(name):
-    return luci.recipe(
-        name="dart/" + name,
-        cipd_package=
-        "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",
-    )
-
-
-def dart_try_builder(name,
-                     recipe="neo",
-                     dimensions={},
-                     experiment_percentage=None,
-                     location_regexp=None,
-                     properties={},
-                     on_cq=False):
-    dimensions.setdefault("os", "Linux")
-    dimensions.setdefault("cpu", "x86-64")
-    properties.setdefault("clobber", "true")
-    builder = name + "-try"
-
-    luci.builder(
-        name=builder,
-        build_numbers=True,
-        bucket="try",
-        caches=[swarming.cache("browsers")],
-        dimensions=dimensions,
-        executable=dart_recipe(recipe),
-        priority=30,
-        properties=properties,
-        service_account=TRY_ACCOUNT,
-        swarming_tags=["vpython:native-python-wrapper"],
-    )
-    if on_cq:
-        luci.cq_tryjob_verifier(builder=builder,
-                                cq_group='sdk',
-                                experiment_percentage=experiment_percentage,
-                                location_regexp=location_regexp)
-        luci.list_view_entry(
-            list_view="cq",
-            builder=builder,
-        )
-
-
-postponed_alt_console_entries = []
-
-
-def dart_builder(name,
-                 bucket,
-                 recipe="neo",
-                 enabled=True,
-                 category=None,
-                 channels=[],
-                 dimensions={},
-                 cpu="x86-64",
-                 fyi=False,
-                 notifies="dart",
-                 priority=50,
-                 properties={},
-                 schedule="triggered",
-                 service_account=TRY_ACCOUNT,
-                 triggered_by=None,
-                 triggering_policy=None,
-                 on_cq=False,
-                 experiment_percentage=None,
-                 location_regexp=None):
-    dimensions.setdefault("os", "Linux")
-    dimensions.update({"cpu": cpu})
-    properties.setdefault("clobber", "true")
-
-    def builder(channel=None):
-        if channel == "try":
-            dart_try_builder(name,
-                             recipe=recipe,
-                             dimensions=dimensions,
-                             properties=properties,
-                             on_cq=on_cq,
-                             experiment_percentage=experiment_percentage,
-                             location_regexp=location_regexp)
-        else:
-            builder = name + "-" + channel if channel else name
-            luci.builder(
-                name=builder,
-                build_numbers=True,
-                bucket=bucket,
-                caches=[swarming.cache("browsers")],
-                dimensions=dimensions,
-                executable=dart_recipe(recipe),
-                priority=priority,
-                properties=properties,
-                notifies=[notifies]
-                if notifies and not channel and enabled else None,
-                schedule=schedule if enabled else None,
-                service_account=service_account,
-                swarming_tags=["vpython:native-python-wrapper"],
-                triggered_by=triggered_by or
-                (["dart-gitiles-trigger-" + (channel if channel else "master")]
-                 if enabled and schedule == "triggered" else None),
-                triggering_policy=triggering_policy)
-            if category:
-                console_category, _, short_name = category.rpartition("|")
-                toplevel_category, _, _ = console_category.partition("|")
-                console = channel or "be" if not fyi else "fyi"
-                luci.console_view_entry(
-                    builder=builder,
-                    short_name=short_name,
-                    category=console_category,
-                    console_view=console,
-                )
-                if console == "be":
-                    if toplevel_category == "vm":
-                        postponed_alt_console_entries.append({
-                            "builder":
-                            builder,
-                            "short_name":
-                            short_name,
-                            "category":
-                            console_category,
-                        })
-                    else:
-                        luci.console_view_entry(
-                            builder=builder,
-                            short_name=short_name,
-                            category=console_category,
-                            console_view="alt",
-                        )
-
-    builder()
-    for channel in channels:
-        if enabled:
-            builder(channel)
-
-
-def dart_ci_builder(name, **kwargs):
-    dart_builder(name,
-                 bucket="ci",
-                 service_account=CI_ACCOUNT,
-                 **kwargs)
-
-
-def dart_ci_sandbox_builder(name,
-                            channels=CHANNELS,
-                            dimensions={},
-                            properties={},
-                            **kwargs):
-
-    if not properties.setdefault("new_workflow_enabled", True):
-        properties.pop("new_workflow_enabled")
-    dimensions.setdefault("pool", "try")
-
-    dart_builder(name,
-                 bucket="ci.sandbox",
-                 channels=channels,
-                 dimensions=dimensions,
-                 properties=properties,
-                 service_account=TRY_ACCOUNT,
-                 **kwargs)
-
-
-# fasta
-dart_ci_sandbox_builder("front-end-linux-release-x64",
-                        category="fasta|l",
-                        on_cq=True)
-dart_ci_sandbox_builder("front-end-mac-release-x64",
-                        category="fasta|m",
-                        dimensions=mac())
-dart_ci_sandbox_builder("front-end-win-release-x64",
-                        category="fasta|w",
-                        dimensions=windows())
-dart_ci_sandbox_builder("flutter-frontend",
-                        category="fasta|fl",
-                        channels=["try"],
-                        properties={"new_workflow_enabled": False},
-                        notifies=None)
-
-# flutter
-dart_ci_sandbox_builder(
-    "flutter-engine-linux",
-    recipe="flutter_engine",
-    category="flutter|3H",
-    channels=[],
-    properties={"new_workflow_enabled": False},
-    triggered_by=["dart-gitiles-trigger-flutter"],
-    triggering_policy=scheduler.greedy_batching(max_concurrent_invocations=5,
-                                                max_batch_size=1),
-)
-
-# vm|app-kernel
-dart_ci_sandbox_builder("app-kernel-linux-debug-x64",
-                        category="vm|app-kernel|d64")
-dart_ci_sandbox_builder("app-kernel-linux-product-x64",
-                        category="vm|app-kernel|p64")
-dart_ci_sandbox_builder("app-kernel-linux-release-x64",
-                        category="vm|app-kernel|r64")
-
-# vm|dartkb
-dart_ci_sandbox_builder("vm-dartkb-linux-debug-simarm64",
-                        category="vm|dartkb|sd")
-dart_ci_sandbox_builder("vm-dartkb-linux-debug-x64", category="vm|dartkb|d")
-dart_ci_sandbox_builder("vm-dartkb-linux-product-simarm64",
-                        category="vm|dartkb|sp")
-dart_ci_sandbox_builder("vm-dartkb-linux-product-x64", category="vm|dartkb|p")
-dart_ci_sandbox_builder("vm-dartkb-linux-release-simarm64",
-                        category="vm|dartkb|sr")
-dart_ci_sandbox_builder("vm-dartkb-linux-release-x64", category="vm|dartkb|r")
-
-#vm|kernel
-dart_ci_sandbox_builder("vm-canary-linux-debug",
-                        category="vm|kernel|c",
-                        on_cq=True)
-dart_ci_sandbox_builder("vm-kernel-linux-debug-x64", category="vm|kernel|d")
-dart_ci_sandbox_builder("vm-kernel-linux-debug-simdbc64",
-                        category="vm|kernel|dbc")
-dart_ci_sandbox_builder("vm-kernel-linux-release-simarm",
-                        category="vm|kernel|a32")
-dart_ci_sandbox_builder("vm-kernel-linux-release-simarm64",
-                        category="vm|kernel|a64")
-dart_ci_sandbox_builder("vm-kernel-linux-release-simdbc64",
-                        category="vm|kernel|rbc",
-                        on_cq=True)
-dart_ci_sandbox_builder("vm-kernel-linux-release-ia32",
-                        category="vm|kernel|r32")
-dart_ci_sandbox_builder("vm-kernel-linux-release-x64",
-                        category="vm|kernel|r",
-                        on_cq=True)
-dart_ci_sandbox_builder("vm-kernel-checked-linux-release-x64",
-                        category="vm|kernel|rc")
-dart_ci_sandbox_builder("vm-kernel-linux-debug-ia32", category="vm|kernel|d32")
-dart_ci_sandbox_builder("vm-kernel-mac-debug-simdbc64",
-                        category="vm|kernel|mds",
-                        dimensions=mac())
-dart_ci_sandbox_builder("vm-kernel-mac-release-simdbc64",
-                        category="vm|kernel|mrs",
-                        dimensions=mac())
-dart_ci_sandbox_builder("vm-kernel-mac-debug-x64",
-                        category="vm|kernel|md",
-                        dimensions=mac())
-dart_ci_sandbox_builder("vm-kernel-mac-release-x64",
-                        category="vm|kernel|mr",
-                        dimensions=mac(),
-                        on_cq=True,
-                        experiment_percentage=5)
-dart_ci_sandbox_builder("vm-kernel-win-debug-ia32",
-                        category="vm|kernel|wd3",
-                        dimensions=windows())
-dart_ci_sandbox_builder("vm-kernel-win-debug-x64",
-                        category="vm|kernel|wd",
-                        dimensions=windows())
-dart_ci_sandbox_builder("vm-kernel-win-release-ia32",
-                        category="vm|kernel|wr3",
-                        dimensions=windows())
-dart_ci_sandbox_builder("vm-kernel-win-release-x64",
-                        category="vm|kernel|wr",
-                        dimensions=windows())
-dart_ci_sandbox_builder("cross-vm-linux-release-arm64",
-                        category="vm|kernel|cra",
-                        channels=RELEASE_CHANNELS)
-
-# vm|kernel-precomp
-dart_ci_sandbox_builder("vm-kernel-precomp-android-release-arm",
-                        category="vm|kernel-precomp|and",
-                        properties={"shard_timeout": 5400})  # 1.5h
-dart_ci_sandbox_builder("vm-kernel-precomp-linux-debug-x64",
-                        category="vm|kernel-precomp|d")
-dart_ci_sandbox_builder("vm-kernel-precomp-linux-product-x64",
-                        category="vm|kernel-precomp|p")
-dart_ci_sandbox_builder("vm-kernel-precomp-linux-release-simarm",
-                        category="vm|kernel-precomp|a32")
-dart_ci_sandbox_builder("vm-kernel-precomp-linux-release-simarm64",
-                        category="vm|kernel-precomp|a64")
-dart_ci_sandbox_builder("vm-kernel-precomp-linux-release-x64",
-                        category="vm|kernel-precomp|r")
-dart_ci_sandbox_builder("vm-kernel-precomp-bare-linux-release-x64",
-                        category="vm|kernel-precomp|br")
-dart_ci_sandbox_builder("vm-kernel-precomp-bare-linux-release-simarm",
-                        category="vm|kernel-precomp|bra32")
-dart_ci_sandbox_builder("vm-kernel-precomp-bare-linux-release-simarm64",
-                        category="vm|kernel-precomp|bra64")
-dart_ci_sandbox_builder("vm-kernel-precomp-obfuscate-linux-release-x64",
-                        category="vm|kernel-precomp|o")
-dart_ci_sandbox_builder("vm-kernel-precomp-mac-release-simarm64",
-                        category="vm|kernel-precomp|ma",
-                        dimensions=mac())
-dart_ci_sandbox_builder("vm-kernel-precomp-win-release-simarm64",
-                        category="vm|kernel-precomp|wa",
-                        dimensions=windows())
-dart_ci_sandbox_builder("vm-kernel-precomp-win-release-x64",
-                        category="vm|kernel-precomp|wr",
-                        dimensions=windows())
-
-# vm|misc
-dart_ci_sandbox_builder("vm-kernel-asan-linux-release-x64",
-                        category="vm|misc|a64")
-dart_ci_sandbox_builder("vm-kernel-optcounter-threshold-linux-release-ia32",
-                        category="vm|misc|o32")
-dart_ci_sandbox_builder("vm-kernel-optcounter-threshold-linux-release-x64",
-                        category="vm|misc|o64")
-
-# vm|product
-dart_ci_sandbox_builder("vm-kernel-linux-product-x64",
-                        category="vm|product|l",
-                        on_cq=True)
-dart_ci_sandbox_builder("vm-kernel-mac-product-x64",
-                        category="vm|product|m",
-                        dimensions=mac())
-dart_ci_sandbox_builder("vm-kernel-win-product-x64",
-                        category="vm|product|w",
-                        dimensions=windows())
-
-# vm|reload-kernel
-dart_ci_sandbox_builder("vm-kernel-reload-linux-debug-x64",
-                        category="vm|reload-kernel|d")
-dart_ci_sandbox_builder("vm-kernel-reload-linux-release-x64",
-                        category="vm|reload-kernel|r")
-dart_ci_sandbox_builder("vm-kernel-reload-mac-debug-simdbc64",
-                        category="vm|reload-kernel|md",
-                        dimensions=mac())
-dart_ci_sandbox_builder("vm-kernel-reload-mac-release-simdbc64",
-                        category="vm|reload-kernel|mr",
-                        dimensions=mac())
-dart_ci_sandbox_builder("vm-kernel-reload-rollback-linux-debug-x64",
-                        category="vm|reload-kernel|drb")
-dart_ci_sandbox_builder("vm-kernel-reload-rollback-linux-release-x64",
-                        category="vm|reload-kernel|rrb")
-# vm|ffi
-dart_ci_sandbox_builder("vm-ffi-android-debug-arm", category="vm|ffi|d32")
-dart_ci_sandbox_builder("vm-ffi-android-release-arm", category="vm|ffi|r32")
-dart_ci_sandbox_builder("vm-ffi-android-product-arm", category="vm|ffi|p32")
-
-# dart2js
-dart_ci_sandbox_builder("dart2js-strong-hostasserts-linux-ia32-d8",
-                        category="dart2js|d8|ha",
-                        on_cq=True)
-dart_ci_sandbox_builder("dart2js-minified-strong-linux-x64-d8",
-                        category="dart2js|d8|mi",
-                        on_cq=True)
-dart_ci_sandbox_builder("dart2js-unit-linux-x64-release",
-                        category="dart2js|d8|u",
-                        on_cq=True)
-dart_ci_sandbox_builder("dart2js-strong-linux-x64-chrome",
-                        category="dart2js|chrome|l",
-                        on_cq=True)
-dart_ci_sandbox_builder("dart2js-csp-minified-linux-x64-chrome",
-                        category="dart2js|chrome|csp")
-dart_ci_sandbox_builder("dart2js-strong-mac-x64-chrome",
-                        category="dart2js|chrome|m",
-                        dimensions=mac())
-dart_ci_sandbox_builder("dart2js-strong-win-x64-chrome",
-                        category="dart2js|chrome|w",
-                        dimensions=windows())
-dart_ci_sandbox_builder("dart2js-strong-linux-x64-firefox",
-                        category="dart2js|firefox|l")
-dart_ci_sandbox_builder("dart2js-strong-win-x64-firefox",
-                        category="dart2js|firefox|w",
-                        dimensions=windows())
-dart_ci_sandbox_builder("dart2js-strong-mac-x64-safari",
-                        category="dart2js|safari|m",
-                        dimensions=mac())
-dart_ci_sandbox_builder("dart2js-strong-win-x64-ie11",
-                        category="dart2js|ms|ie",
-                        dimensions=windows())
-
-# analyzer
-dart_ci_sandbox_builder("flutter-analyze",
-                        category="analyzer|fa",
-                        channels=["try"],
-                        properties={"new_workflow_enabled": False},
-                        notifies=None,
-                        on_cq=True,
-                        location_regexp=[
-                            ".+/[+]/DEPS",
-                            ".+/[+]/pkg/analysis_server/.+",
-                            ".+/[+]/pkg/analysis_server_client/.+",
-                            ".+/[+]/pkg/analyzer/.+",
-                            ".+/[+]/pkg/analyzer_plugin/.+",
-                            ".+/[+]/pkg/front_end/.+",
-                            ".+/[+]/pkg/meta/.+",
-                            ".+/[+]/pkg/telemetry/.+",
-                        ])
-dart_ci_sandbox_builder("analyzer-analysis-server-linux",
-                        category="analyzer|as",
-                        channels=ANALYZER_CHANNELS,
-                        on_cq=True)
-dart_ci_sandbox_builder("analyzer-linux-release",
-                        category="analyzer|l",
-                        on_cq=True,
-                        channels=ANALYZER_CHANNELS)
-dart_ci_sandbox_builder("analyzer-mac-release",
-                        category="analyzer|m",
-                        dimensions=mac(),
-                        channels=ANALYZER_CHANNELS)
-dart_ci_sandbox_builder("analyzer-win-release",
-                        category="analyzer|w",
-                        dimensions=windows(),
-                        channels=ANALYZER_CHANNELS)
-
-# sdk
-dart_ci_builder("dart-sdk-linux", category="sdk|l", channels=CHANNELS)
-dart_ci_builder("dart-sdk-mac",
-                category="sdk|m",
-                channels=CHANNELS,
-                dimensions=mac())
-dart_ci_builder("dart-sdk-win",
-                category="sdk|w",
-                channels=CHANNELS,
-                dimensions=windows(),
-                on_cq=True)
-
-# ddc
-dart_ci_sandbox_builder("ddc-linux-release-chrome",
-                        category="ddc|l",
-                        on_cq=True)
-dart_ci_sandbox_builder("ddc-mac-release-chrome",
-                        category="ddc|m",
-                        dimensions=mac())
-dart_ci_sandbox_builder("ddc-win-release-chrome",
-                        category="ddc|w",
-                        dimensions=windows())
-
-# pkg
-dart_ci_sandbox_builder("pkg-linux-release", category="pkg|l", on_cq=True)
-dart_ci_sandbox_builder("pkg-mac-release", category="pkg|m", dimensions=mac())
-dart_ci_sandbox_builder("pkg-win-release",
-                        category="pkg|w",
-                        dimensions=windows())
-dart_ci_sandbox_builder("pkg-linux-debug", category="pkg|ld", channels=["try"])
-
-# misc
-dart_ci_sandbox_builder("gclient",
-                        recipe="gclient",
-                        category="misc|g",
-                        properties={"new_workflow_enabled": False},
-                        on_cq=True)
-dart_ci_builder("debianpackage-linux",
-                category="misc|dp",
-                channels=RELEASE_CHANNELS,
-                notifies="infra")
-dart_ci_builder("versionchecker-linux",
-                category="misc|vc",
-                channels=RELEASE_CHANNELS)
-
-# external
-dart_ci_builder("google",
-                recipe="external",
-                category="external|g",
-                enabled=False,
-                fyi=True)
-
-# infra
-dart_ci_builder("base",
-                recipe="forward_branch",
-                schedule="with 10m interval",
-                notifies="infra")
-dart_ci_builder("chocolatey",
-                recipe="chocolatey",
-                enabled=False,
-                dimensions=windows())
-dart_ci_builder("co19-roller", recipe="package_co19", enabled=False)
-dart_ci_builder("docker", recipe="docker", enabled=False)
-dart_ci_builder(
-    "linearize-flutter",
-    recipe="linearize",
-    properties={
-        "repo": "https://dart.googlesource.com/linear_sdk_flutter_engine.git"
-    },
-    notifies="infra",
-    triggered_by=[
-        "dart-gitiles-trigger-master", "dart-flutter-engine-trigger",
-        "dart-flutter-flutter-trigger"
-    ],
-    triggering_policy=scheduler.greedy_batching(max_batch_size=1),
-)
-
-# Fuzz testing builders
-dart_ci_sandbox_builder("fuzz-linux",
-                        channels=[],
-                        notifies="dart-fuzz-testing",
-                        properties={"new_workflow_enabled": False},
-                        schedule="0 3 * * *")
-
-# Try only builders
-dart_try_builder("cl-linux")
-dart_try_builder("cl-mac", dimensions=mac())
-dart_try_builder("cl-win", dimensions=windows())
-dart_try_builder("benchmark-linux", on_cq=True)
-
-
-def add_postponed_alt_console_entries():
-    for entry in postponed_alt_console_entries:
-        luci.console_view_entry(console_view="alt", **entry)
-
-
-add_postponed_alt_console_entries()
-
-# Flutter consoles
-luci.console_view_entry(
-    builder="flutter-analyze",
-    short_name="fa",
-    category="analyzer",
-    console_view="flutter",
-)
-
-luci.console_view_entry(
-    builder="flutter-frontend",
-    short_name="fl",
-    category="fasta",
-    console_view="flutter",
-)
-
-luci.console_view_entry(
-    builder="flutter-engine-linux",
-    short_name="3H",
-    category="flutter",
-    console_view="flutter-hhh",
-)

From 840fc1d7a17d9f663eedc70c67b8fdf31f8eb475 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 2 May 2019 12:17:28 +0000
Subject: [PATCH 277/826] Reland "[infra] Migrate Luci config to starlark"

This reverts commit 07ca863ce56ab1c103f0f2d599d953f3b6be8cda.

Additional changes:
* Use fully-qualified names for the swarming "pool" dimension.
* Deleted the old configs to avoid conflicts.
* Moved generated configs to root folder (like in webrtc).

Change-Id: I0c81562db102057762e14e385eca9246c46bbc89
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/100967
Reviewed-by: William Hesse <whesse@google.com>
---
 PRESUBMIT.py          |   16 +-
 commit-queue.cfg      |  136 +-
 console-header.textpb |   28 +
 cr-buildbucket.cfg    | 8568 ++++++++++++++++++++++++++++++++++++++---
 luci-logdog.cfg       |   15 +-
 luci-milo.cfg         | 2008 +++++-----
 luci-notify.cfg       | 1876 ++++++---
 luci-scheduler.cfg    | 5060 +++++++++++-------------
 main.star             |  753 ++++
 project.cfg           |   11 +-
 10 files changed, 13572 insertions(+), 4899 deletions(-)
 create mode 100644 console-header.textpb
 create mode 100755 main.star

diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 51b514c08fc1..9861fb0d818d 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -2,8 +2,20 @@
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
+
 def CheckChangeOnUpload(input_api, output_api):
-  return input_api.canned_checks.CheckChangedLUCIConfigs(input_api, output_api)
+    return _CommonChecks(input_api, output_api)
+
 
 def CheckChangeOnCommit(input_api, output_api):
-  return input_api.canned_checks.CheckChangedLUCIConfigs(input_api, output_api)
+    return _CommonChecks(input_api, output_api)
+
+
+def _CommonChecks(input_api, output_api):
+    tests = input_api.canned_checks.CheckLucicfgGenOutput(
+        input_api, output_api, "main.star")
+    results = []
+    results.extend(
+        input_api.canned_checks.CheckChangedLUCIConfigs(input_api, output_api))
+    results.extend(input_api.RunTests(tests))
+    return results
diff --git a/commit-queue.cfg b/commit-queue.cfg
index b2cfc04fe6b2..e14f992df8a0 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -1,38 +1,61 @@
-# See http://luci-config.appspot.com/schemas/projects:commit-queue.cfg for the
-# documentation of this file format.
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see Config message:
+#   https://luci-config.appspot.com/schemas/projects:commit-queue.cfg
 
-cq_status_host: "chromium-cq-status.appspot.com"
-submit_options {
+submit_options: <
   max_burst: 2
-  burst_delay {
+  burst_delay: <
     seconds: 480
-  }
-}
-config_groups {
-  gerrit {
+  >
+>
+config_groups: <
+  gerrit: <
     url: "https://dart-review.googlesource.com"
-    projects {
+    projects: <
       name: "sdk"
       ref_regexp: "refs/heads/.+"
-    }
-  }
-  verifiers {
-    gerrit_cq_ability {
+    >
+  >
+  verifiers: <
+    gerrit_cq_ability: <
       committer_list: "project-dart-committers"
       dry_run_access_list: "project-dart-tryjob-access"
       allow_submit_with_open_deps: true
-    }
-    tree_status {
+    >
+    tree_status: <
       url: "https://dart-status.appspot.com"
-    }
-    tryjob {
-      builders {
+    >
+    tryjob: <
+      builders: <
         name: "dart/try/analyzer-analysis-server-linux-try"
-      }
-      builders {
+      >
+      builders: <
         name: "dart/try/analyzer-linux-release-try"
-      }
-      builders {
+      >
+      builders: <
+        name: "dart/try/benchmark-linux-try"
+      >
+      builders: <
+        name: "dart/try/dart-sdk-win-try"
+      >
+      builders: <
+        name: "dart/try/dart2js-minified-strong-linux-x64-d8-try"
+      >
+      builders: <
+        name: "dart/try/dart2js-strong-hostasserts-linux-ia32-d8-try"
+      >
+      builders: <
+        name: "dart/try/dart2js-strong-linux-x64-chrome-try"
+      >
+      builders: <
+        name: "dart/try/dart2js-unit-linux-x64-release-try"
+      >
+      builders: <
+        name: "dart/try/ddc-linux-release-chrome-try"
+      >
+      builders: <
         name: "dart/try/flutter-analyze-try"
         location_regexp: ".+/[+]/DEPS"
         location_regexp: ".+/[+]/pkg/analysis_server/.+"
@@ -42,55 +65,34 @@ config_groups {
         location_regexp: ".+/[+]/pkg/front_end/.+"
         location_regexp: ".+/[+]/pkg/meta/.+"
         location_regexp: ".+/[+]/pkg/telemetry/.+"
-      }
-      builders {
-        name: "dart/try/benchmark-linux-try"
-      }
-      builders {
-        name: "dart/try/dart-sdk-win-try"
-      }
-      builders {
-        name: "dart/try/dart2js-strong-linux-x64-chrome-try"
-      }
-      builders {
-        name: "dart/try/dart2js-minified-strong-linux-x64-d8-try"
-      }
-      builders {
-        name: "dart/try/dart2js-strong-hostasserts-linux-ia32-d8-try"
-      }
-      builders {
-        name: "dart/try/dart2js-unit-linux-x64-release-try"
-      }
-      builders {
-        name: "dart/try/ddc-linux-release-chrome-try"
-      }
-      builders {
+      >
+      builders: <
         name: "dart/try/front-end-linux-release-x64-try"
-      }
-      builders {
+      >
+      builders: <
         name: "dart/try/gclient-try"
-      }
-      builders {
+      >
+      builders: <
         name: "dart/try/pkg-linux-release-try"
-      }
-      builders {
+      >
+      builders: <
         name: "dart/try/vm-canary-linux-debug-try"
-      }
-      builders {
+      >
+      builders: <
+        name: "dart/try/vm-kernel-linux-product-x64-try"
+      >
+      builders: <
         name: "dart/try/vm-kernel-linux-release-simdbc64-try"
-      }
-      builders {
+      >
+      builders: <
         name: "dart/try/vm-kernel-linux-release-x64-try"
-      }
-      builders {
+      >
+      builders: <
         name: "dart/try/vm-kernel-mac-release-x64-try"
         experiment_percentage: 5
-      }
-      builders {
-        name: "dart/try/vm-kernel-linux-product-x64-try"
-      }
-      retry_config {
-      }
-    }
-  }
-}
+      >
+      retry_config: <
+      >
+    >
+  >
+>
diff --git a/console-header.textpb b/console-header.textpb
new file mode 100644
index 000000000000..b6c4b8eed23f
--- /dev/null
+++ b/console-header.textpb
@@ -0,0 +1,28 @@
+links: {
+    name: "Consoles"
+    links: {
+        text: "Bleeding Edge console"
+        url: "/p/dart/g/be/console"
+        alt: "SDK BE Console"
+    }
+    links: {
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (alternative)"
+    }
+    links: {
+        text: "FYI console"
+        url: "/p/dart/g/fyi/console"
+        alt: "SDK FYI Console"
+    }
+    links: {
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+    }
+}
+console_groups: {
+    console_ids: "dart/flutter"
+    console_ids: "dart/flutter-hhh"
+}
+tree_status_host: "dart-status.appspot.com"
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 131fba4b6ce2..c227c53e0c19 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1,625 +1,8019 @@
-# Defines buckets on cr-buildbucket.appspot.com, used to schedule builds
-# on Luci. In particular, CQ uses some of these buckets to schedule tryjobs.
+# Auto-generated by lucicfg.
+# Do not modify manually.
 #
-# See http://luci-config.appspot.com/schemas/projects:buildbucket.cfg for
-# schema of this file and documentation.
-#
-# Please keep this list sorted by bucket name.
+# For the schema of this file, see BuildbucketCfg message:
+#   https://luci-config.appspot.com/schemas/projects:buildbucket.cfg
 
-acl_sets {
+buckets: <
   name: "ci"
-  acls {
-    role: READER
+  acls: <
     group: "all"
-  }
-  acls {
+  >
+  acls: <
     role: SCHEDULER
-    identity: "luci-scheduler@appspot.gserviceaccount.com"
-  }
-  acls {
+    identity: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+  >
+  acls: <
     role: SCHEDULER
-    identity: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-  }
-  acls {
+    identity: "user:luci-scheduler@appspot.gserviceaccount.com"
+  >
+  acls: <
     role: SCHEDULER
-    # todo(athom): remove this once google builder is triggered automatically
     group: "project-dart-admins"
-  }
-}
-
-acl_sets {
-  name: "try"
-  acls {
-    role: READER
-    group: "all"
-  }
-  acls {
-    role: SCHEDULER
-    group: "project-dart-tryjob-access"
-  }
-  acls {
-    role: SCHEDULER
-    group: "service-account-cq"
-  }
-}
-
-builder_mixins {
-  name: "android"
-  recipe {
-    properties_j: "shard_timeout:5400" # 1.5h
-  }
-}
-
-builder_mixins {
-  name: "chocolatey"
-  recipe {
-    name: "dart/chocolatey"
-  }
-}
-
-builder_mixins {
-  name: "co19"
-  recipe {
-    name: "dart/package_co19"
-  }
-}
-
-builder_mixins {
-  name: "clobber"
-  recipe {
-    properties: "clobber:true"
-  }
-}
-
-builder_mixins {
-  name: "docker"
-  recipe {
-    name: "dart/docker"
-  }
-}
-
-builder_mixins {
-  name: "external"
-  recipe {
-    name: "dart/external"
-  }
-}
-
-builder_mixins {
-  name: "flutter"
-  recipe {
-    name: "dart/flutter_engine"
-  }
-}
-
-builder_mixins {
-  name: "forward"
-  recipe {
-    name: "dart/forward_branch"
-  }
-}
-
-builder_mixins {
-  name: "gclient"
-  recipe {
-    name: "dart/gclient"
-  }
-}
-
-builder_mixins {
-  name: "fyi"
-  recipe {
-    properties: "mastername:client.dart.fyi"
-  }
-}
-
-builder_mixins {
-  name: "linearize"
-  recipe {
-    name: "dart/linearize"
-    properties: "repo:https://dart.googlesource.com/linear_sdk_flutter_engine.git"
-  }
-}
-
-builder_mixins {
-  name: "mac"
-  dimensions: "os:Mac"
-}
-
-builder_mixins {
-  name: "slow"
-  execution_timeout_secs: 21600 # 6h
-  recipe {
-    properties_j: "shard_timeout:7200" # 2h
-  }
-}
-
-builder_mixins {
-  name: "win"
-  dimensions: "os:Windows"
-}
-
-builder_mixins {
-  name: "new_workflow"
-  recipe {
-    properties_j: "new_workflow_enabled:true"
-  }
-}
-
-buckets {
-  # CI Builders that require special permissions
-  name: "luci.dart.ci"
-  acl_sets: "ci"
-
-  swarming {
-    hostname: "chromium-swarm.appspot.com"
-    url_format: "https://ci.chromium.org/swarming/task/{task_id}"
-    builder_defaults {
-      category: "Dart CI"
+  >
+  swarming: <
+    builders: <
+      name: "base"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
-      build_numbers: YES
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
+        name: "dart/forward_branch"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
       priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "chocolatey"
+      swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      caches {
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
+        name: "dart/chocolatey"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
         path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "co19-roller"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
+        name: "dart/package_co19"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
         name: "browsers"
-      }
-      recipe {
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart-sdk-linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
+        name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties: "clobber:true"
-        properties: "mastername:client.dart"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart-sdk-linux-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
         name: "dart/neo"
-      }
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    }
-
-    # CI Builders that require privileged access
-    builders { name: "base" mixins: "forward" }
-    builders { name: "chocolatey" mixins: "chocolatey" mixins: "win" }
-    builders { name: "co19-roller" mixins: "co19" }
-    builders { name: "dart-sdk-linux" }
-    builders { name: "dart-sdk-mac" mixins: "mac" }
-    builders { name: "dart-sdk-win" mixins: "win" }
-    builders { name: "docker" mixins: "docker" }
-    builders { name: "debianpackage-linux" }
-    builders { name: "google" mixins: "external" }
-    builders { name: "linearize-flutter" mixins: "linearize" }
-    builders { name: "versionchecker-linux" }
-
-    # CI builders that require privileged access on the dev branch
-    builders { name: "dart-sdk-linux-dev" }
-    builders { name: "dart-sdk-mac-dev" mixins: "mac" }
-    builders { name: "dart-sdk-win-dev" mixins: "win" }
-    builders { name: "debianpackage-linux-dev" }
-    builders { name: "versionchecker-linux-dev" }
-
-    # CI builders that require privileged access on the stable branch
-    builders { name: "dart-sdk-linux-stable" }
-    builders { name: "dart-sdk-mac-stable" mixins: "mac" }
-    builders { name: "dart-sdk-win-stable" mixins: "win" }
-    builders { name: "debianpackage-linux-stable" }
-    builders { name: "versionchecker-linux-stable" }
-  }
-}
-
-buckets {
-  # CI Builders that only require try permissions
-  name: "luci.dart.ci.sandbox"
-  acl_sets: "ci"
-
-  swarming {
-    hostname: "chromium-swarm.appspot.com"
-    url_format: "https://ci.chromium.org/swarming/task/{task_id}"
-    builder_defaults {
-      category: "Dart CI (Sandboxed)"
+    >
+    builders: <
+      name: "dart-sdk-linux-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
       build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart-sdk-mac"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
       priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart-sdk-mac-dev"
+      swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      caches {
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
         path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart-sdk-mac-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
         name: "browsers"
-      }
-      recipe {
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart-sdk-win"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
+        name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties: "clobber:true"
-        properties: "mastername:client.dart"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart-sdk-win-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
         name: "dart/neo"
-      }
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-
-    # Fuzz testing builders
-    builders { name: "fuzz-linux" }
-
-    # CI Builders for the analyzer branch
-    builders { name: "analyzer-analysis-server-linux-analyzer-stable" mixins: "new_workflow"  }
-    builders { name: "analyzer-linux-release-analyzer-stable" mixins: "new_workflow"  }
-    builders { name: "analyzer-mac-release-analyzer-stable" mixins: "new_workflow"  mixins: "mac" }
-    builders { name: "analyzer-win-release-analyzer-stable" mixins: "new_workflow"  mixins: "win" }
-
-    # CI Builders for the master branch
-    builders { name: "analyzer-analysis-server-linux" mixins: "new_workflow" }
-    builders { name: "analyzer-linux-release" mixins: "new_workflow" }
-    builders { name: "analyzer-mac-release" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "analyzer-win-release" mixins: "win" mixins: "new_workflow" }
-    builders { name: "app-kernel-linux-debug-x64" mixins: "new_workflow" }
-    builders { name: "app-kernel-linux-product-x64" mixins: "new_workflow" }
-    builders { name: "app-kernel-linux-release-x64" mixins: "new_workflow" }
-    builders { name: "cross-vm-linux-release-arm64" mixins: "new_workflow" }
-    builders { name: "dart2js-csp-minified-linux-x64-chrome" mixins: "new_workflow" }
-    builders { name: "dart2js-minified-strong-linux-x64-d8" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-hostasserts-linux-ia32-d8" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-linux-x64-chrome" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-linux-x64-firefox" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-mac-x64-chrome" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-mac-x64-safari" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-win-x64-chrome" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-win-x64-edge" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-win-x64-firefox" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-win-x64-ie11" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-unit-linux-x64-release" mixins: "new_workflow" }
-    builders { name: "ddc-linux-release-chrome" mixins: "new_workflow" }
-    builders { name: "ddc-mac-release-chrome" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "ddc-win-release-chrome" mixins: "win" mixins: "new_workflow" }
-    builders { name: "flutter-analyze" }
-    builders { name: "flutter-frontend" }
-    builders { name: "flutter-engine-linux" mixins: "flutter"}
-    builders { name: "front-end-linux-release-x64" mixins: "clobber" mixins: "new_workflow" }
-    builders { name: "front-end-mac-release-x64" mixins: "clobber" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "front-end-win-release-x64" mixins: "clobber" mixins: "win" mixins: "new_workflow" }
-    builders { name: "gclient" mixins: "gclient" }
-    builders { name: "pkg-linux-release" mixins: "new_workflow" }
-    builders { name: "pkg-mac-release" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "pkg-win-release" mixins: "win" mixins: "new_workflow" }
-    builders { name: "pkg-linux-debug" mixins: "new_workflow" }
-    builders { name: "vm-canary-linux-debug" mixins: "new_workflow" }
-    builders { name: "vm-dartkb-linux-debug-simarm64" mixins: "new_workflow" }
-    builders { name: "vm-dartkb-linux-debug-x64" mixins: "new_workflow" }
-    builders { name: "vm-dartkb-linux-product-simarm64" mixins: "new_workflow" }
-    builders { name: "vm-dartkb-linux-product-x64" mixins: "new_workflow" }
-    builders { name: "vm-dartkb-linux-release-simarm64" mixins: "new_workflow" }
-    builders { name: "vm-dartkb-linux-release-x64" mixins: "new_workflow" }
-    builders { name: "vm-kernel-asan-linux-release-x64" mixins: "new_workflow" }
-    builders { name: "vm-kernel-checked-linux-release-x64" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-debug-ia32" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-debug-simdbc64" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-debug-x64" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-product-x64" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-release-ia32" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-release-simarm" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-release-simarm64" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-release-simdbc64" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-release-x64" mixins: "new_workflow" }
-    builders { name: "vm-kernel-mac-debug-simdbc64" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-mac-debug-x64" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-mac-product-x64" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-mac-release-simdbc64" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-mac-release-x64" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32" mixins: "new_workflow" }
-    builders { name: "vm-kernel-optcounter-threshold-linux-release-x64" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-debug-arm" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-release-arm" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-product-arm" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-android-release-arm" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-bare-linux-release-simarm" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-bare-linux-release-simarm64" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-bare-linux-release-x64" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-linux-debug-x64" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-linux-product-x64" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-linux-release-simarm" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-linux-release-simarm64" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-linux-release-x64" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-mac-release-simarm64" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-win-release-simarm64" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-win-release-x64" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-kernel-reload-linux-debug-x64" mixins: "new_workflow" }
-    builders { name: "vm-kernel-reload-linux-release-x64" mixins: "new_workflow" }
-    builders { name: "vm-kernel-reload-mac-debug-simdbc64" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-reload-mac-release-simdbc64" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-reload-rollback-linux-debug-x64" mixins: "new_workflow" }
-    builders { name: "vm-kernel-reload-rollback-linux-release-x64" mixins: "new_workflow" }
-    builders { name: "vm-kernel-win-debug-ia32" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-kernel-win-debug-x64" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-kernel-win-product-x64" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-kernel-win-release-ia32" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-kernel-win-release-x64" mixins: "win" mixins: "new_workflow" }
-
-    # CI Builders for the dev branch
-    builders { name: "analyzer-analysis-server-linux-dev" mixins: "new_workflow" }
-    builders { name: "analyzer-linux-release-dev" mixins: "new_workflow" }
-    builders { name: "analyzer-mac-release-dev" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "analyzer-win-release-dev" mixins: "win" mixins: "new_workflow" }
-    builders { name: "app-kernel-linux-debug-x64-dev" mixins: "new_workflow" }
-    builders { name: "app-kernel-linux-product-x64-dev" mixins: "new_workflow" }
-    builders { name: "app-kernel-linux-release-x64-dev" mixins: "new_workflow" }
-    builders { name: "cross-vm-linux-release-arm64-dev" mixins: "new_workflow" }
-    builders { name: "dart2js-csp-minified-linux-x64-chrome-dev" mixins: "new_workflow" }
-    builders { name: "dart2js-minified-strong-linux-x64-d8-dev" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-hostasserts-linux-ia32-d8-dev" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-linux-x64-chrome-dev" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-linux-x64-firefox-dev" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-mac-x64-chrome-dev" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-mac-x64-safari-dev" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-win-x64-chrome-dev" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-win-x64-edge-dev" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-win-x64-firefox-dev" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-win-x64-ie11-dev" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-unit-linux-x64-release-dev" mixins: "new_workflow" }
-    builders { name: "ddc-linux-release-chrome-dev" mixins: "new_workflow" }
-    builders { name: "ddc-mac-release-chrome-dev" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "ddc-win-release-chrome-dev" mixins: "win" mixins: "new_workflow" }
-    builders { name: "front-end-linux-release-x64-dev" mixins: "clobber" mixins: "new_workflow" }
-    builders { name: "front-end-mac-release-x64-dev" mixins: "clobber" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "front-end-win-release-x64-dev" mixins: "clobber" mixins: "win" mixins: "new_workflow" }
-    builders { name: "gclient-dev" mixins: "gclient" }
-    builders { name: "pkg-linux-release-dev" mixins: "new_workflow" }
-    builders { name: "pkg-mac-release-dev" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "pkg-win-release-dev" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-canary-linux-debug-dev" mixins: "new_workflow" }
-    builders { name: "vm-dartkb-linux-debug-simarm64-dev" mixins: "new_workflow" }
-    builders { name: "vm-dartkb-linux-debug-x64-dev" mixins: "new_workflow" }
-    builders { name: "vm-dartkb-linux-product-simarm64-dev" mixins: "new_workflow" }
-    builders { name: "vm-dartkb-linux-product-x64-dev" mixins: "new_workflow" }
-    builders { name: "vm-dartkb-linux-release-simarm64-dev" mixins: "new_workflow" }
-    builders { name: "vm-dartkb-linux-release-x64-dev" mixins: "new_workflow" }
-    builders { name: "vm-kernel-asan-linux-release-x64-dev" mixins: "new_workflow" }
-    builders { name: "vm-kernel-checked-linux-release-x64-dev" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-debug-ia32-dev" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-debug-simdbc64-dev" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-debug-x64-dev" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-product-x64-dev" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-release-ia32-dev" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-release-simarm-dev" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-release-simarm64-dev" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-release-simdbc64-dev" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-release-x64-dev" mixins: "new_workflow" }
-    builders { name: "vm-kernel-mac-debug-simdbc64-dev" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-mac-debug-x64-dev" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-mac-product-x64-dev" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-mac-release-simdbc64-dev" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-mac-release-x64-dev" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-dev" mixins: "new_workflow" }
-    builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-dev" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-debug-arm-dev" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-release-arm-dev" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-product-arm-dev" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-android-release-arm-dev" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-bare-linux-release-simarm-dev" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-bare-linux-release-simarm64-dev" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-bare-linux-release-x64-dev" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-linux-debug-x64-dev" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-linux-product-x64-dev" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-linux-release-simarm-dev" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-linux-release-simarm64-dev" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-linux-release-x64-dev" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-mac-release-simarm64-dev" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-win-release-simarm64-dev" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-win-release-x64-dev" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-kernel-reload-linux-debug-x64-dev" mixins: "new_workflow" }
-    builders { name: "vm-kernel-reload-linux-release-x64-dev" mixins: "new_workflow" }
-    builders { name: "vm-kernel-reload-mac-debug-simdbc64-dev" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-reload-mac-release-simdbc64-dev" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-reload-rollback-linux-debug-x64-dev" mixins: "new_workflow" }
-    builders { name: "vm-kernel-reload-rollback-linux-release-x64-dev" mixins: "new_workflow" }
-    builders { name: "vm-kernel-win-debug-ia32-dev" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-kernel-win-debug-x64-dev" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-kernel-win-product-x64-dev" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-kernel-win-release-ia32-dev" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-kernel-win-release-x64-dev" mixins: "win" mixins: "new_workflow" }
-
-    # CI Builders for the stable branch
-    builders { name: "analyzer-analysis-server-linux-stable" mixins: "new_workflow" }
-    builders { name: "analyzer-linux-release-stable" mixins: "new_workflow" }
-    builders { name: "analyzer-mac-release-stable" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "analyzer-win-release-stable" mixins: "win" mixins: "new_workflow" }
-    builders { name: "app-kernel-linux-debug-x64-stable" mixins: "new_workflow" }
-    builders { name: "app-kernel-linux-product-x64-stable" mixins: "new_workflow" }
-    builders { name: "app-kernel-linux-release-x64-stable" mixins: "new_workflow" }
-    builders { name: "cross-vm-linux-release-arm64-stable" mixins: "new_workflow" }
-    builders { name: "dart2js-csp-minified-linux-x64-chrome-stable" mixins: "new_workflow" }
-    builders { name: "dart2js-minified-strong-linux-x64-d8-stable" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-hostasserts-linux-ia32-d8-stable" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-linux-x64-chrome-stable" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-linux-x64-firefox-stable" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-mac-x64-chrome-stable" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-mac-x64-safari-stable" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-win-x64-chrome-stable" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-win-x64-edge-stable" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-win-x64-firefox-stable" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-win-x64-ie11-stable" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-unit-linux-x64-release-stable" mixins: "new_workflow" }
-    builders { name: "ddc-linux-release-chrome-stable" mixins: "new_workflow" }
-    builders { name: "ddc-mac-release-chrome-stable" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "ddc-win-release-chrome-stable" mixins: "win" mixins: "new_workflow" }
-    builders { name: "front-end-linux-release-x64-stable" mixins: "clobber" mixins: "new_workflow" }
-    builders { name: "front-end-mac-release-x64-stable" mixins: "clobber" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "front-end-win-release-x64-stable" mixins: "clobber" mixins: "win" mixins: "new_workflow" }
-    builders { name: "gclient-stable" mixins: "gclient" }
-    builders { name: "pkg-linux-release-stable" mixins: "new_workflow" }
-    builders { name: "pkg-mac-release-stable" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "pkg-win-release-stable" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-canary-linux-debug-stable" mixins: "new_workflow" }
-    builders { name: "vm-dartkb-linux-debug-simarm64-stable" mixins: "new_workflow" }
-    builders { name: "vm-dartkb-linux-debug-x64-stable" mixins: "new_workflow" }
-    builders { name: "vm-dartkb-linux-product-simarm64-stable" mixins: "new_workflow" }
-    builders { name: "vm-dartkb-linux-product-x64-stable" mixins: "new_workflow" }
-    builders { name: "vm-dartkb-linux-release-simarm64-stable" mixins: "new_workflow" }
-    builders { name: "vm-dartkb-linux-release-x64-stable" mixins: "new_workflow" }
-    builders { name: "vm-kernel-asan-linux-release-x64-stable" mixins: "new_workflow" }
-    builders { name: "vm-kernel-checked-linux-release-x64-stable" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-debug-ia32-stable" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-debug-simdbc64-stable" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-debug-x64-stable" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-product-x64-stable" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-release-ia32-stable" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-release-simarm-stable" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-release-simarm64-stable" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-release-simdbc64-stable" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-release-x64-stable" mixins: "new_workflow" }
-    builders { name: "vm-kernel-mac-debug-simdbc64-stable" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-mac-debug-x64-stable" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-mac-product-x64-stable" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-mac-release-simdbc64-stable" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-mac-release-x64-stable" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-stable" mixins: "new_workflow" }
-    builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-stable" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-debug-arm-stable" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-release-arm-stable" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-product-arm-stable" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-android-release-arm-stable" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-bare-linux-release-simarm-stable" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-bare-linux-release-simarm64-stable" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-bare-linux-release-x64-stable" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-linux-debug-x64-stable" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-linux-product-x64-stable" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-linux-release-simarm-stable" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-linux-release-simarm64-stable" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-linux-release-x64-stable" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-mac-release-simarm64-stable" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-win-release-simarm64-stable" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-win-release-x64-stable" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-kernel-reload-linux-debug-x64-stable" mixins: "new_workflow" }
-    builders { name: "vm-kernel-reload-linux-release-x64-stable" mixins: "new_workflow" }
-    builders { name: "vm-kernel-reload-mac-debug-simdbc64-stable" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-reload-mac-release-simdbc64-stable" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-reload-rollback-linux-debug-x64-stable" mixins: "new_workflow" }
-    builders { name: "vm-kernel-reload-rollback-linux-release-x64-stable" mixins: "new_workflow" }
-    builders { name: "vm-kernel-win-debug-ia32-stable" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-kernel-win-debug-x64-stable" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-kernel-win-product-x64-stable" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-kernel-win-release-ia32-stable" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-kernel-win-release-x64-stable" mixins: "win" mixins: "new_workflow" }
-  }
-}
-
-buckets {
-  name: "luci.dart.try"
-  acl_sets: "try"
-
-  swarming {
-    hostname: "chromium-swarm.appspot.com"
-    url_format: "https://ci.chromium.org/swarming/task/{task_id}"
-    builder_defaults {
-      category: "Dart Try"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart-sdk-win-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "debianpackage-linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
       build_numbers: YES
-      priority: 30
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "debianpackage-linux-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "debianpackage-linux-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "docker"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
+        name: "dart/docker"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "google"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
+        name: "dart/external"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "linearize-flutter"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
+        name: "dart/linearize"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "repo:\"https://dart.googlesource.com/linear_sdk_flutter_engine.git\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "versionchecker-linux"
+      swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      caches {
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
         path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "versionchecker-linux-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
         name: "browsers"
-      }
-      recipe {
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "versionchecker-linux-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
+        name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties: "clobber:true"
-        properties: "mastername:dart.try"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
+  >
+>
+buckets: <
+  name: "ci.sandbox"
+  acls: <
+    group: "all"
+  >
+  acls: <
+    role: SCHEDULER
+    identity: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+  >
+  acls: <
+    role: SCHEDULER
+    identity: "user:luci-scheduler@appspot.gserviceaccount.com"
+  >
+  acls: <
+    role: SCHEDULER
+    group: "project-dart-admins"
+  >
+  swarming: <
+    builders: <
+      name: "analyzer-analysis-server-linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
         name: "dart/neo"
-      }
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-
-    # git cl try builders
-    builders { name: "cl-linux-try" }
-    builders { name: "cl-mac-try" mixins: "mac" }
-    builders { name: "cl-win-try" mixins: "win" }
-
-    # CQ / choose tryjobs builders
-    builders { name: "analyzer-analysis-server-linux-try" mixins: "new_workflow" }
-    builders { name: "analyzer-linux-release-try" mixins: "new_workflow" }
-    builders { name: "analyzer-mac-release-try" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "analyzer-win-release-try" mixins: "win" mixins: "new_workflow" }
-    builders { name: "app-kernel-linux-debug-x64-try"  mixins: "new_workflow"}
-    builders { name: "app-kernel-linux-product-x64-try"  mixins: "new_workflow"}
-    builders { name: "app-kernel-linux-release-x64-try"  mixins: "new_workflow"}
-    builders { name: "benchmark-linux-try" }
-    builders { name: "dart-sdk-linux-try" }
-    builders { name: "dart-sdk-mac-try" mixins: "mac" }
-    builders { name: "dart-sdk-win-try" mixins: "win" }
-    builders { name: "dart2js-csp-minified-linux-x64-chrome-try" mixins: "new_workflow" }
-    builders { name: "dart2js-minified-strong-linux-x64-d8-try" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-hostasserts-linux-ia32-d8-try" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-linux-x64-chrome-try" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-linux-x64-firefox-try" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-mac-x64-chrome-try" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-mac-x64-safari-try" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-win-x64-chrome-try" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-win-x64-firefox-try" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-strong-win-x64-ie11-try" mixins: "win" mixins: "new_workflow" }
-    builders { name: "dart2js-unit-linux-x64-release-try" mixins: "new_workflow" }
-    builders { name: "ddc-linux-release-chrome-try" mixins: "clobber" mixins: "new_workflow" }
-    builders { name: "ddc-mac-release-chrome-try" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "ddc-win-release-chrome-try" mixins: "win" mixins: "new_workflow" }
-    builders { name: "flutter-analyze-try" }
-    builders { name: "flutter-frontend-try" }
-    builders { name: "front-end-linux-release-x64-try" mixins: "clobber" mixins: "new_workflow" }
-    builders { name: "front-end-mac-release-x64-try" mixins: "clobber" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "front-end-win-release-x64-try" mixins: "clobber" mixins: "win" mixins: "new_workflow" }
-    builders { name: "gclient-try" mixins: "gclient" }
-    builders { name: "pkg-linux-release-try" mixins: "new_workflow" }
-    builders { name: "pkg-mac-release-try" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "pkg-win-release-try" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-canary-linux-debug-try" mixins: "new_workflow" }
-    builders { name: "vm-dartkb-linux-debug-simarm64-try" mixins: "new_workflow" }
-    builders { name: "vm-dartkb-linux-debug-x64-try" mixins: "new_workflow" }
-    builders { name: "vm-dartkb-linux-product-simarm64-try" mixins: "new_workflow" }
-    builders { name: "vm-dartkb-linux-product-x64-try" mixins: "new_workflow" }
-    builders { name: "vm-dartkb-linux-release-simarm64-try" mixins: "new_workflow" }
-    builders { name: "vm-dartkb-linux-release-x64-try" mixins: "new_workflow" }
-    builders { name: "vm-kernel-asan-linux-release-x64-try" mixins: "new_workflow" }
-    builders { name: "vm-kernel-checked-linux-release-x64-try" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-debug-ia32-try" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-debug-simdbc64-try" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-debug-x64-try" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-product-x64-try" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-release-ia32-try" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-release-simarm-try" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-release-simarm64-try" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-release-simdbc64-try" mixins: "new_workflow" }
-    builders { name: "vm-kernel-linux-release-x64-try" mixins: "new_workflow" }
-    builders { name: "vm-kernel-mac-debug-simdbc64-try" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-mac-debug-x64-try" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-mac-product-x64-try" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-mac-release-simdbc64-try" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-mac-release-x64-try" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-optcounter-threshold-linux-release-ia32-try" mixins: "new_workflow" }
-    builders { name: "vm-kernel-optcounter-threshold-linux-release-x64-try" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-debug-arm-try" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-release-arm-try" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-ffi-android-product-arm-try" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-android-release-arm-try" mixins: "android" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-bare-linux-release-simarm-try" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-bare-linux-release-simarm64-try" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-bare-linux-release-x64-try" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-linux-debug-x64-try" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-linux-product-x64-try" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-linux-release-simarm-try" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-linux-release-simarm64-try" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-linux-release-x64-try" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-mac-release-simarm64-try" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-obfuscate-linux-release-x64-try" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-win-release-simarm64-try" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-kernel-precomp-win-release-x64-try" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-kernel-reload-linux-debug-x64-try" mixins: "new_workflow" }
-    builders { name: "vm-kernel-reload-linux-release-x64-try" mixins: "new_workflow" }
-    builders { name: "vm-kernel-reload-mac-debug-simdbc64-try" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-reload-mac-release-simdbc64-try" mixins: "mac" mixins: "new_workflow" }
-    builders { name: "vm-kernel-reload-rollback-linux-debug-x64-try" mixins: "new_workflow" }
-    builders { name: "vm-kernel-reload-rollback-linux-release-x64-try" mixins: "new_workflow" }
-    builders { name: "vm-kernel-win-debug-ia32-try" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-kernel-win-debug-x64-try" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-kernel-win-product-x64-try" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-kernel-win-release-ia32-try" mixins: "win" mixins: "new_workflow" }
-    builders { name: "vm-kernel-win-release-x64-try" mixins: "win" mixins: "new_workflow" }
-  }
-}
+    >
+    builders: <
+      name: "analyzer-analysis-server-linux-analyzer-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-analysis-server-linux-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-analysis-server-linux-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-linux-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-linux-release-analyzer-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-linux-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-linux-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-mac-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-mac-release-analyzer-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-mac-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-mac-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-win-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-win-release-analyzer-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-win-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-win-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "app-kernel-linux-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "app-kernel-linux-debug-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "app-kernel-linux-debug-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "app-kernel-linux-product-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "app-kernel-linux-product-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "app-kernel-linux-product-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "app-kernel-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "app-kernel-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "app-kernel-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "cross-vm-linux-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "cross-vm-linux-release-arm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "cross-vm-linux-release-arm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-csp-minified-linux-x64-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-csp-minified-linux-x64-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-csp-minified-linux-x64-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-minified-strong-linux-x64-d8"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-minified-strong-linux-x64-d8-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-minified-strong-linux-x64-d8-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-hostasserts-linux-ia32-d8"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-linux-x64-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-linux-x64-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-linux-x64-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-linux-x64-firefox"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-linux-x64-firefox-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-linux-x64-firefox-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-mac-x64-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-mac-x64-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-mac-x64-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-mac-x64-safari"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-mac-x64-safari-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-mac-x64-safari-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-firefox"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-firefox-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-firefox-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-ie11"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-ie11-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-ie11-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-unit-linux-x64-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-unit-linux-x64-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-unit-linux-x64-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-linux-release-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-linux-release-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-linux-release-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-mac-release-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-mac-release-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-mac-release-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-win-release-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-win-release-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-win-release-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "flutter-analyze"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "flutter-engine-linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/flutter_engine"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "flutter-frontend"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-mac-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-mac-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-mac-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-win-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-win-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-win-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "fuzz-linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "gclient"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/gclient"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "gclient-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/gclient"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "gclient-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/gclient"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-linux-debug"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-linux-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-linux-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-linux-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-mac-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-mac-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-mac-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-win-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-win-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-win-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-canary-linux-debug"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-canary-linux-debug-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-canary-linux-debug-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-debug-simarm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-debug-simarm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-debug-simarm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-debug-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-debug-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-product-simarm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-product-simarm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-product-simarm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-product-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-product-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-product-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-release-simarm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-release-simarm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-release-simarm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-debug-arm"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-debug-arm-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-debug-arm-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-product-arm"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-product-arm-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-product-arm-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-release-arm"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-release-arm-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-release-arm-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-asan-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-asan-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-asan-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-checked-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-checked-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-checked-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-debug-ia32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-debug-ia32-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-debug-ia32-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-debug-simdbc64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-debug-simdbc64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-debug-simdbc64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-debug-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-debug-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-product-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-product-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-product-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-ia32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-ia32-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-ia32-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-simarm"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-simarm-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-simarm-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-simarm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-simarm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-simarm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-simdbc64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-simdbc64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-simdbc64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-debug-simdbc64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-debug-simdbc64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-debug-simdbc64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-debug-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-debug-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-product-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-product-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-product-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-release-simdbc64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-release-simdbc64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-release-simdbc64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-optcounter-threshold-linux-release-ia32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-optcounter-threshold-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-android-release-arm"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "shard_timeout:5400"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-android-release-arm-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "shard_timeout:5400"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-android-release-arm-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "shard_timeout:5400"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-simarm"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-simarm-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-simarm-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-simarm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-debug-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-debug-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-product-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-product-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-product-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-release-simarm"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-release-simarm-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-release-simarm-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-release-simarm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-release-simarm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-release-simarm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-mac-release-simarm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-mac-release-simarm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-mac-release-simarm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-win-release-simarm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-win-release-simarm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-win-release-simarm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-win-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-win-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-win-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-linux-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-linux-debug-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-linux-debug-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-mac-debug-simdbc64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-mac-debug-simdbc64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-mac-debug-simdbc64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-mac-release-simdbc64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-mac-release-simdbc64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-mac-release-simdbc64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-rollback-linux-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-rollback-linux-debug-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-rollback-linux-debug-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-rollback-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-rollback-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-rollback-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-debug-ia32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-debug-ia32-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-debug-ia32-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-debug-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-debug-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-product-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-product-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-product-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-release-ia32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-release-ia32-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-release-ia32-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+  >
+>
+buckets: <
+  name: "try"
+  acls: <
+    group: "all"
+  >
+  acls: <
+    role: SCHEDULER
+    group: "project-dart-admins"
+  >
+  acls: <
+    role: SCHEDULER
+    group: "project-dart-tryjob-access"
+  >
+  acls: <
+    role: SCHEDULER
+    group: "service-account-cq"
+  >
+  swarming: <
+    builders: <
+      name: "analyzer-analysis-server-linux-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-linux-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-mac-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-win-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "app-kernel-linux-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "app-kernel-linux-product-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "app-kernel-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "benchmark-linux-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "cl-linux-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "cl-mac-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "cl-win-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart-sdk-linux-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart-sdk-mac-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart-sdk-win-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-csp-minified-linux-x64-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-minified-strong-linux-x64-d8-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-hostasserts-linux-ia32-d8-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-linux-x64-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-linux-x64-firefox-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-mac-x64-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-mac-x64-safari-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-firefox-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-ie11-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-unit-linux-x64-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-linux-release-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-mac-release-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-win-release-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "flutter-analyze-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "flutter-frontend-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-mac-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-win-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "gclient-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/gclient"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-linux-debug-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-linux-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-mac-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-win-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-canary-linux-debug-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-debug-simarm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-product-simarm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-product-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-release-simarm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-debug-arm-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-product-arm-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-release-arm-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-asan-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-checked-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-debug-ia32-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-debug-simdbc64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-product-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-ia32-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-simarm-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-simarm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-simdbc64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-debug-simdbc64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-product-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-release-simdbc64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-mac-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-optcounter-threshold-linux-release-ia32-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-optcounter-threshold-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-android-release-arm-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "shard_timeout:5400"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-simarm-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-simarm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-product-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-release-simarm-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-release-simarm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-mac-release-simarm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-win-release-simarm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-win-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-linux-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-mac-debug-simdbc64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-mac-release-simdbc64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-rollback-linux-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-reload-rollback-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-debug-ia32-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-product-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-release-ia32-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-win-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+  >
+>
diff --git a/luci-logdog.cfg b/luci-logdog.cfg
index 8b232e90d2e5..adc75bef4980 100644
--- a/luci-logdog.cfg
+++ b/luci-logdog.cfg
@@ -1,14 +1,9 @@
-# Copyright (c) 2017 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
+# Auto-generated by lucicfg.
+# Do not modify manually.
 #
-# For the schema of this file and documentation, see ProjectConfig message in
-# https://luci-config.appspot.com/schemas/services/luci-logdog:logdog.cfg
-# Auth groups who can read log streams.
+# For the schema of this file, see ProjectConfig message:
+#   https://luci-config.appspot.com/schemas/projects:luci-logdog.cfg
+
 reader_auth_groups: "all"
-# Auth groups who can register and emit new log streams.
 writer_auth_groups: "luci-logdog-chromium-writers"
-# The base Google Storage archival path for this project.
-#
-# Archived LogDog logs will be written to this bucket/path.
 archive_gs_bucket: "chromium-luci-logdog"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index a82a81de3ec0..b08510b1d050 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -1,2066 +1,2072 @@
-logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png"
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see Project message:
+#   https://luci-config.appspot.com/schemas/projects:luci-milo.cfg
 
-consoles: {
-  id: "analyzer"
+consoles: <
+  id: "analyzer-stable"
   name: "SDK Analyzer Stable Branch Console"
   repo_url: "https://dart.googlesource.com/sdk"
-  refs: "refs/heads/analyzer-stable"
+  refs: "regexp:refs/heads/analyzer-stable"
   manifest_name: "REVISION"
-  builders {
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-analyzer-stable"
     category: "analyzer"
     short_name: "as"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-analyzer-stable"
     category: "analyzer"
     short_name: "l"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-analyzer-stable"
     category: "analyzer"
     short_name: "m"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-analyzer-stable"
     category: "analyzer"
     short_name: "w"
-  }
-  header: {
-    links: {
+  >
+  header: <
+    links: <
       name: "Consoles"
-      links: {
+      links: <
         text: "Bleeding Edge console"
         url: "/p/dart/g/be/console"
         alt: "SDK BE Console"
-      }
-      links: {
+      >
+      links: <
         text: "Alternative Bleeding Edge console"
         url: "/p/dart/g/alt/console"
         alt: "SDK BE Console (alternative)"
-      }
-      links: {
+      >
+      links: <
         text: "FYI console"
         url: "/p/dart/g/fyi/console"
         alt: "SDK FYI Console"
-      }
-      links: {
+      >
+      links: <
         text: "SDK CQ Status"
         url: "/p/dart/g/cq/builders"
         alt: "SDK CQ Status"
-      }
-    }
-    console_groups: {
+      >
+    >
+    console_groups: <
       console_ids: "dart/flutter"
-    }
+      console_ids: "dart/flutter-hhh"
+    >
     tree_status_host: "dart-status.appspot.com"
-  }
-}
-
-consoles: {
+  >
+>
+consoles: <
   id: "be"
   name: "SDK Bleeding Edge Console"
   repo_url: "https://dart.googlesource.com/sdk"
-  refs: "refs/heads/master"
+  refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
     category: "fasta"
     short_name: "l"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
     category: "fasta"
     short_name: "m"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
     category: "fasta"
     short_name: "w"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
     category: "fasta"
     short_name: "fl"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
     category: "flutter"
     short_name: "3H"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
     category: "vm|app-kernel"
     short_name: "d64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64"
     category: "vm|app-kernel"
     short_name: "p64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64"
     category: "vm|app-kernel"
     short_name: "r64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-simarm64"
     category: "vm|dartkb"
     short_name: "sd"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64"
     category: "vm|dartkb"
     short_name: "d"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-simarm64"
     category: "vm|dartkb"
     short_name: "sp"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-x64"
     category: "vm|dartkb"
     short_name: "p"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64"
     category: "vm|dartkb"
     short_name: "sr"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64"
     category: "vm|dartkb"
     short_name: "r"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
     category: "vm|kernel"
     short_name: "c"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
     category: "vm|kernel"
     short_name: "d"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64"
     category: "vm|kernel"
     short_name: "dbc"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
     short_name: "a32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
     category: "vm|kernel"
     short_name: "a64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64"
     category: "vm|kernel"
     short_name: "rbc"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32"
     category: "vm|kernel"
     short_name: "r32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
     category: "vm|kernel"
     short_name: "r"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
     category: "vm|kernel"
     short_name: "rc"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32"
     category: "vm|kernel"
     short_name: "d32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-simdbc64"
     category: "vm|kernel"
     short_name: "mds"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-simdbc64"
     category: "vm|kernel"
     short_name: "mrs"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
     category: "vm|kernel"
     short_name: "md"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
     category: "vm|kernel"
     short_name: "mr"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
     category: "vm|kernel"
     short_name: "wd3"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64"
     category: "vm|kernel"
     short_name: "wd"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32"
     category: "vm|kernel"
     short_name: "wr3"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
     category: "vm|kernel"
     short_name: "wr"
-  }
-  builders {
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
+    category: "vm|kernel"
+    short_name: "cra"
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm"
     category: "vm|kernel-precomp"
     short_name: "and"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
     category: "vm|kernel-precomp"
     short_name: "d"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
     category: "vm|kernel-precomp"
     short_name: "p"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
     category: "vm|kernel-precomp"
     short_name: "a32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "a64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
     category: "vm|kernel-precomp"
     short_name: "r"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-x64"
     category: "vm|kernel-precomp"
     short_name: "br"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm"
     category: "vm|kernel-precomp"
     short_name: "bra32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "bra64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
     category: "vm|kernel-precomp"
     short_name: "o"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "ma"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "wa"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
     category: "vm|kernel-precomp"
     short_name: "wr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
-    category: "vm|kernel"
-    short_name: "cra"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
     category: "vm|misc"
     short_name: "a64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
     category: "vm|misc"
     short_name: "o32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
     category: "vm|misc"
     short_name: "o64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
     category: "vm|product"
     short_name: "l"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
     category: "vm|product"
     short_name: "m"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
     category: "vm|product"
     short_name: "w"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
     category: "vm|reload-kernel"
     short_name: "d"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
     category: "vm|reload-kernel"
     short_name: "r"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-debug-simdbc64"
     category: "vm|reload-kernel"
     short_name: "md"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64"
     category: "vm|reload-kernel"
     short_name: "mr"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
     category: "vm|reload-kernel"
     short_name: "drb"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64"
     category: "vm|reload-kernel"
     short_name: "rrb"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
     category: "vm|ffi"
     short_name: "d32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm"
     category: "vm|ffi"
     short_name: "r32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm"
     category: "vm|ffi"
     short_name: "p32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
     category: "dart2js|d8"
     short_name: "ha"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
     category: "dart2js|d8"
     short_name: "mi"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
     category: "dart2js|d8"
     short_name: "u"
-  }
-  builders {
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "csp"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
+    category: "dart2js|safari"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11"
+    category: "dart2js|ms"
+    short_name: "ie"
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
     category: "analyzer"
     short_name: "fa"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
     category: "analyzer"
     short_name: "as"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
     category: "analyzer"
     short_name: "l"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
     category: "analyzer"
     short_name: "m"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
     category: "analyzer"
     short_name: "w"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci/dart-sdk-linux"
     category: "sdk"
     short_name: "l"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci/dart-sdk-mac"
     category: "sdk"
     short_name: "m"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci/dart-sdk-win"
     category: "sdk"
     short_name: "w"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
-    category: "dart2js|safari"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11"
-    category: "dart2js|ms"
-    short_name: "ie"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
     short_name: "l"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
     category: "pkg"
     short_name: "m"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
     category: "pkg"
     short_name: "w"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
     category: "pkg"
     short_name: "ld"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/gclient"
     category: "misc"
     short_name: "g"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci/debianpackage-linux"
     category: "misc"
     short_name: "dp"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci/versionchecker-linux"
     category: "misc"
     short_name: "vc"
-  }
-  header: {
-    links: {
+  >
+  header: <
+    links: <
       name: "Consoles"
-      links: {
+      links: <
+        text: "Bleeding Edge console"
+        url: "/p/dart/g/be/console"
+        alt: "SDK BE Console"
+      >
+      links: <
         text: "Alternative Bleeding Edge console"
         url: "/p/dart/g/alt/console"
         alt: "SDK BE Console (alternative)"
-      }
-      links: {
+      >
+      links: <
         text: "FYI console"
         url: "/p/dart/g/fyi/console"
         alt: "SDK FYI Console"
-      }
-      links: {
+      >
+      links: <
         text: "SDK CQ Status"
         url: "/p/dart/g/cq/builders"
         alt: "SDK CQ Status"
-      }
-    }
-    console_groups: {
+      >
+    >
+    console_groups: <
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
-    }
+    >
     tree_status_host: "dart-status.appspot.com"
-  }
-}
-
-consoles: {
+  >
+>
+consoles: <
   id: "alt"
   name: "SDK Bleeding Edge Console (alternative)"
   repo_url: "https://dart.googlesource.com/sdk"
-  refs: "refs/heads/master"
+  refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
     category: "fasta"
     short_name: "l"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
     category: "fasta"
     short_name: "m"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
     category: "fasta"
     short_name: "w"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
     category: "fasta"
     short_name: "fl"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
     category: "flutter"
     short_name: "3H"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
     category: "dart2js|d8"
     short_name: "ha"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
     category: "dart2js|d8"
     short_name: "mi"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
     category: "dart2js|d8"
     short_name: "u"
-  }
-  builders {
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "csp"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
+    category: "dart2js|safari"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11"
+    category: "dart2js|ms"
+    short_name: "ie"
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
     category: "analyzer"
     short_name: "fa"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
     category: "analyzer"
     short_name: "as"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
     category: "analyzer"
     short_name: "l"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
     category: "analyzer"
     short_name: "m"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
     category: "analyzer"
     short_name: "w"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci/dart-sdk-linux"
     category: "sdk"
     short_name: "l"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci/dart-sdk-mac"
     category: "sdk"
     short_name: "m"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci/dart-sdk-win"
     category: "sdk"
     short_name: "w"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
-    category: "dart2js|safari"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11"
-    category: "dart2js|ms"
-    short_name: "ie"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
     short_name: "l"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
     category: "pkg"
     short_name: "m"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
     category: "pkg"
     short_name: "w"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
     category: "pkg"
     short_name: "ld"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/gclient"
     category: "misc"
     short_name: "g"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci/debianpackage-linux"
     category: "misc"
     short_name: "dp"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci/versionchecker-linux"
     category: "misc"
     short_name: "vc"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
     category: "vm|app-kernel"
     short_name: "d64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64"
     category: "vm|app-kernel"
     short_name: "p64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64"
     category: "vm|app-kernel"
     short_name: "r64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-simarm64"
     category: "vm|dartkb"
     short_name: "sd"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64"
     category: "vm|dartkb"
     short_name: "d"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-simarm64"
     category: "vm|dartkb"
     short_name: "sp"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-x64"
     category: "vm|dartkb"
     short_name: "p"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64"
     category: "vm|dartkb"
     short_name: "sr"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64"
     category: "vm|dartkb"
     short_name: "r"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
     category: "vm|kernel"
     short_name: "c"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
     category: "vm|kernel"
     short_name: "d"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64"
     category: "vm|kernel"
     short_name: "dbc"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
     short_name: "a32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
     category: "vm|kernel"
     short_name: "a64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64"
     category: "vm|kernel"
     short_name: "rbc"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32"
     category: "vm|kernel"
     short_name: "r32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
     category: "vm|kernel"
     short_name: "r"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
     category: "vm|kernel"
     short_name: "rc"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32"
     category: "vm|kernel"
     short_name: "d32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-simdbc64"
     category: "vm|kernel"
     short_name: "mds"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-simdbc64"
     category: "vm|kernel"
     short_name: "mrs"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
     category: "vm|kernel"
     short_name: "md"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
     category: "vm|kernel"
     short_name: "mr"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
     category: "vm|kernel"
     short_name: "wd3"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64"
     category: "vm|kernel"
     short_name: "wd"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32"
     category: "vm|kernel"
     short_name: "wr3"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
     category: "vm|kernel"
     short_name: "wr"
-  }
-  builders {
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
+    category: "vm|kernel"
+    short_name: "cra"
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm"
     category: "vm|kernel-precomp"
     short_name: "and"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
     category: "vm|kernel-precomp"
     short_name: "d"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
     category: "vm|kernel-precomp"
     short_name: "p"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
     category: "vm|kernel-precomp"
     short_name: "a32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "a64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
     category: "vm|kernel-precomp"
     short_name: "r"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-x64"
     category: "vm|kernel-precomp"
     short_name: "br"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm"
     category: "vm|kernel-precomp"
     short_name: "bra32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "bra64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
     category: "vm|kernel-precomp"
     short_name: "o"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "ma"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "wa"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
     category: "vm|kernel-precomp"
     short_name: "wr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
-    category: "vm|kernel"
-    short_name: "cra"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
     category: "vm|misc"
     short_name: "a64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
     category: "vm|misc"
     short_name: "o32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
     category: "vm|misc"
     short_name: "o64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
     category: "vm|product"
     short_name: "l"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
     category: "vm|product"
     short_name: "m"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
     category: "vm|product"
     short_name: "w"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
     category: "vm|reload-kernel"
     short_name: "d"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
     category: "vm|reload-kernel"
     short_name: "r"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-debug-simdbc64"
     category: "vm|reload-kernel"
     short_name: "md"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64"
     category: "vm|reload-kernel"
     short_name: "mr"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
     category: "vm|reload-kernel"
     short_name: "drb"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64"
     category: "vm|reload-kernel"
     short_name: "rrb"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
     category: "vm|ffi"
     short_name: "d32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm"
     category: "vm|ffi"
     short_name: "r32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm"
     category: "vm|ffi"
     short_name: "p32"
-  }
-  header: {
-    links: {
+  >
+  header: <
+    links: <
       name: "Consoles"
-      links: {
+      links: <
         text: "Bleeding Edge console"
         url: "/p/dart/g/be/console"
         alt: "SDK BE Console"
-      }
-      links: {
+      >
+      links: <
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (alternative)"
+      >
+      links: <
         text: "FYI console"
         url: "/p/dart/g/fyi/console"
         alt: "SDK FYI Console"
-      }
-      links: {
+      >
+      links: <
         text: "SDK CQ Status"
         url: "/p/dart/g/cq/builders"
         alt: "SDK CQ Status"
-      }
-    }
-    console_groups: {
+      >
+    >
+    console_groups: <
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
-    }
+    >
     tree_status_host: "dart-status.appspot.com"
-  }
-}
-
-consoles: {
+  >
+>
+consoles: <
   id: "dev"
   name: "SDK Dev Console"
   repo_url: "https://dart.googlesource.com/sdk"
-  refs: "refs/heads/dev"
+  refs: "regexp:refs/heads/dev"
   manifest_name: "REVISION"
-  builders {
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-dev"
     category: "fasta"
     short_name: "l"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-dev"
     category: "fasta"
     short_name: "m"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-dev"
     category: "fasta"
     short_name: "w"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-dev"
     category: "vm|app-kernel"
     short_name: "d64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64-dev"
     category: "vm|app-kernel"
     short_name: "p64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-dev"
     category: "vm|app-kernel"
     short_name: "r64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-simarm64-dev"
     category: "vm|dartkb"
     short_name: "sd"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64-dev"
     category: "vm|dartkb"
     short_name: "d"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-simarm64-dev"
     category: "vm|dartkb"
     short_name: "sp"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-x64-dev"
     category: "vm|dartkb"
     short_name: "p"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64-dev"
     category: "vm|dartkb"
     short_name: "sr"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-dev"
     category: "vm|dartkb"
     short_name: "r"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-dev"
     category: "vm|kernel"
     short_name: "c"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-dev"
     category: "vm|kernel"
     short_name: "d"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64-dev"
     category: "vm|kernel"
     short_name: "dbc"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-dev"
     category: "vm|kernel"
     short_name: "a32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-dev"
     category: "vm|kernel"
     short_name: "a64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64-dev"
     category: "vm|kernel"
     short_name: "rbc"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32-dev"
     category: "vm|kernel"
     short_name: "r32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-dev"
     category: "vm|kernel"
     short_name: "r"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-dev"
     category: "vm|kernel"
     short_name: "rc"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32-dev"
     category: "vm|kernel"
     short_name: "d32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-simdbc64-dev"
     category: "vm|kernel"
     short_name: "mds"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-simdbc64-dev"
     category: "vm|kernel"
     short_name: "mrs"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-dev"
     category: "vm|kernel"
     short_name: "md"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-dev"
     category: "vm|kernel"
     short_name: "mr"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32-dev"
     category: "vm|kernel"
     short_name: "wd3"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-dev"
     category: "vm|kernel"
     short_name: "wd"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32-dev"
     category: "vm|kernel"
     short_name: "wr3"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-dev"
     category: "vm|kernel"
     short_name: "wr"
-  }
-  builders {
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-dev"
+    category: "vm|kernel"
+    short_name: "cra"
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm-dev"
     category: "vm|kernel-precomp"
     short_name: "and"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "d"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "p"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-dev"
     category: "vm|kernel-precomp"
     short_name: "a32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-dev"
     category: "vm|kernel-precomp"
     short_name: "a64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "r"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "br"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm-dev"
     category: "vm|kernel-precomp"
     short_name: "bra32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm64-dev"
     category: "vm|kernel-precomp"
     short_name: "bra64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "o"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-dev"
     category: "vm|kernel-precomp"
     short_name: "ma"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-simarm64-dev"
     category: "vm|kernel-precomp"
     short_name: "wa"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "wr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-dev"
-    category: "vm|kernel"
-    short_name: "cra"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-dev"
     category: "vm|misc"
     short_name: "a64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32-dev"
     category: "vm|misc"
     short_name: "o32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-dev"
     category: "vm|misc"
     short_name: "o64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64-dev"
     category: "vm|product"
     short_name: "l"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64-dev"
     category: "vm|product"
     short_name: "m"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64-dev"
     category: "vm|product"
     short_name: "w"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64-dev"
     category: "vm|reload-kernel"
     short_name: "d"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64-dev"
     category: "vm|reload-kernel"
     short_name: "r"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-debug-simdbc64-dev"
     category: "vm|reload-kernel"
     short_name: "md"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64-dev"
     category: "vm|reload-kernel"
     short_name: "mr"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64-dev"
     category: "vm|reload-kernel"
     short_name: "drb"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64-dev"
     category: "vm|reload-kernel"
     short_name: "rrb"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-dev"
     category: "vm|ffi"
     short_name: "d32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-dev"
     category: "vm|ffi"
     short_name: "r32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-dev"
     category: "vm|ffi"
     short_name: "p32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-dev"
     category: "dart2js|d8"
     short_name: "ha"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-dev"
     category: "dart2js|d8"
     short_name: "mi"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-dev"
     category: "dart2js|d8"
     short_name: "u"
-  }
-  builders {
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-dev"
+    category: "dart2js|chrome"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-dev"
+    category: "dart2js|chrome"
+    short_name: "csp"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-dev"
+    category: "dart2js|chrome"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-dev"
+    category: "dart2js|chrome"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-dev"
+    category: "dart2js|firefox"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox-dev"
+    category: "dart2js|firefox"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-dev"
+    category: "dart2js|safari"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11-dev"
+    category: "dart2js|ms"
+    short_name: "ie"
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-dev"
     category: "analyzer"
     short_name: "as"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-dev"
     category: "analyzer"
     short_name: "l"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-dev"
     category: "analyzer"
     short_name: "m"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-dev"
     category: "analyzer"
     short_name: "w"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci/dart-sdk-linux-dev"
     category: "sdk"
     short_name: "l"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci/dart-sdk-mac-dev"
     category: "sdk"
     short_name: "m"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci/dart-sdk-win-dev"
     category: "sdk"
     short_name: "w"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-dev"
     category: "ddc"
     short_name: "l"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-dev"
     category: "ddc"
     short_name: "m"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-dev"
     category: "ddc"
     short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-dev"
-    category: "dart2js|chrome"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-dev"
-    category: "dart2js|firefox"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-dev"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-dev"
-    category: "dart2js|chrome"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-dev"
-    category: "dart2js|safari"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-dev"
-    category: "dart2js|chrome"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox-dev"
-    category: "dart2js|firefox"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11-dev"
-    category: "dart2js|ms"
-    short_name: "ie"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
     category: "pkg"
     short_name: "l"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-dev"
     category: "pkg"
     short_name: "m"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-dev"
     category: "pkg"
     short_name: "w"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/gclient-dev"
     category: "misc"
     short_name: "g"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci/debianpackage-linux-dev"
     category: "misc"
     short_name: "dp"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci/versionchecker-linux-dev"
     category: "misc"
     short_name: "vc"
-  }
-  header: {
-    links: {
+  >
+  header: <
+    links: <
       name: "Consoles"
-      links: {
-        text: "SDK BE Console"
+      links: <
+        text: "Bleeding Edge console"
         url: "/p/dart/g/be/console"
         alt: "SDK BE Console"
-      }
-      links: {
-        text: "SDK Dev Console"
-        url: "/p/dart/g/dev/console"
-        alt: "SDK Dev Console"
-      }
-      links: {
-        text: "SDK Stable Console"
-        url: "/p/dart/g/stable/console"
-        alt: "SDK Stable Console"
-      }
-      links: {
-        text: "SDK FYI Console"
+      >
+      links: <
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (alternative)"
+      >
+      links: <
+        text: "FYI console"
         url: "/p/dart/g/fyi/console"
         alt: "SDK FYI Console"
-      }
-      links: {
+      >
+      links: <
         text: "SDK CQ Status"
         url: "/p/dart/g/cq/builders"
         alt: "SDK CQ Status"
-      }
-    }
+      >
+    >
+    console_groups: <
+      console_ids: "dart/flutter"
+      console_ids: "dart/flutter-hhh"
+    >
     tree_status_host: "dart-status.appspot.com"
-  }
-}
-
-consoles: {
+  >
+>
+consoles: <
   id: "stable"
   name: "SDK Stable Console"
   repo_url: "https://dart.googlesource.com/sdk"
-  refs: "refs/heads/stable"
+  refs: "regexp:refs/heads/stable"
   manifest_name: "REVISION"
-  builders {
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-stable"
     category: "fasta"
     short_name: "l"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-stable"
     category: "fasta"
     short_name: "m"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-stable"
     category: "fasta"
     short_name: "w"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-stable"
     category: "vm|app-kernel"
     short_name: "d64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64-stable"
     category: "vm|app-kernel"
     short_name: "p64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-stable"
     category: "vm|app-kernel"
     short_name: "r64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-simarm64-stable"
     category: "vm|dartkb"
     short_name: "sd"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64-stable"
     category: "vm|dartkb"
     short_name: "d"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-simarm64-stable"
     category: "vm|dartkb"
     short_name: "sp"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-x64-stable"
     category: "vm|dartkb"
     short_name: "p"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64-stable"
     category: "vm|dartkb"
     short_name: "sr"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-stable"
     category: "vm|dartkb"
     short_name: "r"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-stable"
     category: "vm|kernel"
     short_name: "c"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-stable"
     category: "vm|kernel"
     short_name: "d"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64-stable"
     category: "vm|kernel"
     short_name: "dbc"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-stable"
     category: "vm|kernel"
     short_name: "a32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-stable"
     category: "vm|kernel"
     short_name: "a64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64-stable"
     category: "vm|kernel"
     short_name: "rbc"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32-stable"
     category: "vm|kernel"
     short_name: "r32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-stable"
     category: "vm|kernel"
     short_name: "r"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-stable"
     category: "vm|kernel"
     short_name: "rc"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32-stable"
     category: "vm|kernel"
     short_name: "d32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-simdbc64-stable"
     category: "vm|kernel"
     short_name: "mds"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-simdbc64-stable"
     category: "vm|kernel"
     short_name: "mrs"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-stable"
     category: "vm|kernel"
     short_name: "md"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-stable"
     category: "vm|kernel"
     short_name: "mr"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32-stable"
     category: "vm|kernel"
     short_name: "wd3"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-stable"
     category: "vm|kernel"
     short_name: "wd"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32-stable"
     category: "vm|kernel"
     short_name: "wr3"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-stable"
     category: "vm|kernel"
     short_name: "wr"
-  }
-  builders {
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-stable"
+    category: "vm|kernel"
+    short_name: "cra"
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm-stable"
     category: "vm|kernel-precomp"
     short_name: "and"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "d"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "p"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-stable"
     category: "vm|kernel-precomp"
     short_name: "a32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-stable"
     category: "vm|kernel-precomp"
     short_name: "a64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "r"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "br"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm-stable"
     category: "vm|kernel-precomp"
     short_name: "bra32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm64-stable"
     category: "vm|kernel-precomp"
     short_name: "bra64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "o"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-stable"
     category: "vm|kernel-precomp"
     short_name: "ma"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-simarm64-stable"
     category: "vm|kernel-precomp"
     short_name: "wa"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "wr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-stable"
-    category: "vm|kernel"
-    short_name: "cra"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-stable"
     category: "vm|misc"
     short_name: "a64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32-stable"
     category: "vm|misc"
     short_name: "o32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-stable"
     category: "vm|misc"
     short_name: "o64"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64-stable"
     category: "vm|product"
     short_name: "l"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64-stable"
     category: "vm|product"
     short_name: "m"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64-stable"
     category: "vm|product"
     short_name: "w"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64-stable"
     category: "vm|reload-kernel"
     short_name: "d"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64-stable"
     category: "vm|reload-kernel"
     short_name: "r"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-debug-simdbc64-stable"
     category: "vm|reload-kernel"
     short_name: "md"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64-stable"
     category: "vm|reload-kernel"
     short_name: "mr"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64-stable"
     category: "vm|reload-kernel"
     short_name: "drb"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64-stable"
     category: "vm|reload-kernel"
     short_name: "rrb"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-stable"
     category: "vm|ffi"
     short_name: "d32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-stable"
     category: "vm|ffi"
     short_name: "r32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-stable"
     category: "vm|ffi"
     short_name: "p32"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-stable"
     category: "dart2js|d8"
     short_name: "ha"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-stable"
     category: "dart2js|d8"
     short_name: "mi"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-stable"
     category: "dart2js|d8"
     short_name: "u"
-  }
-  builders {
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "csp"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-stable"
+    category: "dart2js|firefox"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox-stable"
+    category: "dart2js|firefox"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-stable"
+    category: "dart2js|safari"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11-stable"
+    category: "dart2js|ms"
+    short_name: "ie"
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-stable"
     category: "analyzer"
     short_name: "as"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-stable"
     category: "analyzer"
     short_name: "l"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-stable"
     category: "analyzer"
     short_name: "m"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-stable"
     category: "analyzer"
     short_name: "w"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci/dart-sdk-linux-stable"
     category: "sdk"
     short_name: "l"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci/dart-sdk-mac-stable"
     category: "sdk"
     short_name: "m"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci/dart-sdk-win-stable"
     category: "sdk"
     short_name: "w"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-stable"
     category: "ddc"
     short_name: "l"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-stable"
     category: "ddc"
     short_name: "m"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-stable"
     category: "ddc"
     short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-stable"
-    category: "dart2js|firefox"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-stable"
-    category: "dart2js|safari"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox-stable"
-    category: "dart2js|firefox"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11-stable"
-    category: "dart2js|ms"
-    short_name: "ie"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
     category: "pkg"
     short_name: "l"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-stable"
     category: "pkg"
     short_name: "m"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-stable"
     category: "pkg"
     short_name: "w"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/gclient-stable"
     category: "misc"
     short_name: "g"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci/debianpackage-linux-stable"
     category: "misc"
     short_name: "dp"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci/versionchecker-linux-stable"
     category: "misc"
     short_name: "vc"
-  }
-  header: {
-    links: {
+  >
+  header: <
+    links: <
       name: "Consoles"
-      links: {
-        text: "SDK BE Console"
+      links: <
+        text: "Bleeding Edge console"
         url: "/p/dart/g/be/console"
         alt: "SDK BE Console"
-      }
-      links: {
-        text: "SDK Dev Console"
-        url: "/p/dart/g/dev/console"
-        alt: "SDK Dev Console"
-      }
-      links: {
-        text: "SDK Stable Console"
-        url: "/p/dart/g/stable/console"
-        alt: "SDK Stable Console"
-      }
-      links: {
-        text: "SDK FYI Console"
+      >
+      links: <
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (alternative)"
+      >
+      links: <
+        text: "FYI console"
         url: "/p/dart/g/fyi/console"
         alt: "SDK FYI Console"
-      }
-      links: {
+      >
+      links: <
         text: "SDK CQ Status"
         url: "/p/dart/g/cq/builders"
         alt: "SDK CQ Status"
-      }
-    }
+      >
+    >
+    console_groups: <
+      console_ids: "dart/flutter"
+      console_ids: "dart/flutter-hhh"
+    >
     tree_status_host: "dart-status.appspot.com"
-  }
-}
-
-consoles: {
+  >
+>
+consoles: <
   id: "flutter"
   name: "Dart/Flutter Console"
   repo_url: "https://dart.googlesource.com/sdk"
-  refs: "refs/heads/master"
+  refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
-    category: "flutter"
+    category: "analyzer"
     short_name: "fa"
-  }
-  builders {
+  >
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
     category: "fasta"
     short_name: "fl"
-  }
-}
-
-consoles: {
+  >
+>
+consoles: <
   id: "flutter-hhh"
   name: "Dart/Flutter Linear History Console"
   repo_url: "https://dart.googlesource.com/linear_sdk_flutter_engine"
-  refs: "refs/heads/master"
+  refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
+  builders: <
     name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
     category: "flutter"
     short_name: "3H"
-  }
-}
-
-consoles: {
+  >
+>
+consoles: <
   id: "fyi"
   name: "SDK FYI Console"
   repo_url: "https://dart.googlesource.com/sdk"
-  refs: "refs/heads/master"
+  refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
+  builders: <
     name: "buildbucket/luci.dart.ci/google"
     category: "external"
     short_name: "g"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostchecked-linux-debug-ia32-none"
-    category: "dart2js"
-    short_name: "hcd"
-  }
-  header: {
-    links: {
-      name: "Consoles"
-      links: {
-        text: "SDK BE Console"
-        url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
-      }
-      links: {
-        text: "SDK Dev Console"
-        url: "/p/dart/g/dev/console"
-        alt: "SDK Dev Console"
-      }
-      links: {
-        text: "SDK Stable Console"
-        url: "/p/dart/g/stable/console"
-        alt: "SDK Stable Console"
-      }
-      links: {
-        text: "SDK FYI Console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
-      }
-      links: {
-        text: "SDK CQ Status"
-        url: "/p/dart/g/cq/builders"
-        alt: "SDK CQ Status"
-      }
-    }
-    tree_status_host: "dart-status.appspot.com"
-  }
-}
-
-consoles: {
+  >
+>
+consoles: <
   id: "cq"
   name: "SDK CQ Console"
+  builders: <
+    name: "buildbucket/luci.dart.try/front-end-linux-release-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simdbc64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-mac-release-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-product-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/dart2js-strong-hostasserts-linux-ia32-d8-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/dart2js-minified-strong-linux-x64-d8-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/dart2js-unit-linux-x64-release-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-chrome-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/flutter-analyze-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/analyzer-analysis-server-linux-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/analyzer-linux-release-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/dart-sdk-win-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/ddc-linux-release-chrome-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/pkg-linux-release-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/gclient-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/benchmark-linux-try"
+  >
   builder_view_only: true
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "refs/heads/master"
-  manifest_name: "PATCHED"
-  builders { name: "buildbucket/luci.dart.try/analyzer-linux-release-try" }
-  builders { name: "buildbucket/luci.dart.try/benchmark-linux-try" }
-  builders { name: "buildbucket/luci.dart.try/dart-sdk-win-try" }
-  builders { name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-chrome-try" }
-  builders { name: "buildbucket/luci.dart.try/dart2js-minified-strong-linux-x64-d8-try" }
-  builders { name: "buildbucket/luci.dart.try/dart2js-strong-hostasserts-linux-ia32-d8-try" }
-  builders { name: "buildbucket/luci.dart.try/dart2js-unit-linux-x64-release-try" }
-  builders { name: "buildbucket/luci.dart.try/ddc-linux-release-chrome-try" }
-  builders { name: "buildbucket/luci.dart.try/front-end-linux-release-x64-try" }
-  builders { name: "buildbucket/luci.dart.try/gclient-try" }
-  builders { name: "buildbucket/luci.dart.try/pkg-linux-release-try" }
-  builders { name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try" }
-  builders { name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simdbc64-try" }
-  builders { name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try" }
-  builders { name: "buildbucket/luci.dart.try/vm-kernel-linux-product-x64-try" }
-}
+>
+logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 9a58ae4b030c..ba7d8586d9b8 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -1,510 +1,1368 @@
-# Copyright (c) 2018, the Dart project authors. Please see the AUTHORS file
-# for details. All rights reserved. Use of this source code is governed by a
-# BSD-style license that can be found in the LICENSE file.
-# Defines notifiers on luci-notify.appspot.com.
-# See schema at
-# https://chromium.googlesource.com/infra/luci/luci-go/+/master/luci_notify/api/config/notify.proto
-# Please keep this list sorted by name.
-# on_change  = Whenever the build status changes.
-# on_success = On every build success.
-# on_failure = On every build failure.
-notifiers {
-    name: "infra"
-    notifications {
-        on_change: false
-        on_success: false
-        on_failure: false
-        on_new_failure: true
-        email {
-            recipients: "athom@google.com"
-            recipients: "sortie@google.com"
-            recipients: "whesse@google.com"
-        }
-    }
-    builders {
-        name: "base"
-        bucket: "ci"
-    }
-    builders {
-        name: "debianpackage-linux"
-        bucket: "ci"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-}
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see ProjectConfig message:
+#   https://luci-config.appspot.com/schemas/projects:luci-notify.cfg
 
-notifiers {
-    name: "dart"
-    notifications {
-        on_change: false
-        on_success: false
-        on_failure: false
-        on_new_failure: true
-        email {
-            recipients: "athom@google.com"
-        }
-        notify_blamelist {}
-    }
-
-    # CI Builders that require privileged access
-    builders {
-        name: "dart-sdk-linux"
-        bucket: "ci"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "dart-sdk-mac"
-        bucket: "ci"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "dart-sdk-win"
-        bucket: "ci"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "versionchecker-linux"
-        bucket: "ci"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-
-    # CI Builders for the master branch
-    builders {
-        name: "analyzer-analysis-server-linux"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "analyzer-linux-release"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "analyzer-mac-release"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "analyzer-win-release"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "app-kernel-linux-debug-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "app-kernel-linux-product-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "app-kernel-linux-release-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "cross-vm-linux-release-arm64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "dart2js-csp-minified-linux-x64-chrome"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "dart2js-minified-strong-linux-x64-d8"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "dart2js-strong-hostasserts-linux-ia32-d8"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "dart2js-strong-linux-x64-chrome"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "dart2js-strong-linux-x64-firefox"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "dart2js-strong-mac-x64-chrome"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "dart2js-strong-mac-x64-safari"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "dart2js-strong-win-x64-chrome"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "dart2js-strong-win-x64-edge"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "dart2js-strong-win-x64-firefox"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "dart2js-strong-win-x64-ie11"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "dart2js-unit-linux-x64-release"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "ddc-linux-release-chrome"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "ddc-mac-release-chrome"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "ddc-win-release-chrome"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "front-end-linux-release-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "front-end-mac-release-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "front-end-win-release-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "gclient"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "pkg-linux-release"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "pkg-mac-release"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "pkg-win-release"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "pkg-linux-debug"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "versionchecker-linux"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-canary-linux-debug"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-dartkb-linux-debug-simarm64-try"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-dartkb-linux-debug-x64-try"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-dartkb-linux-product-simarm64-try"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-dartkb-linux-product-x64-try"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-dartkb-linux-release-simarm64-try"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-dartkb-linux-release-x64-try"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-asan-linux-release-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-checked-linux-release-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-linux-debug-ia32"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-linux-debug-simdbc64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-linux-debug-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-linux-product-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-linux-release-ia32"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-linux-release-simarm"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-linux-release-simarm64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-linux-release-simdbc64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-linux-release-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-mac-debug-simdbc64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-mac-debug-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-mac-product-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-mac-release-simdbc64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-mac-release-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-optcounter-threshold-linux-release-ia32"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-optcounter-threshold-linux-release-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-precomp-android-release-arm"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-precomp-bare-linux-release-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-precomp-bare-linux-release-simarm"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-precomp-bare-linux-release-simarm64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-precomp-linux-debug-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-precomp-linux-product-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-precomp-linux-release-simarm"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-precomp-linux-release-simarm64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-precomp-linux-release-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-precomp-mac-release-simarm64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-precomp-obfuscate-linux-release-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-precomp-win-release-simarm64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-precomp-win-release-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-reload-linux-debug-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-reload-linux-release-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-reload-mac-debug-simdbc64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-reload-mac-release-simdbc64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-reload-rollback-linux-debug-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-reload-rollback-linux-release-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-win-debug-ia32"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-win-debug-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-win-product-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-win-release-ia32"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-kernel-win-release-x64"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-ffi-android-debug-arm"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-ffi-android-release-arm"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-    builders {
-        name: "vm-ffi-android-product-arm"
-        bucket: "ci.sandbox"
-        repository: "https://dart.googlesource.com/sdk"
-    }
-}
-
-notifiers {
-    name: "dart-fuzz-testing"
-    notifications {
-        on_change: false
-        on_success: true
-        on_failure: true
-        on_new_failure: false
-        email {
-            recipients: "ajcbik@google.com"
-            recipients: "athom@google.com"
-        }
-    }
-
-    builders {
-        name: "fuzz-linux"
-        bucket: "ci.sandbox"
-    }
-}
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    >
+  >
+  builders: <
+    bucket: "ci"
+    name: "base"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci"
+    name: "dart-sdk-linux"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci"
+    name: "dart-sdk-mac"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci"
+    name: "dart-sdk-win"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    >
+  >
+  builders: <
+    bucket: "ci"
+    name: "debianpackage-linux"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    >
+  >
+  builders: <
+    bucket: "ci"
+    name: "linearize-flutter"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci"
+    name: "versionchecker-linux"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "analyzer-analysis-server-linux"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "analyzer-linux-release"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "analyzer-mac-release"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "analyzer-win-release"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "app-kernel-linux-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "app-kernel-linux-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "app-kernel-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "cross-vm-linux-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "dart2js-csp-minified-linux-x64-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "dart2js-minified-strong-linux-x64-d8"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "dart2js-strong-hostasserts-linux-ia32-d8"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "dart2js-strong-linux-x64-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "dart2js-strong-linux-x64-firefox"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "dart2js-strong-mac-x64-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "dart2js-strong-mac-x64-safari"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "dart2js-strong-win-x64-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "dart2js-strong-win-x64-firefox"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "dart2js-strong-win-x64-ie11"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "dart2js-unit-linux-x64-release"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "ddc-linux-release-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "ddc-mac-release-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "ddc-win-release-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "flutter-engine-linux"
+    repository: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "front-end-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "front-end-mac-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "front-end-win-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_success: true
+    on_failure: true
+    email: <
+      recipients: "ajcbik@google.com"
+      recipients: "athom@google.com"
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "fuzz-linux"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "gclient"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "pkg-linux-debug"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "pkg-linux-release"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "pkg-mac-release"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "pkg-win-release"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-canary-linux-debug"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-dartkb-linux-debug-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-dartkb-linux-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-dartkb-linux-product-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-dartkb-linux-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-dartkb-linux-release-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-dartkb-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-ffi-android-debug-arm"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-ffi-android-product-arm"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-ffi-android-release-arm"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-asan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-checked-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-debug-ia32"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-debug-simdbc64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-release-ia32"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-release-simarm"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-release-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-release-simdbc64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-mac-debug-simdbc64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-mac-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-mac-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-mac-release-simdbc64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-mac-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-optcounter-threshold-linux-release-ia32"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-optcounter-threshold-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-android-release-arm"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-bare-linux-release-simarm"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-bare-linux-release-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-bare-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-linux-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-linux-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-linux-release-simarm"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-linux-release-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-mac-release-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-obfuscate-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-win-release-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-win-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-reload-linux-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-reload-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-reload-mac-debug-simdbc64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-reload-mac-release-simdbc64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-reload-rollback-linux-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-reload-rollback-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-win-debug-ia32"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-win-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-win-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-win-release-ia32"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-win-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index e7a2d014adef..af9b3624e215 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1,3428 +1,3050 @@
-# Defines jobs on luci-scheduler.appspot.com.
+# Auto-generated by lucicfg.
+# Do not modify manually.
 #
-# For schema of this file and documentation see ProjectConfig message in
-# https://chromium.googlesource.com/infra/luci/luci-go/+/master/scheduler/appengine/messages/config.proto
-acl_sets {
-  name: "default"
-  acls {
-    role: READER
-    granted_to: "group:all"
-  }
-  acls {
-    role: OWNER
-    granted_to: "group:project-dart-committers"
-  }
-}
+# For the schema of this file, see ProjectConfig message:
+#   https://luci-config.appspot.com/schemas/projects:luci-scheduler.cfg
 
-# Special cron jobs
-
-job {
+job: <
+  id: "analyzer-analysis-server-linux"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-analysis-server-linux"
+  >
+>
+job: <
+  id: "analyzer-analysis-server-linux-analyzer-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-analysis-server-linux-analyzer-stable"
+  >
+>
+job: <
+  id: "analyzer-analysis-server-linux-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-analysis-server-linux-dev"
+  >
+>
+job: <
+  id: "analyzer-analysis-server-linux-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-analysis-server-linux-stable"
+  >
+>
+job: <
+  id: "analyzer-linux-release"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-linux-release"
+  >
+>
+job: <
+  id: "analyzer-linux-release-analyzer-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-linux-release-analyzer-stable"
+  >
+>
+job: <
+  id: "analyzer-linux-release-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-linux-release-dev"
+  >
+>
+job: <
+  id: "analyzer-linux-release-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-linux-release-stable"
+  >
+>
+job: <
+  id: "analyzer-mac-release"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-mac-release"
+  >
+>
+job: <
+  id: "analyzer-mac-release-analyzer-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-mac-release-analyzer-stable"
+  >
+>
+job: <
+  id: "analyzer-mac-release-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-mac-release-dev"
+  >
+>
+job: <
+  id: "analyzer-mac-release-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-mac-release-stable"
+  >
+>
+job: <
+  id: "analyzer-win-release"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-win-release"
+  >
+>
+job: <
+  id: "analyzer-win-release-analyzer-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-win-release-analyzer-stable"
+  >
+>
+job: <
+  id: "analyzer-win-release-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-win-release-dev"
+  >
+>
+job: <
+  id: "analyzer-win-release-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-win-release-stable"
+  >
+>
+job: <
+  id: "app-kernel-linux-debug-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-debug-x64"
+  >
+>
+job: <
+  id: "app-kernel-linux-debug-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-debug-x64-dev"
+  >
+>
+job: <
+  id: "app-kernel-linux-debug-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-debug-x64-stable"
+  >
+>
+job: <
+  id: "app-kernel-linux-product-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-product-x64"
+  >
+>
+job: <
+  id: "app-kernel-linux-product-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-product-x64-dev"
+  >
+>
+job: <
+  id: "app-kernel-linux-product-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-product-x64-stable"
+  >
+>
+job: <
+  id: "app-kernel-linux-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-release-x64"
+  >
+>
+job: <
+  id: "app-kernel-linux-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "app-kernel-linux-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-release-x64-stable"
+  >
+>
+job: <
   id: "base"
-  acl_sets: "default"
   schedule: "with 10m interval"
-  buildbucket: {
+  acl_sets: "ci"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "base"
-  }
-}
-
-job {
-  id: "fuzz-linux"
-  acl_sets: "default"
-  schedule: "0 3 * * *" # 3 AM UTC
-  buildbucket: {
+  >
+>
+job: <
+  id: "cross-vm-linux-release-arm64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "fuzz-linux"
-  }
-}
-
-# Flutter 3xH trigger
-trigger {
-  id: "dart-gitiles-trigger-flutter"
-  acl_sets: "default"
-  gitiles: {
-    repo: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
-    refs: "refs/heads/master"
-  }
-  triggers: "flutter-engine-linux"
-}
-
-job {
-  id: "flutter-engine-linux"
-  acl_sets: "default"
+    builder: "cross-vm-linux-release-arm64"
+  >
+>
+job: <
+  id: "cross-vm-linux-release-arm64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "flutter-engine-linux"
-  }
-  triggering_policy: {
-    max_concurrent_invocations: 5
-    max_batch_size: 1
-  }
-}
-
-# Flutter linearized history
-trigger {
-  id: "dart-flutter-engine-trigger"
-  acl_sets: "default"
-  gitiles: {
-    repo: "https://dart.googlesource.com/external/github.com/flutter/engine"
-    refs: "refs/heads/master"
-  }
-  triggers: "linearize-flutter"
-}
-
-trigger {
-  id: "dart-flutter-flutter-trigger"
-  acl_sets: "default"
-  gitiles: {
-    repo: "https://dart.googlesource.com/external/github.com/flutter/flutter"
-    refs: "refs/heads/master"
-  }
-  triggers: "linearize-flutter"
-}
-
-job {
-  id: "linearize-flutter"
-  acl_sets: "default"
+    builder: "cross-vm-linux-release-arm64-dev"
+  >
+>
+job: <
+  id: "cross-vm-linux-release-arm64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "cross-vm-linux-release-arm64-stable"
+  >
+>
+job: <
+  id: "dart-sdk-linux"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
-    builder: "linearize-flutter"
-  }
-  triggering_policy: {
-    max_batch_size: 1
-  }
-}
-
-# analyzer-stable CI triggers
-trigger {
-  id: "dart-gitiles-trigger-analyzer-stable"
-  acl_sets: "default"
-  gitiles: {
-    repo: "https://dart.googlesource.com/sdk/"
-    refs: "refs/heads/analyzer-stable"
-  }
-  triggers: "analyzer-analysis-server-linux-analyzer-stable"
-  triggers: "analyzer-linux-release-analyzer-stable"
-  triggers: "analyzer-mac-release-analyzer-stable"
-  triggers: "analyzer-win-release-analyzer-stable"
-}
-
-# CI triggers
-trigger {
-  id: "dart-gitiles-trigger-master"
-  acl_sets: "default"
-  gitiles: {
-    repo: "https://dart.googlesource.com/sdk/"
-    refs: "refs/heads/master"
-  }
-  triggers: "analyzer-analysis-server-linux"
-  triggers: "analyzer-linux-release"
-  triggers: "analyzer-mac-release"
-  triggers: "analyzer-win-release"
-  triggers: "app-kernel-linux-debug-x64"
-  triggers: "app-kernel-linux-product-x64"
-  triggers: "app-kernel-linux-release-x64"
-  triggers: "cross-vm-linux-release-arm64"
-  triggers: "dart-sdk-linux"
-  triggers: "dart-sdk-mac"
-  triggers: "dart-sdk-win"
-  triggers: "dart2js-csp-minified-linux-x64-chrome"
-  triggers: "dart2js-minified-strong-linux-x64-d8"
-  triggers: "dart2js-strong-hostasserts-linux-ia32-d8"
-  triggers: "dart2js-strong-linux-x64-chrome"
-  triggers: "dart2js-strong-linux-x64-firefox"
-  triggers: "dart2js-strong-mac-x64-chrome"
-  triggers: "dart2js-strong-mac-x64-safari"
-  triggers: "dart2js-strong-win-x64-chrome"
-  triggers: "dart2js-strong-win-x64-firefox"
-  triggers: "dart2js-strong-win-x64-ie11"
-  triggers: "dart2js-unit-linux-x64-release"
-  triggers: "ddc-linux-release-chrome"
-  triggers: "ddc-mac-release-chrome"
-  triggers: "ddc-win-release-chrome"
-  triggers: "debianpackage-linux"
-  triggers: "flutter-analyze"
-  triggers: "flutter-frontend"
-  triggers: "front-end-linux-release-x64"
-  triggers: "front-end-mac-release-x64"
-  triggers: "front-end-win-release-x64"
-  triggers: "gclient"
-  triggers: "linearize-flutter"
-  triggers: "pkg-linux-debug"
-  triggers: "pkg-linux-release"
-  triggers: "pkg-mac-release"
-  triggers: "pkg-win-release"
-  triggers: "versionchecker-linux"
-  triggers: "vm-canary-linux-debug"
-  triggers: "vm-dartkb-linux-debug-simarm64"
-  triggers: "vm-dartkb-linux-debug-x64"
-  triggers: "vm-dartkb-linux-product-simarm64"
-  triggers: "vm-dartkb-linux-product-x64"
-  triggers: "vm-dartkb-linux-release-simarm64"
-  triggers: "vm-dartkb-linux-release-x64"
-  triggers: "vm-kernel-asan-linux-release-x64"
-  triggers: "vm-kernel-checked-linux-release-x64"
-  triggers: "vm-kernel-linux-debug-ia32"
-  triggers: "vm-kernel-linux-debug-simdbc64"
-  triggers: "vm-kernel-linux-debug-x64"
-  triggers: "vm-kernel-linux-product-x64"
-  triggers: "vm-kernel-linux-release-ia32"
-  triggers: "vm-kernel-linux-release-simarm"
-  triggers: "vm-kernel-linux-release-simarm64"
-  triggers: "vm-kernel-linux-release-simdbc64"
-  triggers: "vm-kernel-linux-release-x64"
-  triggers: "vm-kernel-mac-debug-simdbc64"
-  triggers: "vm-kernel-mac-debug-x64"
-  triggers: "vm-kernel-mac-product-x64"
-  triggers: "vm-kernel-mac-release-simdbc64"
-  triggers: "vm-kernel-mac-release-x64"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
-  triggers: "vm-kernel-precomp-android-release-arm"
-  triggers: "vm-kernel-precomp-bare-linux-release-x64"
-  triggers: "vm-kernel-precomp-bare-linux-release-simarm"
-  triggers: "vm-kernel-precomp-bare-linux-release-simarm64"
-  triggers: "vm-kernel-precomp-linux-debug-x64"
-  triggers: "vm-kernel-precomp-linux-product-x64"
-  triggers: "vm-kernel-precomp-linux-release-simarm"
-  triggers: "vm-kernel-precomp-linux-release-simarm64"
-  triggers: "vm-kernel-precomp-linux-release-x64"
-  triggers: "vm-kernel-precomp-mac-release-simarm64"
-  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64"
-  triggers: "vm-kernel-precomp-win-release-simarm64"
-  triggers: "vm-kernel-precomp-win-release-x64"
-  triggers: "vm-kernel-reload-linux-debug-x64"
-  triggers: "vm-kernel-reload-linux-release-x64"
-  triggers: "vm-kernel-reload-mac-debug-simdbc64"
-  triggers: "vm-kernel-reload-mac-release-simdbc64"
-  triggers: "vm-kernel-reload-rollback-linux-debug-x64"
-  triggers: "vm-kernel-reload-rollback-linux-release-x64"
-  triggers: "vm-kernel-win-debug-ia32"
-  triggers: "vm-kernel-win-debug-x64"
-  triggers: "vm-kernel-win-product-x64"
-  triggers: "vm-kernel-win-release-ia32"
-  triggers: "vm-kernel-win-release-x64"
-  triggers: "vm-ffi-android-debug-arm"
-  triggers: "vm-ffi-android-release-arm"
-  triggers: "vm-ffi-android-product-arm"
-}
-
-trigger {
-  id: "dart-gitiles-trigger-dev"
-  acl_sets: "default"
-  gitiles: {
-    repo: "https://dart.googlesource.com/sdk/"
-    refs: "refs/heads/dev"
-  }
-  triggers: "analyzer-analysis-server-linux-dev"
-  triggers: "analyzer-linux-release-dev"
-  triggers: "analyzer-mac-release-dev"
-  triggers: "analyzer-win-release-dev"
-  triggers: "app-kernel-linux-debug-x64-dev"
-  triggers: "app-kernel-linux-product-x64-dev"
-  triggers: "app-kernel-linux-release-x64-dev"
-  triggers: "cross-vm-linux-release-arm64-dev"
-  triggers: "dart-sdk-linux-dev"
-  triggers: "dart-sdk-mac-dev"
-  triggers: "dart-sdk-win-dev"
-  triggers: "dart2js-csp-minified-linux-x64-chrome-dev"
-  triggers: "dart2js-minified-strong-linux-x64-d8-dev"
-  triggers: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
-  triggers: "dart2js-strong-linux-x64-chrome-dev"
-  triggers: "dart2js-strong-linux-x64-firefox-dev"
-  triggers: "dart2js-strong-mac-x64-chrome-dev"
-  triggers: "dart2js-strong-mac-x64-safari-dev"
-  triggers: "dart2js-strong-win-x64-chrome-dev"
-  triggers: "dart2js-strong-win-x64-firefox-dev"
-  triggers: "dart2js-strong-win-x64-ie11-dev"
-  triggers: "dart2js-unit-linux-x64-release-dev"
-  triggers: "ddc-linux-release-chrome-dev"
-  triggers: "ddc-mac-release-chrome-dev"
-  triggers: "ddc-win-release-chrome-dev"
-  triggers: "debianpackage-linux-dev"
-  triggers: "front-end-linux-release-x64-dev"
-  triggers: "front-end-mac-release-x64-dev"
-  triggers: "front-end-win-release-x64-dev"
-  triggers: "gclient-dev"
-  triggers: "pkg-linux-release-dev"
-  triggers: "pkg-mac-release-dev"
-  triggers: "pkg-win-release-dev"
-  triggers: "versionchecker-linux-dev"
-  triggers: "vm-canary-linux-debug-dev"
-  triggers: "vm-dartkb-linux-debug-simarm64-dev"
-  triggers: "vm-dartkb-linux-debug-x64-dev"
-  triggers: "vm-dartkb-linux-product-simarm64-dev"
-  triggers: "vm-dartkb-linux-product-x64-dev"
-  triggers: "vm-dartkb-linux-release-simarm64-dev"
-  triggers: "vm-dartkb-linux-release-x64-dev"
-  triggers: "vm-kernel-asan-linux-release-x64-dev"
-  triggers: "vm-kernel-checked-linux-release-x64-dev"
-  triggers: "vm-kernel-linux-debug-ia32-dev"
-  triggers: "vm-kernel-linux-debug-simdbc64-dev"
-  triggers: "vm-kernel-linux-debug-x64-dev"
-  triggers: "vm-kernel-linux-product-x64-dev"
-  triggers: "vm-kernel-linux-release-ia32-dev"
-  triggers: "vm-kernel-linux-release-simarm-dev"
-  triggers: "vm-kernel-linux-release-simarm64-dev"
-  triggers: "vm-kernel-linux-release-simdbc64-dev"
-  triggers: "vm-kernel-linux-release-x64-dev"
-  triggers: "vm-kernel-mac-debug-simdbc64-dev"
-  triggers: "vm-kernel-mac-debug-x64-dev"
-  triggers: "vm-kernel-mac-product-x64-dev"
-  triggers: "vm-kernel-mac-release-simdbc64-dev"
-  triggers: "vm-kernel-mac-release-x64-dev"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-android-release-arm-dev"
-  triggers: "vm-kernel-precomp-bare-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-bare-linux-release-simarm-dev"
-  triggers: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
-  triggers: "vm-kernel-precomp-linux-debug-x64-dev"
-  triggers: "vm-kernel-precomp-linux-product-x64-dev"
-  triggers: "vm-kernel-precomp-linux-release-simarm-dev"
-  triggers: "vm-kernel-precomp-linux-release-simarm64-dev"
-  triggers: "vm-kernel-precomp-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-mac-release-simarm64-dev"
-  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-win-release-simarm64-dev"
-  triggers: "vm-kernel-precomp-win-release-x64-dev"
-  triggers: "vm-kernel-reload-linux-debug-x64-dev"
-  triggers: "vm-kernel-reload-linux-release-x64-dev"
-  triggers: "vm-kernel-reload-mac-debug-simdbc64-dev"
-  triggers: "vm-kernel-reload-mac-release-simdbc64-dev"
-  triggers: "vm-kernel-reload-rollback-linux-debug-x64-dev"
-  triggers: "vm-kernel-reload-rollback-linux-release-x64-dev"
-  triggers: "vm-kernel-win-debug-ia32-dev"
-  triggers: "vm-kernel-win-debug-x64-dev"
-  triggers: "vm-kernel-win-product-x64-dev"
-  triggers: "vm-kernel-win-release-ia32-dev"
-  triggers: "vm-kernel-win-release-x64-dev"
-  triggers: "vm-ffi-android-debug-arm-dev"
-  triggers: "vm-ffi-android-release-arm-dev"
-  triggers: "vm-ffi-android-product-arm-dev"
-}
-
-trigger {
-  id: "dart-gitiles-trigger-stable"
-  acl_sets: "default"
-  gitiles: {
-    repo: "https://dart.googlesource.com/sdk/"
-    refs: "refs/heads/stable"
-  }
-  triggers: "analyzer-analysis-server-linux-stable"
-  triggers: "analyzer-linux-release-stable"
-  triggers: "analyzer-mac-release-stable"
-  triggers: "analyzer-win-release-stable"
-  triggers: "app-kernel-linux-debug-x64-stable"
-  triggers: "app-kernel-linux-product-x64-stable"
-  triggers: "app-kernel-linux-release-x64-stable"
-  triggers: "cross-vm-linux-release-arm64-stable"
-  triggers: "dart-sdk-linux-stable"
-  triggers: "dart-sdk-mac-stable"
-  triggers: "dart-sdk-win-stable"
-  triggers: "dart2js-csp-minified-linux-x64-chrome-stable"
-  triggers: "dart2js-minified-strong-linux-x64-d8-stable"
-  triggers: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
-  triggers: "dart2js-strong-linux-x64-chrome-stable"
-  triggers: "dart2js-strong-linux-x64-firefox-stable"
-  triggers: "dart2js-strong-mac-x64-chrome-stable"
-  triggers: "dart2js-strong-mac-x64-safari-stable"
-  triggers: "dart2js-strong-win-x64-chrome-stable"
-  triggers: "dart2js-strong-win-x64-firefox-stable"
-  triggers: "dart2js-strong-win-x64-ie11-stable"
-  triggers: "dart2js-unit-linux-x64-release-stable"
-  triggers: "ddc-linux-release-chrome-stable"
-  triggers: "ddc-mac-release-chrome-stable"
-  triggers: "ddc-win-release-chrome-stable"
-  triggers: "debianpackage-linux-stable"
-  triggers: "front-end-linux-release-x64-stable"
-  triggers: "front-end-mac-release-x64-stable"
-  triggers: "front-end-win-release-x64-stable"
-  triggers: "gclient-stable"
-  triggers: "pkg-linux-release-stable"
-  triggers: "pkg-mac-release-stable"
-  triggers: "pkg-win-release-stable"
-  triggers: "versionchecker-linux-stable"
-  triggers: "vm-canary-linux-debug-stable"
-  triggers: "vm-dartkb-linux-debug-simarm64-stable"
-  triggers: "vm-dartkb-linux-debug-x64-stable"
-  triggers: "vm-dartkb-linux-product-simarm64-stable"
-  triggers: "vm-dartkb-linux-product-x64-stable"
-  triggers: "vm-dartkb-linux-release-simarm64-stable"
-  triggers: "vm-dartkb-linux-release-x64-stable"
-  triggers: "vm-kernel-asan-linux-release-x64-stable"
-  triggers: "vm-kernel-checked-linux-release-x64-stable"
-  triggers: "vm-kernel-linux-debug-ia32-stable"
-  triggers: "vm-kernel-linux-debug-simdbc64-stable"
-  triggers: "vm-kernel-linux-debug-x64-stable"
-  triggers: "vm-kernel-linux-product-x64-stable"
-  triggers: "vm-kernel-linux-release-ia32-stable"
-  triggers: "vm-kernel-linux-release-simarm-stable"
-  triggers: "vm-kernel-linux-release-simarm64-stable"
-  triggers: "vm-kernel-linux-release-simdbc64-stable"
-  triggers: "vm-kernel-linux-release-x64-stable"
-  triggers: "vm-kernel-mac-debug-simdbc64-stable"
-  triggers: "vm-kernel-mac-debug-x64-stable"
-  triggers: "vm-kernel-mac-product-x64-stable"
-  triggers: "vm-kernel-mac-release-simdbc64-stable"
-  triggers: "vm-kernel-mac-release-x64-stable"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-android-release-arm-stable"
-  triggers: "vm-kernel-precomp-bare-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-bare-linux-release-simarm-stable"
-  triggers: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
-  triggers: "vm-kernel-precomp-linux-debug-x64-stable"
-  triggers: "vm-kernel-precomp-linux-product-x64-stable"
-  triggers: "vm-kernel-precomp-linux-release-simarm-stable"
-  triggers: "vm-kernel-precomp-linux-release-simarm64-stable"
-  triggers: "vm-kernel-precomp-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-mac-release-simarm64-stable"
-  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-win-release-simarm64-stable"
-  triggers: "vm-kernel-precomp-win-release-x64-stable"
-  triggers: "vm-kernel-reload-linux-debug-x64-stable"
-  triggers: "vm-kernel-reload-linux-release-x64-stable"
-  triggers: "vm-kernel-reload-mac-debug-simdbc64-stable"
-  triggers: "vm-kernel-reload-mac-release-simdbc64-stable"
-  triggers: "vm-kernel-reload-rollback-linux-debug-x64-stable"
-  triggers: "vm-kernel-reload-rollback-linux-release-x64-stable"
-  triggers: "vm-kernel-win-debug-ia32-stable"
-  triggers: "vm-kernel-win-debug-x64-stable"
-  triggers: "vm-kernel-win-product-x64-stable"
-  triggers: "vm-kernel-win-release-ia32-stable"
-  triggers: "vm-kernel-win-release-x64-stable"
-  triggers: "vm-ffi-android-debug-arm-stable"
-  triggers: "vm-ffi-android-release-arm-stable"
-  triggers: "vm-ffi-android-product-arm-stable"
-}
-
-# CI jobs
-
-# analyzer
-
-job {
-  id: "analyzer-analysis-server-linux-analyzer-stable"
-  acl_sets: "default"
+    builder: "dart-sdk-linux"
+  >
+>
+job: <
+  id: "dart-sdk-linux-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-analysis-server-linux-analyzer-stable"
-  }
-}
-
-job {
-  id: "analyzer-linux-release-analyzer-stable"
-  acl_sets: "default"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-linux-dev"
+  >
+>
+job: <
+  id: "dart-sdk-linux-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-linux-release-analyzer-stable"
-  }
-}
-
-job {
-  id: "analyzer-mac-release-analyzer-stable"
-  acl_sets: "default"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-linux-stable"
+  >
+>
+job: <
+  id: "dart-sdk-mac"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-mac-release-analyzer-stable"
-  }
-}
-
-job {
-  id: "analyzer-win-release-analyzer-stable"
-  acl_sets: "default"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-mac"
+  >
+>
+job: <
+  id: "dart-sdk-mac-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-win-release-analyzer-stable"
-  }
-}
-
-# master
-
-job {
-  id: "analyzer-analysis-server-linux"
-  acl_sets: "default"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-mac-dev"
+  >
+>
+job: <
+  id: "dart-sdk-mac-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-analysis-server-linux"
-  }
-}
-
-job {
-  id: "analyzer-linux-release"
-  acl_sets: "default"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-mac-stable"
+  >
+>
+job: <
+  id: "dart-sdk-win"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-linux-release"
-  }
-}
-
-job {
-  id: "analyzer-mac-release"
-  acl_sets: "default"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-win"
+  >
+>
+job: <
+  id: "dart-sdk-win-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-mac-release"
-  }
-}
-
-job {
-  id: "analyzer-win-release"
-  acl_sets: "default"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-win-dev"
+  >
+>
+job: <
+  id: "dart-sdk-win-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-win-release"
-  }
-}
-
-job {
-  id: "app-kernel-linux-debug-x64"
-  acl_sets: "default"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-win-stable"
+  >
+>
+job: <
+  id: "dart2js-csp-minified-linux-x64-chrome"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-debug-x64"
-  }
-}
-
-job {
-  id: "app-kernel-linux-product-x64"
-  acl_sets: "default"
+    builder: "dart2js-csp-minified-linux-x64-chrome"
+  >
+>
+job: <
+  id: "dart2js-csp-minified-linux-x64-chrome-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-product-x64"
-  }
-}
-
-job {
-  id: "app-kernel-linux-release-x64"
-  acl_sets: "default"
+    builder: "dart2js-csp-minified-linux-x64-chrome-dev"
+  >
+>
+job: <
+  id: "dart2js-csp-minified-linux-x64-chrome-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-release-x64"
-  }
-}
-
-job {
-  id: "cross-vm-linux-release-arm64"
-  acl_sets: "default"
+    builder: "dart2js-csp-minified-linux-x64-chrome-stable"
+  >
+>
+job: <
+  id: "dart2js-minified-strong-linux-x64-d8"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "cross-vm-linux-release-arm64"
-  }
-}
-
-job {
-  id: "dart-sdk-linux"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-linux"
-  }
-}
-
-job {
-  id: "dart-sdk-mac"
-  acl_sets: "default"
+    builder: "dart2js-minified-strong-linux-x64-d8"
+  >
+>
+job: <
+  id: "dart2js-minified-strong-linux-x64-d8-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-mac"
-  }
-}
-
-job {
-  id: "dart-sdk-win"
-  acl_sets: "default"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-minified-strong-linux-x64-d8-dev"
+  >
+>
+job: <
+  id: "dart2js-minified-strong-linux-x64-d8-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-win"
-  }
-}
-
-job {
-  id: "dart2js-csp-minified-linux-x64-chrome"
-  acl_sets: "default"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-minified-strong-linux-x64-d8-stable"
+  >
+>
+job: <
+  id: "dart2js-strong-hostasserts-linux-ia32-d8"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-csp-minified-linux-x64-chrome"
-  }
-}
-
-job {
-  id: "dart2js-minified-strong-linux-x64-d8"
-  acl_sets: "default"
+    builder: "dart2js-strong-hostasserts-linux-ia32-d8"
+  >
+>
+job: <
+  id: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-minified-strong-linux-x64-d8"
-  }
-}
-
-job {
-  id: "dart2js-strong-hostasserts-linux-ia32-d8"
-  acl_sets: "default"
+    builder: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
+  >
+>
+job: <
+  id: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-hostasserts-linux-ia32-d8"
-  }
-}
-
-job {
+    builder: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
+  >
+>
+job: <
   id: "dart2js-strong-linux-x64-chrome"
-  acl_sets: "default"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-linux-x64-chrome"
-  }
-}
-
-job {
-  id: "dart2js-strong-linux-x64-firefox"
-  acl_sets: "default"
+  >
+>
+job: <
+  id: "dart2js-strong-linux-x64-chrome-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-linux-x64-firefox"
-  }
-}
-
-job {
-  id: "dart2js-strong-mac-x64-chrome"
-  acl_sets: "default"
+    builder: "dart2js-strong-linux-x64-chrome-dev"
+  >
+>
+job: <
+  id: "dart2js-strong-linux-x64-chrome-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-mac-x64-chrome"
-  }
-}
-
-job {
-  id: "dart2js-strong-mac-x64-safari"
-  acl_sets: "default"
+    builder: "dart2js-strong-linux-x64-chrome-stable"
+  >
+>
+job: <
+  id: "dart2js-strong-linux-x64-firefox"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-mac-x64-safari"
-  }
-}
-
-job {
-  id: "dart2js-strong-win-x64-chrome"
-  acl_sets: "default"
+    builder: "dart2js-strong-linux-x64-firefox"
+  >
+>
+job: <
+  id: "dart2js-strong-linux-x64-firefox-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-chrome"
-  }
-}
-
-job {
-  id: "dart2js-strong-win-x64-firefox"
-  acl_sets: "default"
+    builder: "dart2js-strong-linux-x64-firefox-dev"
+  >
+>
+job: <
+  id: "dart2js-strong-linux-x64-firefox-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-firefox"
-  }
-}
-
-job {
-  id: "dart2js-strong-win-x64-ie11"
-  acl_sets: "default"
+    builder: "dart2js-strong-linux-x64-firefox-stable"
+  >
+>
+job: <
+  id: "dart2js-strong-mac-x64-chrome"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-ie11"
-  }
-}
-
-job {
-  id: "dart2js-unit-linux-x64-release"
-  acl_sets: "default"
+    builder: "dart2js-strong-mac-x64-chrome"
+  >
+>
+job: <
+  id: "dart2js-strong-mac-x64-chrome-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-unit-linux-x64-release"
-  }
-}
-
-job {
-  id: "ddc-linux-release-chrome"
-  acl_sets: "default"
+    builder: "dart2js-strong-mac-x64-chrome-dev"
+  >
+>
+job: <
+  id: "dart2js-strong-mac-x64-chrome-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-linux-release-chrome"
-  }
-}
-
-job {
-  id: "ddc-mac-release-chrome"
-  acl_sets: "default"
+    builder: "dart2js-strong-mac-x64-chrome-stable"
+  >
+>
+job: <
+  id: "dart2js-strong-mac-x64-safari"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-mac-release-chrome"
-  }
-}
-
-job {
-  id: "ddc-win-release-chrome"
-  acl_sets: "default"
+    builder: "dart2js-strong-mac-x64-safari"
+  >
+>
+job: <
+  id: "dart2js-strong-mac-x64-safari-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-win-release-chrome"
-  }
-}
-
-job {
-  id: "debianpackage-linux"
-  acl_sets: "default"
+    builder: "dart2js-strong-mac-x64-safari-dev"
+  >
+>
+job: <
+  id: "dart2js-strong-mac-x64-safari-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "debianpackage-linux"
-  }
-}
-
-job {
-  id: "flutter-analyze"
-  acl_sets: "default"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-mac-x64-safari-stable"
+  >
+>
+job: <
+  id: "dart2js-strong-win-x64-chrome"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "flutter-analyze"
-  }
-}
-
-job {
-  id: "flutter-frontend"
-  acl_sets: "default"
+    builder: "dart2js-strong-win-x64-chrome"
+  >
+>
+job: <
+  id: "dart2js-strong-win-x64-chrome-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "flutter-frontend"
-  }
-}
-
-job {
-  id: "front-end-linux-release-x64"
-  acl_sets: "default"
+    builder: "dart2js-strong-win-x64-chrome-dev"
+  >
+>
+job: <
+  id: "dart2js-strong-win-x64-chrome-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-linux-release-x64"
-  }
-}
-
-job {
-  id: "front-end-mac-release-x64"
-  acl_sets: "default"
+    builder: "dart2js-strong-win-x64-chrome-stable"
+  >
+>
+job: <
+  id: "dart2js-strong-win-x64-firefox"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-mac-release-x64"
-  }
-}
-
-job {
-  id: "front-end-win-release-x64"
-  acl_sets: "default"
+    builder: "dart2js-strong-win-x64-firefox"
+  >
+>
+job: <
+  id: "dart2js-strong-win-x64-firefox-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-win-release-x64"
-  }
-}
-
-job {
-  id: "gclient"
-  acl_sets: "default"
+    builder: "dart2js-strong-win-x64-firefox-dev"
+  >
+>
+job: <
+  id: "dart2js-strong-win-x64-firefox-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "gclient"
-  }
-}
-
-job {
-  id: "pkg-linux-debug"
-  acl_sets: "default"
+    builder: "dart2js-strong-win-x64-firefox-stable"
+  >
+>
+job: <
+  id: "dart2js-strong-win-x64-ie11"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-linux-debug"
-  }
-}
-
-job {
-  id: "pkg-linux-release"
-  acl_sets: "default"
+    builder: "dart2js-strong-win-x64-ie11"
+  >
+>
+job: <
+  id: "dart2js-strong-win-x64-ie11-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-linux-release"
-  }
-}
-
-job {
-  id: "pkg-mac-release"
-  acl_sets: "default"
+    builder: "dart2js-strong-win-x64-ie11-dev"
+  >
+>
+job: <
+  id: "dart2js-strong-win-x64-ie11-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-mac-release"
-  }
-}
-
-job {
-  id: "pkg-win-release"
-  acl_sets: "default"
+    builder: "dart2js-strong-win-x64-ie11-stable"
+  >
+>
+job: <
+  id: "dart2js-unit-linux-x64-release"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-win-release"
-  }
-}
-
-job {
-  id: "versionchecker-linux"
-  acl_sets: "default"
+    builder: "dart2js-unit-linux-x64-release"
+  >
+>
+job: <
+  id: "dart2js-unit-linux-x64-release-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "versionchecker-linux"
-  }
-}
-
-job {
-  id: "vm-canary-linux-debug"
-  acl_sets: "default"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-unit-linux-x64-release-dev"
+  >
+>
+job: <
+  id: "dart2js-unit-linux-x64-release-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-canary-linux-debug"
-  }
-}
-
-job {
-  id: "vm-dartkb-linux-debug-simarm64"
-  acl_sets: "default"
+    builder: "dart2js-unit-linux-x64-release-stable"
+  >
+>
+job: <
+  id: "ddc-linux-release-chrome"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-debug-simarm64"
-  }
-}
-
-job {
-  id: "vm-dartkb-linux-debug-x64"
-  acl_sets: "default"
+    builder: "ddc-linux-release-chrome"
+  >
+>
+job: <
+  id: "ddc-linux-release-chrome-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-debug-x64"
-  }
-}
-
-job {
-  id: "vm-dartkb-linux-product-simarm64"
-  acl_sets: "default"
+    builder: "ddc-linux-release-chrome-dev"
+  >
+>
+job: <
+  id: "ddc-linux-release-chrome-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-product-simarm64"
-  }
-}
-
-job {
-  id: "vm-dartkb-linux-product-x64"
-  acl_sets: "default"
+    builder: "ddc-linux-release-chrome-stable"
+  >
+>
+job: <
+  id: "ddc-mac-release-chrome"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-product-x64"
-  }
-}
-
-job {
-  id: "vm-dartkb-linux-release-simarm64"
-  acl_sets: "default"
+    builder: "ddc-mac-release-chrome"
+  >
+>
+job: <
+  id: "ddc-mac-release-chrome-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-simarm64"
-  }
-}
-
-job {
-  id: "vm-dartkb-linux-release-x64"
-  acl_sets: "default"
+    builder: "ddc-mac-release-chrome-dev"
+  >
+>
+job: <
+  id: "ddc-mac-release-chrome-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-x64"
-  }
-}
-
-job {
-  id: "vm-kernel-asan-linux-release-x64"
-  acl_sets: "default"
+    builder: "ddc-mac-release-chrome-stable"
+  >
+>
+job: <
+  id: "ddc-win-release-chrome"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-asan-linux-release-x64"
-  }
-}
-
-job {
-  id: "vm-kernel-checked-linux-release-x64"
-  acl_sets: "default"
+    builder: "ddc-win-release-chrome"
+  >
+>
+job: <
+  id: "ddc-win-release-chrome-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-checked-linux-release-x64"
-  }
-}
-
-job {
-  id: "vm-kernel-linux-debug-ia32"
-  acl_sets: "default"
+    builder: "ddc-win-release-chrome-dev"
+  >
+>
+job: <
+  id: "ddc-win-release-chrome-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-ia32"
-  }
-}
-
-job {
-  id: "vm-kernel-linux-debug-simdbc64"
-  acl_sets: "default"
+    builder: "ddc-win-release-chrome-stable"
+  >
+>
+job: <
+  id: "debianpackage-linux"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-simdbc64"
-  }
-}
-
-job {
-  id: "vm-kernel-linux-debug-x64"
-  acl_sets: "default"
+    bucket: "luci.dart.ci"
+    builder: "debianpackage-linux"
+  >
+>
+job: <
+  id: "debianpackage-linux-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-x64"
-  }
-}
-
-job {
-  id: "vm-kernel-linux-product-x64"
-  acl_sets: "default"
+    bucket: "luci.dart.ci"
+    builder: "debianpackage-linux-dev"
+  >
+>
+job: <
+  id: "debianpackage-linux-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-product-x64"
-  }
-}
-
-job {
-  id: "vm-kernel-linux-release-ia32"
-  acl_sets: "default"
+    bucket: "luci.dart.ci"
+    builder: "debianpackage-linux-stable"
+  >
+>
+job: <
+  id: "flutter-analyze"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-ia32"
-  }
-}
-
-job {
-  id: "vm-kernel-linux-release-simarm"
-  acl_sets: "default"
+    builder: "flutter-analyze"
+  >
+>
+job: <
+  id: "flutter-engine-linux"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  triggering_policy: <
+    kind: GREEDY_BATCHING
+    max_concurrent_invocations: 5
+    max_batch_size: 1
+  >
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm"
-  }
-}
-
-job {
-  id: "vm-kernel-linux-release-simarm64"
-  acl_sets: "default"
+    builder: "flutter-engine-linux"
+  >
+>
+job: <
+  id: "flutter-frontend"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm64"
-  }
-}
-
-job {
-  id: "vm-kernel-linux-release-simdbc64"
-  acl_sets: "default"
+    builder: "flutter-frontend"
+  >
+>
+job: <
+  id: "front-end-linux-release-x64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simdbc64"
-  }
-}
-
-job {
-  id: "vm-kernel-linux-release-x64"
-  acl_sets: "default"
+    builder: "front-end-linux-release-x64"
+  >
+>
+job: <
+  id: "front-end-linux-release-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-x64"
-  }
-}
-
-job {
-  id: "vm-kernel-mac-debug-simdbc64"
-  acl_sets: "default"
+    builder: "front-end-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "front-end-linux-release-x64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-debug-simdbc64"
-  }
-}
-
-job {
-  id: "vm-kernel-mac-debug-x64"
-  acl_sets: "default"
+    builder: "front-end-linux-release-x64-stable"
+  >
+>
+job: <
+  id: "front-end-mac-release-x64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-debug-x64"
-  }
-}
-
-job {
-  id: "vm-kernel-mac-product-x64"
-  acl_sets: "default"
+    builder: "front-end-mac-release-x64"
+  >
+>
+job: <
+  id: "front-end-mac-release-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-product-x64"
-  }
-}
-
-job {
-  id: "vm-kernel-mac-release-simdbc64"
-  acl_sets: "default"
+    builder: "front-end-mac-release-x64-dev"
+  >
+>
+job: <
+  id: "front-end-mac-release-x64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-release-simdbc64"
-  }
-}
-
-job {
-  id: "vm-kernel-mac-release-x64"
-  acl_sets: "default"
+    builder: "front-end-mac-release-x64-stable"
+  >
+>
+job: <
+  id: "front-end-win-release-x64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-release-x64"
-  }
-}
-
-job {
-  id: "vm-kernel-optcounter-threshold-linux-release-ia32"
-  acl_sets: "default"
+    builder: "front-end-win-release-x64"
+  >
+>
+job: <
+  id: "front-end-win-release-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-optcounter-threshold-linux-release-ia32"
-  }
-}
-
-job {
-  id: "vm-kernel-optcounter-threshold-linux-release-x64"
-  acl_sets: "default"
+    builder: "front-end-win-release-x64-dev"
+  >
+>
+job: <
+  id: "front-end-win-release-x64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-optcounter-threshold-linux-release-x64"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-android-release-arm"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
+    builder: "front-end-win-release-x64-stable"
+  >
+>
+job: <
+  id: "fuzz-linux"
+  schedule: "0 3 * * *"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-bare-linux-release-x64"
-  acl_sets: "default"
+    builder: "fuzz-linux"
+  >
+>
+job: <
+  id: "gclient"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-bare-linux-release-x64"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-bare-linux-release-simarm"
-  acl_sets: "default"
+    builder: "gclient"
+  >
+>
+job: <
+  id: "gclient-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-bare-linux-release-simarm"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-bare-linux-release-simarm64"
-  acl_sets: "default"
+    builder: "gclient-dev"
+  >
+>
+job: <
+  id: "gclient-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-bare-linux-release-simarm64"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-linux-debug-x64"
-  acl_sets: "default"
+    builder: "gclient-stable"
+  >
+>
+job: <
+  id: "linearize-flutter"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci"
+  triggering_policy: <
+    kind: GREEDY_BATCHING
+    max_batch_size: 1
+  >
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-linux-product-x64"
-  acl_sets: "default"
+    bucket: "luci.dart.ci"
+    builder: "linearize-flutter"
+  >
+>
+job: <
+  id: "pkg-linux-debug"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-product-x64"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-linux-release-simarm"
-  acl_sets: "default"
+    builder: "pkg-linux-debug"
+  >
+>
+job: <
+  id: "pkg-linux-release"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-linux-release-simarm64"
-  acl_sets: "default"
+    builder: "pkg-linux-release"
+  >
+>
+job: <
+  id: "pkg-linux-release-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm64"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-linux-release-x64"
-  acl_sets: "default"
+    builder: "pkg-linux-release-dev"
+  >
+>
+job: <
+  id: "pkg-linux-release-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-x64"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-mac-release-simarm64"
-  acl_sets: "default"
+    builder: "pkg-linux-release-stable"
+  >
+>
+job: <
+  id: "pkg-mac-release"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-mac-release-simarm64"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-obfuscate-linux-release-x64"
-  acl_sets: "default"
+    builder: "pkg-mac-release"
+  >
+>
+job: <
+  id: "pkg-mac-release-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-obfuscate-linux-release-x64"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-win-release-simarm64"
-  acl_sets: "default"
+    builder: "pkg-mac-release-dev"
+  >
+>
+job: <
+  id: "pkg-mac-release-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-simarm64"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-win-release-x64"
-  acl_sets: "default"
+    builder: "pkg-mac-release-stable"
+  >
+>
+job: <
+  id: "pkg-win-release"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-x64"
-  }
-}
-
-job {
-  id: "vm-kernel-reload-linux-debug-x64"
-  acl_sets: "default"
+    builder: "pkg-win-release"
+  >
+>
+job: <
+  id: "pkg-win-release-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-linux-debug-x64"
-  }
-}
-
-job {
-  id: "vm-kernel-reload-linux-release-x64"
-  acl_sets: "default"
+    builder: "pkg-win-release-dev"
+  >
+>
+job: <
+  id: "pkg-win-release-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-linux-release-x64"
-  }
-}
-
-job {
-  id: "vm-kernel-reload-mac-debug-simdbc64"
-  acl_sets: "default"
+    builder: "pkg-win-release-stable"
+  >
+>
+job: <
+  id: "versionchecker-linux"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-mac-debug-simdbc64"
-  }
-}
-
-job {
-  id: "vm-kernel-reload-mac-release-simdbc64"
-  acl_sets: "default"
+    bucket: "luci.dart.ci"
+    builder: "versionchecker-linux"
+  >
+>
+job: <
+  id: "versionchecker-linux-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-mac-release-simdbc64"
-  }
-}
-
-job {
-  id: "vm-kernel-reload-rollback-linux-debug-x64"
-  acl_sets: "default"
+    bucket: "luci.dart.ci"
+    builder: "versionchecker-linux-dev"
+  >
+>
+job: <
+  id: "versionchecker-linux-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-debug-x64"
-  }
-}
-
-job {
-  id: "vm-kernel-reload-rollback-linux-release-x64"
-  acl_sets: "default"
+    bucket: "luci.dart.ci"
+    builder: "versionchecker-linux-stable"
+  >
+>
+job: <
+  id: "vm-canary-linux-debug"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-release-x64"
-  }
-}
-
-job {
-  id: "vm-kernel-win-debug-ia32"
-  acl_sets: "default"
+    builder: "vm-canary-linux-debug"
+  >
+>
+job: <
+  id: "vm-canary-linux-debug-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-debug-ia32"
-  }
-}
-
-job {
-  id: "vm-kernel-win-debug-x64"
-  acl_sets: "default"
+    builder: "vm-canary-linux-debug-dev"
+  >
+>
+job: <
+  id: "vm-canary-linux-debug-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-debug-x64"
-  }
-}
-
-job {
-  id: "vm-kernel-win-product-x64"
-  acl_sets: "default"
+    builder: "vm-canary-linux-debug-stable"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-debug-simarm64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-product-x64"
-  }
-}
-
-job {
-  id: "vm-kernel-win-release-ia32"
-  acl_sets: "default"
+    builder: "vm-dartkb-linux-debug-simarm64"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-debug-simarm64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-release-ia32"
-  }
-}
-
-job {
-  id: "vm-kernel-win-release-x64"
-  acl_sets: "default"
+    builder: "vm-dartkb-linux-debug-simarm64-dev"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-debug-simarm64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-release-x64"
-  }
-}
-
-job {
-  id: "vm-ffi-android-debug-arm64"
-  acl_sets: "default"
+    builder: "vm-dartkb-linux-debug-simarm64-stable"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-debug-x64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-debug-arm64"
-  }
-}
-
-job {
-  id: "vm-ffi-android-debug-arm"
-  acl_sets: "default"
+    builder: "vm-dartkb-linux-debug-x64"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-debug-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-debug-arm"
-  }
-}
-
-job {
-  id: "vm-ffi-android-release-arm64"
-  acl_sets: "default"
+    builder: "vm-dartkb-linux-debug-x64-dev"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-debug-x64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-release-arm64"
-  }
-}
-
-job {
-  id: "vm-ffi-android-release-arm"
-  acl_sets: "default"
+    builder: "vm-dartkb-linux-debug-x64-stable"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-product-simarm64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-release-arm"
-  }
-}
-
-job {
-  id: "vm-ffi-android-product-arm64"
-  acl_sets: "default"
+    builder: "vm-dartkb-linux-product-simarm64"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-product-simarm64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-product-arm64"
-  }
-}
-
-job {
-  id: "vm-ffi-android-product-arm"
-  acl_sets: "default"
+    builder: "vm-dartkb-linux-product-simarm64-dev"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-product-simarm64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-product-arm"
-  }
-}
-
-# dev
-
-job {
-  id: "analyzer-analysis-server-linux-dev"
-  acl_sets: "default"
+    builder: "vm-dartkb-linux-product-simarm64-stable"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-product-x64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-analysis-server-linux-dev"
-  }
-}
-
-job {
-  id: "analyzer-linux-release-dev"
-  acl_sets: "default"
+    builder: "vm-dartkb-linux-product-x64"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-product-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-linux-release-dev"
-  }
-}
-
-job {
-  id: "analyzer-mac-release-dev"
-  acl_sets: "default"
+    builder: "vm-dartkb-linux-product-x64-dev"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-product-x64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-mac-release-dev"
-  }
-}
-
-job {
-  id: "analyzer-win-release-dev"
-  acl_sets: "default"
+    builder: "vm-dartkb-linux-product-x64-stable"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-release-simarm64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-win-release-dev"
-  }
-}
-
-job {
-  id: "app-kernel-linux-debug-x64-dev"
-  acl_sets: "default"
+    builder: "vm-dartkb-linux-release-simarm64"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-release-simarm64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-debug-x64-dev"
-  }
-}
-
-job {
-  id: "app-kernel-linux-product-x64-dev"
-  acl_sets: "default"
+    builder: "vm-dartkb-linux-release-simarm64-dev"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-release-simarm64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-product-x64-dev"
-  }
-}
-
-job {
-  id: "app-kernel-linux-release-x64-dev"
-  acl_sets: "default"
+    builder: "vm-dartkb-linux-release-simarm64-stable"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-release-x64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-release-x64-dev"
-  }
-}
-
-job {
-  id: "cross-vm-linux-release-arm64-dev"
-  acl_sets: "default"
+    builder: "vm-dartkb-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-release-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "cross-vm-linux-release-arm64-dev"
-  }
-}
-
-job {
-  id: "dart-sdk-linux-dev"
-  acl_sets: "default"
+    builder: "vm-dartkb-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-release-x64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-linux-dev"
-  }
-}
-
-job {
-  id: "dart-sdk-mac-dev"
-  acl_sets: "default"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-release-x64-stable"
+  >
+>
+job: <
+  id: "vm-ffi-android-debug-arm"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-mac-dev"
-  }
-}
-
-job {
-  id: "dart-sdk-win-dev"
-  acl_sets: "default"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-debug-arm"
+  >
+>
+job: <
+  id: "vm-ffi-android-debug-arm-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-win-dev"
-  }
-}
-
-job {
-  id: "dart2js-csp-minified-linux-x64-chrome-dev"
-  acl_sets: "default"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-debug-arm-dev"
+  >
+>
+job: <
+  id: "vm-ffi-android-debug-arm-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-csp-minified-linux-x64-chrome-dev"
-  }
-}
-
-job {
-  id: "dart2js-minified-strong-linux-x64-d8-dev"
-  acl_sets: "default"
+    builder: "vm-ffi-android-debug-arm-stable"
+  >
+>
+job: <
+  id: "vm-ffi-android-product-arm"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-minified-strong-linux-x64-d8-dev"
-  }
-}
-
-job {
-  id: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
-  acl_sets: "default"
+    builder: "vm-ffi-android-product-arm"
+  >
+>
+job: <
+  id: "vm-ffi-android-product-arm-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
-  }
-}
-
-job {
-  id: "dart2js-strong-linux-x64-chrome-dev"
-  acl_sets: "default"
+    builder: "vm-ffi-android-product-arm-dev"
+  >
+>
+job: <
+  id: "vm-ffi-android-product-arm-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-linux-x64-chrome-dev"
-  }
-}
-
-job {
-  id: "dart2js-strong-linux-x64-firefox-dev"
-  acl_sets: "default"
+    builder: "vm-ffi-android-product-arm-stable"
+  >
+>
+job: <
+  id: "vm-ffi-android-release-arm"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-linux-x64-firefox-dev"
-  }
-}
-
-job {
-  id: "dart2js-strong-mac-x64-chrome-dev"
-  acl_sets: "default"
+    builder: "vm-ffi-android-release-arm"
+  >
+>
+job: <
+  id: "vm-ffi-android-release-arm-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-mac-x64-chrome-dev"
-  }
-}
-
-job {
-  id: "dart2js-strong-mac-x64-safari-dev"
-  acl_sets: "default"
+    builder: "vm-ffi-android-release-arm-dev"
+  >
+>
+job: <
+  id: "vm-ffi-android-release-arm-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-mac-x64-safari-dev"
-  }
-}
-
-job {
-  id: "dart2js-strong-win-x64-chrome-dev"
-  acl_sets: "default"
+    builder: "vm-ffi-android-release-arm-stable"
+  >
+>
+job: <
+  id: "vm-kernel-asan-linux-release-x64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-chrome-dev"
-  }
-}
-
-job {
-  id: "dart2js-strong-win-x64-firefox-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-asan-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-asan-linux-release-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-firefox-dev"
-  }
-}
-
-job {
-  id: "dart2js-strong-win-x64-ie11-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-asan-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-asan-linux-release-x64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-ie11-dev"
-  }
-}
-
-job {
-  id: "dart2js-unit-linux-x64-release-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-asan-linux-release-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-checked-linux-release-x64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-unit-linux-x64-release-dev"
-  }
-}
-
-job {
-  id: "ddc-linux-release-chrome-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-checked-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-checked-linux-release-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-linux-release-chrome-dev"
-  }
-}
-
-job {
-  id: "ddc-mac-release-chrome-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-checked-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-checked-linux-release-x64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-mac-release-chrome-dev"
-  }
-}
-
-job {
-  id: "ddc-win-release-chrome-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-checked-linux-release-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-linux-debug-ia32"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-win-release-chrome-dev"
-  }
-}
-
-job {
-  id: "debianpackage-linux-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-linux-debug-ia32"
+  >
+>
+job: <
+  id: "vm-kernel-linux-debug-ia32-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "debianpackage-linux-dev"
-  }
-}
-
-job {
-  id: "front-end-linux-release-x64-dev"
-  acl_sets: "default"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-ia32-dev"
+  >
+>
+job: <
+  id: "vm-kernel-linux-debug-ia32-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-linux-release-x64-dev"
-  }
-}
-
-job {
-  id: "front-end-mac-release-x64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-linux-debug-ia32-stable"
+  >
+>
+job: <
+  id: "vm-kernel-linux-debug-simdbc64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-mac-release-x64-dev"
-  }
-}
-
-job {
-  id: "front-end-win-release-x64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-linux-debug-simdbc64"
+  >
+>
+job: <
+  id: "vm-kernel-linux-debug-simdbc64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-win-release-x64-dev"
-  }
-}
-
-job {
-  id: "gclient-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-linux-debug-simdbc64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-linux-debug-simdbc64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "gclient-dev"
-  }
-}
-
-job {
-  id: "pkg-linux-release-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-linux-debug-simdbc64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-linux-debug-x64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-linux-release-dev"
-  }
-}
-
-job {
-  id: "pkg-mac-release-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-linux-debug-x64"
+  >
+>
+job: <
+  id: "vm-kernel-linux-debug-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-mac-release-dev"
-  }
-}
-
-job {
-  id: "pkg-win-release-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-linux-debug-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-linux-debug-x64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-win-release-dev"
-  }
-}
-
-job {
-  id: "versionchecker-linux-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-linux-debug-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-linux-product-x64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "versionchecker-linux-dev"
-  }
-}
-
-job {
-  id: "vm-canary-linux-debug-dev"
-  acl_sets: "default"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-product-x64"
+  >
+>
+job: <
+  id: "vm-kernel-linux-product-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-canary-linux-debug-dev"
-  }
-}
-
-job {
-  id: "vm-dartkb-linux-debug-simarm64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-linux-product-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-linux-product-x64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-debug-simarm64-dev"
-  }
-}
-
-job {
-  id: "vm-dartkb-linux-debug-x64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-linux-product-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-ia32"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-debug-x64-dev"
-  }
-}
-
-job {
-  id: "vm-dartkb-linux-product-simarm64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-linux-release-ia32"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-ia32-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-product-simarm64-dev"
-  }
-}
-
-job {
-  id: "vm-dartkb-linux-product-x64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-linux-release-ia32-dev"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-ia32-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-product-x64-dev"
-  }
-}
-
-job {
-  id: "vm-dartkb-linux-release-simarm64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-linux-release-ia32-stable"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-simarm"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-simarm64-dev"
-  }
-}
-
-job {
-  id: "vm-dartkb-linux-release-x64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-linux-release-simarm"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-simarm-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-x64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-asan-linux-release-x64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-linux-release-simarm-dev"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-simarm-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-asan-linux-release-x64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-checked-linux-release-x64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-linux-release-simarm-stable"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-simarm64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-checked-linux-release-x64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-linux-debug-ia32-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-linux-release-simarm64"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-simarm64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-ia32-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-linux-debug-simdbc64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-linux-release-simarm64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-simarm64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-simdbc64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-linux-debug-x64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-linux-release-simarm64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-simdbc64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-x64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-linux-product-x64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-linux-release-simdbc64"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-simdbc64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-product-x64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-linux-release-ia32-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-linux-release-simdbc64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-simdbc64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-ia32-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-linux-release-simarm-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-linux-release-simdbc64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-x64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-linux-release-simarm64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-linux-release-simdbc64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-linux-release-x64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simdbc64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-linux-release-x64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-linux-release-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-mac-debug-simdbc64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-x64-dev"
-  }
-}
-
-job {
+    builder: "vm-kernel-mac-debug-simdbc64"
+  >
+>
+job: <
   id: "vm-kernel-mac-debug-simdbc64-dev"
-  acl_sets: "default"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-mac-debug-simdbc64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-mac-debug-x64-dev"
-  acl_sets: "default"
+  >
+>
+job: <
+  id: "vm-kernel-mac-debug-simdbc64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-debug-x64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-mac-product-x64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-mac-debug-simdbc64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-mac-debug-x64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-product-x64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-mac-release-simdbc64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-mac-debug-x64"
+  >
+>
+job: <
+  id: "vm-kernel-mac-debug-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-release-simdbc64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-mac-release-x64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-mac-debug-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-mac-debug-x64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-release-x64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-mac-debug-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-mac-product-x64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-mac-product-x64"
+  >
+>
+job: <
+  id: "vm-kernel-mac-product-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-android-release-arm-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-mac-product-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-mac-product-x64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-bare-linux-release-x64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-mac-product-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-mac-release-simdbc64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-bare-linux-release-x64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-bare-linux-release-simarm-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-mac-release-simdbc64"
+  >
+>
+job: <
+  id: "vm-kernel-mac-release-simdbc64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-bare-linux-release-simarm-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-mac-release-simdbc64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-mac-release-simdbc64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-linux-debug-x64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-mac-release-simdbc64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-mac-release-x64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-linux-product-x64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-mac-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-mac-release-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-product-x64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-linux-release-simarm-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-mac-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-mac-release-x64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-linux-release-simarm64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-mac-release-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-optcounter-threshold-linux-release-ia32"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-linux-release-x64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-optcounter-threshold-linux-release-ia32"
+  >
+>
+job: <
+  id: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-x64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-mac-release-simarm64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
+  >
+>
+job: <
+  id: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-mac-release-simarm64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
+  >
+>
+job: <
+  id: "vm-kernel-optcounter-threshold-linux-release-x64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-win-release-simarm64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-optcounter-threshold-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-simarm64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-win-release-x64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-x64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-reload-linux-debug-x64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-android-release-arm"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-linux-debug-x64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-reload-linux-release-x64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-android-release-arm"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-android-release-arm-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-linux-release-x64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-reload-mac-debug-simdbc64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-android-release-arm-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-android-release-arm-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-mac-debug-simdbc64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-reload-mac-release-simdbc64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-android-release-arm-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-bare-linux-release-simarm"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-mac-release-simdbc64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-reload-rollback-linux-debug-x64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-bare-linux-release-simarm"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-bare-linux-release-simarm-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-debug-x64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-reload-rollback-linux-release-x64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-bare-linux-release-simarm-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-bare-linux-release-simarm-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-release-x64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-win-debug-ia32-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-bare-linux-release-simarm-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-bare-linux-release-simarm64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-debug-ia32-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-win-debug-x64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-bare-linux-release-simarm64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-debug-x64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-win-product-x64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-product-x64-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-win-release-ia32-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-bare-linux-release-x64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-release-ia32-dev"
-  }
-}
-
-job {
-  id: "vm-kernel-win-release-x64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-bare-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-bare-linux-release-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-release-x64-dev"
-  }
-}
-
-job {
-  id: "vm-ffi-android-debug-arm64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-bare-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-bare-linux-release-x64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-debug-arm64-dev"
-  }
-}
-
-job {
-  id: "vm-ffi-android-debug-arm-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-bare-linux-release-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-debug-x64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-debug-arm-dev"
-  }
-}
-
-job {
-  id: "vm-ffi-android-release-arm64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-linux-debug-x64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-debug-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-release-arm64-dev"
-  }
-}
-
-job {
-  id: "vm-ffi-android-release-arm-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-linux-debug-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-debug-x64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-release-arm-dev"
-  }
-}
-
-job {
-  id: "vm-ffi-android-product-arm64-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-linux-debug-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-product-x64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-product-arm64-dev"
-  }
-}
-
-job {
-  id: "vm-ffi-android-product-arm-dev"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-linux-product-x64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-product-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-product-arm-dev"
-  }
-}
-
-# stable
-
-job {
-  id: "analyzer-analysis-server-linux-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-linux-product-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-product-x64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-analysis-server-linux-stable"
-  }
-}
-
-job {
-  id: "analyzer-linux-release-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-linux-product-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-release-simarm"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-linux-release-stable"
-  }
-}
-
-job {
-  id: "analyzer-mac-release-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-linux-release-simarm"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-release-simarm-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-mac-release-stable"
-  }
-}
-
-job {
-  id: "analyzer-win-release-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-linux-release-simarm-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-release-simarm-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-win-release-stable"
-  }
-}
-
-job {
-  id: "app-kernel-linux-debug-x64-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-linux-release-simarm-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-release-simarm64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-debug-x64-stable"
-  }
-}
-
-job {
-  id: "app-kernel-linux-product-x64-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-linux-release-simarm64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-release-simarm64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-product-x64-stable"
-  }
-}
-
-job {
-  id: "app-kernel-linux-release-x64-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-linux-release-simarm64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-release-simarm64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-release-x64-stable"
-  }
-}
-
-job {
-  id: "cross-vm-linux-release-arm64-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-linux-release-simarm64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-release-x64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "cross-vm-linux-release-arm64-stable"
-  }
-}
-
-job {
-  id: "dart-sdk-linux-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-release-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-linux-stable"
-  }
-}
-
-job {
-  id: "dart-sdk-mac-stable"
-  acl_sets: "default"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-release-x64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-mac-stable"
-  }
-}
-
-job {
-  id: "dart-sdk-win-stable"
-  acl_sets: "default"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-mac-release-simarm64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-win-stable"
-  }
-}
-
-job {
-  id: "dart2js-csp-minified-linux-x64-chrome-stable"
-  acl_sets: "default"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-mac-release-simarm64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-mac-release-simarm64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-csp-minified-linux-x64-chrome-stable"
-  }
-}
-
-job {
-  id: "dart2js-minified-strong-linux-x64-d8-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-mac-release-simarm64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-mac-release-simarm64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-minified-strong-linux-x64-d8-stable"
-  }
-}
-
-job {
-  id: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-mac-release-simarm64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-obfuscate-linux-release-x64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
-  }
-}
-
-job {
-  id: "dart2js-strong-linux-x64-chrome-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-obfuscate-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-linux-x64-chrome-stable"
-  }
-}
-
-job {
-  id: "dart2js-strong-linux-x64-firefox-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-linux-x64-firefox-stable"
-  }
-}
-
-job {
-  id: "dart2js-strong-mac-x64-chrome-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-win-release-simarm64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-mac-x64-chrome-stable"
-  }
-}
-
-job {
-  id: "dart2js-strong-mac-x64-safari-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-win-release-simarm64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-win-release-simarm64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-mac-x64-safari-stable"
-  }
-}
-
-job {
-  id: "dart2js-strong-win-x64-chrome-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-win-release-simarm64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-win-release-simarm64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-chrome-stable"
-  }
-}
-
-job {
-  id: "dart2js-strong-win-x64-firefox-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-win-release-simarm64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-win-release-x64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-firefox-stable"
-  }
-}
-
-job {
-  id: "dart2js-strong-win-x64-ie11-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-win-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-win-release-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-ie11-stable"
-  }
-}
-
-job {
-  id: "dart2js-unit-linux-x64-release-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-win-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-win-release-x64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-unit-linux-x64-release-stable"
-  }
-}
-
-job {
-  id: "ddc-linux-release-chrome-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-precomp-win-release-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-reload-linux-debug-x64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-linux-release-chrome-stable"
-  }
-}
-
-job {
-  id: "ddc-mac-release-chrome-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-reload-linux-debug-x64"
+  >
+>
+job: <
+  id: "vm-kernel-reload-linux-debug-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-mac-release-chrome-stable"
-  }
-}
-
-job {
-  id: "ddc-win-release-chrome-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-reload-linux-debug-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-reload-linux-debug-x64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-win-release-chrome-stable"
-  }
-}
-
-job {
-  id: "debianpackage-linux-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-reload-linux-debug-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-reload-linux-release-x64"
   schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "debianpackage-linux-stable"
-  }
-}
-
-job {
-  id: "front-end-linux-release-x64-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-linux-release-x64-stable"
-  }
-}
-
-job {
-  id: "front-end-mac-release-x64-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-mac-release-x64-stable"
-  }
-}
-
-job {
-  id: "front-end-win-release-x64-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-win-release-x64-stable"
-  }
-}
-
-job {
-  id: "gclient-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "gclient-stable"
-  }
-}
-
-job {
-  id: "pkg-linux-release-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-linux-release-stable"
-  }
-}
-
-job {
-  id: "pkg-mac-release-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-mac-release-stable"
-  }
-}
-
-job {
-  id: "pkg-win-release-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-win-release-stable"
-  }
-}
-
-job {
-  id: "versionchecker-linux-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "versionchecker-linux-stable"
-  }
-}
-
-job {
-  id: "vm-canary-linux-debug-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-canary-linux-debug-stable"
-  }
-}
-
-job {
-  id: "vm-dartkb-linux-debug-simarm64-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-debug-simarm64-stable"
-  }
-}
-
-job {
-  id: "vm-dartkb-linux-debug-x64-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-debug-x64-stable"
-  }
-}
-
-job {
-  id: "vm-dartkb-linux-product-simarm64-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-product-simarm64-stable"
-  }
-}
-
-job {
-  id: "vm-dartkb-linux-product-x64-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-product-x64-stable"
-  }
-}
-
-job {
-  id: "vm-dartkb-linux-release-simarm64-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-simarm64-stable"
-  }
-}
-
-job {
-  id: "vm-dartkb-linux-release-x64-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-x64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-asan-linux-release-x64-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-asan-linux-release-x64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-checked-linux-release-x64-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-checked-linux-release-x64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-linux-debug-ia32-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-ia32-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-linux-debug-simdbc64-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-reload-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-reload-linux-release-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-simdbc64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-linux-debug-x64-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-reload-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-reload-linux-release-x64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-x64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-linux-product-x64-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-reload-linux-release-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-reload-mac-debug-simdbc64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-product-x64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-linux-release-ia32-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-reload-mac-debug-simdbc64"
+  >
+>
+job: <
+  id: "vm-kernel-reload-mac-debug-simdbc64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-ia32-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-linux-release-simarm-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-reload-mac-debug-simdbc64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-reload-mac-debug-simdbc64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-linux-release-simarm64-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-reload-mac-debug-simdbc64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-reload-mac-release-simdbc64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-linux-release-simdbc64-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-reload-mac-release-simdbc64"
+  >
+>
+job: <
+  id: "vm-kernel-reload-mac-release-simdbc64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simdbc64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-linux-release-x64-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-reload-mac-release-simdbc64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-reload-mac-release-simdbc64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-x64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-mac-debug-simdbc64-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-reload-mac-release-simdbc64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-reload-rollback-linux-debug-x64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-debug-simdbc64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-mac-debug-x64-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-reload-rollback-linux-debug-x64"
+  >
+>
+job: <
+  id: "vm-kernel-reload-rollback-linux-debug-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-debug-x64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-mac-product-x64-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-reload-rollback-linux-debug-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-reload-rollback-linux-debug-x64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-product-x64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-mac-release-simdbc64-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-reload-rollback-linux-debug-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-reload-rollback-linux-release-x64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-release-simdbc64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-mac-release-x64-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-reload-rollback-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-reload-rollback-linux-release-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-release-x64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-reload-rollback-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-reload-rollback-linux-release-x64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-reload-rollback-linux-release-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-win-debug-ia32"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-android-release-arm-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-win-debug-ia32"
+  >
+>
+job: <
+  id: "vm-kernel-win-debug-ia32-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-bare-linux-release-x64-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-win-debug-ia32-dev"
+  >
+>
+job: <
+  id: "vm-kernel-win-debug-ia32-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-bare-linux-release-x64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-bare-linux-release-simarm-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-win-debug-ia32-stable"
+  >
+>
+job: <
+  id: "vm-kernel-win-debug-x64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-bare-linux-release-simarm-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-win-debug-x64"
+  >
+>
+job: <
+  id: "vm-kernel-win-debug-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-linux-debug-x64-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-win-debug-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-win-debug-x64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-linux-product-x64-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-win-debug-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-win-product-x64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-product-x64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-linux-release-simarm-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-win-product-x64"
+  >
+>
+job: <
+  id: "vm-kernel-win-product-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-linux-release-simarm64-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-win-product-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-win-product-x64-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-linux-release-x64-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-win-product-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-win-release-ia32"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-x64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-mac-release-simarm64-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-win-release-ia32"
+  >
+>
+job: <
+  id: "vm-kernel-win-release-ia32-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-mac-release-simarm64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-win-release-ia32-dev"
+  >
+>
+job: <
+  id: "vm-kernel-win-release-ia32-stable"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-win-release-simarm64-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-win-release-ia32-stable"
+  >
+>
+job: <
+  id: "vm-kernel-win-release-x64"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-simarm64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-precomp-win-release-x64-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-win-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-win-release-x64-dev"
   schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-x64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-reload-linux-debug-x64-stable"
-  acl_sets: "default"
+    builder: "vm-kernel-win-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-win-release-x64-stable"
   schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-linux-debug-x64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-reload-linux-release-x64-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-linux-release-x64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-reload-mac-debug-simdbc64-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-mac-debug-simdbc64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-reload-mac-release-simdbc64-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-mac-release-simdbc64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-reload-rollback-linux-debug-x64-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-debug-x64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-reload-rollback-linux-release-x64-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-release-x64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-win-debug-ia32-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-debug-ia32-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-win-debug-x64-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-debug-x64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-win-product-x64-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-product-x64-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-win-release-ia32-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-release-ia32-stable"
-  }
-}
-
-job {
-  id: "vm-kernel-win-release-x64-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
+  acl_sets: "ci.sandbox"
+  buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-release-x64-stable"
-  }
-}
-
-job {
-  id: "vm-ffi-android-debug-arm64-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-debug-arm64-stable"
-  }
-}
-
-job {
-  id: "vm-ffi-android-debug-arm-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-debug-arm-stable"
-  }
-}
-
-job {
-  id: "vm-ffi-android-release-arm64-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-release-arm64-stable"
-  }
-}
-
-job {
-  id: "vm-ffi-android-release-arm-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-release-arm-stable"
-  }
-}
-
-job {
-  id: "vm-ffi-android-product-arm64-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-product-arm64-stable"
-  }
-}
-
-job {
-  id: "vm-ffi-android-product-arm-stable"
-  acl_sets: "default"
-  schedule: "triggered"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-product-arm-stable"
-  }
-}
+  >
+>
+trigger: <
+  id: "dart-flutter-engine-trigger"
+  acl_sets: "ci"
+  triggers: "linearize-flutter"
+  gitiles: <
+    repo: "https://dart.googlesource.com/external/github.com/flutter/engine"
+    refs: "regexp:refs/heads/master"
+  >
+>
+trigger: <
+  id: "dart-flutter-flutter-trigger"
+  acl_sets: "ci"
+  triggers: "linearize-flutter"
+  gitiles: <
+    repo: "https://dart.googlesource.com/external/github.com/flutter/flutter"
+    refs: "regexp:refs/heads/master"
+  >
+>
+trigger: <
+  id: "dart-gitiles-trigger-analyzer-stable"
+  acl_sets: "ci"
+  triggers: "analyzer-analysis-server-linux-analyzer-stable"
+  triggers: "analyzer-linux-release-analyzer-stable"
+  triggers: "analyzer-mac-release-analyzer-stable"
+  triggers: "analyzer-win-release-analyzer-stable"
+  gitiles: <
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/analyzer-stable"
+  >
+>
+trigger: <
+  id: "dart-gitiles-trigger-dev"
+  acl_sets: "ci"
+  triggers: "dart-sdk-linux-dev"
+  triggers: "dart-sdk-mac-dev"
+  triggers: "dart-sdk-win-dev"
+  triggers: "debianpackage-linux-dev"
+  triggers: "versionchecker-linux-dev"
+  triggers: "analyzer-analysis-server-linux-dev"
+  triggers: "analyzer-linux-release-dev"
+  triggers: "analyzer-mac-release-dev"
+  triggers: "analyzer-win-release-dev"
+  triggers: "app-kernel-linux-debug-x64-dev"
+  triggers: "app-kernel-linux-product-x64-dev"
+  triggers: "app-kernel-linux-release-x64-dev"
+  triggers: "cross-vm-linux-release-arm64-dev"
+  triggers: "dart2js-csp-minified-linux-x64-chrome-dev"
+  triggers: "dart2js-minified-strong-linux-x64-d8-dev"
+  triggers: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
+  triggers: "dart2js-strong-linux-x64-chrome-dev"
+  triggers: "dart2js-strong-linux-x64-firefox-dev"
+  triggers: "dart2js-strong-mac-x64-chrome-dev"
+  triggers: "dart2js-strong-mac-x64-safari-dev"
+  triggers: "dart2js-strong-win-x64-chrome-dev"
+  triggers: "dart2js-strong-win-x64-firefox-dev"
+  triggers: "dart2js-strong-win-x64-ie11-dev"
+  triggers: "dart2js-unit-linux-x64-release-dev"
+  triggers: "ddc-linux-release-chrome-dev"
+  triggers: "ddc-mac-release-chrome-dev"
+  triggers: "ddc-win-release-chrome-dev"
+  triggers: "front-end-linux-release-x64-dev"
+  triggers: "front-end-mac-release-x64-dev"
+  triggers: "front-end-win-release-x64-dev"
+  triggers: "gclient-dev"
+  triggers: "pkg-linux-release-dev"
+  triggers: "pkg-mac-release-dev"
+  triggers: "pkg-win-release-dev"
+  triggers: "vm-canary-linux-debug-dev"
+  triggers: "vm-dartkb-linux-debug-simarm64-dev"
+  triggers: "vm-dartkb-linux-debug-x64-dev"
+  triggers: "vm-dartkb-linux-product-simarm64-dev"
+  triggers: "vm-dartkb-linux-product-x64-dev"
+  triggers: "vm-dartkb-linux-release-simarm64-dev"
+  triggers: "vm-dartkb-linux-release-x64-dev"
+  triggers: "vm-ffi-android-debug-arm-dev"
+  triggers: "vm-ffi-android-product-arm-dev"
+  triggers: "vm-ffi-android-release-arm-dev"
+  triggers: "vm-kernel-asan-linux-release-x64-dev"
+  triggers: "vm-kernel-checked-linux-release-x64-dev"
+  triggers: "vm-kernel-linux-debug-ia32-dev"
+  triggers: "vm-kernel-linux-debug-simdbc64-dev"
+  triggers: "vm-kernel-linux-debug-x64-dev"
+  triggers: "vm-kernel-linux-product-x64-dev"
+  triggers: "vm-kernel-linux-release-ia32-dev"
+  triggers: "vm-kernel-linux-release-simarm-dev"
+  triggers: "vm-kernel-linux-release-simarm64-dev"
+  triggers: "vm-kernel-linux-release-simdbc64-dev"
+  triggers: "vm-kernel-linux-release-x64-dev"
+  triggers: "vm-kernel-mac-debug-simdbc64-dev"
+  triggers: "vm-kernel-mac-debug-x64-dev"
+  triggers: "vm-kernel-mac-product-x64-dev"
+  triggers: "vm-kernel-mac-release-simdbc64-dev"
+  triggers: "vm-kernel-mac-release-x64-dev"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-android-release-arm-dev"
+  triggers: "vm-kernel-precomp-bare-linux-release-simarm-dev"
+  triggers: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-bare-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-linux-debug-x64-dev"
+  triggers: "vm-kernel-precomp-linux-product-x64-dev"
+  triggers: "vm-kernel-precomp-linux-release-simarm-dev"
+  triggers: "vm-kernel-precomp-linux-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-mac-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-win-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-win-release-x64-dev"
+  triggers: "vm-kernel-reload-linux-debug-x64-dev"
+  triggers: "vm-kernel-reload-linux-release-x64-dev"
+  triggers: "vm-kernel-reload-mac-debug-simdbc64-dev"
+  triggers: "vm-kernel-reload-mac-release-simdbc64-dev"
+  triggers: "vm-kernel-reload-rollback-linux-debug-x64-dev"
+  triggers: "vm-kernel-reload-rollback-linux-release-x64-dev"
+  triggers: "vm-kernel-win-debug-ia32-dev"
+  triggers: "vm-kernel-win-debug-x64-dev"
+  triggers: "vm-kernel-win-product-x64-dev"
+  triggers: "vm-kernel-win-release-ia32-dev"
+  triggers: "vm-kernel-win-release-x64-dev"
+  gitiles: <
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/dev"
+  >
+>
+trigger: <
+  id: "dart-gitiles-trigger-flutter"
+  acl_sets: "ci"
+  triggers: "flutter-engine-linux"
+  gitiles: <
+    repo: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
+    refs: "regexp:refs/heads/master"
+  >
+>
+trigger: <
+  id: "dart-gitiles-trigger-master"
+  acl_sets: "ci"
+  triggers: "dart-sdk-linux"
+  triggers: "dart-sdk-mac"
+  triggers: "dart-sdk-win"
+  triggers: "debianpackage-linux"
+  triggers: "linearize-flutter"
+  triggers: "versionchecker-linux"
+  triggers: "analyzer-analysis-server-linux"
+  triggers: "analyzer-linux-release"
+  triggers: "analyzer-mac-release"
+  triggers: "analyzer-win-release"
+  triggers: "app-kernel-linux-debug-x64"
+  triggers: "app-kernel-linux-product-x64"
+  triggers: "app-kernel-linux-release-x64"
+  triggers: "cross-vm-linux-release-arm64"
+  triggers: "dart2js-csp-minified-linux-x64-chrome"
+  triggers: "dart2js-minified-strong-linux-x64-d8"
+  triggers: "dart2js-strong-hostasserts-linux-ia32-d8"
+  triggers: "dart2js-strong-linux-x64-chrome"
+  triggers: "dart2js-strong-linux-x64-firefox"
+  triggers: "dart2js-strong-mac-x64-chrome"
+  triggers: "dart2js-strong-mac-x64-safari"
+  triggers: "dart2js-strong-win-x64-chrome"
+  triggers: "dart2js-strong-win-x64-firefox"
+  triggers: "dart2js-strong-win-x64-ie11"
+  triggers: "dart2js-unit-linux-x64-release"
+  triggers: "ddc-linux-release-chrome"
+  triggers: "ddc-mac-release-chrome"
+  triggers: "ddc-win-release-chrome"
+  triggers: "flutter-analyze"
+  triggers: "flutter-frontend"
+  triggers: "front-end-linux-release-x64"
+  triggers: "front-end-mac-release-x64"
+  triggers: "front-end-win-release-x64"
+  triggers: "gclient"
+  triggers: "pkg-linux-debug"
+  triggers: "pkg-linux-release"
+  triggers: "pkg-mac-release"
+  triggers: "pkg-win-release"
+  triggers: "vm-canary-linux-debug"
+  triggers: "vm-dartkb-linux-debug-simarm64"
+  triggers: "vm-dartkb-linux-debug-x64"
+  triggers: "vm-dartkb-linux-product-simarm64"
+  triggers: "vm-dartkb-linux-product-x64"
+  triggers: "vm-dartkb-linux-release-simarm64"
+  triggers: "vm-dartkb-linux-release-x64"
+  triggers: "vm-ffi-android-debug-arm"
+  triggers: "vm-ffi-android-product-arm"
+  triggers: "vm-ffi-android-release-arm"
+  triggers: "vm-kernel-asan-linux-release-x64"
+  triggers: "vm-kernel-checked-linux-release-x64"
+  triggers: "vm-kernel-linux-debug-ia32"
+  triggers: "vm-kernel-linux-debug-simdbc64"
+  triggers: "vm-kernel-linux-debug-x64"
+  triggers: "vm-kernel-linux-product-x64"
+  triggers: "vm-kernel-linux-release-ia32"
+  triggers: "vm-kernel-linux-release-simarm"
+  triggers: "vm-kernel-linux-release-simarm64"
+  triggers: "vm-kernel-linux-release-simdbc64"
+  triggers: "vm-kernel-linux-release-x64"
+  triggers: "vm-kernel-mac-debug-simdbc64"
+  triggers: "vm-kernel-mac-debug-x64"
+  triggers: "vm-kernel-mac-product-x64"
+  triggers: "vm-kernel-mac-release-simdbc64"
+  triggers: "vm-kernel-mac-release-x64"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
+  triggers: "vm-kernel-precomp-android-release-arm"
+  triggers: "vm-kernel-precomp-bare-linux-release-simarm"
+  triggers: "vm-kernel-precomp-bare-linux-release-simarm64"
+  triggers: "vm-kernel-precomp-bare-linux-release-x64"
+  triggers: "vm-kernel-precomp-linux-debug-x64"
+  triggers: "vm-kernel-precomp-linux-product-x64"
+  triggers: "vm-kernel-precomp-linux-release-simarm"
+  triggers: "vm-kernel-precomp-linux-release-simarm64"
+  triggers: "vm-kernel-precomp-linux-release-x64"
+  triggers: "vm-kernel-precomp-mac-release-simarm64"
+  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64"
+  triggers: "vm-kernel-precomp-win-release-simarm64"
+  triggers: "vm-kernel-precomp-win-release-x64"
+  triggers: "vm-kernel-reload-linux-debug-x64"
+  triggers: "vm-kernel-reload-linux-release-x64"
+  triggers: "vm-kernel-reload-mac-debug-simdbc64"
+  triggers: "vm-kernel-reload-mac-release-simdbc64"
+  triggers: "vm-kernel-reload-rollback-linux-debug-x64"
+  triggers: "vm-kernel-reload-rollback-linux-release-x64"
+  triggers: "vm-kernel-win-debug-ia32"
+  triggers: "vm-kernel-win-debug-x64"
+  triggers: "vm-kernel-win-product-x64"
+  triggers: "vm-kernel-win-release-ia32"
+  triggers: "vm-kernel-win-release-x64"
+  gitiles: <
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/master"
+  >
+>
+trigger: <
+  id: "dart-gitiles-trigger-stable"
+  acl_sets: "ci"
+  triggers: "dart-sdk-linux-stable"
+  triggers: "dart-sdk-mac-stable"
+  triggers: "dart-sdk-win-stable"
+  triggers: "debianpackage-linux-stable"
+  triggers: "versionchecker-linux-stable"
+  triggers: "analyzer-analysis-server-linux-stable"
+  triggers: "analyzer-linux-release-stable"
+  triggers: "analyzer-mac-release-stable"
+  triggers: "analyzer-win-release-stable"
+  triggers: "app-kernel-linux-debug-x64-stable"
+  triggers: "app-kernel-linux-product-x64-stable"
+  triggers: "app-kernel-linux-release-x64-stable"
+  triggers: "cross-vm-linux-release-arm64-stable"
+  triggers: "dart2js-csp-minified-linux-x64-chrome-stable"
+  triggers: "dart2js-minified-strong-linux-x64-d8-stable"
+  triggers: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
+  triggers: "dart2js-strong-linux-x64-chrome-stable"
+  triggers: "dart2js-strong-linux-x64-firefox-stable"
+  triggers: "dart2js-strong-mac-x64-chrome-stable"
+  triggers: "dart2js-strong-mac-x64-safari-stable"
+  triggers: "dart2js-strong-win-x64-chrome-stable"
+  triggers: "dart2js-strong-win-x64-firefox-stable"
+  triggers: "dart2js-strong-win-x64-ie11-stable"
+  triggers: "dart2js-unit-linux-x64-release-stable"
+  triggers: "ddc-linux-release-chrome-stable"
+  triggers: "ddc-mac-release-chrome-stable"
+  triggers: "ddc-win-release-chrome-stable"
+  triggers: "front-end-linux-release-x64-stable"
+  triggers: "front-end-mac-release-x64-stable"
+  triggers: "front-end-win-release-x64-stable"
+  triggers: "gclient-stable"
+  triggers: "pkg-linux-release-stable"
+  triggers: "pkg-mac-release-stable"
+  triggers: "pkg-win-release-stable"
+  triggers: "vm-canary-linux-debug-stable"
+  triggers: "vm-dartkb-linux-debug-simarm64-stable"
+  triggers: "vm-dartkb-linux-debug-x64-stable"
+  triggers: "vm-dartkb-linux-product-simarm64-stable"
+  triggers: "vm-dartkb-linux-product-x64-stable"
+  triggers: "vm-dartkb-linux-release-simarm64-stable"
+  triggers: "vm-dartkb-linux-release-x64-stable"
+  triggers: "vm-ffi-android-debug-arm-stable"
+  triggers: "vm-ffi-android-product-arm-stable"
+  triggers: "vm-ffi-android-release-arm-stable"
+  triggers: "vm-kernel-asan-linux-release-x64-stable"
+  triggers: "vm-kernel-checked-linux-release-x64-stable"
+  triggers: "vm-kernel-linux-debug-ia32-stable"
+  triggers: "vm-kernel-linux-debug-simdbc64-stable"
+  triggers: "vm-kernel-linux-debug-x64-stable"
+  triggers: "vm-kernel-linux-product-x64-stable"
+  triggers: "vm-kernel-linux-release-ia32-stable"
+  triggers: "vm-kernel-linux-release-simarm-stable"
+  triggers: "vm-kernel-linux-release-simarm64-stable"
+  triggers: "vm-kernel-linux-release-simdbc64-stable"
+  triggers: "vm-kernel-linux-release-x64-stable"
+  triggers: "vm-kernel-mac-debug-simdbc64-stable"
+  triggers: "vm-kernel-mac-debug-x64-stable"
+  triggers: "vm-kernel-mac-product-x64-stable"
+  triggers: "vm-kernel-mac-release-simdbc64-stable"
+  triggers: "vm-kernel-mac-release-x64-stable"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
+  triggers: "vm-kernel-precomp-android-release-arm-stable"
+  triggers: "vm-kernel-precomp-bare-linux-release-simarm-stable"
+  triggers: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
+  triggers: "vm-kernel-precomp-bare-linux-release-x64-stable"
+  triggers: "vm-kernel-precomp-linux-debug-x64-stable"
+  triggers: "vm-kernel-precomp-linux-product-x64-stable"
+  triggers: "vm-kernel-precomp-linux-release-simarm-stable"
+  triggers: "vm-kernel-precomp-linux-release-simarm64-stable"
+  triggers: "vm-kernel-precomp-linux-release-x64-stable"
+  triggers: "vm-kernel-precomp-mac-release-simarm64-stable"
+  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+  triggers: "vm-kernel-precomp-win-release-simarm64-stable"
+  triggers: "vm-kernel-precomp-win-release-x64-stable"
+  triggers: "vm-kernel-reload-linux-debug-x64-stable"
+  triggers: "vm-kernel-reload-linux-release-x64-stable"
+  triggers: "vm-kernel-reload-mac-debug-simdbc64-stable"
+  triggers: "vm-kernel-reload-mac-release-simdbc64-stable"
+  triggers: "vm-kernel-reload-rollback-linux-debug-x64-stable"
+  triggers: "vm-kernel-reload-rollback-linux-release-x64-stable"
+  triggers: "vm-kernel-win-debug-ia32-stable"
+  triggers: "vm-kernel-win-debug-x64-stable"
+  triggers: "vm-kernel-win-product-x64-stable"
+  triggers: "vm-kernel-win-release-ia32-stable"
+  triggers: "vm-kernel-win-release-x64-stable"
+  gitiles: <
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/stable"
+  >
+>
+acl_sets: <
+  name: "ci"
+  acls: <
+    role: OWNER
+    granted_to: "group:project-dart-admins"
+  >
+  acls: <
+    granted_to: "group:all"
+  >
+>
+acl_sets: <
+  name: "ci.sandbox"
+  acls: <
+    role: OWNER
+    granted_to: "group:project-dart-admins"
+  >
+  acls: <
+    granted_to: "group:all"
+  >
+>
diff --git a/main.star b/main.star
new file mode 100755
index 000000000000..dab5a45c16a9
--- /dev/null
+++ b/main.star
@@ -0,0 +1,753 @@
+#!/usr/bin/env lucicfg
+
+# Copyright (c) 2019 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+#
+# https://chromium.googlesource.com/infra/luci/luci-go/+/master/lucicfg/doc/
+
+DART_GIT = "https://dart.googlesource.com/sdk"
+DART_GERRIT = "https://dart-review.googlesource.com/sdk"
+
+RELEASE_CHANNELS = ["dev", "stable"]
+CHANNELS = RELEASE_CHANNELS + ["try"]
+ANALYZER_CHANNELS = ["analyzer-stable"] + CHANNELS
+
+
+def mac():
+    return {"os": "Mac"}
+
+
+def windows():
+    return {"os": "Windows"}
+
+
+CI_ACCOUNT = "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+TRY_ACCOUNT = "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+CI_TRIGGERERS = ["luci-scheduler@appspot.gserviceaccount.com", CI_ACCOUNT]
+
+
+lucicfg.config(
+    config_dir = ".",
+    tracked_files = [
+        "commit-queue.cfg",
+        "cr-buildbucket.cfg",
+        "luci-logdog.cfg",
+        "luci-milo.cfg",
+        "luci-notify.cfg",
+        "luci-scheduler.cfg",
+        "project.cfg",
+    ],
+)
+
+luci.project(
+    name="dart",
+    buildbucket="cr-buildbucket.appspot.com",
+    logdog="luci-logdog.appspot.com",
+    milo="luci-milo.appspot.com",
+    notify="luci-notify.appspot.com",
+    scheduler="luci-scheduler.appspot.com",
+    swarming="chromium-swarm.appspot.com",
+    acls=[
+        acl.entry(
+            [
+                acl.BUILDBUCKET_READER, acl.LOGDOG_READER,
+                acl.PROJECT_CONFIGS_READER, acl.SCHEDULER_READER
+            ],
+            groups=["all"],
+        ),
+        acl.entry(acl.LOGDOG_WRITER, groups=["luci-logdog-chromium-writers"]),
+        acl.entry([acl.SCHEDULER_OWNER, acl.BUILDBUCKET_TRIGGERER],
+                  groups=["project-dart-admins"]),
+        acl.entry(acl.CQ_COMMITTER, groups=["project-dart-committers"]),
+        acl.entry(acl.CQ_DRY_RUNNER, groups=["project-dart-tryjob-access"]),
+    ],
+)
+
+luci.milo(
+    logo="https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png",
+)
+
+luci.console_view(
+    name="analyzer-stable",
+    repo="https://dart.googlesource.com/sdk",
+    title="SDK Analyzer Stable Branch Console",
+    refs=["refs/heads/analyzer-stable"],
+    header="console-header.textpb",
+)
+
+luci.console_view(
+    name="be",
+    repo="https://dart.googlesource.com/sdk",
+    title="SDK Bleeding Edge Console",
+    refs=["refs/heads/master"],
+    header="console-header.textpb",
+)
+
+luci.console_view(
+    name="alt",
+    repo="https://dart.googlesource.com/sdk",
+    title="SDK Bleeding Edge Console (alternative)",
+    refs=["refs/heads/master"],
+    header="console-header.textpb",
+)
+
+luci.console_view(
+    name="dev",
+    repo="https://dart.googlesource.com/sdk",
+    title="SDK Dev Console",
+    refs=["refs/heads/dev"],
+    header="console-header.textpb",
+)
+
+luci.console_view(
+    name="stable",
+    repo="https://dart.googlesource.com/sdk",
+    title="SDK Stable Console",
+    refs=["refs/heads/stable"],
+    header="console-header.textpb",
+)
+
+luci.console_view(
+    name="flutter",
+    repo=DART_GIT,
+    title="Dart/Flutter Console",
+    refs=["refs/heads/master"],
+)
+
+luci.console_view(
+    name="flutter-hhh",
+    repo="https://dart.googlesource.com/linear_sdk_flutter_engine",
+    title="Dart/Flutter Linear History Console",
+    refs=["refs/heads/master"],
+)
+
+luci.console_view(
+    name="fyi",
+    repo=DART_GIT,
+    title="SDK FYI Console",
+    refs=["refs/heads/master"],
+)
+
+luci.list_view(
+    name="cq",
+    title="SDK CQ Console",
+)
+
+luci.logdog(gs_bucket="chromium-luci-logdog")
+
+luci.bucket(
+    name="ci",
+    acls=[
+        acl.entry(acl.BUILDBUCKET_TRIGGERER, users=CI_TRIGGERERS),
+    ],
+)
+luci.bucket(
+    name="ci.sandbox",
+    acls=[
+        acl.entry(acl.BUILDBUCKET_TRIGGERER, users=CI_TRIGGERERS),
+    ],
+)
+luci.bucket(
+    name="try",
+    acls=[
+        acl.entry(acl.BUILDBUCKET_TRIGGERER,
+                  groups=["project-dart-tryjob-access", "service-account-cq"]),
+    ],
+)
+
+luci.gitiles_poller(
+    name="dart-gitiles-trigger-flutter",
+    bucket="ci",
+    repo="https://dart.googlesource.com/linear_sdk_flutter_engine/",
+    refs=["refs/heads/master"],
+)
+
+luci.gitiles_poller(
+    name="dart-gitiles-trigger-master",
+    bucket="ci",
+    repo=DART_GIT,
+    refs=["refs/heads/master"],
+)
+
+luci.gitiles_poller(
+    name="dart-gitiles-trigger-dev",
+    bucket="ci",
+    repo=DART_GIT,
+    refs=["refs/heads/dev"],
+)
+
+luci.gitiles_poller(
+    name="dart-gitiles-trigger-stable",
+    bucket="ci",
+    repo=DART_GIT,
+    refs=["refs/heads/stable"],
+)
+
+luci.gitiles_poller(
+    name="dart-gitiles-trigger-analyzer-stable",
+    bucket="ci",
+    repo=DART_GIT,
+    refs=["refs/heads/analyzer-stable"],
+)
+
+luci.gitiles_poller(
+    name="dart-flutter-engine-trigger",
+    bucket="ci",
+    repo="https://dart.googlesource.com/external/github.com/flutter/engine",
+    refs=["refs/heads/master"],
+)
+
+luci.gitiles_poller(
+    name="dart-flutter-flutter-trigger",
+    bucket="ci",
+    repo="https://dart.googlesource.com/external/github.com/flutter/flutter",
+    refs=["refs/heads/master"],
+)
+
+luci.notifier(name="infra",
+              on_new_failure=True,
+              notify_emails=[
+                  "athom@google.com", "sortie@google.com", "whesse@google.com"
+              ])
+
+luci.notifier(name="dart",
+              on_new_failure=True,
+              notify_emails=["athom@google.com"],
+              notify_blamelist=True)
+
+luci.notifier(name="dart-fuzz-testing",
+              on_success=True,
+              on_failure=True,
+              notify_emails=["ajcbik@google.com", "athom@google.com"])
+
+luci.cq(
+    submit_max_burst=2,
+    submit_burst_delay=8 * time.minute,
+)
+
+luci.cq_group(
+    name="sdk",
+    watch=cq.refset(DART_GERRIT, refs=["refs/heads/.+"]),
+    allow_submit_with_open_deps=True,
+    tree_status_host="dart-status.appspot.com",
+    retry_config=cq.RETRY_NONE,
+    verifiers=None,
+)
+
+
+def dart_recipe(name):
+    return luci.recipe(
+        name="dart/" + name,
+        cipd_package=
+        "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",
+    )
+
+
+def dart_try_builder(name,
+                     recipe="neo",
+                     dimensions={},
+                     experiment_percentage=None,
+                     location_regexp=None,
+                     properties={},
+                     on_cq=False):
+    dimensions = dict(dimensions)
+    dimensions["pool"] = "luci.dart.try"
+    dimensions.setdefault("os", "Linux")
+    dimensions.setdefault("cpu", "x86-64")
+    properties.setdefault("clobber", "true")
+    builder = name + "-try"
+
+    luci.builder(
+        name=builder,
+        build_numbers=True,
+        bucket="try",
+        caches=[swarming.cache("browsers")],
+        dimensions=dimensions,
+        executable=dart_recipe(recipe),
+        priority=30,
+        properties=properties,
+        service_account=TRY_ACCOUNT,
+        swarming_tags=["vpython:native-python-wrapper"],
+    )
+    if on_cq:
+        luci.cq_tryjob_verifier(builder=builder,
+                                cq_group='sdk',
+                                experiment_percentage=experiment_percentage,
+                                location_regexp=location_regexp)
+        luci.list_view_entry(
+            list_view="cq",
+            builder=builder,
+        )
+
+
+postponed_alt_console_entries = []
+
+
+def dart_builder(name,
+                 bucket,
+                 recipe="neo",
+                 enabled=True,
+                 category=None,
+                 channels=[],
+                 dimensions={},
+                 cpu="x86-64",
+                 fyi=False,
+                 notifies="dart",
+                 priority=50,
+                 properties={},
+                 schedule="triggered",
+                 service_account=TRY_ACCOUNT,
+                 triggered_by=None,
+                 triggering_policy=None,
+                 on_cq=False,
+                 experiment_percentage=None,
+                 location_regexp=None):
+    dimensions.setdefault("os", "Linux")
+    dimensions.setdefault("pool", "luci.dart.try")
+    dimensions["cpu"] = cpu
+    properties.setdefault("clobber", "true")
+
+    def builder(channel=None):
+        if channel == "try":
+            dart_try_builder(name,
+                             recipe=recipe,
+                             dimensions=dimensions,
+                             properties=properties,
+                             on_cq=on_cq,
+                             experiment_percentage=experiment_percentage,
+                             location_regexp=location_regexp)
+        else:
+            builder = name + "-" + channel if channel else name
+            luci.builder(
+                name=builder,
+                build_numbers=True,
+                bucket=bucket,
+                caches=[swarming.cache("browsers")],
+                dimensions=dimensions,
+                executable=dart_recipe(recipe),
+                priority=priority,
+                properties=properties,
+                notifies=[notifies]
+                if notifies and not channel and enabled else None,
+                schedule=schedule if enabled else None,
+                service_account=service_account,
+                swarming_tags=["vpython:native-python-wrapper"],
+                triggered_by=triggered_by or
+                (["dart-gitiles-trigger-" + (channel if channel else "master")]
+                 if enabled and schedule == "triggered" else None),
+                triggering_policy=triggering_policy)
+            if category:
+                console_category, _, short_name = category.rpartition("|")
+                toplevel_category, _, _ = console_category.partition("|")
+                console = channel or "be" if not fyi else "fyi"
+                luci.console_view_entry(
+                    builder=builder,
+                    short_name=short_name,
+                    category=console_category,
+                    console_view=console,
+                )
+                if console == "be":
+                    if toplevel_category == "vm":
+                        postponed_alt_console_entries.append({
+                            "builder":
+                            builder,
+                            "short_name":
+                            short_name,
+                            "category":
+                            console_category,
+                        })
+                    else:
+                        luci.console_view_entry(
+                            builder=builder,
+                            short_name=short_name,
+                            category=console_category,
+                            console_view="alt",
+                        )
+
+    builder()
+    for channel in channels:
+        if enabled:
+            builder(channel)
+
+
+def dart_ci_builder(name, dimensions={}, **kwargs):
+    dimensions.setdefault("pool", "luci.dart.ci")
+    dart_builder(name,
+                 bucket="ci",
+                 dimensions=dimensions,
+                 service_account=CI_ACCOUNT,
+                 **kwargs)
+
+
+def dart_ci_sandbox_builder(name,
+                            channels=CHANNELS,
+                            properties={},
+                            **kwargs):
+    if not properties.setdefault("new_workflow_enabled", True):
+        properties.pop("new_workflow_enabled")
+
+    dart_builder(name,
+                 bucket="ci.sandbox",
+                 channels=channels,
+                 properties=properties,
+                 service_account=TRY_ACCOUNT,
+                 **kwargs)
+
+
+# fasta
+dart_ci_sandbox_builder("front-end-linux-release-x64",
+                        category="fasta|l",
+                        on_cq=True)
+dart_ci_sandbox_builder("front-end-mac-release-x64",
+                        category="fasta|m",
+                        dimensions=mac())
+dart_ci_sandbox_builder("front-end-win-release-x64",
+                        category="fasta|w",
+                        dimensions=windows())
+dart_ci_sandbox_builder("flutter-frontend",
+                        category="fasta|fl",
+                        channels=["try"],
+                        properties={"new_workflow_enabled": False},
+                        notifies=None)
+
+# flutter
+dart_ci_sandbox_builder(
+    "flutter-engine-linux",
+    recipe="flutter_engine",
+    category="flutter|3H",
+    channels=[],
+    properties={"new_workflow_enabled": False},
+    triggered_by=["dart-gitiles-trigger-flutter"],
+    triggering_policy=scheduler.greedy_batching(max_concurrent_invocations=5,
+                                                max_batch_size=1),
+)
+
+# vm|app-kernel
+dart_ci_sandbox_builder("app-kernel-linux-debug-x64",
+                        category="vm|app-kernel|d64")
+dart_ci_sandbox_builder("app-kernel-linux-product-x64",
+                        category="vm|app-kernel|p64")
+dart_ci_sandbox_builder("app-kernel-linux-release-x64",
+                        category="vm|app-kernel|r64")
+
+# vm|dartkb
+dart_ci_sandbox_builder("vm-dartkb-linux-debug-simarm64",
+                        category="vm|dartkb|sd")
+dart_ci_sandbox_builder("vm-dartkb-linux-debug-x64", category="vm|dartkb|d")
+dart_ci_sandbox_builder("vm-dartkb-linux-product-simarm64",
+                        category="vm|dartkb|sp")
+dart_ci_sandbox_builder("vm-dartkb-linux-product-x64", category="vm|dartkb|p")
+dart_ci_sandbox_builder("vm-dartkb-linux-release-simarm64",
+                        category="vm|dartkb|sr")
+dart_ci_sandbox_builder("vm-dartkb-linux-release-x64", category="vm|dartkb|r")
+
+#vm|kernel
+dart_ci_sandbox_builder("vm-canary-linux-debug",
+                        category="vm|kernel|c",
+                        on_cq=True)
+dart_ci_sandbox_builder("vm-kernel-linux-debug-x64", category="vm|kernel|d")
+dart_ci_sandbox_builder("vm-kernel-linux-debug-simdbc64",
+                        category="vm|kernel|dbc")
+dart_ci_sandbox_builder("vm-kernel-linux-release-simarm",
+                        category="vm|kernel|a32")
+dart_ci_sandbox_builder("vm-kernel-linux-release-simarm64",
+                        category="vm|kernel|a64")
+dart_ci_sandbox_builder("vm-kernel-linux-release-simdbc64",
+                        category="vm|kernel|rbc",
+                        on_cq=True)
+dart_ci_sandbox_builder("vm-kernel-linux-release-ia32",
+                        category="vm|kernel|r32")
+dart_ci_sandbox_builder("vm-kernel-linux-release-x64",
+                        category="vm|kernel|r",
+                        on_cq=True)
+dart_ci_sandbox_builder("vm-kernel-checked-linux-release-x64",
+                        category="vm|kernel|rc")
+dart_ci_sandbox_builder("vm-kernel-linux-debug-ia32", category="vm|kernel|d32")
+dart_ci_sandbox_builder("vm-kernel-mac-debug-simdbc64",
+                        category="vm|kernel|mds",
+                        dimensions=mac())
+dart_ci_sandbox_builder("vm-kernel-mac-release-simdbc64",
+                        category="vm|kernel|mrs",
+                        dimensions=mac())
+dart_ci_sandbox_builder("vm-kernel-mac-debug-x64",
+                        category="vm|kernel|md",
+                        dimensions=mac())
+dart_ci_sandbox_builder("vm-kernel-mac-release-x64",
+                        category="vm|kernel|mr",
+                        dimensions=mac(),
+                        on_cq=True,
+                        experiment_percentage=5)
+dart_ci_sandbox_builder("vm-kernel-win-debug-ia32",
+                        category="vm|kernel|wd3",
+                        dimensions=windows())
+dart_ci_sandbox_builder("vm-kernel-win-debug-x64",
+                        category="vm|kernel|wd",
+                        dimensions=windows())
+dart_ci_sandbox_builder("vm-kernel-win-release-ia32",
+                        category="vm|kernel|wr3",
+                        dimensions=windows())
+dart_ci_sandbox_builder("vm-kernel-win-release-x64",
+                        category="vm|kernel|wr",
+                        dimensions=windows())
+dart_ci_sandbox_builder("cross-vm-linux-release-arm64",
+                        category="vm|kernel|cra",
+                        channels=RELEASE_CHANNELS)
+
+# vm|kernel-precomp
+dart_ci_sandbox_builder("vm-kernel-precomp-android-release-arm",
+                        category="vm|kernel-precomp|and",
+                        properties={"shard_timeout": 5400})  # 1.5h
+dart_ci_sandbox_builder("vm-kernel-precomp-linux-debug-x64",
+                        category="vm|kernel-precomp|d")
+dart_ci_sandbox_builder("vm-kernel-precomp-linux-product-x64",
+                        category="vm|kernel-precomp|p")
+dart_ci_sandbox_builder("vm-kernel-precomp-linux-release-simarm",
+                        category="vm|kernel-precomp|a32")
+dart_ci_sandbox_builder("vm-kernel-precomp-linux-release-simarm64",
+                        category="vm|kernel-precomp|a64")
+dart_ci_sandbox_builder("vm-kernel-precomp-linux-release-x64",
+                        category="vm|kernel-precomp|r")
+dart_ci_sandbox_builder("vm-kernel-precomp-bare-linux-release-x64",
+                        category="vm|kernel-precomp|br")
+dart_ci_sandbox_builder("vm-kernel-precomp-bare-linux-release-simarm",
+                        category="vm|kernel-precomp|bra32")
+dart_ci_sandbox_builder("vm-kernel-precomp-bare-linux-release-simarm64",
+                        category="vm|kernel-precomp|bra64")
+dart_ci_sandbox_builder("vm-kernel-precomp-obfuscate-linux-release-x64",
+                        category="vm|kernel-precomp|o")
+dart_ci_sandbox_builder("vm-kernel-precomp-mac-release-simarm64",
+                        category="vm|kernel-precomp|ma",
+                        dimensions=mac())
+dart_ci_sandbox_builder("vm-kernel-precomp-win-release-simarm64",
+                        category="vm|kernel-precomp|wa",
+                        dimensions=windows())
+dart_ci_sandbox_builder("vm-kernel-precomp-win-release-x64",
+                        category="vm|kernel-precomp|wr",
+                        dimensions=windows())
+
+# vm|misc
+dart_ci_sandbox_builder("vm-kernel-asan-linux-release-x64",
+                        category="vm|misc|a64")
+dart_ci_sandbox_builder("vm-kernel-optcounter-threshold-linux-release-ia32",
+                        category="vm|misc|o32")
+dart_ci_sandbox_builder("vm-kernel-optcounter-threshold-linux-release-x64",
+                        category="vm|misc|o64")
+
+# vm|product
+dart_ci_sandbox_builder("vm-kernel-linux-product-x64",
+                        category="vm|product|l",
+                        on_cq=True)
+dart_ci_sandbox_builder("vm-kernel-mac-product-x64",
+                        category="vm|product|m",
+                        dimensions=mac())
+dart_ci_sandbox_builder("vm-kernel-win-product-x64",
+                        category="vm|product|w",
+                        dimensions=windows())
+
+# vm|reload-kernel
+dart_ci_sandbox_builder("vm-kernel-reload-linux-debug-x64",
+                        category="vm|reload-kernel|d")
+dart_ci_sandbox_builder("vm-kernel-reload-linux-release-x64",
+                        category="vm|reload-kernel|r")
+dart_ci_sandbox_builder("vm-kernel-reload-mac-debug-simdbc64",
+                        category="vm|reload-kernel|md",
+                        dimensions=mac())
+dart_ci_sandbox_builder("vm-kernel-reload-mac-release-simdbc64",
+                        category="vm|reload-kernel|mr",
+                        dimensions=mac())
+dart_ci_sandbox_builder("vm-kernel-reload-rollback-linux-debug-x64",
+                        category="vm|reload-kernel|drb")
+dart_ci_sandbox_builder("vm-kernel-reload-rollback-linux-release-x64",
+                        category="vm|reload-kernel|rrb")
+# vm|ffi
+dart_ci_sandbox_builder("vm-ffi-android-debug-arm", category="vm|ffi|d32")
+dart_ci_sandbox_builder("vm-ffi-android-release-arm", category="vm|ffi|r32")
+dart_ci_sandbox_builder("vm-ffi-android-product-arm", category="vm|ffi|p32")
+
+# dart2js
+dart_ci_sandbox_builder("dart2js-strong-hostasserts-linux-ia32-d8",
+                        category="dart2js|d8|ha",
+                        on_cq=True)
+dart_ci_sandbox_builder("dart2js-minified-strong-linux-x64-d8",
+                        category="dart2js|d8|mi",
+                        on_cq=True)
+dart_ci_sandbox_builder("dart2js-unit-linux-x64-release",
+                        category="dart2js|d8|u",
+                        on_cq=True)
+dart_ci_sandbox_builder("dart2js-strong-linux-x64-chrome",
+                        category="dart2js|chrome|l",
+                        on_cq=True)
+dart_ci_sandbox_builder("dart2js-csp-minified-linux-x64-chrome",
+                        category="dart2js|chrome|csp")
+dart_ci_sandbox_builder("dart2js-strong-mac-x64-chrome",
+                        category="dart2js|chrome|m",
+                        dimensions=mac())
+dart_ci_sandbox_builder("dart2js-strong-win-x64-chrome",
+                        category="dart2js|chrome|w",
+                        dimensions=windows())
+dart_ci_sandbox_builder("dart2js-strong-linux-x64-firefox",
+                        category="dart2js|firefox|l")
+dart_ci_sandbox_builder("dart2js-strong-win-x64-firefox",
+                        category="dart2js|firefox|w",
+                        dimensions=windows())
+dart_ci_sandbox_builder("dart2js-strong-mac-x64-safari",
+                        category="dart2js|safari|m",
+                        dimensions=mac())
+dart_ci_sandbox_builder("dart2js-strong-win-x64-ie11",
+                        category="dart2js|ms|ie",
+                        dimensions=windows())
+
+# analyzer
+dart_ci_sandbox_builder("flutter-analyze",
+                        category="analyzer|fa",
+                        channels=["try"],
+                        properties={"new_workflow_enabled": False},
+                        notifies=None,
+                        on_cq=True,
+                        location_regexp=[
+                            ".+/[+]/DEPS",
+                            ".+/[+]/pkg/analysis_server/.+",
+                            ".+/[+]/pkg/analysis_server_client/.+",
+                            ".+/[+]/pkg/analyzer/.+",
+                            ".+/[+]/pkg/analyzer_plugin/.+",
+                            ".+/[+]/pkg/front_end/.+",
+                            ".+/[+]/pkg/meta/.+",
+                            ".+/[+]/pkg/telemetry/.+",
+                        ])
+dart_ci_sandbox_builder("analyzer-analysis-server-linux",
+                        category="analyzer|as",
+                        channels=ANALYZER_CHANNELS,
+                        on_cq=True)
+dart_ci_sandbox_builder("analyzer-linux-release",
+                        category="analyzer|l",
+                        on_cq=True,
+                        channels=ANALYZER_CHANNELS)
+dart_ci_sandbox_builder("analyzer-mac-release",
+                        category="analyzer|m",
+                        dimensions=mac(),
+                        channels=ANALYZER_CHANNELS)
+dart_ci_sandbox_builder("analyzer-win-release",
+                        category="analyzer|w",
+                        dimensions=windows(),
+                        channels=ANALYZER_CHANNELS)
+
+# sdk
+dart_ci_builder("dart-sdk-linux", category="sdk|l", channels=CHANNELS)
+dart_ci_builder("dart-sdk-mac",
+                category="sdk|m",
+                channels=CHANNELS,
+                dimensions=mac())
+dart_ci_builder("dart-sdk-win",
+                category="sdk|w",
+                channels=CHANNELS,
+                dimensions=windows(),
+                on_cq=True)
+
+# ddc
+dart_ci_sandbox_builder("ddc-linux-release-chrome",
+                        category="ddc|l",
+                        on_cq=True)
+dart_ci_sandbox_builder("ddc-mac-release-chrome",
+                        category="ddc|m",
+                        dimensions=mac())
+dart_ci_sandbox_builder("ddc-win-release-chrome",
+                        category="ddc|w",
+                        dimensions=windows())
+
+# pkg
+dart_ci_sandbox_builder("pkg-linux-release", category="pkg|l", on_cq=True)
+dart_ci_sandbox_builder("pkg-mac-release", category="pkg|m", dimensions=mac())
+dart_ci_sandbox_builder("pkg-win-release",
+                        category="pkg|w",
+                        dimensions=windows())
+dart_ci_sandbox_builder("pkg-linux-debug", category="pkg|ld", channels=["try"])
+
+# misc
+dart_ci_sandbox_builder("gclient",
+                        recipe="gclient",
+                        category="misc|g",
+                        properties={"new_workflow_enabled": False},
+                        on_cq=True)
+dart_ci_builder("debianpackage-linux",
+                category="misc|dp",
+                channels=RELEASE_CHANNELS,
+                notifies="infra")
+dart_ci_builder("versionchecker-linux",
+                category="misc|vc",
+                channels=RELEASE_CHANNELS)
+
+# external
+dart_ci_builder("google",
+                recipe="external",
+                category="external|g",
+                enabled=False,
+                fyi=True)
+
+# infra
+dart_ci_builder("base",
+                recipe="forward_branch",
+                schedule="with 10m interval",
+                notifies="infra")
+dart_ci_builder("chocolatey",
+                recipe="chocolatey",
+                enabled=False,
+                dimensions=windows())
+dart_ci_builder("co19-roller", recipe="package_co19", enabled=False)
+dart_ci_builder("docker", recipe="docker", enabled=False)
+dart_ci_builder(
+    "linearize-flutter",
+    recipe="linearize",
+    properties={
+        "repo": "https://dart.googlesource.com/linear_sdk_flutter_engine.git"
+    },
+    notifies="infra",
+    triggered_by=[
+        "dart-gitiles-trigger-master", "dart-flutter-engine-trigger",
+        "dart-flutter-flutter-trigger"
+    ],
+    triggering_policy=scheduler.greedy_batching(max_batch_size=1),
+)
+
+# Fuzz testing builders
+dart_ci_sandbox_builder("fuzz-linux",
+                        channels=[],
+                        notifies="dart-fuzz-testing",
+                        properties={"new_workflow_enabled": False},
+                        schedule="0 3 * * *")
+
+# Try only builders
+dart_try_builder("cl-linux")
+dart_try_builder("cl-mac", dimensions=mac())
+dart_try_builder("cl-win", dimensions=windows())
+dart_try_builder("benchmark-linux", on_cq=True)
+
+
+def add_postponed_alt_console_entries():
+    for entry in postponed_alt_console_entries:
+        luci.console_view_entry(console_view="alt", **entry)
+
+
+add_postponed_alt_console_entries()
+
+# Flutter consoles
+luci.console_view_entry(
+    builder="flutter-analyze",
+    short_name="fa",
+    category="analyzer",
+    console_view="flutter",
+)
+
+luci.console_view_entry(
+    builder="flutter-frontend",
+    short_name="fl",
+    category="fasta",
+    console_view="flutter",
+)
+
+luci.console_view_entry(
+    builder="flutter-engine-linux",
+    short_name="3H",
+    category="flutter",
+    console_view="flutter-hhh",
+)
diff --git a/project.cfg b/project.cfg
index 617702a87c27..aa62c97e4b8b 100644
--- a/project.cfg
+++ b/project.cfg
@@ -1,5 +1,8 @@
-# For the schema of this file and documentation, see ProjectCfg message in
-# https://luci-config.appspot.com/schemas/projects:project.cfg
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see ProjectCfg message:
+#   https://luci-config.appspot.com/schemas/projects:project.cfg
 
-name: "Dart"
-access: "group:all" # public
+name: "dart"
+access: "group:all"

From 32ebd6948e5a9d3c19a397f3d49cd280b26b705d Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Mon, 6 May 2019 20:05:57 +0000
Subject: [PATCH 278/826] Turn off result approvals for dev and stable builders

Change-Id: I25a33f3562484e8f136314c2b2d2f20601cb8f64
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/100969
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 172 +++++++++++++++++++++++++++++++++++++++++++++
 main.star          |   5 +-
 2 files changed, 176 insertions(+), 1 deletion(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index c227c53e0c19..49ba7a563366 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -118,6 +118,7 @@ buckets: <
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -139,6 +140,7 @@ buckets: <
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -181,6 +183,7 @@ buckets: <
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -202,6 +205,7 @@ buckets: <
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -244,6 +248,7 @@ buckets: <
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -265,6 +270,7 @@ buckets: <
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -307,6 +313,7 @@ buckets: <
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -328,6 +335,7 @@ buckets: <
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -434,6 +442,7 @@ buckets: <
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -455,6 +464,7 @@ buckets: <
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -541,6 +551,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -563,6 +574,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -629,6 +641,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -651,6 +664,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -717,6 +731,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -739,6 +754,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -805,6 +821,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -827,6 +844,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -871,6 +889,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -893,6 +912,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -937,6 +957,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -959,6 +980,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1003,6 +1025,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1025,6 +1048,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1069,6 +1093,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1091,6 +1116,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1135,6 +1161,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1157,6 +1184,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1201,6 +1229,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1223,6 +1252,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1267,6 +1297,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1289,6 +1320,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1333,6 +1365,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1355,6 +1388,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1399,6 +1433,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1421,6 +1456,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1465,6 +1501,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1487,6 +1524,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1531,6 +1569,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1553,6 +1592,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1597,6 +1637,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1619,6 +1660,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1663,6 +1705,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1685,6 +1728,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1729,6 +1773,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1751,6 +1796,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1795,6 +1841,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1817,6 +1864,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1861,6 +1909,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1883,6 +1932,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1927,6 +1977,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1949,6 +2000,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1993,6 +2045,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2015,6 +2068,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2122,6 +2176,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2144,6 +2199,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2188,6 +2244,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2210,6 +2267,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2254,6 +2312,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2276,6 +2335,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2339,6 +2399,7 @@ buckets: <
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2360,6 +2421,7 @@ buckets: <
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2426,6 +2488,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2448,6 +2511,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2492,6 +2556,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2514,6 +2579,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2558,6 +2624,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2580,6 +2647,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2624,6 +2692,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2646,6 +2715,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2690,6 +2760,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2712,6 +2783,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2756,6 +2828,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2778,6 +2851,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2822,6 +2896,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2844,6 +2919,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2888,6 +2964,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2910,6 +2987,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2954,6 +3032,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2976,6 +3055,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3020,6 +3100,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3042,6 +3123,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3086,6 +3168,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3108,6 +3191,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3152,6 +3236,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3174,6 +3259,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3218,6 +3304,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3240,6 +3327,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3284,6 +3372,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3306,6 +3395,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3350,6 +3440,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3372,6 +3463,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3416,6 +3508,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3438,6 +3531,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3482,6 +3576,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3504,6 +3599,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3548,6 +3644,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3570,6 +3667,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3614,6 +3712,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3636,6 +3735,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3680,6 +3780,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3702,6 +3803,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3746,6 +3848,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3768,6 +3871,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3812,6 +3916,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3834,6 +3939,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3878,6 +3984,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3900,6 +4007,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3944,6 +4052,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3966,6 +4075,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4010,6 +4120,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4032,6 +4143,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4076,6 +4188,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4098,6 +4211,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4142,6 +4256,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4164,6 +4279,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4208,6 +4324,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4230,6 +4347,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4274,6 +4392,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4296,6 +4415,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4340,6 +4460,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4362,6 +4483,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4406,6 +4528,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4428,6 +4551,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4473,6 +4597,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
         properties_j: "shard_timeout:5400"
       >
       priority: 50
@@ -4496,6 +4621,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
         properties_j: "shard_timeout:5400"
       >
       priority: 50
@@ -4541,6 +4667,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4563,6 +4690,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4607,6 +4735,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4629,6 +4758,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4673,6 +4803,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4695,6 +4826,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4739,6 +4871,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4761,6 +4894,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4805,6 +4939,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4827,6 +4962,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4871,6 +5007,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4893,6 +5030,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4937,6 +5075,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4959,6 +5098,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5003,6 +5143,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5025,6 +5166,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5069,6 +5211,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5091,6 +5234,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5135,6 +5279,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5157,6 +5302,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5201,6 +5347,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5223,6 +5370,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5267,6 +5415,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5289,6 +5438,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5333,6 +5483,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5355,6 +5506,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5399,6 +5551,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5421,6 +5574,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5465,6 +5619,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5487,6 +5642,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5531,6 +5687,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5553,6 +5710,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5597,6 +5755,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5619,6 +5778,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5663,6 +5823,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5685,6 +5846,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5729,6 +5891,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5751,6 +5914,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5795,6 +5959,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5817,6 +5982,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5861,6 +6027,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5883,6 +6050,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5927,6 +6095,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5949,6 +6118,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5993,6 +6163,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -6015,6 +6186,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
diff --git a/main.star b/main.star
index dab5a45c16a9..000c6d222f1d 100755
--- a/main.star
+++ b/main.star
@@ -319,6 +319,9 @@ def dart_builder(name,
                              location_regexp=location_regexp)
         else:
             builder = name + "-" + channel if channel else name
+	    channel_properties = dict(properties)
+	    if channel in ['dev', 'stable']:
+	      channel_properties['no_approvals'] = True
             luci.builder(
                 name=builder,
                 build_numbers=True,
@@ -327,7 +330,7 @@ def dart_builder(name,
                 dimensions=dimensions,
                 executable=dart_recipe(recipe),
                 priority=priority,
-                properties=properties,
+                properties=channel_properties,
                 notifies=[notifies]
                 if notifies and not channel and enabled else None,
                 schedule=schedule if enabled else None,

From f63050cf8bddf692e64b43b1bd0bf1d591de0e76 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 10 May 2019 07:50:19 +0000
Subject: [PATCH 279/826] [infra] Trigger special VM builders only on VM
 changes

This adds a new rule "dart_vm_extra_builder" that will use a special
gitiles poller that only fires triggers for commits modifying files
matching any of these regular expressions:

DEPS
build/.+
pkg/(front_end|kernel|vm)/.+
runtime/.+
sdk/.+
tests/.+

This will prevent VM builders using that rule from starting builds on
commits that do not modify the VM directly. On the consoles, this will
result in "incomplete" rows for non-VM commits. The "standard" builders
(vm-kernel-[linux|win|mac]-[debug|release|product]-x64) will still
trigger on all Dart SDK commits.

Unrelated change in this CL:
* Improve documentation in file header.
* Improve readme.

Change-Id: I31a814efc090db2538becc6381be702bc817e75c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/101981
Reviewed-by: Siva Annamalai <asiva@google.com>
Reviewed-by: Martin Kustermann <kustermann@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 README.md          |   7 +-
 luci-scheduler.cfg | 242 ++++++++++++++++++++++++++-------------------
 main.star          | 166 ++++++++++++++++---------------
 3 files changed, 235 insertions(+), 180 deletions(-)

diff --git a/README.md b/README.md
index 5afbe757c40b..ad93df7824ac 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,10 @@ commit queue.
 It is recommended to have a separate checkout for this branch, so switching
 to/from this branch does not populate/delete all files in the master branch.
 
+Most files in this branch are generated from `main.star`. Run `./main.star` to
+regenerate them after changes have been made. Files that are auto-generated must
+not be modified manually, and they have a file header that states that they are.
+
 ## Initial setup:
 
 ```console
@@ -24,7 +28,8 @@ Now you can create a new branch to make changes:
 
 ```console
 git new-branch add-new-builder
-# edit cr-buildbucket.cfg
+# edit main.star
+./main.star # generate Luci config files
 git commit -a
 
 git cl upload
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index af9b3624e215..4e6e18ac9d4c 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -2745,10 +2745,6 @@ trigger: <
   triggers: "analyzer-linux-release-dev"
   triggers: "analyzer-mac-release-dev"
   triggers: "analyzer-win-release-dev"
-  triggers: "app-kernel-linux-debug-x64-dev"
-  triggers: "app-kernel-linux-product-x64-dev"
-  triggers: "app-kernel-linux-release-x64-dev"
-  triggers: "cross-vm-linux-release-arm64-dev"
   triggers: "dart2js-csp-minified-linux-x64-chrome-dev"
   triggers: "dart2js-minified-strong-linux-x64-d8-dev"
   triggers: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
@@ -2771,56 +2767,14 @@ trigger: <
   triggers: "pkg-mac-release-dev"
   triggers: "pkg-win-release-dev"
   triggers: "vm-canary-linux-debug-dev"
-  triggers: "vm-dartkb-linux-debug-simarm64-dev"
-  triggers: "vm-dartkb-linux-debug-x64-dev"
-  triggers: "vm-dartkb-linux-product-simarm64-dev"
-  triggers: "vm-dartkb-linux-product-x64-dev"
-  triggers: "vm-dartkb-linux-release-simarm64-dev"
-  triggers: "vm-dartkb-linux-release-x64-dev"
-  triggers: "vm-ffi-android-debug-arm-dev"
-  triggers: "vm-ffi-android-product-arm-dev"
-  triggers: "vm-ffi-android-release-arm-dev"
-  triggers: "vm-kernel-asan-linux-release-x64-dev"
-  triggers: "vm-kernel-checked-linux-release-x64-dev"
-  triggers: "vm-kernel-linux-debug-ia32-dev"
-  triggers: "vm-kernel-linux-debug-simdbc64-dev"
   triggers: "vm-kernel-linux-debug-x64-dev"
   triggers: "vm-kernel-linux-product-x64-dev"
-  triggers: "vm-kernel-linux-release-ia32-dev"
-  triggers: "vm-kernel-linux-release-simarm-dev"
-  triggers: "vm-kernel-linux-release-simarm64-dev"
-  triggers: "vm-kernel-linux-release-simdbc64-dev"
   triggers: "vm-kernel-linux-release-x64-dev"
-  triggers: "vm-kernel-mac-debug-simdbc64-dev"
   triggers: "vm-kernel-mac-debug-x64-dev"
   triggers: "vm-kernel-mac-product-x64-dev"
-  triggers: "vm-kernel-mac-release-simdbc64-dev"
   triggers: "vm-kernel-mac-release-x64-dev"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-android-release-arm-dev"
-  triggers: "vm-kernel-precomp-bare-linux-release-simarm-dev"
-  triggers: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
-  triggers: "vm-kernel-precomp-bare-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-linux-debug-x64-dev"
-  triggers: "vm-kernel-precomp-linux-product-x64-dev"
-  triggers: "vm-kernel-precomp-linux-release-simarm-dev"
-  triggers: "vm-kernel-precomp-linux-release-simarm64-dev"
-  triggers: "vm-kernel-precomp-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-mac-release-simarm64-dev"
-  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-win-release-simarm64-dev"
-  triggers: "vm-kernel-precomp-win-release-x64-dev"
-  triggers: "vm-kernel-reload-linux-debug-x64-dev"
-  triggers: "vm-kernel-reload-linux-release-x64-dev"
-  triggers: "vm-kernel-reload-mac-debug-simdbc64-dev"
-  triggers: "vm-kernel-reload-mac-release-simdbc64-dev"
-  triggers: "vm-kernel-reload-rollback-linux-debug-x64-dev"
-  triggers: "vm-kernel-reload-rollback-linux-release-x64-dev"
-  triggers: "vm-kernel-win-debug-ia32-dev"
   triggers: "vm-kernel-win-debug-x64-dev"
   triggers: "vm-kernel-win-product-x64-dev"
-  triggers: "vm-kernel-win-release-ia32-dev"
   triggers: "vm-kernel-win-release-x64-dev"
   gitiles: <
     repo: "https://dart.googlesource.com/sdk"
@@ -2849,10 +2803,6 @@ trigger: <
   triggers: "analyzer-linux-release"
   triggers: "analyzer-mac-release"
   triggers: "analyzer-win-release"
-  triggers: "app-kernel-linux-debug-x64"
-  triggers: "app-kernel-linux-product-x64"
-  triggers: "app-kernel-linux-release-x64"
-  triggers: "cross-vm-linux-release-arm64"
   triggers: "dart2js-csp-minified-linux-x64-chrome"
   triggers: "dart2js-minified-strong-linux-x64-d8"
   triggers: "dart2js-strong-hostasserts-linux-ia32-d8"
@@ -2878,6 +2828,135 @@ trigger: <
   triggers: "pkg-mac-release"
   triggers: "pkg-win-release"
   triggers: "vm-canary-linux-debug"
+  triggers: "vm-kernel-linux-debug-x64"
+  triggers: "vm-kernel-linux-product-x64"
+  triggers: "vm-kernel-linux-release-x64"
+  triggers: "vm-kernel-mac-debug-x64"
+  triggers: "vm-kernel-mac-product-x64"
+  triggers: "vm-kernel-mac-release-x64"
+  triggers: "vm-kernel-win-debug-x64"
+  triggers: "vm-kernel-win-product-x64"
+  triggers: "vm-kernel-win-release-x64"
+  gitiles: <
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/master"
+  >
+>
+trigger: <
+  id: "dart-gitiles-trigger-stable"
+  acl_sets: "ci"
+  triggers: "dart-sdk-linux-stable"
+  triggers: "dart-sdk-mac-stable"
+  triggers: "dart-sdk-win-stable"
+  triggers: "debianpackage-linux-stable"
+  triggers: "versionchecker-linux-stable"
+  triggers: "analyzer-analysis-server-linux-stable"
+  triggers: "analyzer-linux-release-stable"
+  triggers: "analyzer-mac-release-stable"
+  triggers: "analyzer-win-release-stable"
+  triggers: "dart2js-csp-minified-linux-x64-chrome-stable"
+  triggers: "dart2js-minified-strong-linux-x64-d8-stable"
+  triggers: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
+  triggers: "dart2js-strong-linux-x64-chrome-stable"
+  triggers: "dart2js-strong-linux-x64-firefox-stable"
+  triggers: "dart2js-strong-mac-x64-chrome-stable"
+  triggers: "dart2js-strong-mac-x64-safari-stable"
+  triggers: "dart2js-strong-win-x64-chrome-stable"
+  triggers: "dart2js-strong-win-x64-firefox-stable"
+  triggers: "dart2js-strong-win-x64-ie11-stable"
+  triggers: "dart2js-unit-linux-x64-release-stable"
+  triggers: "ddc-linux-release-chrome-stable"
+  triggers: "ddc-mac-release-chrome-stable"
+  triggers: "ddc-win-release-chrome-stable"
+  triggers: "front-end-linux-release-x64-stable"
+  triggers: "front-end-mac-release-x64-stable"
+  triggers: "front-end-win-release-x64-stable"
+  triggers: "gclient-stable"
+  triggers: "pkg-linux-release-stable"
+  triggers: "pkg-mac-release-stable"
+  triggers: "pkg-win-release-stable"
+  triggers: "vm-canary-linux-debug-stable"
+  triggers: "vm-kernel-linux-debug-x64-stable"
+  triggers: "vm-kernel-linux-product-x64-stable"
+  triggers: "vm-kernel-linux-release-x64-stable"
+  triggers: "vm-kernel-mac-debug-x64-stable"
+  triggers: "vm-kernel-mac-product-x64-stable"
+  triggers: "vm-kernel-mac-release-x64-stable"
+  triggers: "vm-kernel-win-debug-x64-stable"
+  triggers: "vm-kernel-win-product-x64-stable"
+  triggers: "vm-kernel-win-release-x64-stable"
+  gitiles: <
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/stable"
+  >
+>
+trigger: <
+  id: "dart-vm-gitiles-trigger-dev"
+  acl_sets: "ci"
+  triggers: "app-kernel-linux-debug-x64-dev"
+  triggers: "app-kernel-linux-product-x64-dev"
+  triggers: "app-kernel-linux-release-x64-dev"
+  triggers: "cross-vm-linux-release-arm64-dev"
+  triggers: "vm-dartkb-linux-debug-simarm64-dev"
+  triggers: "vm-dartkb-linux-debug-x64-dev"
+  triggers: "vm-dartkb-linux-product-simarm64-dev"
+  triggers: "vm-dartkb-linux-product-x64-dev"
+  triggers: "vm-dartkb-linux-release-simarm64-dev"
+  triggers: "vm-dartkb-linux-release-x64-dev"
+  triggers: "vm-ffi-android-debug-arm-dev"
+  triggers: "vm-ffi-android-product-arm-dev"
+  triggers: "vm-ffi-android-release-arm-dev"
+  triggers: "vm-kernel-asan-linux-release-x64-dev"
+  triggers: "vm-kernel-checked-linux-release-x64-dev"
+  triggers: "vm-kernel-linux-debug-ia32-dev"
+  triggers: "vm-kernel-linux-debug-simdbc64-dev"
+  triggers: "vm-kernel-linux-release-ia32-dev"
+  triggers: "vm-kernel-linux-release-simarm-dev"
+  triggers: "vm-kernel-linux-release-simarm64-dev"
+  triggers: "vm-kernel-linux-release-simdbc64-dev"
+  triggers: "vm-kernel-mac-debug-simdbc64-dev"
+  triggers: "vm-kernel-mac-release-simdbc64-dev"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-android-release-arm-dev"
+  triggers: "vm-kernel-precomp-bare-linux-release-simarm-dev"
+  triggers: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-bare-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-linux-debug-x64-dev"
+  triggers: "vm-kernel-precomp-linux-product-x64-dev"
+  triggers: "vm-kernel-precomp-linux-release-simarm-dev"
+  triggers: "vm-kernel-precomp-linux-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-mac-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-win-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-win-release-x64-dev"
+  triggers: "vm-kernel-reload-linux-debug-x64-dev"
+  triggers: "vm-kernel-reload-linux-release-x64-dev"
+  triggers: "vm-kernel-reload-mac-debug-simdbc64-dev"
+  triggers: "vm-kernel-reload-mac-release-simdbc64-dev"
+  triggers: "vm-kernel-reload-rollback-linux-debug-x64-dev"
+  triggers: "vm-kernel-reload-rollback-linux-release-x64-dev"
+  triggers: "vm-kernel-win-debug-ia32-dev"
+  triggers: "vm-kernel-win-release-ia32-dev"
+  gitiles: <
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/dev"
+    path_regexps: "DEPS"
+    path_regexps: "build/.+"
+    path_regexps: "pkg/(front_end|kernel|vm)/.+"
+    path_regexps: "runtime/.+"
+    path_regexps: "sdk/.+"
+    path_regexps: "tests/.+"
+  >
+>
+trigger: <
+  id: "dart-vm-gitiles-trigger-master"
+  acl_sets: "ci"
+  triggers: "app-kernel-linux-debug-x64"
+  triggers: "app-kernel-linux-product-x64"
+  triggers: "app-kernel-linux-release-x64"
+  triggers: "cross-vm-linux-release-arm64"
   triggers: "vm-dartkb-linux-debug-simarm64"
   triggers: "vm-dartkb-linux-debug-x64"
   triggers: "vm-dartkb-linux-product-simarm64"
@@ -2891,18 +2970,12 @@ trigger: <
   triggers: "vm-kernel-checked-linux-release-x64"
   triggers: "vm-kernel-linux-debug-ia32"
   triggers: "vm-kernel-linux-debug-simdbc64"
-  triggers: "vm-kernel-linux-debug-x64"
-  triggers: "vm-kernel-linux-product-x64"
   triggers: "vm-kernel-linux-release-ia32"
   triggers: "vm-kernel-linux-release-simarm"
   triggers: "vm-kernel-linux-release-simarm64"
   triggers: "vm-kernel-linux-release-simdbc64"
-  triggers: "vm-kernel-linux-release-x64"
   triggers: "vm-kernel-mac-debug-simdbc64"
-  triggers: "vm-kernel-mac-debug-x64"
-  triggers: "vm-kernel-mac-product-x64"
   triggers: "vm-kernel-mac-release-simdbc64"
-  triggers: "vm-kernel-mac-release-x64"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
   triggers: "vm-kernel-precomp-android-release-arm"
@@ -2925,53 +2998,25 @@ trigger: <
   triggers: "vm-kernel-reload-rollback-linux-debug-x64"
   triggers: "vm-kernel-reload-rollback-linux-release-x64"
   triggers: "vm-kernel-win-debug-ia32"
-  triggers: "vm-kernel-win-debug-x64"
-  triggers: "vm-kernel-win-product-x64"
   triggers: "vm-kernel-win-release-ia32"
-  triggers: "vm-kernel-win-release-x64"
   gitiles: <
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/master"
+    path_regexps: "DEPS"
+    path_regexps: "build/.+"
+    path_regexps: "pkg/(front_end|kernel|vm)/.+"
+    path_regexps: "runtime/.+"
+    path_regexps: "sdk/.+"
+    path_regexps: "tests/.+"
   >
 >
 trigger: <
-  id: "dart-gitiles-trigger-stable"
+  id: "dart-vm-gitiles-trigger-stable"
   acl_sets: "ci"
-  triggers: "dart-sdk-linux-stable"
-  triggers: "dart-sdk-mac-stable"
-  triggers: "dart-sdk-win-stable"
-  triggers: "debianpackage-linux-stable"
-  triggers: "versionchecker-linux-stable"
-  triggers: "analyzer-analysis-server-linux-stable"
-  triggers: "analyzer-linux-release-stable"
-  triggers: "analyzer-mac-release-stable"
-  triggers: "analyzer-win-release-stable"
   triggers: "app-kernel-linux-debug-x64-stable"
   triggers: "app-kernel-linux-product-x64-stable"
   triggers: "app-kernel-linux-release-x64-stable"
   triggers: "cross-vm-linux-release-arm64-stable"
-  triggers: "dart2js-csp-minified-linux-x64-chrome-stable"
-  triggers: "dart2js-minified-strong-linux-x64-d8-stable"
-  triggers: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
-  triggers: "dart2js-strong-linux-x64-chrome-stable"
-  triggers: "dart2js-strong-linux-x64-firefox-stable"
-  triggers: "dart2js-strong-mac-x64-chrome-stable"
-  triggers: "dart2js-strong-mac-x64-safari-stable"
-  triggers: "dart2js-strong-win-x64-chrome-stable"
-  triggers: "dart2js-strong-win-x64-firefox-stable"
-  triggers: "dart2js-strong-win-x64-ie11-stable"
-  triggers: "dart2js-unit-linux-x64-release-stable"
-  triggers: "ddc-linux-release-chrome-stable"
-  triggers: "ddc-mac-release-chrome-stable"
-  triggers: "ddc-win-release-chrome-stable"
-  triggers: "front-end-linux-release-x64-stable"
-  triggers: "front-end-mac-release-x64-stable"
-  triggers: "front-end-win-release-x64-stable"
-  triggers: "gclient-stable"
-  triggers: "pkg-linux-release-stable"
-  triggers: "pkg-mac-release-stable"
-  triggers: "pkg-win-release-stable"
-  triggers: "vm-canary-linux-debug-stable"
   triggers: "vm-dartkb-linux-debug-simarm64-stable"
   triggers: "vm-dartkb-linux-debug-x64-stable"
   triggers: "vm-dartkb-linux-product-simarm64-stable"
@@ -2985,18 +3030,12 @@ trigger: <
   triggers: "vm-kernel-checked-linux-release-x64-stable"
   triggers: "vm-kernel-linux-debug-ia32-stable"
   triggers: "vm-kernel-linux-debug-simdbc64-stable"
-  triggers: "vm-kernel-linux-debug-x64-stable"
-  triggers: "vm-kernel-linux-product-x64-stable"
   triggers: "vm-kernel-linux-release-ia32-stable"
   triggers: "vm-kernel-linux-release-simarm-stable"
   triggers: "vm-kernel-linux-release-simarm64-stable"
   triggers: "vm-kernel-linux-release-simdbc64-stable"
-  triggers: "vm-kernel-linux-release-x64-stable"
   triggers: "vm-kernel-mac-debug-simdbc64-stable"
-  triggers: "vm-kernel-mac-debug-x64-stable"
-  triggers: "vm-kernel-mac-product-x64-stable"
   triggers: "vm-kernel-mac-release-simdbc64-stable"
-  triggers: "vm-kernel-mac-release-x64-stable"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-android-release-arm-stable"
@@ -3019,13 +3058,16 @@ trigger: <
   triggers: "vm-kernel-reload-rollback-linux-debug-x64-stable"
   triggers: "vm-kernel-reload-rollback-linux-release-x64-stable"
   triggers: "vm-kernel-win-debug-ia32-stable"
-  triggers: "vm-kernel-win-debug-x64-stable"
-  triggers: "vm-kernel-win-product-x64-stable"
   triggers: "vm-kernel-win-release-ia32-stable"
-  triggers: "vm-kernel-win-release-x64-stable"
   gitiles: <
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/stable"
+    path_regexps: "DEPS"
+    path_regexps: "build/.+"
+    path_regexps: "pkg/(front_end|kernel|vm)/.+"
+    path_regexps: "runtime/.+"
+    path_regexps: "sdk/.+"
+    path_regexps: "tests/.+"
   >
 >
 acl_sets: <
diff --git a/main.star b/main.star
index 000c6d222f1d..9aac6aad3641 100755
--- a/main.star
+++ b/main.star
@@ -4,6 +4,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
+# Use ./main.star to regenerate the Luci configuration based on this file.
+#
+# Documentation for lucicfg is here:
 # https://chromium.googlesource.com/infra/luci/luci-go/+/master/lucicfg/doc/
 
 DART_GIT = "https://dart.googlesource.com/sdk"
@@ -12,6 +15,7 @@ DART_GERRIT = "https://dart-review.googlesource.com/sdk"
 RELEASE_CHANNELS = ["dev", "stable"]
 CHANNELS = RELEASE_CHANNELS + ["try"]
 ANALYZER_CHANNELS = ["analyzer-stable"] + CHANNELS
+BRANCHES = ["master", "dev", "stable"]
 
 
 def mac():
@@ -163,33 +167,27 @@ luci.gitiles_poller(
     refs=["refs/heads/master"],
 )
 
-luci.gitiles_poller(
-    name="dart-gitiles-trigger-master",
-    bucket="ci",
-    repo=DART_GIT,
-    refs=["refs/heads/master"],
-)
 
-luci.gitiles_poller(
-    name="dart-gitiles-trigger-dev",
-    bucket="ci",
-    repo=DART_GIT,
-    refs=["refs/heads/dev"],
-)
+def dart_poller(name, bucket="ci", branches=BRANCHES, paths=None):
+    for branch in branches:
+        luci.gitiles_poller(
+            name="%s-%s" % (name, branch),
+            bucket=bucket,
+            path_regexps=paths,
+            repo=DART_GIT,
+            refs=["refs/heads/%s" % branch],
+        )
 
-luci.gitiles_poller(
-    name="dart-gitiles-trigger-stable",
-    bucket="ci",
-    repo=DART_GIT,
-    refs=["refs/heads/stable"],
-)
 
-luci.gitiles_poller(
-    name="dart-gitiles-trigger-analyzer-stable",
-    bucket="ci",
-    repo=DART_GIT,
-    refs=["refs/heads/analyzer-stable"],
-)
+dart_poller("dart-gitiles-trigger", branches=BRANCHES + ["analyzer-stable"])
+dart_poller("dart-vm-gitiles-trigger", paths=[
+    "DEPS",
+    "build/.+",
+    "pkg/(front_end|kernel|vm)/.+",
+    "runtime/.+",
+    "sdk/.+",
+    "tests/.+",
+])
 
 luci.gitiles_poller(
     name="dart-flutter-engine-trigger",
@@ -308,7 +306,7 @@ def dart_builder(name,
     dimensions["cpu"] = cpu
     properties.setdefault("clobber", "true")
 
-    def builder(channel=None):
+    def builder(channel=None, triggered_by=None):
         if channel == "try":
             dart_try_builder(name,
                              recipe=recipe,
@@ -319,9 +317,16 @@ def dart_builder(name,
                              location_regexp=location_regexp)
         else:
             builder = name + "-" + channel if channel else name
-	    channel_properties = dict(properties)
-	    if channel in ['dev', 'stable']:
-	      channel_properties['no_approvals'] = True
+            branch = channel if channel else "master"
+            channel_properties = dict(properties)
+            if channel in ['dev', 'stable']:
+                channel_properties['no_approvals'] = True
+            if enabled and schedule == "triggered":
+                if not triggered_by:
+                    triggered_by = ["dart-gitiles-trigger-%s" % branch]
+                elif len(triggered_by) == 1:
+                    # triggered_by may not contain a '%s' so we replace.
+                    triggered_by = [triggered_by[0].replace("%s", branch)]
             luci.builder(
                 name=builder,
                 build_numbers=True,
@@ -336,9 +341,7 @@ def dart_builder(name,
                 schedule=schedule if enabled else None,
                 service_account=service_account,
                 swarming_tags=["vpython:native-python-wrapper"],
-                triggered_by=triggered_by or
-                (["dart-gitiles-trigger-" + (channel if channel else "master")]
-                 if enabled and schedule == "triggered" else None),
+                triggered_by=triggered_by,
                 triggering_policy=triggering_policy)
             if category:
                 console_category, _, short_name = category.rpartition("|")
@@ -368,10 +371,10 @@ def dart_builder(name,
                             console_view="alt",
                         )
 
-    builder()
+    builder(triggered_by=triggered_by)
     for channel in channels:
         if enabled:
-            builder(channel)
+            builder(channel, triggered_by=triggered_by)
 
 
 def dart_ci_builder(name, dimensions={}, **kwargs):
@@ -398,6 +401,11 @@ def dart_ci_sandbox_builder(name,
                  **kwargs)
 
 
+def dart_vm_extra_builder(name, **kwargs):
+    triggered_by = ["dart-vm-gitiles-trigger-%s"]
+    dart_ci_sandbox_builder(name, triggered_by=triggered_by, **kwargs)
+
+
 # fasta
 dart_ci_sandbox_builder("front-end-linux-release-x64",
                         category="fasta|l",
@@ -427,50 +435,50 @@ dart_ci_sandbox_builder(
 )
 
 # vm|app-kernel
-dart_ci_sandbox_builder("app-kernel-linux-debug-x64",
+dart_vm_extra_builder("app-kernel-linux-debug-x64",
                         category="vm|app-kernel|d64")
-dart_ci_sandbox_builder("app-kernel-linux-product-x64",
+dart_vm_extra_builder("app-kernel-linux-product-x64",
                         category="vm|app-kernel|p64")
-dart_ci_sandbox_builder("app-kernel-linux-release-x64",
+dart_vm_extra_builder("app-kernel-linux-release-x64",
                         category="vm|app-kernel|r64")
 
 # vm|dartkb
-dart_ci_sandbox_builder("vm-dartkb-linux-debug-simarm64",
+dart_vm_extra_builder("vm-dartkb-linux-debug-simarm64",
                         category="vm|dartkb|sd")
-dart_ci_sandbox_builder("vm-dartkb-linux-debug-x64", category="vm|dartkb|d")
-dart_ci_sandbox_builder("vm-dartkb-linux-product-simarm64",
+dart_vm_extra_builder("vm-dartkb-linux-debug-x64", category="vm|dartkb|d")
+dart_vm_extra_builder("vm-dartkb-linux-product-simarm64",
                         category="vm|dartkb|sp")
-dart_ci_sandbox_builder("vm-dartkb-linux-product-x64", category="vm|dartkb|p")
-dart_ci_sandbox_builder("vm-dartkb-linux-release-simarm64",
+dart_vm_extra_builder("vm-dartkb-linux-product-x64", category="vm|dartkb|p")
+dart_vm_extra_builder("vm-dartkb-linux-release-simarm64",
                         category="vm|dartkb|sr")
-dart_ci_sandbox_builder("vm-dartkb-linux-release-x64", category="vm|dartkb|r")
+dart_vm_extra_builder("vm-dartkb-linux-release-x64", category="vm|dartkb|r")
 
 #vm|kernel
 dart_ci_sandbox_builder("vm-canary-linux-debug",
                         category="vm|kernel|c",
                         on_cq=True)
 dart_ci_sandbox_builder("vm-kernel-linux-debug-x64", category="vm|kernel|d")
-dart_ci_sandbox_builder("vm-kernel-linux-debug-simdbc64",
+dart_vm_extra_builder("vm-kernel-linux-debug-simdbc64",
                         category="vm|kernel|dbc")
-dart_ci_sandbox_builder("vm-kernel-linux-release-simarm",
+dart_vm_extra_builder("vm-kernel-linux-release-simarm",
                         category="vm|kernel|a32")
-dart_ci_sandbox_builder("vm-kernel-linux-release-simarm64",
+dart_vm_extra_builder("vm-kernel-linux-release-simarm64",
                         category="vm|kernel|a64")
-dart_ci_sandbox_builder("vm-kernel-linux-release-simdbc64",
+dart_vm_extra_builder("vm-kernel-linux-release-simdbc64",
                         category="vm|kernel|rbc",
                         on_cq=True)
-dart_ci_sandbox_builder("vm-kernel-linux-release-ia32",
+dart_vm_extra_builder("vm-kernel-linux-release-ia32",
                         category="vm|kernel|r32")
 dart_ci_sandbox_builder("vm-kernel-linux-release-x64",
                         category="vm|kernel|r",
                         on_cq=True)
-dart_ci_sandbox_builder("vm-kernel-checked-linux-release-x64",
+dart_vm_extra_builder("vm-kernel-checked-linux-release-x64",
                         category="vm|kernel|rc")
-dart_ci_sandbox_builder("vm-kernel-linux-debug-ia32", category="vm|kernel|d32")
-dart_ci_sandbox_builder("vm-kernel-mac-debug-simdbc64",
+dart_vm_extra_builder("vm-kernel-linux-debug-ia32", category="vm|kernel|d32")
+dart_vm_extra_builder("vm-kernel-mac-debug-simdbc64",
                         category="vm|kernel|mds",
                         dimensions=mac())
-dart_ci_sandbox_builder("vm-kernel-mac-release-simdbc64",
+dart_vm_extra_builder("vm-kernel-mac-release-simdbc64",
                         category="vm|kernel|mrs",
                         dimensions=mac())
 dart_ci_sandbox_builder("vm-kernel-mac-debug-x64",
@@ -481,60 +489,60 @@ dart_ci_sandbox_builder("vm-kernel-mac-release-x64",
                         dimensions=mac(),
                         on_cq=True,
                         experiment_percentage=5)
-dart_ci_sandbox_builder("vm-kernel-win-debug-ia32",
+dart_vm_extra_builder("vm-kernel-win-debug-ia32",
                         category="vm|kernel|wd3",
                         dimensions=windows())
 dart_ci_sandbox_builder("vm-kernel-win-debug-x64",
                         category="vm|kernel|wd",
                         dimensions=windows())
-dart_ci_sandbox_builder("vm-kernel-win-release-ia32",
+dart_vm_extra_builder("vm-kernel-win-release-ia32",
                         category="vm|kernel|wr3",
                         dimensions=windows())
 dart_ci_sandbox_builder("vm-kernel-win-release-x64",
                         category="vm|kernel|wr",
                         dimensions=windows())
-dart_ci_sandbox_builder("cross-vm-linux-release-arm64",
+dart_vm_extra_builder("cross-vm-linux-release-arm64",
                         category="vm|kernel|cra",
                         channels=RELEASE_CHANNELS)
 
 # vm|kernel-precomp
-dart_ci_sandbox_builder("vm-kernel-precomp-android-release-arm",
+dart_vm_extra_builder("vm-kernel-precomp-android-release-arm",
                         category="vm|kernel-precomp|and",
                         properties={"shard_timeout": 5400})  # 1.5h
-dart_ci_sandbox_builder("vm-kernel-precomp-linux-debug-x64",
+dart_vm_extra_builder("vm-kernel-precomp-linux-debug-x64",
                         category="vm|kernel-precomp|d")
-dart_ci_sandbox_builder("vm-kernel-precomp-linux-product-x64",
+dart_vm_extra_builder("vm-kernel-precomp-linux-product-x64",
                         category="vm|kernel-precomp|p")
-dart_ci_sandbox_builder("vm-kernel-precomp-linux-release-simarm",
+dart_vm_extra_builder("vm-kernel-precomp-linux-release-simarm",
                         category="vm|kernel-precomp|a32")
-dart_ci_sandbox_builder("vm-kernel-precomp-linux-release-simarm64",
+dart_vm_extra_builder("vm-kernel-precomp-linux-release-simarm64",
                         category="vm|kernel-precomp|a64")
-dart_ci_sandbox_builder("vm-kernel-precomp-linux-release-x64",
+dart_vm_extra_builder("vm-kernel-precomp-linux-release-x64",
                         category="vm|kernel-precomp|r")
-dart_ci_sandbox_builder("vm-kernel-precomp-bare-linux-release-x64",
+dart_vm_extra_builder("vm-kernel-precomp-bare-linux-release-x64",
                         category="vm|kernel-precomp|br")
-dart_ci_sandbox_builder("vm-kernel-precomp-bare-linux-release-simarm",
+dart_vm_extra_builder("vm-kernel-precomp-bare-linux-release-simarm",
                         category="vm|kernel-precomp|bra32")
-dart_ci_sandbox_builder("vm-kernel-precomp-bare-linux-release-simarm64",
+dart_vm_extra_builder("vm-kernel-precomp-bare-linux-release-simarm64",
                         category="vm|kernel-precomp|bra64")
-dart_ci_sandbox_builder("vm-kernel-precomp-obfuscate-linux-release-x64",
+dart_vm_extra_builder("vm-kernel-precomp-obfuscate-linux-release-x64",
                         category="vm|kernel-precomp|o")
-dart_ci_sandbox_builder("vm-kernel-precomp-mac-release-simarm64",
+dart_vm_extra_builder("vm-kernel-precomp-mac-release-simarm64",
                         category="vm|kernel-precomp|ma",
                         dimensions=mac())
-dart_ci_sandbox_builder("vm-kernel-precomp-win-release-simarm64",
+dart_vm_extra_builder("vm-kernel-precomp-win-release-simarm64",
                         category="vm|kernel-precomp|wa",
                         dimensions=windows())
-dart_ci_sandbox_builder("vm-kernel-precomp-win-release-x64",
+dart_vm_extra_builder("vm-kernel-precomp-win-release-x64",
                         category="vm|kernel-precomp|wr",
                         dimensions=windows())
 
 # vm|misc
-dart_ci_sandbox_builder("vm-kernel-asan-linux-release-x64",
+dart_vm_extra_builder("vm-kernel-asan-linux-release-x64",
                         category="vm|misc|a64")
-dart_ci_sandbox_builder("vm-kernel-optcounter-threshold-linux-release-ia32",
+dart_vm_extra_builder("vm-kernel-optcounter-threshold-linux-release-ia32",
                         category="vm|misc|o32")
-dart_ci_sandbox_builder("vm-kernel-optcounter-threshold-linux-release-x64",
+dart_vm_extra_builder("vm-kernel-optcounter-threshold-linux-release-x64",
                         category="vm|misc|o64")
 
 # vm|product
@@ -549,24 +557,24 @@ dart_ci_sandbox_builder("vm-kernel-win-product-x64",
                         dimensions=windows())
 
 # vm|reload-kernel
-dart_ci_sandbox_builder("vm-kernel-reload-linux-debug-x64",
+dart_vm_extra_builder("vm-kernel-reload-linux-debug-x64",
                         category="vm|reload-kernel|d")
-dart_ci_sandbox_builder("vm-kernel-reload-linux-release-x64",
+dart_vm_extra_builder("vm-kernel-reload-linux-release-x64",
                         category="vm|reload-kernel|r")
-dart_ci_sandbox_builder("vm-kernel-reload-mac-debug-simdbc64",
+dart_vm_extra_builder("vm-kernel-reload-mac-debug-simdbc64",
                         category="vm|reload-kernel|md",
                         dimensions=mac())
-dart_ci_sandbox_builder("vm-kernel-reload-mac-release-simdbc64",
+dart_vm_extra_builder("vm-kernel-reload-mac-release-simdbc64",
                         category="vm|reload-kernel|mr",
                         dimensions=mac())
-dart_ci_sandbox_builder("vm-kernel-reload-rollback-linux-debug-x64",
+dart_vm_extra_builder("vm-kernel-reload-rollback-linux-debug-x64",
                         category="vm|reload-kernel|drb")
-dart_ci_sandbox_builder("vm-kernel-reload-rollback-linux-release-x64",
+dart_vm_extra_builder("vm-kernel-reload-rollback-linux-release-x64",
                         category="vm|reload-kernel|rrb")
 # vm|ffi
-dart_ci_sandbox_builder("vm-ffi-android-debug-arm", category="vm|ffi|d32")
-dart_ci_sandbox_builder("vm-ffi-android-release-arm", category="vm|ffi|r32")
-dart_ci_sandbox_builder("vm-ffi-android-product-arm", category="vm|ffi|p32")
+dart_vm_extra_builder("vm-ffi-android-debug-arm", category="vm|ffi|d32")
+dart_vm_extra_builder("vm-ffi-android-release-arm", category="vm|ffi|r32")
+dart_vm_extra_builder("vm-ffi-android-product-arm", category="vm|ffi|p32")
 
 # dart2js
 dart_ci_sandbox_builder("dart2js-strong-hostasserts-linux-ia32-d8",

From 207063e9fba5811a008c742598f27037b3e3f75a Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Tue, 11 Jun 2019 12:29:52 +0000
Subject: [PATCH 280/826] Always trigger all VM builders on commits to dev and
 stable branches

Change-Id: Ibb78eaee5e064499c5a1de09c189e1f24958518b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/105581
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-scheduler.cfg | 212 ++++++++++++++++++++-------------------------
 main.star          |  13 +--
 2 files changed, 100 insertions(+), 125 deletions(-)

diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 4e6e18ac9d4c..e71d081dd44f 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -2745,6 +2745,10 @@ trigger: <
   triggers: "analyzer-linux-release-dev"
   triggers: "analyzer-mac-release-dev"
   triggers: "analyzer-win-release-dev"
+  triggers: "app-kernel-linux-debug-x64-dev"
+  triggers: "app-kernel-linux-product-x64-dev"
+  triggers: "app-kernel-linux-release-x64-dev"
+  triggers: "cross-vm-linux-release-arm64-dev"
   triggers: "dart2js-csp-minified-linux-x64-chrome-dev"
   triggers: "dart2js-minified-strong-linux-x64-d8-dev"
   triggers: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
@@ -2767,14 +2771,56 @@ trigger: <
   triggers: "pkg-mac-release-dev"
   triggers: "pkg-win-release-dev"
   triggers: "vm-canary-linux-debug-dev"
+  triggers: "vm-dartkb-linux-debug-simarm64-dev"
+  triggers: "vm-dartkb-linux-debug-x64-dev"
+  triggers: "vm-dartkb-linux-product-simarm64-dev"
+  triggers: "vm-dartkb-linux-product-x64-dev"
+  triggers: "vm-dartkb-linux-release-simarm64-dev"
+  triggers: "vm-dartkb-linux-release-x64-dev"
+  triggers: "vm-ffi-android-debug-arm-dev"
+  triggers: "vm-ffi-android-product-arm-dev"
+  triggers: "vm-ffi-android-release-arm-dev"
+  triggers: "vm-kernel-asan-linux-release-x64-dev"
+  triggers: "vm-kernel-checked-linux-release-x64-dev"
+  triggers: "vm-kernel-linux-debug-ia32-dev"
+  triggers: "vm-kernel-linux-debug-simdbc64-dev"
   triggers: "vm-kernel-linux-debug-x64-dev"
   triggers: "vm-kernel-linux-product-x64-dev"
+  triggers: "vm-kernel-linux-release-ia32-dev"
+  triggers: "vm-kernel-linux-release-simarm-dev"
+  triggers: "vm-kernel-linux-release-simarm64-dev"
+  triggers: "vm-kernel-linux-release-simdbc64-dev"
   triggers: "vm-kernel-linux-release-x64-dev"
+  triggers: "vm-kernel-mac-debug-simdbc64-dev"
   triggers: "vm-kernel-mac-debug-x64-dev"
   triggers: "vm-kernel-mac-product-x64-dev"
+  triggers: "vm-kernel-mac-release-simdbc64-dev"
   triggers: "vm-kernel-mac-release-x64-dev"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-android-release-arm-dev"
+  triggers: "vm-kernel-precomp-bare-linux-release-simarm-dev"
+  triggers: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-bare-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-linux-debug-x64-dev"
+  triggers: "vm-kernel-precomp-linux-product-x64-dev"
+  triggers: "vm-kernel-precomp-linux-release-simarm-dev"
+  triggers: "vm-kernel-precomp-linux-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-mac-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-win-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-win-release-x64-dev"
+  triggers: "vm-kernel-reload-linux-debug-x64-dev"
+  triggers: "vm-kernel-reload-linux-release-x64-dev"
+  triggers: "vm-kernel-reload-mac-debug-simdbc64-dev"
+  triggers: "vm-kernel-reload-mac-release-simdbc64-dev"
+  triggers: "vm-kernel-reload-rollback-linux-debug-x64-dev"
+  triggers: "vm-kernel-reload-rollback-linux-release-x64-dev"
+  triggers: "vm-kernel-win-debug-ia32-dev"
   triggers: "vm-kernel-win-debug-x64-dev"
   triggers: "vm-kernel-win-product-x64-dev"
+  triggers: "vm-kernel-win-release-ia32-dev"
   triggers: "vm-kernel-win-release-x64-dev"
   gitiles: <
     repo: "https://dart.googlesource.com/sdk"
@@ -2854,6 +2900,10 @@ trigger: <
   triggers: "analyzer-linux-release-stable"
   triggers: "analyzer-mac-release-stable"
   triggers: "analyzer-win-release-stable"
+  triggers: "app-kernel-linux-debug-x64-stable"
+  triggers: "app-kernel-linux-product-x64-stable"
+  triggers: "app-kernel-linux-release-x64-stable"
+  triggers: "cross-vm-linux-release-arm64-stable"
   triggers: "dart2js-csp-minified-linux-x64-chrome-stable"
   triggers: "dart2js-minified-strong-linux-x64-d8-stable"
   triggers: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
@@ -2876,80 +2926,62 @@ trigger: <
   triggers: "pkg-mac-release-stable"
   triggers: "pkg-win-release-stable"
   triggers: "vm-canary-linux-debug-stable"
+  triggers: "vm-dartkb-linux-debug-simarm64-stable"
+  triggers: "vm-dartkb-linux-debug-x64-stable"
+  triggers: "vm-dartkb-linux-product-simarm64-stable"
+  triggers: "vm-dartkb-linux-product-x64-stable"
+  triggers: "vm-dartkb-linux-release-simarm64-stable"
+  triggers: "vm-dartkb-linux-release-x64-stable"
+  triggers: "vm-ffi-android-debug-arm-stable"
+  triggers: "vm-ffi-android-product-arm-stable"
+  triggers: "vm-ffi-android-release-arm-stable"
+  triggers: "vm-kernel-asan-linux-release-x64-stable"
+  triggers: "vm-kernel-checked-linux-release-x64-stable"
+  triggers: "vm-kernel-linux-debug-ia32-stable"
+  triggers: "vm-kernel-linux-debug-simdbc64-stable"
   triggers: "vm-kernel-linux-debug-x64-stable"
   triggers: "vm-kernel-linux-product-x64-stable"
+  triggers: "vm-kernel-linux-release-ia32-stable"
+  triggers: "vm-kernel-linux-release-simarm-stable"
+  triggers: "vm-kernel-linux-release-simarm64-stable"
+  triggers: "vm-kernel-linux-release-simdbc64-stable"
   triggers: "vm-kernel-linux-release-x64-stable"
+  triggers: "vm-kernel-mac-debug-simdbc64-stable"
   triggers: "vm-kernel-mac-debug-x64-stable"
   triggers: "vm-kernel-mac-product-x64-stable"
+  triggers: "vm-kernel-mac-release-simdbc64-stable"
   triggers: "vm-kernel-mac-release-x64-stable"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
+  triggers: "vm-kernel-precomp-android-release-arm-stable"
+  triggers: "vm-kernel-precomp-bare-linux-release-simarm-stable"
+  triggers: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
+  triggers: "vm-kernel-precomp-bare-linux-release-x64-stable"
+  triggers: "vm-kernel-precomp-linux-debug-x64-stable"
+  triggers: "vm-kernel-precomp-linux-product-x64-stable"
+  triggers: "vm-kernel-precomp-linux-release-simarm-stable"
+  triggers: "vm-kernel-precomp-linux-release-simarm64-stable"
+  triggers: "vm-kernel-precomp-linux-release-x64-stable"
+  triggers: "vm-kernel-precomp-mac-release-simarm64-stable"
+  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+  triggers: "vm-kernel-precomp-win-release-simarm64-stable"
+  triggers: "vm-kernel-precomp-win-release-x64-stable"
+  triggers: "vm-kernel-reload-linux-debug-x64-stable"
+  triggers: "vm-kernel-reload-linux-release-x64-stable"
+  triggers: "vm-kernel-reload-mac-debug-simdbc64-stable"
+  triggers: "vm-kernel-reload-mac-release-simdbc64-stable"
+  triggers: "vm-kernel-reload-rollback-linux-debug-x64-stable"
+  triggers: "vm-kernel-reload-rollback-linux-release-x64-stable"
+  triggers: "vm-kernel-win-debug-ia32-stable"
   triggers: "vm-kernel-win-debug-x64-stable"
   triggers: "vm-kernel-win-product-x64-stable"
+  triggers: "vm-kernel-win-release-ia32-stable"
   triggers: "vm-kernel-win-release-x64-stable"
   gitiles: <
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/stable"
   >
 >
-trigger: <
-  id: "dart-vm-gitiles-trigger-dev"
-  acl_sets: "ci"
-  triggers: "app-kernel-linux-debug-x64-dev"
-  triggers: "app-kernel-linux-product-x64-dev"
-  triggers: "app-kernel-linux-release-x64-dev"
-  triggers: "cross-vm-linux-release-arm64-dev"
-  triggers: "vm-dartkb-linux-debug-simarm64-dev"
-  triggers: "vm-dartkb-linux-debug-x64-dev"
-  triggers: "vm-dartkb-linux-product-simarm64-dev"
-  triggers: "vm-dartkb-linux-product-x64-dev"
-  triggers: "vm-dartkb-linux-release-simarm64-dev"
-  triggers: "vm-dartkb-linux-release-x64-dev"
-  triggers: "vm-ffi-android-debug-arm-dev"
-  triggers: "vm-ffi-android-product-arm-dev"
-  triggers: "vm-ffi-android-release-arm-dev"
-  triggers: "vm-kernel-asan-linux-release-x64-dev"
-  triggers: "vm-kernel-checked-linux-release-x64-dev"
-  triggers: "vm-kernel-linux-debug-ia32-dev"
-  triggers: "vm-kernel-linux-debug-simdbc64-dev"
-  triggers: "vm-kernel-linux-release-ia32-dev"
-  triggers: "vm-kernel-linux-release-simarm-dev"
-  triggers: "vm-kernel-linux-release-simarm64-dev"
-  triggers: "vm-kernel-linux-release-simdbc64-dev"
-  triggers: "vm-kernel-mac-debug-simdbc64-dev"
-  triggers: "vm-kernel-mac-release-simdbc64-dev"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-android-release-arm-dev"
-  triggers: "vm-kernel-precomp-bare-linux-release-simarm-dev"
-  triggers: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
-  triggers: "vm-kernel-precomp-bare-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-linux-debug-x64-dev"
-  triggers: "vm-kernel-precomp-linux-product-x64-dev"
-  triggers: "vm-kernel-precomp-linux-release-simarm-dev"
-  triggers: "vm-kernel-precomp-linux-release-simarm64-dev"
-  triggers: "vm-kernel-precomp-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-mac-release-simarm64-dev"
-  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-win-release-simarm64-dev"
-  triggers: "vm-kernel-precomp-win-release-x64-dev"
-  triggers: "vm-kernel-reload-linux-debug-x64-dev"
-  triggers: "vm-kernel-reload-linux-release-x64-dev"
-  triggers: "vm-kernel-reload-mac-debug-simdbc64-dev"
-  triggers: "vm-kernel-reload-mac-release-simdbc64-dev"
-  triggers: "vm-kernel-reload-rollback-linux-debug-x64-dev"
-  triggers: "vm-kernel-reload-rollback-linux-release-x64-dev"
-  triggers: "vm-kernel-win-debug-ia32-dev"
-  triggers: "vm-kernel-win-release-ia32-dev"
-  gitiles: <
-    repo: "https://dart.googlesource.com/sdk"
-    refs: "regexp:refs/heads/dev"
-    path_regexps: "DEPS"
-    path_regexps: "build/.+"
-    path_regexps: "pkg/(front_end|kernel|vm)/.+"
-    path_regexps: "runtime/.+"
-    path_regexps: "sdk/.+"
-    path_regexps: "tests/.+"
-  >
->
 trigger: <
   id: "dart-vm-gitiles-trigger-master"
   acl_sets: "ci"
@@ -3010,66 +3042,6 @@ trigger: <
     path_regexps: "tests/.+"
   >
 >
-trigger: <
-  id: "dart-vm-gitiles-trigger-stable"
-  acl_sets: "ci"
-  triggers: "app-kernel-linux-debug-x64-stable"
-  triggers: "app-kernel-linux-product-x64-stable"
-  triggers: "app-kernel-linux-release-x64-stable"
-  triggers: "cross-vm-linux-release-arm64-stable"
-  triggers: "vm-dartkb-linux-debug-simarm64-stable"
-  triggers: "vm-dartkb-linux-debug-x64-stable"
-  triggers: "vm-dartkb-linux-product-simarm64-stable"
-  triggers: "vm-dartkb-linux-product-x64-stable"
-  triggers: "vm-dartkb-linux-release-simarm64-stable"
-  triggers: "vm-dartkb-linux-release-x64-stable"
-  triggers: "vm-ffi-android-debug-arm-stable"
-  triggers: "vm-ffi-android-product-arm-stable"
-  triggers: "vm-ffi-android-release-arm-stable"
-  triggers: "vm-kernel-asan-linux-release-x64-stable"
-  triggers: "vm-kernel-checked-linux-release-x64-stable"
-  triggers: "vm-kernel-linux-debug-ia32-stable"
-  triggers: "vm-kernel-linux-debug-simdbc64-stable"
-  triggers: "vm-kernel-linux-release-ia32-stable"
-  triggers: "vm-kernel-linux-release-simarm-stable"
-  triggers: "vm-kernel-linux-release-simarm64-stable"
-  triggers: "vm-kernel-linux-release-simdbc64-stable"
-  triggers: "vm-kernel-mac-debug-simdbc64-stable"
-  triggers: "vm-kernel-mac-release-simdbc64-stable"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-android-release-arm-stable"
-  triggers: "vm-kernel-precomp-bare-linux-release-simarm-stable"
-  triggers: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
-  triggers: "vm-kernel-precomp-bare-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-linux-debug-x64-stable"
-  triggers: "vm-kernel-precomp-linux-product-x64-stable"
-  triggers: "vm-kernel-precomp-linux-release-simarm-stable"
-  triggers: "vm-kernel-precomp-linux-release-simarm64-stable"
-  triggers: "vm-kernel-precomp-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-mac-release-simarm64-stable"
-  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-win-release-simarm64-stable"
-  triggers: "vm-kernel-precomp-win-release-x64-stable"
-  triggers: "vm-kernel-reload-linux-debug-x64-stable"
-  triggers: "vm-kernel-reload-linux-release-x64-stable"
-  triggers: "vm-kernel-reload-mac-debug-simdbc64-stable"
-  triggers: "vm-kernel-reload-mac-release-simdbc64-stable"
-  triggers: "vm-kernel-reload-rollback-linux-debug-x64-stable"
-  triggers: "vm-kernel-reload-rollback-linux-release-x64-stable"
-  triggers: "vm-kernel-win-debug-ia32-stable"
-  triggers: "vm-kernel-win-release-ia32-stable"
-  gitiles: <
-    repo: "https://dart.googlesource.com/sdk"
-    refs: "regexp:refs/heads/stable"
-    path_regexps: "DEPS"
-    path_regexps: "build/.+"
-    path_regexps: "pkg/(front_end|kernel|vm)/.+"
-    path_regexps: "runtime/.+"
-    path_regexps: "sdk/.+"
-    path_regexps: "tests/.+"
-  >
->
 acl_sets: <
   name: "ci"
   acls: <
diff --git a/main.star b/main.star
index 9aac6aad3641..c3b0e064af4e 100755
--- a/main.star
+++ b/main.star
@@ -180,7 +180,7 @@ def dart_poller(name, bucket="ci", branches=BRANCHES, paths=None):
 
 
 dart_poller("dart-gitiles-trigger", branches=BRANCHES + ["analyzer-stable"])
-dart_poller("dart-vm-gitiles-trigger", paths=[
+dart_poller("dart-vm-gitiles-trigger", branches=["master"], paths=[
     "DEPS",
     "build/.+",
     "pkg/(front_end|kernel|vm)/.+",
@@ -323,10 +323,13 @@ def dart_builder(name,
                 channel_properties['no_approvals'] = True
             if enabled and schedule == "triggered":
                 if not triggered_by:
-                    triggered_by = ["dart-gitiles-trigger-%s" % branch]
-                elif len(triggered_by) == 1:
-                    # triggered_by may not contain a '%s' so we replace.
-                    triggered_by = [triggered_by[0].replace("%s", branch)]
+                    triggered_by = ["dart-gitiles-trigger-%s"]
+                triggered_by = [trigger.replace("%s", branch) for
+                                trigger in triggered_by]
+                if channel in ['dev', 'stable']:
+                    # Always run vm builders on dev and stable.
+                    triggered_by = [trigger.replace("dart-vm-", "dart-")
+                                    for trigger in triggered_by]
             luci.builder(
                 name=builder,
                 build_numbers=True,

From 3354fbfac264f61296c6a65665a754bb4e04dfa1 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 13 Jun 2019 11:40:39 +0000
Subject: [PATCH 281/826] [infra] Prevent builders from accidentally being run
 on Docker bots

Ordinary Linux bots have an "inside_docker" dimension value "0". Bots on
other OSs don't have this dimension set. This change ensures that
non-Docker enabled builders will always run on regular bots.

Change-Id: Iab3e30514f47a5ec1ae679f8037e95c5a51c198f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/104981
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 236 +++++++++++++++++++++++++++++++++++++++++++++
 main.star          |   3 +-
 2 files changed, 238 insertions(+), 1 deletion(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 49ba7a563366..61827c807d8c 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -27,6 +27,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -69,6 +70,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -90,6 +92,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -111,6 +114,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -133,6 +137,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -285,6 +290,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -306,6 +312,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -328,6 +335,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -350,6 +358,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -371,6 +380,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -392,6 +402,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -414,6 +425,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -435,6 +447,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -457,6 +470,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -499,6 +513,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -521,6 +536,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -543,6 +559,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -566,6 +583,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -589,6 +607,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -611,6 +630,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -633,6 +653,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -656,6 +677,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -859,6 +881,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -881,6 +904,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -904,6 +928,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -927,6 +952,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -949,6 +975,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -972,6 +999,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -995,6 +1023,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1017,6 +1046,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1040,6 +1070,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1063,6 +1094,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1085,6 +1117,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1108,6 +1141,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1131,6 +1165,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1153,6 +1188,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1176,6 +1212,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1199,6 +1236,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1221,6 +1259,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1244,6 +1283,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1267,6 +1307,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1289,6 +1330,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1312,6 +1354,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1335,6 +1378,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1357,6 +1401,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1380,6 +1425,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1403,6 +1449,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1425,6 +1472,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1448,6 +1496,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1811,6 +1860,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1833,6 +1883,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1856,6 +1907,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1879,6 +1931,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1901,6 +1954,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1924,6 +1978,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2083,6 +2138,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2104,6 +2160,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2125,6 +2182,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2146,6 +2204,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2168,6 +2227,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2191,6 +2251,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2350,6 +2411,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2371,6 +2433,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2392,6 +2455,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2414,6 +2478,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2436,6 +2501,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2458,6 +2524,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2480,6 +2547,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2503,6 +2571,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2662,6 +2731,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2684,6 +2754,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2707,6 +2778,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2730,6 +2802,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2752,6 +2825,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2775,6 +2849,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2798,6 +2873,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2820,6 +2896,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2843,6 +2920,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2866,6 +2944,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2888,6 +2967,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2911,6 +2991,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2934,6 +3015,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2956,6 +3038,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2979,6 +3062,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3002,6 +3086,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3024,6 +3109,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3047,6 +3133,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3070,6 +3157,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3092,6 +3180,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3115,6 +3204,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3138,6 +3228,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3160,6 +3251,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3183,6 +3275,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3206,6 +3299,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3228,6 +3322,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3251,6 +3346,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3274,6 +3370,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3296,6 +3393,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3319,6 +3417,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3342,6 +3441,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3364,6 +3464,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3387,6 +3488,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3410,6 +3512,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3432,6 +3535,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3455,6 +3559,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3478,6 +3583,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3500,6 +3606,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3523,6 +3630,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3546,6 +3654,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3568,6 +3677,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3591,6 +3701,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3614,6 +3725,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3636,6 +3748,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3659,6 +3772,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3682,6 +3796,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3704,6 +3819,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3727,6 +3843,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3750,6 +3867,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3772,6 +3890,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3795,6 +3914,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3818,6 +3938,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3840,6 +3961,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3863,6 +3985,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3886,6 +4009,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3908,6 +4032,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3931,6 +4056,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3954,6 +4080,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3976,6 +4103,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3999,6 +4127,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4022,6 +4151,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4044,6 +4174,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4067,6 +4198,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4430,6 +4562,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4452,6 +4585,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4475,6 +4609,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4498,6 +4633,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4520,6 +4656,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4543,6 +4680,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4566,6 +4704,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4589,6 +4728,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4613,6 +4753,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4637,6 +4778,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4659,6 +4801,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4682,6 +4825,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4705,6 +4849,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4727,6 +4872,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4750,6 +4896,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4773,6 +4920,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4795,6 +4943,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4818,6 +4967,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4841,6 +4991,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4863,6 +5014,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4886,6 +5038,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4909,6 +5062,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4931,6 +5085,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4954,6 +5109,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4977,6 +5133,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4999,6 +5156,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5022,6 +5180,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5045,6 +5204,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5067,6 +5227,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5090,6 +5251,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5113,6 +5275,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5135,6 +5298,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5158,6 +5322,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5249,6 +5414,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5271,6 +5437,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5294,6 +5461,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5453,6 +5621,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5475,6 +5644,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5498,6 +5668,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5521,6 +5692,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5543,6 +5715,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5566,6 +5739,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5725,6 +5899,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5747,6 +5922,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5770,6 +5946,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5793,6 +5970,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5815,6 +5993,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5838,6 +6017,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6221,6 +6401,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6243,6 +6424,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6309,6 +6491,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6331,6 +6514,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6353,6 +6537,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6459,6 +6644,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6522,6 +6708,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6544,6 +6731,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6566,6 +6754,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6588,6 +6777,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6610,6 +6800,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6742,6 +6933,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6764,6 +6956,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6830,6 +7023,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6851,6 +7045,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6872,6 +7067,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6938,6 +7134,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6959,6 +7156,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6981,6 +7179,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7047,6 +7246,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7069,6 +7269,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7091,6 +7292,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7113,6 +7315,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7135,6 +7338,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7157,6 +7361,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7179,6 +7384,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7201,6 +7407,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7223,6 +7430,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7245,6 +7453,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7267,6 +7476,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7289,6 +7499,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7311,6 +7522,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7333,6 +7545,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7355,6 +7568,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7377,6 +7591,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7399,6 +7614,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7421,6 +7637,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7443,6 +7660,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7465,6 +7683,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7487,6 +7706,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7619,6 +7839,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7641,6 +7862,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7663,6 +7885,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7686,6 +7909,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7708,6 +7932,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7730,6 +7955,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7752,6 +7978,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7774,6 +8001,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7796,6 +8024,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7818,6 +8047,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7840,6 +8070,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7884,6 +8115,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7950,6 +8182,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7972,6 +8205,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -8038,6 +8272,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -8060,6 +8295,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
diff --git a/main.star b/main.star
index c3b0e064af4e..e886fb9064cc 100755
--- a/main.star
+++ b/main.star
@@ -301,7 +301,8 @@ def dart_builder(name,
                  on_cq=False,
                  experiment_percentage=None,
                  location_regexp=None):
-    dimensions.setdefault("os", "Linux")
+    if dimensions.setdefault("os", "Linux") == "Linux":
+        dimensions.setdefault("inside_docker", "0")
     dimensions.setdefault("pool", "luci.dart.try")
     dimensions["cpu"] = cpu
     properties.setdefault("clobber", "true")

From 4f9de7390e326bd0836d561239b76419719755a7 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Sun, 16 Jun 2019 20:13:09 +0000
Subject: [PATCH 282/826] [infra] Use host_class dimension instead of
 inside_docker

host_class is a custom dimension completely under our control. Using it
will insulate us from any changes to how the inside_docker dimension
works.

See also https://crbug.com/943565

TBR=whesse@google.com

Change-Id: Ifa5d88b393c2b732946427ce6dd279eadf68de5a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/105944
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 595 +++++++++++++++++++++++++++------------------
 main.star          |   4 +-
 2 files changed, 361 insertions(+), 238 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 61827c807d8c..afa1a3ba49b5 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -27,7 +27,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -49,6 +49,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -70,7 +71,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -92,7 +93,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -114,7 +115,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -137,7 +138,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -160,6 +161,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -181,6 +183,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -203,6 +206,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -225,6 +229,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -246,6 +251,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -268,6 +274,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -290,7 +297,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -312,7 +319,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -335,7 +342,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -358,7 +365,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -380,7 +387,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -402,7 +409,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -425,7 +432,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -447,7 +454,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -470,7 +477,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
@@ -513,7 +520,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -536,7 +543,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -559,7 +566,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -583,7 +590,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -607,7 +614,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -630,7 +637,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -653,7 +660,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -677,7 +684,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -701,6 +708,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -723,6 +731,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -745,6 +754,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -768,6 +778,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -791,6 +802,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -813,6 +825,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -835,6 +848,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -858,6 +872,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -881,7 +896,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -904,7 +919,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -928,7 +943,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -952,7 +967,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -975,7 +990,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -999,7 +1014,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1023,7 +1038,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1046,7 +1061,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1070,7 +1085,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1094,7 +1109,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1117,7 +1132,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1141,7 +1156,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1165,7 +1180,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1188,7 +1203,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1212,7 +1227,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1236,7 +1251,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1259,7 +1274,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1283,7 +1298,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1307,7 +1322,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1330,7 +1345,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1354,7 +1369,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1378,7 +1393,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1401,7 +1416,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1425,7 +1440,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1449,7 +1464,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1472,7 +1487,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1496,7 +1511,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1520,6 +1535,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1542,6 +1558,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1565,6 +1582,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1588,6 +1606,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1610,6 +1629,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1633,6 +1653,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1656,6 +1677,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1678,6 +1700,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1701,6 +1724,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1724,6 +1748,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1746,6 +1771,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1769,6 +1795,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1792,6 +1819,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1814,6 +1842,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1837,6 +1866,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1860,7 +1890,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1883,7 +1913,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1907,7 +1937,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1931,7 +1961,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1954,7 +1984,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -1978,7 +2008,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2002,6 +2032,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2024,6 +2055,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2047,6 +2079,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2070,6 +2103,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2092,6 +2126,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2115,6 +2150,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2138,7 +2174,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2160,7 +2196,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2182,7 +2218,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2204,7 +2240,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2227,7 +2263,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2251,7 +2287,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2275,6 +2311,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2297,6 +2334,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2320,6 +2358,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2343,6 +2382,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2365,6 +2405,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2388,6 +2429,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2411,7 +2453,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2433,7 +2475,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2455,7 +2497,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2478,7 +2520,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2501,7 +2543,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2524,7 +2566,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2547,7 +2589,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2571,7 +2613,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2595,6 +2637,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2617,6 +2660,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2640,6 +2684,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2663,6 +2708,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2685,6 +2731,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2708,6 +2755,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2731,7 +2779,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2754,7 +2802,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2778,7 +2826,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2802,7 +2850,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2825,7 +2873,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2849,7 +2897,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2873,7 +2921,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2896,7 +2944,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2920,7 +2968,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2944,7 +2992,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2967,7 +3015,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -2991,7 +3039,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3015,7 +3063,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3038,7 +3086,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3062,7 +3110,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3086,7 +3134,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3109,7 +3157,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3133,7 +3181,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3157,7 +3205,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3180,7 +3228,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3204,7 +3252,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3228,7 +3276,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3251,7 +3299,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3275,7 +3323,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3299,7 +3347,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3322,7 +3370,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3346,7 +3394,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3370,7 +3418,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3393,7 +3441,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3417,7 +3465,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3441,7 +3489,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3464,7 +3512,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3488,7 +3536,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3512,7 +3560,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3535,7 +3583,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3559,7 +3607,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3583,7 +3631,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3606,7 +3654,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3630,7 +3678,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3654,7 +3702,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3677,7 +3725,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3701,7 +3749,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3725,7 +3773,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3748,7 +3796,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3772,7 +3820,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3796,7 +3844,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3819,7 +3867,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3843,7 +3891,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3867,7 +3915,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3890,7 +3938,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3914,7 +3962,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3938,7 +3986,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3961,7 +4009,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -3985,7 +4033,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4009,7 +4057,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4032,7 +4080,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4056,7 +4104,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4080,7 +4128,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4103,7 +4151,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4127,7 +4175,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4151,7 +4199,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4174,7 +4222,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4198,7 +4246,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4222,6 +4270,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4244,6 +4293,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4267,6 +4317,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4290,6 +4341,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4312,6 +4364,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4335,6 +4388,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4358,6 +4412,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4380,6 +4435,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4403,6 +4459,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4426,6 +4483,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4448,6 +4506,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4471,6 +4530,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4494,6 +4554,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4516,6 +4577,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4539,6 +4601,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4562,7 +4625,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4585,7 +4648,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4609,7 +4672,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4633,7 +4696,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4656,7 +4719,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4680,7 +4743,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4704,7 +4767,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4728,7 +4791,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4753,7 +4816,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4778,7 +4841,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4801,7 +4864,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4825,7 +4888,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4849,7 +4912,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4872,7 +4935,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4896,7 +4959,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4920,7 +4983,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4943,7 +5006,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4967,7 +5030,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -4991,7 +5054,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5014,7 +5077,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5038,7 +5101,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5062,7 +5125,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5085,7 +5148,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5109,7 +5172,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5133,7 +5196,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5156,7 +5219,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5180,7 +5243,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5204,7 +5267,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5227,7 +5290,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5251,7 +5314,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5275,7 +5338,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5298,7 +5361,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5322,7 +5385,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5346,6 +5409,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5368,6 +5432,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5391,6 +5456,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5414,7 +5480,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5437,7 +5503,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5461,7 +5527,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5485,6 +5551,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5507,6 +5574,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5530,6 +5598,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5553,6 +5622,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5575,6 +5645,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5598,6 +5669,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5621,7 +5693,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5644,7 +5716,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5668,7 +5740,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5692,7 +5764,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5715,7 +5787,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5739,7 +5811,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5763,6 +5835,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5785,6 +5858,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5808,6 +5882,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5831,6 +5906,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5853,6 +5929,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5876,6 +5953,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5899,7 +5977,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5922,7 +6000,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5946,7 +6024,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5970,7 +6048,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -5993,7 +6071,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6017,7 +6095,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6041,6 +6119,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6063,6 +6142,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6086,6 +6166,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6109,6 +6190,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6131,6 +6213,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6154,6 +6237,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6177,6 +6261,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6199,6 +6284,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6222,6 +6308,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6245,6 +6332,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6267,6 +6355,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6290,6 +6379,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6313,6 +6403,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6335,6 +6426,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6358,6 +6450,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6401,7 +6494,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6424,7 +6517,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6447,6 +6540,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6469,6 +6563,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6491,7 +6586,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6514,7 +6609,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6537,7 +6632,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6644,7 +6739,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6666,6 +6761,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6687,6 +6783,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6708,7 +6805,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6731,7 +6828,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6754,7 +6851,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6777,7 +6874,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6800,7 +6897,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6823,6 +6920,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6845,6 +6943,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6867,6 +6966,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6889,6 +6989,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6911,6 +7012,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6933,7 +7035,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6956,7 +7058,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6979,6 +7081,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7001,6 +7104,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7023,7 +7127,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7045,7 +7149,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7067,7 +7171,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7090,6 +7194,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7112,6 +7217,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7134,7 +7240,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7156,7 +7262,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7179,7 +7285,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7202,6 +7308,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7224,6 +7331,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7246,7 +7354,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7269,7 +7377,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7292,7 +7400,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7315,7 +7423,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7338,7 +7446,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7361,7 +7469,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7384,7 +7492,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7407,7 +7515,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7430,7 +7538,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7453,7 +7561,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7476,7 +7584,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7499,7 +7607,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7522,7 +7630,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7545,7 +7653,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7568,7 +7676,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7591,7 +7699,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7614,7 +7722,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7637,7 +7745,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7660,7 +7768,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7683,7 +7791,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7706,7 +7814,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7729,6 +7837,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7751,6 +7860,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7773,6 +7883,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7795,6 +7906,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7817,6 +7929,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7839,7 +7952,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7862,7 +7975,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7885,7 +7998,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7909,7 +8022,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7932,7 +8045,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7955,7 +8068,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -7978,7 +8091,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -8001,7 +8114,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -8024,7 +8137,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -8047,7 +8160,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -8070,7 +8183,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -8093,6 +8206,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -8115,7 +8229,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -8138,6 +8252,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -8160,6 +8275,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -8182,7 +8298,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -8205,7 +8321,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -8228,6 +8344,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -8250,6 +8367,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -8272,7 +8390,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -8295,7 +8413,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -8318,6 +8436,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -8340,6 +8459,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -8362,6 +8482,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -8384,6 +8505,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -8406,6 +8528,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
diff --git a/main.star b/main.star
index e886fb9064cc..e591d43d750d 100755
--- a/main.star
+++ b/main.star
@@ -301,8 +301,8 @@ def dart_builder(name,
                  on_cq=False,
                  experiment_percentage=None,
                  location_regexp=None):
-    if dimensions.setdefault("os", "Linux") == "Linux":
-        dimensions.setdefault("inside_docker", "0")
+    dimensions.setdefault("os", "Linux")
+    dimensions.setdefault("host_class", "default")
     dimensions.setdefault("pool", "luci.dart.try")
     dimensions["cpu"] = cpu
     properties.setdefault("clobber", "true")

From f7d9958c21e344119ee7e02b71753815627de114 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 17 Jun 2019 18:56:57 +0000
Subject: [PATCH 283/826] [dart] Add host_class=default for pure try jobs

This was only set for builders that also have try jobs, but not for pure
try jobs. This caused docker bots to pickup tasks they shouldn't run.

TBR=whesse@google.com

Change-Id: I90944ba707bb92f8f7452fddc5d0611a06709d45
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/106341
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 4 ++++
 main.star          | 1 +
 2 files changed, 5 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index afa1a3ba49b5..d1d01f2bd6b8 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -6655,6 +6655,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6676,6 +6677,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6697,6 +6699,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
@@ -6718,6 +6721,7 @@ buckets: <
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
diff --git a/main.star b/main.star
index e591d43d750d..567e124c2079 100755
--- a/main.star
+++ b/main.star
@@ -252,6 +252,7 @@ def dart_try_builder(name,
     dimensions = dict(dimensions)
     dimensions["pool"] = "luci.dart.try"
     dimensions.setdefault("os", "Linux")
+    dimensions.setdefault("host_class", "default")
     dimensions.setdefault("cpu", "x86-64")
     properties.setdefault("clobber", "true")
     builder = name + "-try"

From 0c9fc87c3bc444a8570329e7476730d440faf3e6 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 25 Jun 2019 19:32:42 +0000
Subject: [PATCH 284/826] [infra] Add vm-dartkb-linux-release-x64-abi to Luci
 config

Change-Id: Iad7e8a6ee4d13f326dbd5a19c06ab50666160b2e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/101160
Reviewed-by: Liam Appelbe <liama@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 94 ++++++++++++++++++++++++++++++++++++++++++++++
 luci-milo.cfg      | 20 ++++++++++
 luci-notify.cfg    | 15 ++++++++
 luci-scheduler.cfg | 33 ++++++++++++++++
 main.star          |  2 +
 5 files changed, 164 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index d1d01f2bd6b8..2a8bae3b3542 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -3223,6 +3223,77 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-dartkb-linux-release-x64-abi"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-release-x64-abi-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-release-x64-abi-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-dartkb-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
@@ -7491,6 +7562,29 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-dartkb-linux-release-x64-abi-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-dartkb-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index b08510b1d050..11f066941399 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -137,6 +137,11 @@ consoles: <
     category: "vm|dartkb"
     short_name: "r"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-abi"
+    category: "vm|dartkb"
+    short_name: "abi"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
     category: "vm|kernel"
@@ -769,6 +774,11 @@ consoles: <
     category: "vm|dartkb"
     short_name: "r"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-abi"
+    category: "vm|dartkb"
+    short_name: "abi"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
     category: "vm|kernel"
@@ -1101,6 +1111,11 @@ consoles: <
     category: "vm|dartkb"
     short_name: "r"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-abi-dev"
+    category: "vm|dartkb"
+    short_name: "abi"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-dev"
     category: "vm|kernel"
@@ -1568,6 +1583,11 @@ consoles: <
     category: "vm|dartkb"
     short_name: "r"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-abi-stable"
+    category: "vm|dartkb"
+    short_name: "abi"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-stable"
     category: "vm|kernel"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index ba7d8586d9b8..1802ddec24a5 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -691,6 +691,21 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-dartkb-linux-release-x64-abi"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index e71d081dd44f..4b3bbd4946de 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1333,6 +1333,36 @@ job: <
     builder: "vm-dartkb-linux-release-x64"
   >
 >
+job: <
+  id: "vm-dartkb-linux-release-x64-abi"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-release-x64-abi"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-release-x64-abi-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-release-x64-abi-dev"
+  >
+>
+job: <
+  id: "vm-dartkb-linux-release-x64-abi-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-release-x64-abi-stable"
+  >
+>
 job: <
   id: "vm-dartkb-linux-release-x64-dev"
   schedule: "triggered"
@@ -2776,6 +2806,7 @@ trigger: <
   triggers: "vm-dartkb-linux-product-simarm64-dev"
   triggers: "vm-dartkb-linux-product-x64-dev"
   triggers: "vm-dartkb-linux-release-simarm64-dev"
+  triggers: "vm-dartkb-linux-release-x64-abi-dev"
   triggers: "vm-dartkb-linux-release-x64-dev"
   triggers: "vm-ffi-android-debug-arm-dev"
   triggers: "vm-ffi-android-product-arm-dev"
@@ -2931,6 +2962,7 @@ trigger: <
   triggers: "vm-dartkb-linux-product-simarm64-stable"
   triggers: "vm-dartkb-linux-product-x64-stable"
   triggers: "vm-dartkb-linux-release-simarm64-stable"
+  triggers: "vm-dartkb-linux-release-x64-abi-stable"
   triggers: "vm-dartkb-linux-release-x64-stable"
   triggers: "vm-ffi-android-debug-arm-stable"
   triggers: "vm-ffi-android-product-arm-stable"
@@ -2995,6 +3027,7 @@ trigger: <
   triggers: "vm-dartkb-linux-product-x64"
   triggers: "vm-dartkb-linux-release-simarm64"
   triggers: "vm-dartkb-linux-release-x64"
+  triggers: "vm-dartkb-linux-release-x64-abi"
   triggers: "vm-ffi-android-debug-arm"
   triggers: "vm-ffi-android-product-arm"
   triggers: "vm-ffi-android-release-arm"
diff --git a/main.star b/main.star
index 567e124c2079..b16179abb152 100755
--- a/main.star
+++ b/main.star
@@ -457,6 +457,8 @@ dart_vm_extra_builder("vm-dartkb-linux-product-x64", category="vm|dartkb|p")
 dart_vm_extra_builder("vm-dartkb-linux-release-simarm64",
                         category="vm|dartkb|sr")
 dart_vm_extra_builder("vm-dartkb-linux-release-x64", category="vm|dartkb|r")
+dart_vm_extra_builder("vm-dartkb-linux-release-x64-abi",
+                        category="vm|dartkb|abi")
 
 #vm|kernel
 dart_ci_sandbox_builder("vm-canary-linux-debug",

From fe377a1a8274e56cb4a32736c5f0eaa510785be7 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 27 Jun 2019 07:44:03 +0000
Subject: [PATCH 285/826] [infra] Exclude VM extra builders from non-VM CQ runs

This removes vm-kernel-linux-release-simdbc64 from non-VM CQ runs.

Change-Id: I7a1966cfb9d5d93b2d98ad0b914d0a6efc236325
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/107401
Reviewed-by: William Hesse <whesse@google.com>
Reviewed-by: Siva Annamalai <asiva@google.com>
---
 commit-queue.cfg |  6 ++++++
 main.star        | 29 +++++++++++++++++++----------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index e14f992df8a0..cc1ae9255d71 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -83,6 +83,12 @@ config_groups: <
       >
       builders: <
         name: "dart/try/vm-kernel-linux-release-simdbc64-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|vm)/.+"
+        location_regexp: ".+/[+]/runtime/.+"
+        location_regexp: ".+/[+]/sdk/.+"
+        location_regexp: ".+/[+]/tests/.+"
       >
       builders: <
         name: "dart/try/vm-kernel-linux-release-x64-try"
diff --git a/main.star b/main.star
index b16179abb152..740f92ceff12 100755
--- a/main.star
+++ b/main.star
@@ -18,6 +18,16 @@ ANALYZER_CHANNELS = ["analyzer-stable"] + CHANNELS
 BRANCHES = ["master", "dev", "stable"]
 
 
+VM_PATHS = [
+    "DEPS",
+    "build/.+",
+    "pkg/(front_end|kernel|vm)/.+",
+    "runtime/.+",
+    "sdk/.+",
+    "tests/.+",
+]
+
+
 def mac():
     return {"os": "Mac"}
 
@@ -180,14 +190,7 @@ def dart_poller(name, bucket="ci", branches=BRANCHES, paths=None):
 
 
 dart_poller("dart-gitiles-trigger", branches=BRANCHES + ["analyzer-stable"])
-dart_poller("dart-vm-gitiles-trigger", branches=["master"], paths=[
-    "DEPS",
-    "build/.+",
-    "pkg/(front_end|kernel|vm)/.+",
-    "runtime/.+",
-    "sdk/.+",
-    "tests/.+",
-])
+dart_poller("dart-vm-gitiles-trigger", branches=["master"], paths=VM_PATHS)
 
 luci.gitiles_poller(
     name="dart-flutter-engine-trigger",
@@ -406,9 +409,15 @@ def dart_ci_sandbox_builder(name,
                  **kwargs)
 
 
-def dart_vm_extra_builder(name, **kwargs):
+def dart_vm_extra_builder(name, on_cq=False, location_regexp=None, **kwargs):
     triggered_by = ["dart-vm-gitiles-trigger-%s"]
-    dart_ci_sandbox_builder(name, triggered_by=triggered_by, **kwargs)
+    if on_cq and not location_regexp:
+      location_regexp = [".+/[+]/%s" % path for path in VM_PATHS]
+    dart_ci_sandbox_builder(
+        name,
+        triggered_by=triggered_by,
+        on_cq=on_cq,
+        location_regexp=location_regexp, **kwargs)
 
 
 # fasta

From 5ad11c0dccb2a8b1ffe05a7260f0c74b74674dcf Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 27 Jun 2019 10:26:29 +0000
Subject: [PATCH 286/826] [infra] Add dart2js-rti builder to Luci configuration

Change-Id: I87e95fc16e2da59d482451bfc917ec3d9cb851ae
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/107409
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 94 ++++++++++++++++++++++++++++++++++++++++++++++
 luci-milo.cfg      | 20 ++++++++++
 luci-notify.cfg    | 15 ++++++++
 luci-scheduler.cfg | 33 ++++++++++++++++
 main.star          |  1 +
 5 files changed, 163 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 2a8bae3b3542..aa368c215bde 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1317,6 +1317,77 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "dart2js-rti-linux-x64-d8"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-rti-linux-x64-d8-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-rti-linux-x64-d8-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "dart2js-strong-hostasserts-linux-ia32-d8"
       swarming_host: "chromium-swarm.appspot.com"
@@ -6921,6 +6992,29 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "dart2js-rti-linux-x64-d8-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "dart2js-strong-hostasserts-linux-ia32-d8-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 11f066941399..fd02a356d27d 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -382,6 +382,11 @@ consoles: <
     category: "dart2js|d8"
     short_name: "ha"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-rti-linux-x64-d8"
+    category: "dart2js|d8"
+    short_name: "rti"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
     category: "dart2js|d8"
@@ -589,6 +594,11 @@ consoles: <
     category: "dart2js|d8"
     short_name: "ha"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-rti-linux-x64-d8"
+    category: "dart2js|d8"
+    short_name: "rti"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
     category: "dart2js|d8"
@@ -1356,6 +1366,11 @@ consoles: <
     category: "dart2js|d8"
     short_name: "ha"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-rti-linux-x64-d8-dev"
+    category: "dart2js|d8"
+    short_name: "rti"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-dev"
     category: "dart2js|d8"
@@ -1828,6 +1843,11 @@ consoles: <
     category: "dart2js|d8"
     short_name: "ha"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-rti-linux-x64-d8-stable"
+    category: "dart2js|d8"
+    short_name: "rti"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-stable"
     category: "dart2js|d8"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 1802ddec24a5..a231bd7b38d4 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -257,6 +257,21 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "dart2js-rti-linux-x64-d8"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 4b3bbd4946de..7dc844abab0c 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -444,6 +444,36 @@ job: <
     builder: "dart2js-minified-strong-linux-x64-d8-stable"
   >
 >
+job: <
+  id: "dart2js-rti-linux-x64-d8"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-rti-linux-x64-d8"
+  >
+>
+job: <
+  id: "dart2js-rti-linux-x64-d8-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-rti-linux-x64-d8-dev"
+  >
+>
+job: <
+  id: "dart2js-rti-linux-x64-d8-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-rti-linux-x64-d8-stable"
+  >
+>
 job: <
   id: "dart2js-strong-hostasserts-linux-ia32-d8"
   schedule: "triggered"
@@ -2781,6 +2811,7 @@ trigger: <
   triggers: "cross-vm-linux-release-arm64-dev"
   triggers: "dart2js-csp-minified-linux-x64-chrome-dev"
   triggers: "dart2js-minified-strong-linux-x64-d8-dev"
+  triggers: "dart2js-rti-linux-x64-d8-dev"
   triggers: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
   triggers: "dart2js-strong-linux-x64-chrome-dev"
   triggers: "dart2js-strong-linux-x64-firefox-dev"
@@ -2882,6 +2913,7 @@ trigger: <
   triggers: "analyzer-win-release"
   triggers: "dart2js-csp-minified-linux-x64-chrome"
   triggers: "dart2js-minified-strong-linux-x64-d8"
+  triggers: "dart2js-rti-linux-x64-d8"
   triggers: "dart2js-strong-hostasserts-linux-ia32-d8"
   triggers: "dart2js-strong-linux-x64-chrome"
   triggers: "dart2js-strong-linux-x64-firefox"
@@ -2937,6 +2969,7 @@ trigger: <
   triggers: "cross-vm-linux-release-arm64-stable"
   triggers: "dart2js-csp-minified-linux-x64-chrome-stable"
   triggers: "dart2js-minified-strong-linux-x64-d8-stable"
+  triggers: "dart2js-rti-linux-x64-d8-stable"
   triggers: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
   triggers: "dart2js-strong-linux-x64-chrome-stable"
   triggers: "dart2js-strong-linux-x64-firefox-stable"
diff --git a/main.star b/main.star
index 740f92ceff12..88acd2455750 100755
--- a/main.star
+++ b/main.star
@@ -596,6 +596,7 @@ dart_vm_extra_builder("vm-ffi-android-product-arm", category="vm|ffi|p32")
 dart_ci_sandbox_builder("dart2js-strong-hostasserts-linux-ia32-d8",
                         category="dart2js|d8|ha",
                         on_cq=True)
+dart_ci_sandbox_builder("dart2js-rti-linux-x64-d8", category="dart2js|d8|rti")
 dart_ci_sandbox_builder("dart2js-minified-strong-linux-x64-d8",
                         category="dart2js|d8|mi",
                         on_cq=True)

From 160fd2562ef2a60aadeaf1513484365bee6c9357 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 30 Jul 2019 08:11:50 +0000
Subject: [PATCH 287/826] [infra] Enable cancel stale tryjobs feature on the CQ

This should save some capacity when people upload new patchsets.

Change-Id: I818431fee1900a3e6e73b9f9d9c45de579b4f378
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/110907
Reviewed-by: William Hesse <whesse@google.com>
---
 commit-queue.cfg | 1 +
 main.star        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index cc1ae9255d71..85c6298df95e 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -99,6 +99,7 @@ config_groups: <
       >
       retry_config: <
       >
+      cancel_stale_tryjobs: YES
     >
   >
 >
diff --git a/main.star b/main.star
index 88acd2455750..475fe31cf644 100755
--- a/main.star
+++ b/main.star
@@ -234,6 +234,7 @@ luci.cq_group(
     tree_status_host="dart-status.appspot.com",
     retry_config=cq.RETRY_NONE,
     verifiers=None,
+    cancel_stale_tryjobs = True,
 )
 
 

From 91906df57c0b63d72c71ffdcfe25d0854e74f6e9 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 31 Jul 2019 08:23:13 +0000
Subject: [PATCH 288/826] [infra] Add simarm_x64 builders to the Luci
 configuration (#37435)

TBR=whesse@google.com

Change-Id: I500c1865450f5a971ef6d4ad1ea34e671d97f8cd
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/110918
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 188 +++++++++++++++++++++++++++++++++++++++++++++
 luci-milo.cfg      |  64 ++++++++++++---
 luci-notify.cfg    |  30 ++++++++
 luci-scheduler.cfg |  66 ++++++++++++++++
 main.star          |  12 ++-
 5 files changed, 345 insertions(+), 15 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index aa368c215bde..d30407ec4a64 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -5546,6 +5546,77 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-kernel-precomp-mac-debug-simarm_x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-mac-debug-simarm_x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-mac-debug-simarm_x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-precomp-mac-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -5617,6 +5688,77 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-kernel-precomp-mac-release-simarm_x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-mac-release-simarm_x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-mac-release-simarm_x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-precomp-obfuscate-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8393,6 +8535,29 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-kernel-precomp-mac-debug-simarm_x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-precomp-mac-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8416,6 +8581,29 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-kernel-precomp-mac-release-simarm_x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-precomp-obfuscate-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index fd02a356d27d..b6972ae61232 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -270,23 +270,33 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-x64"
     category: "vm|kernel-precomp"
-    short_name: "br"
+    short_name: "b"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm"
     category: "vm|kernel-precomp"
-    short_name: "bra32"
+    short_name: "b32"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm64"
     category: "vm|kernel-precomp"
-    short_name: "bra64"
+    short_name: "b64"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
     category: "vm|kernel-precomp"
     short_name: "o"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-debug-simarm_x64"
+    category: "vm|kernel-precomp"
+    short_name: "ad"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm_x64"
+    category: "vm|kernel-precomp"
+    short_name: "ar"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
     category: "vm|kernel-precomp"
@@ -917,23 +927,33 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-x64"
     category: "vm|kernel-precomp"
-    short_name: "br"
+    short_name: "b"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm"
     category: "vm|kernel-precomp"
-    short_name: "bra32"
+    short_name: "b32"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm64"
     category: "vm|kernel-precomp"
-    short_name: "bra64"
+    short_name: "b64"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
     category: "vm|kernel-precomp"
     short_name: "o"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-debug-simarm_x64"
+    category: "vm|kernel-precomp"
+    short_name: "ad"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm_x64"
+    category: "vm|kernel-precomp"
+    short_name: "ar"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
     category: "vm|kernel-precomp"
@@ -1254,23 +1274,33 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-x64-dev"
     category: "vm|kernel-precomp"
-    short_name: "br"
+    short_name: "b"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm-dev"
     category: "vm|kernel-precomp"
-    short_name: "bra32"
+    short_name: "b32"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm64-dev"
     category: "vm|kernel-precomp"
-    short_name: "bra64"
+    short_name: "b64"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "o"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-debug-simarm_x64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "ad"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm_x64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "ar"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-dev"
     category: "vm|kernel-precomp"
@@ -1731,23 +1761,33 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-x64-stable"
     category: "vm|kernel-precomp"
-    short_name: "br"
+    short_name: "b"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm-stable"
     category: "vm|kernel-precomp"
-    short_name: "bra32"
+    short_name: "b32"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm64-stable"
     category: "vm|kernel-precomp"
-    short_name: "bra64"
+    short_name: "b64"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "o"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-debug-simarm_x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "ad"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm_x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "ar"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-stable"
     category: "vm|kernel-precomp"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index a231bd7b38d4..5e89605d7056 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -1171,6 +1171,21 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-mac-debug-simarm_x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
@@ -1186,6 +1201,21 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-mac-release-simarm_x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 7dc844abab0c..a01a497157c3 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -2313,6 +2313,36 @@ job: <
     builder: "vm-kernel-precomp-linux-release-x64-stable"
   >
 >
+job: <
+  id: "vm-kernel-precomp-mac-debug-simarm_x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-mac-debug-simarm_x64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-mac-debug-simarm_x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-mac-debug-simarm_x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-mac-debug-simarm_x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-mac-debug-simarm_x64-stable"
+  >
+>
 job: <
   id: "vm-kernel-precomp-mac-release-simarm64"
   schedule: "triggered"
@@ -2343,6 +2373,36 @@ job: <
     builder: "vm-kernel-precomp-mac-release-simarm64-stable"
   >
 >
+job: <
+  id: "vm-kernel-precomp-mac-release-simarm_x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-mac-release-simarm_x64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-mac-release-simarm_x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-mac-release-simarm_x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-mac-release-simarm_x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-mac-release-simarm_x64-stable"
+  >
+>
 job: <
   id: "vm-kernel-precomp-obfuscate-linux-release-x64"
   schedule: "triggered"
@@ -2869,7 +2929,9 @@ trigger: <
   triggers: "vm-kernel-precomp-linux-release-simarm-dev"
   triggers: "vm-kernel-precomp-linux-release-simarm64-dev"
   triggers: "vm-kernel-precomp-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-mac-debug-simarm_x64-dev"
   triggers: "vm-kernel-precomp-mac-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-mac-release-simarm_x64-dev"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-win-release-simarm64-dev"
   triggers: "vm-kernel-precomp-win-release-x64-dev"
@@ -3027,7 +3089,9 @@ trigger: <
   triggers: "vm-kernel-precomp-linux-release-simarm-stable"
   triggers: "vm-kernel-precomp-linux-release-simarm64-stable"
   triggers: "vm-kernel-precomp-linux-release-x64-stable"
+  triggers: "vm-kernel-precomp-mac-debug-simarm_x64-stable"
   triggers: "vm-kernel-precomp-mac-release-simarm64-stable"
+  triggers: "vm-kernel-precomp-mac-release-simarm_x64-stable"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-win-release-simarm64-stable"
   triggers: "vm-kernel-precomp-win-release-x64-stable"
@@ -3085,7 +3149,9 @@ trigger: <
   triggers: "vm-kernel-precomp-linux-release-simarm"
   triggers: "vm-kernel-precomp-linux-release-simarm64"
   triggers: "vm-kernel-precomp-linux-release-x64"
+  triggers: "vm-kernel-precomp-mac-debug-simarm_x64"
   triggers: "vm-kernel-precomp-mac-release-simarm64"
+  triggers: "vm-kernel-precomp-mac-release-simarm_x64"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64"
   triggers: "vm-kernel-precomp-win-release-simarm64"
   triggers: "vm-kernel-precomp-win-release-x64"
diff --git a/main.star b/main.star
index 475fe31cf644..8de619ebe612 100755
--- a/main.star
+++ b/main.star
@@ -537,13 +537,19 @@ dart_vm_extra_builder("vm-kernel-precomp-linux-release-simarm64",
 dart_vm_extra_builder("vm-kernel-precomp-linux-release-x64",
                         category="vm|kernel-precomp|r")
 dart_vm_extra_builder("vm-kernel-precomp-bare-linux-release-x64",
-                        category="vm|kernel-precomp|br")
+                        category="vm|kernel-precomp|b")
 dart_vm_extra_builder("vm-kernel-precomp-bare-linux-release-simarm",
-                        category="vm|kernel-precomp|bra32")
+                        category="vm|kernel-precomp|b32")
 dart_vm_extra_builder("vm-kernel-precomp-bare-linux-release-simarm64",
-                        category="vm|kernel-precomp|bra64")
+                        category="vm|kernel-precomp|b64")
 dart_vm_extra_builder("vm-kernel-precomp-obfuscate-linux-release-x64",
                         category="vm|kernel-precomp|o")
+dart_vm_extra_builder("vm-kernel-precomp-mac-debug-simarm_x64",
+                        category="vm|kernel-precomp|ad",
+                        dimensions=mac())
+dart_vm_extra_builder("vm-kernel-precomp-mac-release-simarm_x64",
+                        category="vm|kernel-precomp|ar",
+                        dimensions=mac())
 dart_vm_extra_builder("vm-kernel-precomp-mac-release-simarm64",
                         category="vm|kernel-precomp|ma",
                         dimensions=mac())

From 7e4bcda52a7a2fef197fc3b7ee87b46f51f8bdf3 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 5 Aug 2019 06:39:28 +0000
Subject: [PATCH 289/826] [infra] Increase shard timeout on simarm_x64 debug
 builder

TBR=whesse@google.com

Change-Id: I422d2d185e65e65f2646ad814b50e25cf6dafb40
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/111731
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 4 ++++
 main.star          | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index d30407ec4a64..42f1ec04ef42 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -5560,6 +5560,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5584,6 +5585,7 @@ buckets: <
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5608,6 +5610,7 @@ buckets: <
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -8549,6 +8552,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "shard_timeout:5400"
       >
       priority: 30
       caches: <
diff --git a/main.star b/main.star
index 8de619ebe612..7fb21c2a319b 100755
--- a/main.star
+++ b/main.star
@@ -525,7 +525,7 @@ dart_vm_extra_builder("cross-vm-linux-release-arm64",
 # vm|kernel-precomp
 dart_vm_extra_builder("vm-kernel-precomp-android-release-arm",
                         category="vm|kernel-precomp|and",
-                        properties={"shard_timeout": 5400})  # 1.5h
+                        properties={"shard_timeout": 5400}) # 1.5h
 dart_vm_extra_builder("vm-kernel-precomp-linux-debug-x64",
                         category="vm|kernel-precomp|d")
 dart_vm_extra_builder("vm-kernel-precomp-linux-product-x64",
@@ -546,7 +546,8 @@ dart_vm_extra_builder("vm-kernel-precomp-obfuscate-linux-release-x64",
                         category="vm|kernel-precomp|o")
 dart_vm_extra_builder("vm-kernel-precomp-mac-debug-simarm_x64",
                         category="vm|kernel-precomp|ad",
-                        dimensions=mac())
+                        dimensions=mac(),
+                        properties={"shard_timeout": 5400}) # 1.5h
 dart_vm_extra_builder("vm-kernel-precomp-mac-release-simarm_x64",
                         category="vm|kernel-precomp|ar",
                         dimensions=mac())

From 659faf8d745c0dc9490c653f5d3c11ac79f2b88a Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 8 Aug 2019 06:46:57 +0000
Subject: [PATCH 290/826] [infra] Add ddk-linux-release-firefox builder to Luci
 config

Change-Id: Ib760bcb024dde2f4e4647b6042518ff27affc53c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/112251
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 94 ++++++++++++++++++++++++++++++++++++++++++++++
 luci-milo.cfg      | 20 ++++++++++
 luci-notify.cfg    | 15 ++++++++
 luci-scheduler.cfg | 33 ++++++++++++++++
 main.star          |  2 +
 5 files changed, 164 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 42f1ec04ef42..f5eb4e8bd965 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -2240,6 +2240,77 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "ddk-linux-release-firefox"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddk-linux-release-firefox-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddk-linux-release-firefox-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "flutter-analyze"
       swarming_host: "chromium-swarm.appspot.com"
@@ -7436,6 +7507,29 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "ddk-linux-release-firefox-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "flutter-analyze-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index b6972ae61232..93daeaba3f05 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -502,6 +502,11 @@ consoles: <
     category: "ddc"
     short_name: "w"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox"
+    category: "ddc"
+    short_name: "fl"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
@@ -714,6 +719,11 @@ consoles: <
     category: "ddc"
     short_name: "w"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox"
+    category: "ddc"
+    short_name: "fl"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
@@ -1501,6 +1511,11 @@ consoles: <
     category: "ddc"
     short_name: "w"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-dev"
+    category: "ddc"
+    short_name: "fl"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
     category: "pkg"
@@ -1988,6 +2003,11 @@ consoles: <
     category: "ddc"
     short_name: "w"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-stable"
+    category: "ddc"
+    short_name: "fl"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
     category: "pkg"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 5e89605d7056..0d0fefc7b3f2 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -452,6 +452,21 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "ddk-linux-release-firefox"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index a01a497157c3..1070cb8b8ead 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -834,6 +834,36 @@ job: <
     builder: "ddc-win-release-chrome-stable"
   >
 >
+job: <
+  id: "ddk-linux-release-firefox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddk-linux-release-firefox"
+  >
+>
+job: <
+  id: "ddk-linux-release-firefox-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddk-linux-release-firefox-dev"
+  >
+>
+job: <
+  id: "ddk-linux-release-firefox-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddk-linux-release-firefox-stable"
+  >
+>
 job: <
   id: "debianpackage-linux"
   schedule: "triggered"
@@ -2884,6 +2914,7 @@ trigger: <
   triggers: "ddc-linux-release-chrome-dev"
   triggers: "ddc-mac-release-chrome-dev"
   triggers: "ddc-win-release-chrome-dev"
+  triggers: "ddk-linux-release-firefox-dev"
   triggers: "front-end-linux-release-x64-dev"
   triggers: "front-end-mac-release-x64-dev"
   triggers: "front-end-win-release-x64-dev"
@@ -2988,6 +3019,7 @@ trigger: <
   triggers: "ddc-linux-release-chrome"
   triggers: "ddc-mac-release-chrome"
   triggers: "ddc-win-release-chrome"
+  triggers: "ddk-linux-release-firefox"
   triggers: "flutter-analyze"
   triggers: "flutter-frontend"
   triggers: "front-end-linux-release-x64"
@@ -3044,6 +3076,7 @@ trigger: <
   triggers: "ddc-linux-release-chrome-stable"
   triggers: "ddc-mac-release-chrome-stable"
   triggers: "ddc-win-release-chrome-stable"
+  triggers: "ddk-linux-release-firefox-stable"
   triggers: "front-end-linux-release-x64-stable"
   triggers: "front-end-mac-release-x64-stable"
   triggers: "front-end-win-release-x64-stable"
diff --git a/main.star b/main.star
index 7fb21c2a319b..cc534c466e21 100755
--- a/main.star
+++ b/main.star
@@ -690,6 +690,8 @@ dart_ci_sandbox_builder("ddc-mac-release-chrome",
 dart_ci_sandbox_builder("ddc-win-release-chrome",
                         category="ddc|w",
                         dimensions=windows())
+dart_ci_sandbox_builder("ddk-linux-release-firefox",
+                        category="ddc|fl")
 
 # pkg
 dart_ci_sandbox_builder("pkg-linux-release", category="pkg|l", on_cq=True)

From 2b0377e2394ab3472428d3576651043fb9f433df Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 8 Aug 2019 06:46:57 +0000
Subject: [PATCH 291/826] [infra] Reformat main.star with yapf

This also adds .style.yapf file to make it easier to re-format it.

Change-Id: Icd768dc49ad8d36059dfdf3eaefb3ee425720cc9
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/112252
Reviewed-by: William Hesse <whesse@google.com>
---
 .style.yapf |   2 +
 main.star   | 641 +++++++++++++++++++++++++++-------------------------
 2 files changed, 329 insertions(+), 314 deletions(-)
 create mode 100644 .style.yapf

diff --git a/.style.yapf b/.style.yapf
new file mode 100644
index 000000000000..0e9640c29a2f
--- /dev/null
+++ b/.style.yapf
@@ -0,0 +1,2 @@
+[style]
+based_on_style = google
diff --git a/main.star b/main.star
index cc534c466e21..88efb29f04ea 100755
--- a/main.star
+++ b/main.star
@@ -17,7 +17,6 @@ CHANNELS = RELEASE_CHANNELS + ["try"]
 ANALYZER_CHANNELS = ["analyzer-stable"] + CHANNELS
 BRANCHES = ["master", "dev", "stable"]
 
-
 VM_PATHS = [
     "DEPS",
     "build/.+",
@@ -40,10 +39,9 @@ CI_ACCOUNT = "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
 TRY_ACCOUNT = "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
 CI_TRIGGERERS = ["luci-scheduler@appspot.gserviceaccount.com", CI_ACCOUNT]
 
-
 lucicfg.config(
-    config_dir = ".",
-    tracked_files = [
+    config_dir=".",
+    tracked_files=[
         "commit-queue.cfg",
         "cr-buildbucket.cfg",
         "luci-logdog.cfg",
@@ -71,8 +69,9 @@ luci.project(
             groups=["all"],
         ),
         acl.entry(acl.LOGDOG_WRITER, groups=["luci-logdog-chromium-writers"]),
-        acl.entry([acl.SCHEDULER_OWNER, acl.BUILDBUCKET_TRIGGERER],
-                  groups=["project-dart-admins"]),
+        acl.entry(
+            [acl.SCHEDULER_OWNER, acl.BUILDBUCKET_TRIGGERER],
+            groups=["project-dart-admins"]),
         acl.entry(acl.CQ_COMMITTER, groups=["project-dart-committers"]),
         acl.entry(acl.CQ_DRY_RUNNER, groups=["project-dart-tryjob-access"]),
     ],
@@ -165,8 +164,9 @@ luci.bucket(
 luci.bucket(
     name="try",
     acls=[
-        acl.entry(acl.BUILDBUCKET_TRIGGERER,
-                  groups=["project-dart-tryjob-access", "service-account-cq"]),
+        acl.entry(
+            acl.BUILDBUCKET_TRIGGERER,
+            groups=["project-dart-tryjob-access", "service-account-cq"]),
     ],
 )
 
@@ -206,21 +206,24 @@ luci.gitiles_poller(
     refs=["refs/heads/master"],
 )
 
-luci.notifier(name="infra",
-              on_new_failure=True,
-              notify_emails=[
-                  "athom@google.com", "sortie@google.com", "whesse@google.com"
-              ])
+luci.notifier(
+    name="infra",
+    on_new_failure=True,
+    notify_emails=[
+        "athom@google.com", "sortie@google.com", "whesse@google.com"
+    ])
 
-luci.notifier(name="dart",
-              on_new_failure=True,
-              notify_emails=["athom@google.com"],
-              notify_blamelist=True)
+luci.notifier(
+    name="dart",
+    on_new_failure=True,
+    notify_emails=["athom@google.com"],
+    notify_blamelist=True)
 
-luci.notifier(name="dart-fuzz-testing",
-              on_success=True,
-              on_failure=True,
-              notify_emails=["ajcbik@google.com", "athom@google.com"])
+luci.notifier(
+    name="dart-fuzz-testing",
+    on_success=True,
+    on_failure=True,
+    notify_emails=["ajcbik@google.com", "athom@google.com"])
 
 luci.cq(
     submit_max_burst=2,
@@ -234,7 +237,7 @@ luci.cq_group(
     tree_status_host="dart-status.appspot.com",
     retry_config=cq.RETRY_NONE,
     verifiers=None,
-    cancel_stale_tryjobs = True,
+    cancel_stale_tryjobs=True,
 )
 
 
@@ -274,10 +277,11 @@ def dart_try_builder(name,
         swarming_tags=["vpython:native-python-wrapper"],
     )
     if on_cq:
-        luci.cq_tryjob_verifier(builder=builder,
-                                cq_group='sdk',
-                                experiment_percentage=experiment_percentage,
-                                location_regexp=location_regexp)
+        luci.cq_tryjob_verifier(
+            builder=builder,
+            cq_group='sdk',
+            experiment_percentage=experiment_percentage,
+            location_regexp=location_regexp)
         luci.list_view_entry(
             list_view="cq",
             builder=builder,
@@ -314,13 +318,14 @@ def dart_builder(name,
 
     def builder(channel=None, triggered_by=None):
         if channel == "try":
-            dart_try_builder(name,
-                             recipe=recipe,
-                             dimensions=dimensions,
-                             properties=properties,
-                             on_cq=on_cq,
-                             experiment_percentage=experiment_percentage,
-                             location_regexp=location_regexp)
+            dart_try_builder(
+                name,
+                recipe=recipe,
+                dimensions=dimensions,
+                properties=properties,
+                on_cq=on_cq,
+                experiment_percentage=experiment_percentage,
+                location_regexp=location_regexp)
         else:
             builder = name + "-" + channel if channel else name
             branch = channel if channel else "master"
@@ -330,12 +335,15 @@ def dart_builder(name,
             if enabled and schedule == "triggered":
                 if not triggered_by:
                     triggered_by = ["dart-gitiles-trigger-%s"]
-                triggered_by = [trigger.replace("%s", branch) for
-                                trigger in triggered_by]
+                triggered_by = [
+                    trigger.replace("%s", branch) for trigger in triggered_by
+                ]
                 if channel in ['dev', 'stable']:
                     # Always run vm builders on dev and stable.
-                    triggered_by = [trigger.replace("dart-vm-", "dart-")
-                                    for trigger in triggered_by]
+                    triggered_by = [
+                        trigger.replace("dart-vm-", "dart-")
+                        for trigger in triggered_by
+                    ]
             luci.builder(
                 name=builder,
                 build_numbers=True,
@@ -388,54 +396,52 @@ def dart_builder(name,
 
 def dart_ci_builder(name, dimensions={}, **kwargs):
     dimensions.setdefault("pool", "luci.dart.ci")
-    dart_builder(name,
-                 bucket="ci",
-                 dimensions=dimensions,
-                 service_account=CI_ACCOUNT,
-                 **kwargs)
+    dart_builder(
+        name,
+        bucket="ci",
+        dimensions=dimensions,
+        service_account=CI_ACCOUNT,
+        **kwargs)
 
 
-def dart_ci_sandbox_builder(name,
-                            channels=CHANNELS,
-                            properties={},
-                            **kwargs):
+def dart_ci_sandbox_builder(name, channels=CHANNELS, properties={}, **kwargs):
     if not properties.setdefault("new_workflow_enabled", True):
         properties.pop("new_workflow_enabled")
 
-    dart_builder(name,
-                 bucket="ci.sandbox",
-                 channels=channels,
-                 properties=properties,
-                 service_account=TRY_ACCOUNT,
-                 **kwargs)
+    dart_builder(
+        name,
+        bucket="ci.sandbox",
+        channels=channels,
+        properties=properties,
+        service_account=TRY_ACCOUNT,
+        **kwargs)
 
 
 def dart_vm_extra_builder(name, on_cq=False, location_regexp=None, **kwargs):
     triggered_by = ["dart-vm-gitiles-trigger-%s"]
     if on_cq and not location_regexp:
-      location_regexp = [".+/[+]/%s" % path for path in VM_PATHS]
+        location_regexp = [".+/[+]/%s" % path for path in VM_PATHS]
     dart_ci_sandbox_builder(
         name,
         triggered_by=triggered_by,
         on_cq=on_cq,
-        location_regexp=location_regexp, **kwargs)
+        location_regexp=location_regexp,
+        **kwargs)
 
 
 # fasta
-dart_ci_sandbox_builder("front-end-linux-release-x64",
-                        category="fasta|l",
-                        on_cq=True)
-dart_ci_sandbox_builder("front-end-mac-release-x64",
-                        category="fasta|m",
-                        dimensions=mac())
-dart_ci_sandbox_builder("front-end-win-release-x64",
-                        category="fasta|w",
-                        dimensions=windows())
-dart_ci_sandbox_builder("flutter-frontend",
-                        category="fasta|fl",
-                        channels=["try"],
-                        properties={"new_workflow_enabled": False},
-                        notifies=None)
+dart_ci_sandbox_builder(
+    "front-end-linux-release-x64", category="fasta|l", on_cq=True)
+dart_ci_sandbox_builder(
+    "front-end-mac-release-x64", category="fasta|m", dimensions=mac())
+dart_ci_sandbox_builder(
+    "front-end-win-release-x64", category="fasta|w", dimensions=windows())
+dart_ci_sandbox_builder(
+    "flutter-frontend",
+    category="fasta|fl",
+    channels=["try"],
+    properties={"new_workflow_enabled": False},
+    notifies=None)
 
 # flutter
 dart_ci_sandbox_builder(
@@ -445,292 +451,298 @@ dart_ci_sandbox_builder(
     channels=[],
     properties={"new_workflow_enabled": False},
     triggered_by=["dart-gitiles-trigger-flutter"],
-    triggering_policy=scheduler.greedy_batching(max_concurrent_invocations=5,
-                                                max_batch_size=1),
+    triggering_policy=scheduler.greedy_batching(
+        max_concurrent_invocations=5, max_batch_size=1),
 )
 
 # vm|app-kernel
-dart_vm_extra_builder("app-kernel-linux-debug-x64",
-                        category="vm|app-kernel|d64")
-dart_vm_extra_builder("app-kernel-linux-product-x64",
-                        category="vm|app-kernel|p64")
-dart_vm_extra_builder("app-kernel-linux-release-x64",
-                        category="vm|app-kernel|r64")
+dart_vm_extra_builder(
+    "app-kernel-linux-debug-x64", category="vm|app-kernel|d64")
+dart_vm_extra_builder(
+    "app-kernel-linux-product-x64", category="vm|app-kernel|p64")
+dart_vm_extra_builder(
+    "app-kernel-linux-release-x64", category="vm|app-kernel|r64")
 
 # vm|dartkb
-dart_vm_extra_builder("vm-dartkb-linux-debug-simarm64",
-                        category="vm|dartkb|sd")
+dart_vm_extra_builder("vm-dartkb-linux-debug-simarm64", category="vm|dartkb|sd")
 dart_vm_extra_builder("vm-dartkb-linux-debug-x64", category="vm|dartkb|d")
-dart_vm_extra_builder("vm-dartkb-linux-product-simarm64",
-                        category="vm|dartkb|sp")
+dart_vm_extra_builder(
+    "vm-dartkb-linux-product-simarm64", category="vm|dartkb|sp")
 dart_vm_extra_builder("vm-dartkb-linux-product-x64", category="vm|dartkb|p")
-dart_vm_extra_builder("vm-dartkb-linux-release-simarm64",
-                        category="vm|dartkb|sr")
+dart_vm_extra_builder(
+    "vm-dartkb-linux-release-simarm64", category="vm|dartkb|sr")
 dart_vm_extra_builder("vm-dartkb-linux-release-x64", category="vm|dartkb|r")
-dart_vm_extra_builder("vm-dartkb-linux-release-x64-abi",
-                        category="vm|dartkb|abi")
+dart_vm_extra_builder(
+    "vm-dartkb-linux-release-x64-abi", category="vm|dartkb|abi")
 
 #vm|kernel
-dart_ci_sandbox_builder("vm-canary-linux-debug",
-                        category="vm|kernel|c",
-                        on_cq=True)
+dart_ci_sandbox_builder(
+    "vm-canary-linux-debug", category="vm|kernel|c", on_cq=True)
 dart_ci_sandbox_builder("vm-kernel-linux-debug-x64", category="vm|kernel|d")
-dart_vm_extra_builder("vm-kernel-linux-debug-simdbc64",
-                        category="vm|kernel|dbc")
-dart_vm_extra_builder("vm-kernel-linux-release-simarm",
-                        category="vm|kernel|a32")
-dart_vm_extra_builder("vm-kernel-linux-release-simarm64",
-                        category="vm|kernel|a64")
-dart_vm_extra_builder("vm-kernel-linux-release-simdbc64",
-                        category="vm|kernel|rbc",
-                        on_cq=True)
-dart_vm_extra_builder("vm-kernel-linux-release-ia32",
-                        category="vm|kernel|r32")
-dart_ci_sandbox_builder("vm-kernel-linux-release-x64",
-                        category="vm|kernel|r",
-                        on_cq=True)
-dart_vm_extra_builder("vm-kernel-checked-linux-release-x64",
-                        category="vm|kernel|rc")
+dart_vm_extra_builder(
+    "vm-kernel-linux-debug-simdbc64", category="vm|kernel|dbc")
+dart_vm_extra_builder(
+    "vm-kernel-linux-release-simarm", category="vm|kernel|a32")
+dart_vm_extra_builder(
+    "vm-kernel-linux-release-simarm64", category="vm|kernel|a64")
+dart_vm_extra_builder(
+    "vm-kernel-linux-release-simdbc64", category="vm|kernel|rbc", on_cq=True)
+dart_vm_extra_builder("vm-kernel-linux-release-ia32", category="vm|kernel|r32")
+dart_ci_sandbox_builder(
+    "vm-kernel-linux-release-x64", category="vm|kernel|r", on_cq=True)
+dart_vm_extra_builder(
+    "vm-kernel-checked-linux-release-x64", category="vm|kernel|rc")
 dart_vm_extra_builder("vm-kernel-linux-debug-ia32", category="vm|kernel|d32")
-dart_vm_extra_builder("vm-kernel-mac-debug-simdbc64",
-                        category="vm|kernel|mds",
-                        dimensions=mac())
-dart_vm_extra_builder("vm-kernel-mac-release-simdbc64",
-                        category="vm|kernel|mrs",
-                        dimensions=mac())
-dart_ci_sandbox_builder("vm-kernel-mac-debug-x64",
-                        category="vm|kernel|md",
-                        dimensions=mac())
-dart_ci_sandbox_builder("vm-kernel-mac-release-x64",
-                        category="vm|kernel|mr",
-                        dimensions=mac(),
-                        on_cq=True,
-                        experiment_percentage=5)
-dart_vm_extra_builder("vm-kernel-win-debug-ia32",
-                        category="vm|kernel|wd3",
-                        dimensions=windows())
-dart_ci_sandbox_builder("vm-kernel-win-debug-x64",
-                        category="vm|kernel|wd",
-                        dimensions=windows())
-dart_vm_extra_builder("vm-kernel-win-release-ia32",
-                        category="vm|kernel|wr3",
-                        dimensions=windows())
-dart_ci_sandbox_builder("vm-kernel-win-release-x64",
-                        category="vm|kernel|wr",
-                        dimensions=windows())
-dart_vm_extra_builder("cross-vm-linux-release-arm64",
-                        category="vm|kernel|cra",
-                        channels=RELEASE_CHANNELS)
+dart_vm_extra_builder(
+    "vm-kernel-mac-debug-simdbc64", category="vm|kernel|mds", dimensions=mac())
+dart_vm_extra_builder(
+    "vm-kernel-mac-release-simdbc64",
+    category="vm|kernel|mrs",
+    dimensions=mac())
+dart_ci_sandbox_builder(
+    "vm-kernel-mac-debug-x64", category="vm|kernel|md", dimensions=mac())
+dart_ci_sandbox_builder(
+    "vm-kernel-mac-release-x64",
+    category="vm|kernel|mr",
+    dimensions=mac(),
+    on_cq=True,
+    experiment_percentage=5)
+dart_vm_extra_builder(
+    "vm-kernel-win-debug-ia32", category="vm|kernel|wd3", dimensions=windows())
+dart_ci_sandbox_builder(
+    "vm-kernel-win-debug-x64", category="vm|kernel|wd", dimensions=windows())
+dart_vm_extra_builder(
+    "vm-kernel-win-release-ia32",
+    category="vm|kernel|wr3",
+    dimensions=windows())
+dart_ci_sandbox_builder(
+    "vm-kernel-win-release-x64", category="vm|kernel|wr", dimensions=windows())
+dart_vm_extra_builder(
+    "cross-vm-linux-release-arm64",
+    category="vm|kernel|cra",
+    channels=RELEASE_CHANNELS)
 
 # vm|kernel-precomp
-dart_vm_extra_builder("vm-kernel-precomp-android-release-arm",
-                        category="vm|kernel-precomp|and",
-                        properties={"shard_timeout": 5400}) # 1.5h
-dart_vm_extra_builder("vm-kernel-precomp-linux-debug-x64",
-                        category="vm|kernel-precomp|d")
-dart_vm_extra_builder("vm-kernel-precomp-linux-product-x64",
-                        category="vm|kernel-precomp|p")
-dart_vm_extra_builder("vm-kernel-precomp-linux-release-simarm",
-                        category="vm|kernel-precomp|a32")
-dart_vm_extra_builder("vm-kernel-precomp-linux-release-simarm64",
-                        category="vm|kernel-precomp|a64")
-dart_vm_extra_builder("vm-kernel-precomp-linux-release-x64",
-                        category="vm|kernel-precomp|r")
-dart_vm_extra_builder("vm-kernel-precomp-bare-linux-release-x64",
-                        category="vm|kernel-precomp|b")
-dart_vm_extra_builder("vm-kernel-precomp-bare-linux-release-simarm",
-                        category="vm|kernel-precomp|b32")
-dart_vm_extra_builder("vm-kernel-precomp-bare-linux-release-simarm64",
-                        category="vm|kernel-precomp|b64")
-dart_vm_extra_builder("vm-kernel-precomp-obfuscate-linux-release-x64",
-                        category="vm|kernel-precomp|o")
-dart_vm_extra_builder("vm-kernel-precomp-mac-debug-simarm_x64",
-                        category="vm|kernel-precomp|ad",
-                        dimensions=mac(),
-                        properties={"shard_timeout": 5400}) # 1.5h
-dart_vm_extra_builder("vm-kernel-precomp-mac-release-simarm_x64",
-                        category="vm|kernel-precomp|ar",
-                        dimensions=mac())
-dart_vm_extra_builder("vm-kernel-precomp-mac-release-simarm64",
-                        category="vm|kernel-precomp|ma",
-                        dimensions=mac())
-dart_vm_extra_builder("vm-kernel-precomp-win-release-simarm64",
-                        category="vm|kernel-precomp|wa",
-                        dimensions=windows())
-dart_vm_extra_builder("vm-kernel-precomp-win-release-x64",
-                        category="vm|kernel-precomp|wr",
-                        dimensions=windows())
+dart_vm_extra_builder(
+    "vm-kernel-precomp-android-release-arm",
+    category="vm|kernel-precomp|and",
+    properties={"shard_timeout": 5400})  # 1.5h
+dart_vm_extra_builder(
+    "vm-kernel-precomp-linux-debug-x64", category="vm|kernel-precomp|d")
+dart_vm_extra_builder(
+    "vm-kernel-precomp-linux-product-x64", category="vm|kernel-precomp|p")
+dart_vm_extra_builder(
+    "vm-kernel-precomp-linux-release-simarm", category="vm|kernel-precomp|a32")
+dart_vm_extra_builder(
+    "vm-kernel-precomp-linux-release-simarm64",
+    category="vm|kernel-precomp|a64")
+dart_vm_extra_builder(
+    "vm-kernel-precomp-linux-release-x64", category="vm|kernel-precomp|r")
+dart_vm_extra_builder(
+    "vm-kernel-precomp-bare-linux-release-x64", category="vm|kernel-precomp|b")
+dart_vm_extra_builder(
+    "vm-kernel-precomp-bare-linux-release-simarm",
+    category="vm|kernel-precomp|b32")
+dart_vm_extra_builder(
+    "vm-kernel-precomp-bare-linux-release-simarm64",
+    category="vm|kernel-precomp|b64")
+dart_vm_extra_builder(
+    "vm-kernel-precomp-obfuscate-linux-release-x64",
+    category="vm|kernel-precomp|o")
+dart_vm_extra_builder(
+    "vm-kernel-precomp-mac-debug-simarm_x64",
+    category="vm|kernel-precomp|ad",
+    dimensions=mac(),
+    properties={"shard_timeout": 5400})  # 1.5h
+dart_vm_extra_builder(
+    "vm-kernel-precomp-mac-release-simarm_x64",
+    category="vm|kernel-precomp|ar",
+    dimensions=mac())
+dart_vm_extra_builder(
+    "vm-kernel-precomp-mac-release-simarm64",
+    category="vm|kernel-precomp|ma",
+    dimensions=mac())
+dart_vm_extra_builder(
+    "vm-kernel-precomp-win-release-simarm64",
+    category="vm|kernel-precomp|wa",
+    dimensions=windows())
+dart_vm_extra_builder(
+    "vm-kernel-precomp-win-release-x64",
+    category="vm|kernel-precomp|wr",
+    dimensions=windows())
 
 # vm|misc
-dart_vm_extra_builder("vm-kernel-asan-linux-release-x64",
-                        category="vm|misc|a64")
-dart_vm_extra_builder("vm-kernel-optcounter-threshold-linux-release-ia32",
-                        category="vm|misc|o32")
-dart_vm_extra_builder("vm-kernel-optcounter-threshold-linux-release-x64",
-                        category="vm|misc|o64")
+dart_vm_extra_builder(
+    "vm-kernel-asan-linux-release-x64", category="vm|misc|a64")
+dart_vm_extra_builder(
+    "vm-kernel-optcounter-threshold-linux-release-ia32", category="vm|misc|o32")
+dart_vm_extra_builder(
+    "vm-kernel-optcounter-threshold-linux-release-x64", category="vm|misc|o64")
 
 # vm|product
-dart_ci_sandbox_builder("vm-kernel-linux-product-x64",
-                        category="vm|product|l",
-                        on_cq=True)
-dart_ci_sandbox_builder("vm-kernel-mac-product-x64",
-                        category="vm|product|m",
-                        dimensions=mac())
-dart_ci_sandbox_builder("vm-kernel-win-product-x64",
-                        category="vm|product|w",
-                        dimensions=windows())
+dart_ci_sandbox_builder(
+    "vm-kernel-linux-product-x64", category="vm|product|l", on_cq=True)
+dart_ci_sandbox_builder(
+    "vm-kernel-mac-product-x64", category="vm|product|m", dimensions=mac())
+dart_ci_sandbox_builder(
+    "vm-kernel-win-product-x64", category="vm|product|w", dimensions=windows())
 
 # vm|reload-kernel
-dart_vm_extra_builder("vm-kernel-reload-linux-debug-x64",
-                        category="vm|reload-kernel|d")
-dart_vm_extra_builder("vm-kernel-reload-linux-release-x64",
-                        category="vm|reload-kernel|r")
-dart_vm_extra_builder("vm-kernel-reload-mac-debug-simdbc64",
-                        category="vm|reload-kernel|md",
-                        dimensions=mac())
-dart_vm_extra_builder("vm-kernel-reload-mac-release-simdbc64",
-                        category="vm|reload-kernel|mr",
-                        dimensions=mac())
-dart_vm_extra_builder("vm-kernel-reload-rollback-linux-debug-x64",
-                        category="vm|reload-kernel|drb")
-dart_vm_extra_builder("vm-kernel-reload-rollback-linux-release-x64",
-                        category="vm|reload-kernel|rrb")
+dart_vm_extra_builder(
+    "vm-kernel-reload-linux-debug-x64", category="vm|reload-kernel|d")
+dart_vm_extra_builder(
+    "vm-kernel-reload-linux-release-x64", category="vm|reload-kernel|r")
+dart_vm_extra_builder(
+    "vm-kernel-reload-mac-debug-simdbc64",
+    category="vm|reload-kernel|md",
+    dimensions=mac())
+dart_vm_extra_builder(
+    "vm-kernel-reload-mac-release-simdbc64",
+    category="vm|reload-kernel|mr",
+    dimensions=mac())
+dart_vm_extra_builder(
+    "vm-kernel-reload-rollback-linux-debug-x64",
+    category="vm|reload-kernel|drb")
+dart_vm_extra_builder(
+    "vm-kernel-reload-rollback-linux-release-x64",
+    category="vm|reload-kernel|rrb")
 # vm|ffi
 dart_vm_extra_builder("vm-ffi-android-debug-arm", category="vm|ffi|d32")
 dart_vm_extra_builder("vm-ffi-android-release-arm", category="vm|ffi|r32")
 dart_vm_extra_builder("vm-ffi-android-product-arm", category="vm|ffi|p32")
 
 # dart2js
-dart_ci_sandbox_builder("dart2js-strong-hostasserts-linux-ia32-d8",
-                        category="dart2js|d8|ha",
-                        on_cq=True)
+dart_ci_sandbox_builder(
+    "dart2js-strong-hostasserts-linux-ia32-d8",
+    category="dart2js|d8|ha",
+    on_cq=True)
 dart_ci_sandbox_builder("dart2js-rti-linux-x64-d8", category="dart2js|d8|rti")
-dart_ci_sandbox_builder("dart2js-minified-strong-linux-x64-d8",
-                        category="dart2js|d8|mi",
-                        on_cq=True)
-dart_ci_sandbox_builder("dart2js-unit-linux-x64-release",
-                        category="dart2js|d8|u",
-                        on_cq=True)
-dart_ci_sandbox_builder("dart2js-strong-linux-x64-chrome",
-                        category="dart2js|chrome|l",
-                        on_cq=True)
-dart_ci_sandbox_builder("dart2js-csp-minified-linux-x64-chrome",
-                        category="dart2js|chrome|csp")
-dart_ci_sandbox_builder("dart2js-strong-mac-x64-chrome",
-                        category="dart2js|chrome|m",
-                        dimensions=mac())
-dart_ci_sandbox_builder("dart2js-strong-win-x64-chrome",
-                        category="dart2js|chrome|w",
-                        dimensions=windows())
-dart_ci_sandbox_builder("dart2js-strong-linux-x64-firefox",
-                        category="dart2js|firefox|l")
-dart_ci_sandbox_builder("dart2js-strong-win-x64-firefox",
-                        category="dart2js|firefox|w",
-                        dimensions=windows())
-dart_ci_sandbox_builder("dart2js-strong-mac-x64-safari",
-                        category="dart2js|safari|m",
-                        dimensions=mac())
-dart_ci_sandbox_builder("dart2js-strong-win-x64-ie11",
-                        category="dart2js|ms|ie",
-                        dimensions=windows())
+dart_ci_sandbox_builder(
+    "dart2js-minified-strong-linux-x64-d8",
+    category="dart2js|d8|mi",
+    on_cq=True)
+dart_ci_sandbox_builder(
+    "dart2js-unit-linux-x64-release", category="dart2js|d8|u", on_cq=True)
+dart_ci_sandbox_builder(
+    "dart2js-strong-linux-x64-chrome", category="dart2js|chrome|l", on_cq=True)
+dart_ci_sandbox_builder(
+    "dart2js-csp-minified-linux-x64-chrome", category="dart2js|chrome|csp")
+dart_ci_sandbox_builder(
+    "dart2js-strong-mac-x64-chrome",
+    category="dart2js|chrome|m",
+    dimensions=mac())
+dart_ci_sandbox_builder(
+    "dart2js-strong-win-x64-chrome",
+    category="dart2js|chrome|w",
+    dimensions=windows())
+dart_ci_sandbox_builder(
+    "dart2js-strong-linux-x64-firefox", category="dart2js|firefox|l")
+dart_ci_sandbox_builder(
+    "dart2js-strong-win-x64-firefox",
+    category="dart2js|firefox|w",
+    dimensions=windows())
+dart_ci_sandbox_builder(
+    "dart2js-strong-mac-x64-safari",
+    category="dart2js|safari|m",
+    dimensions=mac())
+dart_ci_sandbox_builder(
+    "dart2js-strong-win-x64-ie11",
+    category="dart2js|ms|ie",
+    dimensions=windows())
 
 # analyzer
-dart_ci_sandbox_builder("flutter-analyze",
-                        category="analyzer|fa",
-                        channels=["try"],
-                        properties={"new_workflow_enabled": False},
-                        notifies=None,
-                        on_cq=True,
-                        location_regexp=[
-                            ".+/[+]/DEPS",
-                            ".+/[+]/pkg/analysis_server/.+",
-                            ".+/[+]/pkg/analysis_server_client/.+",
-                            ".+/[+]/pkg/analyzer/.+",
-                            ".+/[+]/pkg/analyzer_plugin/.+",
-                            ".+/[+]/pkg/front_end/.+",
-                            ".+/[+]/pkg/meta/.+",
-                            ".+/[+]/pkg/telemetry/.+",
-                        ])
-dart_ci_sandbox_builder("analyzer-analysis-server-linux",
-                        category="analyzer|as",
-                        channels=ANALYZER_CHANNELS,
-                        on_cq=True)
-dart_ci_sandbox_builder("analyzer-linux-release",
-                        category="analyzer|l",
-                        on_cq=True,
-                        channels=ANALYZER_CHANNELS)
-dart_ci_sandbox_builder("analyzer-mac-release",
-                        category="analyzer|m",
-                        dimensions=mac(),
-                        channels=ANALYZER_CHANNELS)
-dart_ci_sandbox_builder("analyzer-win-release",
-                        category="analyzer|w",
-                        dimensions=windows(),
-                        channels=ANALYZER_CHANNELS)
+dart_ci_sandbox_builder(
+    "flutter-analyze",
+    category="analyzer|fa",
+    channels=["try"],
+    properties={"new_workflow_enabled": False},
+    notifies=None,
+    on_cq=True,
+    location_regexp=[
+        ".+/[+]/DEPS",
+        ".+/[+]/pkg/analysis_server/.+",
+        ".+/[+]/pkg/analysis_server_client/.+",
+        ".+/[+]/pkg/analyzer/.+",
+        ".+/[+]/pkg/analyzer_plugin/.+",
+        ".+/[+]/pkg/front_end/.+",
+        ".+/[+]/pkg/meta/.+",
+        ".+/[+]/pkg/telemetry/.+",
+    ])
+dart_ci_sandbox_builder(
+    "analyzer-analysis-server-linux",
+    category="analyzer|as",
+    channels=ANALYZER_CHANNELS,
+    on_cq=True)
+dart_ci_sandbox_builder(
+    "analyzer-linux-release",
+    category="analyzer|l",
+    on_cq=True,
+    channels=ANALYZER_CHANNELS)
+dart_ci_sandbox_builder(
+    "analyzer-mac-release",
+    category="analyzer|m",
+    dimensions=mac(),
+    channels=ANALYZER_CHANNELS)
+dart_ci_sandbox_builder(
+    "analyzer-win-release",
+    category="analyzer|w",
+    dimensions=windows(),
+    channels=ANALYZER_CHANNELS)
 
 # sdk
 dart_ci_builder("dart-sdk-linux", category="sdk|l", channels=CHANNELS)
-dart_ci_builder("dart-sdk-mac",
-                category="sdk|m",
-                channels=CHANNELS,
-                dimensions=mac())
-dart_ci_builder("dart-sdk-win",
-                category="sdk|w",
-                channels=CHANNELS,
-                dimensions=windows(),
-                on_cq=True)
+dart_ci_builder(
+    "dart-sdk-mac", category="sdk|m", channels=CHANNELS, dimensions=mac())
+dart_ci_builder(
+    "dart-sdk-win",
+    category="sdk|w",
+    channels=CHANNELS,
+    dimensions=windows(),
+    on_cq=True)
 
 # ddc
-dart_ci_sandbox_builder("ddc-linux-release-chrome",
-                        category="ddc|l",
-                        on_cq=True)
-dart_ci_sandbox_builder("ddc-mac-release-chrome",
-                        category="ddc|m",
-                        dimensions=mac())
-dart_ci_sandbox_builder("ddc-win-release-chrome",
-                        category="ddc|w",
-                        dimensions=windows())
-dart_ci_sandbox_builder("ddk-linux-release-firefox",
-                        category="ddc|fl")
+dart_ci_sandbox_builder(
+    "ddc-linux-release-chrome", category="ddc|l", on_cq=True)
+dart_ci_sandbox_builder(
+    "ddc-mac-release-chrome", category="ddc|m", dimensions=mac())
+dart_ci_sandbox_builder(
+    "ddc-win-release-chrome", category="ddc|w", dimensions=windows())
+dart_ci_sandbox_builder("ddk-linux-release-firefox", category="ddc|fl")
 
 # pkg
 dart_ci_sandbox_builder("pkg-linux-release", category="pkg|l", on_cq=True)
 dart_ci_sandbox_builder("pkg-mac-release", category="pkg|m", dimensions=mac())
-dart_ci_sandbox_builder("pkg-win-release",
-                        category="pkg|w",
-                        dimensions=windows())
+dart_ci_sandbox_builder(
+    "pkg-win-release", category="pkg|w", dimensions=windows())
 dart_ci_sandbox_builder("pkg-linux-debug", category="pkg|ld", channels=["try"])
 
 # misc
-dart_ci_sandbox_builder("gclient",
-                        recipe="gclient",
-                        category="misc|g",
-                        properties={"new_workflow_enabled": False},
-                        on_cq=True)
-dart_ci_builder("debianpackage-linux",
-                category="misc|dp",
-                channels=RELEASE_CHANNELS,
-                notifies="infra")
-dart_ci_builder("versionchecker-linux",
-                category="misc|vc",
-                channels=RELEASE_CHANNELS)
+dart_ci_sandbox_builder(
+    "gclient",
+    recipe="gclient",
+    category="misc|g",
+    properties={"new_workflow_enabled": False},
+    on_cq=True)
+dart_ci_builder(
+    "debianpackage-linux",
+    category="misc|dp",
+    channels=RELEASE_CHANNELS,
+    notifies="infra")
+dart_ci_builder(
+    "versionchecker-linux", category="misc|vc", channels=RELEASE_CHANNELS)
 
 # external
-dart_ci_builder("google",
-                recipe="external",
-                category="external|g",
-                enabled=False,
-                fyi=True)
+dart_ci_builder(
+    "google", recipe="external", category="external|g", enabled=False, fyi=True)
 
 # infra
-dart_ci_builder("base",
-                recipe="forward_branch",
-                schedule="with 10m interval",
-                notifies="infra")
-dart_ci_builder("chocolatey",
-                recipe="chocolatey",
-                enabled=False,
-                dimensions=windows())
+dart_ci_builder(
+    "base",
+    recipe="forward_branch",
+    schedule="with 10m interval",
+    notifies="infra")
+dart_ci_builder(
+    "chocolatey", recipe="chocolatey", enabled=False, dimensions=windows())
 dart_ci_builder("co19-roller", recipe="package_co19", enabled=False)
 dart_ci_builder("docker", recipe="docker", enabled=False)
 dart_ci_builder(
@@ -748,11 +760,12 @@ dart_ci_builder(
 )
 
 # Fuzz testing builders
-dart_ci_sandbox_builder("fuzz-linux",
-                        channels=[],
-                        notifies="dart-fuzz-testing",
-                        properties={"new_workflow_enabled": False},
-                        schedule="0 3 * * *")
+dart_ci_sandbox_builder(
+    "fuzz-linux",
+    channels=[],
+    notifies="dart-fuzz-testing",
+    properties={"new_workflow_enabled": False},
+    schedule="0 3 * * *")
 
 # Try only builders
 dart_try_builder("cl-linux")

From e6d5fb28a10fd13bf2d6d2771c4065d4115cfd3e Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 19 Aug 2019 11:11:58 +0000
Subject: [PATCH 292/826] [infra] Remove some simdbc builders

Simdbc is being mothballed and will likely go away some weeks from now.
This frees up capacity to run more useful tests.

Change-Id: I04eef8cb0313af6e8f1d987f218e4141fc9cc842
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/113680
Reviewed-by: Martin Kustermann <kustermann@google.com>
---
 commit-queue.cfg   |   9 --
 cr-buildbucket.cfg | 282 ---------------------------------------------
 luci-milo.cfg      |  63 ----------
 luci-notify.cfg    |  45 --------
 luci-scheduler.cfg |  99 ----------------
 main.star          |   8 --
 6 files changed, 506 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 85c6298df95e..23ff04e08569 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -81,15 +81,6 @@ config_groups: <
       builders: <
         name: "dart/try/vm-kernel-linux-product-x64-try"
       >
-      builders: <
-        name: "dart/try/vm-kernel-linux-release-simdbc64-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|vm)/.+"
-        location_regexp: ".+/[+]/runtime/.+"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/tests/.+"
-      >
       builders: <
         name: "dart/try/vm-kernel-linux-release-x64-try"
       >
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index f5eb4e8bd965..fe34c674069e 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -3910,77 +3910,6 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-    builders: <
-      name: "vm-kernel-linux-debug-simdbc64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-debug-simdbc64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-debug-simdbc64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
       name: "vm-kernel-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -4336,77 +4265,6 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-    builders: <
-      name: "vm-kernel-linux-release-simdbc64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-release-simdbc64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-linux-release-simdbc64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
       name: "vm-kernel-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -6188,77 +6046,6 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-    builders: <
-      name: "vm-kernel-reload-mac-debug-simdbc64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-mac-debug-simdbc64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-mac-debug-simdbc64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
       name: "vm-kernel-reload-mac-release-simdbc64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8079,29 +7866,6 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-    builders: <
-      name: "vm-kernel-linux-debug-simdbc64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
       name: "vm-kernel-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8217,29 +7981,6 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-    builders: <
-      name: "vm-kernel-linux-release-simdbc64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
       name: "vm-kernel-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8817,29 +8558,6 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-    builders: <
-      name: "vm-kernel-reload-mac-debug-simdbc64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
       name: "vm-kernel-reload-mac-release-simdbc64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 93daeaba3f05..bec8a4f367b0 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -152,11 +152,6 @@ consoles: <
     category: "vm|kernel"
     short_name: "d"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64"
-    category: "vm|kernel"
-    short_name: "dbc"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
@@ -167,11 +162,6 @@ consoles: <
     category: "vm|kernel"
     short_name: "a64"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64"
-    category: "vm|kernel"
-    short_name: "rbc"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32"
     category: "vm|kernel"
@@ -352,11 +342,6 @@ consoles: <
     category: "vm|reload-kernel"
     short_name: "r"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-debug-simdbc64"
-    category: "vm|reload-kernel"
-    short_name: "md"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64"
     category: "vm|reload-kernel"
@@ -819,11 +804,6 @@ consoles: <
     category: "vm|kernel"
     short_name: "d"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64"
-    category: "vm|kernel"
-    short_name: "dbc"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
@@ -834,11 +814,6 @@ consoles: <
     category: "vm|kernel"
     short_name: "a64"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64"
-    category: "vm|kernel"
-    short_name: "rbc"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32"
     category: "vm|kernel"
@@ -1019,11 +994,6 @@ consoles: <
     category: "vm|reload-kernel"
     short_name: "r"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-debug-simdbc64"
-    category: "vm|reload-kernel"
-    short_name: "md"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64"
     category: "vm|reload-kernel"
@@ -1166,11 +1136,6 @@ consoles: <
     category: "vm|kernel"
     short_name: "d"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64-dev"
-    category: "vm|kernel"
-    short_name: "dbc"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-dev"
     category: "vm|kernel"
@@ -1181,11 +1146,6 @@ consoles: <
     category: "vm|kernel"
     short_name: "a64"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64-dev"
-    category: "vm|kernel"
-    short_name: "rbc"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32-dev"
     category: "vm|kernel"
@@ -1366,11 +1326,6 @@ consoles: <
     category: "vm|reload-kernel"
     short_name: "r"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-debug-simdbc64-dev"
-    category: "vm|reload-kernel"
-    short_name: "md"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64-dev"
     category: "vm|reload-kernel"
@@ -1658,11 +1613,6 @@ consoles: <
     category: "vm|kernel"
     short_name: "d"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simdbc64-stable"
-    category: "vm|kernel"
-    short_name: "dbc"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-stable"
     category: "vm|kernel"
@@ -1673,11 +1623,6 @@ consoles: <
     category: "vm|kernel"
     short_name: "a64"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simdbc64-stable"
-    category: "vm|kernel"
-    short_name: "rbc"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32-stable"
     category: "vm|kernel"
@@ -1858,11 +1803,6 @@ consoles: <
     category: "vm|reload-kernel"
     short_name: "r"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-debug-simdbc64-stable"
-    category: "vm|reload-kernel"
-    short_name: "md"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64-stable"
     category: "vm|reload-kernel"
@@ -2119,9 +2059,6 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try"
   >
-  builders: <
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simdbc64-try"
-  >
   builders: <
     name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try"
   >
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 0d0fefc7b3f2..2eb933d74ba9 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -826,21 +826,6 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-debug-simdbc64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
 notifiers: <
   notifications: <
     on_new_failure: true
@@ -916,21 +901,6 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-release-simdbc64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
 notifiers: <
   notifications: <
     on_new_failure: true
@@ -1306,21 +1276,6 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-reload-mac-debug-simdbc64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
 notifiers: <
   notifications: <
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 1070cb8b8ead..09be9651b879 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1623,36 +1623,6 @@ job: <
     builder: "vm-kernel-linux-debug-ia32-stable"
   >
 >
-job: <
-  id: "vm-kernel-linux-debug-simdbc64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-simdbc64"
-  >
->
-job: <
-  id: "vm-kernel-linux-debug-simdbc64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-simdbc64-dev"
-  >
->
-job: <
-  id: "vm-kernel-linux-debug-simdbc64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-simdbc64-stable"
-  >
->
 job: <
   id: "vm-kernel-linux-debug-x64"
   schedule: "triggered"
@@ -1803,36 +1773,6 @@ job: <
     builder: "vm-kernel-linux-release-simarm64-stable"
   >
 >
-job: <
-  id: "vm-kernel-linux-release-simdbc64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simdbc64"
-  >
->
-job: <
-  id: "vm-kernel-linux-release-simdbc64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simdbc64-dev"
-  >
->
-job: <
-  id: "vm-kernel-linux-release-simdbc64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simdbc64-stable"
-  >
->
 job: <
   id: "vm-kernel-linux-release-x64"
   schedule: "triggered"
@@ -2583,36 +2523,6 @@ job: <
     builder: "vm-kernel-reload-linux-release-x64-stable"
   >
 >
-job: <
-  id: "vm-kernel-reload-mac-debug-simdbc64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-mac-debug-simdbc64"
-  >
->
-job: <
-  id: "vm-kernel-reload-mac-debug-simdbc64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-mac-debug-simdbc64-dev"
-  >
->
-job: <
-  id: "vm-kernel-reload-mac-debug-simdbc64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-mac-debug-simdbc64-stable"
-  >
->
 job: <
   id: "vm-kernel-reload-mac-release-simdbc64"
   schedule: "triggered"
@@ -2936,13 +2846,11 @@ trigger: <
   triggers: "vm-kernel-asan-linux-release-x64-dev"
   triggers: "vm-kernel-checked-linux-release-x64-dev"
   triggers: "vm-kernel-linux-debug-ia32-dev"
-  triggers: "vm-kernel-linux-debug-simdbc64-dev"
   triggers: "vm-kernel-linux-debug-x64-dev"
   triggers: "vm-kernel-linux-product-x64-dev"
   triggers: "vm-kernel-linux-release-ia32-dev"
   triggers: "vm-kernel-linux-release-simarm-dev"
   triggers: "vm-kernel-linux-release-simarm64-dev"
-  triggers: "vm-kernel-linux-release-simdbc64-dev"
   triggers: "vm-kernel-linux-release-x64-dev"
   triggers: "vm-kernel-mac-debug-simdbc64-dev"
   triggers: "vm-kernel-mac-debug-x64-dev"
@@ -2968,7 +2876,6 @@ trigger: <
   triggers: "vm-kernel-precomp-win-release-x64-dev"
   triggers: "vm-kernel-reload-linux-debug-x64-dev"
   triggers: "vm-kernel-reload-linux-release-x64-dev"
-  triggers: "vm-kernel-reload-mac-debug-simdbc64-dev"
   triggers: "vm-kernel-reload-mac-release-simdbc64-dev"
   triggers: "vm-kernel-reload-rollback-linux-debug-x64-dev"
   triggers: "vm-kernel-reload-rollback-linux-release-x64-dev"
@@ -3098,13 +3005,11 @@ trigger: <
   triggers: "vm-kernel-asan-linux-release-x64-stable"
   triggers: "vm-kernel-checked-linux-release-x64-stable"
   triggers: "vm-kernel-linux-debug-ia32-stable"
-  triggers: "vm-kernel-linux-debug-simdbc64-stable"
   triggers: "vm-kernel-linux-debug-x64-stable"
   triggers: "vm-kernel-linux-product-x64-stable"
   triggers: "vm-kernel-linux-release-ia32-stable"
   triggers: "vm-kernel-linux-release-simarm-stable"
   triggers: "vm-kernel-linux-release-simarm64-stable"
-  triggers: "vm-kernel-linux-release-simdbc64-stable"
   triggers: "vm-kernel-linux-release-x64-stable"
   triggers: "vm-kernel-mac-debug-simdbc64-stable"
   triggers: "vm-kernel-mac-debug-x64-stable"
@@ -3130,7 +3035,6 @@ trigger: <
   triggers: "vm-kernel-precomp-win-release-x64-stable"
   triggers: "vm-kernel-reload-linux-debug-x64-stable"
   triggers: "vm-kernel-reload-linux-release-x64-stable"
-  triggers: "vm-kernel-reload-mac-debug-simdbc64-stable"
   triggers: "vm-kernel-reload-mac-release-simdbc64-stable"
   triggers: "vm-kernel-reload-rollback-linux-debug-x64-stable"
   triggers: "vm-kernel-reload-rollback-linux-release-x64-stable"
@@ -3164,11 +3068,9 @@ trigger: <
   triggers: "vm-kernel-asan-linux-release-x64"
   triggers: "vm-kernel-checked-linux-release-x64"
   triggers: "vm-kernel-linux-debug-ia32"
-  triggers: "vm-kernel-linux-debug-simdbc64"
   triggers: "vm-kernel-linux-release-ia32"
   triggers: "vm-kernel-linux-release-simarm"
   triggers: "vm-kernel-linux-release-simarm64"
-  triggers: "vm-kernel-linux-release-simdbc64"
   triggers: "vm-kernel-mac-debug-simdbc64"
   triggers: "vm-kernel-mac-release-simdbc64"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32"
@@ -3190,7 +3092,6 @@ trigger: <
   triggers: "vm-kernel-precomp-win-release-x64"
   triggers: "vm-kernel-reload-linux-debug-x64"
   triggers: "vm-kernel-reload-linux-release-x64"
-  triggers: "vm-kernel-reload-mac-debug-simdbc64"
   triggers: "vm-kernel-reload-mac-release-simdbc64"
   triggers: "vm-kernel-reload-rollback-linux-debug-x64"
   triggers: "vm-kernel-reload-rollback-linux-release-x64"
diff --git a/main.star b/main.star
index 88efb29f04ea..5ec4ca4d1466 100755
--- a/main.star
+++ b/main.star
@@ -479,14 +479,10 @@ dart_vm_extra_builder(
 dart_ci_sandbox_builder(
     "vm-canary-linux-debug", category="vm|kernel|c", on_cq=True)
 dart_ci_sandbox_builder("vm-kernel-linux-debug-x64", category="vm|kernel|d")
-dart_vm_extra_builder(
-    "vm-kernel-linux-debug-simdbc64", category="vm|kernel|dbc")
 dart_vm_extra_builder(
     "vm-kernel-linux-release-simarm", category="vm|kernel|a32")
 dart_vm_extra_builder(
     "vm-kernel-linux-release-simarm64", category="vm|kernel|a64")
-dart_vm_extra_builder(
-    "vm-kernel-linux-release-simdbc64", category="vm|kernel|rbc", on_cq=True)
 dart_vm_extra_builder("vm-kernel-linux-release-ia32", category="vm|kernel|r32")
 dart_ci_sandbox_builder(
     "vm-kernel-linux-release-x64", category="vm|kernel|r", on_cq=True)
@@ -592,10 +588,6 @@ dart_vm_extra_builder(
     "vm-kernel-reload-linux-debug-x64", category="vm|reload-kernel|d")
 dart_vm_extra_builder(
     "vm-kernel-reload-linux-release-x64", category="vm|reload-kernel|r")
-dart_vm_extra_builder(
-    "vm-kernel-reload-mac-debug-simdbc64",
-    category="vm|reload-kernel|md",
-    dimensions=mac())
 dart_vm_extra_builder(
     "vm-kernel-reload-mac-release-simdbc64",
     category="vm|reload-kernel|mr",

From 46bda98d4c5b7d17b7c76af8e1a1a90559da58ba Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 19 Aug 2019 11:13:49 +0000
Subject: [PATCH 293/826] [infra] Enable flutter-engine-linux as a tryjob

https://github.com/dart-lang/sdk/issues/37542

Change-Id: Ida6573706a0e8641c4c8d2975d8bd6e9552b0f42
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/112255
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 22 ++++++++++++++++++++++
 main.star          |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index fe34c674069e..bb50605b7b35 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -7339,6 +7339,28 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "flutter-engine-linux-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/flutter_engine"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "flutter-frontend-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/main.star b/main.star
index 5ec4ca4d1466..0d140970a497 100755
--- a/main.star
+++ b/main.star
@@ -448,7 +448,7 @@ dart_ci_sandbox_builder(
     "flutter-engine-linux",
     recipe="flutter_engine",
     category="flutter|3H",
-    channels=[],
+    channels=["try"],
     properties={"new_workflow_enabled": False},
     triggered_by=["dart-gitiles-trigger-flutter"],
     triggering_policy=scheduler.greedy_batching(

From 49833b85f31056a07440b818c2ff7c67f6ce2490 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 19 Aug 2019 14:25:29 +0000
Subject: [PATCH 294/826] [infra] Remove obsolete
 vm-kernel-mac-release-simdbc64 builder

Simdbc is mothballed and will be removed soon.

Some simdbc64 builders have already been removed in a previous CL:
https://dart-review.googlesource.com/c/sdk/+/113680

Change-Id: I5a809eb3a5f32aa111d9eea61b88defaf64645ce
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/113692
Reviewed-by: Samir Jindel <sjindel@google.com>
---
 cr-buildbucket.cfg | 94 ----------------------------------------------
 luci-milo.cfg      | 20 ----------
 luci-notify.cfg    | 15 --------
 luci-scheduler.cfg | 33 ----------------
 main.star          |  4 --
 5 files changed, 166 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index bb50605b7b35..e646f419ff65 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -4549,77 +4549,6 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-    builders: <
-      name: "vm-kernel-mac-release-simdbc64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-mac-release-simdbc64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-mac-release-simdbc64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
       name: "vm-kernel-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8095,29 +8024,6 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-    builders: <
-      name: "vm-kernel-mac-release-simdbc64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
       name: "vm-kernel-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index bec8a4f367b0..b781bc7131cb 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -187,11 +187,6 @@ consoles: <
     category: "vm|kernel"
     short_name: "mds"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-simdbc64"
-    category: "vm|kernel"
-    short_name: "mrs"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
     category: "vm|kernel"
@@ -839,11 +834,6 @@ consoles: <
     category: "vm|kernel"
     short_name: "mds"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-simdbc64"
-    category: "vm|kernel"
-    short_name: "mrs"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
     category: "vm|kernel"
@@ -1171,11 +1161,6 @@ consoles: <
     category: "vm|kernel"
     short_name: "mds"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-simdbc64-dev"
-    category: "vm|kernel"
-    short_name: "mrs"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-dev"
     category: "vm|kernel"
@@ -1648,11 +1633,6 @@ consoles: <
     category: "vm|kernel"
     short_name: "mds"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-simdbc64-stable"
-    category: "vm|kernel"
-    short_name: "mrs"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-stable"
     category: "vm|kernel"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 2eb933d74ba9..9671a33dab2d 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -961,21 +961,6 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-mac-release-simdbc64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
 notifiers: <
   notifications: <
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 09be9651b879..1d845bc5cd53 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1893,36 +1893,6 @@ job: <
     builder: "vm-kernel-mac-product-x64-stable"
   >
 >
-job: <
-  id: "vm-kernel-mac-release-simdbc64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-release-simdbc64"
-  >
->
-job: <
-  id: "vm-kernel-mac-release-simdbc64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-release-simdbc64-dev"
-  >
->
-job: <
-  id: "vm-kernel-mac-release-simdbc64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-release-simdbc64-stable"
-  >
->
 job: <
   id: "vm-kernel-mac-release-x64"
   schedule: "triggered"
@@ -2855,7 +2825,6 @@ trigger: <
   triggers: "vm-kernel-mac-debug-simdbc64-dev"
   triggers: "vm-kernel-mac-debug-x64-dev"
   triggers: "vm-kernel-mac-product-x64-dev"
-  triggers: "vm-kernel-mac-release-simdbc64-dev"
   triggers: "vm-kernel-mac-release-x64-dev"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
@@ -3014,7 +2983,6 @@ trigger: <
   triggers: "vm-kernel-mac-debug-simdbc64-stable"
   triggers: "vm-kernel-mac-debug-x64-stable"
   triggers: "vm-kernel-mac-product-x64-stable"
-  triggers: "vm-kernel-mac-release-simdbc64-stable"
   triggers: "vm-kernel-mac-release-x64-stable"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
@@ -3072,7 +3040,6 @@ trigger: <
   triggers: "vm-kernel-linux-release-simarm"
   triggers: "vm-kernel-linux-release-simarm64"
   triggers: "vm-kernel-mac-debug-simdbc64"
-  triggers: "vm-kernel-mac-release-simdbc64"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
   triggers: "vm-kernel-precomp-android-release-arm"
diff --git a/main.star b/main.star
index 0d140970a497..e7bb3370b69d 100755
--- a/main.star
+++ b/main.star
@@ -491,10 +491,6 @@ dart_vm_extra_builder(
 dart_vm_extra_builder("vm-kernel-linux-debug-ia32", category="vm|kernel|d32")
 dart_vm_extra_builder(
     "vm-kernel-mac-debug-simdbc64", category="vm|kernel|mds", dimensions=mac())
-dart_vm_extra_builder(
-    "vm-kernel-mac-release-simdbc64",
-    category="vm|kernel|mrs",
-    dimensions=mac())
 dart_ci_sandbox_builder(
     "vm-kernel-mac-debug-x64", category="vm|kernel|md", dimensions=mac())
 dart_ci_sandbox_builder(

From c90b9264b91b8f9d5bfd98c093220551210b9552 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 20 Aug 2019 09:46:01 +0000
Subject: [PATCH 295/826] [infra] Add a merging variant of the Flutter 3xH
 builder

This variant of the Flutter 3xH builder doesn't build every commit. This
allows it to catch up even when the normal builder falls behind.

In the future, bisection can be added to the recipe triggered on
failures to identify breaking commits.

Change-Id: I4f8a38964b6e1628d9b09774c0dac086c51c2d0a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/113699
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 22 ++++++++++++++++++++++
 luci-milo.cfg      | 15 +++++++++++++++
 luci-notify.cfg    | 15 +++++++++++++++
 luci-scheduler.cfg | 11 +++++++++++
 main.star          | 15 +++++++++++++++
 5 files changed, 78 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index e646f419ff65..29326b7adc88 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -2355,6 +2355,28 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "flutter-engine-linux-fast"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/flutter_engine"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "flutter-frontend"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index b781bc7131cb..caa1c7f18538 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -92,6 +92,11 @@ consoles: <
     category: "flutter"
     short_name: "3H"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-fast"
+    category: "flutter"
+    short_name: "3Hf"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
     category: "vm|app-kernel"
@@ -584,6 +589,11 @@ consoles: <
     category: "flutter"
     short_name: "3H"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-fast"
+    category: "flutter"
+    short_name: "3Hf"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
     category: "dart2js|d8"
@@ -2017,6 +2027,11 @@ consoles: <
     category: "flutter"
     short_name: "3H"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-fast"
+    category: "flutter"
+    short_name: "3Hf"
+  >
 >
 consoles: <
   id: "fyi"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 9671a33dab2d..f237638afed4 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -482,6 +482,21 @@ notifiers: <
     repository: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "flutter-engine-linux-fast"
+    repository: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 1d845bc5cd53..aa1b1b4668e0 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -919,6 +919,16 @@ job: <
     builder: "flutter-engine-linux"
   >
 >
+job: <
+  id: "flutter-engine-linux-fast"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "flutter-engine-linux-fast"
+  >
+>
 job: <
   id: "flutter-frontend"
   schedule: "triggered"
@@ -2862,6 +2872,7 @@ trigger: <
   id: "dart-gitiles-trigger-flutter"
   acl_sets: "ci"
   triggers: "flutter-engine-linux"
+  triggers: "flutter-engine-linux-fast"
   gitiles: <
     repo: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
     refs: "regexp:refs/heads/master"
diff --git a/main.star b/main.star
index e7bb3370b69d..468a370310d1 100755
--- a/main.star
+++ b/main.star
@@ -454,6 +454,14 @@ dart_ci_sandbox_builder(
     triggering_policy=scheduler.greedy_batching(
         max_concurrent_invocations=5, max_batch_size=1),
 )
+dart_ci_sandbox_builder(
+    "flutter-engine-linux-fast",
+    recipe="flutter_engine",
+    category="flutter|3Hf",
+    channels=[],
+    properties={"new_workflow_enabled": False},
+    triggered_by=["dart-gitiles-trigger-flutter"],
+)
 
 # vm|app-kernel
 dart_vm_extra_builder(
@@ -790,3 +798,10 @@ luci.console_view_entry(
     category="flutter",
     console_view="flutter-hhh",
 )
+
+luci.console_view_entry(
+    builder="flutter-engine-linux-fast",
+    short_name="3Hf",
+    category="flutter",
+    console_view="flutter-hhh",
+)

From 772883d8f68206ebb1cc11742792102f4a5da73b Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 26 Aug 2019 11:09:36 +0000
Subject: [PATCH 296/826] [infra] Allow ci.sandbox builds to trigger other
 ci.sandbox builds

This is needed for builds that trigger bisection builds. Since the
ci.sandbox and try buckets share a service account, this means that
tryjobs may also start ci.sandbox builds (but not ci builds).

https://github.com/dart-lang/sdk/issues/37939

Change-Id: I3a39245b050fc3f3a045ba40a3743655b9fc815f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/114512
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 cr-buildbucket.cfg | 4 ++++
 main.star          | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 29326b7adc88..142a224f06e5 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -506,6 +506,10 @@ buckets: <
     role: SCHEDULER
     identity: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
   >
+  acls: <
+    role: SCHEDULER
+    identity: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  >
   acls: <
     role: SCHEDULER
     identity: "user:luci-scheduler@appspot.gserviceaccount.com"
diff --git a/main.star b/main.star
index 468a370310d1..02d62ca20964 100755
--- a/main.star
+++ b/main.star
@@ -38,6 +38,7 @@ def windows():
 CI_ACCOUNT = "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
 TRY_ACCOUNT = "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
 CI_TRIGGERERS = ["luci-scheduler@appspot.gserviceaccount.com", CI_ACCOUNT]
+CI_SANDBOX_TRIGGERERS = CI_TRIGGERERS + [TRY_ACCOUNT]
 
 lucicfg.config(
     config_dir=".",
@@ -158,7 +159,7 @@ luci.bucket(
 luci.bucket(
     name="ci.sandbox",
     acls=[
-        acl.entry(acl.BUILDBUCKET_TRIGGERER, users=CI_TRIGGERERS),
+        acl.entry(acl.BUILDBUCKET_TRIGGERER, users=CI_SANDBOX_TRIGGERERS),
     ],
 )
 luci.bucket(

From c6d4a986f142a1d3a315ffe0eb3f491b7485929e Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 26 Aug 2019 17:06:16 +0000
Subject: [PATCH 297/826] [infra] Run the Dart Fuzzer twice for one hour each

Starts an extra build for the fuzzer that will cause it to run 4:00
UTC as well as 3:00.

Change-Id: I4809eac3d05b6b8b13c78aa3f684cc8eceb84814
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/114516
Reviewed-by: Aart Bik <ajcbik@google.com>
---
 luci-scheduler.cfg | 2 +-
 main.star          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index aa1b1b4668e0..009640fb65e8 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1031,7 +1031,7 @@ job: <
 >
 job: <
   id: "fuzz-linux"
-  schedule: "0 3 * * *"
+  schedule: "0 3,4 * * *"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
diff --git a/main.star b/main.star
index 02d62ca20964..f1d73a13a60e 100755
--- a/main.star
+++ b/main.star
@@ -762,7 +762,7 @@ dart_ci_sandbox_builder(
     channels=[],
     notifies="dart-fuzz-testing",
     properties={"new_workflow_enabled": False},
-    schedule="0 3 * * *")
+    schedule="0 3,4 * * *")
 
 # Try only builders
 dart_try_builder("cl-linux")

From 087e0e47861c4fa75d0ec7f0e022a4f7e63311fb Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Sun, 1 Sep 2019 19:07:48 +0000
Subject: [PATCH 298/826] [infra] Add arm64 builders to the Luci config

https://crbug.com/960341

Change-Id: I6ba650a43bae42567248ec1787f14e07516a990e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/112342
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 380 +++++++++++++++++++++++++++++++++++++++++++++
 luci-milo.cfg      | 120 +++++++++++---
 luci-notify.cfg    |  60 +++++++
 luci-scheduler.cfg | 132 ++++++++++++++++
 main.star          |  18 ++-
 5 files changed, 686 insertions(+), 24 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 142a224f06e5..1ba759658276 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -3581,6 +3581,77 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-ffi-android-debug-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-debug-arm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-debug-arm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-ffi-android-product-arm"
       swarming_host: "chromium-swarm.appspot.com"
@@ -3652,6 +3723,77 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-ffi-android-product-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-product-arm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-product-arm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-ffi-android-release-arm"
       swarming_host: "chromium-swarm.appspot.com"
@@ -3723,6 +3865,77 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-ffi-android-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-release-arm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-release-arm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-asan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -4862,6 +5075,80 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-kernel-precomp-android-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "shard_timeout:5400"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-android-release-arm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+        properties_j: "shard_timeout:5400"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-android-release-arm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+        properties_j: "shard_timeout:5400"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-precomp-bare-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
@@ -7728,6 +8015,29 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-ffi-android-debug-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-ffi-android-product-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -7751,6 +8061,29 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-ffi-android-product-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-ffi-android-release-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -7774,6 +8107,29 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-ffi-android-release-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-asan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8143,6 +8499,30 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-kernel-precomp-android-release-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "shard_timeout:5400"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-precomp-bare-linux-release-simarm-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index caa1c7f18538..e78d308916e9 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -227,11 +227,6 @@ consoles: <
     category: "vm|kernel"
     short_name: "cra"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm"
-    category: "vm|kernel-precomp"
-    short_name: "and"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
     category: "vm|kernel-precomp"
@@ -302,6 +297,16 @@ consoles: <
     category: "vm|kernel-precomp"
     short_name: "wr"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm"
+    category: "vm|kernel-precomp|android"
+    short_name: "a32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64"
+    category: "vm|kernel-precomp|android"
+    short_name: "a64"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
     category: "vm|misc"
@@ -372,6 +377,21 @@ consoles: <
     category: "vm|ffi"
     short_name: "p32"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64"
+    category: "vm|ffi"
+    short_name: "d64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64"
+    category: "vm|ffi"
+    short_name: "r64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64"
+    category: "vm|ffi"
+    short_name: "p64"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
     category: "dart2js|d8"
@@ -879,11 +899,6 @@ consoles: <
     category: "vm|kernel"
     short_name: "cra"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm"
-    category: "vm|kernel-precomp"
-    short_name: "and"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
     category: "vm|kernel-precomp"
@@ -954,6 +969,16 @@ consoles: <
     category: "vm|kernel-precomp"
     short_name: "wr"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm"
+    category: "vm|kernel-precomp|android"
+    short_name: "a32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64"
+    category: "vm|kernel-precomp|android"
+    short_name: "a64"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
     category: "vm|misc"
@@ -1024,6 +1049,21 @@ consoles: <
     category: "vm|ffi"
     short_name: "p32"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64"
+    category: "vm|ffi"
+    short_name: "d64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64"
+    category: "vm|ffi"
+    short_name: "r64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64"
+    category: "vm|ffi"
+    short_name: "p64"
+  >
   header: <
     links: <
       name: "Consoles"
@@ -1206,11 +1246,6 @@ consoles: <
     category: "vm|kernel"
     short_name: "cra"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm-dev"
-    category: "vm|kernel-precomp"
-    short_name: "and"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-dev"
     category: "vm|kernel-precomp"
@@ -1281,6 +1316,16 @@ consoles: <
     category: "vm|kernel-precomp"
     short_name: "wr"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm-dev"
+    category: "vm|kernel-precomp|android"
+    short_name: "a32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64-dev"
+    category: "vm|kernel-precomp|android"
+    short_name: "a64"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-dev"
     category: "vm|misc"
@@ -1351,6 +1396,21 @@ consoles: <
     category: "vm|ffi"
     short_name: "p32"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64-dev"
+    category: "vm|ffi"
+    short_name: "d64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64-dev"
+    category: "vm|ffi"
+    short_name: "r64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64-dev"
+    category: "vm|ffi"
+    short_name: "p64"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-dev"
     category: "dart2js|d8"
@@ -1678,11 +1738,6 @@ consoles: <
     category: "vm|kernel"
     short_name: "cra"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm-stable"
-    category: "vm|kernel-precomp"
-    short_name: "and"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-stable"
     category: "vm|kernel-precomp"
@@ -1753,6 +1808,16 @@ consoles: <
     category: "vm|kernel-precomp"
     short_name: "wr"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm-stable"
+    category: "vm|kernel-precomp|android"
+    short_name: "a32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64-stable"
+    category: "vm|kernel-precomp|android"
+    short_name: "a64"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-stable"
     category: "vm|misc"
@@ -1823,6 +1888,21 @@ consoles: <
     category: "vm|ffi"
     short_name: "p32"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64-stable"
+    category: "vm|ffi"
+    short_name: "d64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64-stable"
+    category: "vm|ffi"
+    short_name: "r64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64-stable"
+    category: "vm|ffi"
+    short_name: "p64"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-stable"
     category: "dart2js|d8"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index f237638afed4..0f5356b56029 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -766,6 +766,21 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-ffi-android-debug-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
@@ -781,6 +796,21 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-ffi-android-product-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
@@ -796,6 +826,21 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-ffi-android-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
@@ -1036,6 +1081,21 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-android-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 009640fb65e8..819f3c816f54 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1483,6 +1483,36 @@ job: <
     builder: "vm-ffi-android-debug-arm-stable"
   >
 >
+job: <
+  id: "vm-ffi-android-debug-arm64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-debug-arm64"
+  >
+>
+job: <
+  id: "vm-ffi-android-debug-arm64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-debug-arm64-dev"
+  >
+>
+job: <
+  id: "vm-ffi-android-debug-arm64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-debug-arm64-stable"
+  >
+>
 job: <
   id: "vm-ffi-android-product-arm"
   schedule: "triggered"
@@ -1513,6 +1543,36 @@ job: <
     builder: "vm-ffi-android-product-arm-stable"
   >
 >
+job: <
+  id: "vm-ffi-android-product-arm64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-product-arm64"
+  >
+>
+job: <
+  id: "vm-ffi-android-product-arm64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-product-arm64-dev"
+  >
+>
+job: <
+  id: "vm-ffi-android-product-arm64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-product-arm64-stable"
+  >
+>
 job: <
   id: "vm-ffi-android-release-arm"
   schedule: "triggered"
@@ -1543,6 +1603,36 @@ job: <
     builder: "vm-ffi-android-release-arm-stable"
   >
 >
+job: <
+  id: "vm-ffi-android-release-arm64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-release-arm64"
+  >
+>
+job: <
+  id: "vm-ffi-android-release-arm64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-release-arm64-dev"
+  >
+>
+job: <
+  id: "vm-ffi-android-release-arm64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-release-arm64-stable"
+  >
+>
 job: <
   id: "vm-kernel-asan-linux-release-x64"
   schedule: "triggered"
@@ -2023,6 +2113,36 @@ job: <
     builder: "vm-kernel-precomp-android-release-arm-stable"
   >
 >
+job: <
+  id: "vm-kernel-precomp-android-release-arm64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-android-release-arm64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-android-release-arm64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-android-release-arm64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-android-release-arm64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-android-release-arm64-stable"
+  >
+>
 job: <
   id: "vm-kernel-precomp-bare-linux-release-simarm"
   schedule: "triggered"
@@ -2821,8 +2941,11 @@ trigger: <
   triggers: "vm-dartkb-linux-release-x64-abi-dev"
   triggers: "vm-dartkb-linux-release-x64-dev"
   triggers: "vm-ffi-android-debug-arm-dev"
+  triggers: "vm-ffi-android-debug-arm64-dev"
   triggers: "vm-ffi-android-product-arm-dev"
+  triggers: "vm-ffi-android-product-arm64-dev"
   triggers: "vm-ffi-android-release-arm-dev"
+  triggers: "vm-ffi-android-release-arm64-dev"
   triggers: "vm-kernel-asan-linux-release-x64-dev"
   triggers: "vm-kernel-checked-linux-release-x64-dev"
   triggers: "vm-kernel-linux-debug-ia32-dev"
@@ -2839,6 +2962,7 @@ trigger: <
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-android-release-arm-dev"
+  triggers: "vm-kernel-precomp-android-release-arm64-dev"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm-dev"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
   triggers: "vm-kernel-precomp-bare-linux-release-x64-dev"
@@ -2980,8 +3104,11 @@ trigger: <
   triggers: "vm-dartkb-linux-release-x64-abi-stable"
   triggers: "vm-dartkb-linux-release-x64-stable"
   triggers: "vm-ffi-android-debug-arm-stable"
+  triggers: "vm-ffi-android-debug-arm64-stable"
   triggers: "vm-ffi-android-product-arm-stable"
+  triggers: "vm-ffi-android-product-arm64-stable"
   triggers: "vm-ffi-android-release-arm-stable"
+  triggers: "vm-ffi-android-release-arm64-stable"
   triggers: "vm-kernel-asan-linux-release-x64-stable"
   triggers: "vm-kernel-checked-linux-release-x64-stable"
   triggers: "vm-kernel-linux-debug-ia32-stable"
@@ -2998,6 +3125,7 @@ trigger: <
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-android-release-arm-stable"
+  triggers: "vm-kernel-precomp-android-release-arm64-stable"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm-stable"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
   triggers: "vm-kernel-precomp-bare-linux-release-x64-stable"
@@ -3042,8 +3170,11 @@ trigger: <
   triggers: "vm-dartkb-linux-release-x64"
   triggers: "vm-dartkb-linux-release-x64-abi"
   triggers: "vm-ffi-android-debug-arm"
+  triggers: "vm-ffi-android-debug-arm64"
   triggers: "vm-ffi-android-product-arm"
+  triggers: "vm-ffi-android-product-arm64"
   triggers: "vm-ffi-android-release-arm"
+  triggers: "vm-ffi-android-release-arm64"
   triggers: "vm-kernel-asan-linux-release-x64"
   triggers: "vm-kernel-checked-linux-release-x64"
   triggers: "vm-kernel-linux-debug-ia32"
@@ -3054,6 +3185,7 @@ trigger: <
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
   triggers: "vm-kernel-precomp-android-release-arm"
+  triggers: "vm-kernel-precomp-android-release-arm64"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm64"
   triggers: "vm-kernel-precomp-bare-linux-release-x64"
diff --git a/main.star b/main.star
index f1d73a13a60e..dd5cf6ba9480 100755
--- a/main.star
+++ b/main.star
@@ -524,10 +524,6 @@ dart_vm_extra_builder(
     channels=RELEASE_CHANNELS)
 
 # vm|kernel-precomp
-dart_vm_extra_builder(
-    "vm-kernel-precomp-android-release-arm",
-    category="vm|kernel-precomp|and",
-    properties={"shard_timeout": 5400})  # 1.5h
 dart_vm_extra_builder(
     "vm-kernel-precomp-linux-debug-x64", category="vm|kernel-precomp|d")
 dart_vm_extra_builder(
@@ -572,6 +568,16 @@ dart_vm_extra_builder(
     category="vm|kernel-precomp|wr",
     dimensions=windows())
 
+# vm|kernel-precomp|android
+dart_vm_extra_builder(
+    "vm-kernel-precomp-android-release-arm",
+    category="vm|kernel-precomp|android|a32",
+    properties={"shard_timeout": 5400})  # 1.5h
+dart_vm_extra_builder(
+    "vm-kernel-precomp-android-release-arm64",
+    category="vm|kernel-precomp|android|a64",
+    properties={"shard_timeout": 5400})  # 1.5h
+
 # vm|misc
 dart_vm_extra_builder(
     "vm-kernel-asan-linux-release-x64", category="vm|misc|a64")
@@ -603,10 +609,14 @@ dart_vm_extra_builder(
 dart_vm_extra_builder(
     "vm-kernel-reload-rollback-linux-release-x64",
     category="vm|reload-kernel|rrb")
+
 # vm|ffi
 dart_vm_extra_builder("vm-ffi-android-debug-arm", category="vm|ffi|d32")
 dart_vm_extra_builder("vm-ffi-android-release-arm", category="vm|ffi|r32")
 dart_vm_extra_builder("vm-ffi-android-product-arm", category="vm|ffi|p32")
+dart_vm_extra_builder("vm-ffi-android-debug-arm64", category="vm|ffi|d64")
+dart_vm_extra_builder("vm-ffi-android-release-arm64", category="vm|ffi|r64")
+dart_vm_extra_builder("vm-ffi-android-product-arm64", category="vm|ffi|p64")
 
 # dart2js
 dart_ci_sandbox_builder(

From 3b68cdcec2c6d04b4512eca94f176a5aa05f6249 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 2 Sep 2019 10:18:03 +0000
Subject: [PATCH 299/826] [infra] Notify frontend-team for flutter-frontend
 failures

Currently, this just notifies jensj because the frontend team's mailing
list does not accept messages from luci-notify.

Change-Id: I18dd87245778c2b9717e91cf23c3127ba94d343c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/115204
Reviewed-by: Jens Johansen <jensj@google.com>
---
 luci-notify.cfg | 13 +++++++++++++
 main.star       |  8 +++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/luci-notify.cfg b/luci-notify.cfg
index 0f5356b56029..f6d00d35d8cb 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -497,6 +497,19 @@ notifiers: <
     repository: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
   >
 >
+notifiers: <
+  notifications: <
+    on_failure: true
+    email: <
+      recipients: "jensj@google.com"
+    >
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "flutter-frontend"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
diff --git a/main.star b/main.star
index dd5cf6ba9480..ac3929c25c51 100755
--- a/main.star
+++ b/main.star
@@ -226,6 +226,12 @@ luci.notifier(
     on_failure=True,
     notify_emails=["ajcbik@google.com", "athom@google.com"])
 
+luci.notifier(
+    name="frontend-team",
+    on_failure = True,
+    notify_emails = ["jensj@google.com"]
+)
+
 luci.cq(
     submit_max_burst=2,
     submit_burst_delay=8 * time.minute,
@@ -442,7 +448,7 @@ dart_ci_sandbox_builder(
     category="fasta|fl",
     channels=["try"],
     properties={"new_workflow_enabled": False},
-    notifies=None)
+    notifies="frontend-team")
 
 # flutter
 dart_ci_sandbox_builder(

From 8f496775df4b561804346cfa1f95c153699c1b23 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Sun, 8 Sep 2019 20:07:38 +0000
Subject: [PATCH 300/826] [infra] Use build merging/bisection on the regular
 Flutter 3xH builder

* Remove the custom triggering policy on the Flutter 3xH builder.
* Delete the -fast builder.

TBR=whesse@google.com

Change-Id: I84fc931212af66c5a99f9cfcc0ba4eb972cb0bff
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/116206
Reviewed-by: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg   |   3 +-
 cr-buildbucket.cfg |  22 ----
 luci-milo.cfg      |  15 ---
 luci-notify.cfg    | 291 ++++++++++++++-------------------------------
 luci-scheduler.cfg |  16 ---
 main.star          |  17 ---
 6 files changed, 93 insertions(+), 271 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 23ff04e08569..f8faf308de4b 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -88,8 +88,7 @@ config_groups: <
         name: "dart/try/vm-kernel-mac-release-x64-try"
         experiment_percentage: 5
       >
-      retry_config: <
-      >
+      retry_config: <>
       cancel_stale_tryjobs: YES
     >
   >
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 1ba759658276..deabbe4af01f 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -2359,28 +2359,6 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-    builders: <
-      name: "flutter-engine-linux-fast"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/flutter_engine"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
       name: "flutter-frontend"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index e78d308916e9..c795be979259 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -92,11 +92,6 @@ consoles: <
     category: "flutter"
     short_name: "3H"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-fast"
-    category: "flutter"
-    short_name: "3Hf"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
     category: "vm|app-kernel"
@@ -609,11 +604,6 @@ consoles: <
     category: "flutter"
     short_name: "3H"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-fast"
-    category: "flutter"
-    short_name: "3Hf"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
     category: "dart2js|d8"
@@ -2107,11 +2097,6 @@ consoles: <
     category: "flutter"
     short_name: "3H"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-fast"
-    category: "flutter"
-    short_name: "3Hf"
-  >
 >
 consoles: <
   id: "fyi"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index f6d00d35d8cb..adc251957527 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -24,8 +24,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci"
@@ -39,8 +38,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci"
@@ -54,8 +52,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci"
@@ -98,8 +95,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci"
@@ -113,8 +109,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -128,8 +123,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -143,8 +137,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -158,8 +151,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -173,8 +165,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -188,8 +179,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -203,8 +193,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -218,8 +207,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -233,8 +221,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -248,8 +235,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -263,8 +249,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -278,8 +263,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -293,8 +277,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -308,8 +291,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -323,8 +305,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -338,8 +319,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -353,8 +333,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -368,8 +347,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -383,8 +361,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -398,8 +375,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -413,8 +389,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -428,8 +403,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -443,8 +417,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -458,8 +431,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -473,8 +445,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -482,21 +453,6 @@ notifiers: <
     repository: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
   >
 >
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <
-    >
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "flutter-engine-linux-fast"
-    repository: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
-  >
->
 notifiers: <
   notifications: <
     on_failure: true
@@ -516,8 +472,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -531,8 +486,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -546,8 +500,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -575,8 +528,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -590,8 +542,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -605,8 +556,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -620,8 +570,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -635,8 +584,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -650,8 +598,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -665,8 +612,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -680,8 +626,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -695,8 +640,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -710,8 +654,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -725,8 +668,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -740,8 +682,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -755,8 +696,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -770,8 +710,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -785,8 +724,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -800,8 +738,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -815,8 +752,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -830,8 +766,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -845,8 +780,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -860,8 +794,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -875,8 +808,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -890,8 +822,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -905,8 +836,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -920,8 +850,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -935,8 +864,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -950,8 +878,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -965,8 +892,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -980,8 +906,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -995,8 +920,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1010,8 +934,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1025,8 +948,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1040,8 +962,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1055,8 +976,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1070,8 +990,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1085,8 +1004,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1100,8 +1018,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1115,8 +1032,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1130,8 +1046,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1145,8 +1060,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1160,8 +1074,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1175,8 +1088,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1190,8 +1102,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1205,8 +1116,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1220,8 +1130,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1235,8 +1144,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1250,8 +1158,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1265,8 +1172,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1280,8 +1186,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1295,8 +1200,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1310,8 +1214,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1325,8 +1228,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1340,8 +1242,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1355,8 +1256,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1370,8 +1270,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1385,8 +1284,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1400,8 +1298,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1415,8 +1312,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1430,8 +1326,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1445,8 +1340,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
@@ -1460,8 +1354,7 @@ notifiers: <
     email: <
       recipients: "athom@google.com"
     >
-    notify_blamelist: <
-    >
+    notify_blamelist: <>
   >
   builders: <
     bucket: "ci.sandbox"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 819f3c816f54..a1885b2bcca7 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -908,27 +908,12 @@ job: <
   id: "flutter-engine-linux"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  triggering_policy: <
-    kind: GREEDY_BATCHING
-    max_concurrent_invocations: 5
-    max_batch_size: 1
-  >
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "flutter-engine-linux"
   >
 >
-job: <
-  id: "flutter-engine-linux-fast"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "flutter-engine-linux-fast"
-  >
->
 job: <
   id: "flutter-frontend"
   schedule: "triggered"
@@ -2996,7 +2981,6 @@ trigger: <
   id: "dart-gitiles-trigger-flutter"
   acl_sets: "ci"
   triggers: "flutter-engine-linux"
-  triggers: "flutter-engine-linux-fast"
   gitiles: <
     repo: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
     refs: "regexp:refs/heads/master"
diff --git a/main.star b/main.star
index ac3929c25c51..8a78cb056e33 100755
--- a/main.star
+++ b/main.star
@@ -458,16 +458,6 @@ dart_ci_sandbox_builder(
     channels=["try"],
     properties={"new_workflow_enabled": False},
     triggered_by=["dart-gitiles-trigger-flutter"],
-    triggering_policy=scheduler.greedy_batching(
-        max_concurrent_invocations=5, max_batch_size=1),
-)
-dart_ci_sandbox_builder(
-    "flutter-engine-linux-fast",
-    recipe="flutter_engine",
-    category="flutter|3Hf",
-    channels=[],
-    properties={"new_workflow_enabled": False},
-    triggered_by=["dart-gitiles-trigger-flutter"],
 )
 
 # vm|app-kernel
@@ -815,10 +805,3 @@ luci.console_view_entry(
     category="flutter",
     console_view="flutter-hhh",
 )
-
-luci.console_view_entry(
-    builder="flutter-engine-linux-fast",
-    short_name="3Hf",
-    category="flutter",
-    console_view="flutter-hhh",
-)

From d8ed97022aa9a4296dfa1da75c3c6eb9f5a5b700 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 23 Sep 2019 06:23:10 +0000
Subject: [PATCH 301/826] [infra] Only add Dart2js/DDC tryjobs for relevant
 commits

These tryjobs run on JS engines and use a lot of bot capacity. Runnning
them only on changes that are likely to affect them allows that capacity
to be used for other tryjobs.

Change-Id: Ie16dce1b05987062e93374d784ab6fdc08a1acee
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/118046
Reviewed-by: William Hesse <whesse@google.com>
Reviewed-by: Sigmund Cherem <sigmund@google.com>
---
 commit-queue.cfg   | 35 +++++++++++++++++++++++++++
 luci-scheduler.cfg |  5 ++--
 main.star          | 60 ++++++++++++++++++++++++++++++++++++----------
 3 files changed, 86 insertions(+), 14 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index f8faf308de4b..7afb3df41f43 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -42,18 +42,53 @@ config_groups: <
       >
       builders: <
         name: "dart/try/dart2js-minified-strong-linux-x64-d8-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|front_end|kernel|js_ast)/.+"
+        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
       >
       builders: <
         name: "dart/try/dart2js-strong-hostasserts-linux-ia32-d8-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|front_end|kernel|js_ast)/.+"
+        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
       >
       builders: <
         name: "dart/try/dart2js-strong-linux-x64-chrome-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|front_end|kernel|js_ast)/.+"
+        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
       >
       builders: <
         name: "dart/try/dart2js-unit-linux-x64-release-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|front_end|kernel|js_ast)/.+"
+        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
       >
       builders: <
         name: "dart/try/ddc-linux-release-chrome-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(analyzer|build_integration|dev_compiler|front_end|kernel|meta)/.+"
+        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing|testing)/.+"
       >
       builders: <
         name: "dart/try/flutter-analyze-try"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index a1885b2bcca7..66701c6947d0 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -3196,10 +3196,11 @@ trigger: <
     refs: "regexp:refs/heads/master"
     path_regexps: "DEPS"
     path_regexps: "build/.+"
+    path_regexps: "sdk(_nnbd)?/.+"
+    path_regexps: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+    path_regexps: "tests/.+"
     path_regexps: "pkg/(front_end|kernel|vm)/.+"
     path_regexps: "runtime/.+"
-    path_regexps: "sdk/.+"
-    path_regexps: "tests/.+"
   >
 >
 acl_sets: <
diff --git a/main.star b/main.star
index 8a78cb056e33..f4fcdd168cb9 100755
--- a/main.star
+++ b/main.star
@@ -17,15 +17,43 @@ CHANNELS = RELEASE_CHANNELS + ["try"]
 ANALYZER_CHANNELS = ["analyzer-stable"] + CHANNELS
 BRANCHES = ["master", "dev", "stable"]
 
-VM_PATHS = [
-    "DEPS",
+TEST_PY_PATHS = "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+
+STANDARD_PATHS = [
+    "DEPS",  # DEPS catches most third_party changes.
     "build/.+",
+    # core libraries
+    "sdk(_nnbd)?/.+",
+    # testing
+    TEST_PY_PATHS,
+    # tests
+    "tests/.+",
+]
+
+VM_PATHS = STANDARD_PATHS + [
+    # VM sources
     "pkg/(front_end|kernel|vm)/.+",
     "runtime/.+",
-    "sdk/.+",
-    "tests/.+",
 ]
 
+DART2JS_PATHS = STANDARD_PATHS + [
+    # compiler sources
+    "pkg/(compiler|dart2js_tools|front_end|kernel|js_ast)/.+",
+    # testing
+    "pkg/(js|modular_test|sourcemap_testing)/.+",
+]
+
+DDC_PATHS = STANDARD_PATHS + [
+    # compiler sources
+    "pkg/(analyzer|build_integration|dev_compiler|front_end|kernel|meta)/.+",
+    # testing
+    "pkg/(js|modular_test|sourcemap_testing|testing)/.+",
+]
+
+
+def to_location_regexp(paths):
+    return [".+/[+]/%s" % path for path in paths]
+
 
 def mac():
     return {"os": "Mac"}
@@ -227,10 +255,7 @@ luci.notifier(
     notify_emails=["ajcbik@google.com", "athom@google.com"])
 
 luci.notifier(
-    name="frontend-team",
-    on_failure = True,
-    notify_emails = ["jensj@google.com"]
-)
+    name="frontend-team", on_failure=True, notify_emails=["jensj@google.com"])
 
 luci.cq(
     submit_max_burst=2,
@@ -427,7 +452,7 @@ def dart_ci_sandbox_builder(name, channels=CHANNELS, properties={}, **kwargs):
 def dart_vm_extra_builder(name, on_cq=False, location_regexp=None, **kwargs):
     triggered_by = ["dart-vm-gitiles-trigger-%s"]
     if on_cq and not location_regexp:
-        location_regexp = [".+/[+]/%s" % path for path in VM_PATHS]
+        location_regexp = to_location_regexp(VM_PATHS)
     dart_ci_sandbox_builder(
         name,
         triggered_by=triggered_by,
@@ -618,16 +643,24 @@ dart_vm_extra_builder("vm-ffi-android-product-arm64", category="vm|ffi|p64")
 dart_ci_sandbox_builder(
     "dart2js-strong-hostasserts-linux-ia32-d8",
     category="dart2js|d8|ha",
+    location_regexp=to_location_regexp(DART2JS_PATHS),
     on_cq=True)
 dart_ci_sandbox_builder("dart2js-rti-linux-x64-d8", category="dart2js|d8|rti")
 dart_ci_sandbox_builder(
     "dart2js-minified-strong-linux-x64-d8",
     category="dart2js|d8|mi",
+    location_regexp=to_location_regexp(DART2JS_PATHS),
     on_cq=True)
 dart_ci_sandbox_builder(
-    "dart2js-unit-linux-x64-release", category="dart2js|d8|u", on_cq=True)
+    "dart2js-unit-linux-x64-release",
+    category="dart2js|d8|u",
+    location_regexp=to_location_regexp(DART2JS_PATHS),
+    on_cq=True)
 dart_ci_sandbox_builder(
-    "dart2js-strong-linux-x64-chrome", category="dart2js|chrome|l", on_cq=True)
+    "dart2js-strong-linux-x64-chrome",
+    category="dart2js|chrome|l",
+    location_regexp=to_location_regexp(DART2JS_PATHS),
+    on_cq=True)
 dart_ci_sandbox_builder(
     "dart2js-csp-minified-linux-x64-chrome", category="dart2js|chrome|csp")
 dart_ci_sandbox_builder(
@@ -705,7 +738,10 @@ dart_ci_builder(
 
 # ddc
 dart_ci_sandbox_builder(
-    "ddc-linux-release-chrome", category="ddc|l", on_cq=True)
+    "ddc-linux-release-chrome",
+    category="ddc|l",
+    location_regexp=to_location_regexp(DDC_PATHS),
+    on_cq=True)
 dart_ci_sandbox_builder(
     "ddc-mac-release-chrome", category="ddc|m", dimensions=mac())
 dart_ci_sandbox_builder(

From 1c8e5f0d2ebd3f54768c2c2bf46994817b2fe4c3 Mon Sep 17 00:00:00 2001
From: Samir Jindel <sjindel@google.com>
Date: Wed, 25 Sep 2019 17:11:20 +0000
Subject: [PATCH 302/826] [vm] Switch vm-kernel-precomp-mac-debug-simarm_x64 to
 vm-kernel-precomp-linux-debug-simarm_x64.

The reason is that we can test Assembly snapshot generation on Linux but not on Mac.

We have had several bugs propagate to Flutter end-users due to our lack of testing of
AOT Assembly snapshots on ARM (SIMARM_X64 in particular), causing reverts of SDK commits
and disrupting the Dart -> Flutter roll.

For example, see:
  - https://github.com/flutter/flutter/issues/40114
  - https://github.com/flutter/flutter/issues/41228

Change-Id: Ided8116e8230e58ffd350447b2e1a22676bd0506
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/118584
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Samir Jindel <sjindel@google.com>
---
 cr-buildbucket.cfg | 64 ++++++++++++++++++++++----------------------
 luci-milo.cfg      | 24 ++++++++---------
 luci-notify.cfg    | 12 ++++-----
 luci-scheduler.cfg | 66 +++++++++++++++++++++++-----------------------
 main.star          |  7 +++--
 5 files changed, 86 insertions(+), 87 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index deabbe4af01f..2de90b99a9ee 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -5341,7 +5341,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-debug-x64"
+      name: "vm-kernel-precomp-linux-debug-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5354,6 +5354,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5364,7 +5365,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-debug-x64-dev"
+      name: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5378,6 +5379,7 @@ buckets: <
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5388,7 +5390,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-debug-x64-stable"
+      name: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5402,6 +5404,7 @@ buckets: <
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5412,7 +5415,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-product-x64"
+      name: "vm-kernel-precomp-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5435,7 +5438,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-product-x64-dev"
+      name: "vm-kernel-precomp-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5459,7 +5462,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-product-x64-stable"
+      name: "vm-kernel-precomp-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5483,7 +5486,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-simarm"
+      name: "vm-kernel-precomp-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5506,7 +5509,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-simarm-dev"
+      name: "vm-kernel-precomp-linux-product-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5530,7 +5533,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-simarm-stable"
+      name: "vm-kernel-precomp-linux-product-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5554,7 +5557,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-simarm64"
+      name: "vm-kernel-precomp-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5577,7 +5580,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-simarm64-dev"
+      name: "vm-kernel-precomp-linux-release-simarm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5601,7 +5604,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-simarm64-stable"
+      name: "vm-kernel-precomp-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5625,7 +5628,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-x64"
+      name: "vm-kernel-precomp-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5648,7 +5651,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-x64-dev"
+      name: "vm-kernel-precomp-linux-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5672,7 +5675,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-x64-stable"
+      name: "vm-kernel-precomp-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5696,12 +5699,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-mac-debug-simarm_x64"
+      name: "vm-kernel-precomp-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5709,7 +5712,6 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5720,12 +5722,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-mac-debug-simarm_x64-dev"
+      name: "vm-kernel-precomp-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5734,7 +5736,6 @@ buckets: <
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
-        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5745,12 +5746,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-mac-debug-simarm_x64-stable"
+      name: "vm-kernel-precomp-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5759,7 +5760,6 @@ buckets: <
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
-        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -8571,7 +8571,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-debug-x64-try"
+      name: "vm-kernel-precomp-linux-debug-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8584,6 +8584,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "shard_timeout:5400"
       >
       priority: 30
       caches: <
@@ -8594,7 +8595,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-product-x64-try"
+      name: "vm-kernel-precomp-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8617,7 +8618,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-simarm-try"
+      name: "vm-kernel-precomp-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8640,7 +8641,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-simarm64-try"
+      name: "vm-kernel-precomp-linux-release-simarm-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8663,7 +8664,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-x64-try"
+      name: "vm-kernel-precomp-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8686,12 +8687,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-mac-debug-simarm_x64-try"
+      name: "vm-kernel-precomp-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -8699,7 +8700,6 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "shard_timeout:5400"
       >
       priority: 30
       caches: <
diff --git a/luci-milo.cfg b/luci-milo.cfg
index c795be979259..cdceeef796da 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -268,14 +268,14 @@ consoles: <
     short_name: "o"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-debug-simarm_x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64"
     category: "vm|kernel-precomp"
-    short_name: "ad"
+    short_name: "adx"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm_x64"
     category: "vm|kernel-precomp"
-    short_name: "ar"
+    short_name: "arx"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
@@ -935,14 +935,14 @@ consoles: <
     short_name: "o"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-debug-simarm_x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64"
     category: "vm|kernel-precomp"
-    short_name: "ad"
+    short_name: "adx"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm_x64"
     category: "vm|kernel-precomp"
-    short_name: "ar"
+    short_name: "arx"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
@@ -1282,14 +1282,14 @@ consoles: <
     short_name: "o"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-debug-simarm_x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-dev"
     category: "vm|kernel-precomp"
-    short_name: "ad"
+    short_name: "adx"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm_x64-dev"
     category: "vm|kernel-precomp"
-    short_name: "ar"
+    short_name: "arx"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-dev"
@@ -1774,14 +1774,14 @@ consoles: <
     short_name: "o"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-debug-simarm_x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-stable"
     category: "vm|kernel-precomp"
-    short_name: "ad"
+    short_name: "adx"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm_x64-stable"
     category: "vm|kernel-precomp"
-    short_name: "ar"
+    short_name: "arx"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-stable"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index adc251957527..907df8f62688 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -1078,7 +1078,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-debug-x64"
+    name: "vm-kernel-precomp-linux-debug-simarm_x64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -1092,7 +1092,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-product-x64"
+    name: "vm-kernel-precomp-linux-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -1106,7 +1106,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-release-simarm"
+    name: "vm-kernel-precomp-linux-product-x64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -1120,7 +1120,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-release-simarm64"
+    name: "vm-kernel-precomp-linux-release-simarm"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -1134,7 +1134,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-release-x64"
+    name: "vm-kernel-precomp-linux-release-simarm64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -1148,7 +1148,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-mac-debug-simarm_x64"
+    name: "vm-kernel-precomp-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 66701c6947d0..3306804534e6 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -2218,6 +2218,36 @@ job: <
     builder: "vm-kernel-precomp-bare-linux-release-x64-stable"
   >
 >
+job: <
+  id: "vm-kernel-precomp-linux-debug-simarm_x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-debug-simarm_x64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
+  >
+>
 job: <
   id: "vm-kernel-precomp-linux-debug-x64"
   schedule: "triggered"
@@ -2368,36 +2398,6 @@ job: <
     builder: "vm-kernel-precomp-linux-release-x64-stable"
   >
 >
-job: <
-  id: "vm-kernel-precomp-mac-debug-simarm_x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-mac-debug-simarm_x64"
-  >
->
-job: <
-  id: "vm-kernel-precomp-mac-debug-simarm_x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-mac-debug-simarm_x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-precomp-mac-debug-simarm_x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-mac-debug-simarm_x64-stable"
-  >
->
 job: <
   id: "vm-kernel-precomp-mac-release-simarm64"
   schedule: "triggered"
@@ -2951,12 +2951,12 @@ trigger: <
   triggers: "vm-kernel-precomp-bare-linux-release-simarm-dev"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
   triggers: "vm-kernel-precomp-bare-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
   triggers: "vm-kernel-precomp-linux-debug-x64-dev"
   triggers: "vm-kernel-precomp-linux-product-x64-dev"
   triggers: "vm-kernel-precomp-linux-release-simarm-dev"
   triggers: "vm-kernel-precomp-linux-release-simarm64-dev"
   triggers: "vm-kernel-precomp-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-mac-debug-simarm_x64-dev"
   triggers: "vm-kernel-precomp-mac-release-simarm64-dev"
   triggers: "vm-kernel-precomp-mac-release-simarm_x64-dev"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
@@ -3113,12 +3113,12 @@ trigger: <
   triggers: "vm-kernel-precomp-bare-linux-release-simarm-stable"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
   triggers: "vm-kernel-precomp-bare-linux-release-x64-stable"
+  triggers: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
   triggers: "vm-kernel-precomp-linux-debug-x64-stable"
   triggers: "vm-kernel-precomp-linux-product-x64-stable"
   triggers: "vm-kernel-precomp-linux-release-simarm-stable"
   triggers: "vm-kernel-precomp-linux-release-simarm64-stable"
   triggers: "vm-kernel-precomp-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-mac-debug-simarm_x64-stable"
   triggers: "vm-kernel-precomp-mac-release-simarm64-stable"
   triggers: "vm-kernel-precomp-mac-release-simarm_x64-stable"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
@@ -3173,12 +3173,12 @@ trigger: <
   triggers: "vm-kernel-precomp-bare-linux-release-simarm"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm64"
   triggers: "vm-kernel-precomp-bare-linux-release-x64"
+  triggers: "vm-kernel-precomp-linux-debug-simarm_x64"
   triggers: "vm-kernel-precomp-linux-debug-x64"
   triggers: "vm-kernel-precomp-linux-product-x64"
   triggers: "vm-kernel-precomp-linux-release-simarm"
   triggers: "vm-kernel-precomp-linux-release-simarm64"
   triggers: "vm-kernel-precomp-linux-release-x64"
-  triggers: "vm-kernel-precomp-mac-debug-simarm_x64"
   triggers: "vm-kernel-precomp-mac-release-simarm64"
   triggers: "vm-kernel-precomp-mac-release-simarm_x64"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64"
diff --git a/main.star b/main.star
index f4fcdd168cb9..52b0f584e5ed 100755
--- a/main.star
+++ b/main.star
@@ -568,13 +568,12 @@ dart_vm_extra_builder(
     "vm-kernel-precomp-obfuscate-linux-release-x64",
     category="vm|kernel-precomp|o")
 dart_vm_extra_builder(
-    "vm-kernel-precomp-mac-debug-simarm_x64",
-    category="vm|kernel-precomp|ad",
-    dimensions=mac(),
+    "vm-kernel-precomp-linux-debug-simarm_x64",
+    category="vm|kernel-precomp|adx",
     properties={"shard_timeout": 5400})  # 1.5h
 dart_vm_extra_builder(
     "vm-kernel-precomp-mac-release-simarm_x64",
-    category="vm|kernel-precomp|ar",
+    category="vm|kernel-precomp|arx",
     dimensions=mac())
 dart_vm_extra_builder(
     "vm-kernel-precomp-mac-release-simarm64",

From 1484f2b37a2a04e8afa69b0492c5f407d1dc944f Mon Sep 17 00:00:00 2001
From: Samir Jindel <sjindel@google.com>
Date: Mon, 7 Oct 2019 11:38:52 +0000
Subject: [PATCH 303/826] Test ARM_X64 instead of ARM.

Issue https://github.com/dart-lang/sdk/issues/38709

Change-Id: Iba514c4df814960647bff87dd6ee6e983e000f61
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/120261
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 16 ++++++++--------
 luci-milo.cfg      |  8 ++++----
 luci-notify.cfg    |  4 ++--
 luci-scheduler.cfg | 30 +++++++++++++++---------------
 main.star          |  2 +-
 5 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 2de90b99a9ee..4ee716338a3d 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -4980,7 +4980,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm"
+      name: "vm-kernel-precomp-android-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5004,7 +5004,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm-dev"
+      name: "vm-kernel-precomp-android-release-arm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5029,7 +5029,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm-stable"
+      name: "vm-kernel-precomp-android-release-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5054,7 +5054,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm64"
+      name: "vm-kernel-precomp-android-release-arm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5078,7 +5078,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm64-dev"
+      name: "vm-kernel-precomp-android-release-arm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5103,7 +5103,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm64-stable"
+      name: "vm-kernel-precomp-android-release-arm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8454,7 +8454,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm-try"
+      name: "vm-kernel-precomp-android-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8478,7 +8478,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm64-try"
+      name: "vm-kernel-precomp-android-release-arm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index cdceeef796da..3b60797e410a 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -293,7 +293,7 @@ consoles: <
     short_name: "wr"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64"
     category: "vm|kernel-precomp|android"
     short_name: "a32"
   >
@@ -960,7 +960,7 @@ consoles: <
     short_name: "wr"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64"
     category: "vm|kernel-precomp|android"
     short_name: "a32"
   >
@@ -1307,7 +1307,7 @@ consoles: <
     short_name: "wr"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-dev"
     category: "vm|kernel-precomp|android"
     short_name: "a32"
   >
@@ -1799,7 +1799,7 @@ consoles: <
     short_name: "wr"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-stable"
     category: "vm|kernel-precomp|android"
     short_name: "a32"
   >
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 907df8f62688..030b47006133 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -1008,7 +1008,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-android-release-arm"
+    name: "vm-kernel-precomp-android-release-arm64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -1022,7 +1022,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-android-release-arm64"
+    name: "vm-kernel-precomp-android-release-arm_x64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 3306804534e6..aeee07bc5ad4 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -2069,63 +2069,63 @@ job: <
   >
 >
 job: <
-  id: "vm-kernel-precomp-android-release-arm"
+  id: "vm-kernel-precomp-android-release-arm64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm"
+    builder: "vm-kernel-precomp-android-release-arm64"
   >
 >
 job: <
-  id: "vm-kernel-precomp-android-release-arm-dev"
+  id: "vm-kernel-precomp-android-release-arm64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm-dev"
+    builder: "vm-kernel-precomp-android-release-arm64-dev"
   >
 >
 job: <
-  id: "vm-kernel-precomp-android-release-arm-stable"
+  id: "vm-kernel-precomp-android-release-arm64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm-stable"
+    builder: "vm-kernel-precomp-android-release-arm64-stable"
   >
 >
 job: <
-  id: "vm-kernel-precomp-android-release-arm64"
+  id: "vm-kernel-precomp-android-release-arm_x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm64"
+    builder: "vm-kernel-precomp-android-release-arm_x64"
   >
 >
 job: <
-  id: "vm-kernel-precomp-android-release-arm64-dev"
+  id: "vm-kernel-precomp-android-release-arm_x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm64-dev"
+    builder: "vm-kernel-precomp-android-release-arm_x64-dev"
   >
 >
 job: <
-  id: "vm-kernel-precomp-android-release-arm64-stable"
+  id: "vm-kernel-precomp-android-release-arm_x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm64-stable"
+    builder: "vm-kernel-precomp-android-release-arm_x64-stable"
   >
 >
 job: <
@@ -2946,8 +2946,8 @@ trigger: <
   triggers: "vm-kernel-mac-release-x64-dev"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-android-release-arm-dev"
   triggers: "vm-kernel-precomp-android-release-arm64-dev"
+  triggers: "vm-kernel-precomp-android-release-arm_x64-dev"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm-dev"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
   triggers: "vm-kernel-precomp-bare-linux-release-x64-dev"
@@ -3108,8 +3108,8 @@ trigger: <
   triggers: "vm-kernel-mac-release-x64-stable"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-android-release-arm-stable"
   triggers: "vm-kernel-precomp-android-release-arm64-stable"
+  triggers: "vm-kernel-precomp-android-release-arm_x64-stable"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm-stable"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
   triggers: "vm-kernel-precomp-bare-linux-release-x64-stable"
@@ -3168,8 +3168,8 @@ trigger: <
   triggers: "vm-kernel-mac-debug-simdbc64"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
-  triggers: "vm-kernel-precomp-android-release-arm"
   triggers: "vm-kernel-precomp-android-release-arm64"
+  triggers: "vm-kernel-precomp-android-release-arm_x64"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm64"
   triggers: "vm-kernel-precomp-bare-linux-release-x64"
diff --git a/main.star b/main.star
index 52b0f584e5ed..5f503a61f0a1 100755
--- a/main.star
+++ b/main.star
@@ -590,7 +590,7 @@ dart_vm_extra_builder(
 
 # vm|kernel-precomp|android
 dart_vm_extra_builder(
-    "vm-kernel-precomp-android-release-arm",
+    "vm-kernel-precomp-android-release-arm_x64",
     category="vm|kernel-precomp|android|a32",
     properties={"shard_timeout": 5400})  # 1.5h
 dart_vm_extra_builder(

From 800abe9bbd8865ef6544ca2d60a14b1d18449e56 Mon Sep 17 00:00:00 2001
From: Samir Jindel <sjindel@google.com>
Date: Mon, 7 Oct 2019 14:29:59 +0000
Subject: [PATCH 304/826] Revert "Test ARM_X64 instead of ARM."

This reverts commit 1484f2b37a2a04e8afa69b0492c5f407d1dc944f.

Reason for revert: We need to land https://chromium-review.googlesource.com/c/chromium/tools/build/+/1844171/ first.

Original change's description:
> Test ARM_X64 instead of ARM.
>
> Issue https://github.com/dart-lang/sdk/issues/38709
>
> Change-Id: Iba514c4df814960647bff87dd6ee6e983e000f61
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/120261
> Reviewed-by: Alexander Thomas <athom@google.com>

TBR=whesse@google.com,athom@google.com,sjindel@google.com

Change-Id: Iec233a452016feffef9b80995bd4650768175c5f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/120588
Reviewed-by: Samir Jindel <sjindel@google.com>
---
 cr-buildbucket.cfg | 16 ++++++++--------
 luci-milo.cfg      |  8 ++++----
 luci-notify.cfg    |  4 ++--
 luci-scheduler.cfg | 30 +++++++++++++++---------------
 main.star          |  2 +-
 5 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 4ee716338a3d..2de90b99a9ee 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -4980,7 +4980,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm64"
+      name: "vm-kernel-precomp-android-release-arm"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5004,7 +5004,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm64-dev"
+      name: "vm-kernel-precomp-android-release-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5029,7 +5029,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm64-stable"
+      name: "vm-kernel-precomp-android-release-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5054,7 +5054,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm_x64"
+      name: "vm-kernel-precomp-android-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5078,7 +5078,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm_x64-dev"
+      name: "vm-kernel-precomp-android-release-arm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5103,7 +5103,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm_x64-stable"
+      name: "vm-kernel-precomp-android-release-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8454,7 +8454,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm64-try"
+      name: "vm-kernel-precomp-android-release-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8478,7 +8478,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm_x64-try"
+      name: "vm-kernel-precomp-android-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 3b60797e410a..cdceeef796da 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -293,7 +293,7 @@ consoles: <
     short_name: "wr"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm"
     category: "vm|kernel-precomp|android"
     short_name: "a32"
   >
@@ -960,7 +960,7 @@ consoles: <
     short_name: "wr"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm"
     category: "vm|kernel-precomp|android"
     short_name: "a32"
   >
@@ -1307,7 +1307,7 @@ consoles: <
     short_name: "wr"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm-dev"
     category: "vm|kernel-precomp|android"
     short_name: "a32"
   >
@@ -1799,7 +1799,7 @@ consoles: <
     short_name: "wr"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm-stable"
     category: "vm|kernel-precomp|android"
     short_name: "a32"
   >
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 030b47006133..907df8f62688 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -1008,7 +1008,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-android-release-arm64"
+    name: "vm-kernel-precomp-android-release-arm"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -1022,7 +1022,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-android-release-arm_x64"
+    name: "vm-kernel-precomp-android-release-arm64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index aeee07bc5ad4..3306804534e6 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -2069,63 +2069,63 @@ job: <
   >
 >
 job: <
-  id: "vm-kernel-precomp-android-release-arm64"
+  id: "vm-kernel-precomp-android-release-arm"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm64"
+    builder: "vm-kernel-precomp-android-release-arm"
   >
 >
 job: <
-  id: "vm-kernel-precomp-android-release-arm64-dev"
+  id: "vm-kernel-precomp-android-release-arm-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm64-dev"
+    builder: "vm-kernel-precomp-android-release-arm-dev"
   >
 >
 job: <
-  id: "vm-kernel-precomp-android-release-arm64-stable"
+  id: "vm-kernel-precomp-android-release-arm-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm64-stable"
+    builder: "vm-kernel-precomp-android-release-arm-stable"
   >
 >
 job: <
-  id: "vm-kernel-precomp-android-release-arm_x64"
+  id: "vm-kernel-precomp-android-release-arm64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm_x64"
+    builder: "vm-kernel-precomp-android-release-arm64"
   >
 >
 job: <
-  id: "vm-kernel-precomp-android-release-arm_x64-dev"
+  id: "vm-kernel-precomp-android-release-arm64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm_x64-dev"
+    builder: "vm-kernel-precomp-android-release-arm64-dev"
   >
 >
 job: <
-  id: "vm-kernel-precomp-android-release-arm_x64-stable"
+  id: "vm-kernel-precomp-android-release-arm64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm_x64-stable"
+    builder: "vm-kernel-precomp-android-release-arm64-stable"
   >
 >
 job: <
@@ -2946,8 +2946,8 @@ trigger: <
   triggers: "vm-kernel-mac-release-x64-dev"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-android-release-arm-dev"
   triggers: "vm-kernel-precomp-android-release-arm64-dev"
-  triggers: "vm-kernel-precomp-android-release-arm_x64-dev"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm-dev"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
   triggers: "vm-kernel-precomp-bare-linux-release-x64-dev"
@@ -3108,8 +3108,8 @@ trigger: <
   triggers: "vm-kernel-mac-release-x64-stable"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
+  triggers: "vm-kernel-precomp-android-release-arm-stable"
   triggers: "vm-kernel-precomp-android-release-arm64-stable"
-  triggers: "vm-kernel-precomp-android-release-arm_x64-stable"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm-stable"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
   triggers: "vm-kernel-precomp-bare-linux-release-x64-stable"
@@ -3168,8 +3168,8 @@ trigger: <
   triggers: "vm-kernel-mac-debug-simdbc64"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
+  triggers: "vm-kernel-precomp-android-release-arm"
   triggers: "vm-kernel-precomp-android-release-arm64"
-  triggers: "vm-kernel-precomp-android-release-arm_x64"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm64"
   triggers: "vm-kernel-precomp-bare-linux-release-x64"
diff --git a/main.star b/main.star
index 5f503a61f0a1..52b0f584e5ed 100755
--- a/main.star
+++ b/main.star
@@ -590,7 +590,7 @@ dart_vm_extra_builder(
 
 # vm|kernel-precomp|android
 dart_vm_extra_builder(
-    "vm-kernel-precomp-android-release-arm_x64",
+    "vm-kernel-precomp-android-release-arm",
     category="vm|kernel-precomp|android|a32",
     properties={"shard_timeout": 5400})  # 1.5h
 dart_vm_extra_builder(

From 509cff0694c909f550ec88780db44d7eb7ded141 Mon Sep 17 00:00:00 2001
From: Samir Jindel <sjindel@google.com>
Date: Mon, 7 Oct 2019 17:51:57 +0000
Subject: [PATCH 305/826] Reland "Test ARM_X64 instead of ARM."

This reverts commit 800abe9bbd8865ef6544ca2d60a14b1d18449e56.

Reason for revert: The prerequisite https://chromium-review.googlesource.com/c/chromium/tools/build/+/1844171 has landed.

Original change's description:
> Revert "Test ARM_X64 instead of ARM."
>
> This reverts commit 1484f2b37a2a04e8afa69b0492c5f407d1dc944f.
>
> Reason for revert: We need to land https://chromium-review.googlesource.com/c/chromium/tools/build/+/1844171/ first.
>
> Original change's description:
> > Test ARM_X64 instead of ARM.
> >
> > Issue https://github.com/dart-lang/sdk/issues/38709
> >
> > Change-Id: Iba514c4df814960647bff87dd6ee6e983e000f61
> > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/120261
> > Reviewed-by: Alexander Thomas <athom@google.com>
>
> TBR=whesse@google.com,athom@google.com,sjindel@google.com
>
> Change-Id: Iec233a452016feffef9b80995bd4650768175c5f
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/120588
> Reviewed-by: Samir Jindel <sjindel@google.com>

TBR=whesse@google.com,athom@google.com,sjindel@google.com

Change-Id: Ia4284ef511a2182cb53f723e7ece342edb5b95b8
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/120590
Reviewed-by: Samir Jindel <sjindel@google.com>
Commit-Queue: Samir Jindel <sjindel@google.com>
---
 cr-buildbucket.cfg | 16 ++++++++--------
 luci-milo.cfg      |  8 ++++----
 luci-notify.cfg    |  4 ++--
 luci-scheduler.cfg | 30 +++++++++++++++---------------
 main.star          |  2 +-
 5 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 2de90b99a9ee..4ee716338a3d 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -4980,7 +4980,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm"
+      name: "vm-kernel-precomp-android-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5004,7 +5004,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm-dev"
+      name: "vm-kernel-precomp-android-release-arm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5029,7 +5029,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm-stable"
+      name: "vm-kernel-precomp-android-release-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5054,7 +5054,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm64"
+      name: "vm-kernel-precomp-android-release-arm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5078,7 +5078,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm64-dev"
+      name: "vm-kernel-precomp-android-release-arm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5103,7 +5103,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm64-stable"
+      name: "vm-kernel-precomp-android-release-arm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8454,7 +8454,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm-try"
+      name: "vm-kernel-precomp-android-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8478,7 +8478,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm64-try"
+      name: "vm-kernel-precomp-android-release-arm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index cdceeef796da..3b60797e410a 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -293,7 +293,7 @@ consoles: <
     short_name: "wr"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64"
     category: "vm|kernel-precomp|android"
     short_name: "a32"
   >
@@ -960,7 +960,7 @@ consoles: <
     short_name: "wr"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64"
     category: "vm|kernel-precomp|android"
     short_name: "a32"
   >
@@ -1307,7 +1307,7 @@ consoles: <
     short_name: "wr"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-dev"
     category: "vm|kernel-precomp|android"
     short_name: "a32"
   >
@@ -1799,7 +1799,7 @@ consoles: <
     short_name: "wr"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-stable"
     category: "vm|kernel-precomp|android"
     short_name: "a32"
   >
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 907df8f62688..030b47006133 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -1008,7 +1008,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-android-release-arm"
+    name: "vm-kernel-precomp-android-release-arm64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -1022,7 +1022,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-android-release-arm64"
+    name: "vm-kernel-precomp-android-release-arm_x64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 3306804534e6..aeee07bc5ad4 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -2069,63 +2069,63 @@ job: <
   >
 >
 job: <
-  id: "vm-kernel-precomp-android-release-arm"
+  id: "vm-kernel-precomp-android-release-arm64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm"
+    builder: "vm-kernel-precomp-android-release-arm64"
   >
 >
 job: <
-  id: "vm-kernel-precomp-android-release-arm-dev"
+  id: "vm-kernel-precomp-android-release-arm64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm-dev"
+    builder: "vm-kernel-precomp-android-release-arm64-dev"
   >
 >
 job: <
-  id: "vm-kernel-precomp-android-release-arm-stable"
+  id: "vm-kernel-precomp-android-release-arm64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm-stable"
+    builder: "vm-kernel-precomp-android-release-arm64-stable"
   >
 >
 job: <
-  id: "vm-kernel-precomp-android-release-arm64"
+  id: "vm-kernel-precomp-android-release-arm_x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm64"
+    builder: "vm-kernel-precomp-android-release-arm_x64"
   >
 >
 job: <
-  id: "vm-kernel-precomp-android-release-arm64-dev"
+  id: "vm-kernel-precomp-android-release-arm_x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm64-dev"
+    builder: "vm-kernel-precomp-android-release-arm_x64-dev"
   >
 >
 job: <
-  id: "vm-kernel-precomp-android-release-arm64-stable"
+  id: "vm-kernel-precomp-android-release-arm_x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm64-stable"
+    builder: "vm-kernel-precomp-android-release-arm_x64-stable"
   >
 >
 job: <
@@ -2946,8 +2946,8 @@ trigger: <
   triggers: "vm-kernel-mac-release-x64-dev"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-android-release-arm-dev"
   triggers: "vm-kernel-precomp-android-release-arm64-dev"
+  triggers: "vm-kernel-precomp-android-release-arm_x64-dev"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm-dev"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
   triggers: "vm-kernel-precomp-bare-linux-release-x64-dev"
@@ -3108,8 +3108,8 @@ trigger: <
   triggers: "vm-kernel-mac-release-x64-stable"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-android-release-arm-stable"
   triggers: "vm-kernel-precomp-android-release-arm64-stable"
+  triggers: "vm-kernel-precomp-android-release-arm_x64-stable"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm-stable"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
   triggers: "vm-kernel-precomp-bare-linux-release-x64-stable"
@@ -3168,8 +3168,8 @@ trigger: <
   triggers: "vm-kernel-mac-debug-simdbc64"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
-  triggers: "vm-kernel-precomp-android-release-arm"
   triggers: "vm-kernel-precomp-android-release-arm64"
+  triggers: "vm-kernel-precomp-android-release-arm_x64"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm64"
   triggers: "vm-kernel-precomp-bare-linux-release-x64"
diff --git a/main.star b/main.star
index 52b0f584e5ed..5f503a61f0a1 100755
--- a/main.star
+++ b/main.star
@@ -590,7 +590,7 @@ dart_vm_extra_builder(
 
 # vm|kernel-precomp|android
 dart_vm_extra_builder(
-    "vm-kernel-precomp-android-release-arm",
+    "vm-kernel-precomp-android-release-arm_x64",
     category="vm|kernel-precomp|android|a32",
     properties={"shard_timeout": 5400})  # 1.5h
 dart_vm_extra_builder(

From 863385c69026f029a8a1b678d3600f6b49280a0b Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Thu, 10 Oct 2019 12:16:38 +0000
Subject: [PATCH 306/826] Disable Windows Firefox builder

The builder dart2js-strong-win-x64-firefox seems to sometimes leave
a live firefox process on the swarming bot, which breaks other
shards from other builders which run subsequently on that bot.
Can be reverted when the problem with the live firefox process is
solved.

Change-Id: I2a5a1e9c4dbaaff81f5735a02200441a2408a52d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/121066
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 71 ----------------------------------------------
 luci-milo.cfg      | 10 -------
 luci-notify.cfg    | 14 ---------
 luci-scheduler.cfg | 33 ---------------------
 main.star          |  3 +-
 5 files changed, 2 insertions(+), 129 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 4ee716338a3d..60b6df574ba1 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1841,54 +1841,6 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-    builders: <
-      name: "dart2js-strong-win-x64-firefox-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "dart2js-strong-win-x64-firefox-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
       name: "dart2js-strong-win-x64-ie11"
       swarming_host: "chromium-swarm.appspot.com"
@@ -7376,29 +7328,6 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-    builders: <
-      name: "dart2js-strong-win-x64-firefox-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
       name: "dart2js-strong-win-x64-ie11-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 3b60797e410a..76f6b618d0d2 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -1446,11 +1446,6 @@ consoles: <
     category: "dart2js|firefox"
     short_name: "l"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox-dev"
-    category: "dart2js|firefox"
-    short_name: "w"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-dev"
     category: "dart2js|safari"
@@ -1938,11 +1933,6 @@ consoles: <
     category: "dart2js|firefox"
     short_name: "l"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox-stable"
-    category: "dart2js|firefox"
-    short_name: "w"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-stable"
     category: "dart2js|safari"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 030b47006133..8361708f3463 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -341,20 +341,6 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "dart2js-strong-win-x64-firefox"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
 notifiers: <
   notifications: <
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index aeee07bc5ad4..e3843b204165 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -654,36 +654,6 @@ job: <
     builder: "dart2js-strong-win-x64-chrome-stable"
   >
 >
-job: <
-  id: "dart2js-strong-win-x64-firefox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-firefox"
-  >
->
-job: <
-  id: "dart2js-strong-win-x64-firefox-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-firefox-dev"
-  >
->
-job: <
-  id: "dart2js-strong-win-x64-firefox-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-firefox-stable"
-  >
->
 job: <
   id: "dart2js-strong-win-x64-ie11"
   schedule: "triggered"
@@ -2903,7 +2873,6 @@ trigger: <
   triggers: "dart2js-strong-mac-x64-chrome-dev"
   triggers: "dart2js-strong-mac-x64-safari-dev"
   triggers: "dart2js-strong-win-x64-chrome-dev"
-  triggers: "dart2js-strong-win-x64-firefox-dev"
   triggers: "dart2js-strong-win-x64-ie11-dev"
   triggers: "dart2js-unit-linux-x64-release-dev"
   triggers: "ddc-linux-release-chrome-dev"
@@ -3008,7 +2977,6 @@ trigger: <
   triggers: "dart2js-strong-mac-x64-chrome"
   triggers: "dart2js-strong-mac-x64-safari"
   triggers: "dart2js-strong-win-x64-chrome"
-  triggers: "dart2js-strong-win-x64-firefox"
   triggers: "dart2js-strong-win-x64-ie11"
   triggers: "dart2js-unit-linux-x64-release"
   triggers: "ddc-linux-release-chrome"
@@ -3065,7 +3033,6 @@ trigger: <
   triggers: "dart2js-strong-mac-x64-chrome-stable"
   triggers: "dart2js-strong-mac-x64-safari-stable"
   triggers: "dart2js-strong-win-x64-chrome-stable"
-  triggers: "dart2js-strong-win-x64-firefox-stable"
   triggers: "dart2js-strong-win-x64-ie11-stable"
   triggers: "dart2js-unit-linux-x64-release-stable"
   triggers: "ddc-linux-release-chrome-stable"
diff --git a/main.star b/main.star
index 5f503a61f0a1..2156271733d6 100755
--- a/main.star
+++ b/main.star
@@ -675,7 +675,8 @@ dart_ci_sandbox_builder(
 dart_ci_sandbox_builder(
     "dart2js-strong-win-x64-firefox",
     category="dart2js|firefox|w",
-    dimensions=windows())
+    dimensions=windows(),
+    enabled=False)
 dart_ci_sandbox_builder(
     "dart2js-strong-mac-x64-safari",
     category="dart2js|safari|m",

From 7082112c9f97f4cfc8d3aec4a86d15e843bb1565 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 14 Oct 2019 17:15:47 +0000
Subject: [PATCH 307/826] [infra] Add more paths for tryjobs triggered by path
 expressions

Top level build changes and test_matrix.json should trigger all CQ jobs.
Changes to utils/compiler and utils/dartdevc should trigger Dart2js and
DDC jobs respectively.

Change-Id: I65377dcde562373494cb3a6db992e1ad197b61c5
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/121426
Reviewed-by: Nicholas Shahan <nshahan@google.com>
---
 commit-queue.cfg   | 20 ++++++++++++++++++++
 luci-scheduler.cfg |  3 +++
 main.star          |  6 ++++++
 3 files changed, 29 insertions(+)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 7afb3df41f43..87971fedf99f 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -44,50 +44,70 @@ config_groups: <
         name: "dart/try/dart2js-minified-strong-linux-x64-d8-try"
         location_regexp: ".+/[+]/DEPS"
         location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
         location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
         location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|front_end|kernel|js_ast)/.+"
+        location_regexp: ".+/[+]/utils/compiler/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
       >
       builders: <
         name: "dart/try/dart2js-strong-hostasserts-linux-ia32-d8-try"
         location_regexp: ".+/[+]/DEPS"
         location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
         location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
         location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|front_end|kernel|js_ast)/.+"
+        location_regexp: ".+/[+]/utils/compiler/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
       >
       builders: <
         name: "dart/try/dart2js-strong-linux-x64-chrome-try"
         location_regexp: ".+/[+]/DEPS"
         location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
         location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
         location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|front_end|kernel|js_ast)/.+"
+        location_regexp: ".+/[+]/utils/compiler/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
       >
       builders: <
         name: "dart/try/dart2js-unit-linux-x64-release-try"
         location_regexp: ".+/[+]/DEPS"
         location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
         location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
         location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|front_end|kernel|js_ast)/.+"
+        location_regexp: ".+/[+]/utils/compiler/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
       >
       builders: <
         name: "dart/try/ddc-linux-release-chrome-try"
         location_regexp: ".+/[+]/DEPS"
         location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
         location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
         location_regexp: ".+/[+]/pkg/(analyzer|build_integration|dev_compiler|front_end|kernel|meta)/.+"
+        location_regexp: ".+/[+]/utils/dartdevc/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing|testing)/.+"
       >
       builders: <
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index e3843b204165..48ca837000de 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -3163,8 +3163,11 @@ trigger: <
     refs: "regexp:refs/heads/master"
     path_regexps: "DEPS"
     path_regexps: "build/.+"
+    path_regexps: "BUILD.gn"
+    path_regexps: "sdk_args.gni"
     path_regexps: "sdk(_nnbd)?/.+"
     path_regexps: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+    path_regexps: "tools/bots/test_matrix.json"
     path_regexps: "tests/.+"
     path_regexps: "pkg/(front_end|kernel|vm)/.+"
     path_regexps: "runtime/.+"
diff --git a/main.star b/main.star
index 2156271733d6..c460da952119 100755
--- a/main.star
+++ b/main.star
@@ -21,11 +21,15 @@ TEST_PY_PATHS = "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
 
 STANDARD_PATHS = [
     "DEPS",  # DEPS catches most third_party changes.
+    # build files
     "build/.+",
+    "BUILD.gn",
+    "sdk_args.gni",
     # core libraries
     "sdk(_nnbd)?/.+",
     # testing
     TEST_PY_PATHS,
+    "tools/bots/test_matrix.json",
     # tests
     "tests/.+",
 ]
@@ -39,6 +43,7 @@ VM_PATHS = STANDARD_PATHS + [
 DART2JS_PATHS = STANDARD_PATHS + [
     # compiler sources
     "pkg/(compiler|dart2js_tools|front_end|kernel|js_ast)/.+",
+    "utils/compiler/.+",
     # testing
     "pkg/(js|modular_test|sourcemap_testing)/.+",
 ]
@@ -46,6 +51,7 @@ DART2JS_PATHS = STANDARD_PATHS + [
 DDC_PATHS = STANDARD_PATHS + [
     # compiler sources
     "pkg/(analyzer|build_integration|dev_compiler|front_end|kernel|meta)/.+",
+    "utils/dartdevc/.+",
     # testing
     "pkg/(js|modular_test|sourcemap_testing|testing)/.+",
 ]

From 884e2f69d173e6efd37f1f7a8d2fcf53f4062f1f Mon Sep 17 00:00:00 2001
From: Samir Jindel <sjindel@google.com>
Date: Wed, 16 Oct 2019 08:31:32 +0000
Subject: [PATCH 308/826] [vm] Remove last DBC bots. DBC is obsolete.

Change-Id: Ic263e48348dadd410fa2fc7415901596b61c8782
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/121841
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 188 ---------------------------------------------
 luci-milo.cfg      |  40 ----------
 luci-notify.cfg    |  28 -------
 luci-scheduler.cfg |  66 ----------------
 main.star          |   6 --
 5 files changed, 328 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 60b6df574ba1..11055485436d 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -4505,77 +4505,6 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-    builders: <
-      name: "vm-kernel-mac-debug-simdbc64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-mac-debug-simdbc64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-mac-debug-simdbc64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
       name: "vm-kernel-mac-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -6218,77 +6147,6 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-    builders: <
-      name: "vm-kernel-reload-mac-release-simdbc64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-mac-release-simdbc64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-mac-release-simdbc64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
       name: "vm-kernel-reload-rollback-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8244,29 +8102,6 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-    builders: <
-      name: "vm-kernel-mac-debug-simdbc64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
       name: "vm-kernel-mac-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8799,29 +8634,6 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-    builders: <
-      name: "vm-kernel-reload-mac-release-simdbc64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
       name: "vm-kernel-reload-rollback-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 76f6b618d0d2..06c891d4b3f4 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -182,11 +182,6 @@ consoles: <
     category: "vm|kernel"
     short_name: "d32"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-simdbc64"
-    category: "vm|kernel"
-    short_name: "mds"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
     category: "vm|kernel"
@@ -342,11 +337,6 @@ consoles: <
     category: "vm|reload-kernel"
     short_name: "r"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64"
-    category: "vm|reload-kernel"
-    short_name: "mr"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
     category: "vm|reload-kernel"
@@ -849,11 +839,6 @@ consoles: <
     category: "vm|kernel"
     short_name: "d32"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-simdbc64"
-    category: "vm|kernel"
-    short_name: "mds"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
     category: "vm|kernel"
@@ -1009,11 +994,6 @@ consoles: <
     category: "vm|reload-kernel"
     short_name: "r"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64"
-    category: "vm|reload-kernel"
-    short_name: "mr"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
     category: "vm|reload-kernel"
@@ -1196,11 +1176,6 @@ consoles: <
     category: "vm|kernel"
     short_name: "d32"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-simdbc64-dev"
-    category: "vm|kernel"
-    short_name: "mds"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-dev"
     category: "vm|kernel"
@@ -1356,11 +1331,6 @@ consoles: <
     category: "vm|reload-kernel"
     short_name: "r"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64-dev"
-    category: "vm|reload-kernel"
-    short_name: "mr"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64-dev"
     category: "vm|reload-kernel"
@@ -1683,11 +1653,6 @@ consoles: <
     category: "vm|kernel"
     short_name: "d32"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-simdbc64-stable"
-    category: "vm|kernel"
-    short_name: "mds"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-stable"
     category: "vm|kernel"
@@ -1843,11 +1808,6 @@ consoles: <
     category: "vm|reload-kernel"
     short_name: "r"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-mac-release-simdbc64-stable"
-    category: "vm|reload-kernel"
-    short_name: "mr"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64-stable"
     category: "vm|reload-kernel"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 8361708f3463..c6621eadf295 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -900,20 +900,6 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-mac-debug-simdbc64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
 notifiers: <
   notifications: <
     on_new_failure: true
@@ -1236,20 +1222,6 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-reload-mac-release-simdbc64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
 notifiers: <
   notifications: <
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 48ca837000de..49cf22b1fbed 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1858,36 +1858,6 @@ job: <
     builder: "vm-kernel-linux-release-x64-stable"
   >
 >
-job: <
-  id: "vm-kernel-mac-debug-simdbc64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-debug-simdbc64"
-  >
->
-job: <
-  id: "vm-kernel-mac-debug-simdbc64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-debug-simdbc64-dev"
-  >
->
-job: <
-  id: "vm-kernel-mac-debug-simdbc64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-debug-simdbc64-stable"
-  >
->
 job: <
   id: "vm-kernel-mac-debug-x64"
   schedule: "triggered"
@@ -2578,36 +2548,6 @@ job: <
     builder: "vm-kernel-reload-linux-release-x64-stable"
   >
 >
-job: <
-  id: "vm-kernel-reload-mac-release-simdbc64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-mac-release-simdbc64"
-  >
->
-job: <
-  id: "vm-kernel-reload-mac-release-simdbc64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-mac-release-simdbc64-dev"
-  >
->
-job: <
-  id: "vm-kernel-reload-mac-release-simdbc64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-mac-release-simdbc64-stable"
-  >
->
 job: <
   id: "vm-kernel-reload-rollback-linux-debug-x64"
   schedule: "triggered"
@@ -2909,7 +2849,6 @@ trigger: <
   triggers: "vm-kernel-linux-release-simarm-dev"
   triggers: "vm-kernel-linux-release-simarm64-dev"
   triggers: "vm-kernel-linux-release-x64-dev"
-  triggers: "vm-kernel-mac-debug-simdbc64-dev"
   triggers: "vm-kernel-mac-debug-x64-dev"
   triggers: "vm-kernel-mac-product-x64-dev"
   triggers: "vm-kernel-mac-release-x64-dev"
@@ -2933,7 +2872,6 @@ trigger: <
   triggers: "vm-kernel-precomp-win-release-x64-dev"
   triggers: "vm-kernel-reload-linux-debug-x64-dev"
   triggers: "vm-kernel-reload-linux-release-x64-dev"
-  triggers: "vm-kernel-reload-mac-release-simdbc64-dev"
   triggers: "vm-kernel-reload-rollback-linux-debug-x64-dev"
   triggers: "vm-kernel-reload-rollback-linux-release-x64-dev"
   triggers: "vm-kernel-win-debug-ia32-dev"
@@ -3069,7 +3007,6 @@ trigger: <
   triggers: "vm-kernel-linux-release-simarm-stable"
   triggers: "vm-kernel-linux-release-simarm64-stable"
   triggers: "vm-kernel-linux-release-x64-stable"
-  triggers: "vm-kernel-mac-debug-simdbc64-stable"
   triggers: "vm-kernel-mac-debug-x64-stable"
   triggers: "vm-kernel-mac-product-x64-stable"
   triggers: "vm-kernel-mac-release-x64-stable"
@@ -3093,7 +3030,6 @@ trigger: <
   triggers: "vm-kernel-precomp-win-release-x64-stable"
   triggers: "vm-kernel-reload-linux-debug-x64-stable"
   triggers: "vm-kernel-reload-linux-release-x64-stable"
-  triggers: "vm-kernel-reload-mac-release-simdbc64-stable"
   triggers: "vm-kernel-reload-rollback-linux-debug-x64-stable"
   triggers: "vm-kernel-reload-rollback-linux-release-x64-stable"
   triggers: "vm-kernel-win-debug-ia32-stable"
@@ -3132,7 +3068,6 @@ trigger: <
   triggers: "vm-kernel-linux-release-ia32"
   triggers: "vm-kernel-linux-release-simarm"
   triggers: "vm-kernel-linux-release-simarm64"
-  triggers: "vm-kernel-mac-debug-simdbc64"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
   triggers: "vm-kernel-precomp-android-release-arm64"
@@ -3153,7 +3088,6 @@ trigger: <
   triggers: "vm-kernel-precomp-win-release-x64"
   triggers: "vm-kernel-reload-linux-debug-x64"
   triggers: "vm-kernel-reload-linux-release-x64"
-  triggers: "vm-kernel-reload-mac-release-simdbc64"
   triggers: "vm-kernel-reload-rollback-linux-debug-x64"
   triggers: "vm-kernel-reload-rollback-linux-release-x64"
   triggers: "vm-kernel-win-debug-ia32"
diff --git a/main.star b/main.star
index c460da952119..5e6897886b8c 100755
--- a/main.star
+++ b/main.star
@@ -525,8 +525,6 @@ dart_ci_sandbox_builder(
 dart_vm_extra_builder(
     "vm-kernel-checked-linux-release-x64", category="vm|kernel|rc")
 dart_vm_extra_builder("vm-kernel-linux-debug-ia32", category="vm|kernel|d32")
-dart_vm_extra_builder(
-    "vm-kernel-mac-debug-simdbc64", category="vm|kernel|mds", dimensions=mac())
 dart_ci_sandbox_builder(
     "vm-kernel-mac-debug-x64", category="vm|kernel|md", dimensions=mac())
 dart_ci_sandbox_builder(
@@ -625,10 +623,6 @@ dart_vm_extra_builder(
     "vm-kernel-reload-linux-debug-x64", category="vm|reload-kernel|d")
 dart_vm_extra_builder(
     "vm-kernel-reload-linux-release-x64", category="vm|reload-kernel|r")
-dart_vm_extra_builder(
-    "vm-kernel-reload-mac-release-simdbc64",
-    category="vm|reload-kernel|mr",
-    dimensions=mac())
 dart_vm_extra_builder(
     "vm-kernel-reload-rollback-linux-debug-x64",
     category="vm|reload-kernel|drb")

From 9e767ddd9819b01cfbc15b0055c3e3d35f9c5a04 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 17 Oct 2019 17:19:43 +0000
Subject: [PATCH 309/826] [infra] Add DDC NNBD builder to the Luci config

Change-Id: I8ca96a8db6568d9357c8d66324b18b4fe110fade
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/121712
Reviewed-by: Nicholas Shahan <nshahan@google.com>
---
 cr-buildbucket.cfg | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 luci-milo.cfg      | 10 ++++++++++
 luci-notify.cfg    | 14 ++++++++++++++
 luci-scheduler.cfg | 11 +++++++++++
 main.star          |  2 ++
 5 files changed, 83 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 11055485436d..a7fd2eb20515 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -2125,6 +2125,29 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "ddc-nnbd-linux-release-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "ddc-win-release-chrome"
       swarming_host: "chromium-swarm.appspot.com"
@@ -7278,6 +7301,29 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "ddc-nnbd-linux-release-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "ddc-win-release-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 06c891d4b3f4..3a6d65c37a5a 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -482,6 +482,11 @@ consoles: <
     category: "ddc"
     short_name: "l"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-nnbd-linux-release-chrome"
+    category: "ddc"
+    short_name: "nn"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
     category: "ddc"
@@ -699,6 +704,11 @@ consoles: <
     category: "ddc"
     short_name: "l"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-nnbd-linux-release-chrome"
+    category: "ddc"
+    short_name: "nn"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
     category: "ddc"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index c6621eadf295..bb752b7d6055 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -397,6 +397,20 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <>
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "ddc-nnbd-linux-release-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 49cf22b1fbed..20ea2aa5cee2 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -774,6 +774,16 @@ job: <
     builder: "ddc-mac-release-chrome-stable"
   >
 >
+job: <
+  id: "ddc-nnbd-linux-release-chrome"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddc-nnbd-linux-release-chrome"
+  >
+>
 job: <
   id: "ddc-win-release-chrome"
   schedule: "triggered"
@@ -2919,6 +2929,7 @@ trigger: <
   triggers: "dart2js-unit-linux-x64-release"
   triggers: "ddc-linux-release-chrome"
   triggers: "ddc-mac-release-chrome"
+  triggers: "ddc-nnbd-linux-release-chrome"
   triggers: "ddc-win-release-chrome"
   triggers: "ddk-linux-release-firefox"
   triggers: "flutter-analyze"
diff --git a/main.star b/main.star
index 5e6897886b8c..6c0056bc6348 100755
--- a/main.star
+++ b/main.star
@@ -742,6 +742,8 @@ dart_ci_sandbox_builder(
     category="ddc|l",
     location_regexp=to_location_regexp(DDC_PATHS),
     on_cq=True)
+dart_ci_sandbox_builder(
+    "ddc-nnbd-linux-release-chrome", category="ddc|nn", channels=["try"])
 dart_ci_sandbox_builder(
     "ddc-mac-release-chrome", category="ddc|m", dimensions=mac())
 dart_ci_sandbox_builder(

From 7d69d32ac0ea48665bd2d1cd17f2d93abafad6de Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Thu, 24 Oct 2019 18:15:35 +0000
Subject: [PATCH 310/826] [infra] Increase flutter-engine-linux timeout to 4
 hours.

Change-Id: I3be4e666d73bdfd128e2b2c7fee99d9d3fee3495
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/122860
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 1 +
 main.star          | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index a7fd2eb20515..be063db1481b 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -2327,6 +2327,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 50
+      execution_timeout_secs: 14400
       caches: <
         name: "browsers"
         path: "browsers"
diff --git a/main.star b/main.star
index 6c0056bc6348..0360ddea8e0d 100755
--- a/main.star
+++ b/main.star
@@ -337,6 +337,7 @@ def dart_builder(name,
                  channels=[],
                  dimensions={},
                  cpu="x86-64",
+                 execution_timeout=None,
                  fyi=False,
                  notifies="dart",
                  priority=50,
@@ -389,6 +390,7 @@ def dart_builder(name,
                 caches=[swarming.cache("browsers")],
                 dimensions=dimensions,
                 executable=dart_recipe(recipe),
+                execution_timeout=execution_timeout,
                 priority=priority,
                 properties=channel_properties,
                 notifies=[notifies]
@@ -487,6 +489,7 @@ dart_ci_sandbox_builder(
     recipe="flutter_engine",
     category="flutter|3H",
     channels=["try"],
+    execution_timeout=time.duration(4 * 60 * 60 * 1000),
     properties={"new_workflow_enabled": False},
     triggered_by=["dart-gitiles-trigger-flutter"],
 )

From 1613c27e82a022b1f1b280efcb13d7724dd0c324 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 25 Oct 2019 15:11:18 +0000
Subject: [PATCH 311/826] [infra] Add legacy AST mode builders to the Luci
 config

Also removes some dartkb configurations that are no longer as important.

See also https://dart-review.googlesource.com/c/sdk/+/122320/ for the
corresponding test matrix updates.

Change-Id: Ib0f11e7a0001d835df825a50278cfb37b64fea8f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/122321
Reviewed-by: Martin Kustermann <kustermann@google.com>
Reviewed-by: Alexander Markov <alexmarkov@google.com>
---
 cr-buildbucket.cfg | 1042 ++++++++++++++++++++++++++++++++++++--------
 luci-milo.cfg      |  340 ++++++++++-----
 luci-notify.cfg    |  152 +++++--
 luci-scheduler.cfg |  489 +++++++++++++++------
 main.star          |   23 +-
 5 files changed, 1589 insertions(+), 457 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index be063db1481b..4aa99c118bf4 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -2968,7 +2968,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-debug-simarm64"
+      name: "vm-dartkb-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -2991,7 +2991,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-debug-simarm64-dev"
+      name: "vm-dartkb-linux-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3015,7 +3015,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-debug-simarm64-stable"
+      name: "vm-dartkb-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3039,7 +3039,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-debug-x64"
+      name: "vm-dartkb-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3062,7 +3062,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-debug-x64-dev"
+      name: "vm-dartkb-linux-release-x64-abi"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3075,7 +3075,6 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3086,7 +3085,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-debug-x64-stable"
+      name: "vm-dartkb-linux-release-x64-abi-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3110,7 +3109,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-product-simarm64"
+      name: "vm-dartkb-linux-release-x64-abi-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3123,6 +3122,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3133,7 +3133,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-product-simarm64-dev"
+      name: "vm-dartkb-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3157,7 +3157,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-product-simarm64-stable"
+      name: "vm-dartkb-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3181,7 +3181,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-product-x64"
+      name: "vm-ffi-android-debug-arm"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3204,7 +3204,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-product-x64-dev"
+      name: "vm-ffi-android-debug-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3228,7 +3228,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-product-x64-stable"
+      name: "vm-ffi-android-debug-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3252,7 +3252,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-release-simarm64"
+      name: "vm-ffi-android-debug-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3275,7 +3275,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-release-simarm64-dev"
+      name: "vm-ffi-android-debug-arm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3299,7 +3299,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-release-simarm64-stable"
+      name: "vm-ffi-android-debug-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3323,7 +3323,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-release-x64"
+      name: "vm-ffi-android-product-arm"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3346,7 +3346,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-release-x64-abi"
+      name: "vm-ffi-android-product-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3359,6 +3359,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3369,7 +3370,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-release-x64-abi-dev"
+      name: "vm-ffi-android-product-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3393,7 +3394,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-release-x64-abi-stable"
+      name: "vm-ffi-android-product-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3406,7 +3407,6 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3417,7 +3417,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-release-x64-dev"
+      name: "vm-ffi-android-product-arm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3441,7 +3441,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-release-x64-stable"
+      name: "vm-ffi-android-product-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3465,7 +3465,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-debug-arm"
+      name: "vm-ffi-android-release-arm"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3488,7 +3488,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-debug-arm-dev"
+      name: "vm-ffi-android-release-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3512,7 +3512,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-debug-arm-stable"
+      name: "vm-ffi-android-release-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3536,7 +3536,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-debug-arm64"
+      name: "vm-ffi-android-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3559,7 +3559,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-debug-arm64-dev"
+      name: "vm-ffi-android-release-arm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3583,7 +3583,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-debug-arm64-stable"
+      name: "vm-ffi-android-release-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3607,7 +3607,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-product-arm"
+      name: "vm-kernel-asan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3630,7 +3630,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-product-arm-dev"
+      name: "vm-kernel-asan-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3654,7 +3654,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-product-arm-stable"
+      name: "vm-kernel-asan-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3678,7 +3678,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-product-arm64"
+      name: "vm-kernel-ast-linux-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3701,7 +3701,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-product-arm64-dev"
+      name: "vm-kernel-ast-linux-debug-ia32-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3725,7 +3725,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-product-arm64-stable"
+      name: "vm-kernel-ast-linux-debug-ia32-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3749,7 +3749,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-release-arm"
+      name: "vm-kernel-ast-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3772,7 +3772,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-release-arm-dev"
+      name: "vm-kernel-ast-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3796,7 +3796,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-release-arm-stable"
+      name: "vm-kernel-ast-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3820,7 +3820,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-release-arm64"
+      name: "vm-kernel-ast-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3843,7 +3843,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-release-arm64-dev"
+      name: "vm-kernel-ast-linux-release-ia32-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3867,7 +3867,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-release-arm64-stable"
+      name: "vm-kernel-ast-linux-release-ia32-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3891,7 +3891,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-asan-linux-release-x64"
+      name: "vm-kernel-ast-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3914,7 +3914,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-asan-linux-release-x64-dev"
+      name: "vm-kernel-ast-linux-release-simarm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3938,7 +3938,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-asan-linux-release-x64-stable"
+      name: "vm-kernel-ast-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3962,7 +3962,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-checked-linux-release-x64"
+      name: "vm-kernel-ast-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3985,7 +3985,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-checked-linux-release-x64-dev"
+      name: "vm-kernel-ast-linux-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4009,7 +4009,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-checked-linux-release-x64-stable"
+      name: "vm-kernel-ast-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4033,7 +4033,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-debug-ia32"
+      name: "vm-kernel-ast-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4056,7 +4056,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-debug-ia32-dev"
+      name: "vm-kernel-ast-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4080,7 +4080,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-debug-ia32-stable"
+      name: "vm-kernel-ast-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4104,7 +4104,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-debug-x64"
+      name: "vm-kernel-ast-win-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4127,7 +4127,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-debug-x64-dev"
+      name: "vm-kernel-ast-win-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4151,7 +4151,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-debug-x64-stable"
+      name: "vm-kernel-ast-win-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4175,7 +4175,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-product-x64"
+      name: "vm-kernel-ast-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4198,7 +4198,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-product-x64-dev"
+      name: "vm-kernel-ast-win-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4222,7 +4222,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-product-x64-stable"
+      name: "vm-kernel-ast-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4246,7 +4246,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-ia32"
+      name: "vm-kernel-checked-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4269,7 +4269,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-ia32-dev"
+      name: "vm-kernel-checked-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4293,7 +4293,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-ia32-stable"
+      name: "vm-kernel-checked-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4317,7 +4317,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-simarm"
+      name: "vm-kernel-linux-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4340,7 +4340,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-simarm-dev"
+      name: "vm-kernel-linux-debug-ia32-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4364,7 +4364,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-simarm-stable"
+      name: "vm-kernel-linux-debug-ia32-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4388,7 +4388,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-simarm64"
+      name: "vm-kernel-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4411,7 +4411,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-simarm64-dev"
+      name: "vm-kernel-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4435,7 +4435,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-simarm64-stable"
+      name: "vm-kernel-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4459,7 +4459,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-x64"
+      name: "vm-kernel-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4482,7 +4482,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-x64-dev"
+      name: "vm-kernel-linux-product-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4506,7 +4506,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-x64-stable"
+      name: "vm-kernel-linux-product-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4530,12 +4530,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-debug-x64"
+      name: "vm-kernel-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4553,12 +4553,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-debug-x64-dev"
+      name: "vm-kernel-linux-release-ia32-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4577,12 +4577,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-debug-x64-stable"
+      name: "vm-kernel-linux-release-ia32-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4601,12 +4601,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-product-x64"
+      name: "vm-kernel-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4624,12 +4624,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-product-x64-dev"
+      name: "vm-kernel-linux-release-simarm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4648,12 +4648,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-product-x64-stable"
+      name: "vm-kernel-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4672,12 +4672,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-release-x64"
+      name: "vm-kernel-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4695,12 +4695,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-release-x64-dev"
+      name: "vm-kernel-linux-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4719,12 +4719,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-release-x64-stable"
+      name: "vm-kernel-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4743,7 +4743,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-ia32"
+      name: "vm-kernel-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4766,7 +4766,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
+      name: "vm-kernel-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4790,7 +4790,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
+      name: "vm-kernel-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4814,12 +4814,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-x64"
+      name: "vm-kernel-mac-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4837,12 +4837,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
+      name: "vm-kernel-mac-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4861,12 +4861,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
+      name: "vm-kernel-mac-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4885,12 +4885,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm64"
+      name: "vm-kernel-mac-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4898,7 +4898,6 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -4909,12 +4908,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm64-dev"
+      name: "vm-kernel-mac-product-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4923,7 +4922,6 @@ buckets: <
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
-        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -4934,12 +4932,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm64-stable"
+      name: "vm-kernel-mac-product-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4948,7 +4946,6 @@ buckets: <
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
-        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -4959,12 +4956,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm_x64"
+      name: "vm-kernel-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4972,7 +4969,6 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -4983,12 +4979,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm_x64-dev"
+      name: "vm-kernel-mac-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4997,7 +4993,6 @@ buckets: <
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
-        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5008,12 +5003,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm_x64-stable"
+      name: "vm-kernel-mac-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5022,7 +5017,6 @@ buckets: <
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
-        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5033,7 +5027,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm"
+      name: "vm-kernel-optcounter-threshold-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5056,7 +5050,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm-dev"
+      name: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5080,7 +5074,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm-stable"
+      name: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5104,7 +5098,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm64"
+      name: "vm-kernel-optcounter-threshold-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5127,7 +5121,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
+      name: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5151,7 +5145,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
+      name: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5175,7 +5169,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-bare-linux-release-x64"
+      name: "vm-kernel-precomp-android-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5188,6 +5182,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5198,7 +5193,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-bare-linux-release-x64-dev"
+      name: "vm-kernel-precomp-android-release-arm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5212,6 +5207,7 @@ buckets: <
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5222,7 +5218,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-bare-linux-release-x64-stable"
+      name: "vm-kernel-precomp-android-release-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5236,6 +5232,7 @@ buckets: <
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5246,7 +5243,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-debug-simarm_x64"
+      name: "vm-kernel-precomp-android-release-arm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5270,7 +5267,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
+      name: "vm-kernel-precomp-android-release-arm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5295,7 +5292,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
+      name: "vm-kernel-precomp-android-release-arm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5320,7 +5317,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-debug-x64"
+      name: "vm-kernel-precomp-ast-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5343,7 +5340,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-debug-x64-dev"
+      name: "vm-kernel-precomp-ast-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5367,7 +5364,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-debug-x64-stable"
+      name: "vm-kernel-precomp-ast-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5391,7 +5388,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-product-x64"
+      name: "vm-kernel-precomp-ast-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5414,7 +5411,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-product-x64-dev"
+      name: "vm-kernel-precomp-ast-linux-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5438,7 +5435,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-product-x64-stable"
+      name: "vm-kernel-precomp-ast-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5462,7 +5459,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-simarm"
+      name: "vm-kernel-precomp-ast-linux-release-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5485,7 +5482,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-simarm-dev"
+      name: "vm-kernel-precomp-ast-linux-release-simarm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5509,7 +5506,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-simarm-stable"
+      name: "vm-kernel-precomp-ast-linux-release-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5533,7 +5530,507 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-simarm64"
+      name: "vm-kernel-precomp-ast-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-ast-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-ast-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-simarm"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-simarm-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-simarm-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-simarm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-bare-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-debug-simarm_x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "shard_timeout:5400"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+        properties_j: "shard_timeout:5400"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+        properties_j: "shard_timeout:5400"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-debug-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-debug-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-product-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-product-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-product-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5556,7 +6053,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-simarm64-dev"
+      name: "vm-kernel-precomp-linux-release-simarm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5580,7 +6077,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-simarm64-stable"
+      name: "vm-kernel-precomp-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5604,7 +6101,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-x64"
+      name: "vm-kernel-precomp-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5627,7 +6124,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-x64-dev"
+      name: "vm-kernel-precomp-linux-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5651,7 +6148,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-x64-stable"
+      name: "vm-kernel-precomp-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5675,12 +6172,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-mac-release-simarm64"
+      name: "vm-kernel-precomp-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5698,12 +6195,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-mac-release-simarm64-dev"
+      name: "vm-kernel-precomp-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5722,12 +6219,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-mac-release-simarm64-stable"
+      name: "vm-kernel-precomp-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5746,7 +6243,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-mac-release-simarm_x64"
+      name: "vm-kernel-precomp-mac-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5769,7 +6266,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-mac-release-simarm_x64-dev"
+      name: "vm-kernel-precomp-mac-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5793,7 +6290,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-mac-release-simarm_x64-stable"
+      name: "vm-kernel-precomp-mac-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5817,12 +6314,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64"
+      name: "vm-kernel-precomp-mac-release-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5840,12 +6337,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+      name: "vm-kernel-precomp-mac-release-simarm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5864,12 +6361,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+      name: "vm-kernel-precomp-mac-release-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5888,12 +6385,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-win-release-simarm64"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5911,12 +6408,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-win-release-simarm64-dev"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5935,12 +6432,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-win-release-simarm64-stable"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -7644,7 +8141,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-debug-simarm64-try"
+      name: "vm-dartkb-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7667,7 +8164,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-debug-x64-try"
+      name: "vm-dartkb-linux-release-x64-abi-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7690,7 +8187,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-product-simarm64-try"
+      name: "vm-dartkb-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7713,7 +8210,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-product-x64-try"
+      name: "vm-ffi-android-debug-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7736,7 +8233,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-release-simarm64-try"
+      name: "vm-ffi-android-debug-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7759,7 +8256,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-release-x64-abi-try"
+      name: "vm-ffi-android-product-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7782,7 +8279,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-release-x64-try"
+      name: "vm-ffi-android-product-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7805,7 +8302,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-debug-arm-try"
+      name: "vm-ffi-android-release-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7828,7 +8325,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-debug-arm64-try"
+      name: "vm-ffi-android-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7851,7 +8348,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-product-arm-try"
+      name: "vm-kernel-asan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7874,7 +8371,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-product-arm64-try"
+      name: "vm-kernel-ast-linux-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7897,7 +8394,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-release-arm-try"
+      name: "vm-kernel-ast-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7920,7 +8417,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-release-arm64-try"
+      name: "vm-kernel-ast-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7943,7 +8440,99 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-asan-linux-release-x64-try"
+      name: "vm-kernel-ast-linux-release-simarm-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-ast-linux-release-simarm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-ast-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-ast-win-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-ast-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8313,7 +8902,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm-try"
+      name: "vm-kernel-precomp-ast-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8336,7 +8925,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm64-try"
+      name: "vm-kernel-precomp-ast-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8359,7 +8948,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-bare-linux-release-x64-try"
+      name: "vm-kernel-precomp-ast-linux-release-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8382,7 +8971,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-debug-simarm_x64-try"
+      name: "vm-kernel-precomp-ast-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8395,7 +8984,6 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "shard_timeout:5400"
       >
       priority: 30
       caches: <
@@ -8406,7 +8994,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-debug-x64-try"
+      name: "vm-kernel-precomp-bare-linux-release-simarm-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8429,7 +9017,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-product-x64-try"
+      name: "vm-kernel-precomp-bare-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8452,7 +9040,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-simarm-try"
+      name: "vm-kernel-precomp-bare-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8475,7 +9063,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-simarm64-try"
+      name: "vm-kernel-precomp-linux-debug-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8488,6 +9076,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "shard_timeout:5400"
       >
       priority: 30
       caches: <
@@ -8498,7 +9087,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-x64-try"
+      name: "vm-kernel-precomp-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8521,12 +9110,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-mac-release-simarm64-try"
+      name: "vm-kernel-precomp-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -8544,12 +9133,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-mac-release-simarm_x64-try"
+      name: "vm-kernel-precomp-linux-release-simarm-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -8567,7 +9156,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-try"
+      name: "vm-kernel-precomp-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8590,12 +9179,81 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-win-release-simarm64-try"
+      name: "vm-kernel-precomp-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-mac-release-simarm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-mac-release-simarm_x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 3a6d65c37a5a..14a19380ea40 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -92,6 +92,66 @@ consoles: <
     category: "flutter"
     short_name: "3H"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-debug-ia32"
+    category: "vm|ast"
+    short_name: "d32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-ia32"
+    category: "vm|ast"
+    short_name: "r32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-debug-x64"
+    category: "vm|ast"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-simarm"
+    category: "vm|ast"
+    short_name: "psr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-simarm64"
+    category: "vm|ast"
+    short_name: "psr6"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-x64"
+    category: "vm|ast"
+    short_name: "r"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-win-debug-x64"
+    category: "vm|ast"
+    short_name: "wd"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-win-release-x64"
+    category: "vm|ast"
+    short_name: "wr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-debug-x64"
+    category: "vm|ast"
+    short_name: "pd"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-release-simarm_x64"
+    category: "vm|ast"
+    short_name: "psr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-release-simarm64"
+    category: "vm|ast"
+    short_name: "psr6"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-release-x64"
+    category: "vm|ast"
+    short_name: "pr"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
     category: "vm|app-kernel"
@@ -107,26 +167,6 @@ consoles: <
     category: "vm|app-kernel"
     short_name: "r64"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-simarm64"
-    category: "vm|dartkb"
-    short_name: "sd"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64"
-    category: "vm|dartkb"
-    short_name: "d"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-simarm64"
-    category: "vm|dartkb"
-    short_name: "sp"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-x64"
-    category: "vm|dartkb"
-    short_name: "p"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64"
     category: "vm|dartkb"
@@ -277,11 +317,6 @@ consoles: <
     category: "vm|kernel-precomp"
     short_name: "ma"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "wa"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
     category: "vm|kernel-precomp"
@@ -759,6 +794,66 @@ consoles: <
     category: "misc"
     short_name: "vc"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-debug-ia32"
+    category: "vm|ast"
+    short_name: "d32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-ia32"
+    category: "vm|ast"
+    short_name: "r32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-debug-x64"
+    category: "vm|ast"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-simarm"
+    category: "vm|ast"
+    short_name: "psr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-simarm64"
+    category: "vm|ast"
+    short_name: "psr6"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-x64"
+    category: "vm|ast"
+    short_name: "r"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-win-debug-x64"
+    category: "vm|ast"
+    short_name: "wd"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-win-release-x64"
+    category: "vm|ast"
+    short_name: "wr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-debug-x64"
+    category: "vm|ast"
+    short_name: "pd"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-release-simarm_x64"
+    category: "vm|ast"
+    short_name: "psr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-release-simarm64"
+    category: "vm|ast"
+    short_name: "psr6"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-release-x64"
+    category: "vm|ast"
+    short_name: "pr"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
     category: "vm|app-kernel"
@@ -774,26 +869,6 @@ consoles: <
     category: "vm|app-kernel"
     short_name: "r64"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-simarm64"
-    category: "vm|dartkb"
-    short_name: "sd"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64"
-    category: "vm|dartkb"
-    short_name: "d"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-simarm64"
-    category: "vm|dartkb"
-    short_name: "sp"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-x64"
-    category: "vm|dartkb"
-    short_name: "p"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64"
     category: "vm|dartkb"
@@ -944,11 +1019,6 @@ consoles: <
     category: "vm|kernel-precomp"
     short_name: "ma"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "wa"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
     category: "vm|kernel-precomp"
@@ -1096,6 +1166,66 @@ consoles: <
     category: "fasta"
     short_name: "w"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-debug-ia32-dev"
+    category: "vm|ast"
+    short_name: "d32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-ia32-dev"
+    category: "vm|ast"
+    short_name: "r32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-debug-x64-dev"
+    category: "vm|ast"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-simarm-dev"
+    category: "vm|ast"
+    short_name: "psr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-simarm64-dev"
+    category: "vm|ast"
+    short_name: "psr6"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-x64-dev"
+    category: "vm|ast"
+    short_name: "r"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-win-debug-x64-dev"
+    category: "vm|ast"
+    short_name: "wd"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-win-release-x64-dev"
+    category: "vm|ast"
+    short_name: "wr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-debug-x64-dev"
+    category: "vm|ast"
+    short_name: "pd"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-release-simarm_x64-dev"
+    category: "vm|ast"
+    short_name: "psr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-release-simarm64-dev"
+    category: "vm|ast"
+    short_name: "psr6"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-release-x64-dev"
+    category: "vm|ast"
+    short_name: "pr"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-dev"
     category: "vm|app-kernel"
@@ -1111,26 +1241,6 @@ consoles: <
     category: "vm|app-kernel"
     short_name: "r64"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-simarm64-dev"
-    category: "vm|dartkb"
-    short_name: "sd"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64-dev"
-    category: "vm|dartkb"
-    short_name: "d"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-simarm64-dev"
-    category: "vm|dartkb"
-    short_name: "sp"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-x64-dev"
-    category: "vm|dartkb"
-    short_name: "p"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64-dev"
     category: "vm|dartkb"
@@ -1281,11 +1391,6 @@ consoles: <
     category: "vm|kernel-precomp"
     short_name: "ma"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-simarm64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "wa"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-dev"
     category: "vm|kernel-precomp"
@@ -1573,6 +1678,66 @@ consoles: <
     category: "fasta"
     short_name: "w"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-debug-ia32-stable"
+    category: "vm|ast"
+    short_name: "d32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-ia32-stable"
+    category: "vm|ast"
+    short_name: "r32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-debug-x64-stable"
+    category: "vm|ast"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-simarm-stable"
+    category: "vm|ast"
+    short_name: "psr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-simarm64-stable"
+    category: "vm|ast"
+    short_name: "psr6"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-x64-stable"
+    category: "vm|ast"
+    short_name: "r"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-win-debug-x64-stable"
+    category: "vm|ast"
+    short_name: "wd"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-win-release-x64-stable"
+    category: "vm|ast"
+    short_name: "wr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-debug-x64-stable"
+    category: "vm|ast"
+    short_name: "pd"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-release-simarm_x64-stable"
+    category: "vm|ast"
+    short_name: "psr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-release-simarm64-stable"
+    category: "vm|ast"
+    short_name: "psr6"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-release-x64-stable"
+    category: "vm|ast"
+    short_name: "pr"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-stable"
     category: "vm|app-kernel"
@@ -1588,26 +1753,6 @@ consoles: <
     category: "vm|app-kernel"
     short_name: "r64"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-simarm64-stable"
-    category: "vm|dartkb"
-    short_name: "sd"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-debug-x64-stable"
-    category: "vm|dartkb"
-    short_name: "d"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-simarm64-stable"
-    category: "vm|dartkb"
-    short_name: "sp"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-product-x64-stable"
-    category: "vm|dartkb"
-    short_name: "p"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64-stable"
     category: "vm|dartkb"
@@ -1758,11 +1903,6 @@ consoles: <
     category: "vm|kernel-precomp"
     short_name: "ma"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-simarm64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "wa"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-stable"
     category: "vm|kernel-precomp"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index bb752b7d6055..8446fd854942 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -616,7 +616,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-dartkb-linux-debug-simarm64"
+    name: "vm-dartkb-linux-release-simarm64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -630,7 +630,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-dartkb-linux-debug-x64"
+    name: "vm-dartkb-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -644,7 +644,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-dartkb-linux-product-simarm64"
+    name: "vm-dartkb-linux-release-x64-abi"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -658,7 +658,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-dartkb-linux-product-x64"
+    name: "vm-ffi-android-debug-arm"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -672,7 +672,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-dartkb-linux-release-simarm64"
+    name: "vm-ffi-android-debug-arm64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -686,7 +686,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-dartkb-linux-release-x64"
+    name: "vm-ffi-android-product-arm"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -700,7 +700,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-dartkb-linux-release-x64-abi"
+    name: "vm-ffi-android-product-arm64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -714,7 +714,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-ffi-android-debug-arm"
+    name: "vm-ffi-android-release-arm"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -728,7 +728,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-ffi-android-debug-arm64"
+    name: "vm-ffi-android-release-arm64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -742,7 +742,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-ffi-android-product-arm"
+    name: "vm-kernel-asan-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -756,7 +756,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-ffi-android-product-arm64"
+    name: "vm-kernel-ast-linux-debug-ia32"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -770,7 +770,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-ffi-android-release-arm"
+    name: "vm-kernel-ast-linux-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -784,7 +784,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-ffi-android-release-arm64"
+    name: "vm-kernel-ast-linux-release-ia32"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -798,7 +798,63 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-asan-linux-release-x64"
+    name: "vm-kernel-ast-linux-release-simarm"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <>
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-ast-linux-release-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <>
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-ast-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <>
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-ast-win-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <>
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-ast-win-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -1022,7 +1078,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-bare-linux-release-simarm"
+    name: "vm-kernel-precomp-ast-linux-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -1036,7 +1092,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-bare-linux-release-simarm64"
+    name: "vm-kernel-precomp-ast-linux-release-simarm64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -1050,7 +1106,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-bare-linux-release-x64"
+    name: "vm-kernel-precomp-ast-linux-release-simarm_x64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -1064,7 +1120,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-debug-simarm_x64"
+    name: "vm-kernel-precomp-ast-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -1078,7 +1134,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-debug-x64"
+    name: "vm-kernel-precomp-bare-linux-release-simarm"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -1092,7 +1148,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-product-x64"
+    name: "vm-kernel-precomp-bare-linux-release-simarm64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -1106,7 +1162,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-release-simarm"
+    name: "vm-kernel-precomp-bare-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -1120,7 +1176,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-release-simarm64"
+    name: "vm-kernel-precomp-linux-debug-simarm_x64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -1134,7 +1190,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-release-x64"
+    name: "vm-kernel-precomp-linux-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -1148,7 +1204,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-mac-release-simarm64"
+    name: "vm-kernel-precomp-linux-product-x64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -1162,7 +1218,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-mac-release-simarm_x64"
+    name: "vm-kernel-precomp-linux-release-simarm"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -1176,7 +1232,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-obfuscate-linux-release-x64"
+    name: "vm-kernel-precomp-linux-release-simarm64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -1190,7 +1246,49 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-win-release-simarm64"
+    name: "vm-kernel-precomp-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <>
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-mac-release-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <>
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-mac-release-simarm_x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <>
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-obfuscate-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 20ea2aa5cee2..7adaccebc3df 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1209,423 +1209,543 @@ job: <
   >
 >
 job: <
-  id: "vm-dartkb-linux-debug-simarm64"
+  id: "vm-dartkb-linux-release-simarm64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-debug-simarm64"
+    builder: "vm-dartkb-linux-release-simarm64"
   >
 >
 job: <
-  id: "vm-dartkb-linux-debug-simarm64-dev"
+  id: "vm-dartkb-linux-release-simarm64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-debug-simarm64-dev"
+    builder: "vm-dartkb-linux-release-simarm64-dev"
   >
 >
 job: <
-  id: "vm-dartkb-linux-debug-simarm64-stable"
+  id: "vm-dartkb-linux-release-simarm64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-debug-simarm64-stable"
+    builder: "vm-dartkb-linux-release-simarm64-stable"
   >
 >
 job: <
-  id: "vm-dartkb-linux-debug-x64"
+  id: "vm-dartkb-linux-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-debug-x64"
+    builder: "vm-dartkb-linux-release-x64"
   >
 >
 job: <
-  id: "vm-dartkb-linux-debug-x64-dev"
+  id: "vm-dartkb-linux-release-x64-abi"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-debug-x64-dev"
+    builder: "vm-dartkb-linux-release-x64-abi"
   >
 >
 job: <
-  id: "vm-dartkb-linux-debug-x64-stable"
+  id: "vm-dartkb-linux-release-x64-abi-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-debug-x64-stable"
+    builder: "vm-dartkb-linux-release-x64-abi-dev"
   >
 >
 job: <
-  id: "vm-dartkb-linux-product-simarm64"
+  id: "vm-dartkb-linux-release-x64-abi-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-product-simarm64"
+    builder: "vm-dartkb-linux-release-x64-abi-stable"
   >
 >
 job: <
-  id: "vm-dartkb-linux-product-simarm64-dev"
+  id: "vm-dartkb-linux-release-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-product-simarm64-dev"
+    builder: "vm-dartkb-linux-release-x64-dev"
   >
 >
 job: <
-  id: "vm-dartkb-linux-product-simarm64-stable"
+  id: "vm-dartkb-linux-release-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-product-simarm64-stable"
+    builder: "vm-dartkb-linux-release-x64-stable"
   >
 >
 job: <
-  id: "vm-dartkb-linux-product-x64"
+  id: "vm-ffi-android-debug-arm"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-product-x64"
+    builder: "vm-ffi-android-debug-arm"
   >
 >
 job: <
-  id: "vm-dartkb-linux-product-x64-dev"
+  id: "vm-ffi-android-debug-arm-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-product-x64-dev"
+    builder: "vm-ffi-android-debug-arm-dev"
   >
 >
 job: <
-  id: "vm-dartkb-linux-product-x64-stable"
+  id: "vm-ffi-android-debug-arm-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-product-x64-stable"
+    builder: "vm-ffi-android-debug-arm-stable"
   >
 >
 job: <
-  id: "vm-dartkb-linux-release-simarm64"
+  id: "vm-ffi-android-debug-arm64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-simarm64"
+    builder: "vm-ffi-android-debug-arm64"
   >
 >
 job: <
-  id: "vm-dartkb-linux-release-simarm64-dev"
+  id: "vm-ffi-android-debug-arm64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-simarm64-dev"
+    builder: "vm-ffi-android-debug-arm64-dev"
   >
 >
 job: <
-  id: "vm-dartkb-linux-release-simarm64-stable"
+  id: "vm-ffi-android-debug-arm64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-simarm64-stable"
+    builder: "vm-ffi-android-debug-arm64-stable"
   >
 >
 job: <
-  id: "vm-dartkb-linux-release-x64"
+  id: "vm-ffi-android-product-arm"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-x64"
+    builder: "vm-ffi-android-product-arm"
   >
 >
 job: <
-  id: "vm-dartkb-linux-release-x64-abi"
+  id: "vm-ffi-android-product-arm-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-x64-abi"
+    builder: "vm-ffi-android-product-arm-dev"
   >
 >
 job: <
-  id: "vm-dartkb-linux-release-x64-abi-dev"
+  id: "vm-ffi-android-product-arm-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-x64-abi-dev"
+    builder: "vm-ffi-android-product-arm-stable"
   >
 >
 job: <
-  id: "vm-dartkb-linux-release-x64-abi-stable"
+  id: "vm-ffi-android-product-arm64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-x64-abi-stable"
+    builder: "vm-ffi-android-product-arm64"
   >
 >
 job: <
-  id: "vm-dartkb-linux-release-x64-dev"
+  id: "vm-ffi-android-product-arm64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-x64-dev"
+    builder: "vm-ffi-android-product-arm64-dev"
   >
 >
 job: <
-  id: "vm-dartkb-linux-release-x64-stable"
+  id: "vm-ffi-android-product-arm64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-x64-stable"
+    builder: "vm-ffi-android-product-arm64-stable"
   >
 >
 job: <
-  id: "vm-ffi-android-debug-arm"
+  id: "vm-ffi-android-release-arm"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-debug-arm"
+    builder: "vm-ffi-android-release-arm"
   >
 >
 job: <
-  id: "vm-ffi-android-debug-arm-dev"
+  id: "vm-ffi-android-release-arm-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-debug-arm-dev"
+    builder: "vm-ffi-android-release-arm-dev"
   >
 >
 job: <
-  id: "vm-ffi-android-debug-arm-stable"
+  id: "vm-ffi-android-release-arm-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-debug-arm-stable"
+    builder: "vm-ffi-android-release-arm-stable"
   >
 >
 job: <
-  id: "vm-ffi-android-debug-arm64"
+  id: "vm-ffi-android-release-arm64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-debug-arm64"
+    builder: "vm-ffi-android-release-arm64"
   >
 >
 job: <
-  id: "vm-ffi-android-debug-arm64-dev"
+  id: "vm-ffi-android-release-arm64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-debug-arm64-dev"
+    builder: "vm-ffi-android-release-arm64-dev"
   >
 >
 job: <
-  id: "vm-ffi-android-debug-arm64-stable"
+  id: "vm-ffi-android-release-arm64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-debug-arm64-stable"
+    builder: "vm-ffi-android-release-arm64-stable"
   >
 >
 job: <
-  id: "vm-ffi-android-product-arm"
+  id: "vm-kernel-asan-linux-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-product-arm"
+    builder: "vm-kernel-asan-linux-release-x64"
   >
 >
 job: <
-  id: "vm-ffi-android-product-arm-dev"
+  id: "vm-kernel-asan-linux-release-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-product-arm-dev"
+    builder: "vm-kernel-asan-linux-release-x64-dev"
   >
 >
 job: <
-  id: "vm-ffi-android-product-arm-stable"
+  id: "vm-kernel-asan-linux-release-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-product-arm-stable"
+    builder: "vm-kernel-asan-linux-release-x64-stable"
   >
 >
 job: <
-  id: "vm-ffi-android-product-arm64"
+  id: "vm-kernel-ast-linux-debug-ia32"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-product-arm64"
+    builder: "vm-kernel-ast-linux-debug-ia32"
   >
 >
 job: <
-  id: "vm-ffi-android-product-arm64-dev"
+  id: "vm-kernel-ast-linux-debug-ia32-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-product-arm64-dev"
+    builder: "vm-kernel-ast-linux-debug-ia32-dev"
   >
 >
 job: <
-  id: "vm-ffi-android-product-arm64-stable"
+  id: "vm-kernel-ast-linux-debug-ia32-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-product-arm64-stable"
+    builder: "vm-kernel-ast-linux-debug-ia32-stable"
   >
 >
 job: <
-  id: "vm-ffi-android-release-arm"
+  id: "vm-kernel-ast-linux-debug-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-release-arm"
+    builder: "vm-kernel-ast-linux-debug-x64"
   >
 >
 job: <
-  id: "vm-ffi-android-release-arm-dev"
+  id: "vm-kernel-ast-linux-debug-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-release-arm-dev"
+    builder: "vm-kernel-ast-linux-debug-x64-dev"
   >
 >
 job: <
-  id: "vm-ffi-android-release-arm-stable"
+  id: "vm-kernel-ast-linux-debug-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-release-arm-stable"
+    builder: "vm-kernel-ast-linux-debug-x64-stable"
   >
 >
 job: <
-  id: "vm-ffi-android-release-arm64"
+  id: "vm-kernel-ast-linux-release-ia32"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-release-arm64"
+    builder: "vm-kernel-ast-linux-release-ia32"
   >
 >
 job: <
-  id: "vm-ffi-android-release-arm64-dev"
+  id: "vm-kernel-ast-linux-release-ia32-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-release-arm64-dev"
+    builder: "vm-kernel-ast-linux-release-ia32-dev"
   >
 >
 job: <
-  id: "vm-ffi-android-release-arm64-stable"
+  id: "vm-kernel-ast-linux-release-ia32-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-release-arm64-stable"
+    builder: "vm-kernel-ast-linux-release-ia32-stable"
   >
 >
 job: <
-  id: "vm-kernel-asan-linux-release-x64"
+  id: "vm-kernel-ast-linux-release-simarm"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-asan-linux-release-x64"
+    builder: "vm-kernel-ast-linux-release-simarm"
   >
 >
 job: <
-  id: "vm-kernel-asan-linux-release-x64-dev"
+  id: "vm-kernel-ast-linux-release-simarm-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-asan-linux-release-x64-dev"
+    builder: "vm-kernel-ast-linux-release-simarm-dev"
   >
 >
 job: <
-  id: "vm-kernel-asan-linux-release-x64-stable"
+  id: "vm-kernel-ast-linux-release-simarm-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-asan-linux-release-x64-stable"
+    builder: "vm-kernel-ast-linux-release-simarm-stable"
+  >
+>
+job: <
+  id: "vm-kernel-ast-linux-release-simarm64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-ast-linux-release-simarm64"
+  >
+>
+job: <
+  id: "vm-kernel-ast-linux-release-simarm64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-ast-linux-release-simarm64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-ast-linux-release-simarm64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-ast-linux-release-simarm64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-ast-linux-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-ast-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-ast-linux-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-ast-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-ast-linux-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-ast-linux-release-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-ast-win-debug-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-ast-win-debug-x64"
+  >
+>
+job: <
+  id: "vm-kernel-ast-win-debug-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-ast-win-debug-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-ast-win-debug-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-ast-win-debug-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-ast-win-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-ast-win-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-ast-win-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-ast-win-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-ast-win-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-ast-win-release-x64-stable"
   >
 >
 job: <
@@ -2078,6 +2198,126 @@ job: <
     builder: "vm-kernel-precomp-android-release-arm_x64-stable"
   >
 >
+job: <
+  id: "vm-kernel-precomp-ast-linux-debug-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-ast-linux-debug-x64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-ast-linux-debug-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-ast-linux-debug-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-ast-linux-debug-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-ast-linux-debug-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-ast-linux-release-simarm64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-ast-linux-release-simarm64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-ast-linux-release-simarm64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-ast-linux-release-simarm64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-ast-linux-release-simarm64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-ast-linux-release-simarm64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-ast-linux-release-simarm_x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-ast-linux-release-simarm_x64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-ast-linux-release-simarm_x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-ast-linux-release-simarm_x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-ast-linux-release-simarm_x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-ast-linux-release-simarm_x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-ast-linux-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-ast-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-ast-linux-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-ast-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-ast-linux-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-ast-linux-release-x64-stable"
+  >
+>
 job: <
   id: "vm-kernel-precomp-bare-linux-release-simarm"
   schedule: "triggered"
@@ -2438,36 +2678,6 @@ job: <
     builder: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
   >
 >
-job: <
-  id: "vm-kernel-precomp-win-release-simarm64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-simarm64"
-  >
->
-job: <
-  id: "vm-kernel-precomp-win-release-simarm64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-simarm64-dev"
-  >
->
-job: <
-  id: "vm-kernel-precomp-win-release-simarm64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-simarm64-stable"
-  >
->
 job: <
   id: "vm-kernel-precomp-win-release-x64"
   schedule: "triggered"
@@ -2837,10 +3047,6 @@ trigger: <
   triggers: "pkg-mac-release-dev"
   triggers: "pkg-win-release-dev"
   triggers: "vm-canary-linux-debug-dev"
-  triggers: "vm-dartkb-linux-debug-simarm64-dev"
-  triggers: "vm-dartkb-linux-debug-x64-dev"
-  triggers: "vm-dartkb-linux-product-simarm64-dev"
-  triggers: "vm-dartkb-linux-product-x64-dev"
   triggers: "vm-dartkb-linux-release-simarm64-dev"
   triggers: "vm-dartkb-linux-release-x64-abi-dev"
   triggers: "vm-dartkb-linux-release-x64-dev"
@@ -2851,6 +3057,14 @@ trigger: <
   triggers: "vm-ffi-android-release-arm-dev"
   triggers: "vm-ffi-android-release-arm64-dev"
   triggers: "vm-kernel-asan-linux-release-x64-dev"
+  triggers: "vm-kernel-ast-linux-debug-ia32-dev"
+  triggers: "vm-kernel-ast-linux-debug-x64-dev"
+  triggers: "vm-kernel-ast-linux-release-ia32-dev"
+  triggers: "vm-kernel-ast-linux-release-simarm-dev"
+  triggers: "vm-kernel-ast-linux-release-simarm64-dev"
+  triggers: "vm-kernel-ast-linux-release-x64-dev"
+  triggers: "vm-kernel-ast-win-debug-x64-dev"
+  triggers: "vm-kernel-ast-win-release-x64-dev"
   triggers: "vm-kernel-checked-linux-release-x64-dev"
   triggers: "vm-kernel-linux-debug-ia32-dev"
   triggers: "vm-kernel-linux-debug-x64-dev"
@@ -2866,6 +3080,10 @@ trigger: <
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-android-release-arm64-dev"
   triggers: "vm-kernel-precomp-android-release-arm_x64-dev"
+  triggers: "vm-kernel-precomp-ast-linux-debug-x64-dev"
+  triggers: "vm-kernel-precomp-ast-linux-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-ast-linux-release-simarm_x64-dev"
+  triggers: "vm-kernel-precomp-ast-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm-dev"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
   triggers: "vm-kernel-precomp-bare-linux-release-x64-dev"
@@ -2878,7 +3096,6 @@ trigger: <
   triggers: "vm-kernel-precomp-mac-release-simarm64-dev"
   triggers: "vm-kernel-precomp-mac-release-simarm_x64-dev"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-win-release-simarm64-dev"
   triggers: "vm-kernel-precomp-win-release-x64-dev"
   triggers: "vm-kernel-reload-linux-debug-x64-dev"
   triggers: "vm-kernel-reload-linux-release-x64-dev"
@@ -2996,10 +3213,6 @@ trigger: <
   triggers: "pkg-mac-release-stable"
   triggers: "pkg-win-release-stable"
   triggers: "vm-canary-linux-debug-stable"
-  triggers: "vm-dartkb-linux-debug-simarm64-stable"
-  triggers: "vm-dartkb-linux-debug-x64-stable"
-  triggers: "vm-dartkb-linux-product-simarm64-stable"
-  triggers: "vm-dartkb-linux-product-x64-stable"
   triggers: "vm-dartkb-linux-release-simarm64-stable"
   triggers: "vm-dartkb-linux-release-x64-abi-stable"
   triggers: "vm-dartkb-linux-release-x64-stable"
@@ -3010,6 +3223,14 @@ trigger: <
   triggers: "vm-ffi-android-release-arm-stable"
   triggers: "vm-ffi-android-release-arm64-stable"
   triggers: "vm-kernel-asan-linux-release-x64-stable"
+  triggers: "vm-kernel-ast-linux-debug-ia32-stable"
+  triggers: "vm-kernel-ast-linux-debug-x64-stable"
+  triggers: "vm-kernel-ast-linux-release-ia32-stable"
+  triggers: "vm-kernel-ast-linux-release-simarm-stable"
+  triggers: "vm-kernel-ast-linux-release-simarm64-stable"
+  triggers: "vm-kernel-ast-linux-release-x64-stable"
+  triggers: "vm-kernel-ast-win-debug-x64-stable"
+  triggers: "vm-kernel-ast-win-release-x64-stable"
   triggers: "vm-kernel-checked-linux-release-x64-stable"
   triggers: "vm-kernel-linux-debug-ia32-stable"
   triggers: "vm-kernel-linux-debug-x64-stable"
@@ -3025,6 +3246,10 @@ trigger: <
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-android-release-arm64-stable"
   triggers: "vm-kernel-precomp-android-release-arm_x64-stable"
+  triggers: "vm-kernel-precomp-ast-linux-debug-x64-stable"
+  triggers: "vm-kernel-precomp-ast-linux-release-simarm64-stable"
+  triggers: "vm-kernel-precomp-ast-linux-release-simarm_x64-stable"
+  triggers: "vm-kernel-precomp-ast-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm-stable"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
   triggers: "vm-kernel-precomp-bare-linux-release-x64-stable"
@@ -3037,7 +3262,6 @@ trigger: <
   triggers: "vm-kernel-precomp-mac-release-simarm64-stable"
   triggers: "vm-kernel-precomp-mac-release-simarm_x64-stable"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-win-release-simarm64-stable"
   triggers: "vm-kernel-precomp-win-release-x64-stable"
   triggers: "vm-kernel-reload-linux-debug-x64-stable"
   triggers: "vm-kernel-reload-linux-release-x64-stable"
@@ -3060,10 +3284,6 @@ trigger: <
   triggers: "app-kernel-linux-product-x64"
   triggers: "app-kernel-linux-release-x64"
   triggers: "cross-vm-linux-release-arm64"
-  triggers: "vm-dartkb-linux-debug-simarm64"
-  triggers: "vm-dartkb-linux-debug-x64"
-  triggers: "vm-dartkb-linux-product-simarm64"
-  triggers: "vm-dartkb-linux-product-x64"
   triggers: "vm-dartkb-linux-release-simarm64"
   triggers: "vm-dartkb-linux-release-x64"
   triggers: "vm-dartkb-linux-release-x64-abi"
@@ -3074,6 +3294,14 @@ trigger: <
   triggers: "vm-ffi-android-release-arm"
   triggers: "vm-ffi-android-release-arm64"
   triggers: "vm-kernel-asan-linux-release-x64"
+  triggers: "vm-kernel-ast-linux-debug-ia32"
+  triggers: "vm-kernel-ast-linux-debug-x64"
+  triggers: "vm-kernel-ast-linux-release-ia32"
+  triggers: "vm-kernel-ast-linux-release-simarm"
+  triggers: "vm-kernel-ast-linux-release-simarm64"
+  triggers: "vm-kernel-ast-linux-release-x64"
+  triggers: "vm-kernel-ast-win-debug-x64"
+  triggers: "vm-kernel-ast-win-release-x64"
   triggers: "vm-kernel-checked-linux-release-x64"
   triggers: "vm-kernel-linux-debug-ia32"
   triggers: "vm-kernel-linux-release-ia32"
@@ -3083,6 +3311,10 @@ trigger: <
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
   triggers: "vm-kernel-precomp-android-release-arm64"
   triggers: "vm-kernel-precomp-android-release-arm_x64"
+  triggers: "vm-kernel-precomp-ast-linux-debug-x64"
+  triggers: "vm-kernel-precomp-ast-linux-release-simarm64"
+  triggers: "vm-kernel-precomp-ast-linux-release-simarm_x64"
+  triggers: "vm-kernel-precomp-ast-linux-release-x64"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm64"
   triggers: "vm-kernel-precomp-bare-linux-release-x64"
@@ -3095,7 +3327,6 @@ trigger: <
   triggers: "vm-kernel-precomp-mac-release-simarm64"
   triggers: "vm-kernel-precomp-mac-release-simarm_x64"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64"
-  triggers: "vm-kernel-precomp-win-release-simarm64"
   triggers: "vm-kernel-precomp-win-release-x64"
   triggers: "vm-kernel-reload-linux-debug-x64"
   triggers: "vm-kernel-reload-linux-release-x64"
diff --git a/main.star b/main.star
index 0360ddea8e0d..b50f14e381b2 100755
--- a/main.star
+++ b/main.star
@@ -494,6 +494,20 @@ dart_ci_sandbox_builder(
     triggered_by=["dart-gitiles-trigger-flutter"],
 )
 
+# vm|ast
+dart_vm_extra_builder("vm-kernel-ast-linux-debug-ia32", category="vm|ast|d32")
+dart_vm_extra_builder("vm-kernel-ast-linux-release-ia32", category="vm|ast|r32")
+dart_vm_extra_builder("vm-kernel-ast-linux-debug-x64", category="vm|ast|d")
+dart_vm_extra_builder("vm-kernel-ast-linux-release-simarm", category="vm|ast|psr")
+dart_vm_extra_builder("vm-kernel-ast-linux-release-simarm64", category="vm|ast|psr6")
+dart_vm_extra_builder("vm-kernel-ast-linux-release-x64", category="vm|ast|r")
+dart_vm_extra_builder("vm-kernel-ast-win-debug-x64", category="vm|ast|wd")
+dart_vm_extra_builder("vm-kernel-ast-win-release-x64", category="vm|ast|wr")
+dart_vm_extra_builder("vm-kernel-precomp-ast-linux-debug-x64", category="vm|ast|pd")
+dart_vm_extra_builder("vm-kernel-precomp-ast-linux-release-simarm_x64", category="vm|ast|psr")
+dart_vm_extra_builder("vm-kernel-precomp-ast-linux-release-simarm64", category="vm|ast|psr6")
+dart_vm_extra_builder("vm-kernel-precomp-ast-linux-release-x64", category="vm|ast|pr")
+
 # vm|app-kernel
 dart_vm_extra_builder(
     "app-kernel-linux-debug-x64", category="vm|app-kernel|d64")
@@ -503,11 +517,6 @@ dart_vm_extra_builder(
     "app-kernel-linux-release-x64", category="vm|app-kernel|r64")
 
 # vm|dartkb
-dart_vm_extra_builder("vm-dartkb-linux-debug-simarm64", category="vm|dartkb|sd")
-dart_vm_extra_builder("vm-dartkb-linux-debug-x64", category="vm|dartkb|d")
-dart_vm_extra_builder(
-    "vm-dartkb-linux-product-simarm64", category="vm|dartkb|sp")
-dart_vm_extra_builder("vm-dartkb-linux-product-x64", category="vm|dartkb|p")
 dart_vm_extra_builder(
     "vm-dartkb-linux-release-simarm64", category="vm|dartkb|sr")
 dart_vm_extra_builder("vm-dartkb-linux-release-x64", category="vm|dartkb|r")
@@ -586,10 +595,6 @@ dart_vm_extra_builder(
     "vm-kernel-precomp-mac-release-simarm64",
     category="vm|kernel-precomp|ma",
     dimensions=mac())
-dart_vm_extra_builder(
-    "vm-kernel-precomp-win-release-simarm64",
-    category="vm|kernel-precomp|wa",
-    dimensions=windows())
 dart_vm_extra_builder(
     "vm-kernel-precomp-win-release-x64",
     category="vm|kernel-precomp|wr",

From e6cae99a1f7ed39e44d2d2968f1050a502fc4912 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 25 Oct 2019 20:08:46 +0000
Subject: [PATCH 312/826] [infra] Run Windows AST builders on Windows

They were running on Linux (the default). Also, reformatted main.star.

Change-Id: Ied13430fb8cf75f12cf0eb683d9d1f0c7b4bfd4b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/122870
Reviewed-by: Alexander Markov <alexmarkov@google.com>
---
 cr-buildbucket.cfg | 16 ++++++++--------
 main.star          | 29 ++++++++++++++++++-----------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 4aa99c118bf4..beec5f43b39b 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -4109,7 +4109,7 @@ buckets: <
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4132,7 +4132,7 @@ buckets: <
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4156,7 +4156,7 @@ buckets: <
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4180,7 +4180,7 @@ buckets: <
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4203,7 +4203,7 @@ buckets: <
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4227,7 +4227,7 @@ buckets: <
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -8514,7 +8514,7 @@ buckets: <
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -8537,7 +8537,7 @@ buckets: <
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
diff --git a/main.star b/main.star
index b50f14e381b2..29f837ee39cd 100755
--- a/main.star
+++ b/main.star
@@ -104,9 +104,8 @@ luci.project(
             groups=["all"],
         ),
         acl.entry(acl.LOGDOG_WRITER, groups=["luci-logdog-chromium-writers"]),
-        acl.entry(
-            [acl.SCHEDULER_OWNER, acl.BUILDBUCKET_TRIGGERER],
-            groups=["project-dart-admins"]),
+        acl.entry([acl.SCHEDULER_OWNER, acl.BUILDBUCKET_TRIGGERER],
+                  groups=["project-dart-admins"]),
         acl.entry(acl.CQ_COMMITTER, groups=["project-dart-committers"]),
         acl.entry(acl.CQ_DRY_RUNNER, groups=["project-dart-tryjob-access"]),
     ],
@@ -498,15 +497,23 @@ dart_ci_sandbox_builder(
 dart_vm_extra_builder("vm-kernel-ast-linux-debug-ia32", category="vm|ast|d32")
 dart_vm_extra_builder("vm-kernel-ast-linux-release-ia32", category="vm|ast|r32")
 dart_vm_extra_builder("vm-kernel-ast-linux-debug-x64", category="vm|ast|d")
-dart_vm_extra_builder("vm-kernel-ast-linux-release-simarm", category="vm|ast|psr")
-dart_vm_extra_builder("vm-kernel-ast-linux-release-simarm64", category="vm|ast|psr6")
+dart_vm_extra_builder(
+    "vm-kernel-ast-linux-release-simarm", category="vm|ast|psr")
+dart_vm_extra_builder(
+    "vm-kernel-ast-linux-release-simarm64", category="vm|ast|psr6")
 dart_vm_extra_builder("vm-kernel-ast-linux-release-x64", category="vm|ast|r")
-dart_vm_extra_builder("vm-kernel-ast-win-debug-x64", category="vm|ast|wd")
-dart_vm_extra_builder("vm-kernel-ast-win-release-x64", category="vm|ast|wr")
-dart_vm_extra_builder("vm-kernel-precomp-ast-linux-debug-x64", category="vm|ast|pd")
-dart_vm_extra_builder("vm-kernel-precomp-ast-linux-release-simarm_x64", category="vm|ast|psr")
-dart_vm_extra_builder("vm-kernel-precomp-ast-linux-release-simarm64", category="vm|ast|psr6")
-dart_vm_extra_builder("vm-kernel-precomp-ast-linux-release-x64", category="vm|ast|pr")
+dart_vm_extra_builder(
+    "vm-kernel-ast-win-debug-x64", category="vm|ast|wd", dimensions=windows())
+dart_vm_extra_builder(
+    "vm-kernel-ast-win-release-x64", category="vm|ast|wr", dimensions=windows())
+dart_vm_extra_builder(
+    "vm-kernel-precomp-ast-linux-debug-x64", category="vm|ast|pd")
+dart_vm_extra_builder(
+    "vm-kernel-precomp-ast-linux-release-simarm_x64", category="vm|ast|psr")
+dart_vm_extra_builder(
+    "vm-kernel-precomp-ast-linux-release-simarm64", category="vm|ast|psr6")
+dart_vm_extra_builder(
+    "vm-kernel-precomp-ast-linux-release-x64", category="vm|ast|pr")
 
 # vm|app-kernel
 dart_vm_extra_builder(

From d8d935960b910230d64aba75984d1843c8c1e8d5 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Fri, 25 Oct 2019 23:20:38 +0000
Subject: [PATCH 313/826] [infra] Fix execution_timeout not applying for try
 builders.

Change-Id: I4d665b0c8d312360ce94d44fca85ea87aaaf8d47
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/122871
Reviewed-by: Alexander Markov <alexmarkov@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 1 +
 main.star          | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index beec5f43b39b..02a6c93c3025 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -7905,6 +7905,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 30
+      execution_timeout_secs: 14400
       caches: <
         name: "browsers"
         path: "browsers"
diff --git a/main.star b/main.star
index 29f837ee39cd..e95f8ceb9397 100755
--- a/main.star
+++ b/main.star
@@ -289,6 +289,7 @@ def dart_recipe(name):
 def dart_try_builder(name,
                      recipe="neo",
                      dimensions={},
+                     execution_timeout=None,
                      experiment_percentage=None,
                      location_regexp=None,
                      properties={},
@@ -308,6 +309,7 @@ def dart_try_builder(name,
         caches=[swarming.cache("browsers")],
         dimensions=dimensions,
         executable=dart_recipe(recipe),
+        execution_timeout=execution_timeout,
         priority=30,
         properties=properties,
         service_account=TRY_ACCOUNT,
@@ -362,6 +364,7 @@ def dart_builder(name,
                 dimensions=dimensions,
                 properties=properties,
                 on_cq=on_cq,
+                execution_timeout=execution_timeout,
                 experiment_percentage=experiment_percentage,
                 location_regexp=location_regexp)
         else:

From 42a9f6520207f3811718aaca42fbfeca08eed9c0 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Fri, 1 Nov 2019 10:23:20 +0000
Subject: [PATCH 314/826] [infra] Increase flutter-engine-linux timeout to 5
 hours.

Change-Id: If7d7dc2e4e97f481a348ae397bce63727f27754c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/123723
Reviewed-by: Daco Harkes <dacoharkes@google.com>
---
 cr-buildbucket.cfg | 4 ++--
 main.star          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 02a6c93c3025..91ffde8459d9 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -2327,7 +2327,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 50
-      execution_timeout_secs: 14400
+      execution_timeout_secs: 18000
       caches: <
         name: "browsers"
         path: "browsers"
@@ -7905,7 +7905,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 30
-      execution_timeout_secs: 14400
+      execution_timeout_secs: 18000
       caches: <
         name: "browsers"
         path: "browsers"
diff --git a/main.star b/main.star
index e95f8ceb9397..47d6e27e6cce 100755
--- a/main.star
+++ b/main.star
@@ -491,7 +491,7 @@ dart_ci_sandbox_builder(
     recipe="flutter_engine",
     category="flutter|3H",
     channels=["try"],
-    execution_timeout=time.duration(4 * 60 * 60 * 1000),
+    execution_timeout=time.duration(5 * 60 * 60 * 1000),
     properties={"new_workflow_enabled": False},
     triggered_by=["dart-gitiles-trigger-flutter"],
 )

From 973f894b36cf77440a85f2afba9a144f79fd484c Mon Sep 17 00:00:00 2001
From: Paul Berry <paulberry@google.com>
Date: Fri, 1 Nov 2019 13:11:09 +0000
Subject: [PATCH 315/826] Trigger trybots when there are changes in
 _fe_analyzer_shared

Change-Id: Ifd454d4bde9af03f4a3fdef2cad67e5f85dfdd8e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/123862
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 commit-queue.cfg   | 11 ++++++-----
 luci-scheduler.cfg |  2 +-
 main.star          |  7 ++++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 87971fedf99f..a697749b51b8 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -50,7 +50,7 @@ config_groups: <
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|front_end|kernel|js_ast)/.+"
+        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|front_end|kernel|js_ast|_fe_analyzer_shared)/.+"
         location_regexp: ".+/[+]/utils/compiler/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
       >
@@ -64,7 +64,7 @@ config_groups: <
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|front_end|kernel|js_ast)/.+"
+        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|front_end|kernel|js_ast|_fe_analyzer_shared)/.+"
         location_regexp: ".+/[+]/utils/compiler/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
       >
@@ -78,7 +78,7 @@ config_groups: <
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|front_end|kernel|js_ast)/.+"
+        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|front_end|kernel|js_ast|_fe_analyzer_shared)/.+"
         location_regexp: ".+/[+]/utils/compiler/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
       >
@@ -92,7 +92,7 @@ config_groups: <
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|front_end|kernel|js_ast)/.+"
+        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|front_end|kernel|js_ast|_fe_analyzer_shared)/.+"
         location_regexp: ".+/[+]/utils/compiler/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
       >
@@ -106,7 +106,7 @@ config_groups: <
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(analyzer|build_integration|dev_compiler|front_end|kernel|meta)/.+"
+        location_regexp: ".+/[+]/pkg/(analyzer|build_integration|dev_compiler|front_end|kernel|meta|_fe_analyzer_shared)/.+"
         location_regexp: ".+/[+]/utils/dartdevc/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing|testing)/.+"
       >
@@ -118,6 +118,7 @@ config_groups: <
         location_regexp: ".+/[+]/pkg/analyzer/.+"
         location_regexp: ".+/[+]/pkg/analyzer_plugin/.+"
         location_regexp: ".+/[+]/pkg/front_end/.+"
+        location_regexp: ".+/[+]/pkg/_fe_analyzer_shared/.+"
         location_regexp: ".+/[+]/pkg/meta/.+"
         location_regexp: ".+/[+]/pkg/telemetry/.+"
       >
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 7adaccebc3df..b53a25524b2f 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -3345,7 +3345,7 @@ trigger: <
     path_regexps: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
     path_regexps: "tools/bots/test_matrix.json"
     path_regexps: "tests/.+"
-    path_regexps: "pkg/(front_end|kernel|vm)/.+"
+    path_regexps: "pkg/(front_end|kernel|vm|_fe_analyzer_shared)/.+"
     path_regexps: "runtime/.+"
   >
 >
diff --git a/main.star b/main.star
index 47d6e27e6cce..52fb89f3ffbe 100755
--- a/main.star
+++ b/main.star
@@ -36,13 +36,13 @@ STANDARD_PATHS = [
 
 VM_PATHS = STANDARD_PATHS + [
     # VM sources
-    "pkg/(front_end|kernel|vm)/.+",
+    "pkg/(front_end|kernel|vm|_fe_analyzer_shared)/.+",
     "runtime/.+",
 ]
 
 DART2JS_PATHS = STANDARD_PATHS + [
     # compiler sources
-    "pkg/(compiler|dart2js_tools|front_end|kernel|js_ast)/.+",
+    "pkg/(compiler|dart2js_tools|front_end|kernel|js_ast|_fe_analyzer_shared)/.+",
     "utils/compiler/.+",
     # testing
     "pkg/(js|modular_test|sourcemap_testing)/.+",
@@ -50,7 +50,7 @@ DART2JS_PATHS = STANDARD_PATHS + [
 
 DDC_PATHS = STANDARD_PATHS + [
     # compiler sources
-    "pkg/(analyzer|build_integration|dev_compiler|front_end|kernel|meta)/.+",
+    "pkg/(analyzer|build_integration|dev_compiler|front_end|kernel|meta|_fe_analyzer_shared)/.+",
     "utils/dartdevc/.+",
     # testing
     "pkg/(js|modular_test|sourcemap_testing|testing)/.+",
@@ -719,6 +719,7 @@ dart_ci_sandbox_builder(
         ".+/[+]/pkg/analyzer/.+",
         ".+/[+]/pkg/analyzer_plugin/.+",
         ".+/[+]/pkg/front_end/.+",
+        ".+/[+]/pkg/_fe_analyzer_shared/.+",
         ".+/[+]/pkg/meta/.+",
         ".+/[+]/pkg/telemetry/.+",
     ])

From 438bba1f4f49ceecde482312e4b2ebcdae39cde9 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 18 Nov 2019 19:49:36 +0000
Subject: [PATCH 316/826] [infra] Move pkg builders closer to the VM builders

This makes it easier for VM garderners to keep those builders green.

Change-Id: I8fb3feb8a4b778f931cf4ccc6f4dbd17a5e5ada6
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/125269
Reviewed-by: Alexander Aprelev <aam@google.com>
---
 luci-milo.cfg | 146 +++++++++++++++++++++++++-------------------------
 main.star     |  14 ++---
 2 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 14a19380ea40..d779c033e91c 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -412,6 +412,26 @@ consoles: <
     category: "vm|ffi"
     short_name: "p64"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
+    category: "pkg"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
+    category: "pkg"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
+    category: "pkg"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
+    category: "pkg"
+    short_name: "ld"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
     category: "dart2js|d8"
@@ -537,26 +557,6 @@ consoles: <
     category: "ddc"
     short_name: "fl"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
-    category: "pkg"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
-    category: "pkg"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
-    category: "pkg"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
-    category: "pkg"
-    short_name: "ld"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/gclient"
     category: "misc"
@@ -634,6 +634,26 @@ consoles: <
     category: "flutter"
     short_name: "3H"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
+    category: "pkg"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
+    category: "pkg"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
+    category: "pkg"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
+    category: "pkg"
+    short_name: "ld"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
     category: "dart2js|d8"
@@ -759,26 +779,6 @@ consoles: <
     category: "ddc"
     short_name: "fl"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
-    category: "pkg"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
-    category: "pkg"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
-    category: "pkg"
-    short_name: "w"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
-    category: "pkg"
-    short_name: "ld"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/gclient"
     category: "misc"
@@ -1486,6 +1486,21 @@ consoles: <
     category: "vm|ffi"
     short_name: "p64"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
+    category: "pkg"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-dev"
+    category: "pkg"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-dev"
+    category: "pkg"
+    short_name: "w"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-dev"
     category: "dart2js|d8"
@@ -1596,21 +1611,6 @@ consoles: <
     category: "ddc"
     short_name: "fl"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
-    category: "pkg"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-dev"
-    category: "pkg"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-dev"
-    category: "pkg"
-    short_name: "w"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/gclient-dev"
     category: "misc"
@@ -1998,6 +1998,21 @@ consoles: <
     category: "vm|ffi"
     short_name: "p64"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
+    category: "pkg"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-stable"
+    category: "pkg"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-stable"
+    category: "pkg"
+    short_name: "w"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-stable"
     category: "dart2js|d8"
@@ -2108,21 +2123,6 @@ consoles: <
     category: "ddc"
     short_name: "fl"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
-    category: "pkg"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-stable"
-    category: "pkg"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-stable"
-    category: "pkg"
-    short_name: "w"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/gclient-stable"
     category: "misc"
@@ -2228,6 +2228,9 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.try/vm-kernel-linux-product-x64-try"
   >
+  builders: <
+    name: "buildbucket/luci.dart.try/pkg-linux-release-try"
+  >
   builders: <
     name: "buildbucket/luci.dart.try/dart2js-strong-hostasserts-linux-ia32-d8-try"
   >
@@ -2255,9 +2258,6 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.try/ddc-linux-release-chrome-try"
   >
-  builders: <
-    name: "buildbucket/luci.dart.try/pkg-linux-release-try"
-  >
   builders: <
     name: "buildbucket/luci.dart.try/gclient-try"
   >
diff --git a/main.star b/main.star
index 52fb89f3ffbe..6f98d772fe69 100755
--- a/main.star
+++ b/main.star
@@ -656,6 +656,13 @@ dart_vm_extra_builder("vm-ffi-android-debug-arm64", category="vm|ffi|d64")
 dart_vm_extra_builder("vm-ffi-android-release-arm64", category="vm|ffi|r64")
 dart_vm_extra_builder("vm-ffi-android-product-arm64", category="vm|ffi|p64")
 
+# pkg
+dart_ci_sandbox_builder("pkg-linux-release", category="pkg|l", on_cq=True)
+dart_ci_sandbox_builder("pkg-mac-release", category="pkg|m", dimensions=mac())
+dart_ci_sandbox_builder(
+    "pkg-win-release", category="pkg|w", dimensions=windows())
+dart_ci_sandbox_builder("pkg-linux-debug", category="pkg|ld", channels=["try"])
+
 # dart2js
 dart_ci_sandbox_builder(
     "dart2js-strong-hostasserts-linux-ia32-d8",
@@ -769,13 +776,6 @@ dart_ci_sandbox_builder(
     "ddc-win-release-chrome", category="ddc|w", dimensions=windows())
 dart_ci_sandbox_builder("ddk-linux-release-firefox", category="ddc|fl")
 
-# pkg
-dart_ci_sandbox_builder("pkg-linux-release", category="pkg|l", on_cq=True)
-dart_ci_sandbox_builder("pkg-mac-release", category="pkg|m", dimensions=mac())
-dart_ci_sandbox_builder(
-    "pkg-win-release", category="pkg|w", dimensions=windows())
-dart_ci_sandbox_builder("pkg-linux-debug", category="pkg|ld", channels=["try"])
-
 # misc
 dart_ci_sandbox_builder(
     "gclient",

From 06538b93d5ec55081c60714a54988120cfbd7545 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 19 Nov 2019 13:59:12 +0000
Subject: [PATCH 317/826] [infra] Add analyzer-nnbd builder to the Luci config

This change requires https://dart-review.googlesource.com/c/sdk/+/125540
to land first.

Change-Id: I02a0c444ef11a85c0875cc89f9057289df267e9c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/125270
Reviewed-by: Paul Berry <paulberry@google.com>
---
 cr-buildbucket.cfg | 117 +++++++++++++++++++++++++++++++++++++++++++++
 luci-milo.cfg      |  25 ++++++++++
 luci-notify.cfg    |  14 ++++++
 luci-scheduler.cfg |  44 +++++++++++++++++
 main.star          |   4 ++
 5 files changed, 204 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 91ffde8459d9..beaf806f53d0 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -801,6 +801,100 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "analyzer-nnbd-linux-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-nnbd-linux-release-analyzer-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-nnbd-linux-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "analyzer-nnbd-linux-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "analyzer-win-release"
       swarming_host: "chromium-swarm.appspot.com"
@@ -7254,6 +7348,29 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "analyzer-nnbd-linux-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "analyzer-win-release-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index d779c033e91c..0e694bad1cd2 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -20,6 +20,11 @@ consoles: <
     category: "analyzer"
     short_name: "l"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-analyzer-stable"
+    category: "analyzer"
+    short_name: "nn"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-analyzer-stable"
     category: "analyzer"
@@ -507,6 +512,11 @@ consoles: <
     category: "analyzer"
     short_name: "l"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release"
+    category: "analyzer"
+    short_name: "nn"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
     category: "analyzer"
@@ -729,6 +739,11 @@ consoles: <
     category: "analyzer"
     short_name: "l"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release"
+    category: "analyzer"
+    short_name: "nn"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
     category: "analyzer"
@@ -1566,6 +1581,11 @@ consoles: <
     category: "analyzer"
     short_name: "l"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-dev"
+    category: "analyzer"
+    short_name: "nn"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-dev"
     category: "analyzer"
@@ -2078,6 +2098,11 @@ consoles: <
     category: "analyzer"
     short_name: "l"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-stable"
+    category: "analyzer"
+    short_name: "nn"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-stable"
     category: "analyzer"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 8446fd854942..e69fd4095063 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -145,6 +145,20 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <>
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "analyzer-nnbd-linux-release"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index b53a25524b2f..6a27ca72fbd1 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -124,6 +124,46 @@ job: <
     builder: "analyzer-mac-release-stable"
   >
 >
+job: <
+  id: "analyzer-nnbd-linux-release"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-nnbd-linux-release"
+  >
+>
+job: <
+  id: "analyzer-nnbd-linux-release-analyzer-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-nnbd-linux-release-analyzer-stable"
+  >
+>
+job: <
+  id: "analyzer-nnbd-linux-release-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-nnbd-linux-release-dev"
+  >
+>
+job: <
+  id: "analyzer-nnbd-linux-release-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-nnbd-linux-release-stable"
+  >
+>
 job: <
   id: "analyzer-win-release"
   schedule: "triggered"
@@ -3002,6 +3042,7 @@ trigger: <
   triggers: "analyzer-analysis-server-linux-analyzer-stable"
   triggers: "analyzer-linux-release-analyzer-stable"
   triggers: "analyzer-mac-release-analyzer-stable"
+  triggers: "analyzer-nnbd-linux-release-analyzer-stable"
   triggers: "analyzer-win-release-analyzer-stable"
   gitiles: <
     repo: "https://dart.googlesource.com/sdk"
@@ -3019,6 +3060,7 @@ trigger: <
   triggers: "analyzer-analysis-server-linux-dev"
   triggers: "analyzer-linux-release-dev"
   triggers: "analyzer-mac-release-dev"
+  triggers: "analyzer-nnbd-linux-release-dev"
   triggers: "analyzer-win-release-dev"
   triggers: "app-kernel-linux-debug-x64-dev"
   triggers: "app-kernel-linux-product-x64-dev"
@@ -3132,6 +3174,7 @@ trigger: <
   triggers: "analyzer-analysis-server-linux"
   triggers: "analyzer-linux-release"
   triggers: "analyzer-mac-release"
+  triggers: "analyzer-nnbd-linux-release"
   triggers: "analyzer-win-release"
   triggers: "dart2js-csp-minified-linux-x64-chrome"
   triggers: "dart2js-minified-strong-linux-x64-d8"
@@ -3185,6 +3228,7 @@ trigger: <
   triggers: "analyzer-analysis-server-linux-stable"
   triggers: "analyzer-linux-release-stable"
   triggers: "analyzer-mac-release-stable"
+  triggers: "analyzer-nnbd-linux-release-stable"
   triggers: "analyzer-win-release-stable"
   triggers: "app-kernel-linux-debug-x64-stable"
   triggers: "app-kernel-linux-product-x64-stable"
diff --git a/main.star b/main.star
index 6f98d772fe69..a91f621bb1a0 100755
--- a/main.star
+++ b/main.star
@@ -740,6 +740,10 @@ dart_ci_sandbox_builder(
     category="analyzer|l",
     on_cq=True,
     channels=ANALYZER_CHANNELS)
+dart_ci_sandbox_builder(
+    "analyzer-nnbd-linux-release",
+    category="analyzer|nn",
+    channels=ANALYZER_CHANNELS)
 dart_ci_sandbox_builder(
     "analyzer-mac-release",
     category="analyzer|m",

From 6a1a6fbdab30fa0f6ea62574d9d968c6404c04ef Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 28 Nov 2019 07:44:38 +0000
Subject: [PATCH 318/826] [infra] Pin depot_tools OSX SDK to a known good
 version

Because of changes to how the OSX SDK version gets selected introduced
by https://crrev.com/c/chromium/tools/depot_tools/+/1938022, the recipes
picked a different version of the SDK that failed to install.

TBR=whesse@google.com

Bug: https://crbug.com/1029246
Change-Id: I6d707a31d13afff636e7e58249965f28035dd1b7
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/126641
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 408 +++++++++++++++++++++++++++++++++++++++++++++
 main.star          |   2 +
 2 files changed, 410 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index beaf806f53d0..57565a198dcd 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -34,6 +34,7 @@ buckets: <
         name: "dart/forward_branch"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -56,6 +57,7 @@ buckets: <
         name: "dart/chocolatey"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -78,6 +80,7 @@ buckets: <
         name: "dart/package_co19"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -100,6 +103,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -122,6 +126,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -145,6 +150,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -168,6 +174,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -190,6 +197,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -213,6 +221,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -236,6 +245,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -258,6 +268,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -281,6 +292,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -304,6 +316,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -326,6 +339,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -349,6 +363,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -372,6 +387,7 @@ buckets: <
         name: "dart/docker"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -394,6 +410,7 @@ buckets: <
         name: "dart/external"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -416,6 +433,7 @@ buckets: <
         name: "dart/linearize"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "repo:\"https://dart.googlesource.com/linear_sdk_flutter_engine.git\""
       >
@@ -439,6 +457,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -461,6 +480,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -484,6 +504,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -531,6 +552,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -554,6 +576,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -577,6 +600,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -601,6 +625,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -625,6 +650,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -648,6 +674,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -671,6 +698,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -695,6 +723,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -719,6 +748,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -742,6 +772,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -765,6 +796,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -789,6 +821,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -813,6 +846,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -836,6 +870,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -859,6 +894,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -883,6 +919,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -907,6 +944,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -930,6 +968,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -953,6 +992,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -977,6 +1017,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1001,6 +1042,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1024,6 +1066,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1048,6 +1091,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1072,6 +1116,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1095,6 +1140,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1119,6 +1165,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1143,6 +1190,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1166,6 +1214,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1190,6 +1239,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1214,6 +1264,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1237,6 +1288,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1261,6 +1313,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1285,6 +1338,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1308,6 +1362,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1332,6 +1387,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1356,6 +1412,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1379,6 +1436,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1403,6 +1461,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1427,6 +1486,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1450,6 +1510,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1474,6 +1535,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1498,6 +1560,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1521,6 +1584,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1545,6 +1609,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1569,6 +1634,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1592,6 +1658,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1616,6 +1683,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1640,6 +1708,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1663,6 +1732,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1687,6 +1757,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1711,6 +1782,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1734,6 +1806,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1758,6 +1831,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1782,6 +1856,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1805,6 +1880,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1829,6 +1905,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1853,6 +1930,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1876,6 +1954,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1900,6 +1979,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1924,6 +2004,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1947,6 +2028,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1970,6 +2052,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1994,6 +2077,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2018,6 +2102,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2041,6 +2126,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2065,6 +2151,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2089,6 +2176,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2112,6 +2200,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2136,6 +2225,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2160,6 +2250,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2183,6 +2274,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2207,6 +2299,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2231,6 +2324,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2254,6 +2348,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2277,6 +2372,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2301,6 +2397,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2325,6 +2422,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2348,6 +2446,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2372,6 +2471,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2396,6 +2496,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -2418,6 +2519,7 @@ buckets: <
         name: "dart/flutter_engine"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -2441,6 +2543,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -2463,6 +2566,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2486,6 +2590,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2510,6 +2615,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2534,6 +2640,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2557,6 +2664,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2581,6 +2689,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2605,6 +2714,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2628,6 +2738,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2652,6 +2763,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2676,6 +2788,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -2698,6 +2811,7 @@ buckets: <
         name: "dart/gclient"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -2720,6 +2834,7 @@ buckets: <
         name: "dart/gclient"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -2743,6 +2858,7 @@ buckets: <
         name: "dart/gclient"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -2766,6 +2882,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2789,6 +2906,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2812,6 +2930,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2836,6 +2955,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2860,6 +2980,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2883,6 +3004,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2907,6 +3029,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2931,6 +3054,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2954,6 +3078,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2978,6 +3103,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3002,6 +3128,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3025,6 +3152,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3049,6 +3177,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3073,6 +3202,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3096,6 +3226,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3120,6 +3251,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3144,6 +3276,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3167,6 +3300,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3190,6 +3324,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3214,6 +3349,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3238,6 +3374,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3262,6 +3399,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3286,6 +3424,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3309,6 +3448,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3333,6 +3473,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3357,6 +3498,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3380,6 +3522,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3404,6 +3547,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3428,6 +3572,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3451,6 +3596,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3475,6 +3621,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3499,6 +3646,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3522,6 +3670,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3546,6 +3695,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3570,6 +3720,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3593,6 +3744,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3617,6 +3769,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3641,6 +3794,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3664,6 +3818,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3688,6 +3843,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3712,6 +3868,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3735,6 +3892,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3759,6 +3917,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3783,6 +3942,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3806,6 +3966,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3830,6 +3991,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3854,6 +4016,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3877,6 +4040,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3901,6 +4065,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3925,6 +4090,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3948,6 +4114,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3972,6 +4139,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3996,6 +4164,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4019,6 +4188,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4043,6 +4213,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4067,6 +4238,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4090,6 +4262,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4114,6 +4287,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4138,6 +4312,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4161,6 +4336,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4185,6 +4361,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4209,6 +4386,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4232,6 +4410,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4256,6 +4435,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4280,6 +4460,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4303,6 +4484,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4327,6 +4509,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4351,6 +4534,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4374,6 +4558,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4398,6 +4583,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4422,6 +4608,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4445,6 +4632,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4469,6 +4657,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4493,6 +4682,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4516,6 +4706,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4540,6 +4731,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4564,6 +4756,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4587,6 +4780,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4611,6 +4805,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4635,6 +4830,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4658,6 +4854,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4682,6 +4879,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4706,6 +4904,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4729,6 +4928,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4753,6 +4953,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4777,6 +4978,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4800,6 +5002,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4824,6 +5027,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4848,6 +5052,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4871,6 +5076,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4895,6 +5101,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4919,6 +5126,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4942,6 +5150,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4966,6 +5175,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4990,6 +5200,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5013,6 +5224,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5037,6 +5249,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5061,6 +5274,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5084,6 +5298,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5108,6 +5323,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5132,6 +5348,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5155,6 +5372,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5179,6 +5397,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5203,6 +5422,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5226,6 +5446,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5250,6 +5471,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5274,6 +5496,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
@@ -5298,6 +5521,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5323,6 +5547,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5348,6 +5573,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
@@ -5372,6 +5598,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5397,6 +5624,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5422,6 +5650,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5445,6 +5674,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5469,6 +5699,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5493,6 +5724,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5516,6 +5748,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5540,6 +5773,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5564,6 +5798,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5587,6 +5822,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5611,6 +5847,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5635,6 +5872,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5658,6 +5896,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5682,6 +5921,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5706,6 +5946,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5729,6 +5970,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5753,6 +5995,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5777,6 +6020,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5800,6 +6044,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5824,6 +6069,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5848,6 +6094,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5871,6 +6118,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5895,6 +6143,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5919,6 +6168,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
@@ -5943,6 +6193,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5968,6 +6219,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5993,6 +6245,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6016,6 +6269,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6040,6 +6294,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6064,6 +6319,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6087,6 +6343,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6111,6 +6368,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6135,6 +6393,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6158,6 +6417,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6182,6 +6442,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6206,6 +6467,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6229,6 +6491,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6253,6 +6516,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6277,6 +6541,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6300,6 +6565,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6324,6 +6590,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6348,6 +6615,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6371,6 +6639,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6395,6 +6664,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6419,6 +6689,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6442,6 +6713,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6466,6 +6738,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6490,6 +6763,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6513,6 +6787,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6537,6 +6812,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6561,6 +6837,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6584,6 +6861,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6608,6 +6886,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6632,6 +6911,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6655,6 +6935,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6679,6 +6960,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6703,6 +6985,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6726,6 +7009,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6750,6 +7034,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6774,6 +7059,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6797,6 +7083,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6821,6 +7108,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6845,6 +7133,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6868,6 +7157,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6892,6 +7182,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6916,6 +7207,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6939,6 +7231,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6963,6 +7256,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6987,6 +7281,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7010,6 +7305,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -7034,6 +7330,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -7058,6 +7355,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7081,6 +7379,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -7105,6 +7404,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -7129,6 +7429,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7152,6 +7453,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -7176,6 +7478,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -7200,6 +7503,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7223,6 +7527,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -7247,6 +7552,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -7291,6 +7597,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7314,6 +7621,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7337,6 +7645,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7360,6 +7669,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7383,6 +7693,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7406,6 +7717,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7429,6 +7741,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7452,6 +7765,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7475,6 +7789,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -7497,6 +7812,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -7519,6 +7835,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -7541,6 +7858,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -7563,6 +7881,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -7585,6 +7904,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -7607,6 +7927,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -7629,6 +7950,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7652,6 +7974,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7675,6 +7998,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7698,6 +8022,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7721,6 +8046,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7744,6 +8070,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7767,6 +8094,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7790,6 +8118,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7813,6 +8142,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7836,6 +8166,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7859,6 +8190,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7882,6 +8214,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7905,6 +8238,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7928,6 +8262,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7951,6 +8286,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7974,6 +8310,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7997,6 +8334,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -8019,6 +8357,7 @@ buckets: <
         name: "dart/flutter_engine"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -8042,6 +8381,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -8064,6 +8404,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8087,6 +8428,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8110,6 +8452,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8133,6 +8476,7 @@ buckets: <
         name: "dart/gclient"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -8155,6 +8499,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8178,6 +8523,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8201,6 +8547,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8224,6 +8571,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8247,6 +8595,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8270,6 +8619,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8293,6 +8643,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8316,6 +8667,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8339,6 +8691,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8362,6 +8715,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8385,6 +8739,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8408,6 +8763,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8431,6 +8787,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8454,6 +8811,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8477,6 +8835,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8500,6 +8859,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8523,6 +8883,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8546,6 +8907,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8569,6 +8931,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8592,6 +8955,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8615,6 +8979,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8638,6 +9003,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8661,6 +9027,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8684,6 +9051,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8707,6 +9075,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8730,6 +9099,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8753,6 +9123,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8776,6 +9147,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8799,6 +9171,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8822,6 +9195,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8845,6 +9219,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8868,6 +9243,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8891,6 +9267,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8914,6 +9291,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8937,6 +9315,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8960,6 +9339,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8983,6 +9363,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
@@ -9007,6 +9388,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
@@ -9031,6 +9413,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -9054,6 +9437,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -9077,6 +9461,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -9100,6 +9485,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -9123,6 +9509,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -9146,6 +9533,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -9169,6 +9557,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -9192,6 +9581,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
@@ -9216,6 +9606,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -9239,6 +9630,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -9262,6 +9654,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -9285,6 +9678,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -9308,6 +9702,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -9331,6 +9726,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -9354,6 +9750,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -9377,6 +9774,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -9400,6 +9798,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -9423,6 +9822,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -9446,6 +9846,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -9469,6 +9870,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -9492,6 +9894,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -9515,6 +9918,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -9538,6 +9942,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -9561,6 +9966,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -9584,6 +9990,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -9607,6 +10014,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
diff --git a/main.star b/main.star
index a91f621bb1a0..bcc49fee373d 100755
--- a/main.star
+++ b/main.star
@@ -300,6 +300,7 @@ def dart_try_builder(name,
     dimensions.setdefault("host_class", "default")
     dimensions.setdefault("cpu", "x86-64")
     properties.setdefault("clobber", "true")
+    properties.setdefault("$depot_tools/osx_sdk", {"sdk_version": "9c40b"})
     builder = name + "-try"
 
     luci.builder(
@@ -355,6 +356,7 @@ def dart_builder(name,
     dimensions.setdefault("pool", "luci.dart.try")
     dimensions["cpu"] = cpu
     properties.setdefault("clobber", "true")
+    properties.setdefault("$depot_tools/osx_sdk", {"sdk_version": "9c40b"})
 
     def builder(channel=None, triggered_by=None):
         if channel == "try":

From 7457a220865a3e5540cd8af1cb9c0bd893806fb7 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 4 Dec 2019 11:40:13 +0000
Subject: [PATCH 319/826] [infra] Add results feed link to the consoles

This makes it possible to discover the results feed from the consoles.

Change-Id: Ie8c2ac9adcd4d5e9a9fd4848e73e5c9faa2cf95d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/127064
Reviewed-by: William Hesse <whesse@google.com>
---
 console-header.textpb |  5 +++++
 luci-milo.cfg         | 25 +++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/console-header.textpb b/console-header.textpb
index b6c4b8eed23f..83043403b2e3 100644
--- a/console-header.textpb
+++ b/console-header.textpb
@@ -20,6 +20,11 @@ links: {
         url: "/p/dart/g/cq/builders"
         alt: "SDK CQ Status"
     }
+    links: {
+        text: "Results Feed"
+        url: "https://dart-ci.firebaseapp.com/"
+        alt: "Results Feed"
+    }
 }
 console_groups: {
     console_ids: "dart/flutter"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 0e694bad1cd2..d514ddc2265a 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -58,6 +58,11 @@ consoles: <
         url: "/p/dart/g/cq/builders"
         alt: "SDK CQ Status"
       >
+      links: <
+        text: "Results Feed"
+        url: "https://dart-ci.firebaseapp.com/"
+        alt: "Results Feed"
+      >
     >
     console_groups: <
       console_ids: "dart/flutter"
@@ -605,6 +610,11 @@ consoles: <
         url: "/p/dart/g/cq/builders"
         alt: "SDK CQ Status"
       >
+      links: <
+        text: "Results Feed"
+        url: "https://dart-ci.firebaseapp.com/"
+        alt: "Results Feed"
+      >
     >
     console_groups: <
       console_ids: "dart/flutter"
@@ -1152,6 +1162,11 @@ consoles: <
         url: "/p/dart/g/cq/builders"
         alt: "SDK CQ Status"
       >
+      links: <
+        text: "Results Feed"
+        url: "https://dart-ci.firebaseapp.com/"
+        alt: "Results Feed"
+      >
     >
     console_groups: <
       console_ids: "dart/flutter"
@@ -1669,6 +1684,11 @@ consoles: <
         url: "/p/dart/g/cq/builders"
         alt: "SDK CQ Status"
       >
+      links: <
+        text: "Results Feed"
+        url: "https://dart-ci.firebaseapp.com/"
+        alt: "Results Feed"
+      >
     >
     console_groups: <
       console_ids: "dart/flutter"
@@ -2186,6 +2206,11 @@ consoles: <
         url: "/p/dart/g/cq/builders"
         alt: "SDK CQ Status"
       >
+      links: <
+        text: "Results Feed"
+        url: "https://dart-ci.firebaseapp.com/"
+        alt: "Results Feed"
+      >
     >
     console_groups: <
       console_ids: "dart/flutter"

From 0a36713a838a052c554ec7e92c8c9ff1bc24095d Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 12 Dec 2019 09:01:44 +0000
Subject: [PATCH 320/826] [infra] Remove obsolete AST builders

These builders consume capacity but we don't plan to support both modes
in the foreseeable future. Therefore, running all configs in their
default mode is sufficient.

Change-Id: I43f2ef01c21cfba3e581f41659c6b89bd2728ccc
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/127645
Reviewed-by: Siva Annamalai <asiva@google.com>
---
 cr-buildbucket.cfg | 1774 ++++++++------------------------------------
 luci-milo.cfg      |  240 ------
 luci-notify.cfg    |  168 -----
 luci-scheduler.cfg |  396 ----------
 main.star          |   22 -
 5 files changed, 299 insertions(+), 2301 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 57565a198dcd..9d178f0c0bc5 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -3931,7 +3931,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-linux-debug-ia32"
+      name: "vm-kernel-checked-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3955,7 +3955,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-linux-debug-ia32-dev"
+      name: "vm-kernel-checked-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3980,7 +3980,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-linux-debug-ia32-stable"
+      name: "vm-kernel-checked-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4005,7 +4005,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-linux-debug-x64"
+      name: "vm-kernel-linux-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4029,7 +4029,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-linux-debug-x64-dev"
+      name: "vm-kernel-linux-debug-ia32-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4054,7 +4054,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-linux-debug-x64-stable"
+      name: "vm-kernel-linux-debug-ia32-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4079,7 +4079,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-linux-release-ia32"
+      name: "vm-kernel-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4103,7 +4103,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-linux-release-ia32-dev"
+      name: "vm-kernel-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4128,7 +4128,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-linux-release-ia32-stable"
+      name: "vm-kernel-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4153,7 +4153,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-linux-release-simarm"
+      name: "vm-kernel-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4177,7 +4177,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-linux-release-simarm-dev"
+      name: "vm-kernel-linux-product-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4202,7 +4202,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-linux-release-simarm-stable"
+      name: "vm-kernel-linux-product-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4227,7 +4227,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-linux-release-simarm64"
+      name: "vm-kernel-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4251,7 +4251,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-linux-release-simarm64-dev"
+      name: "vm-kernel-linux-release-ia32-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4276,7 +4276,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-linux-release-simarm64-stable"
+      name: "vm-kernel-linux-release-ia32-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4301,7 +4301,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-linux-release-x64"
+      name: "vm-kernel-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4325,7 +4325,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-linux-release-x64-dev"
+      name: "vm-kernel-linux-release-simarm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4350,7 +4350,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-linux-release-x64-stable"
+      name: "vm-kernel-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4375,12 +4375,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-win-debug-x64"
+      name: "vm-kernel-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4399,12 +4399,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-win-debug-x64-dev"
+      name: "vm-kernel-linux-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4424,12 +4424,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-win-debug-x64-stable"
+      name: "vm-kernel-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4449,12 +4449,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-win-release-x64"
+      name: "vm-kernel-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4473,12 +4473,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-win-release-x64-dev"
+      name: "vm-kernel-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4498,12 +4498,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-win-release-x64-stable"
+      name: "vm-kernel-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4523,12 +4523,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-checked-linux-release-x64"
+      name: "vm-kernel-mac-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4547,12 +4547,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-checked-linux-release-x64-dev"
+      name: "vm-kernel-mac-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4572,12 +4572,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-checked-linux-release-x64-stable"
+      name: "vm-kernel-mac-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4597,12 +4597,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-debug-ia32"
+      name: "vm-kernel-mac-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4621,12 +4621,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-debug-ia32-dev"
+      name: "vm-kernel-mac-product-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4646,12 +4646,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-debug-ia32-stable"
+      name: "vm-kernel-mac-product-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4671,12 +4671,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-debug-x64"
+      name: "vm-kernel-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4695,12 +4695,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-debug-x64-dev"
+      name: "vm-kernel-mac-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4720,12 +4720,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-debug-x64-stable"
+      name: "vm-kernel-mac-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4745,7 +4745,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-product-x64"
+      name: "vm-kernel-optcounter-threshold-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4769,7 +4769,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-product-x64-dev"
+      name: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4794,7 +4794,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-product-x64-stable"
+      name: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4819,7 +4819,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-ia32"
+      name: "vm-kernel-optcounter-threshold-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4843,7 +4843,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-ia32-dev"
+      name: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4868,7 +4868,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-ia32-stable"
+      name: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4893,7 +4893,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-simarm"
+      name: "vm-kernel-precomp-android-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4907,6 +4907,7 @@ buckets: <
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -4917,7 +4918,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-simarm-dev"
+      name: "vm-kernel-precomp-android-release-arm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4932,6 +4933,7 @@ buckets: <
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -4942,7 +4944,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-simarm-stable"
+      name: "vm-kernel-precomp-android-release-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4957,6 +4959,7 @@ buckets: <
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -4967,7 +4970,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-simarm64"
+      name: "vm-kernel-precomp-android-release-arm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4981,6 +4984,7 @@ buckets: <
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -4991,7 +4995,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-simarm64-dev"
+      name: "vm-kernel-precomp-android-release-arm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5006,6 +5010,7 @@ buckets: <
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5016,7 +5021,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-simarm64-stable"
+      name: "vm-kernel-precomp-android-release-arm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5031,6 +5036,7 @@ buckets: <
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5041,7 +5047,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-x64"
+      name: "vm-kernel-precomp-bare-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5065,7 +5071,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-x64-dev"
+      name: "vm-kernel-precomp-bare-linux-release-simarm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5090,7 +5096,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-x64-stable"
+      name: "vm-kernel-precomp-bare-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5115,12 +5121,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-debug-x64"
+      name: "vm-kernel-precomp-bare-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5139,12 +5145,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-debug-x64-dev"
+      name: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5164,12 +5170,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-debug-x64-stable"
+      name: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5189,12 +5195,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-product-x64"
+      name: "vm-kernel-precomp-bare-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5213,12 +5219,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-product-x64-dev"
+      name: "vm-kernel-precomp-bare-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5238,12 +5244,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-product-x64-stable"
+      name: "vm-kernel-precomp-bare-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5263,12 +5269,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-release-x64"
+      name: "vm-kernel-precomp-linux-debug-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5277,6 +5283,7 @@ buckets: <
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5287,12 +5294,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-release-x64-dev"
+      name: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5302,6 +5309,7 @@ buckets: <
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5312,12 +5320,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-release-x64-stable"
+      name: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5327,6 +5335,7 @@ buckets: <
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5337,7 +5346,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-ia32"
+      name: "vm-kernel-precomp-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5361,7 +5370,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
+      name: "vm-kernel-precomp-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5386,7 +5395,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
+      name: "vm-kernel-precomp-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5411,7 +5420,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-x64"
+      name: "vm-kernel-precomp-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5435,7 +5444,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
+      name: "vm-kernel-precomp-linux-product-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5460,7 +5469,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
+      name: "vm-kernel-precomp-linux-product-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5485,7 +5494,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm64"
+      name: "vm-kernel-precomp-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5499,7 +5508,6 @@ buckets: <
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5510,7 +5518,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm64-dev"
+      name: "vm-kernel-precomp-linux-release-simarm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5525,7 +5533,6 @@ buckets: <
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
-        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5536,7 +5543,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm64-stable"
+      name: "vm-kernel-precomp-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5551,7 +5558,6 @@ buckets: <
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
-        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5562,7 +5568,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm_x64"
+      name: "vm-kernel-precomp-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5576,7 +5582,6 @@ buckets: <
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5587,7 +5592,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm_x64-dev"
+      name: "vm-kernel-precomp-linux-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5602,7 +5607,6 @@ buckets: <
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
-        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5613,7 +5617,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm_x64-stable"
+      name: "vm-kernel-precomp-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5628,7 +5632,6 @@ buckets: <
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
-        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5639,7 +5642,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-ast-linux-debug-x64"
+      name: "vm-kernel-precomp-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5663,7 +5666,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-ast-linux-debug-x64-dev"
+      name: "vm-kernel-precomp-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5688,7 +5691,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-ast-linux-debug-x64-stable"
+      name: "vm-kernel-precomp-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5713,12 +5716,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-ast-linux-release-simarm64"
+      name: "vm-kernel-precomp-mac-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5737,12 +5740,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-ast-linux-release-simarm64-dev"
+      name: "vm-kernel-precomp-mac-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5762,12 +5765,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-ast-linux-release-simarm64-stable"
+      name: "vm-kernel-precomp-mac-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5787,12 +5790,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-ast-linux-release-simarm_x64"
+      name: "vm-kernel-precomp-mac-release-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5811,12 +5814,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-ast-linux-release-simarm_x64-dev"
+      name: "vm-kernel-precomp-mac-release-simarm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5836,12 +5839,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-ast-linux-release-simarm_x64-stable"
+      name: "vm-kernel-precomp-mac-release-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5861,7 +5864,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-ast-linux-release-x64"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5885,7 +5888,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-ast-linux-release-x64-dev"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5910,7 +5913,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-ast-linux-release-x64-stable"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5935,12 +5938,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm"
+      name: "vm-kernel-precomp-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5959,12 +5962,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm-dev"
+      name: "vm-kernel-precomp-win-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5984,12 +5987,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm-stable"
+      name: "vm-kernel-precomp-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -6009,7 +6012,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm64"
+      name: "vm-kernel-reload-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6033,7 +6036,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
+      name: "vm-kernel-reload-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6058,7 +6061,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
+      name: "vm-kernel-reload-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6083,7 +6086,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-bare-linux-release-x64"
+      name: "vm-kernel-reload-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6107,7 +6110,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-bare-linux-release-x64-dev"
+      name: "vm-kernel-reload-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6132,7 +6135,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-bare-linux-release-x64-stable"
+      name: "vm-kernel-reload-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6157,7 +6160,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-debug-simarm_x64"
+      name: "vm-kernel-reload-rollback-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6171,7 +6174,6 @@ buckets: <
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -6182,7 +6184,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
+      name: "vm-kernel-reload-rollback-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6197,7 +6199,6 @@ buckets: <
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
-        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -6208,7 +6209,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
+      name: "vm-kernel-reload-rollback-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6223,7 +6224,6 @@ buckets: <
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
-        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -6234,7 +6234,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-debug-x64"
+      name: "vm-kernel-reload-rollback-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6258,7 +6258,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-debug-x64-dev"
+      name: "vm-kernel-reload-rollback-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6283,7 +6283,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-debug-x64-stable"
+      name: "vm-kernel-reload-rollback-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6308,12 +6308,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-product-x64"
+      name: "vm-kernel-win-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -6332,12 +6332,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-product-x64-dev"
+      name: "vm-kernel-win-debug-ia32-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -6357,12 +6357,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-product-x64-stable"
+      name: "vm-kernel-win-debug-ia32-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -6382,12 +6382,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-simarm"
+      name: "vm-kernel-win-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -6406,969 +6406,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-simarm-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-linux-release-simarm-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-linux-release-simarm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-linux-release-simarm64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-linux-release-simarm64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-mac-release-simarm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-mac-release-simarm64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-mac-release-simarm64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-mac-release-simarm_x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-mac-release-simarm_x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-mac-release-simarm_x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-win-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-win-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-win-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-linux-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-linux-debug-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-linux-debug-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-rollback-linux-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-rollback-linux-debug-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-rollback-linux-debug-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-rollback-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-rollback-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-rollback-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-debug-ia32"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-debug-ia32-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-debug-ia32-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-debug-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-debug-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-product-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-product-x64-dev"
+      name: "vm-kernel-win-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7393,7 +6431,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-win-product-x64-stable"
+      name: "vm-kernel-win-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7418,7 +6456,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-win-release-ia32"
+      name: "vm-kernel-win-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7442,7 +6480,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-win-release-ia32-dev"
+      name: "vm-kernel-win-product-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7467,7 +6505,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-win-release-ia32-stable"
+      name: "vm-kernel-win-product-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7492,31 +6530,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-win-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-win-release-x64-dev"
+      name: "vm-kernel-win-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7530,7 +6544,6 @@ buckets: <
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -7541,7 +6554,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-win-release-x64-stable"
+      name: "vm-kernel-win-release-ia32-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7565,225 +6578,13 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-  >
->
-buckets: <
-  name: "try"
-  acls: <
-    group: "all"
-  >
-  acls: <
-    role: SCHEDULER
-    group: "project-dart-admins"
-  >
-  acls: <
-    role: SCHEDULER
-    group: "project-dart-tryjob-access"
-  >
-  acls: <
-    role: SCHEDULER
-    group: "service-account-cq"
-  >
-  swarming: <
-    builders: <
-      name: "analyzer-analysis-server-linux-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "analyzer-linux-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "analyzer-mac-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "analyzer-nnbd-linux-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "analyzer-win-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "app-kernel-linux-debug-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "app-kernel-linux-product-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "app-kernel-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
-      name: "benchmark-linux-try"
+      name: "vm-kernel-win-release-ia32-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -7791,8 +6592,10 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
-      priority: 30
+      priority: 50
       caches: <
         name: "browsers"
         path: "browsers"
@@ -7801,12 +6604,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "cl-linux-try"
+      name: "vm-kernel-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -7814,8 +6617,9 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
       >
-      priority: 30
+      priority: 50
       caches: <
         name: "browsers"
         path: "browsers"
@@ -7824,12 +6628,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "cl-mac-try"
+      name: "vm-kernel-win-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -7837,8 +6641,10 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
-      priority: 30
+      priority: 50
       caches: <
         name: "browsers"
         path: "browsers"
@@ -7847,7 +6653,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "cl-win-try"
+      name: "vm-kernel-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7860,8 +6666,10 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
       >
-      priority: 30
+      priority: 50
       caches: <
         name: "browsers"
         path: "browsers"
@@ -7869,8 +6677,28 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+  >
+>
+buckets: <
+  name: "try"
+  acls: <
+    group: "all"
+  >
+  acls: <
+    role: SCHEDULER
+    group: "project-dart-admins"
+  >
+  acls: <
+    role: SCHEDULER
+    group: "project-dart-tryjob-access"
+  >
+  acls: <
+    role: SCHEDULER
+    group: "service-account-cq"
+  >
+  swarming: <
     builders: <
-      name: "dart-sdk-linux-try"
+      name: "analyzer-analysis-server-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7883,6 +6711,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7893,12 +6722,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart-sdk-mac-try"
+      name: "analyzer-linux-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -7906,6 +6735,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7916,12 +6746,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart-sdk-win-try"
+      name: "analyzer-mac-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -7929,6 +6759,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7939,7 +6770,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-csp-minified-linux-x64-chrome-try"
+      name: "analyzer-nnbd-linux-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7963,12 +6794,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-minified-strong-linux-x64-d8-try"
+      name: "analyzer-win-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -7987,7 +6818,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-rti-linux-x64-d8-try"
+      name: "app-kernel-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8011,7 +6842,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-hostasserts-linux-ia32-d8-try"
+      name: "app-kernel-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8035,7 +6866,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-linux-x64-chrome-try"
+      name: "app-kernel-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8059,7 +6890,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-linux-x64-firefox-try"
+      name: "benchmark-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8072,7 +6903,6 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8083,12 +6913,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-mac-x64-chrome-try"
+      name: "cl-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -8096,7 +6926,6 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8107,7 +6936,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-mac-x64-safari-try"
+      name: "cl-mac-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8120,7 +6949,6 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8131,7 +6959,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-win-x64-chrome-try"
+      name: "cl-win-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8144,7 +6972,6 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8155,12 +6982,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-win-x64-ie11-try"
+      name: "dart-sdk-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -8168,7 +6995,6 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8179,12 +7005,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-unit-linux-x64-release-try"
+      name: "dart-sdk-mac-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -8192,7 +7018,6 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8203,12 +7028,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "ddc-linux-release-chrome-try"
+      name: "dart-sdk-win-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -8216,7 +7041,6 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8227,12 +7051,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "ddc-mac-release-chrome-try"
+      name: "dart2js-csp-minified-linux-x64-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -8251,7 +7075,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "ddc-nnbd-linux-release-chrome-try"
+      name: "dart2js-minified-strong-linux-x64-d8-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8275,12 +7099,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "ddc-win-release-chrome-try"
+      name: "dart2js-rti-linux-x64-d8-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -8299,7 +7123,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "ddk-linux-release-firefox-try"
+      name: "dart2js-strong-hostasserts-linux-ia32-d8-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8323,7 +7147,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "flutter-analyze-try"
+      name: "dart2js-strong-linux-x64-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8336,6 +7160,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8346,7 +7171,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "flutter-engine-linux-try"
+      name: "dart2js-strong-linux-x64-firefox-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8354,14 +7179,14 @@ buckets: <
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
-        name: "dart/flutter_engine"
+        name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
-      execution_timeout_secs: 18000
       caches: <
         name: "browsers"
         path: "browsers"
@@ -8370,12 +7195,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "flutter-frontend-try"
+      name: "dart2js-strong-mac-x64-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -8383,6 +7208,7 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8393,12 +7219,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "front-end-linux-release-x64-try"
+      name: "dart2js-strong-mac-x64-safari-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -8417,12 +7243,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "front-end-mac-release-x64-try"
+      name: "dart2js-strong-win-x64-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -8441,7 +7267,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "front-end-win-release-x64-try"
+      name: "dart2js-strong-win-x64-ie11-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8465,7 +7291,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "gclient-try"
+      name: "dart2js-unit-linux-x64-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8473,11 +7299,12 @@ buckets: <
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
-        name: "dart/gclient"
+        name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8488,7 +7315,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "pkg-linux-debug-try"
+      name: "ddc-linux-release-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8512,12 +7339,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "pkg-linux-release-try"
+      name: "ddc-mac-release-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -8536,12 +7363,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "pkg-mac-release-try"
+      name: "ddc-nnbd-linux-release-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -8560,7 +7387,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "pkg-win-release-try"
+      name: "ddc-win-release-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8584,7 +7411,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-canary-linux-debug-try"
+      name: "ddk-linux-release-firefox-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8608,7 +7435,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-release-simarm64-try"
+      name: "flutter-analyze-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8621,7 +7448,6 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8632,7 +7458,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-release-x64-abi-try"
+      name: "flutter-engine-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8640,14 +7466,14 @@ buckets: <
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
-        name: "dart/neo"
+        name: "dart/flutter_engine"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
+      execution_timeout_secs: 18000
       caches: <
         name: "browsers"
         path: "browsers"
@@ -8656,7 +7482,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-release-x64-try"
+      name: "flutter-frontend-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8669,7 +7495,6 @@ buckets: <
         cipd_version: "refs/heads/master"
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8680,7 +7505,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-debug-arm-try"
+      name: "front-end-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8704,12 +7529,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-debug-arm64-try"
+      name: "front-end-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -8728,12 +7553,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-product-arm-try"
+      name: "front-end-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -8752,7 +7577,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-product-arm64-try"
+      name: "gclient-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8760,12 +7585,11 @@ buckets: <
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
-        name: "dart/neo"
+        name: "dart/gclient"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8776,7 +7600,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-release-arm-try"
+      name: "pkg-linux-debug-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8800,7 +7624,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-release-arm64-try"
+      name: "pkg-linux-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8824,12 +7648,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-asan-linux-release-x64-try"
+      name: "pkg-mac-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -8848,12 +7672,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-linux-debug-ia32-try"
+      name: "pkg-win-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -8872,7 +7696,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-linux-debug-x64-try"
+      name: "vm-canary-linux-debug-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8896,7 +7720,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-linux-release-ia32-try"
+      name: "vm-dartkb-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8920,7 +7744,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-linux-release-simarm-try"
+      name: "vm-dartkb-linux-release-x64-abi-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8944,7 +7768,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-linux-release-simarm64-try"
+      name: "vm-dartkb-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8968,7 +7792,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-linux-release-x64-try"
+      name: "vm-ffi-android-debug-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8992,12 +7816,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-win-debug-x64-try"
+      name: "vm-ffi-android-debug-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -9016,12 +7840,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-ast-win-release-x64-try"
+      name: "vm-ffi-android-product-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -9040,7 +7864,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-checked-linux-release-x64-try"
+      name: "vm-ffi-android-product-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9064,7 +7888,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-debug-ia32-try"
+      name: "vm-ffi-android-release-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9088,7 +7912,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-debug-x64-try"
+      name: "vm-ffi-android-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9112,7 +7936,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-product-x64-try"
+      name: "vm-kernel-asan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9136,7 +7960,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-ia32-try"
+      name: "vm-kernel-checked-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9160,7 +7984,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-simarm-try"
+      name: "vm-kernel-linux-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9184,7 +8008,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-simarm64-try"
+      name: "vm-kernel-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9208,7 +8032,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-x64-try"
+      name: "vm-kernel-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9232,12 +8056,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-debug-x64-try"
+      name: "vm-kernel-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -9256,12 +8080,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-product-x64-try"
+      name: "vm-kernel-linux-release-simarm-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -9280,12 +8104,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-release-x64-try"
+      name: "vm-kernel-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -9304,7 +8128,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-ia32-try"
+      name: "vm-kernel-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9328,12 +8152,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-x64-try"
+      name: "vm-kernel-mac-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -9352,12 +8176,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm64-try"
+      name: "vm-kernel-mac-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -9366,7 +8190,6 @@ buckets: <
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "shard_timeout:5400"
       >
       priority: 30
       caches: <
@@ -9377,12 +8200,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm_x64-try"
+      name: "vm-kernel-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -9391,7 +8214,6 @@ buckets: <
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "shard_timeout:5400"
       >
       priority: 30
       caches: <
@@ -9402,7 +8224,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-ast-linux-debug-x64-try"
+      name: "vm-kernel-optcounter-threshold-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9426,7 +8248,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-ast-linux-release-simarm64-try"
+      name: "vm-kernel-optcounter-threshold-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9450,7 +8272,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-ast-linux-release-simarm_x64-try"
+      name: "vm-kernel-precomp-android-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9464,6 +8286,7 @@ buckets: <
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "shard_timeout:5400"
       >
       priority: 30
       caches: <
@@ -9474,7 +8297,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-ast-linux-release-x64-try"
+      name: "vm-kernel-precomp-android-release-arm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9488,6 +8311,7 @@ buckets: <
         properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
+        properties_j: "shard_timeout:5400"
       >
       priority: 30
       caches: <
diff --git a/luci-milo.cfg b/luci-milo.cfg
index d514ddc2265a..8f0b2fd7115b 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -102,66 +102,6 @@ consoles: <
     category: "flutter"
     short_name: "3H"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-debug-ia32"
-    category: "vm|ast"
-    short_name: "d32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-ia32"
-    category: "vm|ast"
-    short_name: "r32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-debug-x64"
-    category: "vm|ast"
-    short_name: "d"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-simarm"
-    category: "vm|ast"
-    short_name: "psr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-simarm64"
-    category: "vm|ast"
-    short_name: "psr6"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-x64"
-    category: "vm|ast"
-    short_name: "r"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-win-debug-x64"
-    category: "vm|ast"
-    short_name: "wd"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-win-release-x64"
-    category: "vm|ast"
-    short_name: "wr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-debug-x64"
-    category: "vm|ast"
-    short_name: "pd"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-release-simarm_x64"
-    category: "vm|ast"
-    short_name: "psr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-release-simarm64"
-    category: "vm|ast"
-    short_name: "psr6"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-release-x64"
-    category: "vm|ast"
-    short_name: "pr"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
     category: "vm|app-kernel"
@@ -819,66 +759,6 @@ consoles: <
     category: "misc"
     short_name: "vc"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-debug-ia32"
-    category: "vm|ast"
-    short_name: "d32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-ia32"
-    category: "vm|ast"
-    short_name: "r32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-debug-x64"
-    category: "vm|ast"
-    short_name: "d"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-simarm"
-    category: "vm|ast"
-    short_name: "psr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-simarm64"
-    category: "vm|ast"
-    short_name: "psr6"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-x64"
-    category: "vm|ast"
-    short_name: "r"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-win-debug-x64"
-    category: "vm|ast"
-    short_name: "wd"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-win-release-x64"
-    category: "vm|ast"
-    short_name: "wr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-debug-x64"
-    category: "vm|ast"
-    short_name: "pd"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-release-simarm_x64"
-    category: "vm|ast"
-    short_name: "psr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-release-simarm64"
-    category: "vm|ast"
-    short_name: "psr6"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-release-x64"
-    category: "vm|ast"
-    short_name: "pr"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
     category: "vm|app-kernel"
@@ -1196,66 +1076,6 @@ consoles: <
     category: "fasta"
     short_name: "w"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-debug-ia32-dev"
-    category: "vm|ast"
-    short_name: "d32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-ia32-dev"
-    category: "vm|ast"
-    short_name: "r32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-debug-x64-dev"
-    category: "vm|ast"
-    short_name: "d"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-simarm-dev"
-    category: "vm|ast"
-    short_name: "psr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-simarm64-dev"
-    category: "vm|ast"
-    short_name: "psr6"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-x64-dev"
-    category: "vm|ast"
-    short_name: "r"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-win-debug-x64-dev"
-    category: "vm|ast"
-    short_name: "wd"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-win-release-x64-dev"
-    category: "vm|ast"
-    short_name: "wr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-debug-x64-dev"
-    category: "vm|ast"
-    short_name: "pd"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-release-simarm_x64-dev"
-    category: "vm|ast"
-    short_name: "psr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-release-simarm64-dev"
-    category: "vm|ast"
-    short_name: "psr6"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-release-x64-dev"
-    category: "vm|ast"
-    short_name: "pr"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-dev"
     category: "vm|app-kernel"
@@ -1718,66 +1538,6 @@ consoles: <
     category: "fasta"
     short_name: "w"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-debug-ia32-stable"
-    category: "vm|ast"
-    short_name: "d32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-ia32-stable"
-    category: "vm|ast"
-    short_name: "r32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-debug-x64-stable"
-    category: "vm|ast"
-    short_name: "d"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-simarm-stable"
-    category: "vm|ast"
-    short_name: "psr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-simarm64-stable"
-    category: "vm|ast"
-    short_name: "psr6"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-linux-release-x64-stable"
-    category: "vm|ast"
-    short_name: "r"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-win-debug-x64-stable"
-    category: "vm|ast"
-    short_name: "wd"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ast-win-release-x64-stable"
-    category: "vm|ast"
-    short_name: "wr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-debug-x64-stable"
-    category: "vm|ast"
-    short_name: "pd"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-release-simarm_x64-stable"
-    category: "vm|ast"
-    short_name: "psr"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-release-simarm64-stable"
-    category: "vm|ast"
-    short_name: "psr6"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ast-linux-release-x64-stable"
-    category: "vm|ast"
-    short_name: "pr"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-stable"
     category: "vm|app-kernel"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index e69fd4095063..64c38f34e834 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -760,118 +760,6 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-ast-linux-debug-ia32"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-ast-linux-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-ast-linux-release-ia32"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-ast-linux-release-simarm"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-ast-linux-release-simarm64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-ast-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-ast-win-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-ast-win-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
 notifiers: <
   notifications: <
     on_new_failure: true
@@ -1082,62 +970,6 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-ast-linux-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-ast-linux-release-simarm64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-ast-linux-release-simarm_x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-ast-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
 notifiers: <
   notifications: <
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 6a27ca72fbd1..26c99721f82b 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1548,246 +1548,6 @@ job: <
     builder: "vm-kernel-asan-linux-release-x64-stable"
   >
 >
-job: <
-  id: "vm-kernel-ast-linux-debug-ia32"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-ast-linux-debug-ia32"
-  >
->
-job: <
-  id: "vm-kernel-ast-linux-debug-ia32-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-ast-linux-debug-ia32-dev"
-  >
->
-job: <
-  id: "vm-kernel-ast-linux-debug-ia32-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-ast-linux-debug-ia32-stable"
-  >
->
-job: <
-  id: "vm-kernel-ast-linux-debug-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-ast-linux-debug-x64"
-  >
->
-job: <
-  id: "vm-kernel-ast-linux-debug-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-ast-linux-debug-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-ast-linux-debug-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-ast-linux-debug-x64-stable"
-  >
->
-job: <
-  id: "vm-kernel-ast-linux-release-ia32"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-ast-linux-release-ia32"
-  >
->
-job: <
-  id: "vm-kernel-ast-linux-release-ia32-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-ast-linux-release-ia32-dev"
-  >
->
-job: <
-  id: "vm-kernel-ast-linux-release-ia32-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-ast-linux-release-ia32-stable"
-  >
->
-job: <
-  id: "vm-kernel-ast-linux-release-simarm"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-ast-linux-release-simarm"
-  >
->
-job: <
-  id: "vm-kernel-ast-linux-release-simarm-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-ast-linux-release-simarm-dev"
-  >
->
-job: <
-  id: "vm-kernel-ast-linux-release-simarm-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-ast-linux-release-simarm-stable"
-  >
->
-job: <
-  id: "vm-kernel-ast-linux-release-simarm64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-ast-linux-release-simarm64"
-  >
->
-job: <
-  id: "vm-kernel-ast-linux-release-simarm64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-ast-linux-release-simarm64-dev"
-  >
->
-job: <
-  id: "vm-kernel-ast-linux-release-simarm64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-ast-linux-release-simarm64-stable"
-  >
->
-job: <
-  id: "vm-kernel-ast-linux-release-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-ast-linux-release-x64"
-  >
->
-job: <
-  id: "vm-kernel-ast-linux-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-ast-linux-release-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-ast-linux-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-ast-linux-release-x64-stable"
-  >
->
-job: <
-  id: "vm-kernel-ast-win-debug-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-ast-win-debug-x64"
-  >
->
-job: <
-  id: "vm-kernel-ast-win-debug-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-ast-win-debug-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-ast-win-debug-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-ast-win-debug-x64-stable"
-  >
->
-job: <
-  id: "vm-kernel-ast-win-release-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-ast-win-release-x64"
-  >
->
-job: <
-  id: "vm-kernel-ast-win-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-ast-win-release-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-ast-win-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-ast-win-release-x64-stable"
-  >
->
 job: <
   id: "vm-kernel-checked-linux-release-x64"
   schedule: "triggered"
@@ -2238,126 +1998,6 @@ job: <
     builder: "vm-kernel-precomp-android-release-arm_x64-stable"
   >
 >
-job: <
-  id: "vm-kernel-precomp-ast-linux-debug-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-ast-linux-debug-x64"
-  >
->
-job: <
-  id: "vm-kernel-precomp-ast-linux-debug-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-ast-linux-debug-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-precomp-ast-linux-debug-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-ast-linux-debug-x64-stable"
-  >
->
-job: <
-  id: "vm-kernel-precomp-ast-linux-release-simarm64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-ast-linux-release-simarm64"
-  >
->
-job: <
-  id: "vm-kernel-precomp-ast-linux-release-simarm64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-ast-linux-release-simarm64-dev"
-  >
->
-job: <
-  id: "vm-kernel-precomp-ast-linux-release-simarm64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-ast-linux-release-simarm64-stable"
-  >
->
-job: <
-  id: "vm-kernel-precomp-ast-linux-release-simarm_x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-ast-linux-release-simarm_x64"
-  >
->
-job: <
-  id: "vm-kernel-precomp-ast-linux-release-simarm_x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-ast-linux-release-simarm_x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-precomp-ast-linux-release-simarm_x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-ast-linux-release-simarm_x64-stable"
-  >
->
-job: <
-  id: "vm-kernel-precomp-ast-linux-release-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-ast-linux-release-x64"
-  >
->
-job: <
-  id: "vm-kernel-precomp-ast-linux-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-ast-linux-release-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-precomp-ast-linux-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-ast-linux-release-x64-stable"
-  >
->
 job: <
   id: "vm-kernel-precomp-bare-linux-release-simarm"
   schedule: "triggered"
@@ -3099,14 +2739,6 @@ trigger: <
   triggers: "vm-ffi-android-release-arm-dev"
   triggers: "vm-ffi-android-release-arm64-dev"
   triggers: "vm-kernel-asan-linux-release-x64-dev"
-  triggers: "vm-kernel-ast-linux-debug-ia32-dev"
-  triggers: "vm-kernel-ast-linux-debug-x64-dev"
-  triggers: "vm-kernel-ast-linux-release-ia32-dev"
-  triggers: "vm-kernel-ast-linux-release-simarm-dev"
-  triggers: "vm-kernel-ast-linux-release-simarm64-dev"
-  triggers: "vm-kernel-ast-linux-release-x64-dev"
-  triggers: "vm-kernel-ast-win-debug-x64-dev"
-  triggers: "vm-kernel-ast-win-release-x64-dev"
   triggers: "vm-kernel-checked-linux-release-x64-dev"
   triggers: "vm-kernel-linux-debug-ia32-dev"
   triggers: "vm-kernel-linux-debug-x64-dev"
@@ -3122,10 +2754,6 @@ trigger: <
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-android-release-arm64-dev"
   triggers: "vm-kernel-precomp-android-release-arm_x64-dev"
-  triggers: "vm-kernel-precomp-ast-linux-debug-x64-dev"
-  triggers: "vm-kernel-precomp-ast-linux-release-simarm64-dev"
-  triggers: "vm-kernel-precomp-ast-linux-release-simarm_x64-dev"
-  triggers: "vm-kernel-precomp-ast-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm-dev"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
   triggers: "vm-kernel-precomp-bare-linux-release-x64-dev"
@@ -3267,14 +2895,6 @@ trigger: <
   triggers: "vm-ffi-android-release-arm-stable"
   triggers: "vm-ffi-android-release-arm64-stable"
   triggers: "vm-kernel-asan-linux-release-x64-stable"
-  triggers: "vm-kernel-ast-linux-debug-ia32-stable"
-  triggers: "vm-kernel-ast-linux-debug-x64-stable"
-  triggers: "vm-kernel-ast-linux-release-ia32-stable"
-  triggers: "vm-kernel-ast-linux-release-simarm-stable"
-  triggers: "vm-kernel-ast-linux-release-simarm64-stable"
-  triggers: "vm-kernel-ast-linux-release-x64-stable"
-  triggers: "vm-kernel-ast-win-debug-x64-stable"
-  triggers: "vm-kernel-ast-win-release-x64-stable"
   triggers: "vm-kernel-checked-linux-release-x64-stable"
   triggers: "vm-kernel-linux-debug-ia32-stable"
   triggers: "vm-kernel-linux-debug-x64-stable"
@@ -3290,10 +2910,6 @@ trigger: <
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-android-release-arm64-stable"
   triggers: "vm-kernel-precomp-android-release-arm_x64-stable"
-  triggers: "vm-kernel-precomp-ast-linux-debug-x64-stable"
-  triggers: "vm-kernel-precomp-ast-linux-release-simarm64-stable"
-  triggers: "vm-kernel-precomp-ast-linux-release-simarm_x64-stable"
-  triggers: "vm-kernel-precomp-ast-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm-stable"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
   triggers: "vm-kernel-precomp-bare-linux-release-x64-stable"
@@ -3338,14 +2954,6 @@ trigger: <
   triggers: "vm-ffi-android-release-arm"
   triggers: "vm-ffi-android-release-arm64"
   triggers: "vm-kernel-asan-linux-release-x64"
-  triggers: "vm-kernel-ast-linux-debug-ia32"
-  triggers: "vm-kernel-ast-linux-debug-x64"
-  triggers: "vm-kernel-ast-linux-release-ia32"
-  triggers: "vm-kernel-ast-linux-release-simarm"
-  triggers: "vm-kernel-ast-linux-release-simarm64"
-  triggers: "vm-kernel-ast-linux-release-x64"
-  triggers: "vm-kernel-ast-win-debug-x64"
-  triggers: "vm-kernel-ast-win-release-x64"
   triggers: "vm-kernel-checked-linux-release-x64"
   triggers: "vm-kernel-linux-debug-ia32"
   triggers: "vm-kernel-linux-release-ia32"
@@ -3355,10 +2963,6 @@ trigger: <
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
   triggers: "vm-kernel-precomp-android-release-arm64"
   triggers: "vm-kernel-precomp-android-release-arm_x64"
-  triggers: "vm-kernel-precomp-ast-linux-debug-x64"
-  triggers: "vm-kernel-precomp-ast-linux-release-simarm64"
-  triggers: "vm-kernel-precomp-ast-linux-release-simarm_x64"
-  triggers: "vm-kernel-precomp-ast-linux-release-x64"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm"
   triggers: "vm-kernel-precomp-bare-linux-release-simarm64"
   triggers: "vm-kernel-precomp-bare-linux-release-x64"
diff --git a/main.star b/main.star
index bcc49fee373d..a89bb490cd3b 100755
--- a/main.star
+++ b/main.star
@@ -498,28 +498,6 @@ dart_ci_sandbox_builder(
     triggered_by=["dart-gitiles-trigger-flutter"],
 )
 
-# vm|ast
-dart_vm_extra_builder("vm-kernel-ast-linux-debug-ia32", category="vm|ast|d32")
-dart_vm_extra_builder("vm-kernel-ast-linux-release-ia32", category="vm|ast|r32")
-dart_vm_extra_builder("vm-kernel-ast-linux-debug-x64", category="vm|ast|d")
-dart_vm_extra_builder(
-    "vm-kernel-ast-linux-release-simarm", category="vm|ast|psr")
-dart_vm_extra_builder(
-    "vm-kernel-ast-linux-release-simarm64", category="vm|ast|psr6")
-dart_vm_extra_builder("vm-kernel-ast-linux-release-x64", category="vm|ast|r")
-dart_vm_extra_builder(
-    "vm-kernel-ast-win-debug-x64", category="vm|ast|wd", dimensions=windows())
-dart_vm_extra_builder(
-    "vm-kernel-ast-win-release-x64", category="vm|ast|wr", dimensions=windows())
-dart_vm_extra_builder(
-    "vm-kernel-precomp-ast-linux-debug-x64", category="vm|ast|pd")
-dart_vm_extra_builder(
-    "vm-kernel-precomp-ast-linux-release-simarm_x64", category="vm|ast|psr")
-dart_vm_extra_builder(
-    "vm-kernel-precomp-ast-linux-release-simarm64", category="vm|ast|psr6")
-dart_vm_extra_builder(
-    "vm-kernel-precomp-ast-linux-release-x64", category="vm|ast|pr")
-
 # vm|app-kernel
 dart_vm_extra_builder(
     "app-kernel-linux-debug-x64", category="vm|app-kernel|d64")

From 15da025c5dc028de36bc7235f9ef0d313ff1e354 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 16 Dec 2019 13:10:09 +0000
Subject: [PATCH 321/826] [infra] Add includable_only to CQ config

This adds the property to all try builders to make them known to the CQ.
It also expands the CQ console to show all tryjobs rather than just those
on the default CQ.

Bug: crbug.com/1032728
Change-Id: I2188959d756f3c4ef83a6866a0d967426b67f218
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/128542
Reviewed-by: Andrii Shyshkalov <tandrii@google.com>
---
 commit-queue.cfg | 292 +++++++++++++++++++++++++++++++++++++++++++++++
 luci-milo.cfg    | 219 +++++++++++++++++++++++++++++++++++
 main.star        |  22 ++--
 3 files changed, 523 insertions(+), 10 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index a697749b51b8..124e1cf9100e 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -34,12 +34,60 @@ config_groups: <
       builders: <
         name: "dart/try/analyzer-linux-release-try"
       >
+      builders: <
+        name: "dart/try/analyzer-mac-release-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/analyzer-nnbd-linux-release-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/analyzer-win-release-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/app-kernel-linux-debug-x64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/app-kernel-linux-product-x64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/app-kernel-linux-release-x64-try"
+        includable_only: true
+      >
       builders: <
         name: "dart/try/benchmark-linux-try"
       >
+      builders: <
+        name: "dart/try/cl-linux-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/cl-mac-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/cl-win-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/dart-sdk-linux-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/dart-sdk-mac-try"
+        includable_only: true
+      >
       builders: <
         name: "dart/try/dart-sdk-win-try"
       >
+      builders: <
+        name: "dart/try/dart2js-csp-minified-linux-x64-chrome-try"
+        includable_only: true
+      >
       builders: <
         name: "dart/try/dart2js-minified-strong-linux-x64-d8-try"
         location_regexp: ".+/[+]/DEPS"
@@ -54,6 +102,10 @@ config_groups: <
         location_regexp: ".+/[+]/utils/compiler/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
       >
+      builders: <
+        name: "dart/try/dart2js-rti-linux-x64-d8-try"
+        includable_only: true
+      >
       builders: <
         name: "dart/try/dart2js-strong-hostasserts-linux-ia32-d8-try"
         location_regexp: ".+/[+]/DEPS"
@@ -82,6 +134,26 @@ config_groups: <
         location_regexp: ".+/[+]/utils/compiler/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
       >
+      builders: <
+        name: "dart/try/dart2js-strong-linux-x64-firefox-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/dart2js-strong-mac-x64-chrome-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/dart2js-strong-mac-x64-safari-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/dart2js-strong-win-x64-chrome-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/dart2js-strong-win-x64-ie11-try"
+        includable_only: true
+      >
       builders: <
         name: "dart/try/dart2js-unit-linux-x64-release-try"
         location_regexp: ".+/[+]/DEPS"
@@ -110,6 +182,22 @@ config_groups: <
         location_regexp: ".+/[+]/utils/dartdevc/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing|testing)/.+"
       >
+      builders: <
+        name: "dart/try/ddc-mac-release-chrome-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/ddc-nnbd-linux-release-chrome-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/ddc-win-release-chrome-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/ddk-linux-release-firefox-try"
+        includable_only: true
+      >
       builders: <
         name: "dart/try/flutter-analyze-try"
         location_regexp: ".+/[+]/DEPS"
@@ -122,28 +210,232 @@ config_groups: <
         location_regexp: ".+/[+]/pkg/meta/.+"
         location_regexp: ".+/[+]/pkg/telemetry/.+"
       >
+      builders: <
+        name: "dart/try/flutter-engine-linux-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/flutter-frontend-try"
+        includable_only: true
+      >
       builders: <
         name: "dart/try/front-end-linux-release-x64-try"
       >
+      builders: <
+        name: "dart/try/front-end-mac-release-x64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/front-end-win-release-x64-try"
+        includable_only: true
+      >
       builders: <
         name: "dart/try/gclient-try"
       >
+      builders: <
+        name: "dart/try/pkg-linux-debug-try"
+        includable_only: true
+      >
       builders: <
         name: "dart/try/pkg-linux-release-try"
       >
+      builders: <
+        name: "dart/try/pkg-mac-release-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/pkg-win-release-try"
+        includable_only: true
+      >
       builders: <
         name: "dart/try/vm-canary-linux-debug-try"
       >
+      builders: <
+        name: "dart/try/vm-dartkb-linux-release-simarm64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-dartkb-linux-release-x64-abi-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-dartkb-linux-release-x64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-ffi-android-debug-arm-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-ffi-android-debug-arm64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-ffi-android-product-arm-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-ffi-android-product-arm64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-ffi-android-release-arm-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-ffi-android-release-arm64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-asan-linux-release-x64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-checked-linux-release-x64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-linux-debug-ia32-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-linux-debug-x64-try"
+        includable_only: true
+      >
       builders: <
         name: "dart/try/vm-kernel-linux-product-x64-try"
       >
+      builders: <
+        name: "dart/try/vm-kernel-linux-release-ia32-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-linux-release-simarm-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-linux-release-simarm64-try"
+        includable_only: true
+      >
       builders: <
         name: "dart/try/vm-kernel-linux-release-x64-try"
       >
+      builders: <
+        name: "dart/try/vm-kernel-mac-debug-x64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-mac-product-x64-try"
+        includable_only: true
+      >
       builders: <
         name: "dart/try/vm-kernel-mac-release-x64-try"
         experiment_percentage: 5
       >
+      builders: <
+        name: "dart/try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-optcounter-threshold-linux-release-x64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-precomp-android-release-arm64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-precomp-android-release-arm_x64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-precomp-bare-linux-release-simarm-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-precomp-bare-linux-release-simarm64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-precomp-bare-linux-release-x64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-precomp-linux-debug-simarm_x64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-precomp-linux-product-x64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-precomp-mac-release-simarm64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-precomp-mac-release-simarm_x64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-precomp-win-release-x64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-reload-linux-debug-x64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-reload-linux-release-x64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-reload-rollback-linux-debug-x64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-reload-rollback-linux-release-x64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-win-debug-ia32-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-win-debug-x64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-win-product-x64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-win-release-ia32-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-win-release-x64-try"
+        includable_only: true
+      >
       retry_config: <>
       cancel_stale_tryjobs: YES
     >
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 8f0b2fd7115b..3647ba7ade7f 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2026,24 +2026,189 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.try/front-end-linux-release-x64-try"
   >
+  builders: <
+    name: "buildbucket/luci.dart.try/front-end-mac-release-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/front-end-win-release-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/flutter-frontend-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/flutter-engine-linux-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/app-kernel-linux-debug-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/app-kernel-linux-product-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/app-kernel-linux-release-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-dartkb-linux-release-simarm64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-dartkb-linux-release-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-dartkb-linux-release-x64-abi-try"
+  >
   builders: <
     name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try"
   >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simarm-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simarm64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-ia32-try"
+  >
   builders: <
     name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try"
   >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-checked-linux-release-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-ia32-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-mac-debug-x64-try"
+  >
   builders: <
     name: "buildbucket/luci.dart.try/vm-kernel-mac-release-x64-try"
   >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-ia32-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-win-release-ia32-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-win-release-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-product-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-bare-linux-release-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-bare-linux-release-simarm-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-bare-linux-release-simarm64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-simarm_x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-mac-release-simarm_x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-mac-release-simarm64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-release-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm_x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-asan-linux-release-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-x64-try"
+  >
   builders: <
     name: "buildbucket/luci.dart.try/vm-kernel-linux-product-x64-try"
   >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-mac-product-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-win-product-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-reload-linux-debug-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-reload-linux-release-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-reload-rollback-linux-debug-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-reload-rollback-linux-release-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-ffi-android-release-arm-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-ffi-android-product-arm-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-ffi-android-release-arm64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-ffi-android-product-arm64-try"
+  >
   builders: <
     name: "buildbucket/luci.dart.try/pkg-linux-release-try"
   >
+  builders: <
+    name: "buildbucket/luci.dart.try/pkg-mac-release-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/pkg-win-release-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/pkg-linux-debug-try"
+  >
   builders: <
     name: "buildbucket/luci.dart.try/dart2js-strong-hostasserts-linux-ia32-d8-try"
   >
+  builders: <
+    name: "buildbucket/luci.dart.try/dart2js-rti-linux-x64-d8-try"
+  >
   builders: <
     name: "buildbucket/luci.dart.try/dart2js-minified-strong-linux-x64-d8-try"
   >
@@ -2053,6 +2218,24 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-chrome-try"
   >
+  builders: <
+    name: "buildbucket/luci.dart.try/dart2js-csp-minified-linux-x64-chrome-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/dart2js-strong-mac-x64-chrome-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/dart2js-strong-win-x64-chrome-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-firefox-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/dart2js-strong-mac-x64-safari-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/dart2js-strong-win-x64-ie11-try"
+  >
   builders: <
     name: "buildbucket/luci.dart.try/flutter-analyze-try"
   >
@@ -2062,15 +2245,51 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.try/analyzer-linux-release-try"
   >
+  builders: <
+    name: "buildbucket/luci.dart.try/analyzer-nnbd-linux-release-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/analyzer-mac-release-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/analyzer-win-release-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/dart-sdk-linux-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/dart-sdk-mac-try"
+  >
   builders: <
     name: "buildbucket/luci.dart.try/dart-sdk-win-try"
   >
   builders: <
     name: "buildbucket/luci.dart.try/ddc-linux-release-chrome-try"
   >
+  builders: <
+    name: "buildbucket/luci.dart.try/ddc-nnbd-linux-release-chrome-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/ddc-mac-release-chrome-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/ddc-win-release-chrome-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/ddk-linux-release-firefox-try"
+  >
   builders: <
     name: "buildbucket/luci.dart.try/gclient-try"
   >
+  builders: <
+    name: "buildbucket/luci.dart.try/cl-linux-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/cl-mac-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/cl-win-try"
+  >
   builders: <
     name: "buildbucket/luci.dart.try/benchmark-linux-try"
   >
diff --git a/main.star b/main.star
index a89bb490cd3b..8675efcef7d8 100755
--- a/main.star
+++ b/main.star
@@ -316,16 +316,18 @@ def dart_try_builder(name,
         service_account=TRY_ACCOUNT,
         swarming_tags=["vpython:native-python-wrapper"],
     )
-    if on_cq:
-        luci.cq_tryjob_verifier(
-            builder=builder,
-            cq_group='sdk',
-            experiment_percentage=experiment_percentage,
-            location_regexp=location_regexp)
-        luci.list_view_entry(
-            list_view="cq",
-            builder=builder,
-        )
+    includable_only = (not on_cq and not experiment_percentage and
+                       not location_regexp)
+    luci.cq_tryjob_verifier(
+        builder=builder,
+        cq_group='sdk',
+        experiment_percentage=experiment_percentage,
+        location_regexp=location_regexp,
+        includable_only=includable_only)
+    luci.list_view_entry(
+        list_view="cq",
+        builder=builder,
+    )
 
 
 postponed_alt_console_entries = []

From 79a506461d9fd0cbeb0d4f159312ae2ac8bc507d Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 16 Dec 2019 14:07:06 +0000
Subject: [PATCH 322/826] Revert "[infra] Pin depot_tools OSX SDK to a known
 good version"

This reverts commit 6a1a6fbdab30fa0f6ea62574d9d968c6404c04ef.

Reason for revert: This seems to cause failures now and the root cause
has been addressed in depot_tools.

Original change's description:
> [infra] Pin depot_tools OSX SDK to a known good version
>
> Because of changes to how the OSX SDK version gets selected introduced
> by https://crrev.com/c/chromium/tools/depot_tools/+/1938022, the recipes
> picked a different version of the SDK that failed to install.
>
> TBR=whesse@google.com
>
> Bug: https://crbug.com/1029246
> Change-Id: I6d707a31d13afff636e7e58249965f28035dd1b7
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/126641
> Reviewed-by: Alexander Thomas <athom@google.com>

TBR=whesse@google.com,athom@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: https://crbug.com/1029246
Change-Id: Ie1c792e865f7792dc72b4ef7d22c90b7a6cff99e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/128548
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 360 ---------------------------------------------
 main.star          |   2 -
 2 files changed, 362 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 9d178f0c0bc5..6870eb718a52 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -34,7 +34,6 @@ buckets: <
         name: "dart/forward_branch"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -57,7 +56,6 @@ buckets: <
         name: "dart/chocolatey"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -80,7 +78,6 @@ buckets: <
         name: "dart/package_co19"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -103,7 +100,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -126,7 +122,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -150,7 +145,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -174,7 +168,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -197,7 +190,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -221,7 +213,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -245,7 +236,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -268,7 +258,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -292,7 +281,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -316,7 +304,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -339,7 +326,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -363,7 +349,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -387,7 +372,6 @@ buckets: <
         name: "dart/docker"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -410,7 +394,6 @@ buckets: <
         name: "dart/external"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -433,7 +416,6 @@ buckets: <
         name: "dart/linearize"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "repo:\"https://dart.googlesource.com/linear_sdk_flutter_engine.git\""
       >
@@ -457,7 +439,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -480,7 +461,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -504,7 +484,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -552,7 +531,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -576,7 +554,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -600,7 +577,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -625,7 +601,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -650,7 +625,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -674,7 +648,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -698,7 +671,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -723,7 +695,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -748,7 +719,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -772,7 +742,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -796,7 +765,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -821,7 +789,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -846,7 +813,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -870,7 +836,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -894,7 +859,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -919,7 +883,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -944,7 +907,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -968,7 +930,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -992,7 +953,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1017,7 +977,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1042,7 +1001,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1066,7 +1024,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1091,7 +1048,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1116,7 +1072,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1140,7 +1095,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1165,7 +1119,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1190,7 +1143,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1214,7 +1166,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1239,7 +1190,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1264,7 +1214,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1288,7 +1237,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1313,7 +1261,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1338,7 +1285,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1362,7 +1308,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1387,7 +1332,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1412,7 +1356,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1436,7 +1379,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1461,7 +1403,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1486,7 +1427,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1510,7 +1450,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1535,7 +1474,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1560,7 +1498,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1584,7 +1521,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1609,7 +1545,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1634,7 +1569,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1658,7 +1592,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1683,7 +1616,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1708,7 +1640,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1732,7 +1663,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1757,7 +1687,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1782,7 +1711,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1806,7 +1734,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1831,7 +1758,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1856,7 +1782,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1880,7 +1805,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1905,7 +1829,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1930,7 +1853,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1954,7 +1876,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1979,7 +1900,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2004,7 +1924,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2028,7 +1947,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2052,7 +1970,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2077,7 +1994,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2102,7 +2018,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2126,7 +2041,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2151,7 +2065,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2176,7 +2089,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2200,7 +2112,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2225,7 +2136,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2250,7 +2160,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2274,7 +2183,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2299,7 +2207,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2324,7 +2231,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2348,7 +2254,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2372,7 +2277,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2397,7 +2301,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2422,7 +2325,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2446,7 +2348,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2471,7 +2372,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2496,7 +2396,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -2519,7 +2418,6 @@ buckets: <
         name: "dart/flutter_engine"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -2543,7 +2441,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -2566,7 +2463,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2590,7 +2486,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2615,7 +2510,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2640,7 +2534,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2664,7 +2557,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2689,7 +2581,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2714,7 +2605,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2738,7 +2628,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2763,7 +2652,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2788,7 +2676,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -2811,7 +2698,6 @@ buckets: <
         name: "dart/gclient"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -2834,7 +2720,6 @@ buckets: <
         name: "dart/gclient"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -2858,7 +2743,6 @@ buckets: <
         name: "dart/gclient"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -2882,7 +2766,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2906,7 +2789,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2930,7 +2812,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2955,7 +2836,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2980,7 +2860,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3004,7 +2883,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3029,7 +2907,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3054,7 +2931,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3078,7 +2954,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3103,7 +2978,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3128,7 +3002,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3152,7 +3025,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3177,7 +3049,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3202,7 +3073,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3226,7 +3096,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3251,7 +3120,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3276,7 +3144,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3300,7 +3167,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3324,7 +3190,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3349,7 +3214,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3374,7 +3238,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3399,7 +3262,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3424,7 +3286,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3448,7 +3309,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3473,7 +3333,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3498,7 +3357,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3522,7 +3380,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3547,7 +3404,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3572,7 +3428,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3596,7 +3451,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3621,7 +3475,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3646,7 +3499,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3670,7 +3522,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3695,7 +3546,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3720,7 +3570,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3744,7 +3593,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3769,7 +3617,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3794,7 +3641,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3818,7 +3664,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3843,7 +3688,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3868,7 +3712,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3892,7 +3735,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3917,7 +3759,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3942,7 +3783,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3966,7 +3806,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3991,7 +3830,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4016,7 +3854,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4040,7 +3877,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4065,7 +3901,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4090,7 +3925,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4114,7 +3948,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4139,7 +3972,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4164,7 +3996,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4188,7 +4019,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4213,7 +4043,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4238,7 +4067,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4262,7 +4090,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4287,7 +4114,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4312,7 +4138,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4336,7 +4161,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4361,7 +4185,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4386,7 +4209,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4410,7 +4232,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4435,7 +4256,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4460,7 +4280,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4484,7 +4303,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4509,7 +4327,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4534,7 +4351,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4558,7 +4374,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4583,7 +4398,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4608,7 +4422,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4632,7 +4445,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4657,7 +4469,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4682,7 +4493,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4706,7 +4516,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4731,7 +4540,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4756,7 +4564,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4780,7 +4587,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4805,7 +4611,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4830,7 +4635,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4854,7 +4658,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4879,7 +4682,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4904,7 +4706,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
@@ -4929,7 +4730,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4955,7 +4755,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4981,7 +4780,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
@@ -5006,7 +4804,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5032,7 +4829,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5058,7 +4854,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5082,7 +4877,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5107,7 +4901,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5132,7 +4925,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5156,7 +4948,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5181,7 +4972,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5206,7 +4996,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5230,7 +5019,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5255,7 +5043,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5280,7 +5067,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
@@ -5305,7 +5091,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5331,7 +5116,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5357,7 +5141,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5381,7 +5164,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5406,7 +5188,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5431,7 +5212,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5455,7 +5235,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5480,7 +5259,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5505,7 +5283,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5529,7 +5306,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5554,7 +5330,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5579,7 +5354,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5603,7 +5377,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5628,7 +5401,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5653,7 +5425,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5677,7 +5448,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5702,7 +5472,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5727,7 +5496,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5751,7 +5519,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5776,7 +5543,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5801,7 +5567,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5825,7 +5590,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5850,7 +5614,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5875,7 +5638,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5899,7 +5661,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5924,7 +5685,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5949,7 +5709,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5973,7 +5732,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5998,7 +5756,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6023,7 +5780,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6047,7 +5803,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6072,7 +5827,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6097,7 +5851,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6121,7 +5874,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6146,7 +5898,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6171,7 +5922,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6195,7 +5945,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6220,7 +5969,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6245,7 +5993,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6269,7 +6016,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6294,7 +6040,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6319,7 +6064,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6343,7 +6087,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6368,7 +6111,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6393,7 +6135,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6417,7 +6158,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6442,7 +6182,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6467,7 +6206,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6491,7 +6229,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6516,7 +6253,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6541,7 +6277,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6565,7 +6300,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6590,7 +6324,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6615,7 +6348,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6639,7 +6371,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6664,7 +6395,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6709,7 +6439,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6733,7 +6462,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6757,7 +6485,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6781,7 +6508,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6805,7 +6531,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6829,7 +6554,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6853,7 +6577,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6877,7 +6600,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6901,7 +6623,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -6924,7 +6645,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -6947,7 +6667,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -6970,7 +6689,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -6993,7 +6711,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -7016,7 +6733,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -7039,7 +6755,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -7062,7 +6777,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7086,7 +6800,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7110,7 +6823,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7134,7 +6846,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7158,7 +6869,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7182,7 +6892,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7206,7 +6915,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7230,7 +6938,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7254,7 +6961,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7278,7 +6984,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7302,7 +7007,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7326,7 +7030,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7350,7 +7053,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7374,7 +7076,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7398,7 +7099,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7422,7 +7122,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7446,7 +7145,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -7469,7 +7167,6 @@ buckets: <
         name: "dart/flutter_engine"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -7493,7 +7190,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -7516,7 +7212,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7540,7 +7235,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7564,7 +7258,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7588,7 +7281,6 @@ buckets: <
         name: "dart/gclient"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -7611,7 +7303,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7635,7 +7326,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7659,7 +7349,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7683,7 +7372,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7707,7 +7395,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7731,7 +7418,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7755,7 +7441,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7779,7 +7464,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7803,7 +7487,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7827,7 +7510,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7851,7 +7533,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7875,7 +7556,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7899,7 +7579,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7923,7 +7602,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7947,7 +7625,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7971,7 +7648,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7995,7 +7671,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8019,7 +7694,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8043,7 +7717,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8067,7 +7740,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8091,7 +7763,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8115,7 +7786,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8139,7 +7809,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8163,7 +7832,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8187,7 +7855,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8211,7 +7878,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8235,7 +7901,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8259,7 +7924,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8283,7 +7947,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
@@ -8308,7 +7971,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
@@ -8333,7 +7995,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8357,7 +8018,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8381,7 +8041,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8405,7 +8064,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
@@ -8430,7 +8088,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8454,7 +8111,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8478,7 +8134,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8502,7 +8157,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8526,7 +8180,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8550,7 +8203,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8574,7 +8226,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8598,7 +8249,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8622,7 +8272,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8646,7 +8295,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8670,7 +8318,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8694,7 +8341,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8718,7 +8364,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8742,7 +8387,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8766,7 +8410,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8790,7 +8433,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8814,7 +8456,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8838,7 +8479,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"9c40b\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
diff --git a/main.star b/main.star
index 8675efcef7d8..2b9ec2b712f2 100755
--- a/main.star
+++ b/main.star
@@ -300,7 +300,6 @@ def dart_try_builder(name,
     dimensions.setdefault("host_class", "default")
     dimensions.setdefault("cpu", "x86-64")
     properties.setdefault("clobber", "true")
-    properties.setdefault("$depot_tools/osx_sdk", {"sdk_version": "9c40b"})
     builder = name + "-try"
 
     luci.builder(
@@ -358,7 +357,6 @@ def dart_builder(name,
     dimensions.setdefault("pool", "luci.dart.try")
     dimensions["cpu"] = cpu
     properties.setdefault("clobber", "true")
-    properties.setdefault("$depot_tools/osx_sdk", {"sdk_version": "9c40b"})
 
     def builder(channel=None, triggered_by=None):
         if channel == "try":

From ece4bc63468e8a012c9853caf986a7201e612517 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 17 Dec 2019 11:18:27 +0000
Subject: [PATCH 323/826] [infra] Update Luci config to move simarm_64 builder
 from macOS to Linux

See also: https://dart-review.googlesource.com/c/sdk/+/128580/

Change-Id: Ie0706705d271bb09acba4dda228b6e65e143edc4
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/128581
Reviewed-by: Samir Jindel <sjindel@google.com>
---
 commit-queue.cfg   |  6 +++---
 cr-buildbucket.cfg | 32 ++++++++++++++++----------------
 luci-milo.cfg      | 10 +++++-----
 luci-notify.cfg    |  6 +++---
 luci-scheduler.cfg | 42 +++++++++++++++++++++---------------------
 main.star          |  5 ++---
 6 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 124e1cf9100e..b1f9d93bacf1 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -381,15 +381,15 @@ config_groups: <
         includable_only: true
       >
       builders: <
-        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm_x64-try"
         includable_only: true
       >
       builders: <
-        name: "dart/try/vm-kernel-precomp-mac-release-simarm64-try"
+        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
         includable_only: true
       >
       builders: <
-        name: "dart/try/vm-kernel-precomp-mac-release-simarm_x64-try"
+        name: "dart/try/vm-kernel-precomp-mac-release-simarm64-try"
         includable_only: true
       >
       builders: <
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 6870eb718a52..bb7ee70fbb2b 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -5414,7 +5414,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-x64"
+      name: "vm-kernel-precomp-linux-release-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5437,7 +5437,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-x64-dev"
+      name: "vm-kernel-precomp-linux-release-simarm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5461,7 +5461,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-x64-stable"
+      name: "vm-kernel-precomp-linux-release-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5485,12 +5485,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-mac-release-simarm64"
+      name: "vm-kernel-precomp-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5508,12 +5508,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-mac-release-simarm64-dev"
+      name: "vm-kernel-precomp-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5532,12 +5532,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-mac-release-simarm64-stable"
+      name: "vm-kernel-precomp-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5556,7 +5556,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-mac-release-simarm_x64"
+      name: "vm-kernel-precomp-mac-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5579,7 +5579,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-mac-release-simarm_x64-dev"
+      name: "vm-kernel-precomp-mac-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5603,7 +5603,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-mac-release-simarm_x64-stable"
+      name: "vm-kernel-precomp-mac-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8169,7 +8169,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-x64-try"
+      name: "vm-kernel-precomp-linux-release-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8192,12 +8192,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-mac-release-simarm64-try"
+      name: "vm-kernel-precomp-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -8215,7 +8215,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-mac-release-simarm_x64-try"
+      name: "vm-kernel-precomp-mac-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 3647ba7ade7f..29519b5a7b7b 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -258,7 +258,7 @@ consoles: <
     short_name: "adx"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm_x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64"
     category: "vm|kernel-precomp"
     short_name: "arx"
   >
@@ -915,7 +915,7 @@ consoles: <
     short_name: "adx"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm_x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64"
     category: "vm|kernel-precomp"
     short_name: "arx"
   >
@@ -1232,7 +1232,7 @@ consoles: <
     short_name: "adx"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm_x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-dev"
     category: "vm|kernel-precomp"
     short_name: "arx"
   >
@@ -1694,7 +1694,7 @@ consoles: <
     short_name: "adx"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm_x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-stable"
     category: "vm|kernel-precomp"
     short_name: "arx"
   >
@@ -2129,7 +2129,7 @@ consoles: <
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-simarm_x64-try"
   >
   builders: <
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-mac-release-simarm_x64-try"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm_x64-try"
   >
   builders: <
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-mac-release-simarm64-try"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 64c38f34e834..dc732821b649 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -1092,7 +1092,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-release-x64"
+    name: "vm-kernel-precomp-linux-release-simarm_x64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -1106,7 +1106,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-mac-release-simarm64"
+    name: "vm-kernel-precomp-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
@@ -1120,7 +1120,7 @@ notifiers: <
   >
   builders: <
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-mac-release-simarm_x64"
+    name: "vm-kernel-precomp-mac-release-simarm64"
     repository: "https://dart.googlesource.com/sdk"
   >
 >
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 26c99721f82b..bb5d30fea1f4 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -2239,93 +2239,93 @@ job: <
   >
 >
 job: <
-  id: "vm-kernel-precomp-linux-release-x64"
+  id: "vm-kernel-precomp-linux-release-simarm_x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-x64"
+    builder: "vm-kernel-precomp-linux-release-simarm_x64"
   >
 >
 job: <
-  id: "vm-kernel-precomp-linux-release-x64-dev"
+  id: "vm-kernel-precomp-linux-release-simarm_x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-x64-dev"
+    builder: "vm-kernel-precomp-linux-release-simarm_x64-dev"
   >
 >
 job: <
-  id: "vm-kernel-precomp-linux-release-x64-stable"
+  id: "vm-kernel-precomp-linux-release-simarm_x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-x64-stable"
+    builder: "vm-kernel-precomp-linux-release-simarm_x64-stable"
   >
 >
 job: <
-  id: "vm-kernel-precomp-mac-release-simarm64"
+  id: "vm-kernel-precomp-linux-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-mac-release-simarm64"
+    builder: "vm-kernel-precomp-linux-release-x64"
   >
 >
 job: <
-  id: "vm-kernel-precomp-mac-release-simarm64-dev"
+  id: "vm-kernel-precomp-linux-release-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-mac-release-simarm64-dev"
+    builder: "vm-kernel-precomp-linux-release-x64-dev"
   >
 >
 job: <
-  id: "vm-kernel-precomp-mac-release-simarm64-stable"
+  id: "vm-kernel-precomp-linux-release-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-mac-release-simarm64-stable"
+    builder: "vm-kernel-precomp-linux-release-x64-stable"
   >
 >
 job: <
-  id: "vm-kernel-precomp-mac-release-simarm_x64"
+  id: "vm-kernel-precomp-mac-release-simarm64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-mac-release-simarm_x64"
+    builder: "vm-kernel-precomp-mac-release-simarm64"
   >
 >
 job: <
-  id: "vm-kernel-precomp-mac-release-simarm_x64-dev"
+  id: "vm-kernel-precomp-mac-release-simarm64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-mac-release-simarm_x64-dev"
+    builder: "vm-kernel-precomp-mac-release-simarm64-dev"
   >
 >
 job: <
-  id: "vm-kernel-precomp-mac-release-simarm_x64-stable"
+  id: "vm-kernel-precomp-mac-release-simarm64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-mac-release-simarm_x64-stable"
+    builder: "vm-kernel-precomp-mac-release-simarm64-stable"
   >
 >
 job: <
@@ -2762,9 +2762,9 @@ trigger: <
   triggers: "vm-kernel-precomp-linux-product-x64-dev"
   triggers: "vm-kernel-precomp-linux-release-simarm-dev"
   triggers: "vm-kernel-precomp-linux-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-linux-release-simarm_x64-dev"
   triggers: "vm-kernel-precomp-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-mac-release-simarm64-dev"
-  triggers: "vm-kernel-precomp-mac-release-simarm_x64-dev"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-win-release-x64-dev"
   triggers: "vm-kernel-reload-linux-debug-x64-dev"
@@ -2918,9 +2918,9 @@ trigger: <
   triggers: "vm-kernel-precomp-linux-product-x64-stable"
   triggers: "vm-kernel-precomp-linux-release-simarm-stable"
   triggers: "vm-kernel-precomp-linux-release-simarm64-stable"
+  triggers: "vm-kernel-precomp-linux-release-simarm_x64-stable"
   triggers: "vm-kernel-precomp-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-mac-release-simarm64-stable"
-  triggers: "vm-kernel-precomp-mac-release-simarm_x64-stable"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-win-release-x64-stable"
   triggers: "vm-kernel-reload-linux-debug-x64-stable"
@@ -2971,9 +2971,9 @@ trigger: <
   triggers: "vm-kernel-precomp-linux-product-x64"
   triggers: "vm-kernel-precomp-linux-release-simarm"
   triggers: "vm-kernel-precomp-linux-release-simarm64"
+  triggers: "vm-kernel-precomp-linux-release-simarm_x64"
   triggers: "vm-kernel-precomp-linux-release-x64"
   triggers: "vm-kernel-precomp-mac-release-simarm64"
-  triggers: "vm-kernel-precomp-mac-release-simarm_x64"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64"
   triggers: "vm-kernel-precomp-win-release-x64"
   triggers: "vm-kernel-reload-linux-debug-x64"
diff --git a/main.star b/main.star
index 2b9ec2b712f2..e7f6fc615ae7 100755
--- a/main.star
+++ b/main.star
@@ -578,9 +578,8 @@ dart_vm_extra_builder(
     category="vm|kernel-precomp|adx",
     properties={"shard_timeout": 5400})  # 1.5h
 dart_vm_extra_builder(
-    "vm-kernel-precomp-mac-release-simarm_x64",
-    category="vm|kernel-precomp|arx",
-    dimensions=mac())
+    "vm-kernel-precomp-linux-release-simarm_x64",
+    category="vm|kernel-precomp|arx")
 dart_vm_extra_builder(
     "vm-kernel-precomp-mac-release-simarm64",
     category="vm|kernel-precomp|ma",

From a8e59a484c0c45961a311bfe3a2c08533b29aea8 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 18 Dec 2019 08:08:54 +0000
Subject: [PATCH 324/826] [infra] Add DDC NNBD builder to the CQ

Change-Id: I9ca32ee3cba1e3a27d7b1d7c4be3f6b346520206
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/128726
Reviewed-by: Nicholas Shahan <nshahan@google.com>
---
 commit-queue.cfg | 14 ++++++++++++--
 main.star        |  8 ++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index b1f9d93bacf1..183004e5160d 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -178,7 +178,7 @@ config_groups: <
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(analyzer|build_integration|dev_compiler|front_end|kernel|meta|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/(build_integration|dev_compiler|front_end|kernel|meta|_fe_analyzer_shared)/.+"
         location_regexp: ".+/[+]/utils/dartdevc/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing|testing)/.+"
       >
@@ -188,7 +188,17 @@ config_groups: <
       >
       builders: <
         name: "dart/try/ddc-nnbd-linux-release-chrome-try"
-        includable_only: true
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
+        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(build_integration|dev_compiler|front_end|kernel|meta|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/utils/dartdevc/.+"
+        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing|testing)/.+"
       >
       builders: <
         name: "dart/try/ddc-win-release-chrome-try"
diff --git a/main.star b/main.star
index e7f6fc615ae7..b7d3e81462da 100755
--- a/main.star
+++ b/main.star
@@ -50,7 +50,7 @@ DART2JS_PATHS = STANDARD_PATHS + [
 
 DDC_PATHS = STANDARD_PATHS + [
     # compiler sources
-    "pkg/(analyzer|build_integration|dev_compiler|front_end|kernel|meta|_fe_analyzer_shared)/.+",
+    "pkg/(build_integration|dev_compiler|front_end|kernel|meta|_fe_analyzer_shared)/.+",
     "utils/dartdevc/.+",
     # testing
     "pkg/(js|modular_test|sourcemap_testing|testing)/.+",
@@ -752,7 +752,11 @@ dart_ci_sandbox_builder(
     location_regexp=to_location_regexp(DDC_PATHS),
     on_cq=True)
 dart_ci_sandbox_builder(
-    "ddc-nnbd-linux-release-chrome", category="ddc|nn", channels=["try"])
+    "ddc-nnbd-linux-release-chrome",
+    category="ddc|nn",
+    channels=["try"],
+    location_regexp=to_location_regexp(DDC_PATHS),
+    on_cq=True)
 dart_ci_sandbox_builder(
     "ddc-mac-release-chrome", category="ddc|m", dimensions=mac())
 dart_ci_sandbox_builder(

From 9eab76c67253adaded3dec2e5898ea4eb39203b3 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 18 Dec 2019 09:31:44 +0000
Subject: [PATCH 325/826] [infra] Add VM NNBD builders to the Luci config

See also: https://dart-review.googlesource.com/c/sdk/+/128724/

Change-Id: I9eeb18cae2473d38a4dff9579a395e09b047fa2c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/128725
Reviewed-by: Siva Annamalai <asiva@google.com>
---
 commit-queue.cfg   |   8 ++
 cr-buildbucket.cfg | 188 +++++++++++++++++++++++++++++++++++++++++++++
 luci-milo.cfg      |  46 +++++++++++
 luci-notify.cfg    |  28 +++++++
 luci-scheduler.cfg |  66 ++++++++++++++++
 main.star          |   6 ++
 6 files changed, 342 insertions(+)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 183004e5160d..faabd98e6104 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -342,6 +342,14 @@ config_groups: <
         name: "dart/try/vm-kernel-mac-release-x64-try"
         experiment_percentage: 5
       >
+      builders: <
+        name: "dart/try/vm-kernel-nnbd-linux-debug-x64-try"
+        includable_only: true
+      >
+      builders: <
+        name: "dart/try/vm-kernel-nnbd-linux-release-x64-try"
+        includable_only: true
+      >
       builders: <
         name: "dart/try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
         includable_only: true
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index bb7ee70fbb2b..82f1bc66c273 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -4552,6 +4552,148 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-kernel-nnbd-linux-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-nnbd-linux-debug-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-nnbd-linux-debug-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-nnbd-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-nnbd-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-nnbd-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-optcounter-threshold-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
@@ -7889,6 +8031,52 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-kernel-nnbd-linux-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-nnbd-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-optcounter-threshold-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 29519b5a7b7b..5a42209c7672 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -102,6 +102,16 @@ consoles: <
     category: "flutter"
     short_name: "3H"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
+    category: "vm|nnbd"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64"
+    category: "vm|nnbd"
+    short_name: "r"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
     category: "vm|app-kernel"
@@ -759,6 +769,16 @@ consoles: <
     category: "misc"
     short_name: "vc"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
+    category: "vm|nnbd"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64"
+    category: "vm|nnbd"
+    short_name: "r"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
     category: "vm|app-kernel"
@@ -1076,6 +1096,16 @@ consoles: <
     category: "fasta"
     short_name: "w"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-dev"
+    category: "vm|nnbd"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-dev"
+    category: "vm|nnbd"
+    short_name: "r"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-dev"
     category: "vm|app-kernel"
@@ -1538,6 +1568,16 @@ consoles: <
     category: "fasta"
     short_name: "w"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-stable"
+    category: "vm|nnbd"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-stable"
+    category: "vm|nnbd"
+    short_name: "r"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-stable"
     category: "vm|app-kernel"
@@ -2038,6 +2078,12 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.try/flutter-engine-linux-try"
   >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-x64-try"
+  >
   builders: <
     name: "buildbucket/luci.dart.try/app-kernel-linux-debug-x64-try"
   >
diff --git a/luci-notify.cfg b/luci-notify.cfg
index dc732821b649..6c7a4915c4b6 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -914,6 +914,34 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <>
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-linux-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <>
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index bb5d30fea1f4..12bb1fbbad62 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1878,6 +1878,66 @@ job: <
     builder: "vm-kernel-mac-release-x64-stable"
   >
 >
+job: <
+  id: "vm-kernel-nnbd-linux-debug-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-linux-debug-x64"
+  >
+>
+job: <
+  id: "vm-kernel-nnbd-linux-debug-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-linux-debug-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-nnbd-linux-debug-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-linux-debug-x64-stable"
+  >
+>
+job: <
+  id: "vm-kernel-nnbd-linux-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-nnbd-linux-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-nnbd-linux-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-linux-release-x64-stable"
+  >
+>
 job: <
   id: "vm-kernel-optcounter-threshold-linux-release-ia32"
   schedule: "triggered"
@@ -2750,6 +2810,8 @@ trigger: <
   triggers: "vm-kernel-mac-debug-x64-dev"
   triggers: "vm-kernel-mac-product-x64-dev"
   triggers: "vm-kernel-mac-release-x64-dev"
+  triggers: "vm-kernel-nnbd-linux-debug-x64-dev"
+  triggers: "vm-kernel-nnbd-linux-release-x64-dev"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-android-release-arm64-dev"
@@ -2906,6 +2968,8 @@ trigger: <
   triggers: "vm-kernel-mac-debug-x64-stable"
   triggers: "vm-kernel-mac-product-x64-stable"
   triggers: "vm-kernel-mac-release-x64-stable"
+  triggers: "vm-kernel-nnbd-linux-debug-x64-stable"
+  triggers: "vm-kernel-nnbd-linux-release-x64-stable"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-android-release-arm64-stable"
@@ -2959,6 +3023,8 @@ trigger: <
   triggers: "vm-kernel-linux-release-ia32"
   triggers: "vm-kernel-linux-release-simarm"
   triggers: "vm-kernel-linux-release-simarm64"
+  triggers: "vm-kernel-nnbd-linux-debug-x64"
+  triggers: "vm-kernel-nnbd-linux-release-x64"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
   triggers: "vm-kernel-precomp-android-release-arm64"
diff --git a/main.star b/main.star
index b7d3e81462da..d871acbfe37e 100755
--- a/main.star
+++ b/main.star
@@ -498,6 +498,12 @@ dart_ci_sandbox_builder(
     triggered_by=["dart-gitiles-trigger-flutter"],
 )
 
+# vm|nnbd
+dart_vm_extra_builder(
+    "vm-kernel-nnbd-linux-debug-x64", category="vm|nnbd|d")
+dart_vm_extra_builder(
+    "vm-kernel-nnbd-linux-release-x64", category="vm|nnbd|r")
+
 # vm|app-kernel
 dart_vm_extra_builder(
     "app-kernel-linux-debug-x64", category="vm|app-kernel|d64")

From 5e6e5b7f5732957da8ea1a2069b2730b7fd6ba46 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Wed, 8 Jan 2020 09:25:22 +0000
Subject: [PATCH 326/826] [infra] Link to dart-ci in luci-notify emails.

Closes dart-lang/dart_ci#52.

Change-Id: Ib51b35102b712392ba640fc423034ee98a8bf6c4
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/128549
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-notify/email-templates/default.template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/luci-notify/email-templates/default.template b/luci-notify/email-templates/default.template
index b1da9f4c96cf..92a9feaec73c 100644
--- a/luci-notify/email-templates/default.template
+++ b/luci-notify/email-templates/default.template
@@ -3,6 +3,15 @@ Dart build {{ .Build.Status }} on {{ .Build.Builder.Builder }}
 {{ template "summary" .Build }}
 {{/* If the build is a failure, show failed steps. */}}
 {{ if ne .Build.Status 12 -}}
+<ul>
+<li>
+<a href="https://dart-ci.firebaseapp.com/#{{- .Build.Input.GitilesCommit.Id -}">Test results</a>.
+</li>
+</ul>
+See the documentation at
+<a href="https://goto.google.com/dart-status-file-free-workflow">
+go/dart-status-file-free-workflow</a>.
+<br />
 <br />
 Failed Steps:
 <ul>
@@ -17,9 +26,5 @@ Failed Steps:
 {{ end -}}
 {{ end -}}
 </ul>
-See the documentation at
-<a href="https://goto.google.com/dart-status-file-free-workflow">
-go/dart-status-file-free-workflow</a>.
-<br />
 Completed at: {{ .Build.EndTime | time }}
 {{ end -}}

From f4d2fc5cd7b660b2b80097f340f9258d70fc6555 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Wed, 8 Jan 2020 12:22:46 +0000
Subject: [PATCH 327/826] [infra] Add missing brace to luci email template.

Change-Id: I8c993d0f874d79e0c4cee354189bbf4b807a7123
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/130681
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-notify/email-templates/default.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/luci-notify/email-templates/default.template b/luci-notify/email-templates/default.template
index 92a9feaec73c..86bbbb38e8cd 100644
--- a/luci-notify/email-templates/default.template
+++ b/luci-notify/email-templates/default.template
@@ -5,7 +5,7 @@ Dart build {{ .Build.Status }} on {{ .Build.Builder.Builder }}
 {{ if ne .Build.Status 12 -}}
 <ul>
 <li>
-<a href="https://dart-ci.firebaseapp.com/#{{- .Build.Input.GitilesCommit.Id -}">Test results</a>.
+<a href="https://dart-ci.firebaseapp.com/#{{- .Build.Input.GitilesCommit.Id -}}">Test results</a>.
 </li>
 </ul>
 See the documentation at

From 667851c19d6c9848544c309f1b9df7e267053d44 Mon Sep 17 00:00:00 2001
From: Karl Klose <karlklose@google.com>
Date: Thu, 9 Jan 2020 09:47:20 +0000
Subject: [PATCH 328/826] [infra] Remove cl-*-try builders

Change-Id: I2dbf4391c7422ee5bb8c99eeaae17aa6ace42361
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/130840
Reviewed-by: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg   | 12 ---------
 cr-buildbucket.cfg | 66 ----------------------------------------------
 luci-milo.cfg      |  9 -------
 main.star          |  3 ---
 4 files changed, 90 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index faabd98e6104..436bec3ed795 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -61,18 +61,6 @@ config_groups: <
       builders: <
         name: "dart/try/benchmark-linux-try"
       >
-      builders: <
-        name: "dart/try/cl-linux-try"
-        includable_only: true
-      >
-      builders: <
-        name: "dart/try/cl-mac-try"
-        includable_only: true
-      >
-      builders: <
-        name: "dart/try/cl-win-try"
-        includable_only: true
-      >
       builders: <
         name: "dart/try/dart-sdk-linux-try"
         includable_only: true
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 82f1bc66c273..d6d1106f99d7 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -6775,72 +6775,6 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-    builders: <
-      name: "cl-linux-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "cl-mac-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "cl-win-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
       name: "dart-sdk-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 5a42209c7672..7af72b8e542c 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2327,15 +2327,6 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.try/gclient-try"
   >
-  builders: <
-    name: "buildbucket/luci.dart.try/cl-linux-try"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.try/cl-mac-try"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.try/cl-win-try"
-  >
   builders: <
     name: "buildbucket/luci.dart.try/benchmark-linux-try"
   >
diff --git a/main.star b/main.star
index d871acbfe37e..a4efce8b77e2 100755
--- a/main.star
+++ b/main.star
@@ -821,9 +821,6 @@ dart_ci_sandbox_builder(
     schedule="0 3,4 * * *")
 
 # Try only builders
-dart_try_builder("cl-linux")
-dart_try_builder("cl-mac", dimensions=mac())
-dart_try_builder("cl-win", dimensions=windows())
 dart_try_builder("benchmark-linux", on_cq=True)
 
 

From 58bed280db412a23bb27b243087a25275b41ae81 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 9 Jan 2020 13:08:22 +0000
Subject: [PATCH 329/826] [infra] Add cfe NNBD builder to the Luci config

This also renames the fasta category to cfe.

Change-Id: I0657f2fda37590ed548bd6e68eea78972996eda1
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/130860
Reviewed-by: Karl Klose <karlklose@google.com>
---
 commit-queue.cfg   |  4 ++
 cr-buildbucket.cfg | 94 ++++++++++++++++++++++++++++++++++++++++++++++
 luci-milo.cfg      | 51 ++++++++++++++++++-------
 luci-notify.cfg    | 14 +++++++
 luci-scheduler.cfg | 33 ++++++++++++++++
 main.star          | 10 +++--
 6 files changed, 188 insertions(+), 18 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 436bec3ed795..ad109002ea1c 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -223,6 +223,10 @@ config_groups: <
         name: "dart/try/front-end-mac-release-x64-try"
         includable_only: true
       >
+      builders: <
+        name: "dart/try/front-end-nnbd-linux-release-x64-try"
+        includable_only: true
+      >
       builders: <
         name: "dart/try/front-end-win-release-x64-try"
         includable_only: true
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index d6d1106f99d7..fe81e98b10e3 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -2593,6 +2593,77 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "front-end-nnbd-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-nnbd-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-nnbd-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "front-end-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -7322,6 +7393,29 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "front-end-nnbd-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "front-end-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 7af72b8e542c..6cb5e15d56e6 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -79,22 +79,27 @@ consoles: <
   manifest_name: "REVISION"
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
-    category: "fasta"
+    category: "cfe"
     short_name: "l"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
-    category: "fasta"
+    category: "cfe"
     short_name: "m"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
-    category: "fasta"
+    category: "cfe"
     short_name: "w"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64"
+    category: "cfe"
+    short_name: "nn"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
-    category: "fasta"
+    category: "cfe"
     short_name: "fl"
   >
   builders: <
@@ -581,22 +586,27 @@ consoles: <
   manifest_name: "REVISION"
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
-    category: "fasta"
+    category: "cfe"
     short_name: "l"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
-    category: "fasta"
+    category: "cfe"
     short_name: "m"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
-    category: "fasta"
+    category: "cfe"
     short_name: "w"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64"
+    category: "cfe"
+    short_name: "nn"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
-    category: "fasta"
+    category: "cfe"
     short_name: "fl"
   >
   builders: <
@@ -1083,19 +1093,24 @@ consoles: <
   manifest_name: "REVISION"
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-dev"
-    category: "fasta"
+    category: "cfe"
     short_name: "l"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-dev"
-    category: "fasta"
+    category: "cfe"
     short_name: "m"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-dev"
-    category: "fasta"
+    category: "cfe"
     short_name: "w"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-dev"
+    category: "cfe"
+    short_name: "nn"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-dev"
     category: "vm|nnbd"
@@ -1555,19 +1570,24 @@ consoles: <
   manifest_name: "REVISION"
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-stable"
-    category: "fasta"
+    category: "cfe"
     short_name: "l"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-stable"
-    category: "fasta"
+    category: "cfe"
     short_name: "m"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-stable"
-    category: "fasta"
+    category: "cfe"
     short_name: "w"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-stable"
+    category: "cfe"
+    short_name: "nn"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-stable"
     category: "vm|nnbd"
@@ -2072,6 +2092,9 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.try/front-end-win-release-x64-try"
   >
+  builders: <
+    name: "buildbucket/luci.dart.try/front-end-nnbd-linux-release-x64-try"
+  >
   builders: <
     name: "buildbucket/luci.dart.try/flutter-frontend-try"
   >
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 6c7a4915c4b6..0dc900d5159d 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -508,6 +508,20 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <>
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "front-end-nnbd-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 12bb1fbbad62..ce0738bcf446 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1004,6 +1004,36 @@ job: <
     builder: "front-end-mac-release-x64-stable"
   >
 >
+job: <
+  id: "front-end-nnbd-linux-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-nnbd-linux-release-x64"
+  >
+>
+job: <
+  id: "front-end-nnbd-linux-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-nnbd-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "front-end-nnbd-linux-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-nnbd-linux-release-x64-stable"
+  >
+>
 job: <
   id: "front-end-win-release-x64"
   schedule: "triggered"
@@ -2783,6 +2813,7 @@ trigger: <
   triggers: "ddk-linux-release-firefox-dev"
   triggers: "front-end-linux-release-x64-dev"
   triggers: "front-end-mac-release-x64-dev"
+  triggers: "front-end-nnbd-linux-release-x64-dev"
   triggers: "front-end-win-release-x64-dev"
   triggers: "gclient-dev"
   triggers: "pkg-linux-release-dev"
@@ -2886,6 +2917,7 @@ trigger: <
   triggers: "flutter-frontend"
   triggers: "front-end-linux-release-x64"
   triggers: "front-end-mac-release-x64"
+  triggers: "front-end-nnbd-linux-release-x64"
   triggers: "front-end-win-release-x64"
   triggers: "gclient"
   triggers: "pkg-linux-debug"
@@ -2941,6 +2973,7 @@ trigger: <
   triggers: "ddk-linux-release-firefox-stable"
   triggers: "front-end-linux-release-x64-stable"
   triggers: "front-end-mac-release-x64-stable"
+  triggers: "front-end-nnbd-linux-release-x64-stable"
   triggers: "front-end-win-release-x64-stable"
   triggers: "gclient-stable"
   triggers: "pkg-linux-release-stable"
diff --git a/main.star b/main.star
index a4efce8b77e2..615e8b591d28 100755
--- a/main.star
+++ b/main.star
@@ -475,14 +475,16 @@ def dart_vm_extra_builder(name, on_cq=False, location_regexp=None, **kwargs):
 
 # fasta
 dart_ci_sandbox_builder(
-    "front-end-linux-release-x64", category="fasta|l", on_cq=True)
+    "front-end-linux-release-x64", category="cfe|l", on_cq=True)
 dart_ci_sandbox_builder(
-    "front-end-mac-release-x64", category="fasta|m", dimensions=mac())
+    "front-end-mac-release-x64", category="cfe|m", dimensions=mac())
 dart_ci_sandbox_builder(
-    "front-end-win-release-x64", category="fasta|w", dimensions=windows())
+    "front-end-win-release-x64", category="cfe|w", dimensions=windows())
+dart_ci_sandbox_builder(
+    "front-end-nnbd-linux-release-x64", category="cfe|nn")
 dart_ci_sandbox_builder(
     "flutter-frontend",
-    category="fasta|fl",
+    category="cfe|fl",
     channels=["try"],
     properties={"new_workflow_enabled": False},
     notifies="frontend-team")

From 191308c410de374b5f141007ed5463d5a86376d9 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 13 Jan 2020 11:13:39 +0000
Subject: [PATCH 330/826] [infra] Add default values for isolated and swarming
 servers

These properties are needed for the isolated and swarming modules.

Change-Id: I6e1129cbfa25974e57514f22233b056e62d9b886
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/131072
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 738 +++++++++++++++++++++++++++++++++++++++++++++
 main.star          |  19 +-
 2 files changed, 751 insertions(+), 6 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index fe81e98b10e3..7118a896257a 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -34,6 +34,8 @@ buckets: <
         name: "dart/forward_branch"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -56,6 +58,8 @@ buckets: <
         name: "dart/chocolatey"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -78,6 +82,8 @@ buckets: <
         name: "dart/package_co19"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -100,6 +106,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -122,6 +130,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -145,6 +155,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -168,6 +180,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -190,6 +204,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -213,6 +229,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -236,6 +254,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -258,6 +278,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -281,6 +303,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -304,6 +328,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -326,6 +352,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -349,6 +377,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -372,6 +402,8 @@ buckets: <
         name: "dart/docker"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -394,6 +426,8 @@ buckets: <
         name: "dart/external"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -416,6 +450,8 @@ buckets: <
         name: "dart/linearize"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "repo:\"https://dart.googlesource.com/linear_sdk_flutter_engine.git\""
       >
@@ -439,6 +475,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -461,6 +499,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -484,6 +524,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -531,6 +573,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -554,6 +598,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -577,6 +623,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -601,6 +649,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -625,6 +675,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -648,6 +700,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -671,6 +725,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -695,6 +751,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -719,6 +777,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -742,6 +802,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -765,6 +827,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -789,6 +853,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -813,6 +879,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -836,6 +904,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -859,6 +929,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -883,6 +955,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -907,6 +981,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -930,6 +1006,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -953,6 +1031,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -977,6 +1057,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1001,6 +1083,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1024,6 +1108,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1048,6 +1134,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1072,6 +1160,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1095,6 +1185,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1119,6 +1211,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1143,6 +1237,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1166,6 +1262,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1190,6 +1288,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1214,6 +1314,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1237,6 +1339,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1261,6 +1365,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1285,6 +1391,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1308,6 +1416,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1332,6 +1442,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1356,6 +1468,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1379,6 +1493,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1403,6 +1519,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1427,6 +1545,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1450,6 +1570,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1474,6 +1596,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1498,6 +1622,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1521,6 +1647,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1545,6 +1673,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1569,6 +1699,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1592,6 +1724,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1616,6 +1750,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1640,6 +1776,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1663,6 +1801,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1687,6 +1827,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1711,6 +1853,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1734,6 +1878,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1758,6 +1904,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1782,6 +1930,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1805,6 +1955,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1829,6 +1981,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1853,6 +2007,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1876,6 +2032,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1900,6 +2058,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1924,6 +2084,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1947,6 +2109,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -1970,6 +2134,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -1994,6 +2160,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2018,6 +2186,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2041,6 +2211,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2065,6 +2237,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2089,6 +2263,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2112,6 +2288,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2136,6 +2314,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2160,6 +2340,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2183,6 +2365,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2207,6 +2391,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2231,6 +2417,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2254,6 +2442,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2277,6 +2467,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2301,6 +2493,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2325,6 +2519,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2348,6 +2544,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2372,6 +2570,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2396,6 +2596,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -2418,6 +2620,8 @@ buckets: <
         name: "dart/flutter_engine"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -2441,6 +2645,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -2463,6 +2669,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2486,6 +2694,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2510,6 +2720,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2534,6 +2746,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2557,6 +2771,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2581,6 +2797,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2605,6 +2823,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2628,6 +2848,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2652,6 +2874,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2676,6 +2900,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2699,6 +2925,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2723,6 +2951,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2747,6 +2977,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -2769,6 +3001,8 @@ buckets: <
         name: "dart/gclient"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 50
@@ -2791,6 +3025,8 @@ buckets: <
         name: "dart/gclient"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -2814,6 +3050,8 @@ buckets: <
         name: "dart/gclient"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "no_approvals:true"
       >
@@ -2837,6 +3075,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2860,6 +3100,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2883,6 +3125,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2907,6 +3151,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2931,6 +3177,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -2954,6 +3202,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -2978,6 +3228,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3002,6 +3254,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3025,6 +3279,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3049,6 +3305,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3073,6 +3331,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3096,6 +3356,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3120,6 +3382,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3144,6 +3408,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3167,6 +3433,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3191,6 +3459,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3215,6 +3485,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3238,6 +3510,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3261,6 +3535,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3285,6 +3561,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3309,6 +3587,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3333,6 +3613,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3357,6 +3639,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3380,6 +3664,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3404,6 +3690,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3428,6 +3716,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3451,6 +3741,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3475,6 +3767,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3499,6 +3793,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3522,6 +3818,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3546,6 +3844,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3570,6 +3870,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3593,6 +3895,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3617,6 +3921,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3641,6 +3947,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3664,6 +3972,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3688,6 +3998,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3712,6 +4024,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3735,6 +4049,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3759,6 +4075,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3783,6 +4101,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3806,6 +4126,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3830,6 +4152,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3854,6 +4178,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3877,6 +4203,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3901,6 +4229,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3925,6 +4255,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -3948,6 +4280,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3972,6 +4306,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -3996,6 +4332,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4019,6 +4357,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4043,6 +4383,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4067,6 +4409,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4090,6 +4434,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4114,6 +4460,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4138,6 +4486,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4161,6 +4511,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4185,6 +4537,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4209,6 +4563,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4232,6 +4588,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4256,6 +4614,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4280,6 +4640,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4303,6 +4665,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4327,6 +4691,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4351,6 +4717,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4374,6 +4742,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4398,6 +4768,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4422,6 +4794,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4445,6 +4819,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4469,6 +4845,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4493,6 +4871,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4516,6 +4896,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4540,6 +4922,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4564,6 +4948,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4587,6 +4973,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4611,6 +4999,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4635,6 +5025,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4658,6 +5050,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4682,6 +5076,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4706,6 +5102,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4729,6 +5127,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4753,6 +5153,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4777,6 +5179,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4800,6 +5204,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4824,6 +5230,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4848,6 +5256,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -4871,6 +5281,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4895,6 +5307,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4919,6 +5333,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
@@ -4943,6 +5359,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4968,6 +5386,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -4993,6 +5413,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
@@ -5017,6 +5439,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5042,6 +5466,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5067,6 +5493,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5090,6 +5518,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5114,6 +5544,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5138,6 +5570,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5161,6 +5595,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5185,6 +5621,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5209,6 +5647,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5232,6 +5672,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5256,6 +5698,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5280,6 +5724,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
@@ -5304,6 +5750,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5329,6 +5777,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5354,6 +5804,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5377,6 +5829,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5401,6 +5855,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5425,6 +5881,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5448,6 +5906,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5472,6 +5932,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5496,6 +5958,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5519,6 +5983,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5543,6 +6009,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5567,6 +6035,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5590,6 +6060,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5614,6 +6086,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5638,6 +6112,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5661,6 +6137,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5685,6 +6163,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5709,6 +6189,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5732,6 +6214,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5756,6 +6240,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5780,6 +6266,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5803,6 +6291,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5827,6 +6317,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5851,6 +6343,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5874,6 +6368,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5898,6 +6394,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5922,6 +6420,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -5945,6 +6445,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5969,6 +6471,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -5993,6 +6497,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6016,6 +6522,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6040,6 +6548,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6064,6 +6574,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6087,6 +6599,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6111,6 +6625,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6135,6 +6651,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6158,6 +6676,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6182,6 +6702,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6206,6 +6728,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6229,6 +6753,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6253,6 +6779,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6277,6 +6805,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6300,6 +6830,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6324,6 +6856,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6348,6 +6882,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6371,6 +6907,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6395,6 +6933,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6419,6 +6959,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6442,6 +6984,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6466,6 +7010,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6490,6 +7036,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6513,6 +7061,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6537,6 +7087,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6561,6 +7113,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6584,6 +7138,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6608,6 +7164,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "no_approvals:true"
@@ -6652,6 +7210,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6675,6 +7235,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6698,6 +7260,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6721,6 +7285,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6744,6 +7310,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6767,6 +7335,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6790,6 +7360,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6813,6 +7385,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6836,6 +7410,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -6858,6 +7434,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -6880,6 +7458,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -6902,6 +7482,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -6924,6 +7506,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6947,6 +7531,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6970,6 +7556,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -6993,6 +7581,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7016,6 +7606,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7039,6 +7631,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7062,6 +7656,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7085,6 +7681,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7108,6 +7706,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7131,6 +7731,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7154,6 +7756,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7177,6 +7781,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7200,6 +7806,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7223,6 +7831,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7246,6 +7856,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7269,6 +7881,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7292,6 +7906,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -7314,6 +7930,8 @@ buckets: <
         name: "dart/flutter_engine"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -7337,6 +7955,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -7359,6 +7979,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7382,6 +8004,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7405,6 +8029,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7428,6 +8054,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7451,6 +8079,8 @@ buckets: <
         name: "dart/gclient"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
       priority: 30
@@ -7473,6 +8103,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7496,6 +8128,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7519,6 +8153,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7542,6 +8178,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7565,6 +8203,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7588,6 +8228,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7611,6 +8253,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7634,6 +8278,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7657,6 +8303,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7680,6 +8328,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7703,6 +8353,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7726,6 +8378,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7749,6 +8403,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7772,6 +8428,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7795,6 +8453,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7818,6 +8478,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7841,6 +8503,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7864,6 +8528,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7887,6 +8553,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7910,6 +8578,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7933,6 +8603,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7956,6 +8628,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -7979,6 +8653,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8002,6 +8678,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8025,6 +8703,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8048,6 +8728,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8071,6 +8753,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8094,6 +8778,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8117,6 +8803,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8140,6 +8828,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8163,6 +8853,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
@@ -8187,6 +8879,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
@@ -8211,6 +8905,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8234,6 +8930,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8257,6 +8955,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8280,6 +8980,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
@@ -8304,6 +9006,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8327,6 +9031,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8350,6 +9056,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8373,6 +9081,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8396,6 +9106,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8419,6 +9131,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8442,6 +9156,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8465,6 +9181,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8488,6 +9206,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8511,6 +9231,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8534,6 +9256,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8557,6 +9281,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8580,6 +9306,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8603,6 +9331,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8626,6 +9356,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8649,6 +9381,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8672,6 +9406,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
@@ -8695,6 +9431,8 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
       >
diff --git a/main.star b/main.star
index 615e8b591d28..f7cf565572f8 100755
--- a/main.star
+++ b/main.star
@@ -331,6 +331,16 @@ def dart_try_builder(name,
 
 postponed_alt_console_entries = []
 
+# Global builder defaults
+luci.builder.defaults.properties.set({
+    '$recipe_engine/isolated': {
+        "server": "https://isolateserver.appspot.com"
+    },
+    '$recipe_engine/swarming': {
+        "server": "https://chromium-swarm.appspot.com"
+    },
+})
+
 
 def dart_builder(name,
                  bucket,
@@ -480,8 +490,7 @@ dart_ci_sandbox_builder(
     "front-end-mac-release-x64", category="cfe|m", dimensions=mac())
 dart_ci_sandbox_builder(
     "front-end-win-release-x64", category="cfe|w", dimensions=windows())
-dart_ci_sandbox_builder(
-    "front-end-nnbd-linux-release-x64", category="cfe|nn")
+dart_ci_sandbox_builder("front-end-nnbd-linux-release-x64", category="cfe|nn")
 dart_ci_sandbox_builder(
     "flutter-frontend",
     category="cfe|fl",
@@ -501,10 +510,8 @@ dart_ci_sandbox_builder(
 )
 
 # vm|nnbd
-dart_vm_extra_builder(
-    "vm-kernel-nnbd-linux-debug-x64", category="vm|nnbd|d")
-dart_vm_extra_builder(
-    "vm-kernel-nnbd-linux-release-x64", category="vm|nnbd|r")
+dart_vm_extra_builder("vm-kernel-nnbd-linux-debug-x64", category="vm|nnbd|d")
+dart_vm_extra_builder("vm-kernel-nnbd-linux-release-x64", category="vm|nnbd|r")
 
 # vm|app-kernel
 dart_vm_extra_builder(

From 540835840757c3c1b88d01bce2a344d6f78bea56 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 13 Jan 2020 13:47:54 +0000
Subject: [PATCH 331/826] [infra] Only render the test results link when there
 is a commit

Builds triggered in other ways (e.g. by a schedule) don't have an input
commit.

Also: convert <br> tags from XHTML to HTML.
Change-Id: I791112b72c96105d2fd28149e6192a3be0eaab95
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/131075
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 luci-notify/email-templates/default.template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/luci-notify/email-templates/default.template b/luci-notify/email-templates/default.template
index 86bbbb38e8cd..95915be91076 100644
--- a/luci-notify/email-templates/default.template
+++ b/luci-notify/email-templates/default.template
@@ -3,6 +3,7 @@ Dart build {{ .Build.Status }} on {{ .Build.Builder.Builder }}
 {{ template "summary" .Build }}
 {{/* If the build is a failure, show failed steps. */}}
 {{ if ne .Build.Status 12 -}}
+{{- if .Build.Input.GitilesCommit -}}
 <ul>
 <li>
 <a href="https://dart-ci.firebaseapp.com/#{{- .Build.Input.GitilesCommit.Id -}}">Test results</a>.
@@ -11,8 +12,9 @@ Dart build {{ .Build.Status }} on {{ .Build.Builder.Builder }}
 See the documentation at
 <a href="https://goto.google.com/dart-status-file-free-workflow">
 go/dart-status-file-free-workflow</a>.
-<br />
-<br />
+<br>
+<br>
+{{end -}}
 Failed Steps:
 <ul>
 {{ range $step := .Build.Steps -}}

From 06c627ea70090cda20708439c046eb67ae6479f5 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 16 Jan 2020 10:38:14 +0000
Subject: [PATCH 332/826] [infra] Add dart2js nnbd builder to the Luci config

Change-Id: I1bd0c432eda566828de6caf7d281e1e5cc960cb8
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/131828
Reviewed-by: William Hesse <whesse@google.com>
---
 commit-queue.cfg   |  14 +++++++
 cr-buildbucket.cfg | 102 +++++++++++++++++++++++++++++++++++++++++++++
 luci-milo.cfg      |  23 ++++++++++
 luci-notify.cfg    |  14 +++++++
 luci-scheduler.cfg |  33 +++++++++++++++
 main.star          |   5 +++
 6 files changed, 191 insertions(+)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index ad109002ea1c..46b7a248c357 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -90,6 +90,20 @@ config_groups: <
         location_regexp: ".+/[+]/utils/compiler/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
       >
+      builders: <
+        name: "dart/try/dart2js-nnbd-linux-x64-chrome-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
+        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|front_end|kernel|js_ast|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/utils/compiler/.+"
+        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
+      >
       builders: <
         name: "dart/try/dart2js-rti-linux-x64-d8-try"
         includable_only: true
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 7118a896257a..33bd51c5c5c8 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1533,6 +1533,83 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "dart2js-nnbd-linux-x64-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-nnbd-linux-x64-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-nnbd-linux-x64-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+        properties_j: "no_approvals:true"
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "dart2js-rti-linux-x64-d8"
       swarming_host: "chromium-swarm.appspot.com"
@@ -7544,6 +7621,31 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "dart2js-nnbd-linux-x64-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+        properties_j: "new_workflow_enabled:true"
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "dart2js-rti-linux-x64-d8-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 6cb5e15d56e6..eb885016a707 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -437,6 +437,11 @@ consoles: <
     category: "dart2js|chrome"
     short_name: "w"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "nn"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
     category: "dart2js|firefox"
@@ -674,6 +679,11 @@ consoles: <
     category: "dart2js|chrome"
     short_name: "w"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "nn"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
     category: "dart2js|firefox"
@@ -1436,6 +1446,11 @@ consoles: <
     category: "dart2js|chrome"
     short_name: "w"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-dev"
+    category: "dart2js|chrome"
+    short_name: "nn"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-dev"
     category: "dart2js|firefox"
@@ -1913,6 +1928,11 @@ consoles: <
     category: "dart2js|chrome"
     short_name: "w"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "nn"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-stable"
     category: "dart2js|firefox"
@@ -2296,6 +2316,9 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.try/dart2js-strong-win-x64-chrome-try"
   >
+  builders: <
+    name: "buildbucket/luci.dart.try/dart2js-nnbd-linux-x64-chrome-try"
+  >
   builders: <
     name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-firefox-try"
   >
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 0dc900d5159d..b5b923fa885c 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -257,6 +257,20 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <>
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "dart2js-nnbd-linux-x64-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index ce0738bcf446..08017fa35b5a 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -484,6 +484,36 @@ job: <
     builder: "dart2js-minified-strong-linux-x64-d8-stable"
   >
 >
+job: <
+  id: "dart2js-nnbd-linux-x64-chrome"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-nnbd-linux-x64-chrome"
+  >
+>
+job: <
+  id: "dart2js-nnbd-linux-x64-chrome-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-nnbd-linux-x64-chrome-dev"
+  >
+>
+job: <
+  id: "dart2js-nnbd-linux-x64-chrome-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-nnbd-linux-x64-chrome-stable"
+  >
+>
 job: <
   id: "dart2js-rti-linux-x64-d8"
   schedule: "triggered"
@@ -2798,6 +2828,7 @@ trigger: <
   triggers: "cross-vm-linux-release-arm64-dev"
   triggers: "dart2js-csp-minified-linux-x64-chrome-dev"
   triggers: "dart2js-minified-strong-linux-x64-d8-dev"
+  triggers: "dart2js-nnbd-linux-x64-chrome-dev"
   triggers: "dart2js-rti-linux-x64-d8-dev"
   triggers: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
   triggers: "dart2js-strong-linux-x64-chrome-dev"
@@ -2899,6 +2930,7 @@ trigger: <
   triggers: "analyzer-win-release"
   triggers: "dart2js-csp-minified-linux-x64-chrome"
   triggers: "dart2js-minified-strong-linux-x64-d8"
+  triggers: "dart2js-nnbd-linux-x64-chrome"
   triggers: "dart2js-rti-linux-x64-d8"
   triggers: "dart2js-strong-hostasserts-linux-ia32-d8"
   triggers: "dart2js-strong-linux-x64-chrome"
@@ -2958,6 +2990,7 @@ trigger: <
   triggers: "cross-vm-linux-release-arm64-stable"
   triggers: "dart2js-csp-minified-linux-x64-chrome-stable"
   triggers: "dart2js-minified-strong-linux-x64-d8-stable"
+  triggers: "dart2js-nnbd-linux-x64-chrome-stable"
   triggers: "dart2js-rti-linux-x64-d8-stable"
   triggers: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
   triggers: "dart2js-strong-linux-x64-chrome-stable"
diff --git a/main.star b/main.star
index f7cf565572f8..91d07dec0dc6 100755
--- a/main.star
+++ b/main.star
@@ -689,6 +689,11 @@ dart_ci_sandbox_builder(
     "dart2js-strong-win-x64-chrome",
     category="dart2js|chrome|w",
     dimensions=windows())
+dart_ci_sandbox_builder(
+    "dart2js-nnbd-linux-x64-chrome",
+    category="dart2js|chrome|nn",
+    location_regexp=to_location_regexp(DART2JS_PATHS),
+    on_cq=True)
 dart_ci_sandbox_builder(
     "dart2js-strong-linux-x64-firefox", category="dart2js|firefox|l")
 dart_ci_sandbox_builder(

From e925fc81e9107e9ddd8af40a57d930d487eec1a0 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 16 Jan 2020 13:29:36 +0000
Subject: [PATCH 333/826] [infra] Add CFE NNBD builder to the CQ
 (conditionally)

All other NNBD builders have already been added to the CQ in the same
way.

Change-Id: I541287069b1c4fbbbc21a727b8e19d1fad8af113
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/131834
Reviewed-by: William Hesse <whesse@google.com>
---
 commit-queue.cfg   | 35 +++++++++++++++++++++++++----------
 luci-scheduler.cfg |  3 ++-
 main.star          | 26 +++++++++++++++++---------
 3 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 46b7a248c357..4e8c733f4052 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -86,7 +86,8 @@ config_groups: <
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|front_end|kernel|js_ast|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
         location_regexp: ".+/[+]/utils/compiler/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
       >
@@ -100,7 +101,8 @@ config_groups: <
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|front_end|kernel|js_ast|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
         location_regexp: ".+/[+]/utils/compiler/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
       >
@@ -118,7 +120,8 @@ config_groups: <
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|front_end|kernel|js_ast|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
         location_regexp: ".+/[+]/utils/compiler/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
       >
@@ -132,7 +135,8 @@ config_groups: <
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|front_end|kernel|js_ast|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
         location_regexp: ".+/[+]/utils/compiler/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
       >
@@ -166,7 +170,8 @@ config_groups: <
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|front_end|kernel|js_ast|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
         location_regexp: ".+/[+]/utils/compiler/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
       >
@@ -180,9 +185,10 @@ config_groups: <
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(build_integration|dev_compiler|front_end|kernel|meta|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/(build_integration|dev_compiler|meta)/.+"
         location_regexp: ".+/[+]/utils/dartdevc/.+"
-        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing|testing)/.+"
+        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
       >
       builders: <
         name: "dart/try/ddc-mac-release-chrome-try"
@@ -198,9 +204,10 @@ config_groups: <
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(build_integration|dev_compiler|front_end|kernel|meta|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/(build_integration|dev_compiler|meta)/.+"
         location_regexp: ".+/[+]/utils/dartdevc/.+"
-        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing|testing)/.+"
+        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
       >
       builders: <
         name: "dart/try/ddc-win-release-chrome-try"
@@ -239,7 +246,15 @@ config_groups: <
       >
       builders: <
         name: "dart/try/front-end-nnbd-linux-release-x64-try"
-        includable_only: true
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
+        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
       >
       builders: <
         name: "dart/try/front-end-win-release-x64-try"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 08017fa35b5a..b7a9fd79ea9e 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -3125,7 +3125,8 @@ trigger: <
     path_regexps: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
     path_regexps: "tools/bots/test_matrix.json"
     path_regexps: "tests/.+"
-    path_regexps: "pkg/(front_end|kernel|vm|_fe_analyzer_shared)/.+"
+    path_regexps: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+    path_regexps: "pkg/vm/.+"
     path_regexps: "runtime/.+"
   >
 >
diff --git a/main.star b/main.star
index 91d07dec0dc6..7e9dda083939 100755
--- a/main.star
+++ b/main.star
@@ -34,26 +34,30 @@ STANDARD_PATHS = [
     "tests/.+",
 ]
 
-VM_PATHS = STANDARD_PATHS + [
+CFE_PATHS = STANDARD_PATHS + [
+    "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+",
+]
+
+VM_PATHS = CFE_PATHS + [
     # VM sources
-    "pkg/(front_end|kernel|vm|_fe_analyzer_shared)/.+",
+    "pkg/vm/.+",
     "runtime/.+",
 ]
 
-DART2JS_PATHS = STANDARD_PATHS + [
+DART2JS_PATHS = CFE_PATHS + [
     # compiler sources
-    "pkg/(compiler|dart2js_tools|front_end|kernel|js_ast|_fe_analyzer_shared)/.+",
+    "pkg/(compiler|dart2js_tools|js_ast)/.+",
     "utils/compiler/.+",
     # testing
     "pkg/(js|modular_test|sourcemap_testing)/.+",
 ]
 
-DDC_PATHS = STANDARD_PATHS + [
+DDC_PATHS = CFE_PATHS + [
     # compiler sources
-    "pkg/(build_integration|dev_compiler|front_end|kernel|meta|_fe_analyzer_shared)/.+",
+    "pkg/(build_integration|dev_compiler|meta)/.+",
     "utils/dartdevc/.+",
     # testing
-    "pkg/(js|modular_test|sourcemap_testing|testing)/.+",
+    "pkg/(js|modular_test|sourcemap_testing)/.+",
 ]
 
 
@@ -483,14 +487,18 @@ def dart_vm_extra_builder(name, on_cq=False, location_regexp=None, **kwargs):
         **kwargs)
 
 
-# fasta
+# cfe
 dart_ci_sandbox_builder(
     "front-end-linux-release-x64", category="cfe|l", on_cq=True)
 dart_ci_sandbox_builder(
     "front-end-mac-release-x64", category="cfe|m", dimensions=mac())
 dart_ci_sandbox_builder(
     "front-end-win-release-x64", category="cfe|w", dimensions=windows())
-dart_ci_sandbox_builder("front-end-nnbd-linux-release-x64", category="cfe|nn")
+dart_ci_sandbox_builder(
+    "front-end-nnbd-linux-release-x64",
+    category="cfe|nn",
+    location_regexp=to_location_regexp(CFE_PATHS),
+    on_cq=True)
 dart_ci_sandbox_builder(
     "flutter-frontend",
     category="cfe|fl",

From fb14f5b9416c20abaa33a1536f1ccd8bb08cef24 Mon Sep 17 00:00:00 2001
From: Karl Klose <karlklose@google.com>
Date: Mon, 27 Jan 2020 11:13:11 +0000
Subject: [PATCH 334/826] [infra] Remove no_approvals property

Change-Id: Ic26bb9d4dd8080cae99bcce80b4e8719cb5ad714
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/133223
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 174 ---------------------------------------------
 main.star          |   2 -
 2 files changed, 176 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 33bd51c5c5c8..11e4904965ae 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -133,7 +133,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -158,7 +157,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -207,7 +205,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -232,7 +229,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -281,7 +277,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -306,7 +301,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -355,7 +349,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -380,7 +373,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -502,7 +494,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -527,7 +518,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -627,7 +617,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -653,7 +642,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -729,7 +717,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -755,7 +742,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -831,7 +817,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -857,7 +842,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -933,7 +917,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -959,7 +942,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1035,7 +1017,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1061,7 +1042,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1112,7 +1092,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1138,7 +1117,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1189,7 +1167,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1215,7 +1192,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1266,7 +1242,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1292,7 +1267,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1343,7 +1317,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1369,7 +1342,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1420,7 +1392,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1446,7 +1417,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1497,7 +1467,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1523,7 +1492,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1651,7 +1619,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1677,7 +1644,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1728,7 +1694,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1754,7 +1719,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1805,7 +1769,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1831,7 +1794,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1882,7 +1844,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1908,7 +1869,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1959,7 +1919,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1985,7 +1944,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2036,7 +1994,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2062,7 +2019,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2113,7 +2069,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2139,7 +2094,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2215,7 +2169,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2241,7 +2194,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2292,7 +2244,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2318,7 +2269,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2369,7 +2319,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2395,7 +2344,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2446,7 +2394,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2472,7 +2419,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2548,7 +2494,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2574,7 +2519,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2625,7 +2569,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2651,7 +2594,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2775,7 +2717,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2801,7 +2742,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2852,7 +2792,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2878,7 +2817,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2929,7 +2867,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -2955,7 +2892,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3006,7 +2942,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3032,7 +2967,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3105,7 +3039,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3130,7 +3063,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3206,7 +3138,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3232,7 +3163,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3283,7 +3213,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3309,7 +3238,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3360,7 +3288,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3386,7 +3313,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3437,7 +3363,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3463,7 +3388,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3514,7 +3438,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3540,7 +3463,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3616,7 +3538,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3642,7 +3563,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3668,7 +3588,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3694,7 +3613,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3745,7 +3663,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3771,7 +3688,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3822,7 +3738,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3848,7 +3763,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3899,7 +3813,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3925,7 +3838,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -3976,7 +3888,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4002,7 +3913,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4053,7 +3963,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4079,7 +3988,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4130,7 +4038,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4156,7 +4063,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4207,7 +4113,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4233,7 +4138,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4284,7 +4188,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4310,7 +4213,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4361,7 +4263,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4387,7 +4288,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4438,7 +4338,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4464,7 +4363,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4515,7 +4413,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4541,7 +4438,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4592,7 +4488,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4618,7 +4513,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4669,7 +4563,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4695,7 +4588,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4746,7 +4638,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4772,7 +4663,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4823,7 +4713,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4849,7 +4738,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4900,7 +4788,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4926,7 +4813,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -4977,7 +4863,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5003,7 +4888,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5054,7 +4938,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5080,7 +4963,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5131,7 +5013,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5157,7 +5038,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5208,7 +5088,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5234,7 +5113,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5285,7 +5163,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5311,7 +5188,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5362,7 +5238,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5388,7 +5263,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5440,7 +5314,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
         properties_j: "shard_timeout:5400"
       >
       priority: 50
@@ -5467,7 +5340,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
         properties_j: "shard_timeout:5400"
       >
       priority: 50
@@ -5520,7 +5392,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
         properties_j: "shard_timeout:5400"
       >
       priority: 50
@@ -5547,7 +5418,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
         properties_j: "shard_timeout:5400"
       >
       priority: 50
@@ -5599,7 +5469,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5625,7 +5494,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5676,7 +5544,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5702,7 +5569,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5753,7 +5619,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5779,7 +5644,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5831,7 +5695,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
         properties_j: "shard_timeout:5400"
       >
       priority: 50
@@ -5858,7 +5721,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
         properties_j: "shard_timeout:5400"
       >
       priority: 50
@@ -5910,7 +5772,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5936,7 +5797,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -5987,7 +5847,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -6013,7 +5872,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -6064,7 +5922,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -6090,7 +5947,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -6141,7 +5997,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -6167,7 +6022,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -6218,7 +6072,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -6244,7 +6097,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -6295,7 +6147,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -6321,7 +6172,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -6372,7 +6222,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -6398,7 +6247,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -6449,7 +6297,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -6475,7 +6322,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -6526,7 +6372,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -6552,7 +6397,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -6603,7 +6447,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -6629,7 +6472,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -6680,7 +6522,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -6706,7 +6547,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -6757,7 +6597,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -6783,7 +6622,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -6834,7 +6672,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -6860,7 +6697,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -6911,7 +6747,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -6937,7 +6772,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -6988,7 +6822,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -7014,7 +6847,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -7065,7 +6897,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -7091,7 +6922,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -7142,7 +6972,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -7168,7 +6997,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -7219,7 +7047,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -7245,7 +7072,6 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
diff --git a/main.star b/main.star
index 7e9dda083939..f9637649d16f 100755
--- a/main.star
+++ b/main.star
@@ -387,8 +387,6 @@ def dart_builder(name,
             builder = name + "-" + channel if channel else name
             branch = channel if channel else "master"
             channel_properties = dict(properties)
-            if channel in ['dev', 'stable']:
-                channel_properties['no_approvals'] = True
             if enabled and schedule == "triggered":
                 if not triggered_by:
                     triggered_by = ["dart-gitiles-trigger-%s"]

From ab5419e93b7b76787b307180b306513199b66994 Mon Sep 17 00:00:00 2001
From: Karl Klose <karlklose@google.com>
Date: Thu, 30 Jan 2020 11:54:14 +0000
Subject: [PATCH 335/826] [infra] Remove 'new_workflow_enabled' property

Change-Id: Ic74209843df775f23d4eef3e1562aeaf3adbf6a6
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/133520
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 339 ---------------------------------------------
 main.star          |   8 --
 2 files changed, 347 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 11e4904965ae..10090691a2e5 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -566,7 +566,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -591,7 +590,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -616,7 +614,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -641,7 +638,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -666,7 +662,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -691,7 +686,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -716,7 +710,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -741,7 +734,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -766,7 +758,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -791,7 +782,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -816,7 +806,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -841,7 +830,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -866,7 +854,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -891,7 +878,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -916,7 +902,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -941,7 +926,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -966,7 +950,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -991,7 +974,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1016,7 +998,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1041,7 +1022,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1066,7 +1046,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1091,7 +1070,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1116,7 +1094,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1141,7 +1118,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1166,7 +1142,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1191,7 +1166,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1216,7 +1190,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1241,7 +1214,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1266,7 +1238,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1291,7 +1262,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1316,7 +1286,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1341,7 +1310,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1366,7 +1334,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1391,7 +1358,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1416,7 +1382,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1441,7 +1406,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1466,7 +1430,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1491,7 +1454,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1516,7 +1478,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1541,8 +1502,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1567,8 +1526,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
-        properties_j: "no_approvals:true"
       >
       priority: 50
       caches: <
@@ -1593,7 +1550,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1618,7 +1574,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1643,7 +1598,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1668,7 +1622,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1693,7 +1646,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1718,7 +1670,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1743,7 +1694,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1768,7 +1718,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1793,7 +1742,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1818,7 +1766,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1843,7 +1790,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1868,7 +1814,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1893,7 +1838,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1918,7 +1862,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1943,7 +1886,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1968,7 +1910,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -1993,7 +1934,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2018,7 +1958,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2043,7 +1982,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2068,7 +2006,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2093,7 +2030,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2118,7 +2054,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2143,7 +2078,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2168,7 +2102,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2193,7 +2126,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2218,7 +2150,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2243,7 +2174,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2268,7 +2198,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2293,7 +2222,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2318,7 +2246,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2343,7 +2270,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2368,7 +2294,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2393,7 +2318,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2418,7 +2342,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2443,7 +2366,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2468,7 +2390,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2493,7 +2414,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2518,7 +2438,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2543,7 +2462,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2568,7 +2486,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2593,7 +2510,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2691,7 +2607,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2716,7 +2631,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2741,7 +2655,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2766,7 +2679,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2791,7 +2703,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2816,7 +2727,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2841,7 +2751,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2866,7 +2775,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2891,7 +2799,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2916,7 +2823,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2941,7 +2847,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -2966,7 +2871,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3087,7 +2991,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3112,7 +3015,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3137,7 +3039,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3162,7 +3063,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3187,7 +3087,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3212,7 +3111,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3237,7 +3135,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3262,7 +3159,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3287,7 +3183,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3312,7 +3207,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3337,7 +3231,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3362,7 +3255,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3387,7 +3279,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3412,7 +3303,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3437,7 +3327,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3462,7 +3351,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3487,7 +3375,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3512,7 +3399,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3537,7 +3423,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3562,7 +3447,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3587,7 +3471,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3612,7 +3495,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3637,7 +3519,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3662,7 +3543,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3687,7 +3567,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3712,7 +3591,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3737,7 +3615,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3762,7 +3639,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3787,7 +3663,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3812,7 +3687,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3837,7 +3711,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3862,7 +3735,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3887,7 +3759,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3912,7 +3783,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3937,7 +3807,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3962,7 +3831,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -3987,7 +3855,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4012,7 +3879,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4037,7 +3903,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4062,7 +3927,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4087,7 +3951,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4112,7 +3975,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4137,7 +3999,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4162,7 +4023,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4187,7 +4047,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4212,7 +4071,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4237,7 +4095,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4262,7 +4119,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4287,7 +4143,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4312,7 +4167,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4337,7 +4191,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4362,7 +4215,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4387,7 +4239,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4412,7 +4263,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4437,7 +4287,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4462,7 +4311,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4487,7 +4335,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4512,7 +4359,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4537,7 +4383,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4562,7 +4407,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4587,7 +4431,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4612,7 +4455,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4637,7 +4479,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4662,7 +4503,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4687,7 +4527,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4712,7 +4551,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4737,7 +4575,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4762,7 +4599,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4787,7 +4623,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4812,7 +4647,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4837,7 +4671,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4862,7 +4695,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4887,7 +4719,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4912,7 +4743,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4937,7 +4767,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4962,7 +4791,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -4987,7 +4815,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5012,7 +4839,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5037,7 +4863,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5062,7 +4887,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5087,7 +4911,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5112,7 +4935,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5137,7 +4959,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5162,7 +4983,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5187,7 +5007,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5212,7 +5031,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5237,7 +5055,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5262,7 +5079,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5287,7 +5103,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
       >
       priority: 50
@@ -5313,7 +5128,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
       >
       priority: 50
@@ -5339,7 +5153,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
       >
       priority: 50
@@ -5365,7 +5178,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
       >
       priority: 50
@@ -5391,7 +5203,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
       >
       priority: 50
@@ -5417,7 +5228,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
       >
       priority: 50
@@ -5443,7 +5253,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5468,7 +5277,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5493,7 +5301,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5518,7 +5325,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5543,7 +5349,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5568,7 +5373,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5593,7 +5397,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5618,7 +5421,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5643,7 +5445,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5668,7 +5469,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
       >
       priority: 50
@@ -5694,7 +5494,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
       >
       priority: 50
@@ -5720,7 +5519,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
       >
       priority: 50
@@ -5746,7 +5544,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5771,7 +5568,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5796,7 +5592,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5821,7 +5616,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5846,7 +5640,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5871,7 +5664,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5896,7 +5688,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5921,7 +5712,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5946,7 +5736,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5971,7 +5760,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -5996,7 +5784,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6021,7 +5808,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6046,7 +5832,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6071,7 +5856,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6096,7 +5880,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6121,7 +5904,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6146,7 +5928,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6171,7 +5952,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6196,7 +5976,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6221,7 +6000,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6246,7 +6024,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6271,7 +6048,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6296,7 +6072,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6321,7 +6096,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6346,7 +6120,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6371,7 +6144,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6396,7 +6168,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6421,7 +6192,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6446,7 +6216,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6471,7 +6240,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6496,7 +6264,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6521,7 +6288,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6546,7 +6312,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6571,7 +6336,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6596,7 +6360,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6621,7 +6384,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6646,7 +6408,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6671,7 +6432,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6696,7 +6456,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6721,7 +6480,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6746,7 +6504,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6771,7 +6528,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6796,7 +6552,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6821,7 +6576,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6846,7 +6600,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6871,7 +6624,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6896,7 +6648,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6921,7 +6672,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6946,7 +6696,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6971,7 +6720,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -6996,7 +6744,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -7021,7 +6768,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -7046,7 +6792,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -7071,7 +6816,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 50
       caches: <
@@ -7116,7 +6860,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7141,7 +6884,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7166,7 +6908,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7191,7 +6932,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7216,7 +6956,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7241,7 +6980,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7266,7 +7004,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7291,7 +7028,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7412,7 +7148,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7437,7 +7172,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7462,7 +7196,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7487,7 +7220,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7512,7 +7244,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7537,7 +7268,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7562,7 +7292,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7587,7 +7316,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7612,7 +7340,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7637,7 +7364,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7662,7 +7388,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7687,7 +7412,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7712,7 +7436,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7737,7 +7460,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7762,7 +7484,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7787,7 +7508,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7812,7 +7532,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7910,7 +7629,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7935,7 +7653,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7960,7 +7677,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -7985,7 +7701,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8034,7 +7749,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8059,7 +7773,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8084,7 +7797,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8109,7 +7821,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8134,7 +7845,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8159,7 +7869,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8184,7 +7893,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8209,7 +7917,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8234,7 +7941,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8259,7 +7965,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8284,7 +7989,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8309,7 +8013,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8334,7 +8037,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8359,7 +8061,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8384,7 +8085,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8409,7 +8109,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8434,7 +8133,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8459,7 +8157,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8484,7 +8181,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8509,7 +8205,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8534,7 +8229,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8559,7 +8253,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8584,7 +8277,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8609,7 +8301,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8634,7 +8325,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8659,7 +8349,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8684,7 +8373,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8709,7 +8397,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8734,7 +8421,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8759,7 +8445,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8784,7 +8469,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
       >
       priority: 30
@@ -8810,7 +8494,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
       >
       priority: 30
@@ -8836,7 +8519,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8861,7 +8543,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8886,7 +8567,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8911,7 +8591,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
         properties_j: "shard_timeout:5400"
       >
       priority: 30
@@ -8937,7 +8616,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8962,7 +8640,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -8987,7 +8664,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -9012,7 +8688,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -9037,7 +8712,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -9062,7 +8736,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -9087,7 +8760,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -9112,7 +8784,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -9137,7 +8808,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -9162,7 +8832,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -9187,7 +8856,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -9212,7 +8880,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -9237,7 +8904,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -9262,7 +8928,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -9287,7 +8952,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -9312,7 +8976,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -9337,7 +9000,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
@@ -9362,7 +9024,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "new_workflow_enabled:true"
       >
       priority: 30
       caches: <
diff --git a/main.star b/main.star
index f9637649d16f..4bb5cd9d499b 100755
--- a/main.star
+++ b/main.star
@@ -461,9 +461,6 @@ def dart_ci_builder(name, dimensions={}, **kwargs):
 
 
 def dart_ci_sandbox_builder(name, channels=CHANNELS, properties={}, **kwargs):
-    if not properties.setdefault("new_workflow_enabled", True):
-        properties.pop("new_workflow_enabled")
-
     dart_builder(
         name,
         bucket="ci.sandbox",
@@ -501,7 +498,6 @@ dart_ci_sandbox_builder(
     "flutter-frontend",
     category="cfe|fl",
     channels=["try"],
-    properties={"new_workflow_enabled": False},
     notifies="frontend-team")
 
 # flutter
@@ -511,7 +507,6 @@ dart_ci_sandbox_builder(
     category="flutter|3H",
     channels=["try"],
     execution_timeout=time.duration(5 * 60 * 60 * 1000),
-    properties={"new_workflow_enabled": False},
     triggered_by=["dart-gitiles-trigger-flutter"],
 )
 
@@ -721,7 +716,6 @@ dart_ci_sandbox_builder(
     "flutter-analyze",
     category="analyzer|fa",
     channels=["try"],
-    properties={"new_workflow_enabled": False},
     notifies=None,
     on_cq=True,
     location_regexp=[
@@ -794,7 +788,6 @@ dart_ci_sandbox_builder(
     "gclient",
     recipe="gclient",
     category="misc|g",
-    properties={"new_workflow_enabled": False},
     on_cq=True)
 dart_ci_builder(
     "debianpackage-linux",
@@ -837,7 +830,6 @@ dart_ci_sandbox_builder(
     "fuzz-linux",
     channels=[],
     notifies="dart-fuzz-testing",
-    properties={"new_workflow_enabled": False},
     schedule="0 3,4 * * *")
 
 # Try only builders

From 374480b7eb56fb2f7bdf4a7f3676455adc25873f Mon Sep 17 00:00:00 2001
From: Karl Klose <karlklose@google.com>
Date: Fri, 7 Feb 2020 14:30:43 +0000
Subject: [PATCH 336/826] [infra] Remove dart2js-nnbd-linux-x64-chrome from CQ

It times out

Change-Id: Ie505d4eacbec98c4137f25d9bb95702799d41514
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/134821
Auto-Submit: Karl Klose <karlklose@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 main.star | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/main.star b/main.star
index 4bb5cd9d499b..4b029a41698f 100755
--- a/main.star
+++ b/main.star
@@ -693,8 +693,7 @@ dart_ci_sandbox_builder(
 dart_ci_sandbox_builder(
     "dart2js-nnbd-linux-x64-chrome",
     category="dart2js|chrome|nn",
-    location_regexp=to_location_regexp(DART2JS_PATHS),
-    on_cq=True)
+    location_regexp=to_location_regexp(DART2JS_PATHS))
 dart_ci_sandbox_builder(
     "dart2js-strong-linux-x64-firefox", category="dart2js|firefox|l")
 dart_ci_sandbox_builder(

From c897e58de951786024e3a36241f6eb43ba151483 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 12 Feb 2020 17:17:56 +0000
Subject: [PATCH 337/826] [infra] Add VM NNBD builders to the CQ

Change-Id: I55b0c93c46db2114c32383047f61738cb49c52dc
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/135460
Reviewed-by: William Hesse <whesse@google.com>
Reviewed-by: Siva Annamalai <asiva@google.com>
---
 commit-queue.cfg | 25 +++++++++++++++++++++++--
 main.star        | 11 +++++------
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 4e8c733f4052..13c17e62913e 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -11,6 +11,7 @@ submit_options: <
   >
 >
 config_groups: <
+  name: "sdk"
   gerrit: <
     url: "https://dart-review.googlesource.com"
     projects: <
@@ -365,11 +366,31 @@ config_groups: <
       >
       builders: <
         name: "dart/try/vm-kernel-nnbd-linux-debug-x64-try"
-        includable_only: true
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
+        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/vm/.+"
+        location_regexp: ".+/[+]/runtime/.+"
       >
       builders: <
         name: "dart/try/vm-kernel-nnbd-linux-release-x64-try"
-        includable_only: true
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
+        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/vm/.+"
+        location_regexp: ".+/[+]/runtime/.+"
       >
       builders: <
         name: "dart/try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
diff --git a/main.star b/main.star
index 4b029a41698f..533f533ee674 100755
--- a/main.star
+++ b/main.star
@@ -511,8 +511,10 @@ dart_ci_sandbox_builder(
 )
 
 # vm|nnbd
-dart_vm_extra_builder("vm-kernel-nnbd-linux-debug-x64", category="vm|nnbd|d")
-dart_vm_extra_builder("vm-kernel-nnbd-linux-release-x64", category="vm|nnbd|r")
+dart_vm_extra_builder(
+    "vm-kernel-nnbd-linux-debug-x64", category="vm|nnbd|d", on_cq=True)
+dart_vm_extra_builder(
+    "vm-kernel-nnbd-linux-release-x64", category="vm|nnbd|r", on_cq=True)
 
 # vm|app-kernel
 dart_vm_extra_builder(
@@ -784,10 +786,7 @@ dart_ci_sandbox_builder("ddk-linux-release-firefox", category="ddc|fl")
 
 # misc
 dart_ci_sandbox_builder(
-    "gclient",
-    recipe="gclient",
-    category="misc|g",
-    on_cq=True)
+    "gclient", recipe="gclient", category="misc|g", on_cq=True)
 dart_ci_builder(
     "debianpackage-linux",
     category="misc|dp",

From 9632efe311330e6ffc4a3c2ef2735c90266b3dcd Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 18 Feb 2020 13:57:21 +0000
Subject: [PATCH 338/826] [infra] Remove the on_cq property when a
 location_regexp is also set

Having on_cq=True in combination with location_regexp gives the
impression that removing on_cq=True will take the builder off the CQ.
But, location_regexp is sufficient for it to remain on the CQ.

Change-Id: I37a1cd028ddb7e69e39d9d0b3beab671158a98e4
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/135681
Reviewed-by: Karl Klose <karlklose@google.com>
---
 main.star | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/main.star b/main.star
index 533f533ee674..8f51f6945efa 100755
--- a/main.star
+++ b/main.star
@@ -298,6 +298,8 @@ def dart_try_builder(name,
                      location_regexp=None,
                      properties={},
                      on_cq=False):
+    if on_cq and location_regexp:
+        fail("Can't be on the default CQ and conditionally on the CQ")
     dimensions = dict(dimensions)
     dimensions["pool"] = "luci.dart.try"
     dimensions.setdefault("os", "Linux")
@@ -474,6 +476,7 @@ def dart_vm_extra_builder(name, on_cq=False, location_regexp=None, **kwargs):
     triggered_by = ["dart-vm-gitiles-trigger-%s"]
     if on_cq and not location_regexp:
         location_regexp = to_location_regexp(VM_PATHS)
+        on_cq = False
     dart_ci_sandbox_builder(
         name,
         triggered_by=triggered_by,
@@ -492,8 +495,7 @@ dart_ci_sandbox_builder(
 dart_ci_sandbox_builder(
     "front-end-nnbd-linux-release-x64",
     category="cfe|nn",
-    location_regexp=to_location_regexp(CFE_PATHS),
-    on_cq=True)
+    location_regexp=to_location_regexp(CFE_PATHS))
 dart_ci_sandbox_builder(
     "flutter-frontend",
     category="cfe|fl",
@@ -664,24 +666,20 @@ dart_ci_sandbox_builder("pkg-linux-debug", category="pkg|ld", channels=["try"])
 dart_ci_sandbox_builder(
     "dart2js-strong-hostasserts-linux-ia32-d8",
     category="dart2js|d8|ha",
-    location_regexp=to_location_regexp(DART2JS_PATHS),
-    on_cq=True)
+    location_regexp=to_location_regexp(DART2JS_PATHS))
 dart_ci_sandbox_builder("dart2js-rti-linux-x64-d8", category="dart2js|d8|rti")
 dart_ci_sandbox_builder(
     "dart2js-minified-strong-linux-x64-d8",
     category="dart2js|d8|mi",
-    location_regexp=to_location_regexp(DART2JS_PATHS),
-    on_cq=True)
+    location_regexp=to_location_regexp(DART2JS_PATHS))
 dart_ci_sandbox_builder(
     "dart2js-unit-linux-x64-release",
     category="dart2js|d8|u",
-    location_regexp=to_location_regexp(DART2JS_PATHS),
-    on_cq=True)
+    location_regexp=to_location_regexp(DART2JS_PATHS))
 dart_ci_sandbox_builder(
     "dart2js-strong-linux-x64-chrome",
     category="dart2js|chrome|l",
-    location_regexp=to_location_regexp(DART2JS_PATHS),
-    on_cq=True)
+    location_regexp=to_location_regexp(DART2JS_PATHS))
 dart_ci_sandbox_builder(
     "dart2js-csp-minified-linux-x64-chrome", category="dart2js|chrome|csp")
 dart_ci_sandbox_builder(
@@ -718,7 +716,6 @@ dart_ci_sandbox_builder(
     category="analyzer|fa",
     channels=["try"],
     notifies=None,
-    on_cq=True,
     location_regexp=[
         ".+/[+]/DEPS",
         ".+/[+]/pkg/analysis_server/.+",
@@ -770,14 +767,12 @@ dart_ci_builder(
 dart_ci_sandbox_builder(
     "ddc-linux-release-chrome",
     category="ddc|l",
-    location_regexp=to_location_regexp(DDC_PATHS),
-    on_cq=True)
+    location_regexp=to_location_regexp(DDC_PATHS))
 dart_ci_sandbox_builder(
     "ddc-nnbd-linux-release-chrome",
     category="ddc|nn",
     channels=["try"],
-    location_regexp=to_location_regexp(DDC_PATHS),
-    on_cq=True)
+    location_regexp=to_location_regexp(DDC_PATHS))
 dart_ci_sandbox_builder(
     "ddc-mac-release-chrome", category="ddc|m", dimensions=mac())
 dart_ci_sandbox_builder(

From 91421076a0b074a39a0d8922fa3ed64f1ac9b2a5 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 21 Feb 2020 17:17:58 +0000
Subject: [PATCH 339/826] [infra] Add VM AOT NNBD builder to the Luci config

Change-Id: I22050f24380afe2c45ff140a2ae3a134a4c030c9
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/136721
Reviewed-by: Alexander Markov <alexmarkov@google.com>
---
 commit-queue.cfg   |  4 ++
 cr-buildbucket.cfg | 96 ++++++++++++++++++++++++++++++++++++++++++++++
 luci-milo.cfg      | 23 +++++++++++
 luci-notify.cfg    | 14 +++++++
 luci-scheduler.cfg | 33 ++++++++++++++++
 main.star          |  2 +
 6 files changed, 172 insertions(+)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 13c17e62913e..372c1bc2e196 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -452,6 +452,10 @@ config_groups: <
         name: "dart/try/vm-kernel-precomp-mac-release-simarm64-try"
         includable_only: true
       >
+      builders: <
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
+        includable_only: true
+      >
       builders: <
         name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
         includable_only: true
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 10090691a2e5..73e51a14061d 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -6033,6 +6033,78 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-kernel-precomp-nnbd-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-precomp-obfuscate-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8769,6 +8841,30 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-kernel-precomp-nnbd-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-precomp-obfuscate-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index eb885016a707..c7c6bde2fb36 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -117,6 +117,11 @@ consoles: <
     category: "vm|nnbd"
     short_name: "r"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64"
+    category: "vm|nnbd"
+    short_name: "r"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
     category: "vm|app-kernel"
@@ -799,6 +804,11 @@ consoles: <
     category: "vm|nnbd"
     short_name: "r"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64"
+    category: "vm|nnbd"
+    short_name: "r"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
     category: "vm|app-kernel"
@@ -1131,6 +1141,11 @@ consoles: <
     category: "vm|nnbd"
     short_name: "r"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-dev"
+    category: "vm|nnbd"
+    short_name: "r"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-dev"
     category: "vm|app-kernel"
@@ -1613,6 +1628,11 @@ consoles: <
     category: "vm|nnbd"
     short_name: "r"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-stable"
+    category: "vm|nnbd"
+    short_name: "r"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-stable"
     category: "vm|app-kernel"
@@ -2127,6 +2147,9 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-x64-try"
   >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-x64-try"
+  >
   builders: <
     name: "buildbucket/luci.dart.try/app-kernel-linux-debug-x64-try"
   >
diff --git a/luci-notify.cfg b/luci-notify.cfg
index b5b923fa885c..22f9fc0d79e4 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -1180,6 +1180,20 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <>
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-nnbd-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index b7a9fd79ea9e..a0791fb62c8d 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -2448,6 +2448,36 @@ job: <
     builder: "vm-kernel-precomp-mac-release-simarm64-stable"
   >
 >
+job: <
+  id: "vm-kernel-precomp-nnbd-linux-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-nnbd-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
+  >
+>
 job: <
   id: "vm-kernel-precomp-obfuscate-linux-release-x64"
   schedule: "triggered"
@@ -2889,6 +2919,7 @@ trigger: <
   triggers: "vm-kernel-precomp-linux-release-simarm_x64-dev"
   triggers: "vm-kernel-precomp-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-mac-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-win-release-x64-dev"
   triggers: "vm-kernel-reload-linux-debug-x64-dev"
@@ -3051,6 +3082,7 @@ trigger: <
   triggers: "vm-kernel-precomp-linux-release-simarm_x64-stable"
   triggers: "vm-kernel-precomp-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-mac-release-simarm64-stable"
+  triggers: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-win-release-x64-stable"
   triggers: "vm-kernel-reload-linux-debug-x64-stable"
@@ -3106,6 +3138,7 @@ trigger: <
   triggers: "vm-kernel-precomp-linux-release-simarm_x64"
   triggers: "vm-kernel-precomp-linux-release-x64"
   triggers: "vm-kernel-precomp-mac-release-simarm64"
+  triggers: "vm-kernel-precomp-nnbd-linux-release-x64"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64"
   triggers: "vm-kernel-precomp-win-release-x64"
   triggers: "vm-kernel-reload-linux-debug-x64"
diff --git a/main.star b/main.star
index 8f51f6945efa..903e36dadce9 100755
--- a/main.star
+++ b/main.star
@@ -517,6 +517,8 @@ dart_vm_extra_builder(
     "vm-kernel-nnbd-linux-debug-x64", category="vm|nnbd|d", on_cq=True)
 dart_vm_extra_builder(
     "vm-kernel-nnbd-linux-release-x64", category="vm|nnbd|r", on_cq=True)
+dart_vm_extra_builder(
+    "vm-kernel-precomp-nnbd-linux-release-x64", category="vm|nnbd|r")
 
 # vm|app-kernel
 dart_vm_extra_builder(

From fdf82123a60861de1553de0fdc7034e449978afe Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Sat, 22 Feb 2020 00:01:09 +0000
Subject: [PATCH 340/826] [infra] Add recipe bundler

https://crbug.com/1032231

Change-Id: I76df50802beb3b452a6cd66342447123490fb150
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/136781
Reviewed-by: Robbie Iannucci <iannucci@google.com>
---
 .style.yapf        |  1 +
 cr-buildbucket.cfg | 29 +++++++++++++++++++++++
 luci-notify.cfg    | 15 ++++++++++++
 luci-scheduler.cfg | 19 +++++++++++++++
 main.star          | 58 +++++++++++++++++++++++++++++++++++++---------
 5 files changed, 111 insertions(+), 11 deletions(-)

diff --git a/.style.yapf b/.style.yapf
index 0e9640c29a2f..f94910ac7122 100644
--- a/.style.yapf
+++ b/.style.yapf
@@ -1,2 +1,3 @@
 [style]
 based_on_style = google
+indent_dictionary_value=True
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 73e51a14061d..52b1b19928f7 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -455,6 +455,35 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "recipe-bundler"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
+        name: "recipe_bundler"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
+        cipd_version: "git_revision:40621e908eb88bd10451ee9d013b7ef89ea91e37"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+        properties_j: "package_name_internal_prefix:\"dart_internal/recipe_bundles\""
+        properties_j: "package_name_prefix:\"dart/recipe_bundles\""
+        properties_j: "recipe_bundler_vers:\"git_revision:2ed88b2c854578b512e1c0486824175fe0d7aab6\""
+        properties_j: "repo_specs:[\"dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/master\"]"
+      >
+      priority: 50
+      execution_timeout_secs: 300
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "versionchecker-linux"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 22f9fc0d79e4..d211f36a761d 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -89,6 +89,21 @@ notifiers: <
     name: "linearize-flutter"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    >
+  >
+  builders: <
+    bucket: "ci"
+    name: "recipe-bundler"
+    repository: "https://dart.googlesource.com/recipes"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index a0791fb62c8d..b5b93d9aa6af 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1248,6 +1248,16 @@ job: <
     builder: "pkg-win-release-stable"
   >
 >
+job: <
+  id: "recipe-bundler"
+  schedule: "*/30 * * * *"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "recipe-bundler"
+  >
+>
 job: <
   id: "versionchecker-linux"
   schedule: "triggered"
@@ -3163,6 +3173,15 @@ trigger: <
     path_regexps: "runtime/.+"
   >
 >
+trigger: <
+  id: "recipes-dart"
+  acl_sets: "ci"
+  triggers: "recipe-bundler"
+  gitiles: <
+    repo: "https://dart.googlesource.com/recipes"
+    refs: "regexp:refs/heads/master"
+  >
+>
 acl_sets: <
   name: "ci"
   acls: <
diff --git a/main.star b/main.star
index 903e36dadce9..6be129e1b649 100755
--- a/main.star
+++ b/main.star
@@ -325,7 +325,7 @@ def dart_try_builder(name,
                        not location_regexp)
     luci.cq_tryjob_verifier(
         builder=builder,
-        cq_group='sdk',
+        cq_group="sdk",
         experiment_percentage=experiment_percentage,
         location_regexp=location_regexp,
         includable_only=includable_only)
@@ -339,10 +339,10 @@ postponed_alt_console_entries = []
 
 # Global builder defaults
 luci.builder.defaults.properties.set({
-    '$recipe_engine/isolated': {
+    "$recipe_engine/isolated": {
         "server": "https://isolateserver.appspot.com"
     },
-    '$recipe_engine/swarming': {
+    "$recipe_engine/swarming": {
         "server": "https://chromium-swarm.appspot.com"
     },
 })
@@ -356,6 +356,7 @@ def dart_builder(name,
                  channels=[],
                  dimensions={},
                  cpu="x86-64",
+                 executable=None,
                  execution_timeout=None,
                  fyi=False,
                  notifies="dart",
@@ -395,7 +396,7 @@ def dart_builder(name,
                 triggered_by = [
                     trigger.replace("%s", branch) for trigger in triggered_by
                 ]
-                if channel in ['dev', 'stable']:
+                if channel in ["dev", "stable"]:
                     # Always run vm builders on dev and stable.
                     triggered_by = [
                         trigger.replace("dart-vm-", "dart-")
@@ -407,7 +408,7 @@ def dart_builder(name,
                 bucket=bucket,
                 caches=[swarming.cache("browsers")],
                 dimensions=dimensions,
-                executable=dart_recipe(recipe),
+                executable=executable or dart_recipe(recipe),
                 execution_timeout=execution_timeout,
                 priority=priority,
                 properties=channel_properties,
@@ -431,12 +432,9 @@ def dart_builder(name,
                 if console == "be":
                     if toplevel_category == "vm":
                         postponed_alt_console_entries.append({
-                            "builder":
-                            builder,
-                            "short_name":
-                            short_name,
-                            "category":
-                            console_category,
+                            "builder": builder,
+                            "short_name": short_name,
+                            "category": console_category,
                         })
                     else:
                         luci.console_view_entry(
@@ -859,3 +857,41 @@ luci.console_view_entry(
     category="flutter",
     console_view="flutter-hhh",
 )
+
+dart_ci_builder(
+    name="recipe-bundler",
+    channels=[],
+    executable=luci.recipe(
+        name="recipe_bundler",
+        cipd_package=
+        "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
+        cipd_version="git_revision:40621e908eb88bd10451ee9d013b7ef89ea91e37",
+    ),
+    execution_timeout=5 * time.minute,
+    notifies="infra",
+    properties={
+        # This property controls the version of the recipe_bundler go tool:
+        #   https://chromium.googlesource.com/infra/infra/+/master/go/src/infra/tools/recipe_bundler
+        "recipe_bundler_vers":
+            "git_revision:2ed88b2c854578b512e1c0486824175fe0d7aab6",
+        # These control the prefix of the CIPD package names that the tool
+        # will create.
+        "package_name_prefix":
+            "dart/recipe_bundles",
+        "package_name_internal_prefix":
+            "dart_internal/recipe_bundles",
+        # Where to grab the recipes to bundle.
+        "repo_specs": [
+            "dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/master",
+        ],
+    },
+    schedule="*/30 * * * *",
+    triggered_by=[
+        luci.gitiles_poller(
+            name="recipes-dart",
+            bucket="ci",
+            repo="https://dart.googlesource.com/recipes",
+            refs=["refs/heads/master"],
+        ),
+    ],
+)

From 0503302f5da9c45ee76d227a96fc31c07283ea08 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 25 Feb 2020 01:10:58 +0000
Subject: [PATCH 341/826] [infra] Migrate Linux builders to goma on RBE

TBR=whesse@google.com

Change-Id: Id59c0a5979ecbb5e02532e2faa10ffd09e902fe9
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/136801
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 378 +++++++++++++++++++++++++++++++++++++++++++++
 main.star          |   9 ++
 2 files changed, 387 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 52b1b19928f7..b97a8f0073ed 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -34,6 +34,7 @@ buckets: <
         name: "dart/forward_branch"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -58,6 +59,7 @@ buckets: <
         name: "dart/chocolatey"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -82,6 +84,7 @@ buckets: <
         name: "dart/package_co19"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -106,6 +109,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -130,6 +134,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -154,6 +159,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -178,6 +184,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -202,6 +209,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -226,6 +234,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -250,6 +259,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -274,6 +284,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -298,6 +309,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -322,6 +334,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -346,6 +359,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -370,6 +384,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -394,6 +409,7 @@ buckets: <
         name: "dart/docker"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -418,6 +434,7 @@ buckets: <
         name: "dart/external"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -442,6 +459,7 @@ buckets: <
         name: "dart/linearize"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -467,6 +485,7 @@ buckets: <
         name: "recipe_bundler"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
         cipd_version: "git_revision:40621e908eb88bd10451ee9d013b7ef89ea91e37"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -496,6 +515,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -520,6 +540,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -544,6 +565,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -592,6 +614,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -616,6 +639,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -640,6 +664,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -664,6 +689,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -688,6 +714,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -712,6 +739,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -736,6 +764,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -760,6 +789,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -784,6 +814,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -808,6 +839,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -832,6 +864,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -856,6 +889,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -880,6 +914,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -904,6 +939,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -928,6 +964,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -952,6 +989,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -976,6 +1014,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1000,6 +1039,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1024,6 +1064,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1048,6 +1089,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1072,6 +1114,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1096,6 +1139,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1120,6 +1164,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1144,6 +1189,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1168,6 +1214,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1192,6 +1239,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1216,6 +1264,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1240,6 +1289,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1264,6 +1314,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1288,6 +1339,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1312,6 +1364,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1336,6 +1389,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1360,6 +1414,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1384,6 +1439,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1408,6 +1464,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1432,6 +1489,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1456,6 +1514,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1480,6 +1539,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1504,6 +1564,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1528,6 +1589,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1552,6 +1614,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1576,6 +1639,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1600,6 +1664,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1624,6 +1689,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1648,6 +1714,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1672,6 +1739,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1696,6 +1764,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1720,6 +1789,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1744,6 +1814,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1768,6 +1839,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1792,6 +1864,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1816,6 +1889,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1840,6 +1914,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1864,6 +1939,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1888,6 +1964,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1912,6 +1989,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1936,6 +2014,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1960,6 +2039,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1984,6 +2064,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2008,6 +2089,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2032,6 +2114,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2056,6 +2139,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2080,6 +2164,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2104,6 +2189,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2128,6 +2214,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2152,6 +2239,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2176,6 +2264,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2200,6 +2289,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2224,6 +2314,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2248,6 +2339,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2272,6 +2364,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2296,6 +2389,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2320,6 +2414,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2344,6 +2439,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2368,6 +2464,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2392,6 +2489,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2416,6 +2514,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2440,6 +2539,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2464,6 +2564,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2488,6 +2589,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2512,6 +2614,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2536,6 +2639,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2560,6 +2664,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2584,6 +2689,7 @@ buckets: <
         name: "dart/flutter_engine"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2609,6 +2715,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2633,6 +2740,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2657,6 +2765,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2681,6 +2790,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2705,6 +2815,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2729,6 +2840,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2753,6 +2865,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2777,6 +2890,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2801,6 +2915,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2825,6 +2940,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2849,6 +2965,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2873,6 +2990,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2897,6 +3015,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2921,6 +3040,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2945,6 +3065,7 @@ buckets: <
         name: "dart/gclient"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2969,6 +3090,7 @@ buckets: <
         name: "dart/gclient"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2993,6 +3115,7 @@ buckets: <
         name: "dart/gclient"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3017,6 +3140,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3041,6 +3165,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3065,6 +3190,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3089,6 +3215,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3113,6 +3240,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3137,6 +3265,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3161,6 +3290,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3185,6 +3315,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3209,6 +3340,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3233,6 +3365,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3257,6 +3390,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3281,6 +3415,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3305,6 +3440,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3329,6 +3465,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3353,6 +3490,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3377,6 +3515,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3401,6 +3540,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3425,6 +3565,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3449,6 +3590,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3473,6 +3615,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3497,6 +3640,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3521,6 +3665,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3545,6 +3690,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3569,6 +3715,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3593,6 +3740,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3617,6 +3765,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3641,6 +3790,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3665,6 +3815,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3689,6 +3840,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3713,6 +3865,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3737,6 +3890,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3761,6 +3915,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3785,6 +3940,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3809,6 +3965,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3833,6 +3990,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3857,6 +4015,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3881,6 +4040,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3905,6 +4065,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3929,6 +4090,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3953,6 +4115,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3977,6 +4140,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4001,6 +4165,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4025,6 +4190,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4049,6 +4215,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4073,6 +4240,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4097,6 +4265,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4121,6 +4290,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4145,6 +4315,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4169,6 +4340,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4193,6 +4365,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4217,6 +4390,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4241,6 +4415,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4265,6 +4440,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4289,6 +4465,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4313,6 +4490,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4337,6 +4515,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4361,6 +4540,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4385,6 +4565,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4409,6 +4590,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4433,6 +4615,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4457,6 +4640,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4481,6 +4665,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4505,6 +4690,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4529,6 +4715,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4553,6 +4740,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4577,6 +4765,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4601,6 +4790,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4625,6 +4815,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4649,6 +4840,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4673,6 +4865,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4697,6 +4890,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4721,6 +4915,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4745,6 +4940,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4769,6 +4965,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4793,6 +4990,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4817,6 +5015,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4841,6 +5040,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4865,6 +5065,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4889,6 +5090,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4913,6 +5115,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4937,6 +5140,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4961,6 +5165,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4985,6 +5190,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5009,6 +5215,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5033,6 +5240,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5057,6 +5265,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5081,6 +5290,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5105,6 +5315,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5129,6 +5340,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5154,6 +5366,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5179,6 +5392,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5204,6 +5418,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5229,6 +5444,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5254,6 +5470,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5279,6 +5496,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5303,6 +5521,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5327,6 +5546,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5351,6 +5571,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5375,6 +5596,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5399,6 +5621,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5423,6 +5646,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5447,6 +5671,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5471,6 +5696,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5495,6 +5721,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5520,6 +5747,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5545,6 +5773,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5570,6 +5799,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5594,6 +5824,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5618,6 +5849,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5642,6 +5874,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5666,6 +5899,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5690,6 +5924,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5714,6 +5949,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5738,6 +5974,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5762,6 +5999,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5786,6 +6024,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5810,6 +6049,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5834,6 +6074,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5858,6 +6099,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5882,6 +6124,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5906,6 +6149,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5930,6 +6174,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5954,6 +6199,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5978,6 +6224,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6002,6 +6249,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6026,6 +6274,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6050,6 +6299,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6074,6 +6324,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6098,6 +6349,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6122,6 +6374,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6146,6 +6399,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6170,6 +6424,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6194,6 +6449,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6218,6 +6474,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6242,6 +6499,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6266,6 +6524,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6290,6 +6549,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6314,6 +6574,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6338,6 +6599,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6362,6 +6624,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6386,6 +6649,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6410,6 +6674,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6434,6 +6699,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6458,6 +6724,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6482,6 +6749,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6506,6 +6774,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6530,6 +6799,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6554,6 +6824,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6578,6 +6849,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6602,6 +6874,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6626,6 +6899,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6650,6 +6924,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6674,6 +6949,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6698,6 +6974,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6722,6 +6999,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6746,6 +7024,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6770,6 +7049,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6794,6 +7074,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6818,6 +7099,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6842,6 +7124,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6866,6 +7149,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6890,6 +7174,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6914,6 +7199,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6958,6 +7244,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6982,6 +7269,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7006,6 +7294,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7030,6 +7319,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7054,6 +7344,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7078,6 +7369,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7102,6 +7394,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7126,6 +7419,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7150,6 +7444,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7174,6 +7469,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7198,6 +7494,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7222,6 +7519,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7246,6 +7544,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7270,6 +7569,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7294,6 +7594,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7318,6 +7619,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7342,6 +7644,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7366,6 +7669,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7390,6 +7694,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7414,6 +7719,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7438,6 +7744,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7462,6 +7769,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7486,6 +7794,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7510,6 +7819,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7534,6 +7844,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7558,6 +7869,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7582,6 +7894,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7606,6 +7919,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7630,6 +7944,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7654,6 +7969,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7678,6 +7994,7 @@ buckets: <
         name: "dart/flutter_engine"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7703,6 +8020,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7727,6 +8045,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7751,6 +8070,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7775,6 +8095,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7799,6 +8120,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7823,6 +8145,7 @@ buckets: <
         name: "dart/gclient"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7847,6 +8170,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7871,6 +8195,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7895,6 +8220,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7919,6 +8245,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7943,6 +8270,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7967,6 +8295,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7991,6 +8320,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8015,6 +8345,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8039,6 +8370,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8063,6 +8395,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8087,6 +8420,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8111,6 +8445,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8135,6 +8470,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8159,6 +8495,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8183,6 +8520,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8207,6 +8545,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8231,6 +8570,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8255,6 +8595,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8279,6 +8620,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8303,6 +8645,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8327,6 +8670,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8351,6 +8695,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8375,6 +8720,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8399,6 +8745,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8423,6 +8770,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8447,6 +8795,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8471,6 +8820,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8495,6 +8845,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8519,6 +8870,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8543,6 +8895,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8567,6 +8920,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8592,6 +8946,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8617,6 +8972,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8641,6 +8997,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8665,6 +9022,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8689,6 +9047,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8714,6 +9073,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8738,6 +9098,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8762,6 +9123,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8786,6 +9148,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8810,6 +9173,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8834,6 +9198,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8858,6 +9223,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8882,6 +9248,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8906,6 +9273,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8930,6 +9298,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8954,6 +9323,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8978,6 +9348,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9002,6 +9373,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9026,6 +9398,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9050,6 +9423,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9074,6 +9448,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9098,6 +9473,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9122,6 +9498,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9146,6 +9523,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
diff --git a/main.star b/main.star
index 6be129e1b649..4cbcc4634a2f 100755
--- a/main.star
+++ b/main.star
@@ -12,6 +12,11 @@
 DART_GIT = "https://dart.googlesource.com/sdk"
 DART_GERRIT = "https://dart-review.googlesource.com/sdk"
 
+GOMA_RBE = {
+    "enable_ats": True,
+    "server_host": "rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog"
+}
+
 RELEASE_CHANNELS = ["dev", "stable"]
 CHANNELS = RELEASE_CHANNELS + ["try"]
 ANALYZER_CHANNELS = ["analyzer-stable"] + CHANNELS
@@ -306,6 +311,8 @@ def dart_try_builder(name,
     dimensions.setdefault("host_class", "default")
     dimensions.setdefault("cpu", "x86-64")
     properties.setdefault("clobber", "true")
+    if dimensions["os"] == "Linux":
+        properties.setdefault("$build/goma", GOMA_RBE)
     builder = name + "-try"
 
     luci.builder(
@@ -374,6 +381,8 @@ def dart_builder(name,
     dimensions.setdefault("pool", "luci.dart.try")
     dimensions["cpu"] = cpu
     properties.setdefault("clobber", "true")
+    if dimensions["os"] == "Linux":
+        properties.setdefault("$build/goma", GOMA_RBE)
 
     def builder(channel=None, triggered_by=None):
         if channel == "try":

From 55643af92aaeac9615ffbdcf6173e81bdb66b453 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 25 Feb 2020 01:35:28 +0000
Subject: [PATCH 342/826] Revert "[infra] Migrate Linux builders to goma on
 RBE"

This reverts commit 0503302f5da9c45ee76d227a96fc31c07283ea08.

Reason for revert: Applied to more builders than intended.

Original change's description:
> [infra] Migrate Linux builders to goma on RBE
>
> TBR=whesse@google.com
>
> Change-Id: Id59c0a5979ecbb5e02532e2faa10ffd09e902fe9
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/136801
> Reviewed-by: Alexander Thomas <athom@google.com>

TBR=whesse@google.com,athom@google.com

Change-Id: If51004a58e425a3c2c44b84b12fdcc2151111134
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/136849
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 378 ---------------------------------------------
 main.star          |   9 --
 2 files changed, 387 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index b97a8f0073ed..52b1b19928f7 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -34,7 +34,6 @@ buckets: <
         name: "dart/forward_branch"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -59,7 +58,6 @@ buckets: <
         name: "dart/chocolatey"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -84,7 +82,6 @@ buckets: <
         name: "dart/package_co19"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -109,7 +106,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -134,7 +130,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -159,7 +154,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -184,7 +178,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -209,7 +202,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -234,7 +226,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -259,7 +250,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -284,7 +274,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -309,7 +298,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -334,7 +322,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -359,7 +346,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -384,7 +370,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -409,7 +394,6 @@ buckets: <
         name: "dart/docker"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -434,7 +418,6 @@ buckets: <
         name: "dart/external"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -459,7 +442,6 @@ buckets: <
         name: "dart/linearize"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -485,7 +467,6 @@ buckets: <
         name: "recipe_bundler"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
         cipd_version: "git_revision:40621e908eb88bd10451ee9d013b7ef89ea91e37"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -515,7 +496,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -540,7 +520,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -565,7 +544,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -614,7 +592,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -639,7 +616,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -664,7 +640,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -689,7 +664,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -714,7 +688,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -739,7 +712,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -764,7 +736,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -789,7 +760,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -814,7 +784,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -839,7 +808,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -864,7 +832,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -889,7 +856,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -914,7 +880,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -939,7 +904,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -964,7 +928,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -989,7 +952,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1014,7 +976,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1039,7 +1000,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1064,7 +1024,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1089,7 +1048,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1114,7 +1072,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1139,7 +1096,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1164,7 +1120,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1189,7 +1144,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1214,7 +1168,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1239,7 +1192,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1264,7 +1216,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1289,7 +1240,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1314,7 +1264,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1339,7 +1288,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1364,7 +1312,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1389,7 +1336,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1414,7 +1360,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1439,7 +1384,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1464,7 +1408,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1489,7 +1432,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1514,7 +1456,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1539,7 +1480,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1564,7 +1504,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1589,7 +1528,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1614,7 +1552,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1639,7 +1576,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1664,7 +1600,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1689,7 +1624,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1714,7 +1648,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1739,7 +1672,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1764,7 +1696,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1789,7 +1720,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1814,7 +1744,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1839,7 +1768,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1864,7 +1792,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1889,7 +1816,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1914,7 +1840,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1939,7 +1864,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1964,7 +1888,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1989,7 +1912,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2014,7 +1936,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2039,7 +1960,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2064,7 +1984,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2089,7 +2008,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2114,7 +2032,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2139,7 +2056,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2164,7 +2080,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2189,7 +2104,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2214,7 +2128,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2239,7 +2152,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2264,7 +2176,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2289,7 +2200,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2314,7 +2224,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2339,7 +2248,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2364,7 +2272,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2389,7 +2296,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2414,7 +2320,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2439,7 +2344,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2464,7 +2368,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2489,7 +2392,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2514,7 +2416,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2539,7 +2440,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2564,7 +2464,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2589,7 +2488,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2614,7 +2512,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2639,7 +2536,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2664,7 +2560,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2689,7 +2584,6 @@ buckets: <
         name: "dart/flutter_engine"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2715,7 +2609,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2740,7 +2633,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2765,7 +2657,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2790,7 +2681,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2815,7 +2705,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2840,7 +2729,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2865,7 +2753,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2890,7 +2777,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2915,7 +2801,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2940,7 +2825,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2965,7 +2849,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2990,7 +2873,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3015,7 +2897,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3040,7 +2921,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3065,7 +2945,6 @@ buckets: <
         name: "dart/gclient"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3090,7 +2969,6 @@ buckets: <
         name: "dart/gclient"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3115,7 +2993,6 @@ buckets: <
         name: "dart/gclient"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3140,7 +3017,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3165,7 +3041,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3190,7 +3065,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3215,7 +3089,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3240,7 +3113,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3265,7 +3137,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3290,7 +3161,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3315,7 +3185,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3340,7 +3209,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3365,7 +3233,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3390,7 +3257,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3415,7 +3281,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3440,7 +3305,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3465,7 +3329,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3490,7 +3353,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3515,7 +3377,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3540,7 +3401,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3565,7 +3425,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3590,7 +3449,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3615,7 +3473,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3640,7 +3497,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3665,7 +3521,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3690,7 +3545,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3715,7 +3569,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3740,7 +3593,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3765,7 +3617,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3790,7 +3641,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3815,7 +3665,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3840,7 +3689,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3865,7 +3713,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3890,7 +3737,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3915,7 +3761,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3940,7 +3785,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3965,7 +3809,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3990,7 +3833,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4015,7 +3857,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4040,7 +3881,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4065,7 +3905,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4090,7 +3929,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4115,7 +3953,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4140,7 +3977,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4165,7 +4001,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4190,7 +4025,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4215,7 +4049,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4240,7 +4073,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4265,7 +4097,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4290,7 +4121,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4315,7 +4145,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4340,7 +4169,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4365,7 +4193,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4390,7 +4217,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4415,7 +4241,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4440,7 +4265,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4465,7 +4289,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4490,7 +4313,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4515,7 +4337,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4540,7 +4361,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4565,7 +4385,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4590,7 +4409,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4615,7 +4433,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4640,7 +4457,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4665,7 +4481,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4690,7 +4505,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4715,7 +4529,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4740,7 +4553,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4765,7 +4577,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4790,7 +4601,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4815,7 +4625,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4840,7 +4649,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4865,7 +4673,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4890,7 +4697,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4915,7 +4721,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4940,7 +4745,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4965,7 +4769,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4990,7 +4793,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5015,7 +4817,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5040,7 +4841,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5065,7 +4865,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5090,7 +4889,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5115,7 +4913,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5140,7 +4937,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5165,7 +4961,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5190,7 +4985,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5215,7 +5009,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5240,7 +5033,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5265,7 +5057,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5290,7 +5081,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5315,7 +5105,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5340,7 +5129,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5366,7 +5154,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5392,7 +5179,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5418,7 +5204,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5444,7 +5229,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5470,7 +5254,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5496,7 +5279,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5521,7 +5303,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5546,7 +5327,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5571,7 +5351,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5596,7 +5375,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5621,7 +5399,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5646,7 +5423,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5671,7 +5447,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5696,7 +5471,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5721,7 +5495,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5747,7 +5520,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5773,7 +5545,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5799,7 +5570,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5824,7 +5594,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5849,7 +5618,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5874,7 +5642,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5899,7 +5666,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5924,7 +5690,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5949,7 +5714,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5974,7 +5738,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5999,7 +5762,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6024,7 +5786,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6049,7 +5810,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6074,7 +5834,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6099,7 +5858,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6124,7 +5882,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6149,7 +5906,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6174,7 +5930,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6199,7 +5954,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6224,7 +5978,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6249,7 +6002,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6274,7 +6026,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6299,7 +6050,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6324,7 +6074,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6349,7 +6098,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6374,7 +6122,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6399,7 +6146,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6424,7 +6170,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6449,7 +6194,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6474,7 +6218,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6499,7 +6242,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6524,7 +6266,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6549,7 +6290,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6574,7 +6314,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6599,7 +6338,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6624,7 +6362,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6649,7 +6386,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6674,7 +6410,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6699,7 +6434,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6724,7 +6458,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6749,7 +6482,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6774,7 +6506,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6799,7 +6530,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6824,7 +6554,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6849,7 +6578,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6874,7 +6602,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6899,7 +6626,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6924,7 +6650,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6949,7 +6674,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6974,7 +6698,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6999,7 +6722,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7024,7 +6746,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7049,7 +6770,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7074,7 +6794,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7099,7 +6818,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7124,7 +6842,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7149,7 +6866,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7174,7 +6890,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7199,7 +6914,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7244,7 +6958,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7269,7 +6982,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7294,7 +7006,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7319,7 +7030,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7344,7 +7054,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7369,7 +7078,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7394,7 +7102,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7419,7 +7126,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7444,7 +7150,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7469,7 +7174,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7494,7 +7198,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7519,7 +7222,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7544,7 +7246,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7569,7 +7270,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7594,7 +7294,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7619,7 +7318,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7644,7 +7342,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7669,7 +7366,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7694,7 +7390,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7719,7 +7414,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7744,7 +7438,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7769,7 +7462,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7794,7 +7486,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7819,7 +7510,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7844,7 +7534,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7869,7 +7558,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7894,7 +7582,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7919,7 +7606,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7944,7 +7630,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7969,7 +7654,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7994,7 +7678,6 @@ buckets: <
         name: "dart/flutter_engine"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8020,7 +7703,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8045,7 +7727,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8070,7 +7751,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8095,7 +7775,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8120,7 +7799,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8145,7 +7823,6 @@ buckets: <
         name: "dart/gclient"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8170,7 +7847,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8195,7 +7871,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8220,7 +7895,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8245,7 +7919,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8270,7 +7943,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8295,7 +7967,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8320,7 +7991,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8345,7 +8015,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8370,7 +8039,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8395,7 +8063,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8420,7 +8087,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8445,7 +8111,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8470,7 +8135,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8495,7 +8159,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8520,7 +8183,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8545,7 +8207,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8570,7 +8231,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8595,7 +8255,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8620,7 +8279,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8645,7 +8303,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8670,7 +8327,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8695,7 +8351,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8720,7 +8375,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8745,7 +8399,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8770,7 +8423,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8795,7 +8447,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8820,7 +8471,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8845,7 +8495,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8870,7 +8519,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8895,7 +8543,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8920,7 +8567,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8946,7 +8592,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8972,7 +8617,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8997,7 +8641,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9022,7 +8665,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9047,7 +8689,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9073,7 +8714,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9098,7 +8738,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9123,7 +8762,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9148,7 +8786,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9173,7 +8810,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9198,7 +8834,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9223,7 +8858,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9248,7 +8882,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9273,7 +8906,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9298,7 +8930,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9323,7 +8954,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9348,7 +8978,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9373,7 +9002,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9398,7 +9026,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9423,7 +9050,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9448,7 +9074,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9473,7 +9098,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9498,7 +9122,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9523,7 +9146,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
diff --git a/main.star b/main.star
index 4cbcc4634a2f..6be129e1b649 100755
--- a/main.star
+++ b/main.star
@@ -12,11 +12,6 @@
 DART_GIT = "https://dart.googlesource.com/sdk"
 DART_GERRIT = "https://dart-review.googlesource.com/sdk"
 
-GOMA_RBE = {
-    "enable_ats": True,
-    "server_host": "rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog"
-}
-
 RELEASE_CHANNELS = ["dev", "stable"]
 CHANNELS = RELEASE_CHANNELS + ["try"]
 ANALYZER_CHANNELS = ["analyzer-stable"] + CHANNELS
@@ -311,8 +306,6 @@ def dart_try_builder(name,
     dimensions.setdefault("host_class", "default")
     dimensions.setdefault("cpu", "x86-64")
     properties.setdefault("clobber", "true")
-    if dimensions["os"] == "Linux":
-        properties.setdefault("$build/goma", GOMA_RBE)
     builder = name + "-try"
 
     luci.builder(
@@ -381,8 +374,6 @@ def dart_builder(name,
     dimensions.setdefault("pool", "luci.dart.try")
     dimensions["cpu"] = cpu
     properties.setdefault("clobber", "true")
-    if dimensions["os"] == "Linux":
-        properties.setdefault("$build/goma", GOMA_RBE)
 
     def builder(channel=None, triggered_by=None):
         if channel == "try":

From cc36793708f2d0f98ae23ec94d57c3b0d05479fc Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Wed, 26 Feb 2020 01:17:08 +0000
Subject: [PATCH 343/826] [infra] Add MSAN and TSAN bots.

Bug: https://github.com/dart-lang/sdk/issues/39611
Change-Id: Idf194e950cef55da57caf1b8f63a0bfbc38ca79b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/136848
Reviewed-by: Martin Kustermann <kustermann@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg   |   8 ++
 cr-buildbucket.cfg | 206 ++++++++++++++++++++++++++++++++++++++++++++-
 luci-milo.cfg      |  46 ++++++++++
 luci-notify.cfg    |  28 ++++++
 luci-scheduler.cfg |  66 +++++++++++++++
 main.star          |   7 +-
 6 files changed, 357 insertions(+), 4 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 372c1bc2e196..df90123c7f29 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -364,6 +364,10 @@ config_groups: <
         name: "dart/try/vm-kernel-mac-release-x64-try"
         experiment_percentage: 5
       >
+      builders: <
+        name: "dart/try/vm-kernel-msan-linux-release-x64-try"
+        includable_only: true
+      >
       builders: <
         name: "dart/try/vm-kernel-nnbd-linux-debug-x64-try"
         location_regexp: ".+/[+]/DEPS"
@@ -480,6 +484,10 @@ config_groups: <
         name: "dart/try/vm-kernel-reload-rollback-linux-release-x64-try"
         includable_only: true
       >
+      builders: <
+        name: "dart/try/vm-kernel-tsan-linux-release-x64-try"
+        includable_only: true
+      >
       builders: <
         name: "dart/try/vm-kernel-win-debug-ia32-try"
         includable_only: true
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 52b1b19928f7..5f658108f78d 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -3981,7 +3981,7 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
-      priority: 50
+      priority: 70
       caches: <
         name: "browsers"
         path: "browsers"
@@ -4005,7 +4005,7 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
-      priority: 50
+      priority: 70
       caches: <
         name: "browsers"
         path: "browsers"
@@ -4029,7 +4029,7 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
-      priority: 50
+      priority: 70
       caches: <
         name: "browsers"
         path: "browsers"
@@ -4829,6 +4829,81 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-kernel-msan-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 70
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-msan-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 70
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-msan-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 70
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-nnbd-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -6566,6 +6641,81 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-kernel-tsan-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 70
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-tsan-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 70
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-tsan-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 70
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-win-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8459,6 +8609,31 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-kernel-msan-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-nnbd-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -9038,6 +9213,31 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-kernel-tsan-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-win-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index c7c6bde2fb36..3d154b58f20b 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -307,6 +307,16 @@ consoles: <
     category: "vm|misc"
     short_name: "a64"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "m64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-tsan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "t64"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
     category: "vm|misc"
@@ -994,6 +1004,16 @@ consoles: <
     category: "vm|misc"
     short_name: "a64"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "m64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-tsan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "t64"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
     category: "vm|misc"
@@ -1331,6 +1351,16 @@ consoles: <
     category: "vm|misc"
     short_name: "a64"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msan-linux-release-x64-dev"
+    category: "vm|misc"
+    short_name: "m64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-tsan-linux-release-x64-dev"
+    category: "vm|misc"
+    short_name: "t64"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32-dev"
     category: "vm|misc"
@@ -1818,6 +1848,16 @@ consoles: <
     category: "vm|misc"
     short_name: "a64"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msan-linux-release-x64-stable"
+    category: "vm|misc"
+    short_name: "m64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-tsan-linux-release-x64-stable"
+    category: "vm|misc"
+    short_name: "t64"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32-stable"
     category: "vm|misc"
@@ -2258,6 +2298,12 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.try/vm-kernel-asan-linux-release-x64-try"
   >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-msan-linux-release-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-tsan-linux-release-x64-try"
+  >
   builders: <
     name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
   >
diff --git a/luci-notify.cfg b/luci-notify.cfg
index d211f36a761d..cc4f289b30a3 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -957,6 +957,20 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <>
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-msan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
@@ -1293,6 +1307,20 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <>
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-tsan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index b5b93d9aa6af..2b7f710dba6c 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1948,6 +1948,36 @@ job: <
     builder: "vm-kernel-mac-release-x64-stable"
   >
 >
+job: <
+  id: "vm-kernel-msan-linux-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-msan-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-msan-linux-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-msan-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-msan-linux-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-msan-linux-release-x64-stable"
+  >
+>
 job: <
   id: "vm-kernel-nnbd-linux-debug-x64"
   schedule: "triggered"
@@ -2668,6 +2698,36 @@ job: <
     builder: "vm-kernel-reload-rollback-linux-release-x64-stable"
   >
 >
+job: <
+  id: "vm-kernel-tsan-linux-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-tsan-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-tsan-linux-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-tsan-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-tsan-linux-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-tsan-linux-release-x64-stable"
+  >
+>
 job: <
   id: "vm-kernel-win-debug-ia32"
   schedule: "triggered"
@@ -2912,6 +2972,7 @@ trigger: <
   triggers: "vm-kernel-mac-debug-x64-dev"
   triggers: "vm-kernel-mac-product-x64-dev"
   triggers: "vm-kernel-mac-release-x64-dev"
+  triggers: "vm-kernel-msan-linux-release-x64-dev"
   triggers: "vm-kernel-nnbd-linux-debug-x64-dev"
   triggers: "vm-kernel-nnbd-linux-release-x64-dev"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
@@ -2936,6 +2997,7 @@ trigger: <
   triggers: "vm-kernel-reload-linux-release-x64-dev"
   triggers: "vm-kernel-reload-rollback-linux-debug-x64-dev"
   triggers: "vm-kernel-reload-rollback-linux-release-x64-dev"
+  triggers: "vm-kernel-tsan-linux-release-x64-dev"
   triggers: "vm-kernel-win-debug-ia32-dev"
   triggers: "vm-kernel-win-debug-x64-dev"
   triggers: "vm-kernel-win-product-x64-dev"
@@ -3075,6 +3137,7 @@ trigger: <
   triggers: "vm-kernel-mac-debug-x64-stable"
   triggers: "vm-kernel-mac-product-x64-stable"
   triggers: "vm-kernel-mac-release-x64-stable"
+  triggers: "vm-kernel-msan-linux-release-x64-stable"
   triggers: "vm-kernel-nnbd-linux-debug-x64-stable"
   triggers: "vm-kernel-nnbd-linux-release-x64-stable"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
@@ -3099,6 +3162,7 @@ trigger: <
   triggers: "vm-kernel-reload-linux-release-x64-stable"
   triggers: "vm-kernel-reload-rollback-linux-debug-x64-stable"
   triggers: "vm-kernel-reload-rollback-linux-release-x64-stable"
+  triggers: "vm-kernel-tsan-linux-release-x64-stable"
   triggers: "vm-kernel-win-debug-ia32-stable"
   triggers: "vm-kernel-win-debug-x64-stable"
   triggers: "vm-kernel-win-product-x64-stable"
@@ -3131,6 +3195,7 @@ trigger: <
   triggers: "vm-kernel-linux-release-ia32"
   triggers: "vm-kernel-linux-release-simarm"
   triggers: "vm-kernel-linux-release-simarm64"
+  triggers: "vm-kernel-msan-linux-release-x64"
   triggers: "vm-kernel-nnbd-linux-debug-x64"
   triggers: "vm-kernel-nnbd-linux-release-x64"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32"
@@ -3155,6 +3220,7 @@ trigger: <
   triggers: "vm-kernel-reload-linux-release-x64"
   triggers: "vm-kernel-reload-rollback-linux-debug-x64"
   triggers: "vm-kernel-reload-rollback-linux-release-x64"
+  triggers: "vm-kernel-tsan-linux-release-x64"
   triggers: "vm-kernel-win-debug-ia32"
   triggers: "vm-kernel-win-release-ia32"
   gitiles: <
diff --git a/main.star b/main.star
index 6be129e1b649..409d5e654878 100755
--- a/main.star
+++ b/main.star
@@ -620,8 +620,13 @@ dart_vm_extra_builder(
     properties={"shard_timeout": 5400})  # 1.5h
 
 # vm|misc
+LOW = 70
 dart_vm_extra_builder(
-    "vm-kernel-asan-linux-release-x64", category="vm|misc|a64")
+    "vm-kernel-asan-linux-release-x64", category="vm|misc|a64", priority=LOW)
+dart_vm_extra_builder(
+    "vm-kernel-msan-linux-release-x64", category="vm|misc|m64", priority=LOW)
+dart_vm_extra_builder(
+    "vm-kernel-tsan-linux-release-x64", category="vm|misc|t64", priority=LOW)
 dart_vm_extra_builder(
     "vm-kernel-optcounter-threshold-linux-release-ia32", category="vm|misc|o32")
 dart_vm_extra_builder(

From 6c5d3396c52e4492faf158928f896202511b4185 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 27 Feb 2020 13:25:21 +0000
Subject: [PATCH 344/826] Reland "[infra] Migrate Linux builders to goma on
 RBE"

* Move defaults for properties and dimensions to defaults.star to make
them immutable (frozen) and reduce code duplication.
* Remove some dead code.

This reverts commit 55643af92aaeac9615ffbdcf6173e81bdb66b453.

Change-Id: I44e5aee44a090e6970e29e6c3124206957323a52
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/136850
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 17 +++++++++++++++++
 defaults.star      | 20 ++++++++++++++++++++
 main.star          | 45 +++++++++++++++++++++++++--------------------
 3 files changed, 62 insertions(+), 20 deletions(-)
 create mode 100644 defaults.star

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 5f658108f78d..5124d70efa40 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -106,6 +106,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -130,6 +131,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -154,6 +156,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2248,6 +2251,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2272,6 +2276,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2296,6 +2301,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2633,6 +2639,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2657,6 +2664,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2681,6 +2689,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2921,6 +2930,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3257,6 +3267,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3281,6 +3292,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3305,6 +3317,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7324,6 +7337,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7684,6 +7698,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7877,6 +7892,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8093,6 +8109,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
diff --git a/defaults.star b/defaults.star
new file mode 100644
index 000000000000..bf14d10591fd
--- /dev/null
+++ b/defaults.star
@@ -0,0 +1,20 @@
+_PROPERTIES = {"clobber": "true"}
+_DIMENSIONS = {
+    "cpu": "x86-64",
+    "host_class": "default",
+    "os": "Linux",
+    "pool": "luci.dart.try"
+}
+
+
+def _default_dict(defaults, overrides):
+    defaults = dict(defaults)
+    if overrides:
+        defaults.update(overrides)
+    return defaults
+
+
+defaults = struct(
+    properties=lambda properties: _default_dict(_PROPERTIES, properties),
+    dimensions=lambda dimensions: _default_dict(_DIMENSIONS, dimensions),
+)
diff --git a/main.star b/main.star
index 409d5e654878..023f88de5645 100755
--- a/main.star
+++ b/main.star
@@ -9,9 +9,13 @@
 # Documentation for lucicfg is here:
 # https://chromium.googlesource.com/infra/luci/luci-go/+/master/lucicfg/doc/
 
+load("//defaults.star", "defaults")
+
 DART_GIT = "https://dart.googlesource.com/sdk"
 DART_GERRIT = "https://dart-review.googlesource.com/sdk"
 
+GOMA_RBE = {"enable_ats": True, "server_host": "goma.chromium.org"}
+
 RELEASE_CHANNELS = ["dev", "stable"]
 CHANNELS = RELEASE_CHANNELS + ["try"]
 ANALYZER_CHANNELS = ["analyzer-stable"] + CHANNELS
@@ -292,20 +296,20 @@ def dart_recipe(name):
 
 def dart_try_builder(name,
                      recipe="neo",
-                     dimensions={},
+                     dimensions=None,
                      execution_timeout=None,
                      experiment_percentage=None,
+                     goma_rbe=False,
                      location_regexp=None,
-                     properties={},
+                     properties=None,
                      on_cq=False):
     if on_cq and location_regexp:
         fail("Can't be on the default CQ and conditionally on the CQ")
-    dimensions = dict(dimensions)
+    dimensions = defaults.dimensions(dimensions)
     dimensions["pool"] = "luci.dart.try"
-    dimensions.setdefault("os", "Linux")
-    dimensions.setdefault("host_class", "default")
-    dimensions.setdefault("cpu", "x86-64")
-    properties.setdefault("clobber", "true")
+    properties = defaults.properties(properties)
+    if dimensions["os"] == "Linux" and goma_rbe:
+        properties.setdefault("$build/goma", GOMA_RBE)
     builder = name + "-try"
 
     luci.builder(
@@ -354,14 +358,14 @@ def dart_builder(name,
                  enabled=True,
                  category=None,
                  channels=[],
-                 dimensions={},
-                 cpu="x86-64",
+                 dimensions=None,
                  executable=None,
                  execution_timeout=None,
+                 goma_rbe=False,
                  fyi=False,
                  notifies="dart",
                  priority=50,
-                 properties={},
+                 properties=None,
                  schedule="triggered",
                  service_account=TRY_ACCOUNT,
                  triggered_by=None,
@@ -369,11 +373,10 @@ def dart_builder(name,
                  on_cq=False,
                  experiment_percentage=None,
                  location_regexp=None):
-    dimensions.setdefault("os", "Linux")
-    dimensions.setdefault("host_class", "default")
-    dimensions.setdefault("pool", "luci.dart.try")
-    dimensions["cpu"] = cpu
-    properties.setdefault("clobber", "true")
+    dimensions = defaults.dimensions(dimensions)
+    properties = defaults.properties(properties)
+    if dimensions["os"] == "Linux" and goma_rbe:
+        properties.setdefault("$build/goma", GOMA_RBE)
 
     def builder(channel=None, triggered_by=None):
         if channel == "try":
@@ -389,7 +392,6 @@ def dart_builder(name,
         else:
             builder = name + "-" + channel if channel else name
             branch = channel if channel else "master"
-            channel_properties = dict(properties)
             if enabled and schedule == "triggered":
                 if not triggered_by:
                     triggered_by = ["dart-gitiles-trigger-%s"]
@@ -411,7 +413,7 @@ def dart_builder(name,
                 executable=executable or dart_recipe(recipe),
                 execution_timeout=execution_timeout,
                 priority=priority,
-                properties=channel_properties,
+                properties=properties,
                 notifies=[notifies]
                 if notifies and not channel and enabled else None,
                 schedule=schedule if enabled else None,
@@ -485,7 +487,7 @@ def dart_vm_extra_builder(name, on_cq=False, location_regexp=None, **kwargs):
 
 # cfe
 dart_ci_sandbox_builder(
-    "front-end-linux-release-x64", category="cfe|l", on_cq=True)
+    "front-end-linux-release-x64", category="cfe|l", goma_rbe=True, on_cq=True)
 dart_ci_sandbox_builder(
     "front-end-mac-release-x64", category="cfe|m", dimensions=mac())
 dart_ci_sandbox_builder(
@@ -535,7 +537,7 @@ dart_vm_extra_builder(
 
 #vm|kernel
 dart_ci_sandbox_builder(
-    "vm-canary-linux-debug", category="vm|kernel|c", on_cq=True)
+    "vm-canary-linux-debug", category="vm|kernel|c", goma_rbe=True, on_cq=True)
 dart_ci_sandbox_builder("vm-kernel-linux-debug-x64", category="vm|kernel|d")
 dart_vm_extra_builder(
     "vm-kernel-linux-release-simarm", category="vm|kernel|a32")
@@ -758,7 +760,8 @@ dart_ci_sandbox_builder(
     channels=ANALYZER_CHANNELS)
 
 # sdk
-dart_ci_builder("dart-sdk-linux", category="sdk|l", channels=CHANNELS)
+dart_ci_builder(
+    "dart-sdk-linux", category="sdk|l", channels=CHANNELS, goma_rbe=True)
 dart_ci_builder(
     "dart-sdk-mac", category="sdk|m", channels=CHANNELS, dimensions=mac())
 dart_ci_builder(
@@ -772,6 +775,7 @@ dart_ci_builder(
 dart_ci_sandbox_builder(
     "ddc-linux-release-chrome",
     category="ddc|l",
+    goma_rbe=True,
     location_regexp=to_location_regexp(DDC_PATHS))
 dart_ci_sandbox_builder(
     "ddc-nnbd-linux-release-chrome",
@@ -827,6 +831,7 @@ dart_ci_builder(
 dart_ci_sandbox_builder(
     "fuzz-linux",
     channels=[],
+    goma_rbe=True,
     notifies="dart-fuzz-testing",
     schedule="0 3,4 * * *")
 

From 9c935f15d8c8c0f6704257514ce62da25855203e Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 2 Mar 2020 11:29:55 +0000
Subject: [PATCH 345/826] [goma] Add use_luci_auth property to Goma properties

Change-Id: Ie25ed98b518e1b906240ffa79169c3a47cac8bd5
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/137924
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 42 +++++++++++++++++-------------------------
 main.star          |  6 +++++-
 2 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 5124d70efa40..aace226f1c1e 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -106,7 +106,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -131,7 +131,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -156,7 +156,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2251,7 +2251,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2276,7 +2276,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2301,7 +2301,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2639,7 +2639,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2664,7 +2664,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2689,7 +2689,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2930,7 +2930,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3267,7 +3267,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3292,7 +3292,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3317,7 +3317,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4854,7 +4854,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4879,7 +4878,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4904,7 +4902,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6666,7 +6663,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6691,7 +6687,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6716,7 +6711,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7337,7 +7331,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7698,7 +7692,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7892,7 +7886,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8109,7 +8103,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8638,7 +8632,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9242,7 +9235,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"rbe-prod1.endpoints.goma-rbe-non-chromium.cloud.goog\"}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
diff --git a/main.star b/main.star
index 023f88de5645..18a2aa9da654 100755
--- a/main.star
+++ b/main.star
@@ -14,7 +14,11 @@ load("//defaults.star", "defaults")
 DART_GIT = "https://dart.googlesource.com/sdk"
 DART_GERRIT = "https://dart-review.googlesource.com/sdk"
 
-GOMA_RBE = {"enable_ats": True, "server_host": "goma.chromium.org"}
+GOMA_RBE = {
+    "enable_ats": True,
+    "server_host": "goma.chromium.org",
+    "use_luci_auth": True
+}
 
 RELEASE_CHANNELS = ["dev", "stable"]
 CHANNELS = RELEASE_CHANNELS + ["try"]

From 22c04d873e5fb11afdc7484040f02f4f7ede8379 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 2 Mar 2020 13:23:27 +0000
Subject: [PATCH 346/826] [infra] Switch builders to use the recipes from
 Dart's recipes.git

Previously, the builders used the recipes from Chromium's build.git. The
recipe_bundler will continue to use Chromium's infra.git recipe bundle.

https://crbug.com/1032231

Change-Id: I22f4cc44dc775e2531149f6dfd5f9ce9380cf7cd
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/137923
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 770 ++++++++++++++++++++++-----------------------
 main.star          |   2 +-
 2 files changed, 386 insertions(+), 386 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index aace226f1c1e..ff5749547b4b 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -32,7 +32,7 @@ buckets: <
       dimensions: "pool:luci.dart.ci"
       recipe: <
         name: "dart/forward_branch"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -56,7 +56,7 @@ buckets: <
       dimensions: "pool:luci.dart.ci"
       recipe: <
         name: "dart/chocolatey"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -80,7 +80,7 @@ buckets: <
       dimensions: "pool:luci.dart.ci"
       recipe: <
         name: "dart/package_co19"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -104,7 +104,7 @@ buckets: <
       dimensions: "pool:luci.dart.ci"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
@@ -129,7 +129,7 @@ buckets: <
       dimensions: "pool:luci.dart.ci"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
@@ -154,7 +154,7 @@ buckets: <
       dimensions: "pool:luci.dart.ci"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
@@ -179,7 +179,7 @@ buckets: <
       dimensions: "pool:luci.dart.ci"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -203,7 +203,7 @@ buckets: <
       dimensions: "pool:luci.dart.ci"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -227,7 +227,7 @@ buckets: <
       dimensions: "pool:luci.dart.ci"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -251,7 +251,7 @@ buckets: <
       dimensions: "pool:luci.dart.ci"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -275,7 +275,7 @@ buckets: <
       dimensions: "pool:luci.dart.ci"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -299,7 +299,7 @@ buckets: <
       dimensions: "pool:luci.dart.ci"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -323,7 +323,7 @@ buckets: <
       dimensions: "pool:luci.dart.ci"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -347,7 +347,7 @@ buckets: <
       dimensions: "pool:luci.dart.ci"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -371,7 +371,7 @@ buckets: <
       dimensions: "pool:luci.dart.ci"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -395,7 +395,7 @@ buckets: <
       dimensions: "pool:luci.dart.ci"
       recipe: <
         name: "dart/docker"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -419,7 +419,7 @@ buckets: <
       dimensions: "pool:luci.dart.ci"
       recipe: <
         name: "dart/external"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -443,7 +443,7 @@ buckets: <
       dimensions: "pool:luci.dart.ci"
       recipe: <
         name: "dart/linearize"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -497,7 +497,7 @@ buckets: <
       dimensions: "pool:luci.dart.ci"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -521,7 +521,7 @@ buckets: <
       dimensions: "pool:luci.dart.ci"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -545,7 +545,7 @@ buckets: <
       dimensions: "pool:luci.dart.ci"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -593,7 +593,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -617,7 +617,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -641,7 +641,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -665,7 +665,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -689,7 +689,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -713,7 +713,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -737,7 +737,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -761,7 +761,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -785,7 +785,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -809,7 +809,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -833,7 +833,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -857,7 +857,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -881,7 +881,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -905,7 +905,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -929,7 +929,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -953,7 +953,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -977,7 +977,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1001,7 +1001,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1025,7 +1025,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1049,7 +1049,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1073,7 +1073,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1097,7 +1097,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1121,7 +1121,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1145,7 +1145,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1169,7 +1169,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1193,7 +1193,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1217,7 +1217,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1241,7 +1241,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1265,7 +1265,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1289,7 +1289,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1313,7 +1313,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1337,7 +1337,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1361,7 +1361,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1385,7 +1385,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1409,7 +1409,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1433,7 +1433,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1457,7 +1457,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1481,7 +1481,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1505,7 +1505,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1529,7 +1529,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1553,7 +1553,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1577,7 +1577,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1601,7 +1601,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1625,7 +1625,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1649,7 +1649,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1673,7 +1673,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1697,7 +1697,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1721,7 +1721,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1745,7 +1745,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1769,7 +1769,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1793,7 +1793,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1817,7 +1817,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1841,7 +1841,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1865,7 +1865,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1889,7 +1889,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1913,7 +1913,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1937,7 +1937,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1961,7 +1961,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -1985,7 +1985,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2009,7 +2009,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2033,7 +2033,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2057,7 +2057,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2081,7 +2081,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2105,7 +2105,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2129,7 +2129,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2153,7 +2153,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2177,7 +2177,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2201,7 +2201,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2225,7 +2225,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2249,7 +2249,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
@@ -2274,7 +2274,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
@@ -2299,7 +2299,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
@@ -2324,7 +2324,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2348,7 +2348,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2372,7 +2372,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2396,7 +2396,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2420,7 +2420,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2444,7 +2444,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2468,7 +2468,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2492,7 +2492,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2516,7 +2516,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2540,7 +2540,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2564,7 +2564,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2588,7 +2588,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/flutter_engine"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2613,7 +2613,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2637,7 +2637,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
@@ -2662,7 +2662,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
@@ -2687,7 +2687,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
@@ -2712,7 +2712,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2736,7 +2736,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2760,7 +2760,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2784,7 +2784,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2808,7 +2808,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2832,7 +2832,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2856,7 +2856,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2880,7 +2880,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2904,7 +2904,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2928,7 +2928,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
@@ -2953,7 +2953,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/gclient"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -2977,7 +2977,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/gclient"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3001,7 +3001,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/gclient"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3025,7 +3025,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3049,7 +3049,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3073,7 +3073,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3097,7 +3097,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3121,7 +3121,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3145,7 +3145,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3169,7 +3169,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3193,7 +3193,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3217,7 +3217,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3241,7 +3241,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3265,7 +3265,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
@@ -3290,7 +3290,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
@@ -3315,7 +3315,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
@@ -3340,7 +3340,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3364,7 +3364,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3388,7 +3388,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3412,7 +3412,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3436,7 +3436,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3460,7 +3460,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3484,7 +3484,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3508,7 +3508,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3532,7 +3532,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3556,7 +3556,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3580,7 +3580,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3604,7 +3604,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3628,7 +3628,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3652,7 +3652,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3676,7 +3676,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3700,7 +3700,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3724,7 +3724,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3748,7 +3748,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3772,7 +3772,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3796,7 +3796,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3820,7 +3820,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3844,7 +3844,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3868,7 +3868,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3892,7 +3892,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3916,7 +3916,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3940,7 +3940,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3964,7 +3964,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -3988,7 +3988,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4012,7 +4012,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4036,7 +4036,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4060,7 +4060,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4084,7 +4084,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4108,7 +4108,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4132,7 +4132,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4156,7 +4156,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4180,7 +4180,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4204,7 +4204,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4228,7 +4228,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4252,7 +4252,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4276,7 +4276,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4300,7 +4300,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4324,7 +4324,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4348,7 +4348,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4372,7 +4372,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4396,7 +4396,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4420,7 +4420,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4444,7 +4444,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4468,7 +4468,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4492,7 +4492,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4516,7 +4516,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4540,7 +4540,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4564,7 +4564,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4588,7 +4588,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4612,7 +4612,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4636,7 +4636,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4660,7 +4660,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4684,7 +4684,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4708,7 +4708,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4732,7 +4732,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4756,7 +4756,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4780,7 +4780,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4804,7 +4804,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4828,7 +4828,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4852,7 +4852,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4876,7 +4876,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4900,7 +4900,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4924,7 +4924,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4948,7 +4948,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4972,7 +4972,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -4996,7 +4996,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5020,7 +5020,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5044,7 +5044,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5068,7 +5068,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5092,7 +5092,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5116,7 +5116,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5140,7 +5140,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5164,7 +5164,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5188,7 +5188,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5212,7 +5212,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5237,7 +5237,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5262,7 +5262,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5287,7 +5287,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5312,7 +5312,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5337,7 +5337,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5362,7 +5362,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5386,7 +5386,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5410,7 +5410,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5434,7 +5434,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5458,7 +5458,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5482,7 +5482,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5506,7 +5506,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5530,7 +5530,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5554,7 +5554,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5578,7 +5578,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5603,7 +5603,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5628,7 +5628,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5653,7 +5653,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5677,7 +5677,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5701,7 +5701,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5725,7 +5725,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5749,7 +5749,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5773,7 +5773,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5797,7 +5797,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5821,7 +5821,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5845,7 +5845,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5869,7 +5869,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5893,7 +5893,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5917,7 +5917,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5941,7 +5941,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5965,7 +5965,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -5989,7 +5989,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6013,7 +6013,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6037,7 +6037,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6061,7 +6061,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6085,7 +6085,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6109,7 +6109,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6133,7 +6133,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6157,7 +6157,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6181,7 +6181,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6205,7 +6205,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6229,7 +6229,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6253,7 +6253,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6277,7 +6277,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6301,7 +6301,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6325,7 +6325,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6349,7 +6349,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6373,7 +6373,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6397,7 +6397,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6421,7 +6421,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6445,7 +6445,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6469,7 +6469,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6493,7 +6493,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6517,7 +6517,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6541,7 +6541,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6565,7 +6565,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6589,7 +6589,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6613,7 +6613,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6637,7 +6637,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6661,7 +6661,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6685,7 +6685,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6709,7 +6709,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6733,7 +6733,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6757,7 +6757,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6781,7 +6781,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6805,7 +6805,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6829,7 +6829,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6853,7 +6853,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6877,7 +6877,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6901,7 +6901,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6925,7 +6925,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6949,7 +6949,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6973,7 +6973,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -6997,7 +6997,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7021,7 +7021,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7045,7 +7045,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7069,7 +7069,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7113,7 +7113,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7137,7 +7137,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7161,7 +7161,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7185,7 +7185,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7209,7 +7209,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7233,7 +7233,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7257,7 +7257,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7281,7 +7281,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7305,7 +7305,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7329,7 +7329,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
@@ -7354,7 +7354,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7378,7 +7378,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7402,7 +7402,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7426,7 +7426,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7450,7 +7450,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7474,7 +7474,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7498,7 +7498,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7522,7 +7522,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7546,7 +7546,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7570,7 +7570,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7594,7 +7594,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7618,7 +7618,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7642,7 +7642,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7666,7 +7666,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7690,7 +7690,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
@@ -7715,7 +7715,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7739,7 +7739,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7763,7 +7763,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7787,7 +7787,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7811,7 +7811,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7835,7 +7835,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/flutter_engine"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7860,7 +7860,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7884,7 +7884,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
@@ -7909,7 +7909,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7933,7 +7933,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7957,7 +7957,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -7981,7 +7981,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/gclient"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8005,7 +8005,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8029,7 +8029,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8053,7 +8053,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8077,7 +8077,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8101,7 +8101,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
@@ -8126,7 +8126,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8150,7 +8150,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8174,7 +8174,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8198,7 +8198,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8222,7 +8222,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8246,7 +8246,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8270,7 +8270,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8294,7 +8294,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8318,7 +8318,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8342,7 +8342,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8366,7 +8366,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8390,7 +8390,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8414,7 +8414,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8438,7 +8438,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8462,7 +8462,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8486,7 +8486,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8510,7 +8510,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8534,7 +8534,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8558,7 +8558,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8582,7 +8582,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8606,7 +8606,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8630,7 +8630,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8654,7 +8654,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8678,7 +8678,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8702,7 +8702,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8726,7 +8726,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8750,7 +8750,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8775,7 +8775,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8800,7 +8800,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8824,7 +8824,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8848,7 +8848,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8872,7 +8872,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8897,7 +8897,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8921,7 +8921,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8945,7 +8945,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8969,7 +8969,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -8993,7 +8993,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -9017,7 +9017,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -9041,7 +9041,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -9065,7 +9065,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -9089,7 +9089,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -9113,7 +9113,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -9137,7 +9137,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -9161,7 +9161,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -9185,7 +9185,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -9209,7 +9209,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -9233,7 +9233,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -9257,7 +9257,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -9281,7 +9281,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -9305,7 +9305,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -9329,7 +9329,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
@@ -9353,7 +9353,7 @@ buckets: <
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
diff --git a/main.star b/main.star
index 18a2aa9da654..437a6a5948cb 100755
--- a/main.star
+++ b/main.star
@@ -294,7 +294,7 @@ def dart_recipe(name):
     return luci.recipe(
         name="dart/" + name,
         cipd_package=
-        "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",
+        "dart/recipe_bundles/dart.googlesource.com/recipes",
     )
 
 

From d5b5fe106e4864e4e3b4654e12ea386a174aad92 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 3 Mar 2020 11:32:25 +0000
Subject: [PATCH 347/826] [goma] Rollback SDK builder to use goma-on-borg

The builds are currently timing out with goma failures.

Possibly related to b/150666049.

Change-Id: Ie96662b071841cda7df712675d8012c215ebcd47
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/137973
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 4 ----
 main.star          | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index ff5749547b4b..10a4735c99b4 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -106,7 +106,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -131,7 +130,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -156,7 +154,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7331,7 +7328,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
diff --git a/main.star b/main.star
index 437a6a5948cb..cd23478144ca 100755
--- a/main.star
+++ b/main.star
@@ -765,7 +765,7 @@ dart_ci_sandbox_builder(
 
 # sdk
 dart_ci_builder(
-    "dart-sdk-linux", category="sdk|l", channels=CHANNELS, goma_rbe=True)
+    "dart-sdk-linux", category="sdk|l", channels=CHANNELS)
 dart_ci_builder(
     "dart-sdk-mac", category="sdk|m", channels=CHANNELS, dimensions=mac())
 dart_ci_builder(

From eb78aea7f15cbbcff47de267ffd011f4f399e92f Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 3 Mar 2020 13:12:48 +0000
Subject: [PATCH 348/826] Revert "[goma] Rollback SDK builder to use
 goma-on-borg"

This reverts commit d5b5fe106e4864e4e3b4654e12ea386a174aad92.

Reason for revert: the goma-team has fixed the goma-on-rbe ACLs.

Original change's description:
> [goma] Rollback SDK builder to use goma-on-borg
>
> The builds are currently timing out with goma failures.
>
> Possibly related to b/150666049.
>
> Change-Id: Ie96662b071841cda7df712675d8012c215ebcd47
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/137973
> Reviewed-by: William Hesse <whesse@google.com>

TBR=whesse@google.com,athom@google.com

Change-Id: I92048fb15ee326460fa494ecd702eeaf8383774c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/138080
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 4 ++++
 main.star          | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 10a4735c99b4..ff5749547b4b 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -106,6 +106,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -130,6 +131,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -154,6 +156,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7328,6 +7331,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
diff --git a/main.star b/main.star
index cd23478144ca..437a6a5948cb 100755
--- a/main.star
+++ b/main.star
@@ -765,7 +765,7 @@ dart_ci_sandbox_builder(
 
 # sdk
 dart_ci_builder(
-    "dart-sdk-linux", category="sdk|l", channels=CHANNELS)
+    "dart-sdk-linux", category="sdk|l", channels=CHANNELS, goma_rbe=True)
 dart_ci_builder(
     "dart-sdk-mac", category="sdk|m", channels=CHANNELS, dimensions=mac())
 dart_ci_builder(

From b24f81aeb1b07181037fed5018d3d14544095b9d Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 3 Mar 2020 13:30:37 +0000
Subject: [PATCH 349/826] [infra] Add ffi-qemu builder to the Luci
 configuration

Corresponding test matrix change:
https://dart-review.googlesource.com/c/sdk/+/137967

Change-Id: Ie2487f3628a0f843a5105aeb7f0fc92d6915e4de
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/137974
Reviewed-by: Daco Harkes <dacoharkes@google.com>
---
 commit-queue.cfg   |  4 ++
 cr-buildbucket.cfg | 96 ++++++++++++++++++++++++++++++++++++++++++++++
 luci-milo.cfg      | 23 +++++++++++
 luci-notify.cfg    | 14 +++++++
 luci-scheduler.cfg | 33 ++++++++++++++++
 main.star          |  5 ++-
 6 files changed, 173 insertions(+), 2 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index df90123c7f29..c63446c80b3a 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -508,6 +508,10 @@ config_groups: <
         name: "dart/try/vm-kernel-win-release-x64-try"
         includable_only: true
       >
+      builders: <
+        name: "dart/try/vm-precomp-ffi-qemu-linux-release-arm-try"
+        includable_only: true
+      >
       retry_config: <>
       cancel_stale_tryjobs: YES
     >
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index ff5749547b4b..89b50043857d 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -7083,6 +7083,78 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-precomp-ffi-qemu-linux-release-arm"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-precomp-ffi-qemu-linux-release-arm-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-precomp-ffi-qemu-linux-release-arm-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
   >
 >
 buckets: <
@@ -9367,5 +9439,29 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-precomp-ffi-qemu-linux-release-arm-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
   >
 >
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 3d154b58f20b..ac4b8b81a485 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -392,6 +392,11 @@ consoles: <
     category: "vm|ffi"
     short_name: "p64"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm"
+    category: "vm|ffi"
+    short_name: "qe"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
@@ -1089,6 +1094,11 @@ consoles: <
     category: "vm|ffi"
     short_name: "p64"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm"
+    category: "vm|ffi"
+    short_name: "qe"
+  >
   header: <
     links: <
       name: "Consoles"
@@ -1436,6 +1446,11 @@ consoles: <
     category: "vm|ffi"
     short_name: "p64"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-dev"
+    category: "vm|ffi"
+    short_name: "qe"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
     category: "pkg"
@@ -1933,6 +1948,11 @@ consoles: <
     category: "vm|ffi"
     short_name: "p64"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-stable"
+    category: "vm|ffi"
+    short_name: "qe"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
     category: "pkg"
@@ -2349,6 +2369,9 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.try/vm-ffi-android-product-arm64-try"
   >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-precomp-ffi-qemu-linux-release-arm-try"
+  >
   builders: <
     name: "buildbucket/luci.dart.try/pkg-linux-release-try"
   >
diff --git a/luci-notify.cfg b/luci-notify.cfg
index cc4f289b30a3..4f6abe422b53 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -1391,3 +1391,17 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <>
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-precomp-ffi-qemu-linux-release-arm"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 2b7f710dba6c..c40622185187 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -2878,6 +2878,36 @@ job: <
     builder: "vm-kernel-win-release-x64-stable"
   >
 >
+job: <
+  id: "vm-precomp-ffi-qemu-linux-release-arm"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-precomp-ffi-qemu-linux-release-arm"
+  >
+>
+job: <
+  id: "vm-precomp-ffi-qemu-linux-release-arm-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-precomp-ffi-qemu-linux-release-arm-dev"
+  >
+>
+job: <
+  id: "vm-precomp-ffi-qemu-linux-release-arm-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-precomp-ffi-qemu-linux-release-arm-stable"
+  >
+>
 trigger: <
   id: "dart-flutter-engine-trigger"
   acl_sets: "ci"
@@ -3003,6 +3033,7 @@ trigger: <
   triggers: "vm-kernel-win-product-x64-dev"
   triggers: "vm-kernel-win-release-ia32-dev"
   triggers: "vm-kernel-win-release-x64-dev"
+  triggers: "vm-precomp-ffi-qemu-linux-release-arm-dev"
   gitiles: <
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/dev"
@@ -3168,6 +3199,7 @@ trigger: <
   triggers: "vm-kernel-win-product-x64-stable"
   triggers: "vm-kernel-win-release-ia32-stable"
   triggers: "vm-kernel-win-release-x64-stable"
+  triggers: "vm-precomp-ffi-qemu-linux-release-arm-stable"
   gitiles: <
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/stable"
@@ -3223,6 +3255,7 @@ trigger: <
   triggers: "vm-kernel-tsan-linux-release-x64"
   triggers: "vm-kernel-win-debug-ia32"
   triggers: "vm-kernel-win-release-ia32"
+  triggers: "vm-precomp-ffi-qemu-linux-release-arm"
   gitiles: <
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/master"
diff --git a/main.star b/main.star
index 437a6a5948cb..fb11308a1a9c 100755
--- a/main.star
+++ b/main.star
@@ -293,8 +293,7 @@ luci.cq_group(
 def dart_recipe(name):
     return luci.recipe(
         name="dart/" + name,
-        cipd_package=
-        "dart/recipe_bundles/dart.googlesource.com/recipes",
+        cipd_package="dart/recipe_bundles/dart.googlesource.com/recipes",
     )
 
 
@@ -665,6 +664,8 @@ dart_vm_extra_builder("vm-ffi-android-product-arm", category="vm|ffi|p32")
 dart_vm_extra_builder("vm-ffi-android-debug-arm64", category="vm|ffi|d64")
 dart_vm_extra_builder("vm-ffi-android-release-arm64", category="vm|ffi|r64")
 dart_vm_extra_builder("vm-ffi-android-product-arm64", category="vm|ffi|p64")
+dart_vm_extra_builder(
+    "vm-precomp-ffi-qemu-linux-release-arm", category="vm|ffi|qe")
 
 # pkg
 dart_ci_sandbox_builder("pkg-linux-release", category="pkg|l", on_cq=True)

From dd1bf9c2e0bb7cf7eb7eead67aba4a6d5cf3599c Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 20 Mar 2020 14:35:09 +0000
Subject: [PATCH 350/826] [infra] Increase timeout of Flutter 3xH to 6 hours

Change-Id: If1ee42cf2e145c12ee9c3cfc3f93d37451ff1093
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/140291
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 4 ++--
 main.star          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 89b50043857d..6482a43da75d 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -2595,7 +2595,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 50
-      execution_timeout_secs: 18000
+      execution_timeout_secs: 21600
       caches: <
         name: "browsers"
         path: "browsers"
@@ -7914,7 +7914,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 30
-      execution_timeout_secs: 18000
+      execution_timeout_secs: 21600
       caches: <
         name: "browsers"
         path: "browsers"
diff --git a/main.star b/main.star
index fb11308a1a9c..fd96720a5d49 100755
--- a/main.star
+++ b/main.star
@@ -511,7 +511,7 @@ dart_ci_sandbox_builder(
     recipe="flutter_engine",
     category="flutter|3H",
     channels=["try"],
-    execution_timeout=time.duration(5 * 60 * 60 * 1000),
+    execution_timeout=time.duration(6 * 60 * 60 * 1000),
     triggered_by=["dart-gitiles-trigger-flutter"],
 )
 

From cd83da98edafbed2f21bb5f2791d7df4205cad13 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 23 Mar 2020 20:12:17 +0000
Subject: [PATCH 351/826] [infra] Set a 15 minute execution timeout on the base
 builder

It frequently hangs and only times out after 3 hours, wasting bot time.

TBR=whesse@google.com

Change-Id: I6985e752c6511fb099562b59a6e51ee59eef1f5b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/140642
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 1 +
 main.star          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 6482a43da75d..f5e55204fb7a 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -39,6 +39,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 50
+      execution_timeout_secs: 900
       caches: <
         name: "browsers"
         path: "browsers"
diff --git a/main.star b/main.star
index fd96720a5d49..8db488267f8e 100755
--- a/main.star
+++ b/main.star
@@ -811,6 +811,7 @@ dart_ci_builder(
 # infra
 dart_ci_builder(
     "base",
+    execution_timeout=time.duration(15 * 60 * 1000),
     recipe="forward_branch",
     schedule="with 10m interval",
     notifies="infra")

From 79be5211607c37fe28ddc199eeeb5d2f1f429d5f Mon Sep 17 00:00:00 2001
From: Martin Kustermann <kustermann@google.com>
Date: Fri, 27 Mar 2020 09:14:16 +0000
Subject: [PATCH 352/826] [infra] Remove
 vm-kernel-precomp-bare-linux-release-{x64,simarm,simarm64} builders

The non-bare mode is not used by anyone and is only on life support. To
reduce CI load, we can remove those builders.

We will continue to test bare and non-bare mode via individual tests,
for example vm/dart/use_bare_instructions_flag_test.

(Builder names are misleading - they are running non-bare mode despite
the name)

Change-Id: I73a8e51e96ab294021921f400139d9dd9e3b0195
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/141122
Reviewed-by: Alexander Thomas <athom@google.com>
Reviewed-by: Alexander Markov <alexmarkov@google.com>
---
 commit-queue.cfg   |  12 --
 cr-buildbucket.cfg | 288 ---------------------------------------------
 luci-milo.cfg      |  69 -----------
 luci-notify.cfg    |  42 -------
 luci-scheduler.cfg |  99 ----------------
 main.star          |   8 --
 6 files changed, 518 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index c63446c80b3a..631fa3fd303f 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -412,18 +412,6 @@ config_groups: <
         name: "dart/try/vm-kernel-precomp-android-release-arm_x64-try"
         includable_only: true
       >
-      builders: <
-        name: "dart/try/vm-kernel-precomp-bare-linux-release-simarm-try"
-        includable_only: true
-      >
-      builders: <
-        name: "dart/try/vm-kernel-precomp-bare-linux-release-simarm64-try"
-        includable_only: true
-      >
-      builders: <
-        name: "dart/try/vm-kernel-precomp-bare-linux-release-x64-try"
-        includable_only: true
-      >
       builders: <
         name: "dart/try/vm-kernel-precomp-linux-debug-simarm_x64-try"
         includable_only: true
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index f5e55204fb7a..005bd4d07f0b 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -5353,222 +5353,6 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-    builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-bare-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-bare-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-bare-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
       name: "vm-kernel-precomp-linux-debug-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8863,78 +8647,6 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-    builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-bare-linux-release-simarm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-bare-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 30
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
       name: "vm-kernel-precomp-linux-debug-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index ac4b8b81a485..719839884498 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -252,21 +252,6 @@ consoles: <
     category: "vm|kernel-precomp"
     short_name: "r"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "b"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm"
-    category: "vm|kernel-precomp"
-    short_name: "b32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "b64"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
     category: "vm|kernel-precomp"
@@ -954,21 +939,6 @@ consoles: <
     category: "vm|kernel-precomp"
     short_name: "r"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "b"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm"
-    category: "vm|kernel-precomp"
-    short_name: "b32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "b64"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
     category: "vm|kernel-precomp"
@@ -1306,21 +1276,6 @@ consoles: <
     category: "vm|kernel-precomp"
     short_name: "r"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "b"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm-dev"
-    category: "vm|kernel-precomp"
-    short_name: "b32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "b64"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-dev"
     category: "vm|kernel-precomp"
@@ -1808,21 +1763,6 @@ consoles: <
     category: "vm|kernel-precomp"
     short_name: "r"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-x64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "b"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm-stable"
-    category: "vm|kernel-precomp"
-    short_name: "b32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-bare-linux-release-simarm64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "b64"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-stable"
     category: "vm|kernel-precomp"
@@ -2285,15 +2225,6 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-x64-try"
   >
-  builders: <
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-bare-linux-release-x64-try"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-bare-linux-release-simarm-try"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-bare-linux-release-simarm64-try"
-  >
   builders: <
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
   >
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 4f6abe422b53..0efacbf45558 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -1055,48 +1055,6 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-bare-linux-release-simarm"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-bare-linux-release-simarm64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-bare-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  >
->
 notifiers: <
   notifications: <
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index c40622185187..f9e3d7978dac 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -2158,96 +2158,6 @@ job: <
     builder: "vm-kernel-precomp-android-release-arm_x64-stable"
   >
 >
-job: <
-  id: "vm-kernel-precomp-bare-linux-release-simarm"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-bare-linux-release-simarm"
-  >
->
-job: <
-  id: "vm-kernel-precomp-bare-linux-release-simarm-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-bare-linux-release-simarm-dev"
-  >
->
-job: <
-  id: "vm-kernel-precomp-bare-linux-release-simarm-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-bare-linux-release-simarm-stable"
-  >
->
-job: <
-  id: "vm-kernel-precomp-bare-linux-release-simarm64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-bare-linux-release-simarm64"
-  >
->
-job: <
-  id: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
-  >
->
-job: <
-  id: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
-  >
->
-job: <
-  id: "vm-kernel-precomp-bare-linux-release-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-bare-linux-release-x64"
-  >
->
-job: <
-  id: "vm-kernel-precomp-bare-linux-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-bare-linux-release-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-precomp-bare-linux-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-bare-linux-release-x64-stable"
-  >
->
 job: <
   id: "vm-kernel-precomp-linux-debug-simarm_x64"
   schedule: "triggered"
@@ -3009,9 +2919,6 @@ trigger: <
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-android-release-arm64-dev"
   triggers: "vm-kernel-precomp-android-release-arm_x64-dev"
-  triggers: "vm-kernel-precomp-bare-linux-release-simarm-dev"
-  triggers: "vm-kernel-precomp-bare-linux-release-simarm64-dev"
-  triggers: "vm-kernel-precomp-bare-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
   triggers: "vm-kernel-precomp-linux-debug-x64-dev"
   triggers: "vm-kernel-precomp-linux-product-x64-dev"
@@ -3175,9 +3082,6 @@ trigger: <
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-android-release-arm64-stable"
   triggers: "vm-kernel-precomp-android-release-arm_x64-stable"
-  triggers: "vm-kernel-precomp-bare-linux-release-simarm-stable"
-  triggers: "vm-kernel-precomp-bare-linux-release-simarm64-stable"
-  triggers: "vm-kernel-precomp-bare-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
   triggers: "vm-kernel-precomp-linux-debug-x64-stable"
   triggers: "vm-kernel-precomp-linux-product-x64-stable"
@@ -3234,9 +3138,6 @@ trigger: <
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
   triggers: "vm-kernel-precomp-android-release-arm64"
   triggers: "vm-kernel-precomp-android-release-arm_x64"
-  triggers: "vm-kernel-precomp-bare-linux-release-simarm"
-  triggers: "vm-kernel-precomp-bare-linux-release-simarm64"
-  triggers: "vm-kernel-precomp-bare-linux-release-x64"
   triggers: "vm-kernel-precomp-linux-debug-simarm_x64"
   triggers: "vm-kernel-precomp-linux-debug-x64"
   triggers: "vm-kernel-precomp-linux-product-x64"
diff --git a/main.star b/main.star
index 8db488267f8e..c38925eb8bd3 100755
--- a/main.star
+++ b/main.star
@@ -587,14 +587,6 @@ dart_vm_extra_builder(
     category="vm|kernel-precomp|a64")
 dart_vm_extra_builder(
     "vm-kernel-precomp-linux-release-x64", category="vm|kernel-precomp|r")
-dart_vm_extra_builder(
-    "vm-kernel-precomp-bare-linux-release-x64", category="vm|kernel-precomp|b")
-dart_vm_extra_builder(
-    "vm-kernel-precomp-bare-linux-release-simarm",
-    category="vm|kernel-precomp|b32")
-dart_vm_extra_builder(
-    "vm-kernel-precomp-bare-linux-release-simarm64",
-    category="vm|kernel-precomp|b64")
 dart_vm_extra_builder(
     "vm-kernel-precomp-obfuscate-linux-release-x64",
     category="vm|kernel-precomp|o")

From f50d8936a8b37008a05dd67bd176fdc2145b12e9 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 27 Mar 2020 09:42:29 +0000
Subject: [PATCH 353/826] [infra] Put VM canary and product builders
 conditionally on the CQ

They should still be added on all VM, CFE and test CLs, but will no
longer be added to unrelated CLs (e.g. analyzer changes). Both of them
are Linux builders, and the product builder also runs co19 tests. The
release builder is still on the CQ and should provide sufficient
coverage in case the patterns miss some changes that affect the VM.

Change-Id: I0a05fefd76a0659fae209af144163d0fe7ea10d1
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/141124
Reviewed-by: William Hesse <whesse@google.com>
---
 commit-queue.cfg   | 22 ++++++++++++++++++++++
 luci-scheduler.cfg |  4 ++--
 main.star          |  4 ++--
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 631fa3fd303f..ef650f9bb295 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -281,6 +281,17 @@ config_groups: <
       >
       builders: <
         name: "dart/try/vm-canary-linux-debug-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
+        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/vm/.+"
+        location_regexp: ".+/[+]/runtime/.+"
       >
       builders: <
         name: "dart/try/vm-dartkb-linux-release-simarm64-try"
@@ -336,6 +347,17 @@ config_groups: <
       >
       builders: <
         name: "dart/try/vm-kernel-linux-product-x64-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
+        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/vm/.+"
+        location_regexp: ".+/[+]/runtime/.+"
       >
       builders: <
         name: "dart/try/vm-kernel-linux-release-ia32-try"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index f9e3d7978dac..05a66719bc85 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -2997,9 +2997,7 @@ trigger: <
   triggers: "pkg-linux-release"
   triggers: "pkg-mac-release"
   triggers: "pkg-win-release"
-  triggers: "vm-canary-linux-debug"
   triggers: "vm-kernel-linux-debug-x64"
-  triggers: "vm-kernel-linux-product-x64"
   triggers: "vm-kernel-linux-release-x64"
   triggers: "vm-kernel-mac-debug-x64"
   triggers: "vm-kernel-mac-product-x64"
@@ -3116,6 +3114,7 @@ trigger: <
   triggers: "app-kernel-linux-product-x64"
   triggers: "app-kernel-linux-release-x64"
   triggers: "cross-vm-linux-release-arm64"
+  triggers: "vm-canary-linux-debug"
   triggers: "vm-dartkb-linux-release-simarm64"
   triggers: "vm-dartkb-linux-release-x64"
   triggers: "vm-dartkb-linux-release-x64-abi"
@@ -3128,6 +3127,7 @@ trigger: <
   triggers: "vm-kernel-asan-linux-release-x64"
   triggers: "vm-kernel-checked-linux-release-x64"
   triggers: "vm-kernel-linux-debug-ia32"
+  triggers: "vm-kernel-linux-product-x64"
   triggers: "vm-kernel-linux-release-ia32"
   triggers: "vm-kernel-linux-release-simarm"
   triggers: "vm-kernel-linux-release-simarm64"
diff --git a/main.star b/main.star
index c38925eb8bd3..a071e7c5c2e8 100755
--- a/main.star
+++ b/main.star
@@ -539,7 +539,7 @@ dart_vm_extra_builder(
     "vm-dartkb-linux-release-x64-abi", category="vm|dartkb|abi")
 
 #vm|kernel
-dart_ci_sandbox_builder(
+dart_vm_extra_builder(
     "vm-canary-linux-debug", category="vm|kernel|c", goma_rbe=True, on_cq=True)
 dart_ci_sandbox_builder("vm-kernel-linux-debug-x64", category="vm|kernel|d")
 dart_vm_extra_builder(
@@ -630,7 +630,7 @@ dart_vm_extra_builder(
     "vm-kernel-optcounter-threshold-linux-release-x64", category="vm|misc|o64")
 
 # vm|product
-dart_ci_sandbox_builder(
+dart_vm_extra_builder(
     "vm-kernel-linux-product-x64", category="vm|product|l", on_cq=True)
 dart_ci_sandbox_builder(
     "vm-kernel-mac-product-x64", category="vm|product|m", dimensions=mac())

From adb7e4779add53d0731d7e7f309b8187329c6711 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 3 Apr 2020 09:11:25 +0000
Subject: [PATCH 354/826] [beta] Add beta builders to Luci configuration

https://github.com/dart-lang/sdk/issues/40983

Change-Id: Ib80b43f1acbdb98ab863dc848ba38d6e705d465b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/139813
Reviewed-by: William Hesse <whesse@google.com>
---
 commit-queue.cfg   |    5 +-
 cr-buildbucket.cfg | 2913 ++++++++++++++++++++++++++++++++++++++------
 luci-milo.cfg      |  495 +++++++-
 luci-scheduler.cfg |  987 +++++++++++++++
 main.star          |   21 +-
 5 files changed, 4025 insertions(+), 396 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index ef650f9bb295..c6cc61e2eb6d 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -16,7 +16,10 @@ config_groups: <
     url: "https://dart-review.googlesource.com"
     projects: <
       name: "sdk"
-      ref_regexp: "refs/heads/.+"
+      ref_regexp: "refs/heads/master"
+      ref_regexp: "refs/heads/beta"
+      ref_regexp: "refs/heads/dev"
+      ref_regexp: "refs/heads/stable"
     >
   >
   verifiers: <
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 005bd4d07f0b..5af9dffa8a45 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -120,6 +120,31 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "dart-sdk-linux-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "dart-sdk-linux-dev"
       swarming_host: "chromium-swarm.appspot.com"
@@ -194,6 +219,30 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "dart-sdk-mac-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "dart-sdk-mac-dev"
       swarming_host: "chromium-swarm.appspot.com"
@@ -266,6 +315,30 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "dart-sdk-win-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "dart-sdk-win-dev"
       swarming_host: "chromium-swarm.appspot.com"
@@ -338,6 +411,30 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "debianpackage-linux-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "debianpackage-linux-dev"
       swarming_host: "chromium-swarm.appspot.com"
@@ -512,6 +609,30 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "versionchecker-linux-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "versionchecker-linux-dev"
       swarming_host: "chromium-swarm.appspot.com"
@@ -633,7 +754,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "analyzer-analysis-server-linux-dev"
+      name: "analyzer-analysis-server-linux-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -657,7 +778,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "analyzer-analysis-server-linux-stable"
+      name: "analyzer-analysis-server-linux-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -681,7 +802,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "analyzer-linux-release"
+      name: "analyzer-analysis-server-linux-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -705,7 +826,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "analyzer-linux-release-analyzer-stable"
+      name: "analyzer-linux-release"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -729,7 +850,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "analyzer-linux-release-dev"
+      name: "analyzer-linux-release-analyzer-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -753,7 +874,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "analyzer-linux-release-stable"
+      name: "analyzer-linux-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -777,12 +898,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "analyzer-mac-release"
+      name: "analyzer-linux-release-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -801,12 +922,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "analyzer-mac-release-analyzer-stable"
+      name: "analyzer-linux-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -825,7 +946,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "analyzer-mac-release-dev"
+      name: "analyzer-mac-release"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -849,7 +970,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "analyzer-mac-release-stable"
+      name: "analyzer-mac-release-analyzer-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -873,12 +994,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "analyzer-nnbd-linux-release"
+      name: "analyzer-mac-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -897,12 +1018,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "analyzer-nnbd-linux-release-analyzer-stable"
+      name: "analyzer-mac-release-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -921,12 +1042,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "analyzer-nnbd-linux-release-dev"
+      name: "analyzer-mac-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -945,7 +1066,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "analyzer-nnbd-linux-release-stable"
+      name: "analyzer-nnbd-linux-release"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -969,12 +1090,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "analyzer-win-release"
+      name: "analyzer-nnbd-linux-release-analyzer-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -993,12 +1114,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "analyzer-win-release-analyzer-stable"
+      name: "analyzer-nnbd-linux-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -1017,12 +1138,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "analyzer-win-release-dev"
+      name: "analyzer-nnbd-linux-release-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -1041,12 +1162,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "analyzer-win-release-stable"
+      name: "analyzer-nnbd-linux-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -1065,12 +1186,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "app-kernel-linux-debug-x64"
+      name: "analyzer-win-release"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -1089,12 +1210,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "app-kernel-linux-debug-x64-dev"
+      name: "analyzer-win-release-analyzer-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -1113,12 +1234,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "app-kernel-linux-debug-x64-stable"
+      name: "analyzer-win-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -1137,12 +1258,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "app-kernel-linux-product-x64"
+      name: "analyzer-win-release-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -1161,12 +1282,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "app-kernel-linux-product-x64-dev"
+      name: "analyzer-win-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -1185,7 +1306,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "app-kernel-linux-product-x64-stable"
+      name: "app-kernel-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1209,7 +1330,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "app-kernel-linux-release-x64"
+      name: "app-kernel-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1233,7 +1354,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "app-kernel-linux-release-x64-dev"
+      name: "app-kernel-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1257,7 +1378,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "app-kernel-linux-release-x64-stable"
+      name: "app-kernel-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1281,7 +1402,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "cross-vm-linux-release-arm64"
+      name: "app-kernel-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1305,7 +1426,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "cross-vm-linux-release-arm64-dev"
+      name: "app-kernel-linux-product-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1329,7 +1450,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "cross-vm-linux-release-arm64-stable"
+      name: "app-kernel-linux-product-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1353,7 +1474,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-csp-minified-linux-x64-chrome"
+      name: "app-kernel-linux-product-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1377,7 +1498,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-csp-minified-linux-x64-chrome-dev"
+      name: "app-kernel-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1401,7 +1522,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-csp-minified-linux-x64-chrome-stable"
+      name: "app-kernel-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1425,7 +1546,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-minified-strong-linux-x64-d8"
+      name: "app-kernel-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1449,7 +1570,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-minified-strong-linux-x64-d8-dev"
+      name: "app-kernel-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1473,7 +1594,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-minified-strong-linux-x64-d8-stable"
+      name: "cross-vm-linux-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1497,7 +1618,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-nnbd-linux-x64-chrome"
+      name: "cross-vm-linux-release-arm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1521,7 +1642,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-nnbd-linux-x64-chrome-dev"
+      name: "cross-vm-linux-release-arm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1545,7 +1666,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-nnbd-linux-x64-chrome-stable"
+      name: "cross-vm-linux-release-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1569,7 +1690,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-rti-linux-x64-d8"
+      name: "dart2js-csp-minified-linux-x64-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1593,7 +1714,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-rti-linux-x64-d8-dev"
+      name: "dart2js-csp-minified-linux-x64-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1617,7 +1738,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-rti-linux-x64-d8-stable"
+      name: "dart2js-csp-minified-linux-x64-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1641,7 +1762,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-hostasserts-linux-ia32-d8"
+      name: "dart2js-csp-minified-linux-x64-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1665,7 +1786,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
+      name: "dart2js-minified-strong-linux-x64-d8"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1689,7 +1810,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
+      name: "dart2js-minified-strong-linux-x64-d8-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1713,7 +1834,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-linux-x64-chrome"
+      name: "dart2js-minified-strong-linux-x64-d8-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1737,7 +1858,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-linux-x64-chrome-dev"
+      name: "dart2js-minified-strong-linux-x64-d8-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1761,7 +1882,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-linux-x64-chrome-stable"
+      name: "dart2js-nnbd-linux-x64-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1785,7 +1906,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-linux-x64-firefox"
+      name: "dart2js-nnbd-linux-x64-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1809,7 +1930,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-linux-x64-firefox-dev"
+      name: "dart2js-nnbd-linux-x64-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1833,7 +1954,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-linux-x64-firefox-stable"
+      name: "dart2js-nnbd-linux-x64-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -1857,12 +1978,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-mac-x64-chrome"
+      name: "dart2js-rti-linux-x64-d8"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -1881,12 +2002,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-mac-x64-chrome-dev"
+      name: "dart2js-rti-linux-x64-d8-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -1905,12 +2026,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-mac-x64-chrome-stable"
+      name: "dart2js-rti-linux-x64-d8-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -1929,12 +2050,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-mac-x64-safari"
+      name: "dart2js-rti-linux-x64-d8-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -1953,12 +2074,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-mac-x64-safari-dev"
+      name: "dart2js-strong-hostasserts-linux-ia32-d8"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -1977,12 +2098,444 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-mac-x64-safari-stable"
+      name: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-linux-x64-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-linux-x64-chrome-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-linux-x64-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-linux-x64-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-linux-x64-firefox"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-linux-x64-firefox-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-linux-x64-firefox-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-linux-x64-firefox-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-mac-x64-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-mac-x64-chrome-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-mac-x64-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-mac-x64-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-mac-x64-safari"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-mac-x64-safari-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-mac-x64-safari-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-mac-x64-safari-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -2006,7 +2559,1409 @@ buckets: <
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-chrome-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-firefox"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-ie11"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-ie11-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-ie11-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-strong-win-x64-ie11-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-unit-linux-x64-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-unit-linux-x64-release-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-unit-linux-x64-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "dart2js-unit-linux-x64-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-linux-release-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-linux-release-chrome-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-linux-release-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-linux-release-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-mac-release-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-mac-release-chrome-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-mac-release-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-mac-release-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-nnbd-linux-release-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-win-release-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-win-release-chrome-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-win-release-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddc-win-release-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddk-linux-release-firefox"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddk-linux-release-firefox-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddk-linux-release-firefox-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "ddk-linux-release-firefox-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "flutter-analyze"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "flutter-engine-linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/flutter_engine"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      execution_timeout_secs: 21600
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "flutter-frontend"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-linux-release-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-mac-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-mac-release-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-mac-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-mac-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-nnbd-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-nnbd-linux-release-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-nnbd-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-nnbd-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-win-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-win-release-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-win-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "front-end-win-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "fuzz-linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "gclient"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/gclient"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "gclient-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/gclient"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "gclient-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/gclient"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "gclient-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/gclient"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-linux-debug"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-linux-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-linux-release-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-linux-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-linux-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -2025,12 +3980,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-win-x64-chrome-dev"
+      name: "pkg-mac-release"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -2049,12 +4004,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-win-x64-chrome-stable"
+      name: "pkg-mac-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -2073,7 +4028,55 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-win-x64-firefox"
+      name: "pkg-mac-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-mac-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "pkg-win-release"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -2097,7 +4100,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-win-x64-ie11"
+      name: "pkg-win-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -2121,7 +4124,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-win-x64-ie11-dev"
+      name: "pkg-win-release-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -2145,7 +4148,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-strong-win-x64-ie11-stable"
+      name: "pkg-win-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -2169,7 +4172,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-unit-linux-x64-release"
+      name: "vm-canary-linux-debug"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -2180,6 +4183,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2193,7 +4197,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-unit-linux-x64-release-dev"
+      name: "vm-canary-linux-debug-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -2204,6 +4208,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2217,7 +4222,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "dart2js-unit-linux-x64-release-stable"
+      name: "vm-canary-linux-debug-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -2228,6 +4233,7 @@ buckets: <
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2241,7 +4247,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "ddc-linux-release-chrome"
+      name: "vm-canary-linux-debug-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -2266,7 +4272,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "ddc-linux-release-chrome-dev"
+      name: "vm-dartkb-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -2277,7 +4283,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2291,7 +4296,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "ddc-linux-release-chrome-stable"
+      name: "vm-dartkb-linux-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -2302,7 +4307,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2316,12 +4320,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "ddc-mac-release-chrome"
+      name: "vm-dartkb-linux-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -2340,12 +4344,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "ddc-mac-release-chrome-dev"
+      name: "vm-dartkb-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -2364,12 +4368,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "ddc-mac-release-chrome-stable"
+      name: "vm-dartkb-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -2388,7 +4392,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "ddc-nnbd-linux-release-chrome"
+      name: "vm-dartkb-linux-release-x64-abi"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -2412,12 +4416,156 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "ddc-win-release-chrome"
+      name: "vm-dartkb-linux-release-x64-abi-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-release-x64-abi-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-release-x64-abi-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-release-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-dartkb-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-ffi-android-debug-arm"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -2436,12 +4584,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "ddc-win-release-chrome-dev"
+      name: "vm-ffi-android-debug-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -2460,12 +4608,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "ddc-win-release-chrome-stable"
+      name: "vm-ffi-android-debug-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -2484,7 +4632,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "ddk-linux-release-firefox"
+      name: "vm-ffi-android-debug-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -2508,7 +4656,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "ddk-linux-release-firefox-dev"
+      name: "vm-ffi-android-debug-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -2532,7 +4680,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "ddk-linux-release-firefox-stable"
+      name: "vm-ffi-android-debug-arm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -2556,7 +4704,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "flutter-analyze"
+      name: "vm-ffi-android-debug-arm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -2580,7 +4728,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "flutter-engine-linux"
+      name: "vm-ffi-android-debug-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -2588,7 +4736,7 @@ buckets: <
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
-        name: "dart/flutter_engine"
+        name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
@@ -2596,7 +4744,6 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 50
-      execution_timeout_secs: 21600
       caches: <
         name: "browsers"
         path: "browsers"
@@ -2605,7 +4752,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "flutter-frontend"
+      name: "vm-ffi-android-product-arm"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -2629,7 +4776,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "front-end-linux-release-x64"
+      name: "vm-ffi-android-product-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -2640,7 +4787,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2654,7 +4800,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "front-end-linux-release-x64-dev"
+      name: "vm-ffi-android-product-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -2665,7 +4811,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2679,7 +4824,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "front-end-linux-release-x64-stable"
+      name: "vm-ffi-android-product-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -2690,7 +4835,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2704,12 +4848,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "front-end-mac-release-x64"
+      name: "vm-ffi-android-product-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -2728,12 +4872,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "front-end-mac-release-x64-dev"
+      name: "vm-ffi-android-product-arm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -2752,12 +4896,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "front-end-mac-release-x64-stable"
+      name: "vm-ffi-android-product-arm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -2776,7 +4920,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "front-end-nnbd-linux-release-x64"
+      name: "vm-ffi-android-product-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -2800,7 +4944,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "front-end-nnbd-linux-release-x64-dev"
+      name: "vm-ffi-android-release-arm"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -2824,7 +4968,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "front-end-nnbd-linux-release-x64-stable"
+      name: "vm-ffi-android-release-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -2848,12 +4992,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "front-end-win-release-x64"
+      name: "vm-ffi-android-release-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -2872,12 +5016,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "front-end-win-release-x64-dev"
+      name: "vm-ffi-android-release-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -2896,12 +5040,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "front-end-win-release-x64-stable"
+      name: "vm-ffi-android-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -2920,7 +5064,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "fuzz-linux"
+      name: "vm-ffi-android-release-arm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -2931,7 +5075,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2945,7 +5088,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "gclient"
+      name: "vm-ffi-android-release-arm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -2953,7 +5096,7 @@ buckets: <
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
-        name: "dart/gclient"
+        name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
@@ -2969,7 +5112,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "gclient-dev"
+      name: "vm-ffi-android-release-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -2977,7 +5120,7 @@ buckets: <
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
-        name: "dart/gclient"
+        name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
@@ -2993,7 +5136,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "gclient-stable"
+      name: "vm-kernel-asan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3001,14 +5144,14 @@ buckets: <
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
-        name: "dart/gclient"
+        name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
-      priority: 50
+      priority: 70
       caches: <
         name: "browsers"
         path: "browsers"
@@ -3017,7 +5160,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "pkg-linux-debug"
+      name: "vm-kernel-asan-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3032,7 +5175,7 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
-      priority: 50
+      priority: 70
       caches: <
         name: "browsers"
         path: "browsers"
@@ -3041,7 +5184,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "pkg-linux-release"
+      name: "vm-kernel-asan-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3056,7 +5199,7 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
-      priority: 50
+      priority: 70
       caches: <
         name: "browsers"
         path: "browsers"
@@ -3065,7 +5208,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "pkg-linux-release-dev"
+      name: "vm-kernel-asan-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3080,7 +5223,7 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
-      priority: 50
+      priority: 70
       caches: <
         name: "browsers"
         path: "browsers"
@@ -3089,7 +5232,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "pkg-linux-release-stable"
+      name: "vm-kernel-checked-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3113,12 +5256,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "pkg-mac-release"
+      name: "vm-kernel-checked-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -3137,12 +5280,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "pkg-mac-release-dev"
+      name: "vm-kernel-checked-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -3161,12 +5304,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "pkg-mac-release-stable"
+      name: "vm-kernel-checked-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -3185,12 +5328,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "pkg-win-release"
+      name: "vm-kernel-linux-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -3209,12 +5352,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "pkg-win-release-dev"
+      name: "vm-kernel-linux-debug-ia32-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -3233,12 +5376,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "pkg-win-release-stable"
+      name: "vm-kernel-linux-debug-ia32-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -3257,7 +5400,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-canary-linux-debug"
+      name: "vm-kernel-linux-debug-ia32-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3268,7 +5411,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3282,7 +5424,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-canary-linux-debug-dev"
+      name: "vm-kernel-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3293,7 +5435,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3307,7 +5448,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-canary-linux-debug-stable"
+      name: "vm-kernel-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3318,7 +5459,6 @@ buckets: <
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3332,7 +5472,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-release-simarm64"
+      name: "vm-kernel-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3356,7 +5496,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-release-simarm64-dev"
+      name: "vm-kernel-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3380,7 +5520,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-release-simarm64-stable"
+      name: "vm-kernel-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3404,7 +5544,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-release-x64"
+      name: "vm-kernel-linux-product-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3428,7 +5568,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-release-x64-abi"
+      name: "vm-kernel-linux-product-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3452,7 +5592,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-release-x64-abi-dev"
+      name: "vm-kernel-linux-product-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3476,7 +5616,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-release-x64-abi-stable"
+      name: "vm-kernel-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3500,7 +5640,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-release-x64-dev"
+      name: "vm-kernel-linux-release-ia32-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3524,7 +5664,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-dartkb-linux-release-x64-stable"
+      name: "vm-kernel-linux-release-ia32-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3548,7 +5688,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-debug-arm"
+      name: "vm-kernel-linux-release-ia32-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3572,7 +5712,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-debug-arm-dev"
+      name: "vm-kernel-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3596,7 +5736,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-debug-arm-stable"
+      name: "vm-kernel-linux-release-simarm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3620,7 +5760,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-debug-arm64"
+      name: "vm-kernel-linux-release-simarm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3644,7 +5784,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-debug-arm64-dev"
+      name: "vm-kernel-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3668,7 +5808,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-debug-arm64-stable"
+      name: "vm-kernel-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3692,7 +5832,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-product-arm"
+      name: "vm-kernel-linux-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3716,7 +5856,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-product-arm-dev"
+      name: "vm-kernel-linux-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3740,7 +5880,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-product-arm-stable"
+      name: "vm-kernel-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3764,7 +5904,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-product-arm64"
+      name: "vm-kernel-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3788,7 +5928,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-product-arm64-dev"
+      name: "vm-kernel-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3812,7 +5952,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-product-arm64-stable"
+      name: "vm-kernel-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3836,7 +5976,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-release-arm"
+      name: "vm-kernel-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -3860,12 +6000,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-release-arm-dev"
+      name: "vm-kernel-mac-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -3884,12 +6024,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-release-arm-stable"
+      name: "vm-kernel-mac-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -3908,12 +6048,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-release-arm64"
+      name: "vm-kernel-mac-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -3932,12 +6072,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-release-arm64-dev"
+      name: "vm-kernel-mac-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -3956,12 +6096,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-ffi-android-release-arm64-stable"
+      name: "vm-kernel-mac-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -3980,12 +6120,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-asan-linux-release-x64"
+      name: "vm-kernel-mac-product-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -3995,7 +6135,7 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
-      priority: 70
+      priority: 50
       caches: <
         name: "browsers"
         path: "browsers"
@@ -4004,12 +6144,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-asan-linux-release-x64-dev"
+      name: "vm-kernel-mac-product-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4019,7 +6159,7 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
-      priority: 70
+      priority: 50
       caches: <
         name: "browsers"
         path: "browsers"
@@ -4028,12 +6168,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-asan-linux-release-x64-stable"
+      name: "vm-kernel-mac-product-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4043,7 +6183,7 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
-      priority: 70
+      priority: 50
       caches: <
         name: "browsers"
         path: "browsers"
@@ -4052,12 +6192,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-checked-linux-release-x64"
+      name: "vm-kernel-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4076,12 +6216,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-checked-linux-release-x64-dev"
+      name: "vm-kernel-mac-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4100,12 +6240,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-checked-linux-release-x64-stable"
+      name: "vm-kernel-mac-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4124,12 +6264,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-debug-ia32"
+      name: "vm-kernel-mac-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4148,7 +6288,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-debug-ia32-dev"
+      name: "vm-kernel-msan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4163,7 +6303,7 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
-      priority: 50
+      priority: 70
       caches: <
         name: "browsers"
         path: "browsers"
@@ -4172,7 +6312,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-debug-ia32-stable"
+      name: "vm-kernel-msan-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4187,7 +6327,7 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
-      priority: 50
+      priority: 70
       caches: <
         name: "browsers"
         path: "browsers"
@@ -4196,7 +6336,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-debug-x64"
+      name: "vm-kernel-msan-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4211,7 +6351,7 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
-      priority: 50
+      priority: 70
       caches: <
         name: "browsers"
         path: "browsers"
@@ -4220,7 +6360,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-debug-x64-dev"
+      name: "vm-kernel-msan-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4235,7 +6375,7 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
-      priority: 50
+      priority: 70
       caches: <
         name: "browsers"
         path: "browsers"
@@ -4244,7 +6384,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-debug-x64-stable"
+      name: "vm-kernel-nnbd-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4268,7 +6408,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-product-x64"
+      name: "vm-kernel-nnbd-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4292,7 +6432,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-product-x64-dev"
+      name: "vm-kernel-nnbd-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4316,7 +6456,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-product-x64-stable"
+      name: "vm-kernel-nnbd-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4340,7 +6480,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-ia32"
+      name: "vm-kernel-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4364,7 +6504,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-ia32-dev"
+      name: "vm-kernel-nnbd-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4388,7 +6528,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-ia32-stable"
+      name: "vm-kernel-nnbd-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4412,7 +6552,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-simarm"
+      name: "vm-kernel-nnbd-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4436,7 +6576,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-simarm-dev"
+      name: "vm-kernel-optcounter-threshold-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4460,7 +6600,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-simarm-stable"
+      name: "vm-kernel-optcounter-threshold-linux-release-ia32-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4484,7 +6624,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-simarm64"
+      name: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4508,7 +6648,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-simarm64-dev"
+      name: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4532,7 +6672,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-simarm64-stable"
+      name: "vm-kernel-optcounter-threshold-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4556,7 +6696,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-x64"
+      name: "vm-kernel-optcounter-threshold-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4580,7 +6720,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-x64-dev"
+      name: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4604,7 +6744,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-linux-release-x64-stable"
+      name: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4628,12 +6768,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-debug-x64"
+      name: "vm-kernel-precomp-android-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4642,6 +6782,7 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -4652,12 +6793,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-debug-x64-dev"
+      name: "vm-kernel-precomp-android-release-arm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4666,6 +6807,7 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -4676,12 +6818,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-debug-x64-stable"
+      name: "vm-kernel-precomp-android-release-arm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4690,6 +6832,7 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -4700,12 +6843,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-product-x64"
+      name: "vm-kernel-precomp-android-release-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4714,6 +6857,7 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -4724,12 +6868,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-product-x64-dev"
+      name: "vm-kernel-precomp-android-release-arm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4738,6 +6882,7 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -4748,12 +6893,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-product-x64-stable"
+      name: "vm-kernel-precomp-android-release-arm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4762,6 +6907,7 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -4772,12 +6918,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-release-x64"
+      name: "vm-kernel-precomp-android-release-arm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4786,6 +6932,7 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -4796,12 +6943,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-release-x64-dev"
+      name: "vm-kernel-precomp-android-release-arm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4810,6 +6957,7 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -4820,12 +6968,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-mac-release-x64-stable"
+      name: "vm-kernel-precomp-linux-debug-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -4834,6 +6982,7 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -4844,7 +6993,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-msan-linux-release-x64"
+      name: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4858,8 +7007,9 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       >
-      priority: 70
+      priority: 50
       caches: <
         name: "browsers"
         path: "browsers"
@@ -4868,7 +7018,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-msan-linux-release-x64-dev"
+      name: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4882,8 +7032,9 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       >
-      priority: 70
+      priority: 50
       caches: <
         name: "browsers"
         path: "browsers"
@@ -4892,7 +7043,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-msan-linux-release-x64-stable"
+      name: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4906,8 +7057,9 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       >
-      priority: 70
+      priority: 50
       caches: <
         name: "browsers"
         path: "browsers"
@@ -4916,7 +7068,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-nnbd-linux-debug-x64"
+      name: "vm-kernel-precomp-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4940,7 +7092,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-nnbd-linux-debug-x64-dev"
+      name: "vm-kernel-precomp-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4964,7 +7116,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-nnbd-linux-debug-x64-stable"
+      name: "vm-kernel-precomp-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -4988,7 +7140,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-nnbd-linux-release-x64"
+      name: "vm-kernel-precomp-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5012,7 +7164,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-nnbd-linux-release-x64-dev"
+      name: "vm-kernel-precomp-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5036,7 +7188,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-nnbd-linux-release-x64-stable"
+      name: "vm-kernel-precomp-linux-product-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5060,7 +7212,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-ia32"
+      name: "vm-kernel-precomp-linux-product-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5084,7 +7236,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
+      name: "vm-kernel-precomp-linux-product-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5108,7 +7260,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
+      name: "vm-kernel-precomp-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5132,7 +7284,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-x64"
+      name: "vm-kernel-precomp-linux-release-simarm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5156,7 +7308,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
+      name: "vm-kernel-precomp-linux-release-simarm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5180,7 +7332,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
+      name: "vm-kernel-precomp-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5204,7 +7356,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm64"
+      name: "vm-kernel-precomp-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5218,7 +7370,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5229,7 +7380,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm64-dev"
+      name: "vm-kernel-precomp-linux-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5243,7 +7394,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5254,7 +7404,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm64-stable"
+      name: "vm-kernel-precomp-linux-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5268,7 +7418,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5279,7 +7428,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm_x64"
+      name: "vm-kernel-precomp-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5293,7 +7442,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5304,7 +7452,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm_x64-dev"
+      name: "vm-kernel-precomp-linux-release-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5318,7 +7466,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5329,7 +7476,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-android-release-arm_x64-stable"
+      name: "vm-kernel-precomp-linux-release-simarm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5343,7 +7490,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5354,7 +7500,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-debug-simarm_x64"
+      name: "vm-kernel-precomp-linux-release-simarm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5368,7 +7514,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5379,7 +7524,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
+      name: "vm-kernel-precomp-linux-release-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5393,7 +7538,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5404,7 +7548,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
+      name: "vm-kernel-precomp-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5418,7 +7562,6 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -5429,7 +7572,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-debug-x64"
+      name: "vm-kernel-precomp-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5453,7 +7596,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-debug-x64-dev"
+      name: "vm-kernel-precomp-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5477,7 +7620,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-debug-x64-stable"
+      name: "vm-kernel-precomp-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5501,12 +7644,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-product-x64"
+      name: "vm-kernel-precomp-mac-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5525,12 +7668,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-product-x64-dev"
+      name: "vm-kernel-precomp-mac-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5549,12 +7692,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-product-x64-stable"
+      name: "vm-kernel-precomp-mac-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5573,12 +7716,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-simarm"
+      name: "vm-kernel-precomp-mac-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5597,7 +7740,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-simarm-dev"
+      name: "vm-kernel-precomp-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5621,7 +7764,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-simarm-stable"
+      name: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5645,7 +7788,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-simarm64"
+      name: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5669,7 +7812,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-simarm64-dev"
+      name: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5693,7 +7836,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-simarm64-stable"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5717,7 +7860,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-simarm_x64"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5741,7 +7884,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-simarm_x64-dev"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5765,7 +7908,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-simarm_x64-stable"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5789,12 +7932,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-x64"
+      name: "vm-kernel-precomp-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5813,12 +7956,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-x64-dev"
+      name: "vm-kernel-precomp-win-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5837,12 +7980,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-linux-release-x64-stable"
+      name: "vm-kernel-precomp-win-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5861,12 +8004,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-mac-release-simarm64"
+      name: "vm-kernel-precomp-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5885,12 +8028,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-mac-release-simarm64-dev"
+      name: "vm-kernel-reload-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5909,12 +8052,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-mac-release-simarm64-stable"
+      name: "vm-kernel-reload-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -5933,7 +8076,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-nnbd-linux-release-x64"
+      name: "vm-kernel-reload-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5957,7 +8100,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
+      name: "vm-kernel-reload-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -5981,7 +8124,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
+      name: "vm-kernel-reload-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6005,7 +8148,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64"
+      name: "vm-kernel-reload-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6029,7 +8172,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+      name: "vm-kernel-reload-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6053,7 +8196,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+      name: "vm-kernel-reload-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6077,12 +8220,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-win-release-x64"
+      name: "vm-kernel-reload-rollback-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -6101,12 +8244,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-win-release-x64-dev"
+      name: "vm-kernel-reload-rollback-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -6125,12 +8268,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-win-release-x64-stable"
+      name: "vm-kernel-reload-rollback-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -6149,7 +8292,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-reload-linux-debug-x64"
+      name: "vm-kernel-reload-rollback-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6173,7 +8316,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-reload-linux-debug-x64-dev"
+      name: "vm-kernel-reload-rollback-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6197,7 +8340,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-reload-linux-debug-x64-stable"
+      name: "vm-kernel-reload-rollback-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6221,7 +8364,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-reload-linux-release-x64"
+      name: "vm-kernel-reload-rollback-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6245,7 +8388,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-reload-linux-release-x64-dev"
+      name: "vm-kernel-reload-rollback-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6269,7 +8412,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-reload-linux-release-x64-stable"
+      name: "vm-kernel-tsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6284,7 +8427,7 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
-      priority: 50
+      priority: 70
       caches: <
         name: "browsers"
         path: "browsers"
@@ -6293,7 +8436,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-reload-rollback-linux-debug-x64"
+      name: "vm-kernel-tsan-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6308,7 +8451,7 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
-      priority: 50
+      priority: 70
       caches: <
         name: "browsers"
         path: "browsers"
@@ -6317,7 +8460,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-reload-rollback-linux-debug-x64-dev"
+      name: "vm-kernel-tsan-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6332,7 +8475,7 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
-      priority: 50
+      priority: 70
       caches: <
         name: "browsers"
         path: "browsers"
@@ -6341,7 +8484,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-reload-rollback-linux-debug-x64-stable"
+      name: "vm-kernel-tsan-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6356,7 +8499,7 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
-      priority: 50
+      priority: 70
       caches: <
         name: "browsers"
         path: "browsers"
@@ -6365,12 +8508,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-reload-rollback-linux-release-x64"
+      name: "vm-kernel-win-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -6389,12 +8532,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-reload-rollback-linux-release-x64-dev"
+      name: "vm-kernel-win-debug-ia32-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -6413,12 +8556,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-reload-rollback-linux-release-x64-stable"
+      name: "vm-kernel-win-debug-ia32-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -6437,12 +8580,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-tsan-linux-release-x64"
+      name: "vm-kernel-win-debug-ia32-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -6452,7 +8595,7 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
-      priority: 70
+      priority: 50
       caches: <
         name: "browsers"
         path: "browsers"
@@ -6461,12 +8604,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-tsan-linux-release-x64-dev"
+      name: "vm-kernel-win-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -6476,7 +8619,7 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
-      priority: 70
+      priority: 50
       caches: <
         name: "browsers"
         path: "browsers"
@@ -6485,12 +8628,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-tsan-linux-release-x64-stable"
+      name: "vm-kernel-win-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -6500,7 +8643,7 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
-      priority: 70
+      priority: 50
       caches: <
         name: "browsers"
         path: "browsers"
@@ -6509,7 +8652,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-win-debug-ia32"
+      name: "vm-kernel-win-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6533,7 +8676,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-win-debug-ia32-dev"
+      name: "vm-kernel-win-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6557,7 +8700,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-win-debug-ia32-stable"
+      name: "vm-kernel-win-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6581,7 +8724,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-win-debug-x64"
+      name: "vm-kernel-win-product-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6605,7 +8748,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-win-debug-x64-dev"
+      name: "vm-kernel-win-product-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6629,7 +8772,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-win-debug-x64-stable"
+      name: "vm-kernel-win-product-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6653,7 +8796,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-win-product-x64"
+      name: "vm-kernel-win-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6677,7 +8820,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-win-product-x64-dev"
+      name: "vm-kernel-win-release-ia32-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6701,7 +8844,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-win-product-x64-stable"
+      name: "vm-kernel-win-release-ia32-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6725,7 +8868,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-win-release-ia32"
+      name: "vm-kernel-win-release-ia32-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6749,7 +8892,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-win-release-ia32-dev"
+      name: "vm-kernel-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6773,7 +8916,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-win-release-ia32-stable"
+      name: "vm-kernel-win-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6797,7 +8940,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-win-release-x64"
+      name: "vm-kernel-win-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6821,7 +8964,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-win-release-x64-dev"
+      name: "vm-kernel-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6845,12 +8988,12 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-win-release-x64-stable"
+      name: "vm-precomp-ffi-qemu-linux-release-arm"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe: <
         name: "dart/neo"
@@ -6869,7 +9012,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-precomp-ffi-qemu-linux-release-arm"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 719839884498..fad09ee06404 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -120,7 +120,7 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64"
     category: "vm|nnbd"
-    short_name: "r"
+    short_name: "pr"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
@@ -807,7 +807,7 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64"
     category: "vm|nnbd"
-    short_name: "r"
+    short_name: "pr"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
@@ -1144,7 +1144,7 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-dev"
     category: "vm|nnbd"
-    short_name: "r"
+    short_name: "pr"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-dev"
@@ -1592,6 +1592,493 @@ consoles: <
     tree_status_host: "dart-status.appspot.com"
   >
 >
+consoles: <
+  id: "beta"
+  name: "SDK Beta Console"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/beta"
+  manifest_name: "REVISION"
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-beta"
+    category: "cfe"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-beta"
+    category: "cfe"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-beta"
+    category: "cfe"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-beta"
+    category: "cfe"
+    short_name: "nn"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-beta"
+    category: "vm|nnbd"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-beta"
+    category: "vm|nnbd"
+    short_name: "r"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-beta"
+    category: "vm|nnbd"
+    short_name: "pr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-beta"
+    category: "vm|app-kernel"
+    short_name: "d64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64-beta"
+    category: "vm|app-kernel"
+    short_name: "p64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-beta"
+    category: "vm|app-kernel"
+    short_name: "r64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64-beta"
+    category: "vm|dartkb"
+    short_name: "sr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-beta"
+    category: "vm|dartkb"
+    short_name: "r"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-abi-beta"
+    category: "vm|dartkb"
+    short_name: "abi"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-beta"
+    category: "vm|kernel"
+    short_name: "c"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-beta"
+    category: "vm|kernel"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-beta"
+    category: "vm|kernel"
+    short_name: "a32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-beta"
+    category: "vm|kernel"
+    short_name: "a64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32-beta"
+    category: "vm|kernel"
+    short_name: "r32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-beta"
+    category: "vm|kernel"
+    short_name: "r"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-beta"
+    category: "vm|kernel"
+    short_name: "rc"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32-beta"
+    category: "vm|kernel"
+    short_name: "d32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-beta"
+    category: "vm|kernel"
+    short_name: "md"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-beta"
+    category: "vm|kernel"
+    short_name: "mr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32-beta"
+    category: "vm|kernel"
+    short_name: "wd3"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-beta"
+    category: "vm|kernel"
+    short_name: "wd"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32-beta"
+    category: "vm|kernel"
+    short_name: "wr3"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-beta"
+    category: "vm|kernel"
+    short_name: "wr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-beta"
+    category: "vm|kernel"
+    short_name: "cra"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "p"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-beta"
+    category: "vm|kernel-precomp"
+    short_name: "a32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "a64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "r"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "o"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "adx"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "arx"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "ma"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "wr"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-beta"
+    category: "vm|kernel-precomp|android"
+    short_name: "a32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64-beta"
+    category: "vm|kernel-precomp|android"
+    short_name: "a64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-beta"
+    category: "vm|misc"
+    short_name: "a64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msan-linux-release-x64-beta"
+    category: "vm|misc"
+    short_name: "m64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-tsan-linux-release-x64-beta"
+    category: "vm|misc"
+    short_name: "t64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32-beta"
+    category: "vm|misc"
+    short_name: "o32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-beta"
+    category: "vm|misc"
+    short_name: "o64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64-beta"
+    category: "vm|product"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64-beta"
+    category: "vm|product"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64-beta"
+    category: "vm|product"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64-beta"
+    category: "vm|reload-kernel"
+    short_name: "d"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64-beta"
+    category: "vm|reload-kernel"
+    short_name: "r"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64-beta"
+    category: "vm|reload-kernel"
+    short_name: "drb"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64-beta"
+    category: "vm|reload-kernel"
+    short_name: "rrb"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-beta"
+    category: "vm|ffi"
+    short_name: "d32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-beta"
+    category: "vm|ffi"
+    short_name: "r32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-beta"
+    category: "vm|ffi"
+    short_name: "p32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64-beta"
+    category: "vm|ffi"
+    short_name: "d64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64-beta"
+    category: "vm|ffi"
+    short_name: "r64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64-beta"
+    category: "vm|ffi"
+    short_name: "p64"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-beta"
+    category: "vm|ffi"
+    short_name: "qe"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-beta"
+    category: "pkg"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-beta"
+    category: "pkg"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-beta"
+    category: "pkg"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-beta"
+    category: "dart2js|d8"
+    short_name: "ha"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-rti-linux-x64-d8-beta"
+    category: "dart2js|d8"
+    short_name: "rti"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-beta"
+    category: "dart2js|d8"
+    short_name: "mi"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-beta"
+    category: "dart2js|d8"
+    short_name: "u"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-beta"
+    category: "dart2js|chrome"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-beta"
+    category: "dart2js|chrome"
+    short_name: "csp"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-beta"
+    category: "dart2js|chrome"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-beta"
+    category: "dart2js|chrome"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-beta"
+    category: "dart2js|chrome"
+    short_name: "nn"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-beta"
+    category: "dart2js|firefox"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-beta"
+    category: "dart2js|safari"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11-beta"
+    category: "dart2js|ms"
+    short_name: "ie"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-beta"
+    category: "analyzer"
+    short_name: "as"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-beta"
+    category: "analyzer"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-beta"
+    category: "analyzer"
+    short_name: "nn"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-beta"
+    category: "analyzer"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-beta"
+    category: "analyzer"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/dart-sdk-linux-beta"
+    category: "sdk"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-beta"
+    category: "sdk"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/dart-sdk-win-beta"
+    category: "sdk"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-beta"
+    category: "ddc"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-beta"
+    category: "ddc"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-beta"
+    category: "ddc"
+    short_name: "w"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-beta"
+    category: "ddc"
+    short_name: "fl"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/gclient-beta"
+    category: "misc"
+    short_name: "g"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/debianpackage-linux-beta"
+    category: "misc"
+    short_name: "dp"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/versionchecker-linux-beta"
+    category: "misc"
+    short_name: "vc"
+  >
+  header: <
+    links: <
+      name: "Consoles"
+      links: <
+        text: "Bleeding Edge console"
+        url: "/p/dart/g/be/console"
+        alt: "SDK BE Console"
+      >
+      links: <
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (alternative)"
+      >
+      links: <
+        text: "FYI console"
+        url: "/p/dart/g/fyi/console"
+        alt: "SDK FYI Console"
+      >
+      links: <
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      >
+      links: <
+        text: "Results Feed"
+        url: "https://dart-ci.firebaseapp.com/"
+        alt: "Results Feed"
+      >
+    >
+    console_groups: <
+      console_ids: "dart/flutter"
+      console_ids: "dart/flutter-hhh"
+    >
+    tree_status_host: "dart-status.appspot.com"
+  >
+>
 consoles: <
   id: "stable"
   name: "SDK Stable Console"
@@ -1631,7 +2118,7 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-stable"
     category: "vm|nnbd"
-    short_name: "r"
+    short_name: "pr"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-stable"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 05a66719bc85..9da5dcef3dac 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -24,6 +24,16 @@ job: <
     builder: "analyzer-analysis-server-linux-analyzer-stable"
   >
 >
+job: <
+  id: "analyzer-analysis-server-linux-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-analysis-server-linux-beta"
+  >
+>
 job: <
   id: "analyzer-analysis-server-linux-dev"
   schedule: "triggered"
@@ -64,6 +74,16 @@ job: <
     builder: "analyzer-linux-release-analyzer-stable"
   >
 >
+job: <
+  id: "analyzer-linux-release-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-linux-release-beta"
+  >
+>
 job: <
   id: "analyzer-linux-release-dev"
   schedule: "triggered"
@@ -104,6 +124,16 @@ job: <
     builder: "analyzer-mac-release-analyzer-stable"
   >
 >
+job: <
+  id: "analyzer-mac-release-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-mac-release-beta"
+  >
+>
 job: <
   id: "analyzer-mac-release-dev"
   schedule: "triggered"
@@ -144,6 +174,16 @@ job: <
     builder: "analyzer-nnbd-linux-release-analyzer-stable"
   >
 >
+job: <
+  id: "analyzer-nnbd-linux-release-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-nnbd-linux-release-beta"
+  >
+>
 job: <
   id: "analyzer-nnbd-linux-release-dev"
   schedule: "triggered"
@@ -184,6 +224,16 @@ job: <
     builder: "analyzer-win-release-analyzer-stable"
   >
 >
+job: <
+  id: "analyzer-win-release-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-win-release-beta"
+  >
+>
 job: <
   id: "analyzer-win-release-dev"
   schedule: "triggered"
@@ -214,6 +264,16 @@ job: <
     builder: "app-kernel-linux-debug-x64"
   >
 >
+job: <
+  id: "app-kernel-linux-debug-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-debug-x64-beta"
+  >
+>
 job: <
   id: "app-kernel-linux-debug-x64-dev"
   schedule: "triggered"
@@ -244,6 +304,16 @@ job: <
     builder: "app-kernel-linux-product-x64"
   >
 >
+job: <
+  id: "app-kernel-linux-product-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-product-x64-beta"
+  >
+>
 job: <
   id: "app-kernel-linux-product-x64-dev"
   schedule: "triggered"
@@ -274,6 +344,16 @@ job: <
     builder: "app-kernel-linux-release-x64"
   >
 >
+job: <
+  id: "app-kernel-linux-release-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-release-x64-beta"
+  >
+>
 job: <
   id: "app-kernel-linux-release-x64-dev"
   schedule: "triggered"
@@ -314,6 +394,16 @@ job: <
     builder: "cross-vm-linux-release-arm64"
   >
 >
+job: <
+  id: "cross-vm-linux-release-arm64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "cross-vm-linux-release-arm64-beta"
+  >
+>
 job: <
   id: "cross-vm-linux-release-arm64-dev"
   schedule: "triggered"
@@ -344,6 +434,16 @@ job: <
     builder: "dart-sdk-linux"
   >
 >
+job: <
+  id: "dart-sdk-linux-beta"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-linux-beta"
+  >
+>
 job: <
   id: "dart-sdk-linux-dev"
   schedule: "triggered"
@@ -374,6 +474,16 @@ job: <
     builder: "dart-sdk-mac"
   >
 >
+job: <
+  id: "dart-sdk-mac-beta"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-mac-beta"
+  >
+>
 job: <
   id: "dart-sdk-mac-dev"
   schedule: "triggered"
@@ -404,6 +514,16 @@ job: <
     builder: "dart-sdk-win"
   >
 >
+job: <
+  id: "dart-sdk-win-beta"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-win-beta"
+  >
+>
 job: <
   id: "dart-sdk-win-dev"
   schedule: "triggered"
@@ -434,6 +554,16 @@ job: <
     builder: "dart2js-csp-minified-linux-x64-chrome"
   >
 >
+job: <
+  id: "dart2js-csp-minified-linux-x64-chrome-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-csp-minified-linux-x64-chrome-beta"
+  >
+>
 job: <
   id: "dart2js-csp-minified-linux-x64-chrome-dev"
   schedule: "triggered"
@@ -464,6 +594,16 @@ job: <
     builder: "dart2js-minified-strong-linux-x64-d8"
   >
 >
+job: <
+  id: "dart2js-minified-strong-linux-x64-d8-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-minified-strong-linux-x64-d8-beta"
+  >
+>
 job: <
   id: "dart2js-minified-strong-linux-x64-d8-dev"
   schedule: "triggered"
@@ -494,6 +634,16 @@ job: <
     builder: "dart2js-nnbd-linux-x64-chrome"
   >
 >
+job: <
+  id: "dart2js-nnbd-linux-x64-chrome-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-nnbd-linux-x64-chrome-beta"
+  >
+>
 job: <
   id: "dart2js-nnbd-linux-x64-chrome-dev"
   schedule: "triggered"
@@ -524,6 +674,16 @@ job: <
     builder: "dart2js-rti-linux-x64-d8"
   >
 >
+job: <
+  id: "dart2js-rti-linux-x64-d8-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-rti-linux-x64-d8-beta"
+  >
+>
 job: <
   id: "dart2js-rti-linux-x64-d8-dev"
   schedule: "triggered"
@@ -554,6 +714,16 @@ job: <
     builder: "dart2js-strong-hostasserts-linux-ia32-d8"
   >
 >
+job: <
+  id: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
+  >
+>
 job: <
   id: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
   schedule: "triggered"
@@ -584,6 +754,16 @@ job: <
     builder: "dart2js-strong-linux-x64-chrome"
   >
 >
+job: <
+  id: "dart2js-strong-linux-x64-chrome-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-linux-x64-chrome-beta"
+  >
+>
 job: <
   id: "dart2js-strong-linux-x64-chrome-dev"
   schedule: "triggered"
@@ -614,6 +794,16 @@ job: <
     builder: "dart2js-strong-linux-x64-firefox"
   >
 >
+job: <
+  id: "dart2js-strong-linux-x64-firefox-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-linux-x64-firefox-beta"
+  >
+>
 job: <
   id: "dart2js-strong-linux-x64-firefox-dev"
   schedule: "triggered"
@@ -644,6 +834,16 @@ job: <
     builder: "dart2js-strong-mac-x64-chrome"
   >
 >
+job: <
+  id: "dart2js-strong-mac-x64-chrome-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-mac-x64-chrome-beta"
+  >
+>
 job: <
   id: "dart2js-strong-mac-x64-chrome-dev"
   schedule: "triggered"
@@ -674,6 +874,16 @@ job: <
     builder: "dart2js-strong-mac-x64-safari"
   >
 >
+job: <
+  id: "dart2js-strong-mac-x64-safari-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-mac-x64-safari-beta"
+  >
+>
 job: <
   id: "dart2js-strong-mac-x64-safari-dev"
   schedule: "triggered"
@@ -704,6 +914,16 @@ job: <
     builder: "dart2js-strong-win-x64-chrome"
   >
 >
+job: <
+  id: "dart2js-strong-win-x64-chrome-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-win-x64-chrome-beta"
+  >
+>
 job: <
   id: "dart2js-strong-win-x64-chrome-dev"
   schedule: "triggered"
@@ -734,6 +954,16 @@ job: <
     builder: "dart2js-strong-win-x64-ie11"
   >
 >
+job: <
+  id: "dart2js-strong-win-x64-ie11-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-win-x64-ie11-beta"
+  >
+>
 job: <
   id: "dart2js-strong-win-x64-ie11-dev"
   schedule: "triggered"
@@ -764,6 +994,16 @@ job: <
     builder: "dart2js-unit-linux-x64-release"
   >
 >
+job: <
+  id: "dart2js-unit-linux-x64-release-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-unit-linux-x64-release-beta"
+  >
+>
 job: <
   id: "dart2js-unit-linux-x64-release-dev"
   schedule: "triggered"
@@ -794,6 +1034,16 @@ job: <
     builder: "ddc-linux-release-chrome"
   >
 >
+job: <
+  id: "ddc-linux-release-chrome-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddc-linux-release-chrome-beta"
+  >
+>
 job: <
   id: "ddc-linux-release-chrome-dev"
   schedule: "triggered"
@@ -824,6 +1074,16 @@ job: <
     builder: "ddc-mac-release-chrome"
   >
 >
+job: <
+  id: "ddc-mac-release-chrome-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddc-mac-release-chrome-beta"
+  >
+>
 job: <
   id: "ddc-mac-release-chrome-dev"
   schedule: "triggered"
@@ -864,6 +1124,16 @@ job: <
     builder: "ddc-win-release-chrome"
   >
 >
+job: <
+  id: "ddc-win-release-chrome-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddc-win-release-chrome-beta"
+  >
+>
 job: <
   id: "ddc-win-release-chrome-dev"
   schedule: "triggered"
@@ -894,6 +1164,16 @@ job: <
     builder: "ddk-linux-release-firefox"
   >
 >
+job: <
+  id: "ddk-linux-release-firefox-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddk-linux-release-firefox-beta"
+  >
+>
 job: <
   id: "ddk-linux-release-firefox-dev"
   schedule: "triggered"
@@ -924,6 +1204,16 @@ job: <
     builder: "debianpackage-linux"
   >
 >
+job: <
+  id: "debianpackage-linux-beta"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "debianpackage-linux-beta"
+  >
+>
 job: <
   id: "debianpackage-linux-dev"
   schedule: "triggered"
@@ -984,6 +1274,16 @@ job: <
     builder: "front-end-linux-release-x64"
   >
 >
+job: <
+  id: "front-end-linux-release-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-linux-release-x64-beta"
+  >
+>
 job: <
   id: "front-end-linux-release-x64-dev"
   schedule: "triggered"
@@ -1014,6 +1314,16 @@ job: <
     builder: "front-end-mac-release-x64"
   >
 >
+job: <
+  id: "front-end-mac-release-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-mac-release-x64-beta"
+  >
+>
 job: <
   id: "front-end-mac-release-x64-dev"
   schedule: "triggered"
@@ -1044,6 +1354,16 @@ job: <
     builder: "front-end-nnbd-linux-release-x64"
   >
 >
+job: <
+  id: "front-end-nnbd-linux-release-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-nnbd-linux-release-x64-beta"
+  >
+>
 job: <
   id: "front-end-nnbd-linux-release-x64-dev"
   schedule: "triggered"
@@ -1074,6 +1394,16 @@ job: <
     builder: "front-end-win-release-x64"
   >
 >
+job: <
+  id: "front-end-win-release-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-win-release-x64-beta"
+  >
+>
 job: <
   id: "front-end-win-release-x64-dev"
   schedule: "triggered"
@@ -1114,6 +1444,16 @@ job: <
     builder: "gclient"
   >
 >
+job: <
+  id: "gclient-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "gclient-beta"
+  >
+>
 job: <
   id: "gclient-dev"
   schedule: "triggered"
@@ -1168,6 +1508,16 @@ job: <
     builder: "pkg-linux-release"
   >
 >
+job: <
+  id: "pkg-linux-release-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-linux-release-beta"
+  >
+>
 job: <
   id: "pkg-linux-release-dev"
   schedule: "triggered"
@@ -1198,6 +1548,16 @@ job: <
     builder: "pkg-mac-release"
   >
 >
+job: <
+  id: "pkg-mac-release-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-mac-release-beta"
+  >
+>
 job: <
   id: "pkg-mac-release-dev"
   schedule: "triggered"
@@ -1228,6 +1588,16 @@ job: <
     builder: "pkg-win-release"
   >
 >
+job: <
+  id: "pkg-win-release-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-win-release-beta"
+  >
+>
 job: <
   id: "pkg-win-release-dev"
   schedule: "triggered"
@@ -1268,6 +1638,16 @@ job: <
     builder: "versionchecker-linux"
   >
 >
+job: <
+  id: "versionchecker-linux-beta"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "versionchecker-linux-beta"
+  >
+>
 job: <
   id: "versionchecker-linux-dev"
   schedule: "triggered"
@@ -1298,6 +1678,16 @@ job: <
     builder: "vm-canary-linux-debug"
   >
 >
+job: <
+  id: "vm-canary-linux-debug-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-canary-linux-debug-beta"
+  >
+>
 job: <
   id: "vm-canary-linux-debug-dev"
   schedule: "triggered"
@@ -1328,6 +1718,16 @@ job: <
     builder: "vm-dartkb-linux-release-simarm64"
   >
 >
+job: <
+  id: "vm-dartkb-linux-release-simarm64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-release-simarm64-beta"
+  >
+>
 job: <
   id: "vm-dartkb-linux-release-simarm64-dev"
   schedule: "triggered"
@@ -1368,6 +1768,16 @@ job: <
     builder: "vm-dartkb-linux-release-x64-abi"
   >
 >
+job: <
+  id: "vm-dartkb-linux-release-x64-abi-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-release-x64-abi-beta"
+  >
+>
 job: <
   id: "vm-dartkb-linux-release-x64-abi-dev"
   schedule: "triggered"
@@ -1388,6 +1798,16 @@ job: <
     builder: "vm-dartkb-linux-release-x64-abi-stable"
   >
 >
+job: <
+  id: "vm-dartkb-linux-release-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-dartkb-linux-release-x64-beta"
+  >
+>
 job: <
   id: "vm-dartkb-linux-release-x64-dev"
   schedule: "triggered"
@@ -1418,6 +1838,16 @@ job: <
     builder: "vm-ffi-android-debug-arm"
   >
 >
+job: <
+  id: "vm-ffi-android-debug-arm-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-debug-arm-beta"
+  >
+>
 job: <
   id: "vm-ffi-android-debug-arm-dev"
   schedule: "triggered"
@@ -1448,6 +1878,16 @@ job: <
     builder: "vm-ffi-android-debug-arm64"
   >
 >
+job: <
+  id: "vm-ffi-android-debug-arm64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-debug-arm64-beta"
+  >
+>
 job: <
   id: "vm-ffi-android-debug-arm64-dev"
   schedule: "triggered"
@@ -1478,6 +1918,16 @@ job: <
     builder: "vm-ffi-android-product-arm"
   >
 >
+job: <
+  id: "vm-ffi-android-product-arm-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-product-arm-beta"
+  >
+>
 job: <
   id: "vm-ffi-android-product-arm-dev"
   schedule: "triggered"
@@ -1508,6 +1958,16 @@ job: <
     builder: "vm-ffi-android-product-arm64"
   >
 >
+job: <
+  id: "vm-ffi-android-product-arm64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-product-arm64-beta"
+  >
+>
 job: <
   id: "vm-ffi-android-product-arm64-dev"
   schedule: "triggered"
@@ -1538,6 +1998,16 @@ job: <
     builder: "vm-ffi-android-release-arm"
   >
 >
+job: <
+  id: "vm-ffi-android-release-arm-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-release-arm-beta"
+  >
+>
 job: <
   id: "vm-ffi-android-release-arm-dev"
   schedule: "triggered"
@@ -1568,6 +2038,16 @@ job: <
     builder: "vm-ffi-android-release-arm64"
   >
 >
+job: <
+  id: "vm-ffi-android-release-arm64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-release-arm64-beta"
+  >
+>
 job: <
   id: "vm-ffi-android-release-arm64-dev"
   schedule: "triggered"
@@ -1598,6 +2078,16 @@ job: <
     builder: "vm-kernel-asan-linux-release-x64"
   >
 >
+job: <
+  id: "vm-kernel-asan-linux-release-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-asan-linux-release-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-asan-linux-release-x64-dev"
   schedule: "triggered"
@@ -1628,6 +2118,16 @@ job: <
     builder: "vm-kernel-checked-linux-release-x64"
   >
 >
+job: <
+  id: "vm-kernel-checked-linux-release-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-checked-linux-release-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-checked-linux-release-x64-dev"
   schedule: "triggered"
@@ -1658,6 +2158,16 @@ job: <
     builder: "vm-kernel-linux-debug-ia32"
   >
 >
+job: <
+  id: "vm-kernel-linux-debug-ia32-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-ia32-beta"
+  >
+>
 job: <
   id: "vm-kernel-linux-debug-ia32-dev"
   schedule: "triggered"
@@ -1688,6 +2198,16 @@ job: <
     builder: "vm-kernel-linux-debug-x64"
   >
 >
+job: <
+  id: "vm-kernel-linux-debug-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-linux-debug-x64-dev"
   schedule: "triggered"
@@ -1718,6 +2238,16 @@ job: <
     builder: "vm-kernel-linux-product-x64"
   >
 >
+job: <
+  id: "vm-kernel-linux-product-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-product-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-linux-product-x64-dev"
   schedule: "triggered"
@@ -1748,6 +2278,16 @@ job: <
     builder: "vm-kernel-linux-release-ia32"
   >
 >
+job: <
+  id: "vm-kernel-linux-release-ia32-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-ia32-beta"
+  >
+>
 job: <
   id: "vm-kernel-linux-release-ia32-dev"
   schedule: "triggered"
@@ -1778,6 +2318,16 @@ job: <
     builder: "vm-kernel-linux-release-simarm"
   >
 >
+job: <
+  id: "vm-kernel-linux-release-simarm-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-simarm-beta"
+  >
+>
 job: <
   id: "vm-kernel-linux-release-simarm-dev"
   schedule: "triggered"
@@ -1808,6 +2358,16 @@ job: <
     builder: "vm-kernel-linux-release-simarm64"
   >
 >
+job: <
+  id: "vm-kernel-linux-release-simarm64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-simarm64-beta"
+  >
+>
 job: <
   id: "vm-kernel-linux-release-simarm64-dev"
   schedule: "triggered"
@@ -1838,6 +2398,16 @@ job: <
     builder: "vm-kernel-linux-release-x64"
   >
 >
+job: <
+  id: "vm-kernel-linux-release-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-linux-release-x64-dev"
   schedule: "triggered"
@@ -1868,6 +2438,16 @@ job: <
     builder: "vm-kernel-mac-debug-x64"
   >
 >
+job: <
+  id: "vm-kernel-mac-debug-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-debug-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-mac-debug-x64-dev"
   schedule: "triggered"
@@ -1898,6 +2478,16 @@ job: <
     builder: "vm-kernel-mac-product-x64"
   >
 >
+job: <
+  id: "vm-kernel-mac-product-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-product-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-mac-product-x64-dev"
   schedule: "triggered"
@@ -1928,6 +2518,16 @@ job: <
     builder: "vm-kernel-mac-release-x64"
   >
 >
+job: <
+  id: "vm-kernel-mac-release-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-release-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-mac-release-x64-dev"
   schedule: "triggered"
@@ -1958,6 +2558,16 @@ job: <
     builder: "vm-kernel-msan-linux-release-x64"
   >
 >
+job: <
+  id: "vm-kernel-msan-linux-release-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-msan-linux-release-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-msan-linux-release-x64-dev"
   schedule: "triggered"
@@ -1988,6 +2598,16 @@ job: <
     builder: "vm-kernel-nnbd-linux-debug-x64"
   >
 >
+job: <
+  id: "vm-kernel-nnbd-linux-debug-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-linux-debug-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-nnbd-linux-debug-x64-dev"
   schedule: "triggered"
@@ -2018,6 +2638,16 @@ job: <
     builder: "vm-kernel-nnbd-linux-release-x64"
   >
 >
+job: <
+  id: "vm-kernel-nnbd-linux-release-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-linux-release-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-nnbd-linux-release-x64-dev"
   schedule: "triggered"
@@ -2048,6 +2678,16 @@ job: <
     builder: "vm-kernel-optcounter-threshold-linux-release-ia32"
   >
 >
+job: <
+  id: "vm-kernel-optcounter-threshold-linux-release-ia32-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-optcounter-threshold-linux-release-ia32-beta"
+  >
+>
 job: <
   id: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
   schedule: "triggered"
@@ -2078,6 +2718,16 @@ job: <
     builder: "vm-kernel-optcounter-threshold-linux-release-x64"
   >
 >
+job: <
+  id: "vm-kernel-optcounter-threshold-linux-release-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-optcounter-threshold-linux-release-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
   schedule: "triggered"
@@ -2108,6 +2758,16 @@ job: <
     builder: "vm-kernel-precomp-android-release-arm64"
   >
 >
+job: <
+  id: "vm-kernel-precomp-android-release-arm64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-android-release-arm64-beta"
+  >
+>
 job: <
   id: "vm-kernel-precomp-android-release-arm64-dev"
   schedule: "triggered"
@@ -2138,6 +2798,16 @@ job: <
     builder: "vm-kernel-precomp-android-release-arm_x64"
   >
 >
+job: <
+  id: "vm-kernel-precomp-android-release-arm_x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-android-release-arm_x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-precomp-android-release-arm_x64-dev"
   schedule: "triggered"
@@ -2168,6 +2838,16 @@ job: <
     builder: "vm-kernel-precomp-linux-debug-simarm_x64"
   >
 >
+job: <
+  id: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
   schedule: "triggered"
@@ -2198,6 +2878,16 @@ job: <
     builder: "vm-kernel-precomp-linux-debug-x64"
   >
 >
+job: <
+  id: "vm-kernel-precomp-linux-debug-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-debug-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-precomp-linux-debug-x64-dev"
   schedule: "triggered"
@@ -2228,6 +2918,16 @@ job: <
     builder: "vm-kernel-precomp-linux-product-x64"
   >
 >
+job: <
+  id: "vm-kernel-precomp-linux-product-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-product-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-precomp-linux-product-x64-dev"
   schedule: "triggered"
@@ -2258,6 +2958,16 @@ job: <
     builder: "vm-kernel-precomp-linux-release-simarm"
   >
 >
+job: <
+  id: "vm-kernel-precomp-linux-release-simarm-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-simarm-beta"
+  >
+>
 job: <
   id: "vm-kernel-precomp-linux-release-simarm-dev"
   schedule: "triggered"
@@ -2288,6 +2998,16 @@ job: <
     builder: "vm-kernel-precomp-linux-release-simarm64"
   >
 >
+job: <
+  id: "vm-kernel-precomp-linux-release-simarm64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-simarm64-beta"
+  >
+>
 job: <
   id: "vm-kernel-precomp-linux-release-simarm64-dev"
   schedule: "triggered"
@@ -2318,6 +3038,16 @@ job: <
     builder: "vm-kernel-precomp-linux-release-simarm_x64"
   >
 >
+job: <
+  id: "vm-kernel-precomp-linux-release-simarm_x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-simarm_x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-precomp-linux-release-simarm_x64-dev"
   schedule: "triggered"
@@ -2348,6 +3078,16 @@ job: <
     builder: "vm-kernel-precomp-linux-release-x64"
   >
 >
+job: <
+  id: "vm-kernel-precomp-linux-release-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-precomp-linux-release-x64-dev"
   schedule: "triggered"
@@ -2378,6 +3118,16 @@ job: <
     builder: "vm-kernel-precomp-mac-release-simarm64"
   >
 >
+job: <
+  id: "vm-kernel-precomp-mac-release-simarm64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-mac-release-simarm64-beta"
+  >
+>
 job: <
   id: "vm-kernel-precomp-mac-release-simarm64-dev"
   schedule: "triggered"
@@ -2408,6 +3158,16 @@ job: <
     builder: "vm-kernel-precomp-nnbd-linux-release-x64"
   >
 >
+job: <
+  id: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
   schedule: "triggered"
@@ -2438,6 +3198,16 @@ job: <
     builder: "vm-kernel-precomp-obfuscate-linux-release-x64"
   >
 >
+job: <
+  id: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
   schedule: "triggered"
@@ -2468,6 +3238,16 @@ job: <
     builder: "vm-kernel-precomp-win-release-x64"
   >
 >
+job: <
+  id: "vm-kernel-precomp-win-release-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-win-release-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-precomp-win-release-x64-dev"
   schedule: "triggered"
@@ -2498,6 +3278,16 @@ job: <
     builder: "vm-kernel-reload-linux-debug-x64"
   >
 >
+job: <
+  id: "vm-kernel-reload-linux-debug-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-linux-debug-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-reload-linux-debug-x64-dev"
   schedule: "triggered"
@@ -2528,6 +3318,16 @@ job: <
     builder: "vm-kernel-reload-linux-release-x64"
   >
 >
+job: <
+  id: "vm-kernel-reload-linux-release-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-linux-release-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-reload-linux-release-x64-dev"
   schedule: "triggered"
@@ -2558,6 +3358,16 @@ job: <
     builder: "vm-kernel-reload-rollback-linux-debug-x64"
   >
 >
+job: <
+  id: "vm-kernel-reload-rollback-linux-debug-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-rollback-linux-debug-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-reload-rollback-linux-debug-x64-dev"
   schedule: "triggered"
@@ -2588,6 +3398,16 @@ job: <
     builder: "vm-kernel-reload-rollback-linux-release-x64"
   >
 >
+job: <
+  id: "vm-kernel-reload-rollback-linux-release-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-rollback-linux-release-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-reload-rollback-linux-release-x64-dev"
   schedule: "triggered"
@@ -2618,6 +3438,16 @@ job: <
     builder: "vm-kernel-tsan-linux-release-x64"
   >
 >
+job: <
+  id: "vm-kernel-tsan-linux-release-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-tsan-linux-release-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-tsan-linux-release-x64-dev"
   schedule: "triggered"
@@ -2648,6 +3478,16 @@ job: <
     builder: "vm-kernel-win-debug-ia32"
   >
 >
+job: <
+  id: "vm-kernel-win-debug-ia32-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-debug-ia32-beta"
+  >
+>
 job: <
   id: "vm-kernel-win-debug-ia32-dev"
   schedule: "triggered"
@@ -2678,6 +3518,16 @@ job: <
     builder: "vm-kernel-win-debug-x64"
   >
 >
+job: <
+  id: "vm-kernel-win-debug-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-debug-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-win-debug-x64-dev"
   schedule: "triggered"
@@ -2708,6 +3558,16 @@ job: <
     builder: "vm-kernel-win-product-x64"
   >
 >
+job: <
+  id: "vm-kernel-win-product-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-product-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-win-product-x64-dev"
   schedule: "triggered"
@@ -2738,6 +3598,16 @@ job: <
     builder: "vm-kernel-win-release-ia32"
   >
 >
+job: <
+  id: "vm-kernel-win-release-ia32-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-release-ia32-beta"
+  >
+>
 job: <
   id: "vm-kernel-win-release-ia32-dev"
   schedule: "triggered"
@@ -2768,6 +3638,16 @@ job: <
     builder: "vm-kernel-win-release-x64"
   >
 >
+job: <
+  id: "vm-kernel-win-release-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-release-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-win-release-x64-dev"
   schedule: "triggered"
@@ -2798,6 +3678,16 @@ job: <
     builder: "vm-precomp-ffi-qemu-linux-release-arm"
   >
 >
+job: <
+  id: "vm-precomp-ffi-qemu-linux-release-arm-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-precomp-ffi-qemu-linux-release-arm-beta"
+  >
+>
 job: <
   id: "vm-precomp-ffi-qemu-linux-release-arm-dev"
   schedule: "triggered"
@@ -2849,6 +3739,103 @@ trigger: <
     refs: "regexp:refs/heads/analyzer-stable"
   >
 >
+trigger: <
+  id: "dart-gitiles-trigger-beta"
+  acl_sets: "ci"
+  triggers: "dart-sdk-linux-beta"
+  triggers: "dart-sdk-mac-beta"
+  triggers: "dart-sdk-win-beta"
+  triggers: "debianpackage-linux-beta"
+  triggers: "versionchecker-linux-beta"
+  triggers: "analyzer-analysis-server-linux-beta"
+  triggers: "analyzer-linux-release-beta"
+  triggers: "analyzer-mac-release-beta"
+  triggers: "analyzer-nnbd-linux-release-beta"
+  triggers: "analyzer-win-release-beta"
+  triggers: "app-kernel-linux-debug-x64-beta"
+  triggers: "app-kernel-linux-product-x64-beta"
+  triggers: "app-kernel-linux-release-x64-beta"
+  triggers: "cross-vm-linux-release-arm64-beta"
+  triggers: "dart2js-csp-minified-linux-x64-chrome-beta"
+  triggers: "dart2js-minified-strong-linux-x64-d8-beta"
+  triggers: "dart2js-nnbd-linux-x64-chrome-beta"
+  triggers: "dart2js-rti-linux-x64-d8-beta"
+  triggers: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
+  triggers: "dart2js-strong-linux-x64-chrome-beta"
+  triggers: "dart2js-strong-linux-x64-firefox-beta"
+  triggers: "dart2js-strong-mac-x64-chrome-beta"
+  triggers: "dart2js-strong-mac-x64-safari-beta"
+  triggers: "dart2js-strong-win-x64-chrome-beta"
+  triggers: "dart2js-strong-win-x64-ie11-beta"
+  triggers: "dart2js-unit-linux-x64-release-beta"
+  triggers: "ddc-linux-release-chrome-beta"
+  triggers: "ddc-mac-release-chrome-beta"
+  triggers: "ddc-win-release-chrome-beta"
+  triggers: "ddk-linux-release-firefox-beta"
+  triggers: "front-end-linux-release-x64-beta"
+  triggers: "front-end-mac-release-x64-beta"
+  triggers: "front-end-nnbd-linux-release-x64-beta"
+  triggers: "front-end-win-release-x64-beta"
+  triggers: "gclient-beta"
+  triggers: "pkg-linux-release-beta"
+  triggers: "pkg-mac-release-beta"
+  triggers: "pkg-win-release-beta"
+  triggers: "vm-canary-linux-debug-beta"
+  triggers: "vm-dartkb-linux-release-simarm64-beta"
+  triggers: "vm-dartkb-linux-release-x64-abi-beta"
+  triggers: "vm-dartkb-linux-release-x64-beta"
+  triggers: "vm-ffi-android-debug-arm-beta"
+  triggers: "vm-ffi-android-debug-arm64-beta"
+  triggers: "vm-ffi-android-product-arm-beta"
+  triggers: "vm-ffi-android-product-arm64-beta"
+  triggers: "vm-ffi-android-release-arm-beta"
+  triggers: "vm-ffi-android-release-arm64-beta"
+  triggers: "vm-kernel-asan-linux-release-x64-beta"
+  triggers: "vm-kernel-checked-linux-release-x64-beta"
+  triggers: "vm-kernel-linux-debug-ia32-beta"
+  triggers: "vm-kernel-linux-debug-x64-beta"
+  triggers: "vm-kernel-linux-product-x64-beta"
+  triggers: "vm-kernel-linux-release-ia32-beta"
+  triggers: "vm-kernel-linux-release-simarm-beta"
+  triggers: "vm-kernel-linux-release-simarm64-beta"
+  triggers: "vm-kernel-linux-release-x64-beta"
+  triggers: "vm-kernel-mac-debug-x64-beta"
+  triggers: "vm-kernel-mac-product-x64-beta"
+  triggers: "vm-kernel-mac-release-x64-beta"
+  triggers: "vm-kernel-msan-linux-release-x64-beta"
+  triggers: "vm-kernel-nnbd-linux-debug-x64-beta"
+  triggers: "vm-kernel-nnbd-linux-release-x64-beta"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-beta"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-x64-beta"
+  triggers: "vm-kernel-precomp-android-release-arm64-beta"
+  triggers: "vm-kernel-precomp-android-release-arm_x64-beta"
+  triggers: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
+  triggers: "vm-kernel-precomp-linux-debug-x64-beta"
+  triggers: "vm-kernel-precomp-linux-product-x64-beta"
+  triggers: "vm-kernel-precomp-linux-release-simarm-beta"
+  triggers: "vm-kernel-precomp-linux-release-simarm64-beta"
+  triggers: "vm-kernel-precomp-linux-release-simarm_x64-beta"
+  triggers: "vm-kernel-precomp-linux-release-x64-beta"
+  triggers: "vm-kernel-precomp-mac-release-simarm64-beta"
+  triggers: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
+  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+  triggers: "vm-kernel-precomp-win-release-x64-beta"
+  triggers: "vm-kernel-reload-linux-debug-x64-beta"
+  triggers: "vm-kernel-reload-linux-release-x64-beta"
+  triggers: "vm-kernel-reload-rollback-linux-debug-x64-beta"
+  triggers: "vm-kernel-reload-rollback-linux-release-x64-beta"
+  triggers: "vm-kernel-tsan-linux-release-x64-beta"
+  triggers: "vm-kernel-win-debug-ia32-beta"
+  triggers: "vm-kernel-win-debug-x64-beta"
+  triggers: "vm-kernel-win-product-x64-beta"
+  triggers: "vm-kernel-win-release-ia32-beta"
+  triggers: "vm-kernel-win-release-x64-beta"
+  triggers: "vm-precomp-ffi-qemu-linux-release-arm-beta"
+  gitiles: <
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/beta"
+  >
+>
 trigger: <
   id: "dart-gitiles-trigger-dev"
   acl_sets: "ci"
diff --git a/main.star b/main.star
index a071e7c5c2e8..90e2d2efac00 100755
--- a/main.star
+++ b/main.star
@@ -20,10 +20,10 @@ GOMA_RBE = {
     "use_luci_auth": True
 }
 
-RELEASE_CHANNELS = ["dev", "stable"]
+RELEASE_CHANNELS = ["beta", "dev", "stable"]
 CHANNELS = RELEASE_CHANNELS + ["try"]
 ANALYZER_CHANNELS = ["analyzer-stable"] + CHANNELS
-BRANCHES = ["master", "dev", "stable"]
+BRANCHES = ["master"] + RELEASE_CHANNELS
 
 TEST_PY_PATHS = "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
 
@@ -159,6 +159,14 @@ luci.console_view(
     header="console-header.textpb",
 )
 
+luci.console_view(
+    name="beta",
+    repo="https://dart.googlesource.com/sdk",
+    title="SDK Beta Console",
+    refs=["refs/heads/beta"],
+    header="console-header.textpb",
+)
+
 luci.console_view(
     name="stable",
     repo="https://dart.googlesource.com/sdk",
@@ -281,7 +289,8 @@ luci.cq(
 
 luci.cq_group(
     name="sdk",
-    watch=cq.refset(DART_GERRIT, refs=["refs/heads/.+"]),
+    watch=cq.refset(
+        DART_GERRIT, refs=["refs/heads/%s" % branch for branch in BRANCHES]),
     allow_submit_with_open_deps=True,
     tree_status_host="dart-status.appspot.com",
     retry_config=cq.RETRY_NONE,
@@ -401,8 +410,8 @@ def dart_builder(name,
                 triggered_by = [
                     trigger.replace("%s", branch) for trigger in triggered_by
                 ]
-                if channel in ["dev", "stable"]:
-                    # Always run vm builders on dev and stable.
+                if channel in RELEASE_CHANNELS:
+                    # Always run vm builders on release channels.
                     triggered_by = [
                         trigger.replace("dart-vm-", "dart-")
                         for trigger in triggered_by
@@ -521,7 +530,7 @@ dart_vm_extra_builder(
 dart_vm_extra_builder(
     "vm-kernel-nnbd-linux-release-x64", category="vm|nnbd|r", on_cq=True)
 dart_vm_extra_builder(
-    "vm-kernel-precomp-nnbd-linux-release-x64", category="vm|nnbd|r")
+    "vm-kernel-precomp-nnbd-linux-release-x64", category="vm|nnbd|pr")
 
 # vm|app-kernel
 dart_vm_extra_builder(

From 75e9a7833fa267473586a3ed91569cf11bfd4cd1 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 6 Apr 2020 16:09:25 +0000
Subject: [PATCH 355/826] [infra] Add AOT sanitizer bots.

Bug: https://github.com/dart-lang/sdk/issues/39611
Change-Id: I71f35c1220d919aa5661beb5a649c19dd770ff83
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/141761
Reviewed-by: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg   |  12 ++
 cr-buildbucket.cfg | 288 +++++++++++++++++++++++++++++++++++++++++++++
 luci-milo.cfg      | 145 +++++++++++++++++------
 luci-notify.cfg    |  42 +++++++
 luci-scheduler.cfg |  99 ++++++++++++++++
 main.star          |  16 ++-
 6 files changed, 559 insertions(+), 43 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index c6cc61e2eb6d..5ee20db86a1e 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -437,6 +437,10 @@ config_groups: <
         name: "dart/try/vm-kernel-precomp-android-release-arm_x64-try"
         includable_only: true
       >
+      builders: <
+        name: "dart/try/vm-kernel-precomp-asan-linux-release-x64-try"
+        includable_only: true
+      >
       builders: <
         name: "dart/try/vm-kernel-precomp-linux-debug-simarm_x64-try"
         includable_only: true
@@ -469,6 +473,10 @@ config_groups: <
         name: "dart/try/vm-kernel-precomp-mac-release-simarm64-try"
         includable_only: true
       >
+      builders: <
+        name: "dart/try/vm-kernel-precomp-msan-linux-release-x64-try"
+        includable_only: true
+      >
       builders: <
         name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
         includable_only: true
@@ -477,6 +485,10 @@ config_groups: <
         name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
         includable_only: true
       >
+      builders: <
+        name: "dart/try/vm-kernel-precomp-tsan-linux-release-x64-try"
+        includable_only: true
+      >
       builders: <
         name: "dart/try/vm-kernel-precomp-win-release-x64-try"
         includable_only: true
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 5af9dffa8a45..b78932c5933a 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -6967,6 +6967,78 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-kernel-precomp-asan-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 70
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-asan-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 70
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-asan-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 70
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-precomp-linux-debug-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -7739,6 +7811,78 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-kernel-precomp-msan-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 70
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-msan-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 70
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-msan-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 70
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-precomp-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -7931,6 +8075,78 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-kernel-precomp-tsan-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 70
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-tsan-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 70
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "vm-kernel-precomp-tsan-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 70
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-precomp-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10790,6 +11006,30 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-kernel-precomp-asan-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-precomp-linux-debug-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10983,6 +11223,30 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-kernel-precomp-msan-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-precomp-nnbd-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -11031,6 +11295,30 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-kernel-precomp-tsan-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-precomp-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index fad09ee06404..6ce931bd72d3 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -287,30 +287,45 @@ consoles: <
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
+    category: "vm|misc"
+    short_name: "o32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
+    category: "vm|misc"
+    short_name: "o64"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
     category: "vm|misc"
-    short_name: "a64"
+    short_name: "a"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msan-linux-release-x64"
     category: "vm|misc"
-    short_name: "m64"
+    short_name: "m"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-tsan-linux-release-x64"
     category: "vm|misc"
-    short_name: "t64"
+    short_name: "t"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
-    category: "vm|misc"
-    short_name: "o32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-asan-linux-release-x64"
+    category: "vm|misc|aot"
+    short_name: "a"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
-    category: "vm|misc"
-    short_name: "o64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-msan-linux-release-x64"
+    category: "vm|misc|aot"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-tsan-linux-release-x64"
+    category: "vm|misc|aot"
+    short_name: "t"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
@@ -974,30 +989,45 @@ consoles: <
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
+    category: "vm|misc"
+    short_name: "o32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
+    category: "vm|misc"
+    short_name: "o64"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
     category: "vm|misc"
-    short_name: "a64"
+    short_name: "a"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msan-linux-release-x64"
     category: "vm|misc"
-    short_name: "m64"
+    short_name: "m"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-tsan-linux-release-x64"
     category: "vm|misc"
-    short_name: "t64"
+    short_name: "t"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
-    category: "vm|misc"
-    short_name: "o32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-asan-linux-release-x64"
+    category: "vm|misc|aot"
+    short_name: "a"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
-    category: "vm|misc"
-    short_name: "o64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-msan-linux-release-x64"
+    category: "vm|misc|aot"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-tsan-linux-release-x64"
+    category: "vm|misc|aot"
+    short_name: "t"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
@@ -1311,30 +1341,45 @@ consoles: <
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32-dev"
+    category: "vm|misc"
+    short_name: "o32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-dev"
+    category: "vm|misc"
+    short_name: "o64"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-dev"
     category: "vm|misc"
-    short_name: "a64"
+    short_name: "a"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msan-linux-release-x64-dev"
     category: "vm|misc"
-    short_name: "m64"
+    short_name: "m"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-tsan-linux-release-x64-dev"
     category: "vm|misc"
-    short_name: "t64"
+    short_name: "t"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32-dev"
-    category: "vm|misc"
-    short_name: "o32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-asan-linux-release-x64-dev"
+    category: "vm|misc|aot"
+    short_name: "a"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-dev"
-    category: "vm|misc"
-    short_name: "o64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-msan-linux-release-x64-dev"
+    category: "vm|misc|aot"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-tsan-linux-release-x64-dev"
+    category: "vm|misc|aot"
+    short_name: "t"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64-dev"
@@ -2285,30 +2330,45 @@ consoles: <
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32-stable"
+    category: "vm|misc"
+    short_name: "o32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-stable"
+    category: "vm|misc"
+    short_name: "o64"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-stable"
     category: "vm|misc"
-    short_name: "a64"
+    short_name: "a"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msan-linux-release-x64-stable"
     category: "vm|misc"
-    short_name: "m64"
+    short_name: "m"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-tsan-linux-release-x64-stable"
     category: "vm|misc"
-    short_name: "t64"
+    short_name: "t"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32-stable"
-    category: "vm|misc"
-    short_name: "o32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-asan-linux-release-x64-stable"
+    category: "vm|misc|aot"
+    short_name: "a"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-stable"
-    category: "vm|misc"
-    short_name: "o64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-msan-linux-release-x64-stable"
+    category: "vm|misc|aot"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-tsan-linux-release-x64-stable"
+    category: "vm|misc|aot"
+    short_name: "t"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64-stable"
@@ -2733,6 +2793,12 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm64-try"
   >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-x64-try"
+  >
   builders: <
     name: "buildbucket/luci.dart.try/vm-kernel-asan-linux-release-x64-try"
   >
@@ -2743,10 +2809,13 @@ consoles: <
     name: "buildbucket/luci.dart.try/vm-kernel-tsan-linux-release-x64-try"
   >
   builders: <
-    name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-asan-linux-release-x64-try"
   >
   builders: <
-    name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-msan-linux-release-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-tsan-linux-release-x64-try"
   >
   builders: <
     name: "buildbucket/luci.dart.try/vm-kernel-linux-product-x64-try"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 0efacbf45558..1f56a382b734 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -1055,6 +1055,20 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <>
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-asan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
@@ -1167,6 +1181,20 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <>
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-msan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
@@ -1195,6 +1223,20 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <>
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-tsan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 9da5dcef3dac..348063bdb329 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -2828,6 +2828,36 @@ job: <
     builder: "vm-kernel-precomp-android-release-arm_x64-stable"
   >
 >
+job: <
+  id: "vm-kernel-precomp-asan-linux-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-asan-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-asan-linux-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-asan-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-asan-linux-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-asan-linux-release-x64-stable"
+  >
+>
 job: <
   id: "vm-kernel-precomp-linux-debug-simarm_x64"
   schedule: "triggered"
@@ -3148,6 +3178,36 @@ job: <
     builder: "vm-kernel-precomp-mac-release-simarm64-stable"
   >
 >
+job: <
+  id: "vm-kernel-precomp-msan-linux-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-msan-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-msan-linux-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-msan-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-msan-linux-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-msan-linux-release-x64-stable"
+  >
+>
 job: <
   id: "vm-kernel-precomp-nnbd-linux-release-x64"
   schedule: "triggered"
@@ -3228,6 +3288,36 @@ job: <
     builder: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
   >
 >
+job: <
+  id: "vm-kernel-precomp-tsan-linux-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-tsan-linux-release-x64"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-tsan-linux-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-tsan-linux-release-x64-dev"
+  >
+>
+job: <
+  id: "vm-kernel-precomp-tsan-linux-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-tsan-linux-release-x64-stable"
+  >
+>
 job: <
   id: "vm-kernel-precomp-win-release-x64"
   schedule: "triggered"
@@ -3906,6 +3996,7 @@ trigger: <
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-android-release-arm64-dev"
   triggers: "vm-kernel-precomp-android-release-arm_x64-dev"
+  triggers: "vm-kernel-precomp-asan-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
   triggers: "vm-kernel-precomp-linux-debug-x64-dev"
   triggers: "vm-kernel-precomp-linux-product-x64-dev"
@@ -3914,8 +4005,10 @@ trigger: <
   triggers: "vm-kernel-precomp-linux-release-simarm_x64-dev"
   triggers: "vm-kernel-precomp-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-mac-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-msan-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-tsan-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-win-release-x64-dev"
   triggers: "vm-kernel-reload-linux-debug-x64-dev"
   triggers: "vm-kernel-reload-linux-release-x64-dev"
@@ -4067,6 +4160,7 @@ trigger: <
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-android-release-arm64-stable"
   triggers: "vm-kernel-precomp-android-release-arm_x64-stable"
+  triggers: "vm-kernel-precomp-asan-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
   triggers: "vm-kernel-precomp-linux-debug-x64-stable"
   triggers: "vm-kernel-precomp-linux-product-x64-stable"
@@ -4075,8 +4169,10 @@ trigger: <
   triggers: "vm-kernel-precomp-linux-release-simarm_x64-stable"
   triggers: "vm-kernel-precomp-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-mac-release-simarm64-stable"
+  triggers: "vm-kernel-precomp-msan-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+  triggers: "vm-kernel-precomp-tsan-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-win-release-x64-stable"
   triggers: "vm-kernel-reload-linux-debug-x64-stable"
   triggers: "vm-kernel-reload-linux-release-x64-stable"
@@ -4125,6 +4221,7 @@ trigger: <
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
   triggers: "vm-kernel-precomp-android-release-arm64"
   triggers: "vm-kernel-precomp-android-release-arm_x64"
+  triggers: "vm-kernel-precomp-asan-linux-release-x64"
   triggers: "vm-kernel-precomp-linux-debug-simarm_x64"
   triggers: "vm-kernel-precomp-linux-debug-x64"
   triggers: "vm-kernel-precomp-linux-product-x64"
@@ -4133,8 +4230,10 @@ trigger: <
   triggers: "vm-kernel-precomp-linux-release-simarm_x64"
   triggers: "vm-kernel-precomp-linux-release-x64"
   triggers: "vm-kernel-precomp-mac-release-simarm64"
+  triggers: "vm-kernel-precomp-msan-linux-release-x64"
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64"
+  triggers: "vm-kernel-precomp-tsan-linux-release-x64"
   triggers: "vm-kernel-precomp-win-release-x64"
   triggers: "vm-kernel-reload-linux-debug-x64"
   triggers: "vm-kernel-reload-linux-release-x64"
diff --git a/main.star b/main.star
index 90e2d2efac00..4ff89ed46d2d 100755
--- a/main.star
+++ b/main.star
@@ -628,15 +628,21 @@ dart_vm_extra_builder(
 # vm|misc
 LOW = 70
 dart_vm_extra_builder(
-    "vm-kernel-asan-linux-release-x64", category="vm|misc|a64", priority=LOW)
+    "vm-kernel-optcounter-threshold-linux-release-ia32", category="vm|misc|o32")
 dart_vm_extra_builder(
-    "vm-kernel-msan-linux-release-x64", category="vm|misc|m64", priority=LOW)
+    "vm-kernel-optcounter-threshold-linux-release-x64", category="vm|misc|o64")
 dart_vm_extra_builder(
-    "vm-kernel-tsan-linux-release-x64", category="vm|misc|t64", priority=LOW)
+    "vm-kernel-asan-linux-release-x64", category="vm|misc|a", priority=LOW)
 dart_vm_extra_builder(
-    "vm-kernel-optcounter-threshold-linux-release-ia32", category="vm|misc|o32")
+    "vm-kernel-msan-linux-release-x64", category="vm|misc|m", priority=LOW)
 dart_vm_extra_builder(
-    "vm-kernel-optcounter-threshold-linux-release-x64", category="vm|misc|o64")
+    "vm-kernel-tsan-linux-release-x64", category="vm|misc|t", priority=LOW)
+dart_vm_extra_builder(
+    "vm-kernel-precomp-asan-linux-release-x64", category="vm|misc|aot|a", priority=LOW)
+dart_vm_extra_builder(
+    "vm-kernel-precomp-msan-linux-release-x64", category="vm|misc|aot|m", priority=LOW)
+dart_vm_extra_builder(
+    "vm-kernel-precomp-tsan-linux-release-x64", category="vm|misc|aot|t", priority=LOW)
 
 # vm|product
 dart_vm_extra_builder(

From c04093858c924890e4e8f0527aec05a2ca026c91 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 17 Apr 2020 11:20:05 +0000
Subject: [PATCH 356/826] [infra] Raise shard timeout on cross-arm builders

The shards take almost 60 mins to complete and some have flakily timed
out.

Also fixes some inconsistencies with outdated luci configs.

Change-Id: I38d6f92aafbef0dfa2c40e01e33b7e349140c57c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/143805
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 76 ++++++++++++++++++++++++++++++++++++++++++++++
 luci-milo.cfg      | 33 ++++++++++++++------
 luci-scheduler.cfg | 33 ++++++++++++++++++++
 main.star          |  3 +-
 4 files changed, 135 insertions(+), 10 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index b78932c5933a..0249ff8ceadd 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1608,6 +1608,7 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -1632,6 +1633,7 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -1656,6 +1658,7 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -1680,6 +1683,7 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       >
       priority: 50
       caches: <
@@ -6991,6 +6995,30 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-kernel-precomp-asan-linux-release-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 70
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-precomp-asan-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
@@ -7835,6 +7863,30 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-kernel-precomp-msan-linux-release-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 70
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-precomp-msan-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8099,6 +8151,30 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-kernel-precomp-tsan-linux-release-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 70
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-precomp-tsan-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 6ce931bd72d3..832ff3003d6f 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -1843,30 +1843,45 @@ consoles: <
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32-beta"
+    category: "vm|misc"
+    short_name: "o32"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-beta"
+    category: "vm|misc"
+    short_name: "o64"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-beta"
     category: "vm|misc"
-    short_name: "a64"
+    short_name: "a"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msan-linux-release-x64-beta"
     category: "vm|misc"
-    short_name: "m64"
+    short_name: "m"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-tsan-linux-release-x64-beta"
     category: "vm|misc"
-    short_name: "t64"
+    short_name: "t"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32-beta"
-    category: "vm|misc"
-    short_name: "o32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-asan-linux-release-x64-beta"
+    category: "vm|misc|aot"
+    short_name: "a"
   >
   builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-beta"
-    category: "vm|misc"
-    short_name: "o64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-msan-linux-release-x64-beta"
+    category: "vm|misc|aot"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-tsan-linux-release-x64-beta"
+    category: "vm|misc|aot"
+    short_name: "t"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64-beta"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 348063bdb329..c095e41ea097 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -2838,6 +2838,16 @@ job: <
     builder: "vm-kernel-precomp-asan-linux-release-x64"
   >
 >
+job: <
+  id: "vm-kernel-precomp-asan-linux-release-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-asan-linux-release-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-precomp-asan-linux-release-x64-dev"
   schedule: "triggered"
@@ -3188,6 +3198,16 @@ job: <
     builder: "vm-kernel-precomp-msan-linux-release-x64"
   >
 >
+job: <
+  id: "vm-kernel-precomp-msan-linux-release-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-msan-linux-release-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-precomp-msan-linux-release-x64-dev"
   schedule: "triggered"
@@ -3298,6 +3318,16 @@ job: <
     builder: "vm-kernel-precomp-tsan-linux-release-x64"
   >
 >
+job: <
+  id: "vm-kernel-precomp-tsan-linux-release-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-tsan-linux-release-x64-beta"
+  >
+>
 job: <
   id: "vm-kernel-precomp-tsan-linux-release-x64-dev"
   schedule: "triggered"
@@ -3899,6 +3929,7 @@ trigger: <
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-beta"
   triggers: "vm-kernel-precomp-android-release-arm64-beta"
   triggers: "vm-kernel-precomp-android-release-arm_x64-beta"
+  triggers: "vm-kernel-precomp-asan-linux-release-x64-beta"
   triggers: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
   triggers: "vm-kernel-precomp-linux-debug-x64-beta"
   triggers: "vm-kernel-precomp-linux-product-x64-beta"
@@ -3907,8 +3938,10 @@ trigger: <
   triggers: "vm-kernel-precomp-linux-release-simarm_x64-beta"
   triggers: "vm-kernel-precomp-linux-release-x64-beta"
   triggers: "vm-kernel-precomp-mac-release-simarm64-beta"
+  triggers: "vm-kernel-precomp-msan-linux-release-x64-beta"
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+  triggers: "vm-kernel-precomp-tsan-linux-release-x64-beta"
   triggers: "vm-kernel-precomp-win-release-x64-beta"
   triggers: "vm-kernel-reload-linux-debug-x64-beta"
   triggers: "vm-kernel-reload-linux-release-x64-beta"
diff --git a/main.star b/main.star
index 4ff89ed46d2d..60ed7f79d174 100755
--- a/main.star
+++ b/main.star
@@ -582,7 +582,8 @@ dart_ci_sandbox_builder(
 dart_vm_extra_builder(
     "cross-vm-linux-release-arm64",
     category="vm|kernel|cra",
-    channels=RELEASE_CHANNELS)
+    channels=RELEASE_CHANNELS,
+    properties={"shard_timeout": 5400})  # 1.5h
 
 # vm|kernel-precomp
 dart_vm_extra_builder(

From bfb396607292ee642cef864338593c180b47fe05 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Wed, 22 Apr 2020 12:56:45 +0000
Subject: [PATCH 357/826] [infra] Disable base builder emails.

They are notoriously flaky and useless distractions.

Change-Id: I56d479017487873234d61805d1965e4ff959b7a8
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/144400
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-notify.cfg | 14 --------------
 main.star       |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/luci-notify.cfg b/luci-notify.cfg
index 1f56a382b734..e91c8df60892 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -4,20 +4,6 @@
 # For the schema of this file, see ProjectConfig message:
 #   https://luci-config.appspot.com/schemas/projects:luci-notify.cfg
 
-notifiers: <
-  notifications: <
-    on_new_failure: true
-    email: <
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    >
-  >
-  builders: <
-    bucket: "ci"
-    name: "base"
-  >
->
 notifiers: <
   notifications: <
     on_new_failure: true
diff --git a/main.star b/main.star
index 60ed7f79d174..e59f30b19383 100755
--- a/main.star
+++ b/main.star
@@ -822,7 +822,7 @@ dart_ci_builder(
     execution_timeout=time.duration(15 * 60 * 1000),
     recipe="forward_branch",
     schedule="with 10m interval",
-    notifies="infra")
+    notifies=None)
 dart_ci_builder(
     "chocolatey", recipe="chocolatey", enabled=False, dimensions=windows())
 dart_ci_builder("co19-roller", recipe="package_co19", enabled=False)

From 82183177ee484113b28ba4cf7aa3e83b917ef0e7 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 30 Apr 2020 13:53:12 +0000
Subject: [PATCH 358/826] [infra] Raise expiration timeout for low priority
 builders

These builders might not run more than once a day, so this should avoid
purple builds when the bots are busy running higher priority jobs.

Change-Id: I28221d87586a622996f8c80538a34943c9ac165a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/145583
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 24 ++++++++++++++++++++++++
 main.star          | 35 ++++++++++++++++++++++-------------
 2 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 0249ff8ceadd..f982b7dd93cb 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -5156,6 +5156,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -5180,6 +5181,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -5204,6 +5206,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -5228,6 +5231,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -6308,6 +6312,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -6332,6 +6337,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -6356,6 +6362,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -6380,6 +6387,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -6988,6 +6996,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -7012,6 +7021,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -7036,6 +7046,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -7060,6 +7071,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -7856,6 +7868,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -7880,6 +7893,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -7904,6 +7918,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -7928,6 +7943,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -8144,6 +8160,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -8168,6 +8185,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -8192,6 +8210,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -8216,6 +8235,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -8720,6 +8740,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -8744,6 +8765,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -8768,6 +8790,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -8792,6 +8815,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
diff --git a/main.star b/main.star
index e59f30b19383..b2ee6b01fda9 100755
--- a/main.star
+++ b/main.star
@@ -373,6 +373,7 @@ def dart_builder(name,
                  dimensions=None,
                  executable=None,
                  execution_timeout=None,
+                 expiration_timeout=None,
                  goma_rbe=False,
                  fyi=False,
                  notifies="dart",
@@ -424,6 +425,7 @@ def dart_builder(name,
                 dimensions=dimensions,
                 executable=executable or dart_recipe(recipe),
                 execution_timeout=execution_timeout,
+                expiration_timeout=expiration_timeout,
                 priority=priority,
                 properties=properties,
                 notifies=[notifies]
@@ -497,6 +499,14 @@ def dart_vm_extra_builder(name, on_cq=False, location_regexp=None, **kwargs):
         **kwargs)
 
 
+LOW = 70
+
+
+def dart_vm_low_priority_builder(name, **kwargs):
+    dart_vm_extra_builder(
+        name, priority=LOW, expiration_timeout=time.day, **kwargs)
+
+
 # cfe
 dart_ci_sandbox_builder(
     "front-end-linux-release-x64", category="cfe|l", goma_rbe=True, on_cq=True)
@@ -627,23 +637,22 @@ dart_vm_extra_builder(
     properties={"shard_timeout": 5400})  # 1.5h
 
 # vm|misc
-LOW = 70
 dart_vm_extra_builder(
     "vm-kernel-optcounter-threshold-linux-release-ia32", category="vm|misc|o32")
 dart_vm_extra_builder(
     "vm-kernel-optcounter-threshold-linux-release-x64", category="vm|misc|o64")
-dart_vm_extra_builder(
-    "vm-kernel-asan-linux-release-x64", category="vm|misc|a", priority=LOW)
-dart_vm_extra_builder(
-    "vm-kernel-msan-linux-release-x64", category="vm|misc|m", priority=LOW)
-dart_vm_extra_builder(
-    "vm-kernel-tsan-linux-release-x64", category="vm|misc|t", priority=LOW)
-dart_vm_extra_builder(
-    "vm-kernel-precomp-asan-linux-release-x64", category="vm|misc|aot|a", priority=LOW)
-dart_vm_extra_builder(
-    "vm-kernel-precomp-msan-linux-release-x64", category="vm|misc|aot|m", priority=LOW)
-dart_vm_extra_builder(
-    "vm-kernel-precomp-tsan-linux-release-x64", category="vm|misc|aot|t", priority=LOW)
+dart_vm_low_priority_builder(
+    "vm-kernel-asan-linux-release-x64", category="vm|misc|a")
+dart_vm_low_priority_builder(
+    "vm-kernel-msan-linux-release-x64", category="vm|misc|m")
+dart_vm_low_priority_builder(
+    "vm-kernel-tsan-linux-release-x64", category="vm|misc|t")
+dart_vm_low_priority_builder(
+    "vm-kernel-precomp-asan-linux-release-x64", category="vm|misc|aot|a")
+dart_vm_low_priority_builder(
+    "vm-kernel-precomp-msan-linux-release-x64", category="vm|misc|aot|m")
+dart_vm_low_priority_builder(
+    "vm-kernel-precomp-tsan-linux-release-x64", category="vm|misc|aot|t")
 
 # vm|product
 dart_vm_extra_builder(

From 70f94759442bdc4f649d7755866744e55ca43e14 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 4 May 2020 06:53:15 +0000
Subject: [PATCH 359/826] [infra] Add a nightly arm64 AOT builder

This builder uses the same arm64 bot used by the other cross builder.
Because there is only one device, the builder is only scheduled nightly.

See also:
https://dart-review.googlesource.com/c/sdk/+/145782/

Change-Id: I85ef5ad734828b37274cb62b9b5317172bddeca4
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/145784
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 25 +++++++++++++++++++++++++
 luci-milo.cfg      | 10 ++++++++++
 luci-scheduler.cfg | 10 ++++++++++
 main.star          | 30 +++++++++++++++++++++++++-----
 4 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index f982b7dd93cb..ff650518f437 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1693,6 +1693,31 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "cross-vm-precomp-linux-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
+      >
+      priority: 70
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "dart2js-csp-minified-linux-x64-chrome"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 832ff3003d6f..321866912591 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -277,6 +277,11 @@ consoles: <
     category: "vm|kernel-precomp"
     short_name: "wr"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-precomp-linux-release-arm64"
+    category: "vm|kernel-precomp"
+    short_name: "cra"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64"
     category: "vm|kernel-precomp|android"
@@ -979,6 +984,11 @@ consoles: <
     category: "vm|kernel-precomp"
     short_name: "wr"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-precomp-linux-release-arm64"
+    category: "vm|kernel-precomp"
+    short_name: "cra"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64"
     category: "vm|kernel-precomp|android"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index c095e41ea097..d59c7ff01657 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -424,6 +424,16 @@ job: <
     builder: "cross-vm-linux-release-arm64-stable"
   >
 >
+job: <
+  id: "cross-vm-precomp-linux-release-arm64"
+  schedule: "0 5 * * *"
+  acl_sets: "ci.sandbox"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "cross-vm-precomp-linux-release-arm64"
+  >
+>
 job: <
   id: "dart-sdk-linux"
   schedule: "triggered"
diff --git a/main.star b/main.star
index b2ee6b01fda9..840c1205e5b1 100755
--- a/main.star
+++ b/main.star
@@ -68,6 +68,13 @@ DDC_PATHS = CFE_PATHS + [
     "pkg/(js|modular_test|sourcemap_testing)/.+",
 ]
 
+# Priorities used by the swarming scheduler. The higher the number, the lower
+# the priority.
+LOW = 70  # Used for "FYI" post-submit builds.
+NORMAL = 50  # Used for post-submit builds.
+HIGH = 30  # Used for try-jobs.
+HIGHEST = 25  # Used for shards in the recipes, included here for completeness.
+
 
 def to_location_regexp(paths):
     return [".+/[+]/%s" % path for path in paths]
@@ -332,7 +339,7 @@ def dart_try_builder(name,
         dimensions=dimensions,
         executable=dart_recipe(recipe),
         execution_timeout=execution_timeout,
-        priority=30,
+        priority=HIGH,
         properties=properties,
         service_account=TRY_ACCOUNT,
         swarming_tags=["vpython:native-python-wrapper"],
@@ -377,7 +384,7 @@ def dart_builder(name,
                  goma_rbe=False,
                  fyi=False,
                  notifies="dart",
-                 priority=50,
+                 priority=NORMAL,
                  properties=None,
                  schedule="triggered",
                  service_account=TRY_ACCOUNT,
@@ -499,14 +506,22 @@ def dart_vm_extra_builder(name, on_cq=False, location_regexp=None, **kwargs):
         **kwargs)
 
 
-LOW = 70
-
-
 def dart_vm_low_priority_builder(name, **kwargs):
     dart_vm_extra_builder(
         name, priority=LOW, expiration_timeout=time.day, **kwargs)
 
 
+def dart_vm_nightly_builder(name, **kwargs):
+    dart_ci_sandbox_builder(
+        name,
+        notifies=None,
+        on_cq=False,
+        priority=LOW,
+        schedule="0 5 * * *",  # daily, at 05:00 UTC
+        triggered_by=None,
+        **kwargs)
+
+
 # cfe
 dart_ci_sandbox_builder(
     "front-end-linux-release-x64", category="cfe|l", goma_rbe=True, on_cq=True)
@@ -625,6 +640,11 @@ dart_vm_extra_builder(
     "vm-kernel-precomp-win-release-x64",
     category="vm|kernel-precomp|wr",
     dimensions=windows())
+dart_vm_nightly_builder(
+    "cross-vm-precomp-linux-release-arm64",
+    category="vm|kernel-precomp|cra",
+    channels=[],
+    properties={"shard_timeout": 5400})  # 1.5h
 
 # vm|kernel-precomp|android
 dart_vm_extra_builder(

From 455c04e5139522653cba8a31ca22909ea0bc07a6 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 6 May 2020 07:06:18 +0000
Subject: [PATCH 360/826] [infra] Add nightly builder

The nightly builder triggers other builders every night using the cron
recipe. It passes an input commit to the builder. That ensures that its
recipe doesn't need special support and that the builds are shown
correctly on the consoles.

* Add proper support for infra builders.
* Add an infra console.

Change-Id: Ied3c0e62dfb32e439b3013cea5d805189ec75cc4
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/146564
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 25 ++++++++++++++++++
 luci-milo.cfg      | 26 +++++++++++++++++++
 luci-notify.cfg    | 56 +++++++++++++++++++++++++++++++++++++++++
 luci-scheduler.cfg | 42 ++++++++++++++++++++++++++++++-
 main.star          | 63 ++++++++++++++++++++++++++++++----------------
 5 files changed, 189 insertions(+), 23 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index ff650518f437..5795c66361fd 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -556,6 +556,31 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "nightly"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
+        name: "dart/cron/cron"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$dart/cron/builders:{\"builders\":[\"cross-vm-precomp-linux-release-arm64\"]}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 50
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "recipe-bundler"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 321866912591..b1ed048281e4 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2982,4 +2982,30 @@ consoles: <
   >
   builder_view_only: true
 >
+consoles: <
+  id: "infra"
+  name: "Infra Console"
+  builders: <
+    name: "buildbucket/luci.dart.ci/google"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/base"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/chocolatey"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/co19-roller"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/docker"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/linearize-flutter"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci/nightly"
+  >
+  builder_view_only: true
+>
 logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index e91c8df60892..c6a7cbe441d8 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -4,6 +4,34 @@
 # For the schema of this file, see ProjectConfig message:
 #   https://luci-config.appspot.com/schemas/projects:luci-notify.cfg
 
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    >
+  >
+  builders: <
+    bucket: "ci"
+    name: "chocolatey"
+  >
+>
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    >
+  >
+  builders: <
+    bucket: "ci"
+    name: "co19-roller"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
@@ -61,6 +89,20 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    >
+  >
+  builders: <
+    bucket: "ci"
+    name: "docker"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
@@ -75,6 +117,20 @@ notifiers: <
     name: "linearize-flutter"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    >
+  >
+  builders: <
+    bucket: "ci"
+    name: "nightly"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index d59c7ff01657..fcf78c17473c 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -384,6 +384,26 @@ job: <
     builder: "base"
   >
 >
+job: <
+  id: "chocolatey"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "chocolatey"
+  >
+>
+job: <
+  id: "co19-roller"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "co19-roller"
+  >
+>
 job: <
   id: "cross-vm-linux-release-arm64"
   schedule: "triggered"
@@ -426,7 +446,7 @@ job: <
 >
 job: <
   id: "cross-vm-precomp-linux-release-arm64"
-  schedule: "0 5 * * *"
+  schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
@@ -1244,6 +1264,16 @@ job: <
     builder: "debianpackage-linux-stable"
   >
 >
+job: <
+  id: "docker"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "docker"
+  >
+>
 job: <
   id: "flutter-analyze"
   schedule: "triggered"
@@ -1498,6 +1528,16 @@ job: <
     builder: "linearize-flutter"
   >
 >
+job: <
+  id: "nightly"
+  schedule: "0 5 * * *"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "nightly"
+  >
+>
 job: <
   id: "pkg-linux-debug"
   schedule: "triggered"
diff --git a/main.star b/main.star
index 840c1205e5b1..08f1a4570a36 100755
--- a/main.star
+++ b/main.star
@@ -208,6 +208,11 @@ luci.list_view(
     title="SDK CQ Console",
 )
 
+luci.list_view(
+    name="infra",
+    title="Infra Console",
+)
+
 luci.logdog(gs_bucket="chromium-luci-logdog")
 
 luci.bucket(
@@ -352,10 +357,7 @@ def dart_try_builder(name,
         experiment_percentage=experiment_percentage,
         location_regexp=location_regexp,
         includable_only=includable_only)
-    luci.list_view_entry(
-        list_view="cq",
-        builder=builder,
-    )
+    luci.list_view_entry(list_view="cq", builder=builder)
 
 
 postponed_alt_console_entries = []
@@ -388,7 +390,7 @@ def dart_builder(name,
                  properties=None,
                  schedule="triggered",
                  service_account=TRY_ACCOUNT,
-                 triggered_by=None,
+                 triggered_by=["dart-gitiles-trigger-%s"],
                  triggering_policy=None,
                  on_cq=False,
                  experiment_percentage=None,
@@ -398,7 +400,7 @@ def dart_builder(name,
     if dimensions["os"] == "Linux" and goma_rbe:
         properties.setdefault("$build/goma", GOMA_RBE)
 
-    def builder(channel=None, triggered_by=None):
+    def builder(channel, triggered_by):
         if channel == "try":
             dart_try_builder(
                 name,
@@ -412,9 +414,7 @@ def dart_builder(name,
         else:
             builder = name + "-" + channel if channel else name
             branch = channel if channel else "master"
-            if enabled and schedule == "triggered":
-                if not triggered_by:
-                    triggered_by = ["dart-gitiles-trigger-%s"]
+            if schedule == "triggered" and triggered_by:
                 triggered_by = [
                     trigger.replace("%s", branch) for trigger in triggered_by
                 ]
@@ -440,7 +440,7 @@ def dart_builder(name,
                 schedule=schedule if enabled else None,
                 service_account=service_account,
                 swarming_tags=["vpython:native-python-wrapper"],
-                triggered_by=triggered_by,
+                triggered_by=triggered_by if enabled else None,
                 triggering_policy=triggering_policy)
             if category:
                 console_category, _, short_name = category.rpartition("|")
@@ -467,7 +467,7 @@ def dart_builder(name,
                             console_view="alt",
                         )
 
-    builder(triggered_by=triggered_by)
+    builder(None, triggered_by=triggered_by)
     for channel in channels:
         if enabled:
             builder(channel, triggered_by=triggered_by)
@@ -483,16 +483,21 @@ def dart_ci_builder(name, dimensions={}, **kwargs):
         **kwargs)
 
 
-def dart_ci_sandbox_builder(name, channels=CHANNELS, properties={}, **kwargs):
+def dart_ci_sandbox_builder(name, channels=CHANNELS, **kwargs):
     dart_builder(
         name,
         bucket="ci.sandbox",
         channels=channels,
-        properties=properties,
         service_account=TRY_ACCOUNT,
         **kwargs)
 
 
+def dart_infra_builder(name, notifies="infra", triggered_by=None, **kwargs):
+    dart_ci_builder(
+        name, notifies=notifies, triggered_by=triggered_by, **kwargs)
+    luci.list_view_entry(list_view="infra", builder=name)
+
+
 def dart_vm_extra_builder(name, on_cq=False, location_regexp=None, **kwargs):
     triggered_by = ["dart-vm-gitiles-trigger-%s"]
     if on_cq and not location_regexp:
@@ -511,15 +516,19 @@ def dart_vm_low_priority_builder(name, **kwargs):
         name, priority=LOW, expiration_timeout=time.day, **kwargs)
 
 
+nightly_builders = []
+
+
 def dart_vm_nightly_builder(name, **kwargs):
     dart_ci_sandbox_builder(
         name,
         notifies=None,
         on_cq=False,
         priority=LOW,
-        schedule="0 5 * * *",  # daily, at 05:00 UTC
+        schedule="triggered",  # triggered by nightly cron builder
         triggered_by=None,
         **kwargs)
+    nightly_builders.append(name)
 
 
 # cfe
@@ -842,21 +851,20 @@ dart_ci_builder(
     "versionchecker-linux", category="misc|vc", channels=RELEASE_CHANNELS)
 
 # external
-dart_ci_builder(
+dart_infra_builder(
     "google", recipe="external", category="external|g", enabled=False, fyi=True)
 
 # infra
-dart_ci_builder(
+dart_infra_builder(
     "base",
     execution_timeout=time.duration(15 * 60 * 1000),
     recipe="forward_branch",
     schedule="with 10m interval",
     notifies=None)
-dart_ci_builder(
-    "chocolatey", recipe="chocolatey", enabled=False, dimensions=windows())
-dart_ci_builder("co19-roller", recipe="package_co19", enabled=False)
-dart_ci_builder("docker", recipe="docker", enabled=False)
-dart_ci_builder(
+dart_infra_builder("chocolatey", recipe="chocolatey", dimensions=windows())
+dart_infra_builder("co19-roller", recipe="package_co19")
+dart_infra_builder("docker", recipe="docker")
+dart_infra_builder(
     "linearize-flutter",
     recipe="linearize",
     properties={
@@ -869,6 +877,15 @@ dart_ci_builder(
     ],
     triggering_policy=scheduler.greedy_batching(max_batch_size=1),
 )
+dart_infra_builder(
+    "nightly",
+    notifies="infra",
+    properties={"$dart/cron/builders": {
+        "builders": nightly_builders
+    }},
+    recipe="cron/cron",
+    schedule="0 5 * * *",  # daily, at 05:00 UTC
+)
 
 # Fuzz testing builders
 dart_ci_sandbox_builder(
@@ -876,7 +893,9 @@ dart_ci_sandbox_builder(
     channels=[],
     goma_rbe=True,
     notifies="dart-fuzz-testing",
-    schedule="0 3,4 * * *")
+    schedule="0 3,4 * * *",
+    triggered_by=None,
+)
 
 # Try only builders
 dart_try_builder("benchmark-linux", on_cq=True)

From c23309c14c5d138a5225d275fbcd49030ca3ae46 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 6 May 2020 07:18:43 +0000
Subject: [PATCH 361/826] [infra] Make recipe names less magic

Now that recipes live in our own repo, we should no longer dump
everything into the "dart" folders. This also fixes the recipe path for
the nightly builder.

TBR=whesse@google.com

Change-Id: I1ddc71812d162858f14c33075fbe324ddfb14e4c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/146760
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg |  2 +-
 main.star          | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 5795c66361fd..736d8f39142d 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -565,7 +565,7 @@ buckets: <
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe: <
-        name: "dart/cron/cron"
+        name: "cron/cron"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$dart/cron/builders:{\"builders\":[\"cross-vm-precomp-linux-release-arm64\"]}"
diff --git a/main.star b/main.star
index 08f1a4570a36..7676e6aab3c6 100755
--- a/main.star
+++ b/main.star
@@ -313,13 +313,13 @@ luci.cq_group(
 
 def dart_recipe(name):
     return luci.recipe(
-        name="dart/" + name,
+        name=name,
         cipd_package="dart/recipe_bundles/dart.googlesource.com/recipes",
     )
 
 
 def dart_try_builder(name,
-                     recipe="neo",
+                     recipe="dart/neo",
                      dimensions=None,
                      execution_timeout=None,
                      experiment_percentage=None,
@@ -375,7 +375,7 @@ luci.builder.defaults.properties.set({
 
 def dart_builder(name,
                  bucket,
-                 recipe="neo",
+                 recipe="dart/neo",
                  enabled=True,
                  category=None,
                  channels=[],
@@ -551,7 +551,7 @@ dart_ci_sandbox_builder(
 # flutter
 dart_ci_sandbox_builder(
     "flutter-engine-linux",
-    recipe="flutter_engine",
+    recipe="dart/flutter_engine",
     category="flutter|3H",
     channels=["try"],
     execution_timeout=time.duration(6 * 60 * 60 * 1000),
@@ -841,7 +841,7 @@ dart_ci_sandbox_builder("ddk-linux-release-firefox", category="ddc|fl")
 
 # misc
 dart_ci_sandbox_builder(
-    "gclient", recipe="gclient", category="misc|g", on_cq=True)
+    "gclient", recipe="dart/gclient", category="misc|g", on_cq=True)
 dart_ci_builder(
     "debianpackage-linux",
     category="misc|dp",
@@ -852,21 +852,21 @@ dart_ci_builder(
 
 # external
 dart_infra_builder(
-    "google", recipe="external", category="external|g", enabled=False, fyi=True)
+    "google", recipe="dart/external", category="external|g", enabled=False, fyi=True)
 
 # infra
 dart_infra_builder(
     "base",
     execution_timeout=time.duration(15 * 60 * 1000),
-    recipe="forward_branch",
+    recipe="dart/forward_branch",
     schedule="with 10m interval",
     notifies=None)
-dart_infra_builder("chocolatey", recipe="chocolatey", dimensions=windows())
-dart_infra_builder("co19-roller", recipe="package_co19")
-dart_infra_builder("docker", recipe="docker")
+dart_infra_builder("chocolatey", recipe="dart/chocolatey", dimensions=windows())
+dart_infra_builder("co19-roller", recipe="dart/package_co19")
+dart_infra_builder("docker", recipe="dart/docker")
 dart_infra_builder(
     "linearize-flutter",
-    recipe="linearize",
+    recipe="dart/linearize",
     properties={
         "repo": "https://dart.googlesource.com/linear_sdk_flutter_engine.git"
     },

From 402e9932f93d0af32904e798647a8e4deaf1f098 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 6 May 2020 11:46:41 +0000
Subject: [PATCH 362/826] [infra] Fix properties for nightly builder

Change-Id: I22e2374b4d8e29d88ed57fd64e4ec74f9bc937c4
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/146789
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 2 +-
 main.star          | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 736d8f39142d..94c7e6784891 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -568,9 +568,9 @@ buckets: <
         name: "cron/cron"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/cron/builders:{\"builders\":[\"cross-vm-precomp-linux-release-arm64\"]}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "builders:[\"cross-vm-precomp-linux-release-arm64\"]"
         properties_j: "clobber:\"true\""
       >
       priority: 50
diff --git a/main.star b/main.star
index 7676e6aab3c6..b974ab9bf828 100755
--- a/main.star
+++ b/main.star
@@ -880,9 +880,7 @@ dart_infra_builder(
 dart_infra_builder(
     "nightly",
     notifies="infra",
-    properties={"$dart/cron/builders": {
-        "builders": nightly_builders
-    }},
+    properties={"builders": nightly_builders},
     recipe="cron/cron",
     schedule="0 5 * * *",  # daily, at 05:00 UTC
 )

From 8385478cdc7371f1086678eb531b293fc8e5f725 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 6 May 2020 12:20:58 +0000
Subject: [PATCH 363/826] [infra] Add recipe bundler to the infra console

Change-Id: Ib6ab4cfa5473d24b4f198e299c0a8b1afebfd4f1
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/146791
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-milo.cfg | 3 +++
 main.star     | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index b1ed048281e4..46526dc90ab5 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -3006,6 +3006,9 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.ci/nightly"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci/recipe-bundler"
+  >
   builder_view_only: true
 >
 logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png"
diff --git a/main.star b/main.star
index b974ab9bf828..4e2fd18b7019 100755
--- a/main.star
+++ b/main.star
@@ -928,9 +928,8 @@ luci.console_view_entry(
     console_view="flutter-hhh",
 )
 
-dart_ci_builder(
+dart_infra_builder(
     name="recipe-bundler",
-    channels=[],
     executable=luci.recipe(
         name="recipe_bundler",
         cipd_package=
@@ -938,7 +937,6 @@ dart_ci_builder(
         cipd_version="git_revision:40621e908eb88bd10451ee9d013b7ef89ea91e37",
     ),
     execution_timeout=5 * time.minute,
-    notifies="infra",
     properties={
         # This property controls the version of the recipe_bundler go tool:
         #   https://chromium.googlesource.com/infra/infra/+/master/go/src/infra/tools/recipe_bundler

From 7ea0c558e196524ef345887c4e111169a1b3bf61 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 11 May 2020 16:39:46 +0000
Subject: [PATCH 364/826] [infra] Add UBSan bots.

Bug: https://github.com/dart-lang/sdk/issues/39427
Change-Id: I9d40f9f3e402b5aba46badcccfada6e891df0755
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/146981
Reviewed-by: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg   |   9 +-
 cr-buildbucket.cfg | 452 +++++----------------------------------------
 luci-milo.cfg      | 116 +++---------
 luci-notify.cfg    |  28 +++
 luci-scheduler.cfg | 188 +------------------
 main.star          |   6 +-
 6 files changed, 123 insertions(+), 676 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 5ee20db86a1e..f54a3f4a9120 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -489,6 +489,10 @@ config_groups: <
         name: "dart/try/vm-kernel-precomp-tsan-linux-release-x64-try"
         includable_only: true
       >
+      builders: <
+        name: "dart/try/vm-kernel-precomp-ubsan-linux-release-x64-try"
+        includable_only: true
+      >
       builders: <
         name: "dart/try/vm-kernel-precomp-win-release-x64-try"
         includable_only: true
@@ -513,6 +517,10 @@ config_groups: <
         name: "dart/try/vm-kernel-tsan-linux-release-x64-try"
         includable_only: true
       >
+      builders: <
+        name: "dart/try/vm-kernel-ubsan-linux-release-x64-try"
+        includable_only: true
+      >
       builders: <
         name: "dart/try/vm-kernel-win-debug-ia32-try"
         includable_only: true
@@ -538,7 +546,6 @@ config_groups: <
         includable_only: true
       >
       retry_config: <>
-      cancel_stale_tryjobs: YES
     >
   >
 >
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 94c7e6784891..2440c84d474a 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -5214,81 +5214,6 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-    builders: <
-      name: "vm-kernel-asan-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 70
-      expiration_secs: 86400
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-asan-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 70
-      expiration_secs: 86400
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-asan-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 70
-      expiration_secs: 86400
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
       name: "vm-kernel-checked-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -6370,81 +6295,6 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-    builders: <
-      name: "vm-kernel-msan-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 70
-      expiration_secs: 86400
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-msan-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 70
-      expiration_secs: 86400
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-msan-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 70
-      expiration_secs: 86400
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
       name: "vm-kernel-nnbd-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -7054,81 +6904,6 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-    builders: <
-      name: "vm-kernel-precomp-asan-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 70
-      expiration_secs: 86400
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-asan-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 70
-      expiration_secs: 86400
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-asan-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 70
-      expiration_secs: 86400
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
       name: "vm-kernel-precomp-linux-debug-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -7926,81 +7701,6 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-    builders: <
-      name: "vm-kernel-precomp-msan-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 70
-      expiration_secs: 86400
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-msan-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 70
-      expiration_secs: 86400
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-msan-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 70
-      expiration_secs: 86400
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
       name: "vm-kernel-precomp-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8219,57 +7919,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-precomp-tsan-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 70
-      expiration_secs: 86400
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-tsan-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 70
-      expiration_secs: 86400
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-precomp-tsan-linux-release-x64-stable"
+      name: "vm-kernel-precomp-ubsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8799,57 +8449,7 @@ buckets: <
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
     builders: <
-      name: "vm-kernel-tsan-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 70
-      expiration_secs: 86400
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-tsan-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 70
-      expiration_secs: 86400
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-tsan-linux-release-x64-stable"
+      name: "vm-kernel-ubsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -11469,6 +11069,30 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-kernel-precomp-ubsan-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-precomp-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -11613,6 +11237,30 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-kernel-ubsan-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-win-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 46526dc90ab5..003256687255 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -317,6 +317,11 @@ consoles: <
     category: "vm|misc"
     short_name: "t"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ubsan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "u"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-asan-linux-release-x64"
     category: "vm|misc|aot"
@@ -332,6 +337,11 @@ consoles: <
     category: "vm|misc|aot"
     short_name: "t"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ubsan-linux-release-x64"
+    category: "vm|misc|aot"
+    short_name: "u"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
     category: "vm|product"
@@ -1024,6 +1034,11 @@ consoles: <
     category: "vm|misc"
     short_name: "t"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ubsan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "u"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-asan-linux-release-x64"
     category: "vm|misc|aot"
@@ -1039,6 +1054,11 @@ consoles: <
     category: "vm|misc|aot"
     short_name: "t"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ubsan-linux-release-x64"
+    category: "vm|misc|aot"
+    short_name: "u"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
     category: "vm|product"
@@ -1361,36 +1381,6 @@ consoles: <
     category: "vm|misc"
     short_name: "o64"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-dev"
-    category: "vm|misc"
-    short_name: "a"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msan-linux-release-x64-dev"
-    category: "vm|misc"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-tsan-linux-release-x64-dev"
-    category: "vm|misc"
-    short_name: "t"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-asan-linux-release-x64-dev"
-    category: "vm|misc|aot"
-    short_name: "a"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-msan-linux-release-x64-dev"
-    category: "vm|misc|aot"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-tsan-linux-release-x64-dev"
-    category: "vm|misc|aot"
-    short_name: "t"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64-dev"
     category: "vm|product"
@@ -1863,36 +1853,6 @@ consoles: <
     category: "vm|misc"
     short_name: "o64"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-beta"
-    category: "vm|misc"
-    short_name: "a"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msan-linux-release-x64-beta"
-    category: "vm|misc"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-tsan-linux-release-x64-beta"
-    category: "vm|misc"
-    short_name: "t"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-asan-linux-release-x64-beta"
-    category: "vm|misc|aot"
-    short_name: "a"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-msan-linux-release-x64-beta"
-    category: "vm|misc|aot"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-tsan-linux-release-x64-beta"
-    category: "vm|misc|aot"
-    short_name: "t"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64-beta"
     category: "vm|product"
@@ -2365,36 +2325,6 @@ consoles: <
     category: "vm|misc"
     short_name: "o64"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64-stable"
-    category: "vm|misc"
-    short_name: "a"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msan-linux-release-x64-stable"
-    category: "vm|misc"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-tsan-linux-release-x64-stable"
-    category: "vm|misc"
-    short_name: "t"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-asan-linux-release-x64-stable"
-    category: "vm|misc|aot"
-    short_name: "a"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-msan-linux-release-x64-stable"
-    category: "vm|misc|aot"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-tsan-linux-release-x64-stable"
-    category: "vm|misc|aot"
-    short_name: "t"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64-stable"
     category: "vm|product"
@@ -2833,6 +2763,9 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.try/vm-kernel-tsan-linux-release-x64-try"
   >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-ubsan-linux-release-x64-try"
+  >
   builders: <
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-asan-linux-release-x64-try"
   >
@@ -2842,6 +2775,9 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-tsan-linux-release-x64-try"
   >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-ubsan-linux-release-x64-try"
+  >
   builders: <
     name: "buildbucket/luci.dart.try/vm-kernel-linux-product-x64-try"
   >
diff --git a/luci-notify.cfg b/luci-notify.cfg
index c6a7cbe441d8..591cc0120940 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -1279,6 +1279,20 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <>
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-ubsan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
@@ -1363,6 +1377,20 @@ notifiers: <
     repository: "https://dart.googlesource.com/sdk"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+    >
+    notify_blamelist: <>
+  >
+  builders: <
+    bucket: "ci.sandbox"
+    name: "vm-kernel-ubsan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index fcf78c17473c..299be7e8227d 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -2128,36 +2128,6 @@ job: <
     builder: "vm-kernel-asan-linux-release-x64"
   >
 >
-job: <
-  id: "vm-kernel-asan-linux-release-x64-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-asan-linux-release-x64-beta"
-  >
->
-job: <
-  id: "vm-kernel-asan-linux-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-asan-linux-release-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-asan-linux-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-asan-linux-release-x64-stable"
-  >
->
 job: <
   id: "vm-kernel-checked-linux-release-x64"
   schedule: "triggered"
@@ -2608,36 +2578,6 @@ job: <
     builder: "vm-kernel-msan-linux-release-x64"
   >
 >
-job: <
-  id: "vm-kernel-msan-linux-release-x64-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-msan-linux-release-x64-beta"
-  >
->
-job: <
-  id: "vm-kernel-msan-linux-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-msan-linux-release-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-msan-linux-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-msan-linux-release-x64-stable"
-  >
->
 job: <
   id: "vm-kernel-nnbd-linux-debug-x64"
   schedule: "triggered"
@@ -2888,36 +2828,6 @@ job: <
     builder: "vm-kernel-precomp-asan-linux-release-x64"
   >
 >
-job: <
-  id: "vm-kernel-precomp-asan-linux-release-x64-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-asan-linux-release-x64-beta"
-  >
->
-job: <
-  id: "vm-kernel-precomp-asan-linux-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-asan-linux-release-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-precomp-asan-linux-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-asan-linux-release-x64-stable"
-  >
->
 job: <
   id: "vm-kernel-precomp-linux-debug-simarm_x64"
   schedule: "triggered"
@@ -3248,36 +3158,6 @@ job: <
     builder: "vm-kernel-precomp-msan-linux-release-x64"
   >
 >
-job: <
-  id: "vm-kernel-precomp-msan-linux-release-x64-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-msan-linux-release-x64-beta"
-  >
->
-job: <
-  id: "vm-kernel-precomp-msan-linux-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-msan-linux-release-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-precomp-msan-linux-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-msan-linux-release-x64-stable"
-  >
->
 job: <
   id: "vm-kernel-precomp-nnbd-linux-release-x64"
   schedule: "triggered"
@@ -3369,33 +3249,13 @@ job: <
   >
 >
 job: <
-  id: "vm-kernel-precomp-tsan-linux-release-x64-beta"
+  id: "vm-kernel-precomp-ubsan-linux-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-tsan-linux-release-x64-beta"
-  >
->
-job: <
-  id: "vm-kernel-precomp-tsan-linux-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-tsan-linux-release-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-precomp-tsan-linux-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-tsan-linux-release-x64-stable"
+    builder: "vm-kernel-precomp-ubsan-linux-release-x64"
   >
 >
 job: <
@@ -3609,33 +3469,13 @@ job: <
   >
 >
 job: <
-  id: "vm-kernel-tsan-linux-release-x64-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-tsan-linux-release-x64-beta"
-  >
->
-job: <
-  id: "vm-kernel-tsan-linux-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-tsan-linux-release-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-tsan-linux-release-x64-stable"
+  id: "vm-kernel-ubsan-linux-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-tsan-linux-release-x64-stable"
+    builder: "vm-kernel-ubsan-linux-release-x64"
   >
 >
 job: <
@@ -3960,7 +3800,6 @@ trigger: <
   triggers: "vm-ffi-android-product-arm64-beta"
   triggers: "vm-ffi-android-release-arm-beta"
   triggers: "vm-ffi-android-release-arm64-beta"
-  triggers: "vm-kernel-asan-linux-release-x64-beta"
   triggers: "vm-kernel-checked-linux-release-x64-beta"
   triggers: "vm-kernel-linux-debug-ia32-beta"
   triggers: "vm-kernel-linux-debug-x64-beta"
@@ -3972,14 +3811,12 @@ trigger: <
   triggers: "vm-kernel-mac-debug-x64-beta"
   triggers: "vm-kernel-mac-product-x64-beta"
   triggers: "vm-kernel-mac-release-x64-beta"
-  triggers: "vm-kernel-msan-linux-release-x64-beta"
   triggers: "vm-kernel-nnbd-linux-debug-x64-beta"
   triggers: "vm-kernel-nnbd-linux-release-x64-beta"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-beta"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-beta"
   triggers: "vm-kernel-precomp-android-release-arm64-beta"
   triggers: "vm-kernel-precomp-android-release-arm_x64-beta"
-  triggers: "vm-kernel-precomp-asan-linux-release-x64-beta"
   triggers: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
   triggers: "vm-kernel-precomp-linux-debug-x64-beta"
   triggers: "vm-kernel-precomp-linux-product-x64-beta"
@@ -3988,16 +3825,13 @@ trigger: <
   triggers: "vm-kernel-precomp-linux-release-simarm_x64-beta"
   triggers: "vm-kernel-precomp-linux-release-x64-beta"
   triggers: "vm-kernel-precomp-mac-release-simarm64-beta"
-  triggers: "vm-kernel-precomp-msan-linux-release-x64-beta"
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
-  triggers: "vm-kernel-precomp-tsan-linux-release-x64-beta"
   triggers: "vm-kernel-precomp-win-release-x64-beta"
   triggers: "vm-kernel-reload-linux-debug-x64-beta"
   triggers: "vm-kernel-reload-linux-release-x64-beta"
   triggers: "vm-kernel-reload-rollback-linux-debug-x64-beta"
   triggers: "vm-kernel-reload-rollback-linux-release-x64-beta"
-  triggers: "vm-kernel-tsan-linux-release-x64-beta"
   triggers: "vm-kernel-win-debug-ia32-beta"
   triggers: "vm-kernel-win-debug-x64-beta"
   triggers: "vm-kernel-win-product-x64-beta"
@@ -4060,7 +3894,6 @@ trigger: <
   triggers: "vm-ffi-android-product-arm64-dev"
   triggers: "vm-ffi-android-release-arm-dev"
   triggers: "vm-ffi-android-release-arm64-dev"
-  triggers: "vm-kernel-asan-linux-release-x64-dev"
   triggers: "vm-kernel-checked-linux-release-x64-dev"
   triggers: "vm-kernel-linux-debug-ia32-dev"
   triggers: "vm-kernel-linux-debug-x64-dev"
@@ -4072,14 +3905,12 @@ trigger: <
   triggers: "vm-kernel-mac-debug-x64-dev"
   triggers: "vm-kernel-mac-product-x64-dev"
   triggers: "vm-kernel-mac-release-x64-dev"
-  triggers: "vm-kernel-msan-linux-release-x64-dev"
   triggers: "vm-kernel-nnbd-linux-debug-x64-dev"
   triggers: "vm-kernel-nnbd-linux-release-x64-dev"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-android-release-arm64-dev"
   triggers: "vm-kernel-precomp-android-release-arm_x64-dev"
-  triggers: "vm-kernel-precomp-asan-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
   triggers: "vm-kernel-precomp-linux-debug-x64-dev"
   triggers: "vm-kernel-precomp-linux-product-x64-dev"
@@ -4088,16 +3919,13 @@ trigger: <
   triggers: "vm-kernel-precomp-linux-release-simarm_x64-dev"
   triggers: "vm-kernel-precomp-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-mac-release-simarm64-dev"
-  triggers: "vm-kernel-precomp-msan-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-tsan-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-win-release-x64-dev"
   triggers: "vm-kernel-reload-linux-debug-x64-dev"
   triggers: "vm-kernel-reload-linux-release-x64-dev"
   triggers: "vm-kernel-reload-rollback-linux-debug-x64-dev"
   triggers: "vm-kernel-reload-rollback-linux-release-x64-dev"
-  triggers: "vm-kernel-tsan-linux-release-x64-dev"
   triggers: "vm-kernel-win-debug-ia32-dev"
   triggers: "vm-kernel-win-debug-x64-dev"
   triggers: "vm-kernel-win-product-x64-dev"
@@ -4224,7 +4052,6 @@ trigger: <
   triggers: "vm-ffi-android-product-arm64-stable"
   triggers: "vm-ffi-android-release-arm-stable"
   triggers: "vm-ffi-android-release-arm64-stable"
-  triggers: "vm-kernel-asan-linux-release-x64-stable"
   triggers: "vm-kernel-checked-linux-release-x64-stable"
   triggers: "vm-kernel-linux-debug-ia32-stable"
   triggers: "vm-kernel-linux-debug-x64-stable"
@@ -4236,14 +4063,12 @@ trigger: <
   triggers: "vm-kernel-mac-debug-x64-stable"
   triggers: "vm-kernel-mac-product-x64-stable"
   triggers: "vm-kernel-mac-release-x64-stable"
-  triggers: "vm-kernel-msan-linux-release-x64-stable"
   triggers: "vm-kernel-nnbd-linux-debug-x64-stable"
   triggers: "vm-kernel-nnbd-linux-release-x64-stable"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-android-release-arm64-stable"
   triggers: "vm-kernel-precomp-android-release-arm_x64-stable"
-  triggers: "vm-kernel-precomp-asan-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
   triggers: "vm-kernel-precomp-linux-debug-x64-stable"
   triggers: "vm-kernel-precomp-linux-product-x64-stable"
@@ -4252,16 +4077,13 @@ trigger: <
   triggers: "vm-kernel-precomp-linux-release-simarm_x64-stable"
   triggers: "vm-kernel-precomp-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-mac-release-simarm64-stable"
-  triggers: "vm-kernel-precomp-msan-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-tsan-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-win-release-x64-stable"
   triggers: "vm-kernel-reload-linux-debug-x64-stable"
   triggers: "vm-kernel-reload-linux-release-x64-stable"
   triggers: "vm-kernel-reload-rollback-linux-debug-x64-stable"
   triggers: "vm-kernel-reload-rollback-linux-release-x64-stable"
-  triggers: "vm-kernel-tsan-linux-release-x64-stable"
   triggers: "vm-kernel-win-debug-ia32-stable"
   triggers: "vm-kernel-win-debug-x64-stable"
   triggers: "vm-kernel-win-product-x64-stable"
@@ -4317,12 +4139,14 @@ trigger: <
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64"
   triggers: "vm-kernel-precomp-tsan-linux-release-x64"
+  triggers: "vm-kernel-precomp-ubsan-linux-release-x64"
   triggers: "vm-kernel-precomp-win-release-x64"
   triggers: "vm-kernel-reload-linux-debug-x64"
   triggers: "vm-kernel-reload-linux-release-x64"
   triggers: "vm-kernel-reload-rollback-linux-debug-x64"
   triggers: "vm-kernel-reload-rollback-linux-release-x64"
   triggers: "vm-kernel-tsan-linux-release-x64"
+  triggers: "vm-kernel-ubsan-linux-release-x64"
   triggers: "vm-kernel-win-debug-ia32"
   triggers: "vm-kernel-win-release-ia32"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm"
diff --git a/main.star b/main.star
index 4e2fd18b7019..bb7ed367c539 100755
--- a/main.star
+++ b/main.star
@@ -513,7 +513,7 @@ def dart_vm_extra_builder(name, on_cq=False, location_regexp=None, **kwargs):
 
 def dart_vm_low_priority_builder(name, **kwargs):
     dart_vm_extra_builder(
-        name, priority=LOW, expiration_timeout=time.day, **kwargs)
+        name, channels=["try"], priority=LOW, expiration_timeout=time.day, **kwargs)
 
 
 nightly_builders = []
@@ -676,12 +676,16 @@ dart_vm_low_priority_builder(
     "vm-kernel-msan-linux-release-x64", category="vm|misc|m")
 dart_vm_low_priority_builder(
     "vm-kernel-tsan-linux-release-x64", category="vm|misc|t")
+dart_vm_low_priority_builder(
+    "vm-kernel-ubsan-linux-release-x64", category="vm|misc|u")
 dart_vm_low_priority_builder(
     "vm-kernel-precomp-asan-linux-release-x64", category="vm|misc|aot|a")
 dart_vm_low_priority_builder(
     "vm-kernel-precomp-msan-linux-release-x64", category="vm|misc|aot|m")
 dart_vm_low_priority_builder(
     "vm-kernel-precomp-tsan-linux-release-x64", category="vm|misc|aot|t")
+dart_vm_low_priority_builder(
+    "vm-kernel-precomp-ubsan-linux-release-x64", category="vm|misc|aot|u")
 
 # vm|product
 dart_vm_extra_builder(

From cdffcfb059aec06ad9b4527501cf619b2dfb5a90 Mon Sep 17 00:00:00 2001
From: Karl Klose <karlklose@google.com>
Date: Thu, 14 May 2020 07:19:29 +0000
Subject: [PATCH 365/826] [infra] Remove 'analyzer-stable' builders

Change-Id: I6ad43cde745626da0ffee5327f8b9beb3d4b7440
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/148061
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 120 ---------------------------------------------
 luci-milo.cfg      |  67 -------------------------
 luci-scheduler.cfg |  63 ------------------------
 main.star          |  22 +++------
 4 files changed, 6 insertions(+), 266 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 2440c84d474a..52bf340d1721 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -754,30 +754,6 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-    builders: <
-      name: "analyzer-analysis-server-linux-analyzer-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
       name: "analyzer-analysis-server-linux-beta"
       swarming_host: "chromium-swarm.appspot.com"
@@ -874,30 +850,6 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-    builders: <
-      name: "analyzer-linux-release-analyzer-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
       name: "analyzer-linux-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
@@ -994,30 +946,6 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-    builders: <
-      name: "analyzer-mac-release-analyzer-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
       name: "analyzer-mac-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
@@ -1114,30 +1042,6 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-    builders: <
-      name: "analyzer-nnbd-linux-release-analyzer-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
       name: "analyzer-nnbd-linux-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
@@ -1234,30 +1138,6 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
-    builders: <
-      name: "analyzer-win-release-analyzer-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
     builders: <
       name: "analyzer-win-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 003256687255..90bf96312a26 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -4,73 +4,6 @@
 # For the schema of this file, see Project message:
 #   https://luci-config.appspot.com/schemas/projects:luci-milo.cfg
 
-consoles: <
-  id: "analyzer-stable"
-  name: "SDK Analyzer Stable Branch Console"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/analyzer-stable"
-  manifest_name: "REVISION"
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-analyzer-stable"
-    category: "analyzer"
-    short_name: "as"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-analyzer-stable"
-    category: "analyzer"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-analyzer-stable"
-    category: "analyzer"
-    short_name: "nn"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-analyzer-stable"
-    category: "analyzer"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-analyzer-stable"
-    category: "analyzer"
-    short_name: "w"
-  >
-  header: <
-    links: <
-      name: "Consoles"
-      links: <
-        text: "Bleeding Edge console"
-        url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
-      >
-      links: <
-        text: "Alternative Bleeding Edge console"
-        url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
-      >
-      links: <
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
-      >
-      links: <
-        text: "SDK CQ Status"
-        url: "/p/dart/g/cq/builders"
-        alt: "SDK CQ Status"
-      >
-      links: <
-        text: "Results Feed"
-        url: "https://dart-ci.firebaseapp.com/"
-        alt: "Results Feed"
-      >
-    >
-    console_groups: <
-      console_ids: "dart/flutter"
-      console_ids: "dart/flutter-hhh"
-    >
-    tree_status_host: "dart-status.appspot.com"
-  >
->
 consoles: <
   id: "be"
   name: "SDK Bleeding Edge Console"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 299be7e8227d..730f044f99e2 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -14,16 +14,6 @@ job: <
     builder: "analyzer-analysis-server-linux"
   >
 >
-job: <
-  id: "analyzer-analysis-server-linux-analyzer-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-analysis-server-linux-analyzer-stable"
-  >
->
 job: <
   id: "analyzer-analysis-server-linux-beta"
   schedule: "triggered"
@@ -64,16 +54,6 @@ job: <
     builder: "analyzer-linux-release"
   >
 >
-job: <
-  id: "analyzer-linux-release-analyzer-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-linux-release-analyzer-stable"
-  >
->
 job: <
   id: "analyzer-linux-release-beta"
   schedule: "triggered"
@@ -114,16 +94,6 @@ job: <
     builder: "analyzer-mac-release"
   >
 >
-job: <
-  id: "analyzer-mac-release-analyzer-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-mac-release-analyzer-stable"
-  >
->
 job: <
   id: "analyzer-mac-release-beta"
   schedule: "triggered"
@@ -164,16 +134,6 @@ job: <
     builder: "analyzer-nnbd-linux-release"
   >
 >
-job: <
-  id: "analyzer-nnbd-linux-release-analyzer-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-nnbd-linux-release-analyzer-stable"
-  >
->
 job: <
   id: "analyzer-nnbd-linux-release-beta"
   schedule: "triggered"
@@ -214,16 +174,6 @@ job: <
     builder: "analyzer-win-release"
   >
 >
-job: <
-  id: "analyzer-win-release-analyzer-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-win-release-analyzer-stable"
-  >
->
 job: <
   id: "analyzer-win-release-beta"
   schedule: "triggered"
@@ -3736,19 +3686,6 @@ trigger: <
     refs: "regexp:refs/heads/master"
   >
 >
-trigger: <
-  id: "dart-gitiles-trigger-analyzer-stable"
-  acl_sets: "ci"
-  triggers: "analyzer-analysis-server-linux-analyzer-stable"
-  triggers: "analyzer-linux-release-analyzer-stable"
-  triggers: "analyzer-mac-release-analyzer-stable"
-  triggers: "analyzer-nnbd-linux-release-analyzer-stable"
-  triggers: "analyzer-win-release-analyzer-stable"
-  gitiles: <
-    repo: "https://dart.googlesource.com/sdk"
-    refs: "regexp:refs/heads/analyzer-stable"
-  >
->
 trigger: <
   id: "dart-gitiles-trigger-beta"
   acl_sets: "ci"
diff --git a/main.star b/main.star
index bb7ed367c539..9b7a6e5e3983 100755
--- a/main.star
+++ b/main.star
@@ -22,7 +22,6 @@ GOMA_RBE = {
 
 RELEASE_CHANNELS = ["beta", "dev", "stable"]
 CHANNELS = RELEASE_CHANNELS + ["try"]
-ANALYZER_CHANNELS = ["analyzer-stable"] + CHANNELS
 BRANCHES = ["master"] + RELEASE_CHANNELS
 
 TEST_PY_PATHS = "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
@@ -134,14 +133,6 @@ luci.milo(
     logo="https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png",
 )
 
-luci.console_view(
-    name="analyzer-stable",
-    repo="https://dart.googlesource.com/sdk",
-    title="SDK Analyzer Stable Branch Console",
-    refs=["refs/heads/analyzer-stable"],
-    header="console-header.textpb",
-)
-
 luci.console_view(
     name="be",
     repo="https://dart.googlesource.com/sdk",
@@ -255,7 +246,7 @@ def dart_poller(name, bucket="ci", branches=BRANCHES, paths=None):
         )
 
 
-dart_poller("dart-gitiles-trigger", branches=BRANCHES + ["analyzer-stable"])
+dart_poller("dart-gitiles-trigger", branches=BRANCHES)
 dart_poller("dart-vm-gitiles-trigger", branches=["master"], paths=VM_PATHS)
 
 luci.gitiles_poller(
@@ -307,7 +298,6 @@ luci.cq_group(
     tree_status_host="dart-status.appspot.com",
     retry_config=cq.RETRY_NONE,
     verifiers=None,
-    cancel_stale_tryjobs=True,
 )
 
 
@@ -792,27 +782,27 @@ dart_ci_sandbox_builder(
 dart_ci_sandbox_builder(
     "analyzer-analysis-server-linux",
     category="analyzer|as",
-    channels=ANALYZER_CHANNELS,
+    channels=CHANNELS,
     on_cq=True)
 dart_ci_sandbox_builder(
     "analyzer-linux-release",
     category="analyzer|l",
     on_cq=True,
-    channels=ANALYZER_CHANNELS)
+    channels=CHANNELS)
 dart_ci_sandbox_builder(
     "analyzer-nnbd-linux-release",
     category="analyzer|nn",
-    channels=ANALYZER_CHANNELS)
+    channels=CHANNELS)
 dart_ci_sandbox_builder(
     "analyzer-mac-release",
     category="analyzer|m",
     dimensions=mac(),
-    channels=ANALYZER_CHANNELS)
+    channels=CHANNELS)
 dart_ci_sandbox_builder(
     "analyzer-win-release",
     category="analyzer|w",
     dimensions=windows(),
-    channels=ANALYZER_CHANNELS)
+    channels=CHANNELS)
 
 # sdk
 dart_ci_builder(

From 94cf8288b48c2bdedd9d307cd052382b8e22a513 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 18 May 2020 17:43:42 +0000
Subject: [PATCH 366/826] [infra] Add a GCC try bot.

Change-Id: I832a2e6a1c5e0864ed8f44faa02895b4dbc1018a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/148461
Reviewed-by: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg   |  4 ++++
 cr-buildbucket.cfg | 24 ++++++++++++++++++++++++
 luci-milo.cfg      |  3 +++
 main.star          |  1 +
 4 files changed, 32 insertions(+)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index f54a3f4a9120..3ee826aa2e36 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -340,6 +340,10 @@ config_groups: <
         name: "dart/try/vm-kernel-checked-linux-release-x64-try"
         includable_only: true
       >
+      builders: <
+        name: "dart/try/vm-kernel-gcc-linux-try"
+        includable_only: true
+      >
       builders: <
         name: "dart/try/vm-kernel-linux-debug-ia32-try"
         includable_only: true
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 52bf340d1721..70fba8b38c7a 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -10226,6 +10226,30 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "vm-kernel-gcc-linux-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe: <
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      >
+      priority: 30
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "vm-kernel-linux-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 90bf96312a26..6c1072db1c13 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2849,6 +2849,9 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.try/benchmark-linux-try"
   >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-gcc-linux-try"
+  >
   builder_view_only: true
 >
 consoles: <
diff --git a/main.star b/main.star
index 9b7a6e5e3983..8e8e02f877b6 100755
--- a/main.star
+++ b/main.star
@@ -891,6 +891,7 @@ dart_ci_sandbox_builder(
 
 # Try only builders
 dart_try_builder("benchmark-linux", on_cq=True)
+dart_try_builder("vm-kernel-gcc-linux")
 
 
 def add_postponed_alt_console_entries():

From f40a2722d812b3e4085c8a391adb4e9fbcb34185 Mon Sep 17 00:00:00 2001
From: Karl Klose <karlklose@google.com>
Date: Tue, 26 May 2020 07:20:37 +0000
Subject: [PATCH 367/826] [infra] Increase timeout for flutter-engine-linux to
 7 hours

Also changes the definition of other timeouts to use durations
and updates a schedule description.

Change-Id: I0bf967219cf0ab437793c7695acdbe0a5d34b38f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/149000
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg |  4 ++--
 luci-scheduler.cfg |  2 +-
 main.star          | 16 ++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 70fba8b38c7a..37505ed67ea6 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -3252,7 +3252,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 50
-      execution_timeout_secs: 21600
+      execution_timeout_secs: 25200
       caches: <
         name: "browsers"
         path: "browsers"
@@ -9688,7 +9688,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 30
-      execution_timeout_secs: 21600
+      execution_timeout_secs: 25200
       caches: <
         name: "browsers"
         path: "browsers"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 730f044f99e2..53935ac6d02c 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -326,7 +326,7 @@ job: <
 >
 job: <
   id: "base"
-  schedule: "with 10m interval"
+  schedule: "with 15m interval"
   acl_sets: "ci"
   buildbucket: <
     server: "cr-buildbucket.appspot.com"
diff --git a/main.star b/main.star
index 8e8e02f877b6..ec6b9fd569a2 100755
--- a/main.star
+++ b/main.star
@@ -544,7 +544,7 @@ dart_ci_sandbox_builder(
     recipe="dart/flutter_engine",
     category="flutter|3H",
     channels=["try"],
-    execution_timeout=time.duration(6 * 60 * 60 * 1000),
+    execution_timeout=7 * time.hour,
     triggered_by=["dart-gitiles-trigger-flutter"],
 )
 
@@ -607,7 +607,7 @@ dart_vm_extra_builder(
     "cross-vm-linux-release-arm64",
     category="vm|kernel|cra",
     channels=RELEASE_CHANNELS,
-    properties={"shard_timeout": 5400})  # 1.5h
+    properties={"shard_timeout": (90 * time.minute) / time.second})
 
 # vm|kernel-precomp
 dart_vm_extra_builder(
@@ -627,7 +627,7 @@ dart_vm_extra_builder(
 dart_vm_extra_builder(
     "vm-kernel-precomp-linux-debug-simarm_x64",
     category="vm|kernel-precomp|adx",
-    properties={"shard_timeout": 5400})  # 1.5h
+    properties={"shard_timeout": (90 * time.minute) / time.second})
 dart_vm_extra_builder(
     "vm-kernel-precomp-linux-release-simarm_x64",
     category="vm|kernel-precomp|arx")
@@ -643,17 +643,17 @@ dart_vm_nightly_builder(
     "cross-vm-precomp-linux-release-arm64",
     category="vm|kernel-precomp|cra",
     channels=[],
-    properties={"shard_timeout": 5400})  # 1.5h
+    properties={"shard_timeout": (90 * time.minute) / time.second})
 
 # vm|kernel-precomp|android
 dart_vm_extra_builder(
     "vm-kernel-precomp-android-release-arm_x64",
     category="vm|kernel-precomp|android|a32",
-    properties={"shard_timeout": 5400})  # 1.5h
+    properties={"shard_timeout": (90 * time.minute) / time.second})
 dart_vm_extra_builder(
     "vm-kernel-precomp-android-release-arm64",
     category="vm|kernel-precomp|android|a64",
-    properties={"shard_timeout": 5400})  # 1.5h
+    properties={"shard_timeout": (90 * time.minute) / time.second})
 
 # vm|misc
 dart_vm_extra_builder(
@@ -851,9 +851,9 @@ dart_infra_builder(
 # infra
 dart_infra_builder(
     "base",
-    execution_timeout=time.duration(15 * 60 * 1000),
+    execution_timeout=15 * time.minute,
     recipe="dart/forward_branch",
-    schedule="with 10m interval",
+    schedule="with 15m interval",
     notifies=None)
 dart_infra_builder("chocolatey", recipe="dart/chocolatey", dimensions=windows())
 dart_infra_builder("co19-roller", recipe="dart/package_co19")

From f9a09eb8903a68727f54be470925907905f81549 Mon Sep 17 00:00:00 2001
From: Karl Klose <karlklose@google.com>
Date: Wed, 27 May 2020 06:27:16 +0000
Subject: [PATCH 368/826] [infra] Increase timeout for flutter-engine-linux to
 8 hours

Change-Id: I5f4b9a56887ee822c997f2e8e5614f86cac2dd19
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/149062
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 4 ++--
 main.star          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 37505ed67ea6..a45a5a69f29c 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -3252,7 +3252,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 50
-      execution_timeout_secs: 25200
+      execution_timeout_secs: 28800
       caches: <
         name: "browsers"
         path: "browsers"
@@ -9688,7 +9688,7 @@ buckets: <
         properties_j: "clobber:\"true\""
       >
       priority: 30
-      execution_timeout_secs: 25200
+      execution_timeout_secs: 28800
       caches: <
         name: "browsers"
         path: "browsers"
diff --git a/main.star b/main.star
index ec6b9fd569a2..876731306d23 100755
--- a/main.star
+++ b/main.star
@@ -544,7 +544,7 @@ dart_ci_sandbox_builder(
     recipe="dart/flutter_engine",
     category="flutter|3H",
     channels=["try"],
-    execution_timeout=7 * time.hour,
+    execution_timeout=8 * time.hour,
     triggered_by=["dart-gitiles-trigger-flutter"],
 )
 

From c9004fb683289cec6adfce9372398effd069f388 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 3 Jun 2020 08:03:40 +0000
Subject: [PATCH 369/826] [infra] Add a recipe autoroller builder

This builder will check for roll candidates every hour but with low
priority. It will create Gerrit CLs to roll recipe dependencies forward.

https://crbug.com/1054201

Change-Id: Ib307abdc974ed7bad04c82c178670592f62a2837
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/149596
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 28 ++++++++++++++++++++++++++++
 luci-milo.cfg      |  3 +++
 luci-notify.cfg    | 14 ++++++++++++++
 luci-scheduler.cfg | 10 ++++++++++
 main.star          | 21 +++++++++++++++++++++
 5 files changed, 76 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index a45a5a69f29c..9b1fea333fea 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -610,6 +610,34 @@ buckets: <
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "recipe-deps-roller"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      recipe: <
+        name: "recipe_autoroller"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
+        cipd_version: "git_revision:647d5e58ec508f13ccd054f1516e78d7ca3bd540"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+        properties_j: "db_gcs_bucket:\"dart-recipe-roller-db\""
+        properties_j: "projects:[[\"dart\",\"https://dart.googlesource.com/recipes\"]]"
+      >
+      priority: 70
+      execution_timeout_secs: 1200
+      expiration_secs: 86400
+      caches: <
+        name: "browsers"
+        path: "browsers"
+      >
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    >
     builders: <
       name: "versionchecker-linux"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 6c1072db1c13..383f42fff671 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2878,6 +2878,9 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.ci/nightly"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci/recipe-deps-roller"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci/recipe-bundler"
   >
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 591cc0120940..72056ef87ec3 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -146,6 +146,20 @@ notifiers: <
     repository: "https://dart.googlesource.com/recipes"
   >
 >
+notifiers: <
+  notifications: <
+    on_new_failure: true
+    email: <
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    >
+  >
+  builders: <
+    bucket: "ci"
+    name: "recipe-deps-roller"
+  >
+>
 notifiers: <
   notifications: <
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 53935ac6d02c..e1cc7bbe397e 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1628,6 +1628,16 @@ job: <
     builder: "recipe-bundler"
   >
 >
+job: <
+  id: "recipe-deps-roller"
+  schedule: "with 1h interval"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "recipe-deps-roller"
+  >
+>
 job: <
   id: "versionchecker-linux"
   schedule: "triggered"
diff --git a/main.star b/main.star
index 876731306d23..4f219c792723 100755
--- a/main.star
+++ b/main.star
@@ -923,6 +923,27 @@ luci.console_view_entry(
     console_view="flutter-hhh",
 )
 
+# Rolls dart recipe dependencies.
+dart_infra_builder(
+    name="recipe-deps-roller",
+    executable=luci.recipe(
+        name="recipe_autoroller",
+        cipd_package=
+        "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
+        cipd_version="git_revision:647d5e58ec508f13ccd054f1516e78d7ca3bd540"
+    ),
+    execution_timeout=20 * time.minute,
+    expiration_timeout=time.day,
+    priority=LOW,
+    properties={
+        "db_gcs_bucket": "dart-recipe-roller-db",
+        "projects": {
+            "dart": "https://dart.googlesource.com/recipes",
+        }.items(), # recipe_autoroller expects a list of tuples.
+    },
+    schedule="with 1h interval",
+)
+
 dart_infra_builder(
     name="recipe-bundler",
     executable=luci.recipe(

From 4707d1479af0f500bf2fcc49a040e4ad4e080c7d Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 4 Jun 2020 14:21:10 +0000
Subject: [PATCH 370/826] [infra] Add CQ configurations for the dart_ci and
 recipes repos

Initially, they will not have any verifiers. The CQ will just submit on
behalf of the triggerer. This enables rollers to land changes and
enables Auto-Submit.

Change-Id: I30559e0a8b020c65fcf7fe33077d788dc3d274b2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/150100
Reviewed-by: William Hesse <whesse@google.com>
---
 commit-queue.cfg | 40 ++++++++++++++++++++++++++++++++++++++++
 main.star        | 24 ++++++++++++++++++++++--
 2 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 3ee826aa2e36..c90ec2cf4f3e 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -10,6 +10,46 @@ submit_options: <
     seconds: 480
   >
 >
+config_groups: <
+  name: "dart_ci"
+  gerrit: <
+    url: "https://dart-review.googlesource.com"
+    projects: <
+      name: "dart_ci"
+      ref_regexp: "refs/heads/master"
+    >
+  >
+  verifiers: <
+    gerrit_cq_ability: <
+      committer_list: "project-dart-committers"
+      dry_run_access_list: "project-dart-tryjob-access"
+      allow_submit_with_open_deps: true
+    >
+    tree_status: <
+      url: "https://dart-status.appspot.com"
+    >
+  >
+>
+config_groups: <
+  name: "recipes"
+  gerrit: <
+    url: "https://dart-review.googlesource.com"
+    projects: <
+      name: "recipes"
+      ref_regexp: "refs/heads/master"
+    >
+  >
+  verifiers: <
+    gerrit_cq_ability: <
+      committer_list: "project-dart-committers"
+      dry_run_access_list: "project-dart-tryjob-access"
+      allow_submit_with_open_deps: true
+    >
+    tree_status: <
+      url: "https://dart-status.appspot.com"
+    >
+  >
+>
 config_groups: <
   name: "sdk"
   gerrit: <
diff --git a/main.star b/main.star
index 4f219c792723..cddd0da9faf0 100755
--- a/main.star
+++ b/main.star
@@ -12,7 +12,7 @@
 load("//defaults.star", "defaults")
 
 DART_GIT = "https://dart.googlesource.com/sdk"
-DART_GERRIT = "https://dart-review.googlesource.com/sdk"
+DART_GERRIT = "https://dart-review.googlesource.com/"
 
 GOMA_RBE = {
     "enable_ats": True,
@@ -293,7 +293,27 @@ luci.cq(
 luci.cq_group(
     name="sdk",
     watch=cq.refset(
-        DART_GERRIT, refs=["refs/heads/%s" % branch for branch in BRANCHES]),
+        DART_GERRIT + "sdk", refs=["refs/heads/%s" % branch for branch in BRANCHES]),
+    allow_submit_with_open_deps=True,
+    tree_status_host="dart-status.appspot.com",
+    retry_config=cq.RETRY_NONE,
+    verifiers=None,
+)
+
+luci.cq_group(
+    name="recipes",
+    watch=cq.refset(
+        DART_GERRIT + "recipes", refs=["refs/heads/master"]),
+    allow_submit_with_open_deps=True,
+    tree_status_host="dart-status.appspot.com",
+    retry_config=cq.RETRY_NONE,
+    verifiers=None,
+)
+
+luci.cq_group(
+    name="dart_ci",
+    watch=cq.refset(
+        DART_GERRIT + "dart_ci", refs=["refs/heads/master"]),
     allow_submit_with_open_deps=True,
     tree_status_host="dart-status.appspot.com",
     retry_config=cq.RETRY_NONE,

From 80311a70d76b622421e53bd93829c6efa82a9dc3 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Thu, 4 Jun 2020 17:11:34 +0000
Subject: [PATCH 371/826] [infra] Make opt-counter and reload builders low
 priority.

Also reorders the console to group all the low priority builders together.

Change-Id: Iac821bcce94d82c49c1b6c802a51f1c86766ebb1
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/149642
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 450 ++-------------------------------------------
 luci-milo.cfg      | 184 +++++-------------
 luci-scheduler.cfg | 198 --------------------
 main.star          |  40 ++--
 4 files changed, 77 insertions(+), 795 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 9b1fea333fea..7e85247d6ce4 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -6411,79 +6411,8 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-ia32-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
+      priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -6507,79 +6436,8 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
+      priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -7963,79 +7821,8 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-linux-debug-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-linux-debug-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-linux-debug-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
+      priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -8059,79 +7846,8 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
+      priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -8155,79 +7871,8 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-rollback-linux-debug-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-rollback-linux-debug-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-rollback-linux-debug-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
+      priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
@@ -8251,79 +7896,8 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-rollback-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-rollback-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
-      caches: <
-        name: "browsers"
-        path: "browsers"
-      >
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
-      name: "vm-kernel-reload-rollback-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe: <
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      >
-      priority: 50
+      priority: 70
+      expiration_secs: 86400
       caches: <
         name: "browsers"
         path: "browsers"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 383f42fff671..d4ea0741f9fd 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -225,6 +225,21 @@ consoles: <
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
+    category: "vm|product"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
+    category: "vm|product"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
+    category: "vm|product"
+    short_name: "w"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
     category: "vm|misc"
@@ -275,39 +290,24 @@ consoles: <
     category: "vm|misc|aot"
     short_name: "u"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
-    category: "vm|product"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
-    category: "vm|product"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
-    category: "vm|product"
-    short_name: "w"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
-    category: "vm|reload-kernel"
+    category: "vm|misc|reload"
     short_name: "d"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
-    category: "vm|reload-kernel"
+    category: "vm|misc|reload"
     short_name: "r"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
-    category: "vm|reload-kernel"
+    category: "vm|misc|reload"
     short_name: "drb"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64"
-    category: "vm|reload-kernel"
+    category: "vm|misc|reload"
     short_name: "rrb"
   >
   builders: <
@@ -942,6 +942,21 @@ consoles: <
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
+    category: "vm|product"
+    short_name: "l"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
+    category: "vm|product"
+    short_name: "m"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
+    category: "vm|product"
+    short_name: "w"
+  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
     category: "vm|misc"
@@ -992,39 +1007,24 @@ consoles: <
     category: "vm|misc|aot"
     short_name: "u"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
-    category: "vm|product"
-    short_name: "l"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
-    category: "vm|product"
-    short_name: "m"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
-    category: "vm|product"
-    short_name: "w"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
-    category: "vm|reload-kernel"
+    category: "vm|misc|reload"
     short_name: "d"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
-    category: "vm|reload-kernel"
+    category: "vm|misc|reload"
     short_name: "r"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
-    category: "vm|reload-kernel"
+    category: "vm|misc|reload"
     short_name: "drb"
   >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64"
-    category: "vm|reload-kernel"
+    category: "vm|misc|reload"
     short_name: "rrb"
   >
   builders: <
@@ -1304,16 +1304,6 @@ consoles: <
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32-dev"
-    category: "vm|misc"
-    short_name: "o32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-dev"
-    category: "vm|misc"
-    short_name: "o64"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64-dev"
     category: "vm|product"
@@ -1329,26 +1319,6 @@ consoles: <
     category: "vm|product"
     short_name: "w"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64-dev"
-    category: "vm|reload-kernel"
-    short_name: "d"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64-dev"
-    category: "vm|reload-kernel"
-    short_name: "r"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64-dev"
-    category: "vm|reload-kernel"
-    short_name: "drb"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64-dev"
-    category: "vm|reload-kernel"
-    short_name: "rrb"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-dev"
     category: "vm|ffi"
@@ -1776,16 +1746,6 @@ consoles: <
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32-beta"
-    category: "vm|misc"
-    short_name: "o32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-beta"
-    category: "vm|misc"
-    short_name: "o64"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64-beta"
     category: "vm|product"
@@ -1801,26 +1761,6 @@ consoles: <
     category: "vm|product"
     short_name: "w"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64-beta"
-    category: "vm|reload-kernel"
-    short_name: "d"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64-beta"
-    category: "vm|reload-kernel"
-    short_name: "r"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64-beta"
-    category: "vm|reload-kernel"
-    short_name: "drb"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64-beta"
-    category: "vm|reload-kernel"
-    short_name: "rrb"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-beta"
     category: "vm|ffi"
@@ -2248,16 +2188,6 @@ consoles: <
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32-stable"
-    category: "vm|misc"
-    short_name: "o32"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64-stable"
-    category: "vm|misc"
-    short_name: "o64"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64-stable"
     category: "vm|product"
@@ -2273,26 +2203,6 @@ consoles: <
     category: "vm|product"
     short_name: "w"
   >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64-stable"
-    category: "vm|reload-kernel"
-    short_name: "d"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64-stable"
-    category: "vm|reload-kernel"
-    short_name: "r"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64-stable"
-    category: "vm|reload-kernel"
-    short_name: "drb"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64-stable"
-    category: "vm|reload-kernel"
-    short_name: "rrb"
-  >
   builders: <
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-stable"
     category: "vm|ffi"
@@ -2681,6 +2591,15 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm64-try"
   >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-product-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-mac-product-x64-try"
+  >
+  builders: <
+    name: "buildbucket/luci.dart.try/vm-kernel-win-product-x64-try"
+  >
   builders: <
     name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
   >
@@ -2711,15 +2630,6 @@ consoles: <
   builders: <
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-ubsan-linux-release-x64-try"
   >
-  builders: <
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-product-x64-try"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.try/vm-kernel-mac-product-x64-try"
-  >
-  builders: <
-    name: "buildbucket/luci.dart.try/vm-kernel-win-product-x64-try"
-  >
   builders: <
     name: "buildbucket/luci.dart.try/vm-kernel-reload-linux-debug-x64-try"
   >
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index e1cc7bbe397e..d838a0364b1a 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -2628,36 +2628,6 @@ job: <
     builder: "vm-kernel-optcounter-threshold-linux-release-ia32"
   >
 >
-job: <
-  id: "vm-kernel-optcounter-threshold-linux-release-ia32-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-optcounter-threshold-linux-release-ia32-beta"
-  >
->
-job: <
-  id: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
-  >
->
-job: <
-  id: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
-  >
->
 job: <
   id: "vm-kernel-optcounter-threshold-linux-release-x64"
   schedule: "triggered"
@@ -2668,36 +2638,6 @@ job: <
     builder: "vm-kernel-optcounter-threshold-linux-release-x64"
   >
 >
-job: <
-  id: "vm-kernel-optcounter-threshold-linux-release-x64-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-optcounter-threshold-linux-release-x64-beta"
-  >
->
-job: <
-  id: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
-  >
->
 job: <
   id: "vm-kernel-precomp-android-release-arm64"
   schedule: "triggered"
@@ -3268,36 +3208,6 @@ job: <
     builder: "vm-kernel-reload-linux-debug-x64"
   >
 >
-job: <
-  id: "vm-kernel-reload-linux-debug-x64-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-linux-debug-x64-beta"
-  >
->
-job: <
-  id: "vm-kernel-reload-linux-debug-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-linux-debug-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-reload-linux-debug-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-linux-debug-x64-stable"
-  >
->
 job: <
   id: "vm-kernel-reload-linux-release-x64"
   schedule: "triggered"
@@ -3308,36 +3218,6 @@ job: <
     builder: "vm-kernel-reload-linux-release-x64"
   >
 >
-job: <
-  id: "vm-kernel-reload-linux-release-x64-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-linux-release-x64-beta"
-  >
->
-job: <
-  id: "vm-kernel-reload-linux-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-linux-release-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-reload-linux-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-linux-release-x64-stable"
-  >
->
 job: <
   id: "vm-kernel-reload-rollback-linux-debug-x64"
   schedule: "triggered"
@@ -3348,36 +3228,6 @@ job: <
     builder: "vm-kernel-reload-rollback-linux-debug-x64"
   >
 >
-job: <
-  id: "vm-kernel-reload-rollback-linux-debug-x64-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-debug-x64-beta"
-  >
->
-job: <
-  id: "vm-kernel-reload-rollback-linux-debug-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-debug-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-reload-rollback-linux-debug-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-debug-x64-stable"
-  >
->
 job: <
   id: "vm-kernel-reload-rollback-linux-release-x64"
   schedule: "triggered"
@@ -3388,36 +3238,6 @@ job: <
     builder: "vm-kernel-reload-rollback-linux-release-x64"
   >
 >
-job: <
-  id: "vm-kernel-reload-rollback-linux-release-x64-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-release-x64-beta"
-  >
->
-job: <
-  id: "vm-kernel-reload-rollback-linux-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-release-x64-dev"
-  >
->
-job: <
-  id: "vm-kernel-reload-rollback-linux-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-release-x64-stable"
-  >
->
 job: <
   id: "vm-kernel-tsan-linux-release-x64"
   schedule: "triggered"
@@ -3760,8 +3580,6 @@ trigger: <
   triggers: "vm-kernel-mac-release-x64-beta"
   triggers: "vm-kernel-nnbd-linux-debug-x64-beta"
   triggers: "vm-kernel-nnbd-linux-release-x64-beta"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-beta"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-x64-beta"
   triggers: "vm-kernel-precomp-android-release-arm64-beta"
   triggers: "vm-kernel-precomp-android-release-arm_x64-beta"
   triggers: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
@@ -3775,10 +3593,6 @@ trigger: <
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
   triggers: "vm-kernel-precomp-win-release-x64-beta"
-  triggers: "vm-kernel-reload-linux-debug-x64-beta"
-  triggers: "vm-kernel-reload-linux-release-x64-beta"
-  triggers: "vm-kernel-reload-rollback-linux-debug-x64-beta"
-  triggers: "vm-kernel-reload-rollback-linux-release-x64-beta"
   triggers: "vm-kernel-win-debug-ia32-beta"
   triggers: "vm-kernel-win-debug-x64-beta"
   triggers: "vm-kernel-win-product-x64-beta"
@@ -3854,8 +3668,6 @@ trigger: <
   triggers: "vm-kernel-mac-release-x64-dev"
   triggers: "vm-kernel-nnbd-linux-debug-x64-dev"
   triggers: "vm-kernel-nnbd-linux-release-x64-dev"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-dev"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-android-release-arm64-dev"
   triggers: "vm-kernel-precomp-android-release-arm_x64-dev"
   triggers: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
@@ -3869,10 +3681,6 @@ trigger: <
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-win-release-x64-dev"
-  triggers: "vm-kernel-reload-linux-debug-x64-dev"
-  triggers: "vm-kernel-reload-linux-release-x64-dev"
-  triggers: "vm-kernel-reload-rollback-linux-debug-x64-dev"
-  triggers: "vm-kernel-reload-rollback-linux-release-x64-dev"
   triggers: "vm-kernel-win-debug-ia32-dev"
   triggers: "vm-kernel-win-debug-x64-dev"
   triggers: "vm-kernel-win-product-x64-dev"
@@ -4012,8 +3820,6 @@ trigger: <
   triggers: "vm-kernel-mac-release-x64-stable"
   triggers: "vm-kernel-nnbd-linux-debug-x64-stable"
   triggers: "vm-kernel-nnbd-linux-release-x64-stable"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32-stable"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-android-release-arm64-stable"
   triggers: "vm-kernel-precomp-android-release-arm_x64-stable"
   triggers: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
@@ -4027,10 +3833,6 @@ trigger: <
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-win-release-x64-stable"
-  triggers: "vm-kernel-reload-linux-debug-x64-stable"
-  triggers: "vm-kernel-reload-linux-release-x64-stable"
-  triggers: "vm-kernel-reload-rollback-linux-debug-x64-stable"
-  triggers: "vm-kernel-reload-rollback-linux-release-x64-stable"
   triggers: "vm-kernel-win-debug-ia32-stable"
   triggers: "vm-kernel-win-debug-x64-stable"
   triggers: "vm-kernel-win-product-x64-stable"
diff --git a/main.star b/main.star
index cddd0da9faf0..afec072f3dc8 100755
--- a/main.star
+++ b/main.star
@@ -675,10 +675,18 @@ dart_vm_extra_builder(
     category="vm|kernel-precomp|android|a64",
     properties={"shard_timeout": (90 * time.minute) / time.second})
 
-# vm|misc
+# vm|product
 dart_vm_extra_builder(
+    "vm-kernel-linux-product-x64", category="vm|product|l", on_cq=True)
+dart_ci_sandbox_builder(
+    "vm-kernel-mac-product-x64", category="vm|product|m", dimensions=mac())
+dart_ci_sandbox_builder(
+    "vm-kernel-win-product-x64", category="vm|product|w", dimensions=windows())
+
+# vm|misc
+dart_vm_low_priority_builder(
     "vm-kernel-optcounter-threshold-linux-release-ia32", category="vm|misc|o32")
-dart_vm_extra_builder(
+dart_vm_low_priority_builder(
     "vm-kernel-optcounter-threshold-linux-release-x64", category="vm|misc|o64")
 dart_vm_low_priority_builder(
     "vm-kernel-asan-linux-release-x64", category="vm|misc|a")
@@ -696,26 +704,14 @@ dart_vm_low_priority_builder(
     "vm-kernel-precomp-tsan-linux-release-x64", category="vm|misc|aot|t")
 dart_vm_low_priority_builder(
     "vm-kernel-precomp-ubsan-linux-release-x64", category="vm|misc|aot|u")
-
-# vm|product
-dart_vm_extra_builder(
-    "vm-kernel-linux-product-x64", category="vm|product|l", on_cq=True)
-dart_ci_sandbox_builder(
-    "vm-kernel-mac-product-x64", category="vm|product|m", dimensions=mac())
-dart_ci_sandbox_builder(
-    "vm-kernel-win-product-x64", category="vm|product|w", dimensions=windows())
-
-# vm|reload-kernel
-dart_vm_extra_builder(
-    "vm-kernel-reload-linux-debug-x64", category="vm|reload-kernel|d")
-dart_vm_extra_builder(
-    "vm-kernel-reload-linux-release-x64", category="vm|reload-kernel|r")
-dart_vm_extra_builder(
-    "vm-kernel-reload-rollback-linux-debug-x64",
-    category="vm|reload-kernel|drb")
-dart_vm_extra_builder(
-    "vm-kernel-reload-rollback-linux-release-x64",
-    category="vm|reload-kernel|rrb")
+dart_vm_low_priority_builder(
+    "vm-kernel-reload-linux-debug-x64", category="vm|misc|reload|d")
+dart_vm_low_priority_builder(
+    "vm-kernel-reload-linux-release-x64", category="vm|misc|reload|r")
+dart_vm_low_priority_builder(
+    "vm-kernel-reload-rollback-linux-debug-x64", category="vm|misc|reload|drb")
+dart_vm_low_priority_builder(
+    "vm-kernel-reload-rollback-linux-release-x64", category="vm|misc|reload|rrb")
 
 # vm|ffi
 dart_vm_extra_builder("vm-ffi-android-debug-arm", category="vm|ffi|d32")

From 38bec798c0b318ce10d5181218afd8d25fe35815 Mon Sep 17 00:00:00 2001
From: Paul Berry <paulberry@google.com>
Date: Thu, 4 Jun 2020 17:12:47 +0000
Subject: [PATCH 372/826] [infra] Improve triggering for analyzer trybots.

Previously, analyzer-analysis-server-linux and analyzer-linux-release
were triggered on all CLs.  They really only need to be triggered on
changes to pkg/ (as well as the set of standard paths that trigger
everything, such as tests).

Previously, analyzer-nnbd-linux-release wasn't triggered at all.  It
needs to be triggered on changes to the analyzer itself (and standard
paths).

Change-Id: I56581724b572aac41926aa7d7bad03c444bff2a0
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/150141
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Paul Berry <paulberry@google.com>
---
 commit-queue.cfg | 28 +++++++++++++++++++++++++++-
 main.star        | 17 ++++++++++++++---
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index c90ec2cf4f3e..be97bc6302b0 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -74,9 +74,27 @@ config_groups: <
     tryjob: <
       builders: <
         name: "dart/try/analyzer-analysis-server-linux-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
+        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/.+"
       >
       builders: <
         name: "dart/try/analyzer-linux-release-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
+        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/.+"
       >
       builders: <
         name: "dart/try/analyzer-mac-release-try"
@@ -84,7 +102,15 @@ config_groups: <
       >
       builders: <
         name: "dart/try/analyzer-nnbd-linux-release-try"
-        includable_only: true
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
+        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(analyzer|analyzer_cli|_fe_analyzer_shared)/.+"
       >
       builders: <
         name: "dart/try/analyzer-win-release-try"
diff --git a/main.star b/main.star
index afec072f3dc8..2bb457d15069 100755
--- a/main.star
+++ b/main.star
@@ -67,6 +67,16 @@ DDC_PATHS = CFE_PATHS + [
     "pkg/(js|modular_test|sourcemap_testing)/.+",
 ]
 
+ANALYZER_NNBD_PATHS = STANDARD_PATHS + [
+    # analyzer sources
+    "pkg/(analyzer|analyzer_cli|_fe_analyzer_shared)/.+",
+]
+
+ANALYZER_PATHS = STANDARD_PATHS + [
+    # "analyzer" bots analyze everything under pkg
+    "pkg/.+",
+]
+
 # Priorities used by the swarming scheduler. The higher the number, the lower
 # the priority.
 LOW = 70  # Used for "FYI" post-submit builds.
@@ -798,16 +808,17 @@ dart_ci_sandbox_builder(
 dart_ci_sandbox_builder(
     "analyzer-analysis-server-linux",
     category="analyzer|as",
-    channels=CHANNELS,
-    on_cq=True)
+    location_regexp=to_location_regexp(ANALYZER_PATHS),
+    channels=CHANNELS)
 dart_ci_sandbox_builder(
     "analyzer-linux-release",
     category="analyzer|l",
-    on_cq=True,
+    location_regexp=to_location_regexp(ANALYZER_PATHS),
     channels=CHANNELS)
 dart_ci_sandbox_builder(
     "analyzer-nnbd-linux-release",
     category="analyzer|nn",
+    location_regexp=to_location_regexp(ANALYZER_NNBD_PATHS),
     channels=CHANNELS)
 dart_ci_sandbox_builder(
     "analyzer-mac-release",

From 1c730dac428f4860697837464ed9d8d38fc0fc08 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 9 Jun 2020 14:25:19 +0000
Subject: [PATCH 373/826] [infra] Upgrade to lucicfg 1.15.0

https://groups.google.com/a/google.com/d/msg/luci-eng/CPz7TqXvUWI/GWh_Dr5TBwAJ

TBR=whesse@google.com

Change-Id: I4c39644d484c778e2a91cc561f169f838856f5e5
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/150525
Reviewed-by: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg   |  478 ++--
 cr-buildbucket.cfg | 5464 ++++++++++++++++++++++----------------------
 luci-milo.cfg      | 2412 +++++++++----------
 luci-notify.cfg    | 1888 +++++++--------
 luci-scheduler.cfg | 2892 +++++++++++------------
 main.star          |    2 +
 6 files changed, 6569 insertions(+), 6567 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index be97bc6302b0..f748ff3dfbb1 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -4,75 +4,75 @@
 # For the schema of this file, see Config message:
 #   https://luci-config.appspot.com/schemas/projects:commit-queue.cfg
 
-submit_options: <
+submit_options {
   max_burst: 2
-  burst_delay: <
+  burst_delay {
     seconds: 480
-  >
->
-config_groups: <
+  }
+}
+config_groups {
   name: "dart_ci"
-  gerrit: <
+  gerrit {
     url: "https://dart-review.googlesource.com"
-    projects: <
+    projects {
       name: "dart_ci"
       ref_regexp: "refs/heads/master"
-    >
-  >
-  verifiers: <
-    gerrit_cq_ability: <
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
       committer_list: "project-dart-committers"
       dry_run_access_list: "project-dart-tryjob-access"
       allow_submit_with_open_deps: true
-    >
-    tree_status: <
+    }
+    tree_status {
       url: "https://dart-status.appspot.com"
-    >
-  >
->
-config_groups: <
+    }
+  }
+}
+config_groups {
   name: "recipes"
-  gerrit: <
+  gerrit {
     url: "https://dart-review.googlesource.com"
-    projects: <
+    projects {
       name: "recipes"
       ref_regexp: "refs/heads/master"
-    >
-  >
-  verifiers: <
-    gerrit_cq_ability: <
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
       committer_list: "project-dart-committers"
       dry_run_access_list: "project-dart-tryjob-access"
       allow_submit_with_open_deps: true
-    >
-    tree_status: <
+    }
+    tree_status {
       url: "https://dart-status.appspot.com"
-    >
-  >
->
-config_groups: <
+    }
+  }
+}
+config_groups {
   name: "sdk"
-  gerrit: <
+  gerrit {
     url: "https://dart-review.googlesource.com"
-    projects: <
+    projects {
       name: "sdk"
       ref_regexp: "refs/heads/master"
       ref_regexp: "refs/heads/beta"
       ref_regexp: "refs/heads/dev"
       ref_regexp: "refs/heads/stable"
-    >
-  >
-  verifiers: <
-    gerrit_cq_ability: <
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
       committer_list: "project-dart-committers"
       dry_run_access_list: "project-dart-tryjob-access"
       allow_submit_with_open_deps: true
-    >
-    tree_status: <
+    }
+    tree_status {
       url: "https://dart-status.appspot.com"
-    >
-    tryjob: <
-      builders: <
+    }
+    tryjob {
+      builders {
         name: "dart/try/analyzer-analysis-server-linux-try"
         location_regexp: ".+/[+]/DEPS"
         location_regexp: ".+/[+]/build/.+"
@@ -83,8 +83,8 @@ config_groups: <
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
         location_regexp: ".+/[+]/pkg/.+"
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/analyzer-linux-release-try"
         location_regexp: ".+/[+]/DEPS"
         location_regexp: ".+/[+]/build/.+"
@@ -95,12 +95,12 @@ config_groups: <
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
         location_regexp: ".+/[+]/pkg/.+"
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/analyzer-mac-release-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/analyzer-nnbd-linux-release-try"
         location_regexp: ".+/[+]/DEPS"
         location_regexp: ".+/[+]/build/.+"
@@ -111,42 +111,42 @@ config_groups: <
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
         location_regexp: ".+/[+]/pkg/(analyzer|analyzer_cli|_fe_analyzer_shared)/.+"
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/analyzer-win-release-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/app-kernel-linux-debug-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/app-kernel-linux-product-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/app-kernel-linux-release-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/benchmark-linux-try"
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/dart-sdk-linux-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/dart-sdk-mac-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/dart-sdk-win-try"
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/dart2js-csp-minified-linux-x64-chrome-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/dart2js-minified-strong-linux-x64-d8-try"
         location_regexp: ".+/[+]/DEPS"
         location_regexp: ".+/[+]/build/.+"
@@ -160,8 +160,8 @@ config_groups: <
         location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
         location_regexp: ".+/[+]/utils/compiler/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/dart2js-nnbd-linux-x64-chrome-try"
         location_regexp: ".+/[+]/DEPS"
         location_regexp: ".+/[+]/build/.+"
@@ -175,12 +175,12 @@ config_groups: <
         location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
         location_regexp: ".+/[+]/utils/compiler/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/dart2js-rti-linux-x64-d8-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/dart2js-strong-hostasserts-linux-ia32-d8-try"
         location_regexp: ".+/[+]/DEPS"
         location_regexp: ".+/[+]/build/.+"
@@ -194,8 +194,8 @@ config_groups: <
         location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
         location_regexp: ".+/[+]/utils/compiler/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/dart2js-strong-linux-x64-chrome-try"
         location_regexp: ".+/[+]/DEPS"
         location_regexp: ".+/[+]/build/.+"
@@ -209,28 +209,28 @@ config_groups: <
         location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
         location_regexp: ".+/[+]/utils/compiler/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/dart2js-strong-linux-x64-firefox-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/dart2js-strong-mac-x64-chrome-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/dart2js-strong-mac-x64-safari-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/dart2js-strong-win-x64-chrome-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/dart2js-strong-win-x64-ie11-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/dart2js-unit-linux-x64-release-try"
         location_regexp: ".+/[+]/DEPS"
         location_regexp: ".+/[+]/build/.+"
@@ -244,8 +244,8 @@ config_groups: <
         location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
         location_regexp: ".+/[+]/utils/compiler/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/ddc-linux-release-chrome-try"
         location_regexp: ".+/[+]/DEPS"
         location_regexp: ".+/[+]/build/.+"
@@ -259,12 +259,12 @@ config_groups: <
         location_regexp: ".+/[+]/pkg/(build_integration|dev_compiler|meta)/.+"
         location_regexp: ".+/[+]/utils/dartdevc/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/ddc-mac-release-chrome-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/ddc-nnbd-linux-release-chrome-try"
         location_regexp: ".+/[+]/DEPS"
         location_regexp: ".+/[+]/build/.+"
@@ -278,16 +278,16 @@ config_groups: <
         location_regexp: ".+/[+]/pkg/(build_integration|dev_compiler|meta)/.+"
         location_regexp: ".+/[+]/utils/dartdevc/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/ddc-win-release-chrome-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/ddk-linux-release-firefox-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/flutter-analyze-try"
         location_regexp: ".+/[+]/DEPS"
         location_regexp: ".+/[+]/pkg/analysis_server/.+"
@@ -298,23 +298,23 @@ config_groups: <
         location_regexp: ".+/[+]/pkg/_fe_analyzer_shared/.+"
         location_regexp: ".+/[+]/pkg/meta/.+"
         location_regexp: ".+/[+]/pkg/telemetry/.+"
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/flutter-engine-linux-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/flutter-frontend-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/front-end-linux-release-x64-try"
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/front-end-mac-release-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/front-end-nnbd-linux-release-x64-try"
         location_regexp: ".+/[+]/DEPS"
         location_regexp: ".+/[+]/build/.+"
@@ -325,30 +325,30 @@ config_groups: <
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
         location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/front-end-win-release-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/gclient-try"
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/pkg-linux-debug-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/pkg-linux-release-try"
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/pkg-mac-release-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/pkg-win-release-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-canary-linux-debug-try"
         location_regexp: ".+/[+]/DEPS"
         location_regexp: ".+/[+]/build/.+"
@@ -361,64 +361,64 @@ config_groups: <
         location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         location_regexp: ".+/[+]/pkg/vm/.+"
         location_regexp: ".+/[+]/runtime/.+"
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-dartkb-linux-release-simarm64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-dartkb-linux-release-x64-abi-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-dartkb-linux-release-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-ffi-android-debug-arm-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-ffi-android-debug-arm64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-ffi-android-product-arm-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-ffi-android-product-arm64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-ffi-android-release-arm-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-ffi-android-release-arm64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-asan-linux-release-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-checked-linux-release-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-gcc-linux-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-linux-debug-ia32-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-linux-debug-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-linux-product-x64-try"
         location_regexp: ".+/[+]/DEPS"
         location_regexp: ".+/[+]/build/.+"
@@ -431,39 +431,39 @@ config_groups: <
         location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         location_regexp: ".+/[+]/pkg/vm/.+"
         location_regexp: ".+/[+]/runtime/.+"
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-linux-release-ia32-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-linux-release-simarm-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-linux-release-simarm64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-linux-release-x64-try"
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-mac-debug-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-mac-product-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-mac-release-x64-try"
         experiment_percentage: 5
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-msan-linux-release-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-nnbd-linux-debug-x64-try"
         location_regexp: ".+/[+]/DEPS"
         location_regexp: ".+/[+]/build/.+"
@@ -476,8 +476,8 @@ config_groups: <
         location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         location_regexp: ".+/[+]/pkg/vm/.+"
         location_regexp: ".+/[+]/runtime/.+"
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-nnbd-linux-release-x64-try"
         location_regexp: ".+/[+]/DEPS"
         location_regexp: ".+/[+]/build/.+"
@@ -490,132 +490,132 @@ config_groups: <
         location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         location_regexp: ".+/[+]/pkg/vm/.+"
         location_regexp: ".+/[+]/runtime/.+"
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-optcounter-threshold-linux-release-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-precomp-android-release-arm64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-precomp-android-release-arm_x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-precomp-asan-linux-release-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-precomp-linux-debug-simarm_x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-precomp-linux-product-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-precomp-linux-release-simarm64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-precomp-linux-release-simarm_x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-precomp-mac-release-simarm64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-precomp-msan-linux-release-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-precomp-tsan-linux-release-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-precomp-ubsan-linux-release-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-precomp-win-release-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-reload-linux-debug-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-reload-linux-release-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-reload-rollback-linux-debug-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-reload-rollback-linux-release-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-tsan-linux-release-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-ubsan-linux-release-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-win-debug-ia32-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-win-debug-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-win-product-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-win-release-ia32-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-kernel-win-release-x64-try"
         includable_only: true
-      >
-      builders: <
+      }
+      builders {
         name: "dart/try/vm-precomp-ffi-qemu-linux-release-arm-try"
         includable_only: true
-      >
-      retry_config: <>
-    >
-  >
->
+      }
+      retry_config {}
+    }
+  }
+}
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 7e85247d6ce4..37c2f0ffebe0 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -4,25 +4,25 @@
 # For the schema of this file, see BuildbucketCfg message:
 #   https://luci-config.appspot.com/schemas/projects:buildbucket.cfg
 
-buckets: <
+buckets {
   name: "ci"
-  acls: <
+  acls {
     group: "all"
-  >
-  acls: <
+  }
+  acls {
     role: SCHEDULER
     identity: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-  >
-  acls: <
+  }
+  acls {
     role: SCHEDULER
     identity: "user:luci-scheduler@appspot.gserviceaccount.com"
-  >
-  acls: <
+  }
+  acls {
     role: SCHEDULER
     group: "project-dart-admins"
-  >
-  swarming: <
-    builders: <
+  }
+  swarming {
+    builders {
       name: "base"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -30,24 +30,24 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "dart/forward_branch"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
       execution_timeout_secs: 900
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "chocolatey"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -55,23 +55,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "dart/chocolatey"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "co19-roller"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -79,23 +79,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "dart/package_co19"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart-sdk-linux"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -103,7 +103,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -111,16 +111,16 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart-sdk-linux-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -128,7 +128,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -136,16 +136,16 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart-sdk-linux-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -153,7 +153,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -161,16 +161,16 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart-sdk-linux-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -178,7 +178,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -186,16 +186,16 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart-sdk-mac"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -203,23 +203,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart-sdk-mac-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -227,23 +227,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart-sdk-mac-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -251,23 +251,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart-sdk-mac-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -275,23 +275,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart-sdk-win"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -299,23 +299,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart-sdk-win-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -323,23 +323,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart-sdk-win-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -347,23 +347,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart-sdk-win-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -371,23 +371,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "debianpackage-linux"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -395,23 +395,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "debianpackage-linux-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -419,23 +419,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "debianpackage-linux-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -443,23 +443,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "debianpackage-linux-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -467,23 +467,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "docker"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -491,23 +491,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "dart/docker"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "google"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -515,23 +515,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "dart/external"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "linearize-flutter"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -539,7 +539,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "dart/linearize"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -547,16 +547,16 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "repo:\"https://dart.googlesource.com/linear_sdk_flutter_engine.git\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "nightly"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -564,7 +564,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "cron/cron"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -572,16 +572,16 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "builders:[\"cross-vm-precomp-linux-release-arm64\"]"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "recipe-bundler"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -589,7 +589,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "recipe_bundler"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
         cipd_version: "git_revision:40621e908eb88bd10451ee9d013b7ef89ea91e37"
@@ -600,17 +600,17 @@ buckets: <
         properties_j: "package_name_prefix:\"dart/recipe_bundles\""
         properties_j: "recipe_bundler_vers:\"git_revision:2ed88b2c854578b512e1c0486824175fe0d7aab6\""
         properties_j: "repo_specs:[\"dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/master\"]"
-      >
+      }
       priority: 50
       execution_timeout_secs: 300
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "recipe-deps-roller"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -618,7 +618,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "recipe_autoroller"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
         cipd_version: "git_revision:647d5e58ec508f13ccd054f1516e78d7ca3bd540"
@@ -627,18 +627,18 @@ buckets: <
         properties_j: "clobber:\"true\""
         properties_j: "db_gcs_bucket:\"dart-recipe-roller-db\""
         properties_j: "projects:[[\"dart\",\"https://dart.googlesource.com/recipes\"]]"
-      >
+      }
       priority: 70
       execution_timeout_secs: 1200
       expiration_secs: 86400
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "versionchecker-linux"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -646,23 +646,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "versionchecker-linux-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -670,23 +670,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "versionchecker-linux-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -694,23 +694,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "versionchecker-linux-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -718,47 +718,47 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    >
-  >
->
-buckets: <
+    }
+  }
+}
+buckets {
   name: "ci.sandbox"
-  acls: <
+  acls {
     group: "all"
-  >
-  acls: <
+  }
+  acls {
     role: SCHEDULER
     identity: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-  >
-  acls: <
+  }
+  acls {
     role: SCHEDULER
     identity: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-  >
-  acls: <
+  }
+  acls {
     role: SCHEDULER
     identity: "user:luci-scheduler@appspot.gserviceaccount.com"
-  >
-  acls: <
+  }
+  acls {
     role: SCHEDULER
     group: "project-dart-admins"
-  >
-  swarming: <
-    builders: <
+  }
+  swarming {
+    builders {
       name: "analyzer-analysis-server-linux"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -766,23 +766,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "analyzer-analysis-server-linux-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -790,23 +790,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "analyzer-analysis-server-linux-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -814,23 +814,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "analyzer-analysis-server-linux-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -838,23 +838,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "analyzer-linux-release"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -862,23 +862,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "analyzer-linux-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -886,23 +886,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "analyzer-linux-release-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -910,23 +910,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "analyzer-linux-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -934,23 +934,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "analyzer-mac-release"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -958,23 +958,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "analyzer-mac-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -982,23 +982,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "analyzer-mac-release-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1006,23 +1006,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "analyzer-mac-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1030,23 +1030,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "analyzer-nnbd-linux-release"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1054,23 +1054,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "analyzer-nnbd-linux-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1078,23 +1078,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "analyzer-nnbd-linux-release-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1102,23 +1102,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "analyzer-nnbd-linux-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1126,23 +1126,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "analyzer-win-release"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1150,23 +1150,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "analyzer-win-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1174,23 +1174,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "analyzer-win-release-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1198,23 +1198,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "analyzer-win-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1222,23 +1222,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "app-kernel-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1246,23 +1246,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "app-kernel-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1270,23 +1270,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "app-kernel-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1294,23 +1294,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "app-kernel-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1318,23 +1318,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "app-kernel-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1342,23 +1342,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "app-kernel-linux-product-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1366,23 +1366,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "app-kernel-linux-product-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1390,23 +1390,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "app-kernel-linux-product-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1414,23 +1414,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "app-kernel-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1438,23 +1438,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "app-kernel-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1462,23 +1462,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "app-kernel-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1486,23 +1486,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "app-kernel-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1510,23 +1510,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "cross-vm-linux-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1534,7 +1534,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -1542,16 +1542,16 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "shard_timeout:5400"
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "cross-vm-linux-release-arm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1559,7 +1559,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -1567,16 +1567,16 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "shard_timeout:5400"
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "cross-vm-linux-release-arm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1584,7 +1584,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -1592,16 +1592,16 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "shard_timeout:5400"
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "cross-vm-linux-release-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1609,7 +1609,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -1617,16 +1617,16 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "shard_timeout:5400"
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "cross-vm-precomp-linux-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1634,7 +1634,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -1642,16 +1642,16 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "shard_timeout:5400"
-      >
+      }
       priority: 70
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-csp-minified-linux-x64-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1659,23 +1659,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-csp-minified-linux-x64-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1683,23 +1683,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-csp-minified-linux-x64-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1707,23 +1707,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-csp-minified-linux-x64-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1731,23 +1731,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-minified-strong-linux-x64-d8"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1755,23 +1755,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-minified-strong-linux-x64-d8-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1779,23 +1779,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-minified-strong-linux-x64-d8-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1803,23 +1803,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-minified-strong-linux-x64-d8-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1827,23 +1827,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-nnbd-linux-x64-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1851,23 +1851,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-nnbd-linux-x64-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1875,23 +1875,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-nnbd-linux-x64-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1899,23 +1899,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-nnbd-linux-x64-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1923,23 +1923,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-rti-linux-x64-d8"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1947,23 +1947,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-rti-linux-x64-d8-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1971,23 +1971,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-rti-linux-x64-d8-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -1995,23 +1995,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-rti-linux-x64-d8-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2019,23 +2019,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-hostasserts-linux-ia32-d8"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2043,23 +2043,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2067,23 +2067,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2091,23 +2091,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2115,23 +2115,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-linux-x64-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2139,23 +2139,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-linux-x64-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2163,23 +2163,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-linux-x64-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2187,23 +2187,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-linux-x64-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2211,23 +2211,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-linux-x64-firefox"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2235,23 +2235,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-linux-x64-firefox-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2259,23 +2259,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-linux-x64-firefox-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2283,23 +2283,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-linux-x64-firefox-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2307,23 +2307,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-mac-x64-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2331,23 +2331,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-mac-x64-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2355,23 +2355,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-mac-x64-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2379,23 +2379,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-mac-x64-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2403,23 +2403,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-mac-x64-safari"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2427,23 +2427,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-mac-x64-safari-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2451,23 +2451,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-mac-x64-safari-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2475,23 +2475,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-mac-x64-safari-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2499,23 +2499,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-win-x64-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2523,23 +2523,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-win-x64-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2547,23 +2547,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-win-x64-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2571,23 +2571,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-win-x64-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2595,23 +2595,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-win-x64-firefox"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2619,23 +2619,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-win-x64-ie11"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2643,23 +2643,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-win-x64-ie11-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2667,23 +2667,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-win-x64-ie11-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2691,23 +2691,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-win-x64-ie11-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2715,23 +2715,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-unit-linux-x64-release"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2739,23 +2739,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-unit-linux-x64-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2763,23 +2763,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-unit-linux-x64-release-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2787,23 +2787,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-unit-linux-x64-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2811,23 +2811,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "ddc-linux-release-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2835,7 +2835,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -2843,16 +2843,16 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "ddc-linux-release-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2860,7 +2860,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -2868,16 +2868,16 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "ddc-linux-release-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2885,7 +2885,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -2893,16 +2893,16 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "ddc-linux-release-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2910,7 +2910,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -2918,16 +2918,16 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "ddc-mac-release-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2935,23 +2935,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "ddc-mac-release-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2959,23 +2959,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "ddc-mac-release-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -2983,23 +2983,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "ddc-mac-release-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3007,23 +3007,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "ddc-nnbd-linux-release-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3031,23 +3031,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "ddc-win-release-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3055,23 +3055,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "ddc-win-release-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3079,23 +3079,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "ddc-win-release-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3103,23 +3103,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "ddc-win-release-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3127,23 +3127,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "ddk-linux-release-firefox"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3151,23 +3151,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "ddk-linux-release-firefox-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3175,23 +3175,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "ddk-linux-release-firefox-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3199,23 +3199,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "ddk-linux-release-firefox-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3223,23 +3223,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "flutter-analyze"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3247,23 +3247,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "flutter-engine-linux"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3271,24 +3271,24 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/flutter_engine"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
       execution_timeout_secs: 28800
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "flutter-frontend"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3296,23 +3296,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "front-end-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3320,7 +3320,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -3328,16 +3328,16 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "front-end-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3345,7 +3345,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -3353,16 +3353,16 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "front-end-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3370,7 +3370,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -3378,16 +3378,16 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "front-end-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3395,7 +3395,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -3403,16 +3403,16 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "front-end-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3420,23 +3420,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "front-end-mac-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3444,23 +3444,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "front-end-mac-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3468,23 +3468,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "front-end-mac-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3492,23 +3492,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "front-end-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3516,23 +3516,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "front-end-nnbd-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3540,23 +3540,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "front-end-nnbd-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3564,23 +3564,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "front-end-nnbd-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3588,23 +3588,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "front-end-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3612,23 +3612,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "front-end-win-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3636,23 +3636,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "front-end-win-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3660,23 +3660,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "front-end-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3684,23 +3684,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "fuzz-linux"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3708,7 +3708,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -3716,16 +3716,16 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "gclient"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3733,23 +3733,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/gclient"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "gclient-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3757,23 +3757,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/gclient"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "gclient-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3781,23 +3781,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/gclient"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "gclient-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3805,23 +3805,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/gclient"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "pkg-linux-debug"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3829,23 +3829,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "pkg-linux-release"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3853,23 +3853,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "pkg-linux-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3877,23 +3877,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "pkg-linux-release-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3901,23 +3901,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "pkg-linux-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3925,23 +3925,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "pkg-mac-release"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3949,23 +3949,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "pkg-mac-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3973,23 +3973,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "pkg-mac-release-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -3997,23 +3997,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "pkg-mac-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4021,23 +4021,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "pkg-win-release"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4045,23 +4045,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "pkg-win-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4069,23 +4069,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "pkg-win-release-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4093,23 +4093,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "pkg-win-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4117,23 +4117,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-canary-linux-debug"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4141,7 +4141,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -4149,16 +4149,16 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-canary-linux-debug-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4166,7 +4166,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -4174,16 +4174,16 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-canary-linux-debug-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4191,7 +4191,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -4199,16 +4199,16 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-canary-linux-debug-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4216,7 +4216,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -4224,16 +4224,16 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-dartkb-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4241,23 +4241,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-dartkb-linux-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4265,23 +4265,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-dartkb-linux-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4289,23 +4289,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-dartkb-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4313,23 +4313,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-dartkb-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4337,23 +4337,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-dartkb-linux-release-x64-abi"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4361,23 +4361,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-dartkb-linux-release-x64-abi-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4385,23 +4385,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-dartkb-linux-release-x64-abi-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4409,23 +4409,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-dartkb-linux-release-x64-abi-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4433,23 +4433,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-dartkb-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4457,23 +4457,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-dartkb-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4481,23 +4481,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-dartkb-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4505,23 +4505,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-debug-arm"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4529,23 +4529,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-debug-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4553,23 +4553,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-debug-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4577,23 +4577,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-debug-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4601,23 +4601,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-debug-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4625,23 +4625,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-debug-arm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4649,23 +4649,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-debug-arm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4673,23 +4673,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-debug-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4697,23 +4697,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-product-arm"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4721,23 +4721,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-product-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4745,23 +4745,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-product-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4769,23 +4769,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-product-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4793,23 +4793,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-product-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4817,23 +4817,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-product-arm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4841,23 +4841,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-product-arm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4865,23 +4865,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-product-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4889,23 +4889,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-release-arm"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4913,23 +4913,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-release-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4937,23 +4937,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-release-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4961,23 +4961,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-release-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -4985,23 +4985,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5009,23 +5009,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-release-arm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5033,23 +5033,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-release-arm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5057,23 +5057,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-release-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5081,23 +5081,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-asan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5105,24 +5105,24 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 70
       expiration_secs: 86400
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-checked-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5130,23 +5130,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-checked-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5154,23 +5154,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-checked-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5178,23 +5178,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-checked-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5202,23 +5202,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5226,23 +5226,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-debug-ia32-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5250,23 +5250,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-debug-ia32-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5274,23 +5274,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-debug-ia32-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5298,23 +5298,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5322,23 +5322,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5346,23 +5346,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5370,23 +5370,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5394,23 +5394,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5418,23 +5418,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-product-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5442,23 +5442,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-product-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5466,23 +5466,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-product-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5490,23 +5490,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5514,23 +5514,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-release-ia32-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5538,23 +5538,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-release-ia32-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5562,23 +5562,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-release-ia32-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5586,23 +5586,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5610,23 +5610,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-release-simarm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5634,23 +5634,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-release-simarm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5658,23 +5658,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5682,23 +5682,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5706,23 +5706,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5730,23 +5730,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5754,23 +5754,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5778,23 +5778,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5802,23 +5802,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5826,23 +5826,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5850,23 +5850,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5874,23 +5874,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-mac-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5898,23 +5898,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-mac-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5922,23 +5922,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-mac-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5946,23 +5946,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-mac-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5970,23 +5970,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-mac-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -5994,23 +5994,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-mac-product-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6018,23 +6018,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-mac-product-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6042,23 +6042,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-mac-product-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6066,23 +6066,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6090,23 +6090,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-mac-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6114,23 +6114,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-mac-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6138,23 +6138,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-mac-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6162,23 +6162,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-msan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6186,24 +6186,24 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 70
       expiration_secs: 86400
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-nnbd-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6211,23 +6211,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-nnbd-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6235,23 +6235,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-nnbd-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6259,23 +6259,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-nnbd-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6283,23 +6283,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6307,23 +6307,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-nnbd-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6331,23 +6331,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-nnbd-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6355,23 +6355,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-nnbd-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6379,23 +6379,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-optcounter-threshold-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6403,24 +6403,24 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 70
       expiration_secs: 86400
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-optcounter-threshold-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6428,24 +6428,24 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 70
       expiration_secs: 86400
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-android-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6453,7 +6453,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -6461,16 +6461,16 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "shard_timeout:5400"
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-android-release-arm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6478,7 +6478,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -6486,16 +6486,16 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "shard_timeout:5400"
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-android-release-arm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6503,7 +6503,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -6511,16 +6511,16 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "shard_timeout:5400"
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-android-release-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6528,7 +6528,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -6536,16 +6536,16 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "shard_timeout:5400"
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-android-release-arm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6553,7 +6553,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -6561,16 +6561,16 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "shard_timeout:5400"
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-android-release-arm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6578,7 +6578,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -6586,16 +6586,16 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "shard_timeout:5400"
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-android-release-arm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6603,7 +6603,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -6611,16 +6611,16 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "shard_timeout:5400"
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-android-release-arm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6628,7 +6628,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -6636,16 +6636,16 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "shard_timeout:5400"
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-asan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6653,24 +6653,24 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 70
       expiration_secs: 86400
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-debug-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6678,7 +6678,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -6686,16 +6686,16 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "shard_timeout:5400"
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6703,7 +6703,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -6711,16 +6711,16 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "shard_timeout:5400"
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6728,7 +6728,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -6736,16 +6736,16 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "shard_timeout:5400"
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6753,7 +6753,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -6761,16 +6761,16 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "shard_timeout:5400"
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6778,23 +6778,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6802,23 +6802,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6826,23 +6826,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6850,23 +6850,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6874,23 +6874,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-product-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6898,23 +6898,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-product-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6922,23 +6922,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-product-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6946,23 +6946,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6970,23 +6970,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-release-simarm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -6994,23 +6994,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-release-simarm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7018,23 +7018,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7042,23 +7042,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7066,23 +7066,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7090,23 +7090,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7114,23 +7114,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7138,23 +7138,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-release-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7162,23 +7162,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-release-simarm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7186,23 +7186,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-release-simarm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7210,23 +7210,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-release-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7234,23 +7234,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7258,23 +7258,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7282,23 +7282,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7306,23 +7306,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7330,23 +7330,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-mac-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7354,23 +7354,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-mac-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7378,23 +7378,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-mac-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7402,23 +7402,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-mac-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7426,23 +7426,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-msan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7450,24 +7450,24 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 70
       expiration_secs: 86400
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7475,23 +7475,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7499,23 +7499,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7523,23 +7523,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7547,23 +7547,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-obfuscate-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7571,23 +7571,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7595,23 +7595,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7619,23 +7619,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7643,23 +7643,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-tsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7667,24 +7667,24 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 70
       expiration_secs: 86400
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-ubsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7692,24 +7692,24 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 70
       expiration_secs: 86400
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7717,23 +7717,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-win-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7741,23 +7741,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-win-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7765,23 +7765,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7789,23 +7789,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-reload-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7813,24 +7813,24 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 70
       expiration_secs: 86400
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-reload-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7838,24 +7838,24 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 70
       expiration_secs: 86400
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-reload-rollback-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7863,24 +7863,24 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 70
       expiration_secs: 86400
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-reload-rollback-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7888,24 +7888,24 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 70
       expiration_secs: 86400
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-tsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7913,24 +7913,24 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 70
       expiration_secs: 86400
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-ubsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7938,24 +7938,24 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 70
       expiration_secs: 86400
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-win-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7963,23 +7963,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-win-debug-ia32-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -7987,23 +7987,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-win-debug-ia32-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8011,23 +8011,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-win-debug-ia32-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8035,23 +8035,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-win-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8059,23 +8059,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-win-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8083,23 +8083,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-win-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8107,23 +8107,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-win-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8131,23 +8131,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-win-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8155,23 +8155,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-win-product-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8179,23 +8179,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-win-product-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8203,23 +8203,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-win-product-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8227,23 +8227,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-win-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8251,23 +8251,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-win-release-ia32-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8275,23 +8275,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-win-release-ia32-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8299,23 +8299,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-win-release-ia32-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8323,23 +8323,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8347,23 +8347,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-win-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8371,23 +8371,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-win-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8395,23 +8395,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8419,23 +8419,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8443,23 +8443,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8467,23 +8467,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8491,23 +8491,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8515,43 +8515,43 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 50
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-  >
->
-buckets: <
+    }
+  }
+}
+buckets {
   name: "try"
-  acls: <
+  acls {
     group: "all"
-  >
-  acls: <
+  }
+  acls {
     role: SCHEDULER
     group: "project-dart-admins"
-  >
-  acls: <
+  }
+  acls {
     role: SCHEDULER
     group: "project-dart-tryjob-access"
-  >
-  acls: <
+  }
+  acls {
     role: SCHEDULER
     group: "service-account-cq"
-  >
-  swarming: <
-    builders: <
+  }
+  swarming {
+    builders {
       name: "analyzer-analysis-server-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8559,23 +8559,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "analyzer-linux-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8583,23 +8583,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "analyzer-mac-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8607,23 +8607,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "analyzer-nnbd-linux-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8631,23 +8631,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "analyzer-win-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8655,23 +8655,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "app-kernel-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8679,23 +8679,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "app-kernel-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8703,23 +8703,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "app-kernel-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8727,23 +8727,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "benchmark-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8751,23 +8751,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart-sdk-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8775,7 +8775,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -8783,16 +8783,16 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart-sdk-mac-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8800,23 +8800,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart-sdk-win-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8824,23 +8824,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-csp-minified-linux-x64-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8848,23 +8848,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-minified-strong-linux-x64-d8-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8872,23 +8872,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-nnbd-linux-x64-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8896,23 +8896,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-rti-linux-x64-d8-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8920,23 +8920,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-hostasserts-linux-ia32-d8-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8944,23 +8944,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-linux-x64-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8968,23 +8968,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-linux-x64-firefox-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -8992,23 +8992,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-mac-x64-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9016,23 +9016,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-mac-x64-safari-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9040,23 +9040,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-win-x64-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9064,23 +9064,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-strong-win-x64-ie11-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9088,23 +9088,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "dart2js-unit-linux-x64-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9112,23 +9112,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "ddc-linux-release-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9136,7 +9136,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -9144,16 +9144,16 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "ddc-mac-release-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9161,23 +9161,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "ddc-nnbd-linux-release-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9185,23 +9185,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "ddc-win-release-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9209,23 +9209,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "ddk-linux-release-firefox-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9233,23 +9233,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "flutter-analyze-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9257,23 +9257,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "flutter-engine-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9281,24 +9281,24 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/flutter_engine"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
       execution_timeout_secs: 28800
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "flutter-frontend-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9306,23 +9306,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "front-end-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9330,7 +9330,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -9338,16 +9338,16 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "front-end-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9355,23 +9355,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "front-end-nnbd-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9379,23 +9379,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "front-end-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9403,23 +9403,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "gclient-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9427,23 +9427,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/gclient"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "pkg-linux-debug-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9451,23 +9451,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "pkg-linux-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9475,23 +9475,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "pkg-mac-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9499,23 +9499,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "pkg-win-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9523,23 +9523,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-canary-linux-debug-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9547,7 +9547,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -9555,16 +9555,16 @@ buckets: <
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-dartkb-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9572,23 +9572,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-dartkb-linux-release-x64-abi-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9596,23 +9596,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-dartkb-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9620,23 +9620,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-debug-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9644,23 +9644,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-debug-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9668,23 +9668,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-product-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9692,23 +9692,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-product-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9716,23 +9716,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-release-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9740,23 +9740,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-ffi-android-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9764,23 +9764,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-asan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9788,23 +9788,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-checked-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9812,23 +9812,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-gcc-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9836,23 +9836,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9860,23 +9860,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9884,23 +9884,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9908,23 +9908,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9932,23 +9932,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-release-simarm-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9956,23 +9956,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -9980,23 +9980,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10004,23 +10004,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-mac-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10028,23 +10028,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-mac-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10052,23 +10052,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10076,23 +10076,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-msan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10100,23 +10100,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-nnbd-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10124,23 +10124,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-nnbd-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10148,23 +10148,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-optcounter-threshold-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10172,23 +10172,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-optcounter-threshold-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10196,23 +10196,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-android-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10220,7 +10220,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -10228,16 +10228,16 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "shard_timeout:5400"
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-android-release-arm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10245,7 +10245,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -10253,16 +10253,16 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "shard_timeout:5400"
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-asan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10270,23 +10270,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-debug-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10294,7 +10294,7 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
@@ -10302,16 +10302,16 @@ buckets: <
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
         properties_j: "shard_timeout:5400"
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10319,23 +10319,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10343,23 +10343,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-release-simarm-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10367,23 +10367,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10391,23 +10391,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-release-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10415,23 +10415,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10439,23 +10439,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-mac-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10463,23 +10463,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-msan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10487,23 +10487,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-nnbd-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10511,23 +10511,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-obfuscate-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10535,23 +10535,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-tsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10559,23 +10559,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-ubsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10583,23 +10583,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-precomp-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10607,23 +10607,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-reload-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10631,23 +10631,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-reload-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10655,23 +10655,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-reload-rollback-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10679,23 +10679,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-reload-rollback-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10703,23 +10703,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-tsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10727,23 +10727,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-ubsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10751,23 +10751,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-win-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10775,23 +10775,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-win-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10799,23 +10799,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-win-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10823,23 +10823,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-win-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10847,23 +10847,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-kernel-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10871,23 +10871,23 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-    builders: <
+    }
+    builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -10895,21 +10895,21 @@ buckets: <
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe: <
+      recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-      >
+      }
       priority: 30
-      caches: <
+      caches {
         name: "browsers"
         path: "browsers"
-      >
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    >
-  >
->
+    }
+  }
+}
diff --git a/luci-milo.cfg b/luci-milo.cfg
index d4ea0741f9fd..6dc42b5d6b8b 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -4,2796 +4,2796 @@
 # For the schema of this file, see Project message:
 #   https://luci-config.appspot.com/schemas/projects:luci-milo.cfg
 
-consoles: <
+consoles {
   id: "be"
   name: "SDK Bleeding Edge Console"
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders: <
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
     category: "cfe"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
     category: "cfe"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
     category: "cfe"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64"
     category: "cfe"
     short_name: "nn"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
     category: "cfe"
     short_name: "fl"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
     category: "flutter"
     short_name: "3H"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
     category: "vm|nnbd"
     short_name: "d"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64"
     category: "vm|nnbd"
     short_name: "r"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64"
     category: "vm|nnbd"
     short_name: "pr"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
     category: "vm|app-kernel"
     short_name: "d64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64"
     category: "vm|app-kernel"
     short_name: "p64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64"
     category: "vm|app-kernel"
     short_name: "r64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64"
     category: "vm|dartkb"
     short_name: "sr"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64"
     category: "vm|dartkb"
     short_name: "r"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-abi"
     category: "vm|dartkb"
     short_name: "abi"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
     category: "vm|kernel"
     short_name: "c"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
     category: "vm|kernel"
     short_name: "d"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
     short_name: "a32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
     category: "vm|kernel"
     short_name: "a64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32"
     category: "vm|kernel"
     short_name: "r32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
     category: "vm|kernel"
     short_name: "r"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
     category: "vm|kernel"
     short_name: "rc"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32"
     category: "vm|kernel"
     short_name: "d32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
     category: "vm|kernel"
     short_name: "md"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
     category: "vm|kernel"
     short_name: "mr"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
     category: "vm|kernel"
     short_name: "wd3"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64"
     category: "vm|kernel"
     short_name: "wd"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32"
     category: "vm|kernel"
     short_name: "wr3"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
     category: "vm|kernel"
     short_name: "wr"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
     category: "vm|kernel"
     short_name: "cra"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
     category: "vm|kernel-precomp"
     short_name: "d"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
     category: "vm|kernel-precomp"
     short_name: "p"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
     category: "vm|kernel-precomp"
     short_name: "a32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "a64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
     category: "vm|kernel-precomp"
     short_name: "r"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
     category: "vm|kernel-precomp"
     short_name: "o"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64"
     category: "vm|kernel-precomp"
     short_name: "adx"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64"
     category: "vm|kernel-precomp"
     short_name: "arx"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "ma"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
     category: "vm|kernel-precomp"
     short_name: "wr"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/cross-vm-precomp-linux-release-arm64"
     category: "vm|kernel-precomp"
     short_name: "cra"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64"
     category: "vm|kernel-precomp|android"
     short_name: "a32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64"
     category: "vm|kernel-precomp|android"
     short_name: "a64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
     category: "vm|product"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
     category: "vm|product"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
     category: "vm|product"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
     category: "vm|misc"
     short_name: "o32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
     category: "vm|misc"
     short_name: "o64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
     category: "vm|misc"
     short_name: "a"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msan-linux-release-x64"
     category: "vm|misc"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-tsan-linux-release-x64"
     category: "vm|misc"
     short_name: "t"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ubsan-linux-release-x64"
     category: "vm|misc"
     short_name: "u"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-asan-linux-release-x64"
     category: "vm|misc|aot"
     short_name: "a"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-msan-linux-release-x64"
     category: "vm|misc|aot"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-tsan-linux-release-x64"
     category: "vm|misc|aot"
     short_name: "t"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ubsan-linux-release-x64"
     category: "vm|misc|aot"
     short_name: "u"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
     category: "vm|misc|reload"
     short_name: "d"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
     category: "vm|misc|reload"
     short_name: "r"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
     category: "vm|misc|reload"
     short_name: "drb"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64"
     category: "vm|misc|reload"
     short_name: "rrb"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
     category: "vm|ffi"
     short_name: "d32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm"
     category: "vm|ffi"
     short_name: "r32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm"
     category: "vm|ffi"
     short_name: "p32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64"
     category: "vm|ffi"
     short_name: "d64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64"
     category: "vm|ffi"
     short_name: "r64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64"
     category: "vm|ffi"
     short_name: "p64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm"
     category: "vm|ffi"
     short_name: "qe"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
     category: "pkg"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
     category: "pkg"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
     category: "pkg"
     short_name: "ld"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
     category: "dart2js|d8"
     short_name: "ha"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-rti-linux-x64-d8"
     category: "dart2js|d8"
     short_name: "rti"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
     category: "dart2js|d8"
     short_name: "mi"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
     category: "dart2js|d8"
     short_name: "u"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "csp"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "nn"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
     category: "dart2js|firefox"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
     category: "dart2js|firefox"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
     category: "dart2js|safari"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11"
     category: "dart2js|ms"
     short_name: "ie"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
     category: "analyzer"
     short_name: "fa"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
     category: "analyzer"
     short_name: "as"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
     category: "analyzer"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release"
     category: "analyzer"
     short_name: "nn"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
     category: "analyzer"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
     category: "analyzer"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-linux"
     category: "sdk"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-mac"
     category: "sdk"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-win"
     category: "sdk"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-nnbd-linux-release-chrome"
     category: "ddc"
     short_name: "nn"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox"
     category: "ddc"
     short_name: "fl"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/gclient"
     category: "misc"
     short_name: "g"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/debianpackage-linux"
     category: "misc"
     short_name: "dp"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/versionchecker-linux"
     category: "misc"
     short_name: "vc"
-  >
-  header: <
-    links: <
+  }
+  header {
+    links {
       name: "Consoles"
-      links: <
+      links {
         text: "Bleeding Edge console"
         url: "/p/dart/g/be/console"
         alt: "SDK BE Console"
-      >
-      links: <
+      }
+      links {
         text: "Alternative Bleeding Edge console"
         url: "/p/dart/g/alt/console"
         alt: "SDK BE Console (alternative)"
-      >
-      links: <
+      }
+      links {
         text: "FYI console"
         url: "/p/dart/g/fyi/console"
         alt: "SDK FYI Console"
-      >
-      links: <
+      }
+      links {
         text: "SDK CQ Status"
         url: "/p/dart/g/cq/builders"
         alt: "SDK CQ Status"
-      >
-      links: <
+      }
+      links {
         text: "Results Feed"
         url: "https://dart-ci.firebaseapp.com/"
         alt: "Results Feed"
-      >
-    >
-    console_groups: <
+      }
+    }
+    console_groups {
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
-    >
+    }
     tree_status_host: "dart-status.appspot.com"
-  >
->
-consoles: <
+  }
+}
+consoles {
   id: "alt"
   name: "SDK Bleeding Edge Console (alternative)"
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders: <
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
     category: "cfe"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
     category: "cfe"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
     category: "cfe"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64"
     category: "cfe"
     short_name: "nn"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
     category: "cfe"
     short_name: "fl"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
     category: "flutter"
     short_name: "3H"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
     category: "pkg"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
     category: "pkg"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
     category: "pkg"
     short_name: "ld"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
     category: "dart2js|d8"
     short_name: "ha"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-rti-linux-x64-d8"
     category: "dart2js|d8"
     short_name: "rti"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
     category: "dart2js|d8"
     short_name: "mi"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
     category: "dart2js|d8"
     short_name: "u"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "csp"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "nn"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
     category: "dart2js|firefox"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
     category: "dart2js|firefox"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
     category: "dart2js|safari"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11"
     category: "dart2js|ms"
     short_name: "ie"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
     category: "analyzer"
     short_name: "fa"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
     category: "analyzer"
     short_name: "as"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
     category: "analyzer"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release"
     category: "analyzer"
     short_name: "nn"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
     category: "analyzer"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
     category: "analyzer"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-linux"
     category: "sdk"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-mac"
     category: "sdk"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-win"
     category: "sdk"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-nnbd-linux-release-chrome"
     category: "ddc"
     short_name: "nn"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox"
     category: "ddc"
     short_name: "fl"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/gclient"
     category: "misc"
     short_name: "g"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/debianpackage-linux"
     category: "misc"
     short_name: "dp"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/versionchecker-linux"
     category: "misc"
     short_name: "vc"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
     category: "vm|nnbd"
     short_name: "d"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64"
     category: "vm|nnbd"
     short_name: "r"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64"
     category: "vm|nnbd"
     short_name: "pr"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
     category: "vm|app-kernel"
     short_name: "d64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64"
     category: "vm|app-kernel"
     short_name: "p64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64"
     category: "vm|app-kernel"
     short_name: "r64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64"
     category: "vm|dartkb"
     short_name: "sr"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64"
     category: "vm|dartkb"
     short_name: "r"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-abi"
     category: "vm|dartkb"
     short_name: "abi"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
     category: "vm|kernel"
     short_name: "c"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
     category: "vm|kernel"
     short_name: "d"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
     short_name: "a32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
     category: "vm|kernel"
     short_name: "a64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32"
     category: "vm|kernel"
     short_name: "r32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
     category: "vm|kernel"
     short_name: "r"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
     category: "vm|kernel"
     short_name: "rc"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32"
     category: "vm|kernel"
     short_name: "d32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
     category: "vm|kernel"
     short_name: "md"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
     category: "vm|kernel"
     short_name: "mr"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
     category: "vm|kernel"
     short_name: "wd3"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64"
     category: "vm|kernel"
     short_name: "wd"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32"
     category: "vm|kernel"
     short_name: "wr3"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
     category: "vm|kernel"
     short_name: "wr"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
     category: "vm|kernel"
     short_name: "cra"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
     category: "vm|kernel-precomp"
     short_name: "d"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
     category: "vm|kernel-precomp"
     short_name: "p"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
     category: "vm|kernel-precomp"
     short_name: "a32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "a64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
     category: "vm|kernel-precomp"
     short_name: "r"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
     category: "vm|kernel-precomp"
     short_name: "o"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64"
     category: "vm|kernel-precomp"
     short_name: "adx"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64"
     category: "vm|kernel-precomp"
     short_name: "arx"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "ma"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
     category: "vm|kernel-precomp"
     short_name: "wr"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/cross-vm-precomp-linux-release-arm64"
     category: "vm|kernel-precomp"
     short_name: "cra"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64"
     category: "vm|kernel-precomp|android"
     short_name: "a32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64"
     category: "vm|kernel-precomp|android"
     short_name: "a64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
     category: "vm|product"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
     category: "vm|product"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
     category: "vm|product"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
     category: "vm|misc"
     short_name: "o32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
     category: "vm|misc"
     short_name: "o64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
     category: "vm|misc"
     short_name: "a"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msan-linux-release-x64"
     category: "vm|misc"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-tsan-linux-release-x64"
     category: "vm|misc"
     short_name: "t"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ubsan-linux-release-x64"
     category: "vm|misc"
     short_name: "u"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-asan-linux-release-x64"
     category: "vm|misc|aot"
     short_name: "a"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-msan-linux-release-x64"
     category: "vm|misc|aot"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-tsan-linux-release-x64"
     category: "vm|misc|aot"
     short_name: "t"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ubsan-linux-release-x64"
     category: "vm|misc|aot"
     short_name: "u"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
     category: "vm|misc|reload"
     short_name: "d"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
     category: "vm|misc|reload"
     short_name: "r"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
     category: "vm|misc|reload"
     short_name: "drb"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64"
     category: "vm|misc|reload"
     short_name: "rrb"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
     category: "vm|ffi"
     short_name: "d32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm"
     category: "vm|ffi"
     short_name: "r32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm"
     category: "vm|ffi"
     short_name: "p32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64"
     category: "vm|ffi"
     short_name: "d64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64"
     category: "vm|ffi"
     short_name: "r64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64"
     category: "vm|ffi"
     short_name: "p64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm"
     category: "vm|ffi"
     short_name: "qe"
-  >
-  header: <
-    links: <
+  }
+  header {
+    links {
       name: "Consoles"
-      links: <
+      links {
         text: "Bleeding Edge console"
         url: "/p/dart/g/be/console"
         alt: "SDK BE Console"
-      >
-      links: <
+      }
+      links {
         text: "Alternative Bleeding Edge console"
         url: "/p/dart/g/alt/console"
         alt: "SDK BE Console (alternative)"
-      >
-      links: <
+      }
+      links {
         text: "FYI console"
         url: "/p/dart/g/fyi/console"
         alt: "SDK FYI Console"
-      >
-      links: <
+      }
+      links {
         text: "SDK CQ Status"
         url: "/p/dart/g/cq/builders"
         alt: "SDK CQ Status"
-      >
-      links: <
+      }
+      links {
         text: "Results Feed"
         url: "https://dart-ci.firebaseapp.com/"
         alt: "Results Feed"
-      >
-    >
-    console_groups: <
+      }
+    }
+    console_groups {
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
-    >
+    }
     tree_status_host: "dart-status.appspot.com"
-  >
->
-consoles: <
+  }
+}
+consoles {
   id: "dev"
   name: "SDK Dev Console"
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "regexp:refs/heads/dev"
   manifest_name: "REVISION"
-  builders: <
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-dev"
     category: "cfe"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-dev"
     category: "cfe"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-dev"
     category: "cfe"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-dev"
     category: "cfe"
     short_name: "nn"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-dev"
     category: "vm|nnbd"
     short_name: "d"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-dev"
     category: "vm|nnbd"
     short_name: "r"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-dev"
     category: "vm|nnbd"
     short_name: "pr"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-dev"
     category: "vm|app-kernel"
     short_name: "d64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64-dev"
     category: "vm|app-kernel"
     short_name: "p64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-dev"
     category: "vm|app-kernel"
     short_name: "r64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64-dev"
     category: "vm|dartkb"
     short_name: "sr"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-dev"
     category: "vm|dartkb"
     short_name: "r"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-abi-dev"
     category: "vm|dartkb"
     short_name: "abi"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-dev"
     category: "vm|kernel"
     short_name: "c"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-dev"
     category: "vm|kernel"
     short_name: "d"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-dev"
     category: "vm|kernel"
     short_name: "a32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-dev"
     category: "vm|kernel"
     short_name: "a64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32-dev"
     category: "vm|kernel"
     short_name: "r32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-dev"
     category: "vm|kernel"
     short_name: "r"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-dev"
     category: "vm|kernel"
     short_name: "rc"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32-dev"
     category: "vm|kernel"
     short_name: "d32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-dev"
     category: "vm|kernel"
     short_name: "md"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-dev"
     category: "vm|kernel"
     short_name: "mr"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32-dev"
     category: "vm|kernel"
     short_name: "wd3"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-dev"
     category: "vm|kernel"
     short_name: "wd"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32-dev"
     category: "vm|kernel"
     short_name: "wr3"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-dev"
     category: "vm|kernel"
     short_name: "wr"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-dev"
     category: "vm|kernel"
     short_name: "cra"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "d"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "p"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-dev"
     category: "vm|kernel-precomp"
     short_name: "a32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-dev"
     category: "vm|kernel-precomp"
     short_name: "a64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "r"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "o"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-dev"
     category: "vm|kernel-precomp"
     short_name: "adx"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-dev"
     category: "vm|kernel-precomp"
     short_name: "arx"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-dev"
     category: "vm|kernel-precomp"
     short_name: "ma"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "wr"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-dev"
     category: "vm|kernel-precomp|android"
     short_name: "a32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64-dev"
     category: "vm|kernel-precomp|android"
     short_name: "a64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64-dev"
     category: "vm|product"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64-dev"
     category: "vm|product"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64-dev"
     category: "vm|product"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-dev"
     category: "vm|ffi"
     short_name: "d32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-dev"
     category: "vm|ffi"
     short_name: "r32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-dev"
     category: "vm|ffi"
     short_name: "p32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64-dev"
     category: "vm|ffi"
     short_name: "d64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64-dev"
     category: "vm|ffi"
     short_name: "r64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64-dev"
     category: "vm|ffi"
     short_name: "p64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-dev"
     category: "vm|ffi"
     short_name: "qe"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
     category: "pkg"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-dev"
     category: "pkg"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-dev"
     category: "pkg"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-dev"
     category: "dart2js|d8"
     short_name: "ha"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-rti-linux-x64-d8-dev"
     category: "dart2js|d8"
     short_name: "rti"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-dev"
     category: "dart2js|d8"
     short_name: "mi"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-dev"
     category: "dart2js|d8"
     short_name: "u"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "csp"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "nn"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-dev"
     category: "dart2js|firefox"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-dev"
     category: "dart2js|safari"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11-dev"
     category: "dart2js|ms"
     short_name: "ie"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-dev"
     category: "analyzer"
     short_name: "as"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-dev"
     category: "analyzer"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-dev"
     category: "analyzer"
     short_name: "nn"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-dev"
     category: "analyzer"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-dev"
     category: "analyzer"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-linux-dev"
     category: "sdk"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-mac-dev"
     category: "sdk"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-win-dev"
     category: "sdk"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-dev"
     category: "ddc"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-dev"
     category: "ddc"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-dev"
     category: "ddc"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-dev"
     category: "ddc"
     short_name: "fl"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/gclient-dev"
     category: "misc"
     short_name: "g"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/debianpackage-linux-dev"
     category: "misc"
     short_name: "dp"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/versionchecker-linux-dev"
     category: "misc"
     short_name: "vc"
-  >
-  header: <
-    links: <
+  }
+  header {
+    links {
       name: "Consoles"
-      links: <
+      links {
         text: "Bleeding Edge console"
         url: "/p/dart/g/be/console"
         alt: "SDK BE Console"
-      >
-      links: <
+      }
+      links {
         text: "Alternative Bleeding Edge console"
         url: "/p/dart/g/alt/console"
         alt: "SDK BE Console (alternative)"
-      >
-      links: <
+      }
+      links {
         text: "FYI console"
         url: "/p/dart/g/fyi/console"
         alt: "SDK FYI Console"
-      >
-      links: <
+      }
+      links {
         text: "SDK CQ Status"
         url: "/p/dart/g/cq/builders"
         alt: "SDK CQ Status"
-      >
-      links: <
+      }
+      links {
         text: "Results Feed"
         url: "https://dart-ci.firebaseapp.com/"
         alt: "Results Feed"
-      >
-    >
-    console_groups: <
+      }
+    }
+    console_groups {
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
-    >
+    }
     tree_status_host: "dart-status.appspot.com"
-  >
->
-consoles: <
+  }
+}
+consoles {
   id: "beta"
   name: "SDK Beta Console"
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "regexp:refs/heads/beta"
   manifest_name: "REVISION"
-  builders: <
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-beta"
     category: "cfe"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-beta"
     category: "cfe"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-beta"
     category: "cfe"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-beta"
     category: "cfe"
     short_name: "nn"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-beta"
     category: "vm|nnbd"
     short_name: "d"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-beta"
     category: "vm|nnbd"
     short_name: "r"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-beta"
     category: "vm|nnbd"
     short_name: "pr"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-beta"
     category: "vm|app-kernel"
     short_name: "d64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64-beta"
     category: "vm|app-kernel"
     short_name: "p64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-beta"
     category: "vm|app-kernel"
     short_name: "r64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64-beta"
     category: "vm|dartkb"
     short_name: "sr"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-beta"
     category: "vm|dartkb"
     short_name: "r"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-abi-beta"
     category: "vm|dartkb"
     short_name: "abi"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-beta"
     category: "vm|kernel"
     short_name: "c"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-beta"
     category: "vm|kernel"
     short_name: "d"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-beta"
     category: "vm|kernel"
     short_name: "a32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-beta"
     category: "vm|kernel"
     short_name: "a64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32-beta"
     category: "vm|kernel"
     short_name: "r32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-beta"
     category: "vm|kernel"
     short_name: "r"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-beta"
     category: "vm|kernel"
     short_name: "rc"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32-beta"
     category: "vm|kernel"
     short_name: "d32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-beta"
     category: "vm|kernel"
     short_name: "md"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-beta"
     category: "vm|kernel"
     short_name: "mr"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32-beta"
     category: "vm|kernel"
     short_name: "wd3"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-beta"
     category: "vm|kernel"
     short_name: "wd"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32-beta"
     category: "vm|kernel"
     short_name: "wr3"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-beta"
     category: "vm|kernel"
     short_name: "wr"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-beta"
     category: "vm|kernel"
     short_name: "cra"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-beta"
     category: "vm|kernel-precomp"
     short_name: "d"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-beta"
     category: "vm|kernel-precomp"
     short_name: "p"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-beta"
     category: "vm|kernel-precomp"
     short_name: "a32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-beta"
     category: "vm|kernel-precomp"
     short_name: "a64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-beta"
     category: "vm|kernel-precomp"
     short_name: "r"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-beta"
     category: "vm|kernel-precomp"
     short_name: "o"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-beta"
     category: "vm|kernel-precomp"
     short_name: "adx"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-beta"
     category: "vm|kernel-precomp"
     short_name: "arx"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-beta"
     category: "vm|kernel-precomp"
     short_name: "ma"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-beta"
     category: "vm|kernel-precomp"
     short_name: "wr"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-beta"
     category: "vm|kernel-precomp|android"
     short_name: "a32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64-beta"
     category: "vm|kernel-precomp|android"
     short_name: "a64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64-beta"
     category: "vm|product"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64-beta"
     category: "vm|product"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64-beta"
     category: "vm|product"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-beta"
     category: "vm|ffi"
     short_name: "d32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-beta"
     category: "vm|ffi"
     short_name: "r32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-beta"
     category: "vm|ffi"
     short_name: "p32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64-beta"
     category: "vm|ffi"
     short_name: "d64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64-beta"
     category: "vm|ffi"
     short_name: "r64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64-beta"
     category: "vm|ffi"
     short_name: "p64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-beta"
     category: "vm|ffi"
     short_name: "qe"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-beta"
     category: "pkg"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-beta"
     category: "pkg"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-beta"
     category: "pkg"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-beta"
     category: "dart2js|d8"
     short_name: "ha"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-rti-linux-x64-d8-beta"
     category: "dart2js|d8"
     short_name: "rti"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-beta"
     category: "dart2js|d8"
     short_name: "mi"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-beta"
     category: "dart2js|d8"
     short_name: "u"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-beta"
     category: "dart2js|chrome"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-beta"
     category: "dart2js|chrome"
     short_name: "csp"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-beta"
     category: "dart2js|chrome"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-beta"
     category: "dart2js|chrome"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-beta"
     category: "dart2js|chrome"
     short_name: "nn"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-beta"
     category: "dart2js|firefox"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-beta"
     category: "dart2js|safari"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11-beta"
     category: "dart2js|ms"
     short_name: "ie"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-beta"
     category: "analyzer"
     short_name: "as"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-beta"
     category: "analyzer"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-beta"
     category: "analyzer"
     short_name: "nn"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-beta"
     category: "analyzer"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-beta"
     category: "analyzer"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-linux-beta"
     category: "sdk"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-mac-beta"
     category: "sdk"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-win-beta"
     category: "sdk"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-beta"
     category: "ddc"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-beta"
     category: "ddc"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-beta"
     category: "ddc"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-beta"
     category: "ddc"
     short_name: "fl"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/gclient-beta"
     category: "misc"
     short_name: "g"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/debianpackage-linux-beta"
     category: "misc"
     short_name: "dp"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/versionchecker-linux-beta"
     category: "misc"
     short_name: "vc"
-  >
-  header: <
-    links: <
+  }
+  header {
+    links {
       name: "Consoles"
-      links: <
+      links {
         text: "Bleeding Edge console"
         url: "/p/dart/g/be/console"
         alt: "SDK BE Console"
-      >
-      links: <
+      }
+      links {
         text: "Alternative Bleeding Edge console"
         url: "/p/dart/g/alt/console"
         alt: "SDK BE Console (alternative)"
-      >
-      links: <
+      }
+      links {
         text: "FYI console"
         url: "/p/dart/g/fyi/console"
         alt: "SDK FYI Console"
-      >
-      links: <
+      }
+      links {
         text: "SDK CQ Status"
         url: "/p/dart/g/cq/builders"
         alt: "SDK CQ Status"
-      >
-      links: <
+      }
+      links {
         text: "Results Feed"
         url: "https://dart-ci.firebaseapp.com/"
         alt: "Results Feed"
-      >
-    >
-    console_groups: <
+      }
+    }
+    console_groups {
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
-    >
+    }
     tree_status_host: "dart-status.appspot.com"
-  >
->
-consoles: <
+  }
+}
+consoles {
   id: "stable"
   name: "SDK Stable Console"
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "regexp:refs/heads/stable"
   manifest_name: "REVISION"
-  builders: <
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-stable"
     category: "cfe"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-stable"
     category: "cfe"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-stable"
     category: "cfe"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-stable"
     category: "cfe"
     short_name: "nn"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-stable"
     category: "vm|nnbd"
     short_name: "d"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-stable"
     category: "vm|nnbd"
     short_name: "r"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-stable"
     category: "vm|nnbd"
     short_name: "pr"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-stable"
     category: "vm|app-kernel"
     short_name: "d64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64-stable"
     category: "vm|app-kernel"
     short_name: "p64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-stable"
     category: "vm|app-kernel"
     short_name: "r64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64-stable"
     category: "vm|dartkb"
     short_name: "sr"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-stable"
     category: "vm|dartkb"
     short_name: "r"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-abi-stable"
     category: "vm|dartkb"
     short_name: "abi"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-stable"
     category: "vm|kernel"
     short_name: "c"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-stable"
     category: "vm|kernel"
     short_name: "d"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-stable"
     category: "vm|kernel"
     short_name: "a32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-stable"
     category: "vm|kernel"
     short_name: "a64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32-stable"
     category: "vm|kernel"
     short_name: "r32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-stable"
     category: "vm|kernel"
     short_name: "r"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-stable"
     category: "vm|kernel"
     short_name: "rc"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32-stable"
     category: "vm|kernel"
     short_name: "d32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-stable"
     category: "vm|kernel"
     short_name: "md"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-stable"
     category: "vm|kernel"
     short_name: "mr"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32-stable"
     category: "vm|kernel"
     short_name: "wd3"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-stable"
     category: "vm|kernel"
     short_name: "wd"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32-stable"
     category: "vm|kernel"
     short_name: "wr3"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-stable"
     category: "vm|kernel"
     short_name: "wr"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-stable"
     category: "vm|kernel"
     short_name: "cra"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "d"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "p"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-stable"
     category: "vm|kernel-precomp"
     short_name: "a32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-stable"
     category: "vm|kernel-precomp"
     short_name: "a64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "r"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "o"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-stable"
     category: "vm|kernel-precomp"
     short_name: "adx"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-stable"
     category: "vm|kernel-precomp"
     short_name: "arx"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-stable"
     category: "vm|kernel-precomp"
     short_name: "ma"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "wr"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-stable"
     category: "vm|kernel-precomp|android"
     short_name: "a32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64-stable"
     category: "vm|kernel-precomp|android"
     short_name: "a64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64-stable"
     category: "vm|product"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64-stable"
     category: "vm|product"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64-stable"
     category: "vm|product"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-stable"
     category: "vm|ffi"
     short_name: "d32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-stable"
     category: "vm|ffi"
     short_name: "r32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-stable"
     category: "vm|ffi"
     short_name: "p32"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64-stable"
     category: "vm|ffi"
     short_name: "d64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64-stable"
     category: "vm|ffi"
     short_name: "r64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64-stable"
     category: "vm|ffi"
     short_name: "p64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-stable"
     category: "vm|ffi"
     short_name: "qe"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
     category: "pkg"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-stable"
     category: "pkg"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-stable"
     category: "pkg"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-stable"
     category: "dart2js|d8"
     short_name: "ha"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-rti-linux-x64-d8-stable"
     category: "dart2js|d8"
     short_name: "rti"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-stable"
     category: "dart2js|d8"
     short_name: "mi"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-stable"
     category: "dart2js|d8"
     short_name: "u"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "csp"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "nn"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-stable"
     category: "dart2js|firefox"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-stable"
     category: "dart2js|safari"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11-stable"
     category: "dart2js|ms"
     short_name: "ie"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-stable"
     category: "analyzer"
     short_name: "as"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-stable"
     category: "analyzer"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-stable"
     category: "analyzer"
     short_name: "nn"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-stable"
     category: "analyzer"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-stable"
     category: "analyzer"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-linux-stable"
     category: "sdk"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-mac-stable"
     category: "sdk"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-win-stable"
     category: "sdk"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-stable"
     category: "ddc"
     short_name: "l"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-stable"
     category: "ddc"
     short_name: "m"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-stable"
     category: "ddc"
     short_name: "w"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-stable"
     category: "ddc"
     short_name: "fl"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/gclient-stable"
     category: "misc"
     short_name: "g"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/debianpackage-linux-stable"
     category: "misc"
     short_name: "dp"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/versionchecker-linux-stable"
     category: "misc"
     short_name: "vc"
-  >
-  header: <
-    links: <
+  }
+  header {
+    links {
       name: "Consoles"
-      links: <
+      links {
         text: "Bleeding Edge console"
         url: "/p/dart/g/be/console"
         alt: "SDK BE Console"
-      >
-      links: <
+      }
+      links {
         text: "Alternative Bleeding Edge console"
         url: "/p/dart/g/alt/console"
         alt: "SDK BE Console (alternative)"
-      >
-      links: <
+      }
+      links {
         text: "FYI console"
         url: "/p/dart/g/fyi/console"
         alt: "SDK FYI Console"
-      >
-      links: <
+      }
+      links {
         text: "SDK CQ Status"
         url: "/p/dart/g/cq/builders"
         alt: "SDK CQ Status"
-      >
-      links: <
+      }
+      links {
         text: "Results Feed"
         url: "https://dart-ci.firebaseapp.com/"
         alt: "Results Feed"
-      >
-    >
-    console_groups: <
+      }
+    }
+    console_groups {
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
-    >
+    }
     tree_status_host: "dart-status.appspot.com"
-  >
->
-consoles: <
+  }
+}
+consoles {
   id: "flutter"
   name: "Dart/Flutter Console"
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders: <
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
     category: "analyzer"
     short_name: "fa"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
     category: "fasta"
     short_name: "fl"
-  >
->
-consoles: <
+  }
+}
+consoles {
   id: "flutter-hhh"
   name: "Dart/Flutter Linear History Console"
   repo_url: "https://dart.googlesource.com/linear_sdk_flutter_engine"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders: <
+  builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
     category: "flutter"
     short_name: "3H"
-  >
->
-consoles: <
+  }
+}
+consoles {
   id: "fyi"
   name: "SDK FYI Console"
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders: <
+  builders {
     name: "buildbucket/luci.dart.ci/google"
     category: "external"
     short_name: "g"
-  >
->
-consoles: <
+  }
+}
+consoles {
   id: "cq"
   name: "SDK CQ Console"
-  builders: <
+  builders {
     name: "buildbucket/luci.dart.try/front-end-linux-release-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/front-end-mac-release-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/front-end-win-release-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/front-end-nnbd-linux-release-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/flutter-frontend-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/flutter-engine-linux-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/app-kernel-linux-debug-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/app-kernel-linux-product-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/app-kernel-linux-release-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-dartkb-linux-release-simarm64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-dartkb-linux-release-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-dartkb-linux-release-x64-abi-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simarm-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simarm64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-linux-release-ia32-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-checked-linux-release-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-ia32-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-mac-debug-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-mac-release-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-win-debug-ia32-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-win-debug-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-win-release-ia32-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-win-release-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-product-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-simarm_x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm_x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-mac-release-simarm64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-release-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm_x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-linux-product-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-mac-product-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-win-product-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-asan-linux-release-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-msan-linux-release-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-tsan-linux-release-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-ubsan-linux-release-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-asan-linux-release-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-msan-linux-release-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-tsan-linux-release-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-ubsan-linux-release-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-reload-linux-debug-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-reload-linux-release-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-reload-rollback-linux-debug-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-reload-rollback-linux-release-x64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-ffi-android-release-arm-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-ffi-android-product-arm-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-ffi-android-release-arm64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-ffi-android-product-arm64-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-precomp-ffi-qemu-linux-release-arm-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/pkg-linux-release-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/pkg-mac-release-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/pkg-win-release-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/pkg-linux-debug-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/dart2js-strong-hostasserts-linux-ia32-d8-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/dart2js-rti-linux-x64-d8-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/dart2js-minified-strong-linux-x64-d8-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/dart2js-unit-linux-x64-release-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-chrome-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/dart2js-csp-minified-linux-x64-chrome-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/dart2js-strong-mac-x64-chrome-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/dart2js-strong-win-x64-chrome-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/dart2js-nnbd-linux-x64-chrome-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-firefox-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/dart2js-strong-mac-x64-safari-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/dart2js-strong-win-x64-ie11-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/flutter-analyze-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/analyzer-analysis-server-linux-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/analyzer-linux-release-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/analyzer-nnbd-linux-release-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/analyzer-mac-release-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/analyzer-win-release-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/dart-sdk-linux-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/dart-sdk-mac-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/dart-sdk-win-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/ddc-linux-release-chrome-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/ddc-nnbd-linux-release-chrome-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/ddc-mac-release-chrome-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/ddc-win-release-chrome-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/ddk-linux-release-firefox-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/gclient-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/benchmark-linux-try"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.try/vm-kernel-gcc-linux-try"
-  >
+  }
   builder_view_only: true
->
-consoles: <
+}
+consoles {
   id: "infra"
   name: "Infra Console"
-  builders: <
+  builders {
     name: "buildbucket/luci.dart.ci/google"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/base"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/chocolatey"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/co19-roller"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/docker"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/linearize-flutter"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/nightly"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/recipe-deps-roller"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.dart.ci/recipe-bundler"
-  >
+  }
   builder_view_only: true
->
+}
 logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 72056ef87ec3..540d285191d7 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -4,1488 +4,1488 @@
 # For the schema of this file, see ProjectConfig message:
 #   https://luci-config.appspot.com/schemas/projects:luci-notify.cfg
 
-notifiers: <
-  notifications: <
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-    >
-  >
-  builders: <
+    }
+  }
+  builders {
     bucket: "ci"
     name: "chocolatey"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-    >
-  >
-  builders: <
+    }
+  }
+  builders {
     bucket: "ci"
     name: "co19-roller"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci"
     name: "dart-sdk-linux"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci"
     name: "dart-sdk-mac"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci"
     name: "dart-sdk-win"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-    >
-  >
-  builders: <
+    }
+  }
+  builders {
     bucket: "ci"
     name: "debianpackage-linux"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-    >
-  >
-  builders: <
+    }
+  }
+  builders {
     bucket: "ci"
     name: "docker"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-    >
-  >
-  builders: <
+    }
+  }
+  builders {
     bucket: "ci"
     name: "linearize-flutter"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-    >
-  >
-  builders: <
+    }
+  }
+  builders {
     bucket: "ci"
     name: "nightly"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-    >
-  >
-  builders: <
+    }
+  }
+  builders {
     bucket: "ci"
     name: "recipe-bundler"
     repository: "https://dart.googlesource.com/recipes"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-    >
-  >
-  builders: <
+    }
+  }
+  builders {
     bucket: "ci"
     name: "recipe-deps-roller"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci"
     name: "versionchecker-linux"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "analyzer-analysis-server-linux"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "analyzer-linux-release"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "analyzer-mac-release"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "analyzer-nnbd-linux-release"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "analyzer-win-release"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "app-kernel-linux-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "app-kernel-linux-product-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "app-kernel-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "cross-vm-linux-release-arm64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "dart2js-csp-minified-linux-x64-chrome"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "dart2js-minified-strong-linux-x64-d8"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "dart2js-nnbd-linux-x64-chrome"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "dart2js-rti-linux-x64-d8"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "dart2js-strong-hostasserts-linux-ia32-d8"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "dart2js-strong-linux-x64-chrome"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "dart2js-strong-linux-x64-firefox"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "dart2js-strong-mac-x64-chrome"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "dart2js-strong-mac-x64-safari"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "dart2js-strong-win-x64-chrome"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "dart2js-strong-win-x64-ie11"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "dart2js-unit-linux-x64-release"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "ddc-linux-release-chrome"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "ddc-mac-release-chrome"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "ddc-nnbd-linux-release-chrome"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "ddc-win-release-chrome"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "ddk-linux-release-firefox"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "flutter-engine-linux"
     repository: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_failure: true
-    email: <
+    email {
       recipients: "jensj@google.com"
-    >
-  >
-  builders: <
+    }
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "flutter-frontend"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "front-end-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "front-end-mac-release-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "front-end-nnbd-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "front-end-win-release-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_success: true
     on_failure: true
-    email: <
+    email {
       recipients: "ajcbik@google.com"
       recipients: "athom@google.com"
-    >
-  >
-  builders: <
+    }
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "fuzz-linux"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "gclient"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "pkg-linux-debug"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "pkg-linux-release"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "pkg-mac-release"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "pkg-win-release"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-canary-linux-debug"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-dartkb-linux-release-simarm64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-dartkb-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-dartkb-linux-release-x64-abi"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-ffi-android-debug-arm"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-ffi-android-debug-arm64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-ffi-android-product-arm"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-ffi-android-product-arm64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-ffi-android-release-arm"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-ffi-android-release-arm64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-asan-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-checked-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-linux-debug-ia32"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-linux-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-linux-product-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-linux-release-ia32"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-linux-release-simarm"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-linux-release-simarm64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-mac-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-mac-product-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-mac-release-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-msan-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-nnbd-linux-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-nnbd-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-optcounter-threshold-linux-release-ia32"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-optcounter-threshold-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-android-release-arm64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-android-release-arm_x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-asan-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-linux-debug-simarm_x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-linux-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-linux-product-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-linux-release-simarm"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-linux-release-simarm64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-linux-release-simarm_x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-mac-release-simarm64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-msan-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-nnbd-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-obfuscate-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-tsan-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-ubsan-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-win-release-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-reload-linux-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-reload-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-reload-rollback-linux-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-reload-rollback-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-tsan-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-ubsan-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-win-debug-ia32"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-win-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-win-product-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-win-release-ia32"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-win-release-x64"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
-notifiers: <
-  notifications: <
+  }
+}
+notifiers {
+  notifications {
     on_new_failure: true
-    email: <
+    email {
       recipients: "athom@google.com"
-    >
-    notify_blamelist: <>
-  >
-  builders: <
+    }
+    notify_blamelist {}
+  }
+  builders {
     bucket: "ci.sandbox"
     name: "vm-precomp-ffi-qemu-linux-release-arm"
     repository: "https://dart.googlesource.com/sdk"
-  >
->
+  }
+}
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index d838a0364b1a..68790e1c519d 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -4,3519 +4,3519 @@
 # For the schema of this file, see ProjectConfig message:
 #   https://luci-config.appspot.com/schemas/projects:luci-scheduler.cfg
 
-job: <
+job {
   id: "analyzer-analysis-server-linux"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-analysis-server-linux"
-  >
->
-job: <
+  }
+}
+job {
   id: "analyzer-analysis-server-linux-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-analysis-server-linux-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "analyzer-analysis-server-linux-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-analysis-server-linux-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "analyzer-analysis-server-linux-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-analysis-server-linux-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "analyzer-linux-release"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-linux-release"
-  >
->
-job: <
+  }
+}
+job {
   id: "analyzer-linux-release-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-linux-release-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "analyzer-linux-release-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-linux-release-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "analyzer-linux-release-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-linux-release-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "analyzer-mac-release"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-mac-release"
-  >
->
-job: <
+  }
+}
+job {
   id: "analyzer-mac-release-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-mac-release-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "analyzer-mac-release-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-mac-release-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "analyzer-mac-release-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-mac-release-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "analyzer-nnbd-linux-release"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-nnbd-linux-release"
-  >
->
-job: <
+  }
+}
+job {
   id: "analyzer-nnbd-linux-release-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-nnbd-linux-release-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "analyzer-nnbd-linux-release-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-nnbd-linux-release-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "analyzer-nnbd-linux-release-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-nnbd-linux-release-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "analyzer-win-release"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-win-release"
-  >
->
-job: <
+  }
+}
+job {
   id: "analyzer-win-release-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-win-release-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "analyzer-win-release-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-win-release-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "analyzer-win-release-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "analyzer-win-release-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "app-kernel-linux-debug-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "app-kernel-linux-debug-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "app-kernel-linux-debug-x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "app-kernel-linux-debug-x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "app-kernel-linux-debug-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "app-kernel-linux-debug-x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "app-kernel-linux-debug-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "app-kernel-linux-debug-x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "app-kernel-linux-product-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "app-kernel-linux-product-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "app-kernel-linux-product-x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "app-kernel-linux-product-x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "app-kernel-linux-product-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "app-kernel-linux-product-x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "app-kernel-linux-product-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "app-kernel-linux-product-x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "app-kernel-linux-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "app-kernel-linux-release-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "app-kernel-linux-release-x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "app-kernel-linux-release-x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "app-kernel-linux-release-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "app-kernel-linux-release-x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "app-kernel-linux-release-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "app-kernel-linux-release-x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "base"
   schedule: "with 15m interval"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "base"
-  >
->
-job: <
+  }
+}
+job {
   id: "chocolatey"
   schedule: "triggered"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "chocolatey"
-  >
->
-job: <
+  }
+}
+job {
   id: "co19-roller"
   schedule: "triggered"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "co19-roller"
-  >
->
-job: <
+  }
+}
+job {
   id: "cross-vm-linux-release-arm64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "cross-vm-linux-release-arm64"
-  >
->
-job: <
+  }
+}
+job {
   id: "cross-vm-linux-release-arm64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "cross-vm-linux-release-arm64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "cross-vm-linux-release-arm64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "cross-vm-linux-release-arm64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "cross-vm-linux-release-arm64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "cross-vm-linux-release-arm64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "cross-vm-precomp-linux-release-arm64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "cross-vm-precomp-linux-release-arm64"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart-sdk-linux"
   schedule: "triggered"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "dart-sdk-linux"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart-sdk-linux-beta"
   schedule: "triggered"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "dart-sdk-linux-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart-sdk-linux-dev"
   schedule: "triggered"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "dart-sdk-linux-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart-sdk-linux-stable"
   schedule: "triggered"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "dart-sdk-linux-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart-sdk-mac"
   schedule: "triggered"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "dart-sdk-mac"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart-sdk-mac-beta"
   schedule: "triggered"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "dart-sdk-mac-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart-sdk-mac-dev"
   schedule: "triggered"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "dart-sdk-mac-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart-sdk-mac-stable"
   schedule: "triggered"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "dart-sdk-mac-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart-sdk-win"
   schedule: "triggered"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "dart-sdk-win"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart-sdk-win-beta"
   schedule: "triggered"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "dart-sdk-win-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart-sdk-win-dev"
   schedule: "triggered"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "dart-sdk-win-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart-sdk-win-stable"
   schedule: "triggered"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "dart-sdk-win-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-csp-minified-linux-x64-chrome"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-csp-minified-linux-x64-chrome"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-csp-minified-linux-x64-chrome-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-csp-minified-linux-x64-chrome-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-csp-minified-linux-x64-chrome-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-csp-minified-linux-x64-chrome-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-csp-minified-linux-x64-chrome-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-csp-minified-linux-x64-chrome-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-minified-strong-linux-x64-d8"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-minified-strong-linux-x64-d8"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-minified-strong-linux-x64-d8-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-minified-strong-linux-x64-d8-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-minified-strong-linux-x64-d8-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-minified-strong-linux-x64-d8-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-minified-strong-linux-x64-d8-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-minified-strong-linux-x64-d8-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-nnbd-linux-x64-chrome"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-nnbd-linux-x64-chrome"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-nnbd-linux-x64-chrome-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-nnbd-linux-x64-chrome-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-nnbd-linux-x64-chrome-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-nnbd-linux-x64-chrome-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-nnbd-linux-x64-chrome-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-nnbd-linux-x64-chrome-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-rti-linux-x64-d8"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-rti-linux-x64-d8"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-rti-linux-x64-d8-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-rti-linux-x64-d8-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-rti-linux-x64-d8-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-rti-linux-x64-d8-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-rti-linux-x64-d8-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-rti-linux-x64-d8-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-hostasserts-linux-ia32-d8"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-hostasserts-linux-ia32-d8"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-linux-x64-chrome"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-linux-x64-chrome"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-linux-x64-chrome-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-linux-x64-chrome-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-linux-x64-chrome-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-linux-x64-chrome-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-linux-x64-chrome-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-linux-x64-chrome-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-linux-x64-firefox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-linux-x64-firefox"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-linux-x64-firefox-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-linux-x64-firefox-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-linux-x64-firefox-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-linux-x64-firefox-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-linux-x64-firefox-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-linux-x64-firefox-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-mac-x64-chrome"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-mac-x64-chrome"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-mac-x64-chrome-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-mac-x64-chrome-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-mac-x64-chrome-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-mac-x64-chrome-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-mac-x64-chrome-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-mac-x64-chrome-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-mac-x64-safari"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-mac-x64-safari"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-mac-x64-safari-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-mac-x64-safari-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-mac-x64-safari-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-mac-x64-safari-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-mac-x64-safari-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-mac-x64-safari-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-win-x64-chrome"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-win-x64-chrome"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-win-x64-chrome-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-win-x64-chrome-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-win-x64-chrome-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-win-x64-chrome-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-win-x64-chrome-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-win-x64-chrome-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-win-x64-ie11"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-win-x64-ie11"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-win-x64-ie11-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-win-x64-ie11-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-win-x64-ie11-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-win-x64-ie11-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-strong-win-x64-ie11-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-strong-win-x64-ie11-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-unit-linux-x64-release"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-unit-linux-x64-release"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-unit-linux-x64-release-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-unit-linux-x64-release-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-unit-linux-x64-release-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-unit-linux-x64-release-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "dart2js-unit-linux-x64-release-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "dart2js-unit-linux-x64-release-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "ddc-linux-release-chrome"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "ddc-linux-release-chrome"
-  >
->
-job: <
+  }
+}
+job {
   id: "ddc-linux-release-chrome-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "ddc-linux-release-chrome-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "ddc-linux-release-chrome-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "ddc-linux-release-chrome-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "ddc-linux-release-chrome-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "ddc-linux-release-chrome-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "ddc-mac-release-chrome"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "ddc-mac-release-chrome"
-  >
->
-job: <
+  }
+}
+job {
   id: "ddc-mac-release-chrome-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "ddc-mac-release-chrome-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "ddc-mac-release-chrome-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "ddc-mac-release-chrome-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "ddc-mac-release-chrome-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "ddc-mac-release-chrome-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "ddc-nnbd-linux-release-chrome"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "ddc-nnbd-linux-release-chrome"
-  >
->
-job: <
+  }
+}
+job {
   id: "ddc-win-release-chrome"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "ddc-win-release-chrome"
-  >
->
-job: <
+  }
+}
+job {
   id: "ddc-win-release-chrome-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "ddc-win-release-chrome-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "ddc-win-release-chrome-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "ddc-win-release-chrome-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "ddc-win-release-chrome-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "ddc-win-release-chrome-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "ddk-linux-release-firefox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "ddk-linux-release-firefox"
-  >
->
-job: <
+  }
+}
+job {
   id: "ddk-linux-release-firefox-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "ddk-linux-release-firefox-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "ddk-linux-release-firefox-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "ddk-linux-release-firefox-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "ddk-linux-release-firefox-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "ddk-linux-release-firefox-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "debianpackage-linux"
   schedule: "triggered"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "debianpackage-linux"
-  >
->
-job: <
+  }
+}
+job {
   id: "debianpackage-linux-beta"
   schedule: "triggered"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "debianpackage-linux-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "debianpackage-linux-dev"
   schedule: "triggered"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "debianpackage-linux-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "debianpackage-linux-stable"
   schedule: "triggered"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "debianpackage-linux-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "docker"
   schedule: "triggered"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "docker"
-  >
->
-job: <
+  }
+}
+job {
   id: "flutter-analyze"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "flutter-analyze"
-  >
->
-job: <
+  }
+}
+job {
   id: "flutter-engine-linux"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "flutter-engine-linux"
-  >
->
-job: <
+  }
+}
+job {
   id: "flutter-frontend"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "flutter-frontend"
-  >
->
-job: <
+  }
+}
+job {
   id: "front-end-linux-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "front-end-linux-release-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "front-end-linux-release-x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "front-end-linux-release-x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "front-end-linux-release-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "front-end-linux-release-x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "front-end-linux-release-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "front-end-linux-release-x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "front-end-mac-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "front-end-mac-release-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "front-end-mac-release-x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "front-end-mac-release-x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "front-end-mac-release-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "front-end-mac-release-x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "front-end-mac-release-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "front-end-mac-release-x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "front-end-nnbd-linux-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "front-end-nnbd-linux-release-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "front-end-nnbd-linux-release-x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "front-end-nnbd-linux-release-x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "front-end-nnbd-linux-release-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "front-end-nnbd-linux-release-x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "front-end-nnbd-linux-release-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "front-end-nnbd-linux-release-x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "front-end-win-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "front-end-win-release-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "front-end-win-release-x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "front-end-win-release-x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "front-end-win-release-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "front-end-win-release-x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "front-end-win-release-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "front-end-win-release-x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "fuzz-linux"
   schedule: "0 3,4 * * *"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "fuzz-linux"
-  >
->
-job: <
+  }
+}
+job {
   id: "gclient"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "gclient"
-  >
->
-job: <
+  }
+}
+job {
   id: "gclient-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "gclient-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "gclient-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "gclient-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "gclient-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "gclient-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "linearize-flutter"
   schedule: "triggered"
   acl_sets: "ci"
-  triggering_policy: <
+  triggering_policy {
     kind: GREEDY_BATCHING
     max_batch_size: 1
-  >
-  buildbucket: <
+  }
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "linearize-flutter"
-  >
->
-job: <
+  }
+}
+job {
   id: "nightly"
   schedule: "0 5 * * *"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "nightly"
-  >
->
-job: <
+  }
+}
+job {
   id: "pkg-linux-debug"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "pkg-linux-debug"
-  >
->
-job: <
+  }
+}
+job {
   id: "pkg-linux-release"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "pkg-linux-release"
-  >
->
-job: <
+  }
+}
+job {
   id: "pkg-linux-release-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "pkg-linux-release-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "pkg-linux-release-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "pkg-linux-release-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "pkg-linux-release-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "pkg-linux-release-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "pkg-mac-release"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "pkg-mac-release"
-  >
->
-job: <
+  }
+}
+job {
   id: "pkg-mac-release-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "pkg-mac-release-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "pkg-mac-release-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "pkg-mac-release-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "pkg-mac-release-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "pkg-mac-release-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "pkg-win-release"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "pkg-win-release"
-  >
->
-job: <
+  }
+}
+job {
   id: "pkg-win-release-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "pkg-win-release-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "pkg-win-release-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "pkg-win-release-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "pkg-win-release-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "pkg-win-release-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "recipe-bundler"
   schedule: "*/30 * * * *"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "recipe-bundler"
-  >
->
-job: <
+  }
+}
+job {
   id: "recipe-deps-roller"
   schedule: "with 1h interval"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "recipe-deps-roller"
-  >
->
-job: <
+  }
+}
+job {
   id: "versionchecker-linux"
   schedule: "triggered"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "versionchecker-linux"
-  >
->
-job: <
+  }
+}
+job {
   id: "versionchecker-linux-beta"
   schedule: "triggered"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "versionchecker-linux-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "versionchecker-linux-dev"
   schedule: "triggered"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "versionchecker-linux-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "versionchecker-linux-stable"
   schedule: "triggered"
   acl_sets: "ci"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci"
     builder: "versionchecker-linux-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-canary-linux-debug"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-canary-linux-debug"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-canary-linux-debug-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-canary-linux-debug-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-canary-linux-debug-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-canary-linux-debug-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-canary-linux-debug-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-canary-linux-debug-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-dartkb-linux-release-simarm64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-dartkb-linux-release-simarm64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-dartkb-linux-release-simarm64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-dartkb-linux-release-simarm64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-dartkb-linux-release-simarm64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-dartkb-linux-release-simarm64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-dartkb-linux-release-simarm64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-dartkb-linux-release-simarm64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-dartkb-linux-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-dartkb-linux-release-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-dartkb-linux-release-x64-abi"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-dartkb-linux-release-x64-abi"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-dartkb-linux-release-x64-abi-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-dartkb-linux-release-x64-abi-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-dartkb-linux-release-x64-abi-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-dartkb-linux-release-x64-abi-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-dartkb-linux-release-x64-abi-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-dartkb-linux-release-x64-abi-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-dartkb-linux-release-x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-dartkb-linux-release-x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-dartkb-linux-release-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-dartkb-linux-release-x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-dartkb-linux-release-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-dartkb-linux-release-x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-ffi-android-debug-arm"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-ffi-android-debug-arm"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-ffi-android-debug-arm-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-ffi-android-debug-arm-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-ffi-android-debug-arm-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-ffi-android-debug-arm-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-ffi-android-debug-arm-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-ffi-android-debug-arm-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-ffi-android-debug-arm64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-ffi-android-debug-arm64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-ffi-android-debug-arm64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-ffi-android-debug-arm64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-ffi-android-debug-arm64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-ffi-android-debug-arm64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-ffi-android-debug-arm64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-ffi-android-debug-arm64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-ffi-android-product-arm"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-ffi-android-product-arm"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-ffi-android-product-arm-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-ffi-android-product-arm-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-ffi-android-product-arm-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-ffi-android-product-arm-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-ffi-android-product-arm-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-ffi-android-product-arm-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-ffi-android-product-arm64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-ffi-android-product-arm64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-ffi-android-product-arm64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-ffi-android-product-arm64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-ffi-android-product-arm64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-ffi-android-product-arm64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-ffi-android-product-arm64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-ffi-android-product-arm64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-ffi-android-release-arm"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-ffi-android-release-arm"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-ffi-android-release-arm-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-ffi-android-release-arm-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-ffi-android-release-arm-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-ffi-android-release-arm-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-ffi-android-release-arm-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-ffi-android-release-arm-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-ffi-android-release-arm64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-ffi-android-release-arm64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-ffi-android-release-arm64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-ffi-android-release-arm64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-ffi-android-release-arm64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-ffi-android-release-arm64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-ffi-android-release-arm64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-ffi-android-release-arm64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-asan-linux-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-asan-linux-release-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-checked-linux-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-checked-linux-release-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-checked-linux-release-x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-checked-linux-release-x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-checked-linux-release-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-checked-linux-release-x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-checked-linux-release-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-checked-linux-release-x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-debug-ia32"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-debug-ia32"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-debug-ia32-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-debug-ia32-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-debug-ia32-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-debug-ia32-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-debug-ia32-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-debug-ia32-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-debug-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-debug-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-debug-x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-debug-x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-debug-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-debug-x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-debug-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-debug-x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-product-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-product-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-product-x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-product-x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-product-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-product-x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-product-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-product-x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-release-ia32"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-ia32"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-release-ia32-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-ia32-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-release-ia32-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-ia32-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-release-ia32-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-ia32-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-release-simarm"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simarm"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-release-simarm-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simarm-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-release-simarm-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simarm-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-release-simarm-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simarm-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-release-simarm64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simarm64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-release-simarm64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simarm64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-release-simarm64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simarm64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-release-simarm64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-simarm64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-release-x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-release-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-linux-release-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-linux-release-x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-mac-debug-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-mac-debug-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-mac-debug-x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-mac-debug-x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-mac-debug-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-mac-debug-x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-mac-debug-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-mac-debug-x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-mac-product-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-mac-product-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-mac-product-x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-mac-product-x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-mac-product-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-mac-product-x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-mac-product-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-mac-product-x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-mac-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-mac-release-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-mac-release-x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-mac-release-x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-mac-release-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-mac-release-x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-mac-release-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-mac-release-x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-msan-linux-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-msan-linux-release-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-nnbd-linux-debug-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-nnbd-linux-debug-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-nnbd-linux-debug-x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-nnbd-linux-debug-x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-nnbd-linux-debug-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-nnbd-linux-debug-x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-nnbd-linux-debug-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-nnbd-linux-debug-x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-nnbd-linux-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-nnbd-linux-release-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-nnbd-linux-release-x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-nnbd-linux-release-x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-nnbd-linux-release-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-nnbd-linux-release-x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-nnbd-linux-release-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-nnbd-linux-release-x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-optcounter-threshold-linux-release-ia32"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-optcounter-threshold-linux-release-ia32"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-optcounter-threshold-linux-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-optcounter-threshold-linux-release-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-android-release-arm64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-android-release-arm64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-android-release-arm64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-android-release-arm64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-android-release-arm64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-android-release-arm64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-android-release-arm64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-android-release-arm64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-android-release-arm_x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-android-release-arm_x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-android-release-arm_x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-android-release-arm_x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-android-release-arm_x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-android-release-arm_x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-android-release-arm_x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-android-release-arm_x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-asan-linux-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-asan-linux-release-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-debug-simarm_x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-debug-simarm_x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-debug-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-debug-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-debug-x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-debug-x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-debug-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-debug-x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-debug-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-debug-x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-product-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-product-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-product-x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-product-x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-product-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-product-x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-product-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-product-x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-release-simarm"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-release-simarm-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-release-simarm-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-release-simarm-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-release-simarm64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-release-simarm64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-release-simarm64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-release-simarm64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-release-simarm_x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm_x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-release-simarm_x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm_x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-release-simarm_x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm_x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-release-simarm_x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm_x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-release-x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-release-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-linux-release-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-mac-release-simarm64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-mac-release-simarm64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-mac-release-simarm64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-mac-release-simarm64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-mac-release-simarm64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-mac-release-simarm64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-mac-release-simarm64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-mac-release-simarm64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-msan-linux-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-msan-linux-release-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-nnbd-linux-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-nnbd-linux-release-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-obfuscate-linux-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-obfuscate-linux-release-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-tsan-linux-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-tsan-linux-release-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-ubsan-linux-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-ubsan-linux-release-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-win-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-win-release-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-win-release-x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-win-release-x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-win-release-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-win-release-x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-precomp-win-release-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-precomp-win-release-x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-reload-linux-debug-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-reload-linux-debug-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-reload-linux-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-reload-linux-release-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-reload-rollback-linux-debug-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-reload-rollback-linux-debug-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-reload-rollback-linux-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-reload-rollback-linux-release-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-tsan-linux-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-tsan-linux-release-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-ubsan-linux-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-ubsan-linux-release-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-win-debug-ia32"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-debug-ia32"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-win-debug-ia32-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-debug-ia32-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-win-debug-ia32-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-debug-ia32-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-win-debug-ia32-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-debug-ia32-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-win-debug-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-debug-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-win-debug-x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-debug-x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-win-debug-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-debug-x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-win-debug-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-debug-x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-win-product-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-product-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-win-product-x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-product-x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-win-product-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-product-x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-win-product-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-product-x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-win-release-ia32"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-release-ia32"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-win-release-ia32-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-release-ia32-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-win-release-ia32-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-release-ia32-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-win-release-ia32-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-release-ia32-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-win-release-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-release-x64"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-win-release-x64-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-release-x64-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-win-release-x64-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-release-x64-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-kernel-win-release-x64-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-kernel-win-release-x64-stable"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-precomp-ffi-qemu-linux-release-arm"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-precomp-ffi-qemu-linux-release-arm"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-precomp-ffi-qemu-linux-release-arm-beta"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-precomp-ffi-qemu-linux-release-arm-beta"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-precomp-ffi-qemu-linux-release-arm-dev"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-precomp-ffi-qemu-linux-release-arm-dev"
-  >
->
-job: <
+  }
+}
+job {
   id: "vm-precomp-ffi-qemu-linux-release-arm-stable"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
-  buildbucket: <
+  buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
     builder: "vm-precomp-ffi-qemu-linux-release-arm-stable"
-  >
->
-trigger: <
+  }
+}
+trigger {
   id: "dart-flutter-engine-trigger"
   acl_sets: "ci"
   triggers: "linearize-flutter"
-  gitiles: <
+  gitiles {
     repo: "https://dart.googlesource.com/external/github.com/flutter/engine"
     refs: "regexp:refs/heads/master"
-  >
->
-trigger: <
+  }
+}
+trigger {
   id: "dart-flutter-flutter-trigger"
   acl_sets: "ci"
   triggers: "linearize-flutter"
-  gitiles: <
+  gitiles {
     repo: "https://dart.googlesource.com/external/github.com/flutter/flutter"
     refs: "regexp:refs/heads/master"
-  >
->
-trigger: <
+  }
+}
+trigger {
   id: "dart-gitiles-trigger-beta"
   acl_sets: "ci"
   triggers: "dart-sdk-linux-beta"
@@ -3599,12 +3599,12 @@ trigger: <
   triggers: "vm-kernel-win-release-ia32-beta"
   triggers: "vm-kernel-win-release-x64-beta"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm-beta"
-  gitiles: <
+  gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/beta"
-  >
->
-trigger: <
+  }
+}
+trigger {
   id: "dart-gitiles-trigger-dev"
   acl_sets: "ci"
   triggers: "dart-sdk-linux-dev"
@@ -3687,21 +3687,21 @@ trigger: <
   triggers: "vm-kernel-win-release-ia32-dev"
   triggers: "vm-kernel-win-release-x64-dev"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm-dev"
-  gitiles: <
+  gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/dev"
-  >
->
-trigger: <
+  }
+}
+trigger {
   id: "dart-gitiles-trigger-flutter"
   acl_sets: "ci"
   triggers: "flutter-engine-linux"
-  gitiles: <
+  gitiles {
     repo: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
     refs: "regexp:refs/heads/master"
-  >
->
-trigger: <
+  }
+}
+trigger {
   id: "dart-gitiles-trigger-master"
   acl_sets: "ci"
   triggers: "dart-sdk-linux"
@@ -3751,12 +3751,12 @@ trigger: <
   triggers: "vm-kernel-win-debug-x64"
   triggers: "vm-kernel-win-product-x64"
   triggers: "vm-kernel-win-release-x64"
-  gitiles: <
+  gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/master"
-  >
->
-trigger: <
+  }
+}
+trigger {
   id: "dart-gitiles-trigger-stable"
   acl_sets: "ci"
   triggers: "dart-sdk-linux-stable"
@@ -3839,12 +3839,12 @@ trigger: <
   triggers: "vm-kernel-win-release-ia32-stable"
   triggers: "vm-kernel-win-release-x64-stable"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm-stable"
-  gitiles: <
+  gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/stable"
-  >
->
-trigger: <
+  }
+}
+trigger {
   id: "dart-vm-gitiles-trigger-master"
   acl_sets: "ci"
   triggers: "app-kernel-linux-debug-x64"
@@ -3899,7 +3899,7 @@ trigger: <
   triggers: "vm-kernel-win-debug-ia32"
   triggers: "vm-kernel-win-release-ia32"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm"
-  gitiles: <
+  gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/master"
     path_regexps: "DEPS"
@@ -3913,34 +3913,34 @@ trigger: <
     path_regexps: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
     path_regexps: "pkg/vm/.+"
     path_regexps: "runtime/.+"
-  >
->
-trigger: <
+  }
+}
+trigger {
   id: "recipes-dart"
   acl_sets: "ci"
   triggers: "recipe-bundler"
-  gitiles: <
+  gitiles {
     repo: "https://dart.googlesource.com/recipes"
     refs: "regexp:refs/heads/master"
-  >
->
-acl_sets: <
+  }
+}
+acl_sets {
   name: "ci"
-  acls: <
+  acls {
     role: OWNER
     granted_to: "group:project-dart-admins"
-  >
-  acls: <
+  }
+  acls {
     granted_to: "group:all"
-  >
->
-acl_sets: <
+  }
+}
+acl_sets {
   name: "ci.sandbox"
-  acls: <
+  acls {
     role: OWNER
     granted_to: "group:project-dart-admins"
-  >
-  acls: <
+  }
+  acls {
     granted_to: "group:all"
-  >
->
+  }
+}
diff --git a/main.star b/main.star
index 2bb457d15069..0a8219d2f220 100755
--- a/main.star
+++ b/main.star
@@ -11,6 +11,8 @@
 
 load("//defaults.star", "defaults")
 
+lucicfg.check_version('1.15.0')
+
 DART_GIT = "https://dart.googlesource.com/sdk"
 DART_GERRIT = "https://dart-review.googlesource.com/"
 

From e7675d818793edf98dc1be4918b65fc5dc4bc91d Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 11 Jun 2020 06:35:59 +0000
Subject: [PATCH 374/826] [infra] Reduce recipe roll frequency

Since we don't have any downstream dependencies, and the roller is quite
noisy, it's better to roll less frequently.

Change-Id: I538fe3691906d137c9b1f9bf4dc9ccf960b1b335
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/150900
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: Karl Klose <karlklose@google.com>
Commit-Queue: Karl Klose <karlklose@google.com>
---
 luci-scheduler.cfg | 2 +-
 main.star          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 68790e1c519d..a4c473cdc352 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1630,7 +1630,7 @@ job {
 }
 job {
   id: "recipe-deps-roller"
-  schedule: "with 1h interval"
+  schedule: "with 4h interval"
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
diff --git a/main.star b/main.star
index 0a8219d2f220..21614777eb1a 100755
--- a/main.star
+++ b/main.star
@@ -970,7 +970,7 @@ dart_infra_builder(
             "dart": "https://dart.googlesource.com/recipes",
         }.items(), # recipe_autoroller expects a list of tuples.
     },
-    schedule="with 1h interval",
+    schedule="with 4h interval",
 )
 
 dart_infra_builder(

From 07242ec7ae7bee64b89ddabb2858133d0ac06ba8 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 11 Jun 2020 07:43:12 +0000
Subject: [PATCH 375/826] [infra] Enable the CQ for the infra/config branch

Enough is enough :)

Change-Id: I74dfe1cda1ecc693bd045b5f3c203030c8b90c6e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/150920
Reviewed-by: Karl Klose <karlklose@google.com>
---
 commit-queue.cfg | 20 ++++++++++++++++++++
 main.star        |  9 +++++++++
 2 files changed, 29 insertions(+)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index f748ff3dfbb1..f187f499d32b 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -619,3 +619,23 @@ config_groups {
     }
   }
 }
+config_groups {
+  name: "sdk-infra-config"
+  gerrit {
+    url: "https://dart-review.googlesource.com"
+    projects {
+      name: "sdk"
+      ref_regexp: "refs/heads/infra/config"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "project-dart-committers"
+      dry_run_access_list: "project-dart-tryjob-access"
+      allow_submit_with_open_deps: true
+    }
+    tree_status {
+      url: "https://dart-status.appspot.com"
+    }
+  }
+}
diff --git a/main.star b/main.star
index 21614777eb1a..c7bf7262f7ed 100755
--- a/main.star
+++ b/main.star
@@ -312,6 +312,15 @@ luci.cq_group(
     verifiers=None,
 )
 
+luci.cq_group(
+    name="sdk-infra-config",
+    watch=cq.refset(DART_GERRIT + "sdk", refs=["refs/heads/infra/config"]),
+    allow_submit_with_open_deps=True,
+    tree_status_host="dart-status.appspot.com",
+    retry_config=cq.RETRY_NONE,
+    verifiers=None,
+)
+
 luci.cq_group(
     name="recipes",
     watch=cq.refset(

From dae18cc1d391f5742588667afac2050f5d5b7dfd Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 11 Jun 2020 09:26:02 +0000
Subject: [PATCH 376/826] [infra] Migrate all Linux builders to goma on RBE

b/144018396

Change-Id: I4cdc403f26ca4f0187a6ac3b535c363ec402f86f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/150922
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 306 +++++++++++++++++++++++++++++++++++++++++++++
 main.star          |  12 +-
 2 files changed, 311 insertions(+), 7 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 37c2f0ffebe0..9ea9336013be 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -34,6 +34,7 @@ buckets {
         name: "dart/forward_branch"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -83,6 +84,7 @@ buckets {
         name: "dart/package_co19"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -399,6 +401,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -423,6 +426,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -447,6 +451,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -471,6 +476,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -495,6 +501,7 @@ buckets {
         name: "dart/docker"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -519,6 +526,7 @@ buckets {
         name: "dart/external"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -543,6 +551,7 @@ buckets {
         name: "dart/linearize"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -568,6 +577,7 @@ buckets {
         name: "cron/cron"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "builders:[\"cross-vm-precomp-linux-release-arm64\"]"
@@ -593,6 +603,7 @@ buckets {
         name: "recipe_bundler"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
         cipd_version: "git_revision:40621e908eb88bd10451ee9d013b7ef89ea91e37"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -622,6 +633,7 @@ buckets {
         name: "recipe_autoroller"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
         cipd_version: "git_revision:647d5e58ec508f13ccd054f1516e78d7ca3bd540"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -650,6 +662,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -674,6 +687,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -698,6 +712,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -722,6 +737,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -770,6 +786,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -794,6 +811,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -818,6 +836,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -842,6 +861,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -866,6 +886,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -890,6 +911,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -914,6 +936,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -938,6 +961,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1058,6 +1082,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1082,6 +1107,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1106,6 +1132,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1130,6 +1157,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1250,6 +1278,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1274,6 +1303,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1298,6 +1328,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1322,6 +1353,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1346,6 +1378,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1370,6 +1403,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1394,6 +1428,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1418,6 +1453,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1442,6 +1478,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1466,6 +1503,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1490,6 +1528,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1514,6 +1553,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1538,6 +1578,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1563,6 +1604,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1588,6 +1630,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1613,6 +1656,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1638,6 +1682,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1663,6 +1708,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1687,6 +1733,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1711,6 +1758,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1735,6 +1783,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1759,6 +1808,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1783,6 +1833,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1807,6 +1858,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1831,6 +1883,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1855,6 +1908,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1879,6 +1933,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1903,6 +1958,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1927,6 +1983,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1951,6 +2008,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1975,6 +2033,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1999,6 +2058,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2023,6 +2083,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2047,6 +2108,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2071,6 +2133,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2095,6 +2158,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2119,6 +2183,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2143,6 +2208,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2167,6 +2233,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2191,6 +2258,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2215,6 +2283,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2239,6 +2308,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2263,6 +2333,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2287,6 +2358,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2311,6 +2383,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2743,6 +2816,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2767,6 +2841,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2791,6 +2866,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2815,6 +2891,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3035,6 +3112,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3155,6 +3233,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3179,6 +3258,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3203,6 +3283,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3227,6 +3308,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3251,6 +3333,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3275,6 +3358,7 @@ buckets {
         name: "dart/flutter_engine"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3300,6 +3384,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3520,6 +3605,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3544,6 +3630,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3568,6 +3655,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3592,6 +3680,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3737,6 +3826,7 @@ buckets {
         name: "dart/gclient"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3761,6 +3851,7 @@ buckets {
         name: "dart/gclient"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3785,6 +3876,7 @@ buckets {
         name: "dart/gclient"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3809,6 +3901,7 @@ buckets {
         name: "dart/gclient"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3833,6 +3926,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3857,6 +3951,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3881,6 +3976,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3905,6 +4001,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3929,6 +4026,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4245,6 +4343,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4269,6 +4368,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4293,6 +4393,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4317,6 +4418,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4341,6 +4443,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4365,6 +4468,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4389,6 +4493,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4413,6 +4518,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4437,6 +4543,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4461,6 +4568,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4485,6 +4593,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4509,6 +4618,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4533,6 +4643,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4557,6 +4668,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4581,6 +4693,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4605,6 +4718,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4629,6 +4743,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4653,6 +4768,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4677,6 +4793,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4701,6 +4818,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4725,6 +4843,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4749,6 +4868,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4773,6 +4893,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4797,6 +4918,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4821,6 +4943,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4845,6 +4968,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4869,6 +4993,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4893,6 +5018,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4917,6 +5043,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4941,6 +5068,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4965,6 +5093,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4989,6 +5118,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5013,6 +5143,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5037,6 +5168,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5061,6 +5193,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5085,6 +5218,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5109,6 +5243,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5134,6 +5269,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5158,6 +5294,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5182,6 +5319,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5206,6 +5344,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5230,6 +5369,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5254,6 +5394,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5278,6 +5419,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5302,6 +5444,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5326,6 +5469,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5350,6 +5494,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5374,6 +5519,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5398,6 +5544,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5422,6 +5569,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5446,6 +5594,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5470,6 +5619,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5494,6 +5644,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5518,6 +5669,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5542,6 +5694,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5566,6 +5719,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5590,6 +5744,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5614,6 +5769,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5638,6 +5794,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5662,6 +5819,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5686,6 +5844,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5710,6 +5869,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5734,6 +5894,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5758,6 +5919,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5782,6 +5944,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5806,6 +5969,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5830,6 +5994,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5854,6 +6019,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5878,6 +6044,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6190,6 +6357,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6215,6 +6383,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6239,6 +6408,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6263,6 +6433,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6287,6 +6458,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6311,6 +6483,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6335,6 +6508,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6359,6 +6533,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6383,6 +6558,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6407,6 +6583,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6432,6 +6609,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6457,6 +6635,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6482,6 +6661,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6507,6 +6687,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6532,6 +6713,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6557,6 +6739,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6582,6 +6765,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6607,6 +6791,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6632,6 +6817,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6657,6 +6843,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6682,6 +6869,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6707,6 +6895,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6732,6 +6921,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6757,6 +6947,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6782,6 +6973,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6806,6 +6998,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6830,6 +7023,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6854,6 +7048,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6878,6 +7073,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6902,6 +7098,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6926,6 +7123,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6950,6 +7148,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6974,6 +7173,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6998,6 +7198,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7022,6 +7223,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7046,6 +7248,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7070,6 +7273,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7094,6 +7298,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7118,6 +7323,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7142,6 +7348,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7166,6 +7373,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7190,6 +7398,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7214,6 +7423,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7238,6 +7448,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7262,6 +7473,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7286,6 +7498,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7310,6 +7523,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7334,6 +7548,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7454,6 +7669,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7479,6 +7695,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7503,6 +7720,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7527,6 +7745,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7551,6 +7770,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7575,6 +7795,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7599,6 +7820,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7623,6 +7845,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7647,6 +7870,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7671,6 +7895,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7696,6 +7921,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7817,6 +8043,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7842,6 +8069,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7867,6 +8095,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7892,6 +8121,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7917,6 +8147,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7942,6 +8173,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8447,6 +8679,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8471,6 +8704,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8495,6 +8729,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8519,6 +8754,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8563,6 +8799,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8587,6 +8824,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8635,6 +8873,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8683,6 +8922,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8707,6 +8947,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8731,6 +8972,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8755,6 +8997,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8852,6 +9095,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8876,6 +9120,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8900,6 +9145,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8924,6 +9170,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8948,6 +9195,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8972,6 +9220,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8996,6 +9245,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9116,6 +9366,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9189,6 +9440,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9237,6 +9489,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9261,6 +9514,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9285,6 +9539,7 @@ buckets {
         name: "dart/flutter_engine"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9310,6 +9565,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9383,6 +9639,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9431,6 +9688,7 @@ buckets {
         name: "dart/gclient"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9455,6 +9713,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9479,6 +9738,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9576,6 +9836,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9600,6 +9861,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9624,6 +9886,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9648,6 +9911,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9672,6 +9936,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9696,6 +9961,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9720,6 +9986,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9744,6 +10011,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9768,6 +10036,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9792,6 +10061,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9816,6 +10086,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9840,6 +10111,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9864,6 +10136,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9888,6 +10161,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9912,6 +10186,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9936,6 +10211,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9960,6 +10236,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9984,6 +10261,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10008,6 +10286,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10104,6 +10383,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10128,6 +10408,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10152,6 +10433,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10176,6 +10458,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10200,6 +10483,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10224,6 +10508,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10249,6 +10534,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10274,6 +10560,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10298,6 +10585,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10323,6 +10611,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10347,6 +10636,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10371,6 +10661,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10395,6 +10686,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10419,6 +10711,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10443,6 +10736,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10491,6 +10785,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10515,6 +10810,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10539,6 +10835,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10563,6 +10860,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10587,6 +10885,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10635,6 +10934,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10659,6 +10959,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10683,6 +10984,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10707,6 +11009,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10731,6 +11034,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10755,6 +11059,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10899,6 +11204,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
diff --git a/main.star b/main.star
index c7bf7262f7ed..8e2de382d20a 100755
--- a/main.star
+++ b/main.star
@@ -363,7 +363,7 @@ def dart_try_builder(name,
     dimensions = defaults.dimensions(dimensions)
     dimensions["pool"] = "luci.dart.try"
     properties = defaults.properties(properties)
-    if dimensions["os"] == "Linux" and goma_rbe:
+    if dimensions["os"] == "Linux" or goma_rbe:
         properties.setdefault("$build/goma", GOMA_RBE)
     builder = name + "-try"
 
@@ -428,7 +428,7 @@ def dart_builder(name,
                  location_regexp=None):
     dimensions = defaults.dimensions(dimensions)
     properties = defaults.properties(properties)
-    if dimensions["os"] == "Linux" and goma_rbe:
+    if dimensions["os"] == "Linux" or goma_rbe:
         properties.setdefault("$build/goma", GOMA_RBE)
 
     def builder(channel, triggered_by):
@@ -564,7 +564,7 @@ def dart_vm_nightly_builder(name, **kwargs):
 
 # cfe
 dart_ci_sandbox_builder(
-    "front-end-linux-release-x64", category="cfe|l", goma_rbe=True, on_cq=True)
+    "front-end-linux-release-x64", category="cfe|l", on_cq=True)
 dart_ci_sandbox_builder(
     "front-end-mac-release-x64", category="cfe|m", dimensions=mac())
 dart_ci_sandbox_builder(
@@ -614,7 +614,7 @@ dart_vm_extra_builder(
 
 #vm|kernel
 dart_vm_extra_builder(
-    "vm-canary-linux-debug", category="vm|kernel|c", goma_rbe=True, on_cq=True)
+    "vm-canary-linux-debug", category="vm|kernel|c", on_cq=True)
 dart_ci_sandbox_builder("vm-kernel-linux-debug-x64", category="vm|kernel|d")
 dart_vm_extra_builder(
     "vm-kernel-linux-release-simarm", category="vm|kernel|a32")
@@ -844,7 +844,7 @@ dart_ci_sandbox_builder(
 
 # sdk
 dart_ci_builder(
-    "dart-sdk-linux", category="sdk|l", channels=CHANNELS, goma_rbe=True)
+    "dart-sdk-linux", category="sdk|l", channels=CHANNELS)
 dart_ci_builder(
     "dart-sdk-mac", category="sdk|m", channels=CHANNELS, dimensions=mac())
 dart_ci_builder(
@@ -858,7 +858,6 @@ dart_ci_builder(
 dart_ci_sandbox_builder(
     "ddc-linux-release-chrome",
     category="ddc|l",
-    goma_rbe=True,
     location_regexp=to_location_regexp(DDC_PATHS))
 dart_ci_sandbox_builder(
     "ddc-nnbd-linux-release-chrome",
@@ -921,7 +920,6 @@ dart_infra_builder(
 dart_ci_sandbox_builder(
     "fuzz-linux",
     channels=[],
-    goma_rbe=True,
     notifies="dart-fuzz-testing",
     schedule="0 3,4 * * *",
     triggered_by=None,

From 45306e99d5239fc42d3bcf5f02f91521e3582470 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 11 Jun 2020 11:01:30 +0000
Subject: [PATCH 377/826] [infra] Don't use new goma backend on android builds

They don't seem to use the a sysroot for all build steps causing errors
in the backend.

b/144018396

TBR=whesse@google.com

Change-Id: I9c8a60b221fb89074458eff47df4853f7b39be63
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/150930
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 40 ----------------------------------------
 main.star          |  7 +++++--
 2 files changed, 5 insertions(+), 42 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 9ea9336013be..b167a021120e 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -4643,7 +4643,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4668,7 +4667,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4693,7 +4691,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4718,7 +4715,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4743,7 +4739,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4768,7 +4763,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4793,7 +4787,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4818,7 +4811,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4843,7 +4835,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4868,7 +4859,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4893,7 +4883,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4918,7 +4907,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4943,7 +4931,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4968,7 +4955,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4993,7 +4979,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5018,7 +5003,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5043,7 +5027,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5068,7 +5051,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5093,7 +5075,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5118,7 +5099,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5143,7 +5123,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5168,7 +5147,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5193,7 +5171,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5218,7 +5195,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6635,7 +6611,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6661,7 +6636,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6687,7 +6661,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6713,7 +6686,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6739,7 +6711,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6765,7 +6736,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6791,7 +6761,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6817,7 +6786,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9911,7 +9879,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9936,7 +9903,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9961,7 +9927,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9986,7 +9951,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10011,7 +9975,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10036,7 +9999,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10508,7 +10470,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10534,7 +10495,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
diff --git a/main.star b/main.star
index 8e2de382d20a..5a889bd6a79f 100755
--- a/main.star
+++ b/main.star
@@ -349,6 +349,9 @@ def dart_recipe(name):
     )
 
 
+def use_goma_rbe(name, goma_rbe, dimensions):
+    return "android" not in name and (dimensions["os"] == "Linux" or goma_rbe)
+
 def dart_try_builder(name,
                      recipe="dart/neo",
                      dimensions=None,
@@ -363,7 +366,7 @@ def dart_try_builder(name,
     dimensions = defaults.dimensions(dimensions)
     dimensions["pool"] = "luci.dart.try"
     properties = defaults.properties(properties)
-    if dimensions["os"] == "Linux" or goma_rbe:
+    if use_goma_rbe(name, goma_rbe, dimensions):
         properties.setdefault("$build/goma", GOMA_RBE)
     builder = name + "-try"
 
@@ -428,7 +431,7 @@ def dart_builder(name,
                  location_regexp=None):
     dimensions = defaults.dimensions(dimensions)
     properties = defaults.properties(properties)
-    if dimensions["os"] == "Linux" or goma_rbe:
+    if use_goma_rbe(name, goma_rbe, dimensions):
         properties.setdefault("$build/goma", GOMA_RBE)
 
     def builder(channel, triggered_by):

From ed596b7d93f47e3a601e3864a3de4c297f54769b Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 11 Jun 2020 16:18:53 +0000
Subject: [PATCH 378/826] [infra] Disable the new goma backend on ubsan

This also changes the goma_rbe parameter to have three states:
* default (currently "on" for Linux and "off" for everything else).
* True (turns the new goma backend "on").
* False (turns the new goma backend "off").

Change-Id: I305ad1ffd184026b282551f2b8ea5f312304019a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/150939
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg |  4 ----
 main.star          | 45 ++++++++++++++++++++++++++++++---------------
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index b167a021120e..c54ce3151412 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -7889,7 +7889,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8141,7 +8140,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10845,7 +10843,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -11019,7 +11016,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
diff --git a/main.star b/main.star
index 5a889bd6a79f..0f7c34762001 100755
--- a/main.star
+++ b/main.star
@@ -349,15 +349,18 @@ def dart_recipe(name):
     )
 
 
-def use_goma_rbe(name, goma_rbe, dimensions):
-    return "android" not in name and (dimensions["os"] == "Linux" or goma_rbe)
+def use_goma_rbe(goma_rbe, dimensions):
+    if goma_rbe == None:
+        return dimensions["os"] == "Linux"
+    return goma_rbe
+
 
 def dart_try_builder(name,
                      recipe="dart/neo",
                      dimensions=None,
                      execution_timeout=None,
                      experiment_percentage=None,
-                     goma_rbe=False,
+                     goma_rbe=None,
                      location_regexp=None,
                      properties=None,
                      on_cq=False):
@@ -366,7 +369,7 @@ def dart_try_builder(name,
     dimensions = defaults.dimensions(dimensions)
     dimensions["pool"] = "luci.dart.try"
     properties = defaults.properties(properties)
-    if use_goma_rbe(name, goma_rbe, dimensions):
+    if use_goma_rbe(goma_rbe, dimensions):
         properties.setdefault("$build/goma", GOMA_RBE)
     builder = name + "-try"
 
@@ -417,7 +420,7 @@ def dart_builder(name,
                  executable=None,
                  execution_timeout=None,
                  expiration_timeout=None,
-                 goma_rbe=False,
+                 goma_rbe=None,
                  fyi=False,
                  notifies="dart",
                  priority=NORMAL,
@@ -431,7 +434,7 @@ def dart_builder(name,
                  location_regexp=None):
     dimensions = defaults.dimensions(dimensions)
     properties = defaults.properties(properties)
-    if use_goma_rbe(name, goma_rbe, dimensions):
+    if use_goma_rbe(goma_rbe, dimensions):
         properties.setdefault("$build/goma", GOMA_RBE)
 
     def builder(channel, triggered_by):
@@ -444,6 +447,7 @@ def dart_builder(name,
                 on_cq=on_cq,
                 execution_timeout=execution_timeout,
                 experiment_percentage=experiment_percentage,
+                goma_rbe=goma_rbe,
                 location_regexp=location_regexp)
         else:
             builder = name + "-" + channel if channel else name
@@ -693,10 +697,12 @@ dart_vm_nightly_builder(
 dart_vm_extra_builder(
     "vm-kernel-precomp-android-release-arm_x64",
     category="vm|kernel-precomp|android|a32",
+    goma_rbe=False,
     properties={"shard_timeout": (90 * time.minute) / time.second})
 dart_vm_extra_builder(
     "vm-kernel-precomp-android-release-arm64",
     category="vm|kernel-precomp|android|a64",
+    goma_rbe=False,
     properties={"shard_timeout": (90 * time.minute) / time.second})
 
 # vm|product
@@ -719,7 +725,8 @@ dart_vm_low_priority_builder(
 dart_vm_low_priority_builder(
     "vm-kernel-tsan-linux-release-x64", category="vm|misc|t")
 dart_vm_low_priority_builder(
-    "vm-kernel-ubsan-linux-release-x64", category="vm|misc|u")
+    "vm-kernel-ubsan-linux-release-x64", category="vm|misc|u",
+    goma_rbe=False) # ubsan is not compatible with our sysroot.
 dart_vm_low_priority_builder(
     "vm-kernel-precomp-asan-linux-release-x64", category="vm|misc|aot|a")
 dart_vm_low_priority_builder(
@@ -727,7 +734,8 @@ dart_vm_low_priority_builder(
 dart_vm_low_priority_builder(
     "vm-kernel-precomp-tsan-linux-release-x64", category="vm|misc|aot|t")
 dart_vm_low_priority_builder(
-    "vm-kernel-precomp-ubsan-linux-release-x64", category="vm|misc|aot|u")
+    "vm-kernel-precomp-ubsan-linux-release-x64", category="vm|misc|aot|u",
+    goma_rbe=False) # ubsan is not compatible with our sysroot.
 dart_vm_low_priority_builder(
     "vm-kernel-reload-linux-debug-x64", category="vm|misc|reload|d")
 dart_vm_low_priority_builder(
@@ -735,15 +743,22 @@ dart_vm_low_priority_builder(
 dart_vm_low_priority_builder(
     "vm-kernel-reload-rollback-linux-debug-x64", category="vm|misc|reload|drb")
 dart_vm_low_priority_builder(
-    "vm-kernel-reload-rollback-linux-release-x64", category="vm|misc|reload|rrb")
+    "vm-kernel-reload-rollback-linux-release-x64",
+    category="vm|misc|reload|rrb")
 
 # vm|ffi
-dart_vm_extra_builder("vm-ffi-android-debug-arm", category="vm|ffi|d32")
-dart_vm_extra_builder("vm-ffi-android-release-arm", category="vm|ffi|r32")
-dart_vm_extra_builder("vm-ffi-android-product-arm", category="vm|ffi|p32")
-dart_vm_extra_builder("vm-ffi-android-debug-arm64", category="vm|ffi|d64")
-dart_vm_extra_builder("vm-ffi-android-release-arm64", category="vm|ffi|r64")
-dart_vm_extra_builder("vm-ffi-android-product-arm64", category="vm|ffi|p64")
+dart_vm_extra_builder(
+    "vm-ffi-android-debug-arm", category="vm|ffi|d32", goma_rbe=False)
+dart_vm_extra_builder(
+    "vm-ffi-android-release-arm", category="vm|ffi|r32", goma_rbe=False)
+dart_vm_extra_builder(
+    "vm-ffi-android-product-arm", category="vm|ffi|p32", goma_rbe=False)
+dart_vm_extra_builder(
+    "vm-ffi-android-debug-arm64", category="vm|ffi|d64", goma_rbe=False)
+dart_vm_extra_builder(
+    "vm-ffi-android-release-arm64", category="vm|ffi|r64", goma_rbe=False)
+dart_vm_extra_builder(
+    "vm-ffi-android-product-arm64", category="vm|ffi|p64", goma_rbe=False)
 dart_vm_extra_builder(
     "vm-precomp-ffi-qemu-linux-release-arm", category="vm|ffi|qe")
 

From 6235dd66ade59896f0c98622e4a36bd8cb2150c9 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 15 Jun 2020 14:25:28 +0000
Subject: [PATCH 379/826] [infra] Add a presubmit tryjob

For now, it will only be available via "choose tryjobs".

Change-Id: Ie015b882395acb55b0b78a99598c1cb35df0c04b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/151228
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg   |  4 ++++
 cr-buildbucket.cfg | 26 ++++++++++++++++++++++++++
 luci-milo.cfg      |  3 +++
 main.star          |  6 +++++-
 4 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index f187f499d32b..280ff2290197 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -348,6 +348,10 @@ config_groups {
         name: "dart/try/pkg-win-release-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/presubmit-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-canary-linux-debug-try"
         location_regexp: ".+/[+]/DEPS"
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index c54ce3151412..7497466a6734 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -9765,6 +9765,32 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
+    builders {
+      name: "presubmit-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "presubmit/presubmit"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 30
+      execution_timeout_secs: 300
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
     builders {
       name: "vm-canary-linux-debug-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 6dc42b5d6b8b..321dd95c0300 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2762,6 +2762,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-gcc-linux-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/presubmit-try"
+  }
   builder_view_only: true
 }
 consoles {
diff --git a/main.star b/main.star
index 0f7c34762001..90ed47ddf5a7 100755
--- a/main.star
+++ b/main.star
@@ -946,7 +946,11 @@ dart_ci_sandbox_builder(
 # Try only builders
 dart_try_builder("benchmark-linux", on_cq=True)
 dart_try_builder("vm-kernel-gcc-linux")
-
+dart_try_builder(
+    "presubmit",
+    recipe="presubmit/presubmit",
+    execution_timeout=5 * time.minute,
+)
 
 def add_postponed_alt_console_entries():
     for entry in postponed_alt_console_entries:

From 4cddb885031f59bb03fe46e6e48878cc39b0b517 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 15 Jun 2020 15:40:57 +0000
Subject: [PATCH 380/826] [infra] Add a new bucket for the presubmit builder

The buildbucket plugin currently always adds all builders in a bucket to
the choose tryjobs list (https://crbug.com/840461). To work around that,
builders that work in all projects need to go into a different Luci
bucket. This CL adds that bucket (luci.dart.try.shared) and moves the
presubmit builder into the new bucket.

Change-Id: I4e51f8a4be643cdfa6dd00ce0390bb18a5fe78da
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/151232
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg   |  8 +++---
 cr-buildbucket.cfg | 72 +++++++++++++++++++++++++++++-----------------
 luci-milo.cfg      |  2 +-
 main.star          | 21 +++++++-------
 4 files changed, 62 insertions(+), 41 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 280ff2290197..bba40316b94c 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -72,6 +72,10 @@ config_groups {
       url: "https://dart-status.appspot.com"
     }
     tryjob {
+      builders {
+        name: "dart/try.shared/presubmit-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/analyzer-analysis-server-linux-try"
         location_regexp: ".+/[+]/DEPS"
@@ -348,10 +352,6 @@ config_groups {
         name: "dart/try/pkg-win-release-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/presubmit-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-canary-linux-debug-try"
         location_regexp: ".+/[+]/DEPS"
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 7497466a6734..98c98c6258c3 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -9765,32 +9765,6 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
-    builders {
-      name: "presubmit-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "presubmit/presubmit"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 30
-      execution_timeout_secs: 300
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
     builders {
       name: "vm-canary-linux-debug-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -11201,3 +11175,49 @@ buckets {
     }
   }
 }
+buckets {
+  name: "try.shared"
+  acls {
+    group: "all"
+  }
+  acls {
+    role: SCHEDULER
+    group: "project-dart-admins"
+  }
+  acls {
+    role: SCHEDULER
+    group: "project-dart-tryjob-access"
+  }
+  acls {
+    role: SCHEDULER
+    group: "service-account-cq"
+  }
+  swarming {
+    builders {
+      name: "presubmit-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "presubmit/presubmit"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 30
+      execution_timeout_secs: 300
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+  }
+}
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 321dd95c0300..1f4cbceebe48 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2763,7 +2763,7 @@ consoles {
     name: "buildbucket/luci.dart.try/vm-kernel-gcc-linux-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/presubmit-try"
+    name: "buildbucket/luci.dart.try.shared/presubmit-try"
   }
   builder_view_only: true
 }
diff --git a/main.star b/main.star
index 90ed47ddf5a7..08fc1c95354a 100755
--- a/main.star
+++ b/main.star
@@ -230,14 +230,13 @@ luci.bucket(
         acl.entry(acl.BUILDBUCKET_TRIGGERER, users=CI_SANDBOX_TRIGGERERS),
     ],
 )
-luci.bucket(
-    name="try",
-    acls=[
-        acl.entry(
-            acl.BUILDBUCKET_TRIGGERER,
-            groups=["project-dart-tryjob-access", "service-account-cq"]),
-    ],
-)
+TRY_ACLS=[
+    acl.entry(
+        acl.BUILDBUCKET_TRIGGERER,
+        groups=["project-dart-tryjob-access", "service-account-cq"]),
+]
+luci.bucket(name="try", acls=TRY_ACLS) # Tryjobs specific to the Dart SDK repo.
+luci.bucket(name="try.shared", acls=TRY_ACLS) # Tryjobs for all repos.
 
 luci.gitiles_poller(
     name="dart-gitiles-trigger-flutter",
@@ -357,6 +356,7 @@ def use_goma_rbe(goma_rbe, dimensions):
 
 def dart_try_builder(name,
                      recipe="dart/neo",
+                     bucket="try",
                      dimensions=None,
                      execution_timeout=None,
                      experiment_percentage=None,
@@ -376,7 +376,7 @@ def dart_try_builder(name,
     luci.builder(
         name=builder,
         build_numbers=True,
-        bucket="try",
+        bucket=bucket,
         caches=[swarming.cache("browsers")],
         dimensions=dimensions,
         executable=dart_recipe(recipe),
@@ -948,8 +948,9 @@ dart_try_builder("benchmark-linux", on_cq=True)
 dart_try_builder("vm-kernel-gcc-linux")
 dart_try_builder(
     "presubmit",
-    recipe="presubmit/presubmit",
+    bucket="try.shared",
     execution_timeout=5 * time.minute,
+    recipe="presubmit/presubmit",
 )
 
 def add_postponed_alt_console_entries():

From 65b2294412f7f42f7fd629afa5c76e50218c2a1d Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 15 Jun 2020 22:37:05 +0000
Subject: [PATCH 381/826] [infra] Add presubmit verifier to the infra/config
 and recipes CQ groups

This enables the presubmit-try builder for CQ runs in SDK's infra/config
branch as well as in the recipes repo.

disable_reuse means that a dry run will not be "re-used" when voting
CQ+2 even if the build is less than 24h old.

Change-Id: I9c48a48944956a849db82fe8251c9cd828043367
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/151238
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 commit-queue.cfg | 14 ++++++++++++++
 main.star        | 12 ++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index bba40316b94c..004f062ec96a 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -48,6 +48,13 @@ config_groups {
     tree_status {
       url: "https://dart-status.appspot.com"
     }
+    tryjob {
+      builders {
+        name: "dart/try.shared/presubmit-try"
+        disable_reuse: true
+      }
+      retry_config {}
+    }
   }
 }
 config_groups {
@@ -641,5 +648,12 @@ config_groups {
     tree_status {
       url: "https://dart-status.appspot.com"
     }
+    tryjob {
+      builders {
+        name: "dart/try.shared/presubmit-try"
+        disable_reuse: true
+      }
+      retry_config {}
+    }
   }
 }
diff --git a/main.star b/main.star
index 08fc1c95354a..67089ef05579 100755
--- a/main.star
+++ b/main.star
@@ -301,6 +301,14 @@ luci.cq(
     submit_burst_delay=8 * time.minute,
 )
 
+def default_verifiers():
+    return [
+        luci.cq_tryjob_verifier(
+            builder='presubmit-try',
+            disable_reuse=True,
+        ),
+    ]
+
 luci.cq_group(
     name="sdk",
     watch=cq.refset(
@@ -317,7 +325,7 @@ luci.cq_group(
     allow_submit_with_open_deps=True,
     tree_status_host="dart-status.appspot.com",
     retry_config=cq.RETRY_NONE,
-    verifiers=None,
+    verifiers=default_verifiers(),
 )
 
 luci.cq_group(
@@ -327,7 +335,7 @@ luci.cq_group(
     allow_submit_with_open_deps=True,
     tree_status_host="dart-status.appspot.com",
     retry_config=cq.RETRY_NONE,
-    verifiers=None,
+    verifiers=default_verifiers(),
 )
 
 luci.cq_group(

From ce6a768f9f31c9def28778a248f8e998b0e0da03 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 17 Jun 2020 08:46:59 +0000
Subject: [PATCH 382/826] [infra] Re-enable new goma backend on android
 builders

We're now using the sysroot for the build actions that run with the
host toolchain.

Also disables the new backend on gcc, which is not supported by our
sysroots.

b/144018396

Change-Id: I843eb8195ecccc5f0fcb7f57e1d1e336218f6ac7
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/151503
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 41 ++++++++++++++++++++++++++++++++++++++++-
 main.star          | 23 ++++++++---------------
 2 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 98c98c6258c3..6f049966d494 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -4643,6 +4643,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4667,6 +4668,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4691,6 +4693,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4715,6 +4718,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4739,6 +4743,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4763,6 +4768,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4787,6 +4793,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4811,6 +4818,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4835,6 +4843,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4859,6 +4868,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4883,6 +4893,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4907,6 +4918,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4931,6 +4943,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4955,6 +4968,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4979,6 +4993,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5003,6 +5018,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5027,6 +5043,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5051,6 +5068,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5075,6 +5093,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5099,6 +5118,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5123,6 +5143,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5147,6 +5168,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5171,6 +5193,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5195,6 +5218,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6611,6 +6635,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6636,6 +6661,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6661,6 +6687,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6686,6 +6713,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6711,6 +6739,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6736,6 +6765,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6761,6 +6791,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6786,6 +6817,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9877,6 +9909,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9901,6 +9934,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9925,6 +9959,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9949,6 +9984,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9973,6 +10009,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9997,6 +10034,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10071,7 +10109,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10468,6 +10505,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10493,6 +10531,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
diff --git a/main.star b/main.star
index 67089ef05579..30aebbf31a6f 100755
--- a/main.star
+++ b/main.star
@@ -705,12 +705,10 @@ dart_vm_nightly_builder(
 dart_vm_extra_builder(
     "vm-kernel-precomp-android-release-arm_x64",
     category="vm|kernel-precomp|android|a32",
-    goma_rbe=False,
     properties={"shard_timeout": (90 * time.minute) / time.second})
 dart_vm_extra_builder(
     "vm-kernel-precomp-android-release-arm64",
     category="vm|kernel-precomp|android|a64",
-    goma_rbe=False,
     properties={"shard_timeout": (90 * time.minute) / time.second})
 
 # vm|product
@@ -755,18 +753,12 @@ dart_vm_low_priority_builder(
     category="vm|misc|reload|rrb")
 
 # vm|ffi
-dart_vm_extra_builder(
-    "vm-ffi-android-debug-arm", category="vm|ffi|d32", goma_rbe=False)
-dart_vm_extra_builder(
-    "vm-ffi-android-release-arm", category="vm|ffi|r32", goma_rbe=False)
-dart_vm_extra_builder(
-    "vm-ffi-android-product-arm", category="vm|ffi|p32", goma_rbe=False)
-dart_vm_extra_builder(
-    "vm-ffi-android-debug-arm64", category="vm|ffi|d64", goma_rbe=False)
-dart_vm_extra_builder(
-    "vm-ffi-android-release-arm64", category="vm|ffi|r64", goma_rbe=False)
-dart_vm_extra_builder(
-    "vm-ffi-android-product-arm64", category="vm|ffi|p64", goma_rbe=False)
+dart_vm_extra_builder("vm-ffi-android-debug-arm", category="vm|ffi|d32")
+dart_vm_extra_builder("vm-ffi-android-release-arm", category="vm|ffi|r32")
+dart_vm_extra_builder("vm-ffi-android-product-arm", category="vm|ffi|p32")
+dart_vm_extra_builder("vm-ffi-android-debug-arm64", category="vm|ffi|d64")
+dart_vm_extra_builder("vm-ffi-android-release-arm64", category="vm|ffi|r64")
+dart_vm_extra_builder("vm-ffi-android-product-arm64", category="vm|ffi|p64")
 dart_vm_extra_builder(
     "vm-precomp-ffi-qemu-linux-release-arm", category="vm|ffi|qe")
 
@@ -953,7 +945,8 @@ dart_ci_sandbox_builder(
 
 # Try only builders
 dart_try_builder("benchmark-linux", on_cq=True)
-dart_try_builder("vm-kernel-gcc-linux")
+# Our sysroot does not support gcc, we can't use goma on RBE for this builder
+dart_try_builder("vm-kernel-gcc-linux", goma_rbe=False)
 dart_try_builder(
     "presubmit",
     bucket="try.shared",

From ae7128a168dc9c47f24cddedf69c559b9f1096ed Mon Sep 17 00:00:00 2001
From: Oliver Newman <olivernewman@google.com>
Date: Wed, 17 Jun 2020 19:56:41 +0000
Subject: [PATCH 383/826] [infra] Update recipe_autoroller CIPD package

This version includes http://crrev.com/c/2247497, which causes the
recipe roller to respect the new no_cc_authors recipes.cfg field so it
won't spammily CC authors of rolled recipe changes.

Fuchsia recipe contributors have been getting a lot of emails about
changes being rolled into Dart recipes, so the fuchsia recipes now have
no_cc_authors set to true.

Change-Id: I052e112975dc2f3ada436208634495e53591fabb
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/151641
Auto-Submit: Oliver Newman <olivernewman@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 2 +-
 main.star          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 6f049966d494..f44056370da7 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -632,7 +632,7 @@ buckets {
       recipe {
         name: "recipe_autoroller"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
-        cipd_version: "git_revision:647d5e58ec508f13ccd054f1516e78d7ca3bd540"
+        cipd_version: "git_revision:83c4abf53a0e73ca8b659766fbb0f7d46b05bd16"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
diff --git a/main.star b/main.star
index 30aebbf31a6f..368ebad36112 100755
--- a/main.star
+++ b/main.star
@@ -990,7 +990,7 @@ dart_infra_builder(
         name="recipe_autoroller",
         cipd_package=
         "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
-        cipd_version="git_revision:647d5e58ec508f13ccd054f1516e78d7ca3bd540"
+        cipd_version="git_revision:83c4abf53a0e73ca8b659766fbb0f7d46b05bd16"
     ),
     execution_timeout=20 * time.minute,
     expiration_timeout=time.day,

From a0b80aa4cd4e336bd105ab373785d74eefda015c Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 22 Jun 2020 07:47:33 +0000
Subject: [PATCH 384/826] [infra] Temporarily remove gclient-try from the
 default CQ

https://crbug.com/1097668

Change-Id: I6668bde1eed127360e74db70ca7d65571ccb902c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/151846
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: Karl Klose <karlklose@google.com>
Commit-Queue: Karl Klose <karlklose@google.com>
---
 commit-queue.cfg | 1 +
 main.star        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 004f062ec96a..4df4ba5b3854 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -343,6 +343,7 @@ config_groups {
       }
       builders {
         name: "dart/try/gclient-try"
+        includable_only: true
       }
       builders {
         name: "dart/try/pkg-linux-debug-try"
diff --git a/main.star b/main.star
index 368ebad36112..cc5d5cec2b47 100755
--- a/main.star
+++ b/main.star
@@ -890,7 +890,7 @@ dart_ci_sandbox_builder("ddk-linux-release-firefox", category="ddc|fl")
 
 # misc
 dart_ci_sandbox_builder(
-    "gclient", recipe="dart/gclient", category="misc|g", on_cq=True)
+    "gclient", recipe="dart/gclient", category="misc|g")
 dart_ci_builder(
     "debianpackage-linux",
     category="misc|dp",

From ca831a66cd92ee4dc9621866575b536cd10557f1 Mon Sep 17 00:00:00 2001
From: Oliver Newman <olivernewman@google.com>
Date: Tue, 23 Jun 2020 17:29:11 +0000
Subject: [PATCH 385/826] [infra] Update recipe-deps-roller CIPD package

This version includes http://crrev.com/c/2256318, which is a reland of a
reverted CL that makes it safe to call recipes.py dump_specs in repos
where the command isn't supported yet.

Bug: http://fxbug.dev/54380
Change-Id: Ic02cbb4a196bd8894c9ced90b75e9ca514032a5f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/152061
Reviewed-by: William Hesse <whesse@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
Auto-Submit: Oliver Newman <olivernewman@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 2 +-
 main.star          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index f44056370da7..ba6f1be29654 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -632,7 +632,7 @@ buckets {
       recipe {
         name: "recipe_autoroller"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
-        cipd_version: "git_revision:83c4abf53a0e73ca8b659766fbb0f7d46b05bd16"
+        cipd_version: "git_revision:905c1df843d7771bf3adc0cf21f58eb9498ff063"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
diff --git a/main.star b/main.star
index cc5d5cec2b47..ccecc54593e7 100755
--- a/main.star
+++ b/main.star
@@ -990,7 +990,7 @@ dart_infra_builder(
         name="recipe_autoroller",
         cipd_package=
         "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
-        cipd_version="git_revision:83c4abf53a0e73ca8b659766fbb0f7d46b05bd16"
+        cipd_version="git_revision:905c1df843d7771bf3adc0cf21f58eb9498ff063"
     ),
     execution_timeout=20 * time.minute,
     expiration_timeout=time.day,

From e59513f1b01477d258c1bf06acdffb418015bb5c Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 25 Jun 2020 12:58:38 +0000
Subject: [PATCH 386/826] [infra] Add VM Fuchsia builder to the Luci
 configuration

Change-Id: Ide0a1c6910a29af30812431740706121933a1b50
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/152325
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 commit-queue.cfg   |  4 ++++
 cr-buildbucket.cfg | 51 ++++++++++++++++++++++++++++++++++++++++++++++
 luci-milo.cfg      | 13 ++++++++++++
 luci-notify.cfg    | 14 +++++++++++++
 luci-scheduler.cfg | 11 ++++++++++
 main.star          |  1 +
 6 files changed, 94 insertions(+)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 4df4ba5b3854..7b28bbd98b3a 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -410,6 +410,10 @@ config_groups {
         name: "dart/try/vm-ffi-android-release-arm64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-fuchsia-release-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-asan-linux-release-x64-try"
         includable_only: true
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index ba6f1be29654..c1dc2b9bcbeb 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -5231,6 +5231,32 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
+    builders {
+      name: "vm-fuchsia-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 70
+      expiration_secs: 86400
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
     builders {
       name: "vm-kernel-asan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10047,6 +10073,31 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
+    builders {
+      name: "vm-fuchsia-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
     builders {
       name: "vm-kernel-asan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 1f4cbceebe48..d74501b96471 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -310,6 +310,11 @@ consoles {
     category: "vm|misc|reload"
     short_name: "rrb"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-fuchsia-release-x64"
+    category: "vm|misc"
+    short_name: "f"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
     category: "vm|ffi"
@@ -1027,6 +1032,11 @@ consoles {
     category: "vm|misc|reload"
     short_name: "rrb"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-fuchsia-release-x64"
+    category: "vm|misc"
+    short_name: "f"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
     category: "vm|ffi"
@@ -2642,6 +2652,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-reload-rollback-linux-release-x64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-fuchsia-release-x64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm-try"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 540d285191d7..a1fcae19ad62 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -845,6 +845,20 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-fuchsia-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index a4c473cdc352..0ee37b4c8a90 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -2078,6 +2078,16 @@ job {
     builder: "vm-ffi-android-release-arm64-stable"
   }
 }
+job {
+  id: "vm-fuchsia-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-fuchsia-release-x64"
+  }
+}
 job {
   id: "vm-kernel-asan-linux-release-x64"
   schedule: "triggered"
@@ -3861,6 +3871,7 @@ trigger {
   triggers: "vm-ffi-android-product-arm64"
   triggers: "vm-ffi-android-release-arm"
   triggers: "vm-ffi-android-release-arm64"
+  triggers: "vm-fuchsia-release-x64"
   triggers: "vm-kernel-asan-linux-release-x64"
   triggers: "vm-kernel-checked-linux-release-x64"
   triggers: "vm-kernel-linux-debug-ia32"
diff --git a/main.star b/main.star
index ccecc54593e7..0cfd2a781041 100755
--- a/main.star
+++ b/main.star
@@ -751,6 +751,7 @@ dart_vm_low_priority_builder(
 dart_vm_low_priority_builder(
     "vm-kernel-reload-rollback-linux-release-x64",
     category="vm|misc|reload|rrb")
+dart_vm_low_priority_builder("vm-fuchsia-release-x64", category="vm|misc|f")
 
 # vm|ffi
 dart_vm_extra_builder("vm-ffi-android-debug-arm", category="vm|ffi|d32")

From 9f4cfc5638f29975c82820b51f40760ea5a2bf79 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 25 Jun 2020 15:31:21 +0000
Subject: [PATCH 387/826] [infra] Format main.star

Change-Id: Ic5ee24df358c3cee5d7fc67a898dc438098ef2e4
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/152501
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 main.star | 657 ++++++++++++++++++++++++++----------------------------
 1 file changed, 322 insertions(+), 335 deletions(-)

diff --git a/main.star b/main.star
index 0cfd2a781041..31505a37bf99 100755
--- a/main.star
+++ b/main.star
@@ -230,13 +230,12 @@ luci.bucket(
         acl.entry(acl.BUILDBUCKET_TRIGGERER, users=CI_SANDBOX_TRIGGERERS),
     ],
 )
-TRY_ACLS=[
-    acl.entry(
-        acl.BUILDBUCKET_TRIGGERER,
-        groups=["project-dart-tryjob-access", "service-account-cq"]),
+TRY_ACLS = [
+    acl.entry(acl.BUILDBUCKET_TRIGGERER,
+              groups=["project-dart-tryjob-access", "service-account-cq"]),
 ]
-luci.bucket(name="try", acls=TRY_ACLS) # Tryjobs specific to the Dart SDK repo.
-luci.bucket(name="try.shared", acls=TRY_ACLS) # Tryjobs for all repos.
+luci.bucket(name="try", acls=TRY_ACLS)  # Tryjobs specific to the Dart SDK repo.
+luci.bucket(name="try.shared", acls=TRY_ACLS)  # Tryjobs for all repos.
 
 luci.gitiles_poller(
     name="dart-gitiles-trigger-flutter",
@@ -274,33 +273,32 @@ luci.gitiles_poller(
     refs=["refs/heads/master"],
 )
 
-luci.notifier(
-    name="infra",
-    on_new_failure=True,
-    notify_emails=[
-        "athom@google.com", "sortie@google.com", "whesse@google.com"
-    ])
+luci.notifier(name="infra",
+              on_new_failure=True,
+              notify_emails=[
+                  "athom@google.com", "sortie@google.com", "whesse@google.com"
+              ])
 
-luci.notifier(
-    name="dart",
-    on_new_failure=True,
-    notify_emails=["athom@google.com"],
-    notify_blamelist=True)
+luci.notifier(name="dart",
+              on_new_failure=True,
+              notify_emails=["athom@google.com"],
+              notify_blamelist=True)
 
-luci.notifier(
-    name="dart-fuzz-testing",
-    on_success=True,
-    on_failure=True,
-    notify_emails=["ajcbik@google.com", "athom@google.com"])
+luci.notifier(name="dart-fuzz-testing",
+              on_success=True,
+              on_failure=True,
+              notify_emails=["ajcbik@google.com", "athom@google.com"])
 
-luci.notifier(
-    name="frontend-team", on_failure=True, notify_emails=["jensj@google.com"])
+luci.notifier(name="frontend-team",
+              on_failure=True,
+              notify_emails=["jensj@google.com"])
 
 luci.cq(
     submit_max_burst=2,
     submit_burst_delay=8 * time.minute,
 )
 
+
 def default_verifiers():
     return [
         luci.cq_tryjob_verifier(
@@ -309,10 +307,11 @@ def default_verifiers():
         ),
     ]
 
+
 luci.cq_group(
     name="sdk",
-    watch=cq.refset(
-        DART_GERRIT + "sdk", refs=["refs/heads/%s" % branch for branch in BRANCHES]),
+    watch=cq.refset(DART_GERRIT + "sdk",
+                    refs=["refs/heads/%s" % branch for branch in BRANCHES]),
     allow_submit_with_open_deps=True,
     tree_status_host="dart-status.appspot.com",
     retry_config=cq.RETRY_NONE,
@@ -330,8 +329,7 @@ luci.cq_group(
 
 luci.cq_group(
     name="recipes",
-    watch=cq.refset(
-        DART_GERRIT + "recipes", refs=["refs/heads/master"]),
+    watch=cq.refset(DART_GERRIT + "recipes", refs=["refs/heads/master"]),
     allow_submit_with_open_deps=True,
     tree_status_host="dart-status.appspot.com",
     retry_config=cq.RETRY_NONE,
@@ -340,8 +338,7 @@ luci.cq_group(
 
 luci.cq_group(
     name="dart_ci",
-    watch=cq.refset(
-        DART_GERRIT + "dart_ci", refs=["refs/heads/master"]),
+    watch=cq.refset(DART_GERRIT + "dart_ci", refs=["refs/heads/master"]),
     allow_submit_with_open_deps=True,
     tree_status_host="dart-status.appspot.com",
     retry_config=cq.RETRY_NONE,
@@ -396,12 +393,11 @@ def dart_try_builder(name,
     )
     includable_only = (not on_cq and not experiment_percentage and
                        not location_regexp)
-    luci.cq_tryjob_verifier(
-        builder=builder,
-        cq_group="sdk",
-        experiment_percentage=experiment_percentage,
-        location_regexp=location_regexp,
-        includable_only=includable_only)
+    luci.cq_tryjob_verifier(builder=builder,
+                            cq_group="sdk",
+                            experiment_percentage=experiment_percentage,
+                            location_regexp=location_regexp,
+                            includable_only=includable_only)
     luci.list_view_entry(list_view="cq", builder=builder)
 
 
@@ -447,16 +443,15 @@ def dart_builder(name,
 
     def builder(channel, triggered_by):
         if channel == "try":
-            dart_try_builder(
-                name,
-                recipe=recipe,
-                dimensions=dimensions,
-                properties=properties,
-                on_cq=on_cq,
-                execution_timeout=execution_timeout,
-                experiment_percentage=experiment_percentage,
-                goma_rbe=goma_rbe,
-                location_regexp=location_regexp)
+            dart_try_builder(name,
+                             recipe=recipe,
+                             dimensions=dimensions,
+                             properties=properties,
+                             on_cq=on_cq,
+                             execution_timeout=execution_timeout,
+                             experiment_percentage=experiment_percentage,
+                             goma_rbe=goma_rbe,
+                             location_regexp=location_regexp)
         else:
             builder = name + "-" + channel if channel else name
             branch = channel if channel else "master"
@@ -470,24 +465,23 @@ def dart_builder(name,
                         trigger.replace("dart-vm-", "dart-")
                         for trigger in triggered_by
                     ]
-            luci.builder(
-                name=builder,
-                build_numbers=True,
-                bucket=bucket,
-                caches=[swarming.cache("browsers")],
-                dimensions=dimensions,
-                executable=executable or dart_recipe(recipe),
-                execution_timeout=execution_timeout,
-                expiration_timeout=expiration_timeout,
-                priority=priority,
-                properties=properties,
-                notifies=[notifies]
-                if notifies and not channel and enabled else None,
-                schedule=schedule if enabled else None,
-                service_account=service_account,
-                swarming_tags=["vpython:native-python-wrapper"],
-                triggered_by=triggered_by if enabled else None,
-                triggering_policy=triggering_policy)
+            luci.builder(name=builder,
+                         build_numbers=True,
+                         bucket=bucket,
+                         caches=[swarming.cache("browsers")],
+                         dimensions=dimensions,
+                         executable=executable or dart_recipe(recipe),
+                         execution_timeout=execution_timeout,
+                         expiration_timeout=expiration_timeout,
+                         priority=priority,
+                         properties=properties,
+                         notifies=[notifies]
+                         if notifies and not channel and enabled else None,
+                         schedule=schedule if enabled else None,
+                         service_account=service_account,
+                         swarming_tags=["vpython:native-python-wrapper"],
+                         triggered_by=triggered_by if enabled else None,
+                         triggering_policy=triggering_policy)
             if category:
                 console_category, _, short_name = category.rpartition("|")
                 toplevel_category, _, _ = console_category.partition("|")
@@ -521,26 +515,26 @@ def dart_builder(name,
 
 def dart_ci_builder(name, dimensions={}, **kwargs):
     dimensions.setdefault("pool", "luci.dart.ci")
-    dart_builder(
-        name,
-        bucket="ci",
-        dimensions=dimensions,
-        service_account=CI_ACCOUNT,
-        **kwargs)
+    dart_builder(name,
+                 bucket="ci",
+                 dimensions=dimensions,
+                 service_account=CI_ACCOUNT,
+                 **kwargs)
 
 
 def dart_ci_sandbox_builder(name, channels=CHANNELS, **kwargs):
-    dart_builder(
-        name,
-        bucket="ci.sandbox",
-        channels=channels,
-        service_account=TRY_ACCOUNT,
-        **kwargs)
+    dart_builder(name,
+                 bucket="ci.sandbox",
+                 channels=channels,
+                 service_account=TRY_ACCOUNT,
+                 **kwargs)
 
 
 def dart_infra_builder(name, notifies="infra", triggered_by=None, **kwargs):
-    dart_ci_builder(
-        name, notifies=notifies, triggered_by=triggered_by, **kwargs)
+    dart_ci_builder(name,
+                    notifies=notifies,
+                    triggered_by=triggered_by,
+                    **kwargs)
     luci.list_view_entry(list_view="infra", builder=name)
 
 
@@ -549,17 +543,19 @@ def dart_vm_extra_builder(name, on_cq=False, location_regexp=None, **kwargs):
     if on_cq and not location_regexp:
         location_regexp = to_location_regexp(VM_PATHS)
         on_cq = False
-    dart_ci_sandbox_builder(
-        name,
-        triggered_by=triggered_by,
-        on_cq=on_cq,
-        location_regexp=location_regexp,
-        **kwargs)
+    dart_ci_sandbox_builder(name,
+                            triggered_by=triggered_by,
+                            on_cq=on_cq,
+                            location_regexp=location_regexp,
+                            **kwargs)
 
 
 def dart_vm_low_priority_builder(name, **kwargs):
-    dart_vm_extra_builder(
-        name, channels=["try"], priority=LOW, expiration_timeout=time.day, **kwargs)
+    dart_vm_extra_builder(name,
+                          channels=["try"],
+                          priority=LOW,
+                          expiration_timeout=time.day,
+                          **kwargs)
 
 
 nightly_builders = []
@@ -578,21 +574,22 @@ def dart_vm_nightly_builder(name, **kwargs):
 
 
 # cfe
-dart_ci_sandbox_builder(
-    "front-end-linux-release-x64", category="cfe|l", on_cq=True)
-dart_ci_sandbox_builder(
-    "front-end-mac-release-x64", category="cfe|m", dimensions=mac())
-dart_ci_sandbox_builder(
-    "front-end-win-release-x64", category="cfe|w", dimensions=windows())
-dart_ci_sandbox_builder(
-    "front-end-nnbd-linux-release-x64",
-    category="cfe|nn",
-    location_regexp=to_location_regexp(CFE_PATHS))
-dart_ci_sandbox_builder(
-    "flutter-frontend",
-    category="cfe|fl",
-    channels=["try"],
-    notifies="frontend-team")
+dart_ci_sandbox_builder("front-end-linux-release-x64",
+                        category="cfe|l",
+                        on_cq=True)
+dart_ci_sandbox_builder("front-end-mac-release-x64",
+                        category="cfe|m",
+                        dimensions=mac())
+dart_ci_sandbox_builder("front-end-win-release-x64",
+                        category="cfe|w",
+                        dimensions=windows())
+dart_ci_sandbox_builder("front-end-nnbd-linux-release-x64",
+                        category="cfe|nn",
+                        location_regexp=to_location_regexp(CFE_PATHS))
+dart_ci_sandbox_builder("flutter-frontend",
+                        category="cfe|fl",
+                        channels=["try"],
+                        notifies="frontend-team")
 
 # flutter
 dart_ci_sandbox_builder(
@@ -605,60 +602,66 @@ dart_ci_sandbox_builder(
 )
 
 # vm|nnbd
-dart_vm_extra_builder(
-    "vm-kernel-nnbd-linux-debug-x64", category="vm|nnbd|d", on_cq=True)
-dart_vm_extra_builder(
-    "vm-kernel-nnbd-linux-release-x64", category="vm|nnbd|r", on_cq=True)
-dart_vm_extra_builder(
-    "vm-kernel-precomp-nnbd-linux-release-x64", category="vm|nnbd|pr")
+dart_vm_extra_builder("vm-kernel-nnbd-linux-debug-x64",
+                      category="vm|nnbd|d",
+                      on_cq=True)
+dart_vm_extra_builder("vm-kernel-nnbd-linux-release-x64",
+                      category="vm|nnbd|r",
+                      on_cq=True)
+dart_vm_extra_builder("vm-kernel-precomp-nnbd-linux-release-x64",
+                      category="vm|nnbd|pr")
 
 # vm|app-kernel
-dart_vm_extra_builder(
-    "app-kernel-linux-debug-x64", category="vm|app-kernel|d64")
-dart_vm_extra_builder(
-    "app-kernel-linux-product-x64", category="vm|app-kernel|p64")
-dart_vm_extra_builder(
-    "app-kernel-linux-release-x64", category="vm|app-kernel|r64")
+dart_vm_extra_builder("app-kernel-linux-debug-x64",
+                      category="vm|app-kernel|d64")
+dart_vm_extra_builder("app-kernel-linux-product-x64",
+                      category="vm|app-kernel|p64")
+dart_vm_extra_builder("app-kernel-linux-release-x64",
+                      category="vm|app-kernel|r64")
 
 # vm|dartkb
-dart_vm_extra_builder(
-    "vm-dartkb-linux-release-simarm64", category="vm|dartkb|sr")
+dart_vm_extra_builder("vm-dartkb-linux-release-simarm64",
+                      category="vm|dartkb|sr")
 dart_vm_extra_builder("vm-dartkb-linux-release-x64", category="vm|dartkb|r")
-dart_vm_extra_builder(
-    "vm-dartkb-linux-release-x64-abi", category="vm|dartkb|abi")
+dart_vm_extra_builder("vm-dartkb-linux-release-x64-abi",
+                      category="vm|dartkb|abi")
 
 #vm|kernel
-dart_vm_extra_builder(
-    "vm-canary-linux-debug", category="vm|kernel|c", on_cq=True)
+dart_vm_extra_builder("vm-canary-linux-debug",
+                      category="vm|kernel|c",
+                      on_cq=True)
 dart_ci_sandbox_builder("vm-kernel-linux-debug-x64", category="vm|kernel|d")
-dart_vm_extra_builder(
-    "vm-kernel-linux-release-simarm", category="vm|kernel|a32")
-dart_vm_extra_builder(
-    "vm-kernel-linux-release-simarm64", category="vm|kernel|a64")
+dart_vm_extra_builder("vm-kernel-linux-release-simarm",
+                      category="vm|kernel|a32")
+dart_vm_extra_builder("vm-kernel-linux-release-simarm64",
+                      category="vm|kernel|a64")
 dart_vm_extra_builder("vm-kernel-linux-release-ia32", category="vm|kernel|r32")
-dart_ci_sandbox_builder(
-    "vm-kernel-linux-release-x64", category="vm|kernel|r", on_cq=True)
-dart_vm_extra_builder(
-    "vm-kernel-checked-linux-release-x64", category="vm|kernel|rc")
+dart_ci_sandbox_builder("vm-kernel-linux-release-x64",
+                        category="vm|kernel|r",
+                        on_cq=True)
+dart_vm_extra_builder("vm-kernel-checked-linux-release-x64",
+                      category="vm|kernel|rc")
 dart_vm_extra_builder("vm-kernel-linux-debug-ia32", category="vm|kernel|d32")
-dart_ci_sandbox_builder(
-    "vm-kernel-mac-debug-x64", category="vm|kernel|md", dimensions=mac())
-dart_ci_sandbox_builder(
-    "vm-kernel-mac-release-x64",
-    category="vm|kernel|mr",
-    dimensions=mac(),
-    on_cq=True,
-    experiment_percentage=5)
-dart_vm_extra_builder(
-    "vm-kernel-win-debug-ia32", category="vm|kernel|wd3", dimensions=windows())
-dart_ci_sandbox_builder(
-    "vm-kernel-win-debug-x64", category="vm|kernel|wd", dimensions=windows())
-dart_vm_extra_builder(
-    "vm-kernel-win-release-ia32",
-    category="vm|kernel|wr3",
-    dimensions=windows())
-dart_ci_sandbox_builder(
-    "vm-kernel-win-release-x64", category="vm|kernel|wr", dimensions=windows())
+dart_ci_sandbox_builder("vm-kernel-mac-debug-x64",
+                        category="vm|kernel|md",
+                        dimensions=mac())
+dart_ci_sandbox_builder("vm-kernel-mac-release-x64",
+                        category="vm|kernel|mr",
+                        dimensions=mac(),
+                        on_cq=True,
+                        experiment_percentage=5)
+dart_vm_extra_builder("vm-kernel-win-debug-ia32",
+                      category="vm|kernel|wd3",
+                      dimensions=windows())
+dart_ci_sandbox_builder("vm-kernel-win-debug-x64",
+                        category="vm|kernel|wd",
+                        dimensions=windows())
+dart_vm_extra_builder("vm-kernel-win-release-ia32",
+                      category="vm|kernel|wr3",
+                      dimensions=windows())
+dart_ci_sandbox_builder("vm-kernel-win-release-x64",
+                        category="vm|kernel|wr",
+                        dimensions=windows())
 dart_vm_extra_builder(
     "cross-vm-linux-release-arm64",
     category="vm|kernel|cra",
@@ -666,35 +669,30 @@ dart_vm_extra_builder(
     properties={"shard_timeout": (90 * time.minute) / time.second})
 
 # vm|kernel-precomp
-dart_vm_extra_builder(
-    "vm-kernel-precomp-linux-debug-x64", category="vm|kernel-precomp|d")
-dart_vm_extra_builder(
-    "vm-kernel-precomp-linux-product-x64", category="vm|kernel-precomp|p")
-dart_vm_extra_builder(
-    "vm-kernel-precomp-linux-release-simarm", category="vm|kernel-precomp|a32")
-dart_vm_extra_builder(
-    "vm-kernel-precomp-linux-release-simarm64",
-    category="vm|kernel-precomp|a64")
-dart_vm_extra_builder(
-    "vm-kernel-precomp-linux-release-x64", category="vm|kernel-precomp|r")
-dart_vm_extra_builder(
-    "vm-kernel-precomp-obfuscate-linux-release-x64",
-    category="vm|kernel-precomp|o")
+dart_vm_extra_builder("vm-kernel-precomp-linux-debug-x64",
+                      category="vm|kernel-precomp|d")
+dart_vm_extra_builder("vm-kernel-precomp-linux-product-x64",
+                      category="vm|kernel-precomp|p")
+dart_vm_extra_builder("vm-kernel-precomp-linux-release-simarm",
+                      category="vm|kernel-precomp|a32")
+dart_vm_extra_builder("vm-kernel-precomp-linux-release-simarm64",
+                      category="vm|kernel-precomp|a64")
+dart_vm_extra_builder("vm-kernel-precomp-linux-release-x64",
+                      category="vm|kernel-precomp|r")
+dart_vm_extra_builder("vm-kernel-precomp-obfuscate-linux-release-x64",
+                      category="vm|kernel-precomp|o")
 dart_vm_extra_builder(
     "vm-kernel-precomp-linux-debug-simarm_x64",
     category="vm|kernel-precomp|adx",
     properties={"shard_timeout": (90 * time.minute) / time.second})
-dart_vm_extra_builder(
-    "vm-kernel-precomp-linux-release-simarm_x64",
-    category="vm|kernel-precomp|arx")
-dart_vm_extra_builder(
-    "vm-kernel-precomp-mac-release-simarm64",
-    category="vm|kernel-precomp|ma",
-    dimensions=mac())
-dart_vm_extra_builder(
-    "vm-kernel-precomp-win-release-x64",
-    category="vm|kernel-precomp|wr",
-    dimensions=windows())
+dart_vm_extra_builder("vm-kernel-precomp-linux-release-simarm_x64",
+                      category="vm|kernel-precomp|arx")
+dart_vm_extra_builder("vm-kernel-precomp-mac-release-simarm64",
+                      category="vm|kernel-precomp|ma",
+                      dimensions=mac())
+dart_vm_extra_builder("vm-kernel-precomp-win-release-x64",
+                      category="vm|kernel-precomp|wr",
+                      dimensions=windows())
 dart_vm_nightly_builder(
     "cross-vm-precomp-linux-release-arm64",
     category="vm|kernel-precomp|cra",
@@ -712,45 +710,48 @@ dart_vm_extra_builder(
     properties={"shard_timeout": (90 * time.minute) / time.second})
 
 # vm|product
-dart_vm_extra_builder(
-    "vm-kernel-linux-product-x64", category="vm|product|l", on_cq=True)
-dart_ci_sandbox_builder(
-    "vm-kernel-mac-product-x64", category="vm|product|m", dimensions=mac())
-dart_ci_sandbox_builder(
-    "vm-kernel-win-product-x64", category="vm|product|w", dimensions=windows())
+dart_vm_extra_builder("vm-kernel-linux-product-x64",
+                      category="vm|product|l",
+                      on_cq=True)
+dart_ci_sandbox_builder("vm-kernel-mac-product-x64",
+                        category="vm|product|m",
+                        dimensions=mac())
+dart_ci_sandbox_builder("vm-kernel-win-product-x64",
+                        category="vm|product|w",
+                        dimensions=windows())
 
 # vm|misc
 dart_vm_low_priority_builder(
     "vm-kernel-optcounter-threshold-linux-release-ia32", category="vm|misc|o32")
-dart_vm_low_priority_builder(
-    "vm-kernel-optcounter-threshold-linux-release-x64", category="vm|misc|o64")
-dart_vm_low_priority_builder(
-    "vm-kernel-asan-linux-release-x64", category="vm|misc|a")
-dart_vm_low_priority_builder(
-    "vm-kernel-msan-linux-release-x64", category="vm|misc|m")
-dart_vm_low_priority_builder(
-    "vm-kernel-tsan-linux-release-x64", category="vm|misc|t")
+dart_vm_low_priority_builder("vm-kernel-optcounter-threshold-linux-release-x64",
+                             category="vm|misc|o64")
+dart_vm_low_priority_builder("vm-kernel-asan-linux-release-x64",
+                             category="vm|misc|a")
+dart_vm_low_priority_builder("vm-kernel-msan-linux-release-x64",
+                             category="vm|misc|m")
+dart_vm_low_priority_builder("vm-kernel-tsan-linux-release-x64",
+                             category="vm|misc|t")
 dart_vm_low_priority_builder(
     "vm-kernel-ubsan-linux-release-x64", category="vm|misc|u",
-    goma_rbe=False) # ubsan is not compatible with our sysroot.
-dart_vm_low_priority_builder(
-    "vm-kernel-precomp-asan-linux-release-x64", category="vm|misc|aot|a")
-dart_vm_low_priority_builder(
-    "vm-kernel-precomp-msan-linux-release-x64", category="vm|misc|aot|m")
-dart_vm_low_priority_builder(
-    "vm-kernel-precomp-tsan-linux-release-x64", category="vm|misc|aot|t")
-dart_vm_low_priority_builder(
-    "vm-kernel-precomp-ubsan-linux-release-x64", category="vm|misc|aot|u",
-    goma_rbe=False) # ubsan is not compatible with our sysroot.
+    goma_rbe=False)  # ubsan is not compatible with our sysroot.
+dart_vm_low_priority_builder("vm-kernel-precomp-asan-linux-release-x64",
+                             category="vm|misc|aot|a")
+dart_vm_low_priority_builder("vm-kernel-precomp-msan-linux-release-x64",
+                             category="vm|misc|aot|m")
+dart_vm_low_priority_builder("vm-kernel-precomp-tsan-linux-release-x64",
+                             category="vm|misc|aot|t")
 dart_vm_low_priority_builder(
-    "vm-kernel-reload-linux-debug-x64", category="vm|misc|reload|d")
-dart_vm_low_priority_builder(
-    "vm-kernel-reload-linux-release-x64", category="vm|misc|reload|r")
-dart_vm_low_priority_builder(
-    "vm-kernel-reload-rollback-linux-debug-x64", category="vm|misc|reload|drb")
-dart_vm_low_priority_builder(
-    "vm-kernel-reload-rollback-linux-release-x64",
-    category="vm|misc|reload|rrb")
+    "vm-kernel-precomp-ubsan-linux-release-x64",
+    category="vm|misc|aot|u",
+    goma_rbe=False)  # ubsan is not compatible with our sysroot.
+dart_vm_low_priority_builder("vm-kernel-reload-linux-debug-x64",
+                             category="vm|misc|reload|d")
+dart_vm_low_priority_builder("vm-kernel-reload-linux-release-x64",
+                             category="vm|misc|reload|r")
+dart_vm_low_priority_builder("vm-kernel-reload-rollback-linux-debug-x64",
+                             category="vm|misc|reload|drb")
+dart_vm_low_priority_builder("vm-kernel-reload-rollback-linux-release-x64",
+                             category="vm|misc|reload|rrb")
 dart_vm_low_priority_builder("vm-fuchsia-release-x64", category="vm|misc|f")
 
 # vm|ffi
@@ -760,157 +761,143 @@ dart_vm_extra_builder("vm-ffi-android-product-arm", category="vm|ffi|p32")
 dart_vm_extra_builder("vm-ffi-android-debug-arm64", category="vm|ffi|d64")
 dart_vm_extra_builder("vm-ffi-android-release-arm64", category="vm|ffi|r64")
 dart_vm_extra_builder("vm-ffi-android-product-arm64", category="vm|ffi|p64")
-dart_vm_extra_builder(
-    "vm-precomp-ffi-qemu-linux-release-arm", category="vm|ffi|qe")
+dart_vm_extra_builder("vm-precomp-ffi-qemu-linux-release-arm",
+                      category="vm|ffi|qe")
 
 # pkg
 dart_ci_sandbox_builder("pkg-linux-release", category="pkg|l", on_cq=True)
 dart_ci_sandbox_builder("pkg-mac-release", category="pkg|m", dimensions=mac())
-dart_ci_sandbox_builder(
-    "pkg-win-release", category="pkg|w", dimensions=windows())
+dart_ci_sandbox_builder("pkg-win-release",
+                        category="pkg|w",
+                        dimensions=windows())
 dart_ci_sandbox_builder("pkg-linux-debug", category="pkg|ld", channels=["try"])
 
 # dart2js
-dart_ci_sandbox_builder(
-    "dart2js-strong-hostasserts-linux-ia32-d8",
-    category="dart2js|d8|ha",
-    location_regexp=to_location_regexp(DART2JS_PATHS))
+dart_ci_sandbox_builder("dart2js-strong-hostasserts-linux-ia32-d8",
+                        category="dart2js|d8|ha",
+                        location_regexp=to_location_regexp(DART2JS_PATHS))
 dart_ci_sandbox_builder("dart2js-rti-linux-x64-d8", category="dart2js|d8|rti")
-dart_ci_sandbox_builder(
-    "dart2js-minified-strong-linux-x64-d8",
-    category="dart2js|d8|mi",
-    location_regexp=to_location_regexp(DART2JS_PATHS))
-dart_ci_sandbox_builder(
-    "dart2js-unit-linux-x64-release",
-    category="dart2js|d8|u",
-    location_regexp=to_location_regexp(DART2JS_PATHS))
-dart_ci_sandbox_builder(
-    "dart2js-strong-linux-x64-chrome",
-    category="dart2js|chrome|l",
-    location_regexp=to_location_regexp(DART2JS_PATHS))
-dart_ci_sandbox_builder(
-    "dart2js-csp-minified-linux-x64-chrome", category="dart2js|chrome|csp")
-dart_ci_sandbox_builder(
-    "dart2js-strong-mac-x64-chrome",
-    category="dart2js|chrome|m",
-    dimensions=mac())
-dart_ci_sandbox_builder(
-    "dart2js-strong-win-x64-chrome",
-    category="dart2js|chrome|w",
-    dimensions=windows())
-dart_ci_sandbox_builder(
-    "dart2js-nnbd-linux-x64-chrome",
-    category="dart2js|chrome|nn",
-    location_regexp=to_location_regexp(DART2JS_PATHS))
-dart_ci_sandbox_builder(
-    "dart2js-strong-linux-x64-firefox", category="dart2js|firefox|l")
-dart_ci_sandbox_builder(
-    "dart2js-strong-win-x64-firefox",
-    category="dart2js|firefox|w",
-    dimensions=windows(),
-    enabled=False)
-dart_ci_sandbox_builder(
-    "dart2js-strong-mac-x64-safari",
-    category="dart2js|safari|m",
-    dimensions=mac())
-dart_ci_sandbox_builder(
-    "dart2js-strong-win-x64-ie11",
-    category="dart2js|ms|ie",
-    dimensions=windows())
+dart_ci_sandbox_builder("dart2js-minified-strong-linux-x64-d8",
+                        category="dart2js|d8|mi",
+                        location_regexp=to_location_regexp(DART2JS_PATHS))
+dart_ci_sandbox_builder("dart2js-unit-linux-x64-release",
+                        category="dart2js|d8|u",
+                        location_regexp=to_location_regexp(DART2JS_PATHS))
+dart_ci_sandbox_builder("dart2js-strong-linux-x64-chrome",
+                        category="dart2js|chrome|l",
+                        location_regexp=to_location_regexp(DART2JS_PATHS))
+dart_ci_sandbox_builder("dart2js-csp-minified-linux-x64-chrome",
+                        category="dart2js|chrome|csp")
+dart_ci_sandbox_builder("dart2js-strong-mac-x64-chrome",
+                        category="dart2js|chrome|m",
+                        dimensions=mac())
+dart_ci_sandbox_builder("dart2js-strong-win-x64-chrome",
+                        category="dart2js|chrome|w",
+                        dimensions=windows())
+dart_ci_sandbox_builder("dart2js-nnbd-linux-x64-chrome",
+                        category="dart2js|chrome|nn",
+                        location_regexp=to_location_regexp(DART2JS_PATHS))
+dart_ci_sandbox_builder("dart2js-strong-linux-x64-firefox",
+                        category="dart2js|firefox|l")
+dart_ci_sandbox_builder("dart2js-strong-win-x64-firefox",
+                        category="dart2js|firefox|w",
+                        dimensions=windows(),
+                        enabled=False)
+dart_ci_sandbox_builder("dart2js-strong-mac-x64-safari",
+                        category="dart2js|safari|m",
+                        dimensions=mac())
+dart_ci_sandbox_builder("dart2js-strong-win-x64-ie11",
+                        category="dart2js|ms|ie",
+                        dimensions=windows())
 
 # analyzer
-dart_ci_sandbox_builder(
-    "flutter-analyze",
-    category="analyzer|fa",
-    channels=["try"],
-    notifies=None,
-    location_regexp=[
-        ".+/[+]/DEPS",
-        ".+/[+]/pkg/analysis_server/.+",
-        ".+/[+]/pkg/analysis_server_client/.+",
-        ".+/[+]/pkg/analyzer/.+",
-        ".+/[+]/pkg/analyzer_plugin/.+",
-        ".+/[+]/pkg/front_end/.+",
-        ".+/[+]/pkg/_fe_analyzer_shared/.+",
-        ".+/[+]/pkg/meta/.+",
-        ".+/[+]/pkg/telemetry/.+",
-    ])
-dart_ci_sandbox_builder(
-    "analyzer-analysis-server-linux",
-    category="analyzer|as",
-    location_regexp=to_location_regexp(ANALYZER_PATHS),
-    channels=CHANNELS)
-dart_ci_sandbox_builder(
-    "analyzer-linux-release",
-    category="analyzer|l",
-    location_regexp=to_location_regexp(ANALYZER_PATHS),
-    channels=CHANNELS)
-dart_ci_sandbox_builder(
-    "analyzer-nnbd-linux-release",
-    category="analyzer|nn",
-    location_regexp=to_location_regexp(ANALYZER_NNBD_PATHS),
-    channels=CHANNELS)
-dart_ci_sandbox_builder(
-    "analyzer-mac-release",
-    category="analyzer|m",
-    dimensions=mac(),
-    channels=CHANNELS)
-dart_ci_sandbox_builder(
-    "analyzer-win-release",
-    category="analyzer|w",
-    dimensions=windows(),
-    channels=CHANNELS)
+dart_ci_sandbox_builder("flutter-analyze",
+                        category="analyzer|fa",
+                        channels=["try"],
+                        notifies=None,
+                        location_regexp=[
+                            ".+/[+]/DEPS",
+                            ".+/[+]/pkg/analysis_server/.+",
+                            ".+/[+]/pkg/analysis_server_client/.+",
+                            ".+/[+]/pkg/analyzer/.+",
+                            ".+/[+]/pkg/analyzer_plugin/.+",
+                            ".+/[+]/pkg/front_end/.+",
+                            ".+/[+]/pkg/_fe_analyzer_shared/.+",
+                            ".+/[+]/pkg/meta/.+",
+                            ".+/[+]/pkg/telemetry/.+",
+                        ])
+dart_ci_sandbox_builder("analyzer-analysis-server-linux",
+                        category="analyzer|as",
+                        location_regexp=to_location_regexp(ANALYZER_PATHS),
+                        channels=CHANNELS)
+dart_ci_sandbox_builder("analyzer-linux-release",
+                        category="analyzer|l",
+                        location_regexp=to_location_regexp(ANALYZER_PATHS),
+                        channels=CHANNELS)
+dart_ci_sandbox_builder("analyzer-nnbd-linux-release",
+                        category="analyzer|nn",
+                        location_regexp=to_location_regexp(ANALYZER_NNBD_PATHS),
+                        channels=CHANNELS)
+dart_ci_sandbox_builder("analyzer-mac-release",
+                        category="analyzer|m",
+                        dimensions=mac(),
+                        channels=CHANNELS)
+dart_ci_sandbox_builder("analyzer-win-release",
+                        category="analyzer|w",
+                        dimensions=windows(),
+                        channels=CHANNELS)
 
 # sdk
-dart_ci_builder(
-    "dart-sdk-linux", category="sdk|l", channels=CHANNELS)
-dart_ci_builder(
-    "dart-sdk-mac", category="sdk|m", channels=CHANNELS, dimensions=mac())
-dart_ci_builder(
-    "dart-sdk-win",
-    category="sdk|w",
-    channels=CHANNELS,
-    dimensions=windows(),
-    on_cq=True)
+dart_ci_builder("dart-sdk-linux", category="sdk|l", channels=CHANNELS)
+dart_ci_builder("dart-sdk-mac",
+                category="sdk|m",
+                channels=CHANNELS,
+                dimensions=mac())
+dart_ci_builder("dart-sdk-win",
+                category="sdk|w",
+                channels=CHANNELS,
+                dimensions=windows(),
+                on_cq=True)
 
 # ddc
-dart_ci_sandbox_builder(
-    "ddc-linux-release-chrome",
-    category="ddc|l",
-    location_regexp=to_location_regexp(DDC_PATHS))
-dart_ci_sandbox_builder(
-    "ddc-nnbd-linux-release-chrome",
-    category="ddc|nn",
-    channels=["try"],
-    location_regexp=to_location_regexp(DDC_PATHS))
-dart_ci_sandbox_builder(
-    "ddc-mac-release-chrome", category="ddc|m", dimensions=mac())
-dart_ci_sandbox_builder(
-    "ddc-win-release-chrome", category="ddc|w", dimensions=windows())
+dart_ci_sandbox_builder("ddc-linux-release-chrome",
+                        category="ddc|l",
+                        location_regexp=to_location_regexp(DDC_PATHS))
+dart_ci_sandbox_builder("ddc-nnbd-linux-release-chrome",
+                        category="ddc|nn",
+                        channels=["try"],
+                        location_regexp=to_location_regexp(DDC_PATHS))
+dart_ci_sandbox_builder("ddc-mac-release-chrome",
+                        category="ddc|m",
+                        dimensions=mac())
+dart_ci_sandbox_builder("ddc-win-release-chrome",
+                        category="ddc|w",
+                        dimensions=windows())
 dart_ci_sandbox_builder("ddk-linux-release-firefox", category="ddc|fl")
 
 # misc
-dart_ci_sandbox_builder(
-    "gclient", recipe="dart/gclient", category="misc|g")
-dart_ci_builder(
-    "debianpackage-linux",
-    category="misc|dp",
-    channels=RELEASE_CHANNELS,
-    notifies="infra")
-dart_ci_builder(
-    "versionchecker-linux", category="misc|vc", channels=RELEASE_CHANNELS)
+dart_ci_sandbox_builder("gclient", recipe="dart/gclient", category="misc|g")
+dart_ci_builder("debianpackage-linux",
+                category="misc|dp",
+                channels=RELEASE_CHANNELS,
+                notifies="infra")
+dart_ci_builder("versionchecker-linux",
+                category="misc|vc",
+                channels=RELEASE_CHANNELS)
 
 # external
-dart_infra_builder(
-    "google", recipe="dart/external", category="external|g", enabled=False, fyi=True)
+dart_infra_builder("google",
+                   recipe="dart/external",
+                   category="external|g",
+                   enabled=False,
+                   fyi=True)
 
 # infra
-dart_infra_builder(
-    "base",
-    execution_timeout=15 * time.minute,
-    recipe="dart/forward_branch",
-    schedule="with 15m interval",
-    notifies=None)
+dart_infra_builder("base",
+                   execution_timeout=15 * time.minute,
+                   recipe="dart/forward_branch",
+                   schedule="with 15m interval",
+                   notifies=None)
 dart_infra_builder("chocolatey", recipe="dart/chocolatey", dimensions=windows())
 dart_infra_builder("co19-roller", recipe="dart/package_co19")
 dart_infra_builder("docker", recipe="dart/docker")
@@ -955,6 +942,7 @@ dart_try_builder(
     recipe="presubmit/presubmit",
 )
 
+
 def add_postponed_alt_console_entries():
     for entry in postponed_alt_console_entries:
         luci.console_view_entry(console_view="alt", **entry)
@@ -991,8 +979,7 @@ dart_infra_builder(
         name="recipe_autoroller",
         cipd_package=
         "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
-        cipd_version="git_revision:905c1df843d7771bf3adc0cf21f58eb9498ff063"
-    ),
+        cipd_version="git_revision:905c1df843d7771bf3adc0cf21f58eb9498ff063"),
     execution_timeout=20 * time.minute,
     expiration_timeout=time.day,
     priority=LOW,
@@ -1000,7 +987,7 @@ dart_infra_builder(
         "db_gcs_bucket": "dart-recipe-roller-db",
         "projects": {
             "dart": "https://dart.googlesource.com/recipes",
-        }.items(), # recipe_autoroller expects a list of tuples.
+        }.items(),  # recipe_autoroller expects a list of tuples.
     },
     schedule="with 4h interval",
 )

From 06a8b000833a0140df68f1849d88b4b12a59a421 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 25 Jun 2020 15:31:51 +0000
Subject: [PATCH 388/826] [infra] Download chrome on pkg builders to support
 web unit tests

https://github.com/dart-lang/sdk/issues/42417

Change-Id: If678cb418df7b15f98aa2ad49818c908c24089bc
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/152502
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 17 +++++++++++++++++
 main.star          | 20 ++++++++++++++++----
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index c1dc2b9bcbeb..161ed40570e8 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -3930,6 +3930,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -3955,6 +3956,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -3980,6 +3982,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -4005,6 +4008,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -4030,6 +4034,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -4054,6 +4059,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -4078,6 +4084,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -4102,6 +4109,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -4126,6 +4134,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -4150,6 +4159,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -4174,6 +4184,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -4198,6 +4209,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -4222,6 +4234,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -9741,6 +9754,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
       caches {
@@ -9766,6 +9780,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
       caches {
@@ -9790,6 +9805,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
       caches {
@@ -9814,6 +9830,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
       caches {
diff --git a/main.star b/main.star
index 31505a37bf99..094c7881ec33 100755
--- a/main.star
+++ b/main.star
@@ -86,6 +86,8 @@ NORMAL = 50  # Used for post-submit builds.
 HIGH = 30  # Used for try-jobs.
 HIGHEST = 25  # Used for shards in the recipes, included here for completeness.
 
+CHROME = {"custom_vars": {"download_chrome": True}}
+
 
 def to_location_regexp(paths):
     return [".+/[+]/%s" % path for path in paths]
@@ -765,12 +767,22 @@ dart_vm_extra_builder("vm-precomp-ffi-qemu-linux-release-arm",
                       category="vm|ffi|qe")
 
 # pkg
-dart_ci_sandbox_builder("pkg-linux-release", category="pkg|l", on_cq=True)
-dart_ci_sandbox_builder("pkg-mac-release", category="pkg|m", dimensions=mac())
+dart_ci_sandbox_builder("pkg-linux-release",
+                        category="pkg|l",
+                        on_cq=True,
+                        properties=CHROME)
+dart_ci_sandbox_builder("pkg-mac-release",
+                        category="pkg|m",
+                        dimensions=mac(),
+                        properties=CHROME)
 dart_ci_sandbox_builder("pkg-win-release",
                         category="pkg|w",
-                        dimensions=windows())
-dart_ci_sandbox_builder("pkg-linux-debug", category="pkg|ld", channels=["try"])
+                        dimensions=windows(),
+                        properties=CHROME)
+dart_ci_sandbox_builder("pkg-linux-debug",
+                        category="pkg|ld",
+                        channels=["try"],
+                        properties=CHROME)
 
 # dart2js
 dart_ci_sandbox_builder("dart2js-strong-hostasserts-linux-ia32-d8",

From f2282fa932c0fa1cd23fe0962668aa24563ae8ea Mon Sep 17 00:00:00 2001
From: Karl Klose <karlklose@google.com>
Date: Fri, 26 Jun 2020 11:32:58 +0000
Subject: [PATCH 389/826] [infra] Add a builder for the ci-test-data branch

Change-Id: I67866912f41e453e5be3f83c145b2a45db0021fb
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/152324
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 26 ++++++++++++++++++++++++++
 luci-notify.cfg    | 14 ++++++++++++++
 luci-scheduler.cfg | 20 ++++++++++++++++++++
 main.star          | 21 +++++++++++++++++++++
 4 files changed, 81 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 161ed40570e8..5af708ee6037 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1566,6 +1566,32 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
+    builders {
+      name: "ci-test-data"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 50
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
     builders {
       name: "cross-vm-linux-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index a1fcae19ad62..f51082846c11 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -286,6 +286,20 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_success: true
+    on_failure: true
+    email {
+      recipients: "karlklose@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "ci-test-data"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 0ee37b4c8a90..48b060464c58 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -344,6 +344,16 @@ job {
     builder: "chocolatey"
   }
 }
+job {
+  id: "ci-test-data"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ci-test-data"
+  }
+}
 job {
   id: "co19-roller"
   schedule: "triggered"
@@ -3508,6 +3518,16 @@ job {
     builder: "vm-precomp-ffi-qemu-linux-release-arm-stable"
   }
 }
+trigger {
+  id: "dart-ci-test-data-trigger"
+  acl_sets: "ci"
+  triggers: "ci-test-data"
+  gitiles {
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/ci-test-data"
+    path_regexps: "tools/bots/ci_test_data_trigger"
+  }
+}
 trigger {
   id: "dart-flutter-engine-trigger"
   acl_sets: "ci"
diff --git a/main.star b/main.star
index 094c7881ec33..544c8b3eae94 100755
--- a/main.star
+++ b/main.star
@@ -246,6 +246,13 @@ luci.gitiles_poller(
     refs=["refs/heads/master"],
 )
 
+luci.gitiles_poller(
+    name="dart-ci-test-data-trigger",
+    bucket="ci",
+    path_regexps=["tools/bots/ci_test_data_trigger"],
+    repo=DART_GIT,
+    refs=["refs/heads/ci-test-data"],
+)
 
 def dart_poller(name, bucket="ci", branches=BRANCHES, paths=None):
     for branch in branches:
@@ -295,6 +302,12 @@ luci.notifier(name="frontend-team",
               on_failure=True,
               notify_emails=["jensj@google.com"])
 
+luci.notifier(
+    name="ci-test-data",
+    on_success=True,
+    on_failure=True,
+    notify_emails=["karlklose@google.com"])
+
 luci.cq(
     submit_max_burst=2,
     submit_burst_delay=8 * time.minute,
@@ -934,6 +947,14 @@ dart_infra_builder(
     schedule="0 5 * * *",  # daily, at 05:00 UTC
 )
 
+dart_ci_sandbox_builder(
+   "ci-test-data",
+   channels=[],
+   properties={"bisection_enabled": True},
+   notifies="ci-test-data",
+   triggered_by=["dart-ci-test-data-trigger"],
+)
+
 # Fuzz testing builders
 dart_ci_sandbox_builder(
     "fuzz-linux",

From 48cba13c72bb470b6103eefa4257fcfe2ec89261 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 3 Jul 2020 11:29:00 +0000
Subject: [PATCH 390/826] [infra] Format and fix lints produced by `lucicfg
 lint`

Change-Id: I2593daee2145a10439c4856b34ee77fa6bc1b8d0
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/153205
Auto-Submit: Alexander Thomas <athom@google.com>
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 defaults.star |   15 +-
 main.star     | 1538 ++++++++++++++++++++++++++++---------------------
 2 files changed, 899 insertions(+), 654 deletions(-)

diff --git a/defaults.star b/defaults.star
index bf14d10591fd..82c328f7f010 100644
--- a/defaults.star
+++ b/defaults.star
@@ -1,20 +1,25 @@
+# Copyright (c) 2019 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Defaults for properties and dimensions used in main.star.
+"""
+
 _PROPERTIES = {"clobber": "true"}
 _DIMENSIONS = {
     "cpu": "x86-64",
     "host_class": "default",
     "os": "Linux",
-    "pool": "luci.dart.try"
+    "pool": "luci.dart.try",
 }
 
-
 def _default_dict(defaults, overrides):
     defaults = dict(defaults)
     if overrides:
         defaults.update(overrides)
     return defaults
 
-
 defaults = struct(
-    properties=lambda properties: _default_dict(_PROPERTIES, properties),
-    dimensions=lambda dimensions: _default_dict(_DIMENSIONS, dimensions),
+    properties = lambda properties: _default_dict(_PROPERTIES, properties),
+    dimensions = lambda dimensions: _default_dict(_DIMENSIONS, dimensions),
 )
diff --git a/main.star b/main.star
index 544c8b3eae94..ad247e04f81a 100755
--- a/main.star
+++ b/main.star
@@ -8,10 +8,13 @@
 #
 # Documentation for lucicfg is here:
 # https://chromium.googlesource.com/infra/luci/luci-go/+/master/lucicfg/doc/
+"""
+Generates the Luci configuration for the Dart project.
+"""
 
 load("//defaults.star", "defaults")
 
-lucicfg.check_version('1.15.0')
+lucicfg.check_version("1.17.0")
 
 DART_GIT = "https://dart.googlesource.com/sdk"
 DART_GERRIT = "https://dart-review.googlesource.com/"
@@ -19,7 +22,7 @@ DART_GERRIT = "https://dart-review.googlesource.com/"
 GOMA_RBE = {
     "enable_ats": True,
     "server_host": "goma.chromium.org",
-    "use_luci_auth": True
+    "use_luci_auth": True,
 }
 
 RELEASE_CHANNELS = ["beta", "dev", "stable"]
@@ -88,27 +91,23 @@ HIGHEST = 25  # Used for shards in the recipes, included here for completeness.
 
 CHROME = {"custom_vars": {"download_chrome": True}}
 
-
 def to_location_regexp(paths):
     return [".+/[+]/%s" % path for path in paths]
 
-
 def mac():
     return {"os": "Mac"}
 
-
 def windows():
     return {"os": "Windows"}
 
-
 CI_ACCOUNT = "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
 TRY_ACCOUNT = "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
 CI_TRIGGERERS = ["luci-scheduler@appspot.gserviceaccount.com", CI_ACCOUNT]
 CI_SANDBOX_TRIGGERERS = CI_TRIGGERERS + [TRY_ACCOUNT]
 
 lucicfg.config(
-    config_dir=".",
-    tracked_files=[
+    config_dir = ".",
+    tracked_files = [
         "commit-queue.cfg",
         "cr-buildbucket.cfg",
         "luci-logdog.cfg",
@@ -117,273 +116,302 @@ lucicfg.config(
         "luci-scheduler.cfg",
         "project.cfg",
     ],
+    lint_checks = ["default"],
 )
 
 luci.project(
-    name="dart",
-    buildbucket="cr-buildbucket.appspot.com",
-    logdog="luci-logdog.appspot.com",
-    milo="luci-milo.appspot.com",
-    notify="luci-notify.appspot.com",
-    scheduler="luci-scheduler.appspot.com",
-    swarming="chromium-swarm.appspot.com",
-    acls=[
+    name = "dart",
+    buildbucket = "cr-buildbucket.appspot.com",
+    logdog = "luci-logdog.appspot.com",
+    milo = "luci-milo.appspot.com",
+    notify = "luci-notify.appspot.com",
+    scheduler = "luci-scheduler.appspot.com",
+    swarming = "chromium-swarm.appspot.com",
+    acls = [
         acl.entry(
             [
-                acl.BUILDBUCKET_READER, acl.LOGDOG_READER,
-                acl.PROJECT_CONFIGS_READER, acl.SCHEDULER_READER
+                acl.BUILDBUCKET_READER,
+                acl.LOGDOG_READER,
+                acl.PROJECT_CONFIGS_READER,
+                acl.SCHEDULER_READER,
             ],
-            groups=["all"],
+            groups = ["all"],
         ),
-        acl.entry(acl.LOGDOG_WRITER, groups=["luci-logdog-chromium-writers"]),
-        acl.entry([acl.SCHEDULER_OWNER, acl.BUILDBUCKET_TRIGGERER],
-                  groups=["project-dart-admins"]),
-        acl.entry(acl.CQ_COMMITTER, groups=["project-dart-committers"]),
-        acl.entry(acl.CQ_DRY_RUNNER, groups=["project-dart-tryjob-access"]),
+        acl.entry(acl.LOGDOG_WRITER, groups = ["luci-logdog-chromium-writers"]),
+        acl.entry(
+            [acl.SCHEDULER_OWNER, acl.BUILDBUCKET_TRIGGERER],
+            groups = ["project-dart-admins"],
+        ),
+        acl.entry(acl.CQ_COMMITTER, groups = ["project-dart-committers"]),
+        acl.entry(acl.CQ_DRY_RUNNER, groups = ["project-dart-tryjob-access"]),
     ],
 )
 
 luci.milo(
-    logo="https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png",
+    logo = "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png",
 )
 
 luci.console_view(
-    name="be",
-    repo="https://dart.googlesource.com/sdk",
-    title="SDK Bleeding Edge Console",
-    refs=["refs/heads/master"],
-    header="console-header.textpb",
+    name = "be",
+    repo = "https://dart.googlesource.com/sdk",
+    title = "SDK Bleeding Edge Console",
+    refs = ["refs/heads/master"],
+    header = "console-header.textpb",
 )
 
 luci.console_view(
-    name="alt",
-    repo="https://dart.googlesource.com/sdk",
-    title="SDK Bleeding Edge Console (alternative)",
-    refs=["refs/heads/master"],
-    header="console-header.textpb",
+    name = "alt",
+    repo = "https://dart.googlesource.com/sdk",
+    title = "SDK Bleeding Edge Console (alternative)",
+    refs = ["refs/heads/master"],
+    header = "console-header.textpb",
 )
 
 luci.console_view(
-    name="dev",
-    repo="https://dart.googlesource.com/sdk",
-    title="SDK Dev Console",
-    refs=["refs/heads/dev"],
-    header="console-header.textpb",
+    name = "dev",
+    repo = "https://dart.googlesource.com/sdk",
+    title = "SDK Dev Console",
+    refs = ["refs/heads/dev"],
+    header = "console-header.textpb",
 )
 
 luci.console_view(
-    name="beta",
-    repo="https://dart.googlesource.com/sdk",
-    title="SDK Beta Console",
-    refs=["refs/heads/beta"],
-    header="console-header.textpb",
+    name = "beta",
+    repo = "https://dart.googlesource.com/sdk",
+    title = "SDK Beta Console",
+    refs = ["refs/heads/beta"],
+    header = "console-header.textpb",
 )
 
 luci.console_view(
-    name="stable",
-    repo="https://dart.googlesource.com/sdk",
-    title="SDK Stable Console",
-    refs=["refs/heads/stable"],
-    header="console-header.textpb",
+    name = "stable",
+    repo = "https://dart.googlesource.com/sdk",
+    title = "SDK Stable Console",
+    refs = ["refs/heads/stable"],
+    header = "console-header.textpb",
 )
 
 luci.console_view(
-    name="flutter",
-    repo=DART_GIT,
-    title="Dart/Flutter Console",
-    refs=["refs/heads/master"],
+    name = "flutter",
+    repo = DART_GIT,
+    title = "Dart/Flutter Console",
+    refs = ["refs/heads/master"],
 )
 
 luci.console_view(
-    name="flutter-hhh",
-    repo="https://dart.googlesource.com/linear_sdk_flutter_engine",
-    title="Dart/Flutter Linear History Console",
-    refs=["refs/heads/master"],
+    name = "flutter-hhh",
+    repo = "https://dart.googlesource.com/linear_sdk_flutter_engine",
+    title = "Dart/Flutter Linear History Console",
+    refs = ["refs/heads/master"],
 )
 
 luci.console_view(
-    name="fyi",
-    repo=DART_GIT,
-    title="SDK FYI Console",
-    refs=["refs/heads/master"],
+    name = "fyi",
+    repo = DART_GIT,
+    title = "SDK FYI Console",
+    refs = ["refs/heads/master"],
 )
 
 luci.list_view(
-    name="cq",
-    title="SDK CQ Console",
+    name = "cq",
+    title = "SDK CQ Console",
 )
 
 luci.list_view(
-    name="infra",
-    title="Infra Console",
+    name = "infra",
+    title = "Infra Console",
 )
 
-luci.logdog(gs_bucket="chromium-luci-logdog")
+luci.logdog(gs_bucket = "chromium-luci-logdog")
 
 luci.bucket(
-    name="ci",
-    acls=[
-        acl.entry(acl.BUILDBUCKET_TRIGGERER, users=CI_TRIGGERERS),
+    name = "ci",
+    acls = [
+        acl.entry(acl.BUILDBUCKET_TRIGGERER, users = CI_TRIGGERERS),
     ],
 )
 luci.bucket(
-    name="ci.sandbox",
-    acls=[
-        acl.entry(acl.BUILDBUCKET_TRIGGERER, users=CI_SANDBOX_TRIGGERERS),
+    name = "ci.sandbox",
+    acls = [
+        acl.entry(acl.BUILDBUCKET_TRIGGERER, users = CI_SANDBOX_TRIGGERERS),
     ],
 )
 TRY_ACLS = [
-    acl.entry(acl.BUILDBUCKET_TRIGGERER,
-              groups=["project-dart-tryjob-access", "service-account-cq"]),
+    acl.entry(
+        acl.BUILDBUCKET_TRIGGERER,
+        groups = ["project-dart-tryjob-access", "service-account-cq"],
+    ),
 ]
-luci.bucket(name="try", acls=TRY_ACLS)  # Tryjobs specific to the Dart SDK repo.
-luci.bucket(name="try.shared", acls=TRY_ACLS)  # Tryjobs for all repos.
+luci.bucket(name = "try", acls = TRY_ACLS)  # Tryjobs specific to the Dart SDK repo.
+luci.bucket(name = "try.shared", acls = TRY_ACLS)  # Tryjobs for all repos.
 
 luci.gitiles_poller(
-    name="dart-gitiles-trigger-flutter",
-    bucket="ci",
-    repo="https://dart.googlesource.com/linear_sdk_flutter_engine/",
-    refs=["refs/heads/master"],
+    name = "dart-gitiles-trigger-flutter",
+    bucket = "ci",
+    repo = "https://dart.googlesource.com/linear_sdk_flutter_engine/",
+    refs = ["refs/heads/master"],
 )
 
 luci.gitiles_poller(
-    name="dart-ci-test-data-trigger",
-    bucket="ci",
-    path_regexps=["tools/bots/ci_test_data_trigger"],
-    repo=DART_GIT,
-    refs=["refs/heads/ci-test-data"],
+    name = "dart-ci-test-data-trigger",
+    bucket = "ci",
+    path_regexps = ["tools/bots/ci_test_data_trigger"],
+    repo = DART_GIT,
+    refs = ["refs/heads/ci-test-data"],
 )
 
-def dart_poller(name, bucket="ci", branches=BRANCHES, paths=None):
+def dart_poller(name, bucket = "ci", branches = BRANCHES, paths = None):
     for branch in branches:
         luci.gitiles_poller(
-            name="%s-%s" % (name, branch),
-            bucket=bucket,
-            path_regexps=paths,
-            repo=DART_GIT,
-            refs=["refs/heads/%s" % branch],
+            name = "%s-%s" % (name, branch),
+            bucket = bucket,
+            path_regexps = paths,
+            repo = DART_GIT,
+            refs = ["refs/heads/%s" % branch],
         )
 
-
-dart_poller("dart-gitiles-trigger", branches=BRANCHES)
-dart_poller("dart-vm-gitiles-trigger", branches=["master"], paths=VM_PATHS)
+dart_poller("dart-gitiles-trigger", branches = BRANCHES)
+dart_poller("dart-vm-gitiles-trigger", branches = ["master"], paths = VM_PATHS)
 
 luci.gitiles_poller(
-    name="dart-flutter-engine-trigger",
-    bucket="ci",
-    repo="https://dart.googlesource.com/external/github.com/flutter/engine",
-    refs=["refs/heads/master"],
+    name = "dart-flutter-engine-trigger",
+    bucket = "ci",
+    repo = "https://dart.googlesource.com/external/github.com/flutter/engine",
+    refs = ["refs/heads/master"],
 )
 
 luci.gitiles_poller(
-    name="dart-flutter-flutter-trigger",
-    bucket="ci",
-    repo="https://dart.googlesource.com/external/github.com/flutter/flutter",
-    refs=["refs/heads/master"],
+    name = "dart-flutter-flutter-trigger",
+    bucket = "ci",
+    repo = "https://dart.googlesource.com/external/github.com/flutter/flutter",
+    refs = ["refs/heads/master"],
 )
 
-luci.notifier(name="infra",
-              on_new_failure=True,
-              notify_emails=[
-                  "athom@google.com", "sortie@google.com", "whesse@google.com"
-              ])
+luci.notifier(
+    name = "infra",
+    on_new_failure = True,
+    notify_emails = [
+        "athom@google.com",
+        "sortie@google.com",
+        "whesse@google.com",
+    ],
+)
 
-luci.notifier(name="dart",
-              on_new_failure=True,
-              notify_emails=["athom@google.com"],
-              notify_blamelist=True)
+luci.notifier(
+    name = "dart",
+    on_new_failure = True,
+    notify_emails = ["athom@google.com"],
+    notify_blamelist = True,
+)
 
-luci.notifier(name="dart-fuzz-testing",
-              on_success=True,
-              on_failure=True,
-              notify_emails=["ajcbik@google.com", "athom@google.com"])
+luci.notifier(
+    name = "dart-fuzz-testing",
+    on_success = True,
+    on_failure = True,
+    notify_emails = ["ajcbik@google.com", "athom@google.com"],
+)
 
-luci.notifier(name="frontend-team",
-              on_failure=True,
-              notify_emails=["jensj@google.com"])
+luci.notifier(
+    name = "frontend-team",
+    on_failure = True,
+    notify_emails = ["jensj@google.com"],
+)
 
 luci.notifier(
-    name="ci-test-data",
-    on_success=True,
-    on_failure=True,
-    notify_emails=["karlklose@google.com"])
+    name = "ci-test-data",
+    on_success = True,
+    on_failure = True,
+    notify_emails = ["karlklose@google.com"],
+)
 
 luci.cq(
-    submit_max_burst=2,
-    submit_burst_delay=8 * time.minute,
+    submit_max_burst = 2,
+    submit_burst_delay = 8 * time.minute,
 )
 
-
 def default_verifiers():
     return [
         luci.cq_tryjob_verifier(
-            builder='presubmit-try',
-            disable_reuse=True,
+            builder = "presubmit-try",
+            disable_reuse = True,
         ),
     ]
 
-
 luci.cq_group(
-    name="sdk",
-    watch=cq.refset(DART_GERRIT + "sdk",
-                    refs=["refs/heads/%s" % branch for branch in BRANCHES]),
-    allow_submit_with_open_deps=True,
-    tree_status_host="dart-status.appspot.com",
-    retry_config=cq.RETRY_NONE,
-    verifiers=None,
+    name = "sdk",
+    watch = cq.refset(
+        DART_GERRIT + "sdk",
+        refs = ["refs/heads/%s" % branch for branch in BRANCHES],
+    ),
+    allow_submit_with_open_deps = True,
+    tree_status_host = "dart-status.appspot.com",
+    retry_config = cq.RETRY_NONE,
+    verifiers = None,
 )
 
 luci.cq_group(
-    name="sdk-infra-config",
-    watch=cq.refset(DART_GERRIT + "sdk", refs=["refs/heads/infra/config"]),
-    allow_submit_with_open_deps=True,
-    tree_status_host="dart-status.appspot.com",
-    retry_config=cq.RETRY_NONE,
-    verifiers=default_verifiers(),
+    name = "sdk-infra-config",
+    watch = cq.refset(DART_GERRIT + "sdk", refs = ["refs/heads/infra/config"]),
+    allow_submit_with_open_deps = True,
+    tree_status_host = "dart-status.appspot.com",
+    retry_config = cq.RETRY_NONE,
+    verifiers = default_verifiers(),
 )
 
 luci.cq_group(
-    name="recipes",
-    watch=cq.refset(DART_GERRIT + "recipes", refs=["refs/heads/master"]),
-    allow_submit_with_open_deps=True,
-    tree_status_host="dart-status.appspot.com",
-    retry_config=cq.RETRY_NONE,
-    verifiers=default_verifiers(),
+    name = "recipes",
+    watch = cq.refset(DART_GERRIT + "recipes", refs = ["refs/heads/master"]),
+    allow_submit_with_open_deps = True,
+    tree_status_host = "dart-status.appspot.com",
+    retry_config = cq.RETRY_NONE,
+    verifiers = default_verifiers(),
 )
 
 luci.cq_group(
-    name="dart_ci",
-    watch=cq.refset(DART_GERRIT + "dart_ci", refs=["refs/heads/master"]),
-    allow_submit_with_open_deps=True,
-    tree_status_host="dart-status.appspot.com",
-    retry_config=cq.RETRY_NONE,
-    verifiers=None,
+    name = "dart_ci",
+    watch = cq.refset(DART_GERRIT + "dart_ci", refs = ["refs/heads/master"]),
+    allow_submit_with_open_deps = True,
+    tree_status_host = "dart-status.appspot.com",
+    retry_config = cq.RETRY_NONE,
+    verifiers = None,
 )
 
-
 def dart_recipe(name):
     return luci.recipe(
-        name=name,
-        cipd_package="dart/recipe_bundles/dart.googlesource.com/recipes",
+        name = name,
+        cipd_package = "dart/recipe_bundles/dart.googlesource.com/recipes",
     )
 
-
 def use_goma_rbe(goma_rbe, dimensions):
     if goma_rbe == None:
         return dimensions["os"] == "Linux"
     return goma_rbe
 
-
-def dart_try_builder(name,
-                     recipe="dart/neo",
-                     bucket="try",
-                     dimensions=None,
-                     execution_timeout=None,
-                     experiment_percentage=None,
-                     goma_rbe=None,
-                     location_regexp=None,
-                     properties=None,
-                     on_cq=False):
+def dart_try_builder(
+        name,
+        recipe = "dart/neo",
+        bucket = "try",
+        dimensions = None,
+        execution_timeout = None,
+        experiment_percentage = None,
+        goma_rbe = None,
+        location_regexp = None,
+        properties = None,
+        on_cq = False):
+    """Creates a Dart tryjob.
+
+    Args:
+        name: The builder name.
+        recipe: The recipe to use (defaults to "dart/neo").
+        bucket: The bucket to use (defaults to "try").
+        dimensions: Extra swarming dimensions required by this builder.
+        execution_timeout: Time to allow for the build to run.
+        experiment_percentage: What experiment percentage to use.
+        goma_rbe: Whether to use goma on RBE or not.
+        location_regexp: Locations that trigger this tryjob.
+        properties: Extra properties to set for builds.
+        on_cq: Whether the build is added to the default set of CQ tryjobs.
+    """
     if on_cq and location_regexp:
         fail("Can't be on the default CQ and conditionally on the CQ")
     dimensions = defaults.dimensions(dimensions)
@@ -394,63 +422,91 @@ def dart_try_builder(name,
     builder = name + "-try"
 
     luci.builder(
-        name=builder,
-        build_numbers=True,
-        bucket=bucket,
-        caches=[swarming.cache("browsers")],
-        dimensions=dimensions,
-        executable=dart_recipe(recipe),
-        execution_timeout=execution_timeout,
-        priority=HIGH,
-        properties=properties,
-        service_account=TRY_ACCOUNT,
-        swarming_tags=["vpython:native-python-wrapper"],
+        name = builder,
+        build_numbers = True,
+        bucket = bucket,
+        caches = [swarming.cache("browsers")],
+        dimensions = dimensions,
+        executable = dart_recipe(recipe),
+        execution_timeout = execution_timeout,
+        priority = HIGH,
+        properties = properties,
+        service_account = TRY_ACCOUNT,
+        swarming_tags = ["vpython:native-python-wrapper"],
     )
     includable_only = (not on_cq and not experiment_percentage and
                        not location_regexp)
-    luci.cq_tryjob_verifier(builder=builder,
-                            cq_group="sdk",
-                            experiment_percentage=experiment_percentage,
-                            location_regexp=location_regexp,
-                            includable_only=includable_only)
-    luci.list_view_entry(list_view="cq", builder=builder)
-
+    luci.cq_tryjob_verifier(
+        builder = builder,
+        cq_group = "sdk",
+        experiment_percentage = experiment_percentage,
+        location_regexp = location_regexp,
+        includable_only = includable_only,
+    )
+    luci.list_view_entry(list_view = "cq", builder = builder)
 
 postponed_alt_console_entries = []
 
 # Global builder defaults
 luci.builder.defaults.properties.set({
     "$recipe_engine/isolated": {
-        "server": "https://isolateserver.appspot.com"
+        "server": "https://isolateserver.appspot.com",
     },
     "$recipe_engine/swarming": {
-        "server": "https://chromium-swarm.appspot.com"
+        "server": "https://chromium-swarm.appspot.com",
     },
 })
 
-
-def dart_builder(name,
-                 bucket,
-                 recipe="dart/neo",
-                 enabled=True,
-                 category=None,
-                 channels=[],
-                 dimensions=None,
-                 executable=None,
-                 execution_timeout=None,
-                 expiration_timeout=None,
-                 goma_rbe=None,
-                 fyi=False,
-                 notifies="dart",
-                 priority=NORMAL,
-                 properties=None,
-                 schedule="triggered",
-                 service_account=TRY_ACCOUNT,
-                 triggered_by=["dart-gitiles-trigger-%s"],
-                 triggering_policy=None,
-                 on_cq=False,
-                 experiment_percentage=None,
-                 location_regexp=None):
+def dart_builder(
+        name,
+        bucket,
+        recipe = "dart/neo",
+        enabled = True,
+        category = None,
+        channels = [],
+        dimensions = None,
+        executable = None,
+        execution_timeout = None,
+        expiration_timeout = None,
+        goma_rbe = None,
+        fyi = False,
+        notifies = "dart",
+        priority = NORMAL,
+        properties = None,
+        schedule = "triggered",
+        service_account = TRY_ACCOUNT,
+        triggered_by = ["dart-gitiles-trigger-%s"],
+        triggering_policy = None,
+        on_cq = False,
+        experiment_percentage = None,
+        location_regexp = None):
+    """
+    Creates a Dart builder on all the specified channels.
+
+    Args:
+        name: The builder name.
+        bucket: The bucket to use (defaults to "try").
+        recipe: The recipe to use (defaults to "dart/neo").
+        enabled: Whether this builder is currently running or not.
+        category: Where to show the builder on the console.
+        channels: Which other channels the builder should be added to.
+        dimensions: Extra swarming dimensions required by this builder.
+        executable: The Luci executable to use.
+        execution_timeout: Time to allow for the build to run.
+        expiration_timeout: How long builds should wait for a bot to run on.
+        goma_rbe: Whether to use goma on RBE or not.
+        fyi: Whether this is an FYI builder or not.
+        notifies: Which luci notifier group to notify (default: "dart").
+        priority: What swarming priority this builder gets (default: NORMAL).
+        properties: Extra properties to set for builds.
+        schedule: What schedule to use (default: "triggered").
+        service_account: The task service account to use (default: TRY_ACCOUNT).
+        triggered_by: What triggers this builder (defaults to standard trigger).
+        triggering_policy: The triggering policy used by this builder.
+        on_cq: Whether the build is added to the default set of CQ tryjobs.
+        experiment_percentage: What experiment percentage to use.
+        location_regexp: Locations that trigger this builder.
+    """
     dimensions = defaults.dimensions(dimensions)
     properties = defaults.properties(properties)
     if use_goma_rbe(goma_rbe, dimensions):
@@ -458,21 +514,24 @@ def dart_builder(name,
 
     def builder(channel, triggered_by):
         if channel == "try":
-            dart_try_builder(name,
-                             recipe=recipe,
-                             dimensions=dimensions,
-                             properties=properties,
-                             on_cq=on_cq,
-                             execution_timeout=execution_timeout,
-                             experiment_percentage=experiment_percentage,
-                             goma_rbe=goma_rbe,
-                             location_regexp=location_regexp)
+            dart_try_builder(
+                name,
+                recipe = recipe,
+                dimensions = dimensions,
+                properties = properties,
+                on_cq = on_cq,
+                execution_timeout = execution_timeout,
+                experiment_percentage = experiment_percentage,
+                goma_rbe = goma_rbe,
+                location_regexp = location_regexp,
+            )
         else:
             builder = name + "-" + channel if channel else name
             branch = channel if channel else "master"
             if schedule == "triggered" and triggered_by:
                 triggered_by = [
-                    trigger.replace("%s", branch) for trigger in triggered_by
+                    trigger.replace("%s", branch)
+                    for trigger in triggered_by
                 ]
                 if channel in RELEASE_CHANNELS:
                     # Always run vm builders on release channels.
@@ -480,32 +539,33 @@ def dart_builder(name,
                         trigger.replace("dart-vm-", "dart-")
                         for trigger in triggered_by
                     ]
-            luci.builder(name=builder,
-                         build_numbers=True,
-                         bucket=bucket,
-                         caches=[swarming.cache("browsers")],
-                         dimensions=dimensions,
-                         executable=executable or dart_recipe(recipe),
-                         execution_timeout=execution_timeout,
-                         expiration_timeout=expiration_timeout,
-                         priority=priority,
-                         properties=properties,
-                         notifies=[notifies]
-                         if notifies and not channel and enabled else None,
-                         schedule=schedule if enabled else None,
-                         service_account=service_account,
-                         swarming_tags=["vpython:native-python-wrapper"],
-                         triggered_by=triggered_by if enabled else None,
-                         triggering_policy=triggering_policy)
+            luci.builder(
+                name = builder,
+                build_numbers = True,
+                bucket = bucket,
+                caches = [swarming.cache("browsers")],
+                dimensions = dimensions,
+                executable = executable or dart_recipe(recipe),
+                execution_timeout = execution_timeout,
+                expiration_timeout = expiration_timeout,
+                priority = priority,
+                properties = properties,
+                notifies = [notifies] if notifies and not channel and enabled else None,
+                schedule = schedule if enabled else None,
+                service_account = service_account,
+                swarming_tags = ["vpython:native-python-wrapper"],
+                triggered_by = triggered_by if enabled else None,
+                triggering_policy = triggering_policy,
+            )
             if category:
                 console_category, _, short_name = category.rpartition("|")
                 toplevel_category, _, _ = console_category.partition("|")
                 console = channel or "be" if not fyi else "fyi"
                 luci.console_view_entry(
-                    builder=builder,
-                    short_name=short_name,
-                    category=console_category,
-                    console_view=console,
+                    builder = builder,
+                    short_name = short_name,
+                    category = console_category,
+                    console_view = console,
                 )
                 if console == "be":
                     if toplevel_category == "vm":
@@ -516,547 +576,727 @@ def dart_builder(name,
                         })
                     else:
                         luci.console_view_entry(
-                            builder=builder,
-                            short_name=short_name,
-                            category=console_category,
-                            console_view="alt",
+                            builder = builder,
+                            short_name = short_name,
+                            category = console_category,
+                            console_view = "alt",
                         )
 
-    builder(None, triggered_by=triggered_by)
+    builder(None, triggered_by = triggered_by)
     for channel in channels:
         if enabled:
-            builder(channel, triggered_by=triggered_by)
-
+            builder(channel, triggered_by = triggered_by)
 
-def dart_ci_builder(name, dimensions={}, **kwargs):
+def dart_ci_builder(name, dimensions = {}, **kwargs):
     dimensions.setdefault("pool", "luci.dart.ci")
-    dart_builder(name,
-                 bucket="ci",
-                 dimensions=dimensions,
-                 service_account=CI_ACCOUNT,
-                 **kwargs)
-
-
-def dart_ci_sandbox_builder(name, channels=CHANNELS, **kwargs):
-    dart_builder(name,
-                 bucket="ci.sandbox",
-                 channels=channels,
-                 service_account=TRY_ACCOUNT,
-                 **kwargs)
-
-
-def dart_infra_builder(name, notifies="infra", triggered_by=None, **kwargs):
-    dart_ci_builder(name,
-                    notifies=notifies,
-                    triggered_by=triggered_by,
-                    **kwargs)
-    luci.list_view_entry(list_view="infra", builder=name)
+    dart_builder(
+        name,
+        bucket = "ci",
+        dimensions = dimensions,
+        service_account = CI_ACCOUNT,
+        **kwargs
+    )
 
+def dart_ci_sandbox_builder(name, channels = CHANNELS, **kwargs):
+    dart_builder(
+        name,
+        bucket = "ci.sandbox",
+        channels = channels,
+        service_account = TRY_ACCOUNT,
+        **kwargs
+    )
 
-def dart_vm_extra_builder(name, on_cq=False, location_regexp=None, **kwargs):
+def dart_infra_builder(name, notifies = "infra", triggered_by = None, **kwargs):
+    dart_ci_builder(
+        name,
+        notifies = notifies,
+        triggered_by = triggered_by,
+        **kwargs
+    )
+    luci.list_view_entry(list_view = "infra", builder = name)
+
+def dart_vm_extra_builder(name, on_cq = False, location_regexp = None, **kwargs):
+    """
+    Creates a Dart builder that is only triggered by VM commits.
+
+    Args:
+        name: The builder name.
+        on_cq: Whether the build is added to the default set of CQ tryjobs.
+        location_regexp: Locations that trigger this builder.
+        **kwargs: Extra arguments are passed on to dart_ci_sandbox_builder.
+    """
     triggered_by = ["dart-vm-gitiles-trigger-%s"]
     if on_cq and not location_regexp:
         location_regexp = to_location_regexp(VM_PATHS)
         on_cq = False
-    dart_ci_sandbox_builder(name,
-                            triggered_by=triggered_by,
-                            on_cq=on_cq,
-                            location_regexp=location_regexp,
-                            **kwargs)
-
+    dart_ci_sandbox_builder(
+        name,
+        triggered_by = triggered_by,
+        on_cq = on_cq,
+        location_regexp = location_regexp,
+        **kwargs
+    )
 
 def dart_vm_low_priority_builder(name, **kwargs):
-    dart_vm_extra_builder(name,
-                          channels=["try"],
-                          priority=LOW,
-                          expiration_timeout=time.day,
-                          **kwargs)
-
+    dart_vm_extra_builder(
+        name,
+        channels = ["try"],
+        priority = LOW,
+        expiration_timeout = time.day,
+        **kwargs
+    )
 
 nightly_builders = []
 
-
 def dart_vm_nightly_builder(name, **kwargs):
     dart_ci_sandbox_builder(
         name,
-        notifies=None,
-        on_cq=False,
-        priority=LOW,
-        schedule="triggered",  # triggered by nightly cron builder
-        triggered_by=None,
-        **kwargs)
+        notifies = None,
+        on_cq = False,
+        priority = LOW,
+        schedule = "triggered",  # triggered by nightly cron builder
+        triggered_by = None,
+        **kwargs
+    )
     nightly_builders.append(name)
 
-
 # cfe
-dart_ci_sandbox_builder("front-end-linux-release-x64",
-                        category="cfe|l",
-                        on_cq=True)
-dart_ci_sandbox_builder("front-end-mac-release-x64",
-                        category="cfe|m",
-                        dimensions=mac())
-dart_ci_sandbox_builder("front-end-win-release-x64",
-                        category="cfe|w",
-                        dimensions=windows())
-dart_ci_sandbox_builder("front-end-nnbd-linux-release-x64",
-                        category="cfe|nn",
-                        location_regexp=to_location_regexp(CFE_PATHS))
-dart_ci_sandbox_builder("flutter-frontend",
-                        category="cfe|fl",
-                        channels=["try"],
-                        notifies="frontend-team")
+dart_ci_sandbox_builder(
+    "front-end-linux-release-x64",
+    category = "cfe|l",
+    on_cq = True,
+)
+dart_ci_sandbox_builder(
+    "front-end-mac-release-x64",
+    category = "cfe|m",
+    dimensions = mac(),
+)
+dart_ci_sandbox_builder(
+    "front-end-win-release-x64",
+    category = "cfe|w",
+    dimensions = windows(),
+)
+dart_ci_sandbox_builder(
+    "front-end-nnbd-linux-release-x64",
+    category = "cfe|nn",
+    location_regexp = to_location_regexp(CFE_PATHS),
+)
+dart_ci_sandbox_builder(
+    "flutter-frontend",
+    category = "cfe|fl",
+    channels = ["try"],
+    notifies = "frontend-team",
+)
 
 # flutter
 dart_ci_sandbox_builder(
     "flutter-engine-linux",
-    recipe="dart/flutter_engine",
-    category="flutter|3H",
-    channels=["try"],
-    execution_timeout=8 * time.hour,
-    triggered_by=["dart-gitiles-trigger-flutter"],
+    recipe = "dart/flutter_engine",
+    category = "flutter|3H",
+    channels = ["try"],
+    execution_timeout = 8 * time.hour,
+    triggered_by = ["dart-gitiles-trigger-flutter"],
 )
 
 # vm|nnbd
-dart_vm_extra_builder("vm-kernel-nnbd-linux-debug-x64",
-                      category="vm|nnbd|d",
-                      on_cq=True)
-dart_vm_extra_builder("vm-kernel-nnbd-linux-release-x64",
-                      category="vm|nnbd|r",
-                      on_cq=True)
-dart_vm_extra_builder("vm-kernel-precomp-nnbd-linux-release-x64",
-                      category="vm|nnbd|pr")
+dart_vm_extra_builder(
+    "vm-kernel-nnbd-linux-debug-x64",
+    category = "vm|nnbd|d",
+    on_cq = True,
+)
+dart_vm_extra_builder(
+    "vm-kernel-nnbd-linux-release-x64",
+    category = "vm|nnbd|r",
+    on_cq = True,
+)
+dart_vm_extra_builder(
+    "vm-kernel-precomp-nnbd-linux-release-x64",
+    category = "vm|nnbd|pr",
+)
 
 # vm|app-kernel
-dart_vm_extra_builder("app-kernel-linux-debug-x64",
-                      category="vm|app-kernel|d64")
-dart_vm_extra_builder("app-kernel-linux-product-x64",
-                      category="vm|app-kernel|p64")
-dart_vm_extra_builder("app-kernel-linux-release-x64",
-                      category="vm|app-kernel|r64")
+dart_vm_extra_builder(
+    "app-kernel-linux-debug-x64",
+    category = "vm|app-kernel|d64",
+)
+dart_vm_extra_builder(
+    "app-kernel-linux-product-x64",
+    category = "vm|app-kernel|p64",
+)
+dart_vm_extra_builder(
+    "app-kernel-linux-release-x64",
+    category = "vm|app-kernel|r64",
+)
 
 # vm|dartkb
-dart_vm_extra_builder("vm-dartkb-linux-release-simarm64",
-                      category="vm|dartkb|sr")
-dart_vm_extra_builder("vm-dartkb-linux-release-x64", category="vm|dartkb|r")
-dart_vm_extra_builder("vm-dartkb-linux-release-x64-abi",
-                      category="vm|dartkb|abi")
+dart_vm_extra_builder(
+    "vm-dartkb-linux-release-simarm64",
+    category = "vm|dartkb|sr",
+)
+dart_vm_extra_builder("vm-dartkb-linux-release-x64", category = "vm|dartkb|r")
+dart_vm_extra_builder(
+    "vm-dartkb-linux-release-x64-abi",
+    category = "vm|dartkb|abi",
+)
 
 #vm|kernel
-dart_vm_extra_builder("vm-canary-linux-debug",
-                      category="vm|kernel|c",
-                      on_cq=True)
-dart_ci_sandbox_builder("vm-kernel-linux-debug-x64", category="vm|kernel|d")
-dart_vm_extra_builder("vm-kernel-linux-release-simarm",
-                      category="vm|kernel|a32")
-dart_vm_extra_builder("vm-kernel-linux-release-simarm64",
-                      category="vm|kernel|a64")
-dart_vm_extra_builder("vm-kernel-linux-release-ia32", category="vm|kernel|r32")
-dart_ci_sandbox_builder("vm-kernel-linux-release-x64",
-                        category="vm|kernel|r",
-                        on_cq=True)
-dart_vm_extra_builder("vm-kernel-checked-linux-release-x64",
-                      category="vm|kernel|rc")
-dart_vm_extra_builder("vm-kernel-linux-debug-ia32", category="vm|kernel|d32")
-dart_ci_sandbox_builder("vm-kernel-mac-debug-x64",
-                        category="vm|kernel|md",
-                        dimensions=mac())
-dart_ci_sandbox_builder("vm-kernel-mac-release-x64",
-                        category="vm|kernel|mr",
-                        dimensions=mac(),
-                        on_cq=True,
-                        experiment_percentage=5)
-dart_vm_extra_builder("vm-kernel-win-debug-ia32",
-                      category="vm|kernel|wd3",
-                      dimensions=windows())
-dart_ci_sandbox_builder("vm-kernel-win-debug-x64",
-                        category="vm|kernel|wd",
-                        dimensions=windows())
-dart_vm_extra_builder("vm-kernel-win-release-ia32",
-                      category="vm|kernel|wr3",
-                      dimensions=windows())
-dart_ci_sandbox_builder("vm-kernel-win-release-x64",
-                        category="vm|kernel|wr",
-                        dimensions=windows())
+dart_vm_extra_builder(
+    "vm-canary-linux-debug",
+    category = "vm|kernel|c",
+    on_cq = True,
+)
+dart_ci_sandbox_builder("vm-kernel-linux-debug-x64", category = "vm|kernel|d")
+dart_vm_extra_builder(
+    "vm-kernel-linux-release-simarm",
+    category = "vm|kernel|a32",
+)
+dart_vm_extra_builder(
+    "vm-kernel-linux-release-simarm64",
+    category = "vm|kernel|a64",
+)
+dart_vm_extra_builder("vm-kernel-linux-release-ia32", category = "vm|kernel|r32")
+dart_ci_sandbox_builder(
+    "vm-kernel-linux-release-x64",
+    category = "vm|kernel|r",
+    on_cq = True,
+)
+dart_vm_extra_builder(
+    "vm-kernel-checked-linux-release-x64",
+    category = "vm|kernel|rc",
+)
+dart_vm_extra_builder("vm-kernel-linux-debug-ia32", category = "vm|kernel|d32")
+dart_ci_sandbox_builder(
+    "vm-kernel-mac-debug-x64",
+    category = "vm|kernel|md",
+    dimensions = mac(),
+)
+dart_ci_sandbox_builder(
+    "vm-kernel-mac-release-x64",
+    category = "vm|kernel|mr",
+    dimensions = mac(),
+    on_cq = True,
+    experiment_percentage = 5,
+)
+dart_vm_extra_builder(
+    "vm-kernel-win-debug-ia32",
+    category = "vm|kernel|wd3",
+    dimensions = windows(),
+)
+dart_ci_sandbox_builder(
+    "vm-kernel-win-debug-x64",
+    category = "vm|kernel|wd",
+    dimensions = windows(),
+)
+dart_vm_extra_builder(
+    "vm-kernel-win-release-ia32",
+    category = "vm|kernel|wr3",
+    dimensions = windows(),
+)
+dart_ci_sandbox_builder(
+    "vm-kernel-win-release-x64",
+    category = "vm|kernel|wr",
+    dimensions = windows(),
+)
 dart_vm_extra_builder(
     "cross-vm-linux-release-arm64",
-    category="vm|kernel|cra",
-    channels=RELEASE_CHANNELS,
-    properties={"shard_timeout": (90 * time.minute) / time.second})
+    category = "vm|kernel|cra",
+    channels = RELEASE_CHANNELS,
+    properties = {"shard_timeout": (90 * time.minute) // time.second},
+)
 
 # vm|kernel-precomp
-dart_vm_extra_builder("vm-kernel-precomp-linux-debug-x64",
-                      category="vm|kernel-precomp|d")
-dart_vm_extra_builder("vm-kernel-precomp-linux-product-x64",
-                      category="vm|kernel-precomp|p")
-dart_vm_extra_builder("vm-kernel-precomp-linux-release-simarm",
-                      category="vm|kernel-precomp|a32")
-dart_vm_extra_builder("vm-kernel-precomp-linux-release-simarm64",
-                      category="vm|kernel-precomp|a64")
-dart_vm_extra_builder("vm-kernel-precomp-linux-release-x64",
-                      category="vm|kernel-precomp|r")
-dart_vm_extra_builder("vm-kernel-precomp-obfuscate-linux-release-x64",
-                      category="vm|kernel-precomp|o")
+dart_vm_extra_builder(
+    "vm-kernel-precomp-linux-debug-x64",
+    category = "vm|kernel-precomp|d",
+)
+dart_vm_extra_builder(
+    "vm-kernel-precomp-linux-product-x64",
+    category = "vm|kernel-precomp|p",
+)
+dart_vm_extra_builder(
+    "vm-kernel-precomp-linux-release-simarm",
+    category = "vm|kernel-precomp|a32",
+)
+dart_vm_extra_builder(
+    "vm-kernel-precomp-linux-release-simarm64",
+    category = "vm|kernel-precomp|a64",
+)
+dart_vm_extra_builder(
+    "vm-kernel-precomp-linux-release-x64",
+    category = "vm|kernel-precomp|r",
+)
+dart_vm_extra_builder(
+    "vm-kernel-precomp-obfuscate-linux-release-x64",
+    category = "vm|kernel-precomp|o",
+)
 dart_vm_extra_builder(
     "vm-kernel-precomp-linux-debug-simarm_x64",
-    category="vm|kernel-precomp|adx",
-    properties={"shard_timeout": (90 * time.minute) / time.second})
-dart_vm_extra_builder("vm-kernel-precomp-linux-release-simarm_x64",
-                      category="vm|kernel-precomp|arx")
-dart_vm_extra_builder("vm-kernel-precomp-mac-release-simarm64",
-                      category="vm|kernel-precomp|ma",
-                      dimensions=mac())
-dart_vm_extra_builder("vm-kernel-precomp-win-release-x64",
-                      category="vm|kernel-precomp|wr",
-                      dimensions=windows())
+    category = "vm|kernel-precomp|adx",
+    properties = {"shard_timeout": (90 * time.minute) // time.second},
+)
+dart_vm_extra_builder(
+    "vm-kernel-precomp-linux-release-simarm_x64",
+    category = "vm|kernel-precomp|arx",
+)
+dart_vm_extra_builder(
+    "vm-kernel-precomp-mac-release-simarm64",
+    category = "vm|kernel-precomp|ma",
+    dimensions = mac(),
+)
+dart_vm_extra_builder(
+    "vm-kernel-precomp-win-release-x64",
+    category = "vm|kernel-precomp|wr",
+    dimensions = windows(),
+)
 dart_vm_nightly_builder(
     "cross-vm-precomp-linux-release-arm64",
-    category="vm|kernel-precomp|cra",
-    channels=[],
-    properties={"shard_timeout": (90 * time.minute) / time.second})
+    category = "vm|kernel-precomp|cra",
+    channels = [],
+    properties = {"shard_timeout": (90 * time.minute) // time.second},
+)
 
 # vm|kernel-precomp|android
 dart_vm_extra_builder(
     "vm-kernel-precomp-android-release-arm_x64",
-    category="vm|kernel-precomp|android|a32",
-    properties={"shard_timeout": (90 * time.minute) / time.second})
+    category = "vm|kernel-precomp|android|a32",
+    properties = {"shard_timeout": (90 * time.minute) // time.second},
+)
 dart_vm_extra_builder(
     "vm-kernel-precomp-android-release-arm64",
-    category="vm|kernel-precomp|android|a64",
-    properties={"shard_timeout": (90 * time.minute) / time.second})
+    category = "vm|kernel-precomp|android|a64",
+    properties = {"shard_timeout": (90 * time.minute) // time.second},
+)
 
 # vm|product
-dart_vm_extra_builder("vm-kernel-linux-product-x64",
-                      category="vm|product|l",
-                      on_cq=True)
-dart_ci_sandbox_builder("vm-kernel-mac-product-x64",
-                        category="vm|product|m",
-                        dimensions=mac())
-dart_ci_sandbox_builder("vm-kernel-win-product-x64",
-                        category="vm|product|w",
-                        dimensions=windows())
+dart_vm_extra_builder(
+    "vm-kernel-linux-product-x64",
+    category = "vm|product|l",
+    on_cq = True,
+)
+dart_ci_sandbox_builder(
+    "vm-kernel-mac-product-x64",
+    category = "vm|product|m",
+    dimensions = mac(),
+)
+dart_ci_sandbox_builder(
+    "vm-kernel-win-product-x64",
+    category = "vm|product|w",
+    dimensions = windows(),
+)
 
 # vm|misc
 dart_vm_low_priority_builder(
-    "vm-kernel-optcounter-threshold-linux-release-ia32", category="vm|misc|o32")
-dart_vm_low_priority_builder("vm-kernel-optcounter-threshold-linux-release-x64",
-                             category="vm|misc|o64")
-dart_vm_low_priority_builder("vm-kernel-asan-linux-release-x64",
-                             category="vm|misc|a")
-dart_vm_low_priority_builder("vm-kernel-msan-linux-release-x64",
-                             category="vm|misc|m")
-dart_vm_low_priority_builder("vm-kernel-tsan-linux-release-x64",
-                             category="vm|misc|t")
+    "vm-kernel-optcounter-threshold-linux-release-ia32",
+    category = "vm|misc|o32",
+)
+dart_vm_low_priority_builder(
+    "vm-kernel-optcounter-threshold-linux-release-x64",
+    category = "vm|misc|o64",
+)
+dart_vm_low_priority_builder(
+    "vm-kernel-asan-linux-release-x64",
+    category = "vm|misc|a",
+)
+dart_vm_low_priority_builder(
+    "vm-kernel-msan-linux-release-x64",
+    category = "vm|misc|m",
+)
+dart_vm_low_priority_builder(
+    "vm-kernel-tsan-linux-release-x64",
+    category = "vm|misc|t",
+)
+dart_vm_low_priority_builder(
+    "vm-kernel-ubsan-linux-release-x64",
+    category = "vm|misc|u",
+    goma_rbe = False,
+)  # ubsan is not compatible with our sysroot.
+dart_vm_low_priority_builder(
+    "vm-kernel-precomp-asan-linux-release-x64",
+    category = "vm|misc|aot|a",
+)
 dart_vm_low_priority_builder(
-    "vm-kernel-ubsan-linux-release-x64", category="vm|misc|u",
-    goma_rbe=False)  # ubsan is not compatible with our sysroot.
-dart_vm_low_priority_builder("vm-kernel-precomp-asan-linux-release-x64",
-                             category="vm|misc|aot|a")
-dart_vm_low_priority_builder("vm-kernel-precomp-msan-linux-release-x64",
-                             category="vm|misc|aot|m")
-dart_vm_low_priority_builder("vm-kernel-precomp-tsan-linux-release-x64",
-                             category="vm|misc|aot|t")
+    "vm-kernel-precomp-msan-linux-release-x64",
+    category = "vm|misc|aot|m",
+)
+dart_vm_low_priority_builder(
+    "vm-kernel-precomp-tsan-linux-release-x64",
+    category = "vm|misc|aot|t",
+)
 dart_vm_low_priority_builder(
     "vm-kernel-precomp-ubsan-linux-release-x64",
-    category="vm|misc|aot|u",
-    goma_rbe=False)  # ubsan is not compatible with our sysroot.
-dart_vm_low_priority_builder("vm-kernel-reload-linux-debug-x64",
-                             category="vm|misc|reload|d")
-dart_vm_low_priority_builder("vm-kernel-reload-linux-release-x64",
-                             category="vm|misc|reload|r")
-dart_vm_low_priority_builder("vm-kernel-reload-rollback-linux-debug-x64",
-                             category="vm|misc|reload|drb")
-dart_vm_low_priority_builder("vm-kernel-reload-rollback-linux-release-x64",
-                             category="vm|misc|reload|rrb")
-dart_vm_low_priority_builder("vm-fuchsia-release-x64", category="vm|misc|f")
+    category = "vm|misc|aot|u",
+    goma_rbe = False,
+)  # ubsan is not compatible with our sysroot.
+dart_vm_low_priority_builder(
+    "vm-kernel-reload-linux-debug-x64",
+    category = "vm|misc|reload|d",
+)
+dart_vm_low_priority_builder(
+    "vm-kernel-reload-linux-release-x64",
+    category = "vm|misc|reload|r",
+)
+dart_vm_low_priority_builder(
+    "vm-kernel-reload-rollback-linux-debug-x64",
+    category = "vm|misc|reload|drb",
+)
+dart_vm_low_priority_builder(
+    "vm-kernel-reload-rollback-linux-release-x64",
+    category = "vm|misc|reload|rrb",
+)
+dart_vm_low_priority_builder("vm-fuchsia-release-x64", category = "vm|misc|f")
 
 # vm|ffi
-dart_vm_extra_builder("vm-ffi-android-debug-arm", category="vm|ffi|d32")
-dart_vm_extra_builder("vm-ffi-android-release-arm", category="vm|ffi|r32")
-dart_vm_extra_builder("vm-ffi-android-product-arm", category="vm|ffi|p32")
-dart_vm_extra_builder("vm-ffi-android-debug-arm64", category="vm|ffi|d64")
-dart_vm_extra_builder("vm-ffi-android-release-arm64", category="vm|ffi|r64")
-dart_vm_extra_builder("vm-ffi-android-product-arm64", category="vm|ffi|p64")
-dart_vm_extra_builder("vm-precomp-ffi-qemu-linux-release-arm",
-                      category="vm|ffi|qe")
+dart_vm_extra_builder("vm-ffi-android-debug-arm", category = "vm|ffi|d32")
+dart_vm_extra_builder("vm-ffi-android-release-arm", category = "vm|ffi|r32")
+dart_vm_extra_builder("vm-ffi-android-product-arm", category = "vm|ffi|p32")
+dart_vm_extra_builder("vm-ffi-android-debug-arm64", category = "vm|ffi|d64")
+dart_vm_extra_builder("vm-ffi-android-release-arm64", category = "vm|ffi|r64")
+dart_vm_extra_builder("vm-ffi-android-product-arm64", category = "vm|ffi|p64")
+dart_vm_extra_builder(
+    "vm-precomp-ffi-qemu-linux-release-arm",
+    category = "vm|ffi|qe",
+)
 
 # pkg
-dart_ci_sandbox_builder("pkg-linux-release",
-                        category="pkg|l",
-                        on_cq=True,
-                        properties=CHROME)
-dart_ci_sandbox_builder("pkg-mac-release",
-                        category="pkg|m",
-                        dimensions=mac(),
-                        properties=CHROME)
-dart_ci_sandbox_builder("pkg-win-release",
-                        category="pkg|w",
-                        dimensions=windows(),
-                        properties=CHROME)
-dart_ci_sandbox_builder("pkg-linux-debug",
-                        category="pkg|ld",
-                        channels=["try"],
-                        properties=CHROME)
+dart_ci_sandbox_builder(
+    "pkg-linux-release",
+    category = "pkg|l",
+    on_cq = True,
+    properties = CHROME,
+)
+dart_ci_sandbox_builder(
+    "pkg-mac-release",
+    category = "pkg|m",
+    dimensions = mac(),
+    properties = CHROME,
+)
+dart_ci_sandbox_builder(
+    "pkg-win-release",
+    category = "pkg|w",
+    dimensions = windows(),
+    properties = CHROME,
+)
+dart_ci_sandbox_builder(
+    "pkg-linux-debug",
+    category = "pkg|ld",
+    channels = ["try"],
+    properties = CHROME,
+)
 
 # dart2js
-dart_ci_sandbox_builder("dart2js-strong-hostasserts-linux-ia32-d8",
-                        category="dart2js|d8|ha",
-                        location_regexp=to_location_regexp(DART2JS_PATHS))
-dart_ci_sandbox_builder("dart2js-rti-linux-x64-d8", category="dart2js|d8|rti")
-dart_ci_sandbox_builder("dart2js-minified-strong-linux-x64-d8",
-                        category="dart2js|d8|mi",
-                        location_regexp=to_location_regexp(DART2JS_PATHS))
-dart_ci_sandbox_builder("dart2js-unit-linux-x64-release",
-                        category="dart2js|d8|u",
-                        location_regexp=to_location_regexp(DART2JS_PATHS))
-dart_ci_sandbox_builder("dart2js-strong-linux-x64-chrome",
-                        category="dart2js|chrome|l",
-                        location_regexp=to_location_regexp(DART2JS_PATHS))
-dart_ci_sandbox_builder("dart2js-csp-minified-linux-x64-chrome",
-                        category="dart2js|chrome|csp")
-dart_ci_sandbox_builder("dart2js-strong-mac-x64-chrome",
-                        category="dart2js|chrome|m",
-                        dimensions=mac())
-dart_ci_sandbox_builder("dart2js-strong-win-x64-chrome",
-                        category="dart2js|chrome|w",
-                        dimensions=windows())
-dart_ci_sandbox_builder("dart2js-nnbd-linux-x64-chrome",
-                        category="dart2js|chrome|nn",
-                        location_regexp=to_location_regexp(DART2JS_PATHS))
-dart_ci_sandbox_builder("dart2js-strong-linux-x64-firefox",
-                        category="dart2js|firefox|l")
-dart_ci_sandbox_builder("dart2js-strong-win-x64-firefox",
-                        category="dart2js|firefox|w",
-                        dimensions=windows(),
-                        enabled=False)
-dart_ci_sandbox_builder("dart2js-strong-mac-x64-safari",
-                        category="dart2js|safari|m",
-                        dimensions=mac())
-dart_ci_sandbox_builder("dart2js-strong-win-x64-ie11",
-                        category="dart2js|ms|ie",
-                        dimensions=windows())
+dart_ci_sandbox_builder(
+    "dart2js-strong-hostasserts-linux-ia32-d8",
+    category = "dart2js|d8|ha",
+    location_regexp = to_location_regexp(DART2JS_PATHS),
+)
+dart_ci_sandbox_builder("dart2js-rti-linux-x64-d8", category = "dart2js|d8|rti")
+dart_ci_sandbox_builder(
+    "dart2js-minified-strong-linux-x64-d8",
+    category = "dart2js|d8|mi",
+    location_regexp = to_location_regexp(DART2JS_PATHS),
+)
+dart_ci_sandbox_builder(
+    "dart2js-unit-linux-x64-release",
+    category = "dart2js|d8|u",
+    location_regexp = to_location_regexp(DART2JS_PATHS),
+)
+dart_ci_sandbox_builder(
+    "dart2js-strong-linux-x64-chrome",
+    category = "dart2js|chrome|l",
+    location_regexp = to_location_regexp(DART2JS_PATHS),
+)
+dart_ci_sandbox_builder(
+    "dart2js-csp-minified-linux-x64-chrome",
+    category = "dart2js|chrome|csp",
+)
+dart_ci_sandbox_builder(
+    "dart2js-strong-mac-x64-chrome",
+    category = "dart2js|chrome|m",
+    dimensions = mac(),
+)
+dart_ci_sandbox_builder(
+    "dart2js-strong-win-x64-chrome",
+    category = "dart2js|chrome|w",
+    dimensions = windows(),
+)
+dart_ci_sandbox_builder(
+    "dart2js-nnbd-linux-x64-chrome",
+    category = "dart2js|chrome|nn",
+    location_regexp = to_location_regexp(DART2JS_PATHS),
+)
+dart_ci_sandbox_builder(
+    "dart2js-strong-linux-x64-firefox",
+    category = "dart2js|firefox|l",
+)
+dart_ci_sandbox_builder(
+    "dart2js-strong-win-x64-firefox",
+    category = "dart2js|firefox|w",
+    dimensions = windows(),
+    enabled = False,
+)
+dart_ci_sandbox_builder(
+    "dart2js-strong-mac-x64-safari",
+    category = "dart2js|safari|m",
+    dimensions = mac(),
+)
+dart_ci_sandbox_builder(
+    "dart2js-strong-win-x64-ie11",
+    category = "dart2js|ms|ie",
+    dimensions = windows(),
+)
 
 # analyzer
-dart_ci_sandbox_builder("flutter-analyze",
-                        category="analyzer|fa",
-                        channels=["try"],
-                        notifies=None,
-                        location_regexp=[
-                            ".+/[+]/DEPS",
-                            ".+/[+]/pkg/analysis_server/.+",
-                            ".+/[+]/pkg/analysis_server_client/.+",
-                            ".+/[+]/pkg/analyzer/.+",
-                            ".+/[+]/pkg/analyzer_plugin/.+",
-                            ".+/[+]/pkg/front_end/.+",
-                            ".+/[+]/pkg/_fe_analyzer_shared/.+",
-                            ".+/[+]/pkg/meta/.+",
-                            ".+/[+]/pkg/telemetry/.+",
-                        ])
-dart_ci_sandbox_builder("analyzer-analysis-server-linux",
-                        category="analyzer|as",
-                        location_regexp=to_location_regexp(ANALYZER_PATHS),
-                        channels=CHANNELS)
-dart_ci_sandbox_builder("analyzer-linux-release",
-                        category="analyzer|l",
-                        location_regexp=to_location_regexp(ANALYZER_PATHS),
-                        channels=CHANNELS)
-dart_ci_sandbox_builder("analyzer-nnbd-linux-release",
-                        category="analyzer|nn",
-                        location_regexp=to_location_regexp(ANALYZER_NNBD_PATHS),
-                        channels=CHANNELS)
-dart_ci_sandbox_builder("analyzer-mac-release",
-                        category="analyzer|m",
-                        dimensions=mac(),
-                        channels=CHANNELS)
-dart_ci_sandbox_builder("analyzer-win-release",
-                        category="analyzer|w",
-                        dimensions=windows(),
-                        channels=CHANNELS)
+dart_ci_sandbox_builder(
+    "flutter-analyze",
+    category = "analyzer|fa",
+    channels = ["try"],
+    notifies = None,
+    location_regexp = [
+        ".+/[+]/DEPS",
+        ".+/[+]/pkg/analysis_server/.+",
+        ".+/[+]/pkg/analysis_server_client/.+",
+        ".+/[+]/pkg/analyzer/.+",
+        ".+/[+]/pkg/analyzer_plugin/.+",
+        ".+/[+]/pkg/front_end/.+",
+        ".+/[+]/pkg/_fe_analyzer_shared/.+",
+        ".+/[+]/pkg/meta/.+",
+        ".+/[+]/pkg/telemetry/.+",
+    ],
+)
+dart_ci_sandbox_builder(
+    "analyzer-analysis-server-linux",
+    category = "analyzer|as",
+    location_regexp = to_location_regexp(ANALYZER_PATHS),
+    channels = CHANNELS,
+)
+dart_ci_sandbox_builder(
+    "analyzer-linux-release",
+    category = "analyzer|l",
+    location_regexp = to_location_regexp(ANALYZER_PATHS),
+    channels = CHANNELS,
+)
+dart_ci_sandbox_builder(
+    "analyzer-nnbd-linux-release",
+    category = "analyzer|nn",
+    location_regexp = to_location_regexp(ANALYZER_NNBD_PATHS),
+    channels = CHANNELS,
+)
+dart_ci_sandbox_builder(
+    "analyzer-mac-release",
+    category = "analyzer|m",
+    dimensions = mac(),
+    channels = CHANNELS,
+)
+dart_ci_sandbox_builder(
+    "analyzer-win-release",
+    category = "analyzer|w",
+    dimensions = windows(),
+    channels = CHANNELS,
+)
 
 # sdk
-dart_ci_builder("dart-sdk-linux", category="sdk|l", channels=CHANNELS)
-dart_ci_builder("dart-sdk-mac",
-                category="sdk|m",
-                channels=CHANNELS,
-                dimensions=mac())
-dart_ci_builder("dart-sdk-win",
-                category="sdk|w",
-                channels=CHANNELS,
-                dimensions=windows(),
-                on_cq=True)
+dart_ci_builder("dart-sdk-linux", category = "sdk|l", channels = CHANNELS)
+dart_ci_builder(
+    "dart-sdk-mac",
+    category = "sdk|m",
+    channels = CHANNELS,
+    dimensions = mac(),
+)
+dart_ci_builder(
+    "dart-sdk-win",
+    category = "sdk|w",
+    channels = CHANNELS,
+    dimensions = windows(),
+    on_cq = True,
+)
 
 # ddc
-dart_ci_sandbox_builder("ddc-linux-release-chrome",
-                        category="ddc|l",
-                        location_regexp=to_location_regexp(DDC_PATHS))
-dart_ci_sandbox_builder("ddc-nnbd-linux-release-chrome",
-                        category="ddc|nn",
-                        channels=["try"],
-                        location_regexp=to_location_regexp(DDC_PATHS))
-dart_ci_sandbox_builder("ddc-mac-release-chrome",
-                        category="ddc|m",
-                        dimensions=mac())
-dart_ci_sandbox_builder("ddc-win-release-chrome",
-                        category="ddc|w",
-                        dimensions=windows())
-dart_ci_sandbox_builder("ddk-linux-release-firefox", category="ddc|fl")
+dart_ci_sandbox_builder(
+    "ddc-linux-release-chrome",
+    category = "ddc|l",
+    location_regexp = to_location_regexp(DDC_PATHS),
+)
+dart_ci_sandbox_builder(
+    "ddc-nnbd-linux-release-chrome",
+    category = "ddc|nn",
+    channels = ["try"],
+    location_regexp = to_location_regexp(DDC_PATHS),
+)
+dart_ci_sandbox_builder(
+    "ddc-mac-release-chrome",
+    category = "ddc|m",
+    dimensions = mac(),
+)
+dart_ci_sandbox_builder(
+    "ddc-win-release-chrome",
+    category = "ddc|w",
+    dimensions = windows(),
+)
+dart_ci_sandbox_builder("ddk-linux-release-firefox", category = "ddc|fl")
 
 # misc
-dart_ci_sandbox_builder("gclient", recipe="dart/gclient", category="misc|g")
-dart_ci_builder("debianpackage-linux",
-                category="misc|dp",
-                channels=RELEASE_CHANNELS,
-                notifies="infra")
-dart_ci_builder("versionchecker-linux",
-                category="misc|vc",
-                channels=RELEASE_CHANNELS)
+dart_ci_sandbox_builder("gclient", recipe = "dart/gclient", category = "misc|g")
+dart_ci_builder(
+    "debianpackage-linux",
+    category = "misc|dp",
+    channels = RELEASE_CHANNELS,
+    notifies = "infra",
+)
+dart_ci_builder(
+    "versionchecker-linux",
+    category = "misc|vc",
+    channels = RELEASE_CHANNELS,
+)
 
 # external
-dart_infra_builder("google",
-                   recipe="dart/external",
-                   category="external|g",
-                   enabled=False,
-                   fyi=True)
+dart_infra_builder(
+    "google",
+    recipe = "dart/external",
+    category = "external|g",
+    enabled = False,
+    fyi = True,
+)
 
 # infra
-dart_infra_builder("base",
-                   execution_timeout=15 * time.minute,
-                   recipe="dart/forward_branch",
-                   schedule="with 15m interval",
-                   notifies=None)
-dart_infra_builder("chocolatey", recipe="dart/chocolatey", dimensions=windows())
-dart_infra_builder("co19-roller", recipe="dart/package_co19")
-dart_infra_builder("docker", recipe="dart/docker")
+dart_infra_builder(
+    "base",
+    execution_timeout = 15 * time.minute,
+    recipe = "dart/forward_branch",
+    schedule = "with 15m interval",
+    notifies = None,
+)
+dart_infra_builder("chocolatey", recipe = "dart/chocolatey", dimensions = windows())
+dart_infra_builder("co19-roller", recipe = "dart/package_co19")
+dart_infra_builder("docker", recipe = "dart/docker")
 dart_infra_builder(
     "linearize-flutter",
-    recipe="dart/linearize",
-    properties={
-        "repo": "https://dart.googlesource.com/linear_sdk_flutter_engine.git"
+    recipe = "dart/linearize",
+    properties = {
+        "repo": "https://dart.googlesource.com/linear_sdk_flutter_engine.git",
     },
-    notifies="infra",
-    triggered_by=[
-        "dart-gitiles-trigger-master", "dart-flutter-engine-trigger",
-        "dart-flutter-flutter-trigger"
+    notifies = "infra",
+    triggered_by = [
+        "dart-gitiles-trigger-master",
+        "dart-flutter-engine-trigger",
+        "dart-flutter-flutter-trigger",
     ],
-    triggering_policy=scheduler.greedy_batching(max_batch_size=1),
+    triggering_policy = scheduler.greedy_batching(max_batch_size = 1),
 )
 dart_infra_builder(
     "nightly",
-    notifies="infra",
-    properties={"builders": nightly_builders},
-    recipe="cron/cron",
-    schedule="0 5 * * *",  # daily, at 05:00 UTC
+    notifies = "infra",
+    properties = {"builders": nightly_builders},
+    recipe = "cron/cron",
+    schedule = "0 5 * * *",  # daily, at 05:00 UTC
 )
 
 dart_ci_sandbox_builder(
-   "ci-test-data",
-   channels=[],
-   properties={"bisection_enabled": True},
-   notifies="ci-test-data",
-   triggered_by=["dart-ci-test-data-trigger"],
+    "ci-test-data",
+    channels = [],
+    properties = {"bisection_enabled": True},
+    notifies = "ci-test-data",
+    triggered_by = ["dart-ci-test-data-trigger"],
 )
 
 # Fuzz testing builders
 dart_ci_sandbox_builder(
     "fuzz-linux",
-    channels=[],
-    notifies="dart-fuzz-testing",
-    schedule="0 3,4 * * *",
-    triggered_by=None,
+    channels = [],
+    notifies = "dart-fuzz-testing",
+    schedule = "0 3,4 * * *",
+    triggered_by = None,
 )
 
 # Try only builders
-dart_try_builder("benchmark-linux", on_cq=True)
+dart_try_builder("benchmark-linux", on_cq = True)
+
 # Our sysroot does not support gcc, we can't use goma on RBE for this builder
-dart_try_builder("vm-kernel-gcc-linux", goma_rbe=False)
+dart_try_builder("vm-kernel-gcc-linux", goma_rbe = False)
 dart_try_builder(
     "presubmit",
-    bucket="try.shared",
-    execution_timeout=5 * time.minute,
-    recipe="presubmit/presubmit",
+    bucket = "try.shared",
+    execution_timeout = 5 * time.minute,
+    recipe = "presubmit/presubmit",
 )
 
-
 def add_postponed_alt_console_entries():
     for entry in postponed_alt_console_entries:
-        luci.console_view_entry(console_view="alt", **entry)
-
+        luci.console_view_entry(console_view = "alt", **entry)
 
 add_postponed_alt_console_entries()
 
 # Flutter consoles
 luci.console_view_entry(
-    builder="flutter-analyze",
-    short_name="fa",
-    category="analyzer",
-    console_view="flutter",
+    builder = "flutter-analyze",
+    short_name = "fa",
+    category = "analyzer",
+    console_view = "flutter",
 )
 
 luci.console_view_entry(
-    builder="flutter-frontend",
-    short_name="fl",
-    category="fasta",
-    console_view="flutter",
+    builder = "flutter-frontend",
+    short_name = "fl",
+    category = "fasta",
+    console_view = "flutter",
 )
 
 luci.console_view_entry(
-    builder="flutter-engine-linux",
-    short_name="3H",
-    category="flutter",
-    console_view="flutter-hhh",
+    builder = "flutter-engine-linux",
+    short_name = "3H",
+    category = "flutter",
+    console_view = "flutter-hhh",
 )
 
 # Rolls dart recipe dependencies.
 dart_infra_builder(
-    name="recipe-deps-roller",
-    executable=luci.recipe(
-        name="recipe_autoroller",
-        cipd_package=
-        "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
-        cipd_version="git_revision:905c1df843d7771bf3adc0cf21f58eb9498ff063"),
-    execution_timeout=20 * time.minute,
-    expiration_timeout=time.day,
-    priority=LOW,
-    properties={
+    name = "recipe-deps-roller",
+    executable = luci.recipe(
+        name = "recipe_autoroller",
+        cipd_package =
+            "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
+        cipd_version = "git_revision:905c1df843d7771bf3adc0cf21f58eb9498ff063",
+    ),
+    execution_timeout = 20 * time.minute,
+    expiration_timeout = time.day,
+    priority = LOW,
+    properties = {
         "db_gcs_bucket": "dart-recipe-roller-db",
         "projects": {
             "dart": "https://dart.googlesource.com/recipes",
         }.items(),  # recipe_autoroller expects a list of tuples.
     },
-    schedule="with 4h interval",
+    schedule = "with 4h interval",
 )
 
 dart_infra_builder(
-    name="recipe-bundler",
-    executable=luci.recipe(
-        name="recipe_bundler",
-        cipd_package=
-        "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
-        cipd_version="git_revision:40621e908eb88bd10451ee9d013b7ef89ea91e37",
+    name = "recipe-bundler",
+    executable = luci.recipe(
+        name = "recipe_bundler",
+        cipd_package =
+            "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
+        cipd_version = "git_revision:40621e908eb88bd10451ee9d013b7ef89ea91e37",
     ),
-    execution_timeout=5 * time.minute,
-    properties={
+    execution_timeout = 5 * time.minute,
+    properties = {
         # This property controls the version of the recipe_bundler go tool:
         #   https://chromium.googlesource.com/infra/infra/+/master/go/src/infra/tools/recipe_bundler
-        "recipe_bundler_vers":
-            "git_revision:2ed88b2c854578b512e1c0486824175fe0d7aab6",
+        "recipe_bundler_vers": "git_revision:2ed88b2c854578b512e1c0486824175fe0d7aab6",
         # These control the prefix of the CIPD package names that the tool
         # will create.
-        "package_name_prefix":
-            "dart/recipe_bundles",
-        "package_name_internal_prefix":
-            "dart_internal/recipe_bundles",
+        "package_name_prefix": "dart/recipe_bundles",
+        "package_name_internal_prefix": "dart_internal/recipe_bundles",
         # Where to grab the recipes to bundle.
         "repo_specs": [
             "dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/master",
         ],
     },
-    schedule="*/30 * * * *",
-    triggered_by=[
+    schedule = "*/30 * * * *",
+    triggered_by = [
         luci.gitiles_poller(
-            name="recipes-dart",
-            bucket="ci",
-            repo="https://dart.googlesource.com/recipes",
-            refs=["refs/heads/master"],
+            name = "recipes-dart",
+            bucket = "ci",
+            repo = "https://dart.googlesource.com/recipes",
+            refs = ["refs/heads/master"],
         ),
     ],
 )

From b1cd62e3c7cb8a3536c84b1997b55c8cb4ae8267 Mon Sep 17 00:00:00 2001
From: Karl Klose <karlklose@google.com>
Date: Tue, 7 Jul 2020 08:22:58 +0000
Subject: [PATCH 391/826] [infra] Remove builder 'dart2js-rti-linux-x64-d8'

Change-Id: Ie1389989f9e8783e6d3c3fa4ecbbae1f111e9c8a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/151396
Reviewed-by: William Hesse <whesse@google.com>
---
 commit-queue.cfg   |   4 --
 cr-buildbucket.cfg | 125 ---------------------------------------------
 luci-milo.cfg      |  28 ----------
 luci-notify.cfg    |  14 -----
 luci-scheduler.cfg |  44 ----------------
 main.star          |   1 -
 6 files changed, 216 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 7b28bbd98b3a..651675d237d3 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -187,10 +187,6 @@ config_groups {
         location_regexp: ".+/[+]/utils/compiler/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
       }
-      builders {
-        name: "dart/try/dart2js-rti-linux-x64-d8-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/dart2js-strong-hostasserts-linux-ia32-d8-try"
         location_regexp: ".+/[+]/DEPS"
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 5af708ee6037..8c4bf6d2a078 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -2022,106 +2022,6 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
-    builders {
-      name: "dart2js-rti-linux-x64-d8"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "dart2js-rti-linux-x64-d8-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "dart2js-rti-linux-x64-d8-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "dart2js-rti-linux-x64-d8-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
     builders {
       name: "dart2js-strong-hostasserts-linux-ia32-d8"
       swarming_host: "chromium-swarm.appspot.com"
@@ -9221,31 +9121,6 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
-    builders {
-      name: "dart2js-rti-linux-x64-d8-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 30
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
     builders {
       name: "dart2js-strong-hostasserts-linux-ia32-d8-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index d74501b96471..cfc9d888f9e9 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -375,11 +375,6 @@ consoles {
     category: "dart2js|d8"
     short_name: "ha"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-rti-linux-x64-d8"
-    category: "dart2js|d8"
-    short_name: "rti"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
     category: "dart2js|d8"
@@ -617,11 +612,6 @@ consoles {
     category: "dart2js|d8"
     short_name: "ha"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-rti-linux-x64-d8"
-    category: "dart2js|d8"
-    short_name: "rti"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
     category: "dart2js|d8"
@@ -1384,11 +1374,6 @@ consoles {
     category: "dart2js|d8"
     short_name: "ha"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-rti-linux-x64-d8-dev"
-    category: "dart2js|d8"
-    short_name: "rti"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-dev"
     category: "dart2js|d8"
@@ -1826,11 +1811,6 @@ consoles {
     category: "dart2js|d8"
     short_name: "ha"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-rti-linux-x64-d8-beta"
-    category: "dart2js|d8"
-    short_name: "rti"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-beta"
     category: "dart2js|d8"
@@ -2268,11 +2248,6 @@ consoles {
     category: "dart2js|d8"
     short_name: "ha"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-rti-linux-x64-d8-stable"
-    category: "dart2js|d8"
-    short_name: "rti"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-stable"
     category: "dart2js|d8"
@@ -2691,9 +2666,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/dart2js-strong-hostasserts-linux-ia32-d8-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/dart2js-rti-linux-x64-d8-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/dart2js-minified-strong-linux-x64-d8-try"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index f51082846c11..00205bf49e4f 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -356,20 +356,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "dart2js-rti-linux-x64-d8"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 48b060464c58..ea9de2da2dc7 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -654,46 +654,6 @@ job {
     builder: "dart2js-nnbd-linux-x64-chrome-stable"
   }
 }
-job {
-  id: "dart2js-rti-linux-x64-d8"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-rti-linux-x64-d8"
-  }
-}
-job {
-  id: "dart2js-rti-linux-x64-d8-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-rti-linux-x64-d8-beta"
-  }
-}
-job {
-  id: "dart2js-rti-linux-x64-d8-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-rti-linux-x64-d8-dev"
-  }
-}
-job {
-  id: "dart2js-rti-linux-x64-d8-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-rti-linux-x64-d8-stable"
-  }
-}
 job {
   id: "dart2js-strong-hostasserts-linux-ia32-d8"
   schedule: "triggered"
@@ -3566,7 +3526,6 @@ trigger {
   triggers: "dart2js-csp-minified-linux-x64-chrome-beta"
   triggers: "dart2js-minified-strong-linux-x64-d8-beta"
   triggers: "dart2js-nnbd-linux-x64-chrome-beta"
-  triggers: "dart2js-rti-linux-x64-d8-beta"
   triggers: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
   triggers: "dart2js-strong-linux-x64-chrome-beta"
   triggers: "dart2js-strong-linux-x64-firefox-beta"
@@ -3654,7 +3613,6 @@ trigger {
   triggers: "dart2js-csp-minified-linux-x64-chrome-dev"
   triggers: "dart2js-minified-strong-linux-x64-d8-dev"
   triggers: "dart2js-nnbd-linux-x64-chrome-dev"
-  triggers: "dart2js-rti-linux-x64-d8-dev"
   triggers: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
   triggers: "dart2js-strong-linux-x64-chrome-dev"
   triggers: "dart2js-strong-linux-x64-firefox-dev"
@@ -3748,7 +3706,6 @@ trigger {
   triggers: "dart2js-csp-minified-linux-x64-chrome"
   triggers: "dart2js-minified-strong-linux-x64-d8"
   triggers: "dart2js-nnbd-linux-x64-chrome"
-  triggers: "dart2js-rti-linux-x64-d8"
   triggers: "dart2js-strong-hostasserts-linux-ia32-d8"
   triggers: "dart2js-strong-linux-x64-chrome"
   triggers: "dart2js-strong-linux-x64-firefox"
@@ -3806,7 +3763,6 @@ trigger {
   triggers: "dart2js-csp-minified-linux-x64-chrome-stable"
   triggers: "dart2js-minified-strong-linux-x64-d8-stable"
   triggers: "dart2js-nnbd-linux-x64-chrome-stable"
-  triggers: "dart2js-rti-linux-x64-d8-stable"
   triggers: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
   triggers: "dart2js-strong-linux-x64-chrome-stable"
   triggers: "dart2js-strong-linux-x64-firefox-stable"
diff --git a/main.star b/main.star
index ad247e04f81a..e74c8c17a5cb 100755
--- a/main.star
+++ b/main.star
@@ -989,7 +989,6 @@ dart_ci_sandbox_builder(
     category = "dart2js|d8|ha",
     location_regexp = to_location_regexp(DART2JS_PATHS),
 )
-dart_ci_sandbox_builder("dart2js-rti-linux-x64-d8", category = "dart2js|d8|rti")
 dart_ci_sandbox_builder(
     "dart2js-minified-strong-linux-x64-d8",
     category = "dart2js|d8|mi",

From e0093ab905dd3e60c01db0a69396bd2de38d6b94 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 7 Jul 2020 08:50:19 +0000
Subject: [PATCH 392/826] [infra] Raise the timeout for the presubmit builder
 to 10 minutes

On the SDK checkout, a bot_update might take 5 minutes on empty caches.

Change-Id: I310d3695cdcb322a48d35e3725e19586f34572e0
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/153352
Auto-Submit: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
Commit-Queue: Karl Klose <karlklose@google.com>
Reviewed-by: Karl Klose <karlklose@google.com>
---
 cr-buildbucket.cfg | 2 +-
 main.star          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 8c4bf6d2a078..149b8bb5634b 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -11219,7 +11219,7 @@ buckets {
         properties_j: "clobber:\"true\""
       }
       priority: 30
-      execution_timeout_secs: 300
+      execution_timeout_secs: 600
       caches {
         name: "browsers"
         path: "browsers"
diff --git a/main.star b/main.star
index e74c8c17a5cb..c1d78bd2f4f9 100755
--- a/main.star
+++ b/main.star
@@ -1214,7 +1214,7 @@ dart_try_builder("vm-kernel-gcc-linux", goma_rbe = False)
 dart_try_builder(
     "presubmit",
     bucket = "try.shared",
-    execution_timeout = 5 * time.minute,
+    execution_timeout = 10 * time.minute,
     recipe = "presubmit/presubmit",
 )
 

From 190085d8c5d5cf9dec2d4f2d9a26a514042665b5 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 10 Jul 2020 11:37:38 +0000
Subject: [PATCH 393/826] [infra] Use the gclient provided browsers on all
 builders

This should land after the corresponding recipe change landed:
https://dart-review.googlesource.com/c/recipes/+/153120

https://github.com/dart-lang/sdk/issues/42417

Change-Id: I0eb569e3b0c9c1d401c7924b5e021b259e6638a4
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/153206
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 251 +++++++++++++++++++++++++++------------------
 main.star          |  20 +++-
 2 files changed, 170 insertions(+), 101 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 149b8bb5634b..89548da20975 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1738,6 +1738,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -1763,6 +1764,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -1788,6 +1790,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -1813,6 +1816,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -1938,6 +1942,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -1963,6 +1968,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -1988,6 +1994,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -2013,6 +2020,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -2138,6 +2146,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -2163,6 +2172,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -2188,6 +2198,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -2213,6 +2224,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -2238,6 +2250,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_firefox\":true}"
       }
       priority: 50
       caches {
@@ -2263,6 +2276,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_firefox\":true}"
       }
       priority: 50
       caches {
@@ -2288,6 +2302,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_firefox\":true}"
       }
       priority: 50
       caches {
@@ -2313,6 +2328,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_firefox\":true}"
       }
       priority: 50
       caches {
@@ -2337,6 +2353,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -2361,6 +2378,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -2385,6 +2403,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -2409,6 +2428,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -2529,6 +2549,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -2553,6 +2574,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -2577,6 +2599,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -2601,6 +2624,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -2625,6 +2649,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_firefox\":true}"
       }
       priority: 50
       caches {
@@ -2846,6 +2871,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -2871,6 +2897,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -2896,6 +2923,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -2921,6 +2949,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -2945,6 +2974,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -2969,6 +2999,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -2993,6 +3024,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -3017,6 +3049,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -3042,6 +3075,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -3066,6 +3100,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -3090,6 +3125,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -3114,6 +3150,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -3138,6 +3175,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
       caches {
@@ -3163,6 +3201,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_firefox\":true}"
       }
       priority: 50
       caches {
@@ -3188,6 +3227,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_firefox\":true}"
       }
       priority: 50
       caches {
@@ -3213,6 +3253,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_firefox\":true}"
       }
       priority: 50
       caches {
@@ -3238,6 +3279,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_firefox\":true}"
       }
       priority: 50
       caches {
@@ -8770,7 +8812,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8795,7 +8837,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8819,7 +8861,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8844,7 +8886,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8868,7 +8910,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8893,7 +8935,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8918,7 +8960,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8943,7 +8985,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8968,7 +9010,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8993,7 +9035,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9017,7 +9059,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9041,7 +9083,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9062,11 +9104,12 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9091,7 +9134,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9112,11 +9155,12 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9141,7 +9185,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9162,11 +9206,12 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9187,11 +9232,12 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_firefox\":true}"
       }
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9211,11 +9257,12 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9239,7 +9286,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9259,11 +9306,12 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9287,7 +9335,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9312,7 +9360,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9333,11 +9381,12 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9357,11 +9406,12 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9382,11 +9432,12 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9406,11 +9457,12 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9431,11 +9483,12 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_firefox\":true}"
       }
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9460,7 +9513,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9486,7 +9539,7 @@ buckets {
       execution_timeout_secs: 28800
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9511,7 +9564,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9536,7 +9589,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9560,7 +9613,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9585,7 +9638,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9609,7 +9662,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9634,7 +9687,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9660,7 +9713,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9686,7 +9739,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9711,7 +9764,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9736,7 +9789,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9761,7 +9814,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9786,7 +9839,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9811,7 +9864,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9836,7 +9889,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9861,7 +9914,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9886,7 +9939,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9911,7 +9964,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9936,7 +9989,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9961,7 +10014,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9986,7 +10039,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10011,7 +10064,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10036,7 +10089,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10061,7 +10114,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10085,7 +10138,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10110,7 +10163,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10135,7 +10188,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10160,7 +10213,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10185,7 +10238,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10210,7 +10263,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10235,7 +10288,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10260,7 +10313,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10284,7 +10337,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10308,7 +10361,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10332,7 +10385,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10357,7 +10410,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10382,7 +10435,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10407,7 +10460,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10432,7 +10485,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10457,7 +10510,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10483,7 +10536,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10509,7 +10562,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10534,7 +10587,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10560,7 +10613,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10585,7 +10638,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10610,7 +10663,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10635,7 +10688,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10660,7 +10713,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10685,7 +10738,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10710,7 +10763,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10734,7 +10787,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10759,7 +10812,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10784,7 +10837,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10809,7 +10862,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10834,7 +10887,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10858,7 +10911,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10882,7 +10935,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10907,7 +10960,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10932,7 +10985,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10957,7 +11010,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10982,7 +11035,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -11007,7 +11060,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -11031,7 +11084,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -11055,7 +11108,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -11079,7 +11132,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -11103,7 +11156,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -11127,7 +11180,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -11151,7 +11204,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -11176,7 +11229,7 @@ buckets {
       priority: 30
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -11222,7 +11275,7 @@ buckets {
       execution_timeout_secs: 600
       caches {
         name: "browsers"
-        path: "browsers"
+        path: "third_party/browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
diff --git a/main.star b/main.star
index c1d78bd2f4f9..8d22b59c74a8 100755
--- a/main.star
+++ b/main.star
@@ -90,6 +90,7 @@ HIGH = 30  # Used for try-jobs.
 HIGHEST = 25  # Used for shards in the recipes, included here for completeness.
 
 CHROME = {"custom_vars": {"download_chrome": True}}
+FIREFOX = {"custom_vars": {"download_firefox": True}}
 
 def to_location_regexp(paths):
     return [".+/[+]/%s" % path for path in paths]
@@ -425,7 +426,7 @@ def dart_try_builder(
         name = builder,
         build_numbers = True,
         bucket = bucket,
-        caches = [swarming.cache("browsers")],
+        caches = [swarming.cache("third_party/browsers", name = "browsers")],
         dimensions = dimensions,
         executable = dart_recipe(recipe),
         execution_timeout = execution_timeout,
@@ -1003,35 +1004,42 @@ dart_ci_sandbox_builder(
     "dart2js-strong-linux-x64-chrome",
     category = "dart2js|chrome|l",
     location_regexp = to_location_regexp(DART2JS_PATHS),
+    properties = CHROME,
 )
 dart_ci_sandbox_builder(
     "dart2js-csp-minified-linux-x64-chrome",
     category = "dart2js|chrome|csp",
+    properties = CHROME,
 )
 dart_ci_sandbox_builder(
     "dart2js-strong-mac-x64-chrome",
     category = "dart2js|chrome|m",
     dimensions = mac(),
+    properties = CHROME,
 )
 dart_ci_sandbox_builder(
     "dart2js-strong-win-x64-chrome",
     category = "dart2js|chrome|w",
     dimensions = windows(),
+    properties = CHROME,
 )
 dart_ci_sandbox_builder(
     "dart2js-nnbd-linux-x64-chrome",
     category = "dart2js|chrome|nn",
     location_regexp = to_location_regexp(DART2JS_PATHS),
+    properties = CHROME,
 )
 dart_ci_sandbox_builder(
     "dart2js-strong-linux-x64-firefox",
     category = "dart2js|firefox|l",
+    properties = FIREFOX,
 )
 dart_ci_sandbox_builder(
     "dart2js-strong-win-x64-firefox",
     category = "dart2js|firefox|w",
     dimensions = windows(),
     enabled = False,
+    properties = FIREFOX,
 )
 dart_ci_sandbox_builder(
     "dart2js-strong-mac-x64-safari",
@@ -1114,24 +1122,32 @@ dart_ci_sandbox_builder(
     "ddc-linux-release-chrome",
     category = "ddc|l",
     location_regexp = to_location_regexp(DDC_PATHS),
+    properties = CHROME,
 )
 dart_ci_sandbox_builder(
     "ddc-nnbd-linux-release-chrome",
     category = "ddc|nn",
     channels = ["try"],
     location_regexp = to_location_regexp(DDC_PATHS),
+    properties = CHROME,
 )
 dart_ci_sandbox_builder(
     "ddc-mac-release-chrome",
     category = "ddc|m",
     dimensions = mac(),
+    properties = CHROME,
 )
 dart_ci_sandbox_builder(
     "ddc-win-release-chrome",
     category = "ddc|w",
     dimensions = windows(),
+    properties = CHROME,
+)
+dart_ci_sandbox_builder(
+    "ddk-linux-release-firefox",
+    category = "ddc|fl",
+    properties = FIREFOX,
 )
-dart_ci_sandbox_builder("ddk-linux-release-firefox", category = "ddc|fl")
 
 # misc
 dart_ci_sandbox_builder("gclient", recipe = "dart/gclient", category = "misc|g")

From 1e889d3e687552089442d182faca1ebde4942cfb Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 27 Jul 2020 07:12:22 +0000
Subject: [PATCH 394/826] [infra] Opt dart-sdk-mac in to Goma on RBE

Bug: b/151697301
Change-Id: I2c88ba94e9dfbaa248a2a280f0d5201b27308993
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/153983
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg |  5 +++++
 main.star          | 25 ++++++++++++++++---------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 89548da20975..4713c039f029 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -209,6 +209,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -233,6 +234,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -257,6 +259,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -281,6 +284,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9052,6 +9056,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
diff --git a/main.star b/main.star
index 8d22b59c74a8..785f51b0fc9c 100755
--- a/main.star
+++ b/main.star
@@ -20,7 +20,6 @@ DART_GIT = "https://dart.googlesource.com/sdk"
 DART_GERRIT = "https://dart-review.googlesource.com/"
 
 GOMA_RBE = {
-    "enable_ats": True,
     "server_host": "goma.chromium.org",
     "use_luci_auth": True,
 }
@@ -383,10 +382,19 @@ def dart_recipe(name):
         cipd_package = "dart/recipe_bundles/dart.googlesource.com/recipes",
     )
 
-def use_goma_rbe(goma_rbe, dimensions):
-    if goma_rbe == None:
-        return dimensions["os"] == "Linux"
-    return goma_rbe
+def set_goma_rbe_properties(goma_rbe, dimensions, properties):
+    """Sets the $build/goma property when goma on RBE is used.
+
+    Args:
+        goma_rbe: Opt-in (True), opt-out (False) or default (None).
+        dimensions: The dimensions of the builder.
+        properties: The properties object to set $build/goma on (if opted-in).
+    """
+    if goma_rbe or (goma_rbe == None and dimensions["os"] == "Linux"):
+        goma_properties = {}
+        goma_properties.update(GOMA_RBE)
+        goma_properties["enable_ats"] = dimensions["os"] != "Mac"
+        properties.setdefault("$build/goma", goma_properties)
 
 def dart_try_builder(
         name,
@@ -418,8 +426,7 @@ def dart_try_builder(
     dimensions = defaults.dimensions(dimensions)
     dimensions["pool"] = "luci.dart.try"
     properties = defaults.properties(properties)
-    if use_goma_rbe(goma_rbe, dimensions):
-        properties.setdefault("$build/goma", GOMA_RBE)
+    goma_properties = set_goma_rbe_properties(goma_rbe, dimensions, properties)
     builder = name + "-try"
 
     luci.builder(
@@ -510,8 +517,7 @@ def dart_builder(
     """
     dimensions = defaults.dimensions(dimensions)
     properties = defaults.properties(properties)
-    if use_goma_rbe(goma_rbe, dimensions):
-        properties.setdefault("$build/goma", GOMA_RBE)
+    set_goma_rbe_properties(goma_rbe, dimensions, properties)
 
     def builder(channel, triggered_by):
         if channel == "try":
@@ -1108,6 +1114,7 @@ dart_ci_builder(
     category = "sdk|m",
     channels = CHANNELS,
     dimensions = mac(),
+    goma_rbe = True,
 )
 dart_ci_builder(
     "dart-sdk-win",

From 91df2430cf3305d2908be0654eb82158d1eda38e Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 28 Jul 2020 09:08:01 +0000
Subject: [PATCH 395/826] [infra] Remove the ABI builder from the Luci config

It will be removed from the test matrix in:
https://dart-review.googlesource.com/c/sdk/+/156026/

Change-Id: I2f9e37159cfae65195de036153f244bee34e26d2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/156027
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 commit-queue.cfg   |   4 --
 cr-buildbucket.cfg | 125 ---------------------------------------------
 luci-milo.cfg      |  28 ----------
 luci-notify.cfg    |  14 -----
 luci-scheduler.cfg |  44 ----------------
 main.star          |   4 --
 6 files changed, 219 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 651675d237d3..4bbeb38a4710 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -374,10 +374,6 @@ config_groups {
         name: "dart/try/vm-dartkb-linux-release-simarm64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-dartkb-linux-release-x64-abi-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-dartkb-linux-release-x64-try"
         includable_only: true
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 4713c039f029..b9a3ed7266c7 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -4441,106 +4441,6 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
-    builders {
-      name: "vm-dartkb-linux-release-x64-abi"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-dartkb-linux-release-x64-abi-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-dartkb-linux-release-x64-abi-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-dartkb-linux-release-x64-abi-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
     builders {
       name: "vm-dartkb-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
@@ -9849,31 +9749,6 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
-    builders {
-      name: "vm-dartkb-linux-release-x64-abi-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
     builders {
       name: "vm-dartkb-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index cfc9d888f9e9..29fbff3da570 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -80,11 +80,6 @@ consoles {
     category: "vm|dartkb"
     short_name: "r"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-abi"
-    category: "vm|dartkb"
-    short_name: "abi"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
     category: "vm|kernel"
@@ -792,11 +787,6 @@ consoles {
     category: "vm|dartkb"
     short_name: "r"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-abi"
-    category: "vm|dartkb"
-    short_name: "abi"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
     category: "vm|kernel"
@@ -1164,11 +1154,6 @@ consoles {
     category: "vm|dartkb"
     short_name: "r"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-abi-dev"
-    category: "vm|dartkb"
-    short_name: "abi"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-dev"
     category: "vm|kernel"
@@ -1601,11 +1586,6 @@ consoles {
     category: "vm|dartkb"
     short_name: "r"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-abi-beta"
-    category: "vm|dartkb"
-    short_name: "abi"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-beta"
     category: "vm|kernel"
@@ -2038,11 +2018,6 @@ consoles {
     category: "vm|dartkb"
     short_name: "r"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-abi-stable"
-    category: "vm|dartkb"
-    short_name: "abi"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-stable"
     category: "vm|kernel"
@@ -2495,9 +2470,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-dartkb-linux-release-x64-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-dartkb-linux-release-x64-abi-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 00205bf49e4f..05d671af38e5 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -747,20 +747,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-dartkb-linux-release-x64-abi"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index ea9de2da2dc7..035964dfd6bd 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1738,46 +1738,6 @@ job {
     builder: "vm-dartkb-linux-release-x64"
   }
 }
-job {
-  id: "vm-dartkb-linux-release-x64-abi"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-x64-abi"
-  }
-}
-job {
-  id: "vm-dartkb-linux-release-x64-abi-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-x64-abi-beta"
-  }
-}
-job {
-  id: "vm-dartkb-linux-release-x64-abi-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-x64-abi-dev"
-  }
-}
-job {
-  id: "vm-dartkb-linux-release-x64-abi-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-x64-abi-stable"
-  }
-}
 job {
   id: "vm-dartkb-linux-release-x64-beta"
   schedule: "triggered"
@@ -3548,7 +3508,6 @@ trigger {
   triggers: "pkg-win-release-beta"
   triggers: "vm-canary-linux-debug-beta"
   triggers: "vm-dartkb-linux-release-simarm64-beta"
-  triggers: "vm-dartkb-linux-release-x64-abi-beta"
   triggers: "vm-dartkb-linux-release-x64-beta"
   triggers: "vm-ffi-android-debug-arm-beta"
   triggers: "vm-ffi-android-debug-arm64-beta"
@@ -3635,7 +3594,6 @@ trigger {
   triggers: "pkg-win-release-dev"
   triggers: "vm-canary-linux-debug-dev"
   triggers: "vm-dartkb-linux-release-simarm64-dev"
-  triggers: "vm-dartkb-linux-release-x64-abi-dev"
   triggers: "vm-dartkb-linux-release-x64-dev"
   triggers: "vm-ffi-android-debug-arm-dev"
   triggers: "vm-ffi-android-debug-arm64-dev"
@@ -3785,7 +3743,6 @@ trigger {
   triggers: "pkg-win-release-stable"
   triggers: "vm-canary-linux-debug-stable"
   triggers: "vm-dartkb-linux-release-simarm64-stable"
-  triggers: "vm-dartkb-linux-release-x64-abi-stable"
   triggers: "vm-dartkb-linux-release-x64-stable"
   triggers: "vm-ffi-android-debug-arm-stable"
   triggers: "vm-ffi-android-debug-arm64-stable"
@@ -3840,7 +3797,6 @@ trigger {
   triggers: "vm-canary-linux-debug"
   triggers: "vm-dartkb-linux-release-simarm64"
   triggers: "vm-dartkb-linux-release-x64"
-  triggers: "vm-dartkb-linux-release-x64-abi"
   triggers: "vm-ffi-android-debug-arm"
   triggers: "vm-ffi-android-debug-arm64"
   triggers: "vm-ffi-android-product-arm"
diff --git a/main.star b/main.star
index 785f51b0fc9c..554969b18a65 100755
--- a/main.star
+++ b/main.star
@@ -741,10 +741,6 @@ dart_vm_extra_builder(
     category = "vm|dartkb|sr",
 )
 dart_vm_extra_builder("vm-dartkb-linux-release-x64", category = "vm|dartkb|r")
-dart_vm_extra_builder(
-    "vm-dartkb-linux-release-x64-abi",
-    category = "vm|dartkb|abi",
-)
 
 #vm|kernel
 dart_vm_extra_builder(

From 7cecadac3c1209ad8df2cee474b8ae7dc419087d Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 30 Jul 2020 09:46:34 +0000
Subject: [PATCH 396/826] [infra] Add VM AOT nnbd simarm builder to the luci
 configuration

Change-Id: Ib9aa80a31b0036c5691d70e7103fa76361acfcc3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/156191
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg   |   4 ++
 cr-buildbucket.cfg | 125 +++++++++++++++++++++++++++++++++++++++++++++
 luci-milo.cfg      |  48 +++++++++++++----
 luci-notify.cfg    |  14 +++++
 luci-scheduler.cfg |  44 ++++++++++++++++
 main.star          |   6 ++-
 6 files changed, 230 insertions(+), 11 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 4bbeb38a4710..7854f693ca7b 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -555,6 +555,10 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-msan-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
         includable_only: true
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index b9a3ed7266c7..7a7cef2a2efc 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -7594,6 +7594,106 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
+    builders {
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 50
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 50
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 50
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 50
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10697,6 +10797,31 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
+    builders {
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 29fbff3da570..57745bcdb0a9 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -52,8 +52,13 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64"
-    category: "vm|nnbd"
-    short_name: "pr"
+    category: "vm|nnbd|aot"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64"
+    category: "vm|nnbd|aot"
+    short_name: "a64"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
@@ -759,8 +764,13 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64"
-    category: "vm|nnbd"
-    short_name: "pr"
+    category: "vm|nnbd|aot"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64"
+    category: "vm|nnbd|aot"
+    short_name: "a64"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
@@ -1126,8 +1136,13 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-dev"
-    category: "vm|nnbd"
-    short_name: "pr"
+    category: "vm|nnbd|aot"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64-dev"
+    category: "vm|nnbd|aot"
+    short_name: "a64"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-dev"
@@ -1558,8 +1573,13 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-beta"
-    category: "vm|nnbd"
-    short_name: "pr"
+    category: "vm|nnbd|aot"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64-beta"
+    category: "vm|nnbd|aot"
+    short_name: "a64"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-beta"
@@ -1990,8 +2010,13 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-stable"
-    category: "vm|nnbd"
-    short_name: "pr"
+    category: "vm|nnbd|aot"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64-stable"
+    category: "vm|nnbd|aot"
+    short_name: "a64"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-stable"
@@ -2455,6 +2480,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-x64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/app-kernel-linux-debug-x64-try"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 05d671af38e5..548c65e1bcc9 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -1251,6 +1251,20 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-nnbd-linux-release-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 035964dfd6bd..35049d01ad21 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -2998,6 +2998,46 @@ job {
     builder: "vm-kernel-precomp-msan-linux-release-x64"
   }
 }
+job {
+  id: "vm-kernel-precomp-nnbd-linux-release-simarm64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-nnbd-linux-release-simarm64"
+  }
+}
+job {
+  id: "vm-kernel-precomp-nnbd-linux-release-simarm64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-nnbd-linux-release-simarm64-beta"
+  }
+}
+job {
+  id: "vm-kernel-precomp-nnbd-linux-release-simarm64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-nnbd-linux-release-simarm64-dev"
+  }
+}
+job {
+  id: "vm-kernel-precomp-nnbd-linux-release-simarm64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-nnbd-linux-release-simarm64-stable"
+  }
+}
 job {
   id: "vm-kernel-precomp-nnbd-linux-release-x64"
   schedule: "triggered"
@@ -3538,6 +3578,7 @@ trigger {
   triggers: "vm-kernel-precomp-linux-release-simarm_x64-beta"
   triggers: "vm-kernel-precomp-linux-release-x64-beta"
   triggers: "vm-kernel-precomp-mac-release-simarm64-beta"
+  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm64-beta"
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
   triggers: "vm-kernel-precomp-win-release-x64-beta"
@@ -3624,6 +3665,7 @@ trigger {
   triggers: "vm-kernel-precomp-linux-release-simarm_x64-dev"
   triggers: "vm-kernel-precomp-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-mac-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm64-dev"
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-win-release-x64-dev"
@@ -3773,6 +3815,7 @@ trigger {
   triggers: "vm-kernel-precomp-linux-release-simarm_x64-stable"
   triggers: "vm-kernel-precomp-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-mac-release-simarm64-stable"
+  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm64-stable"
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-win-release-x64-stable"
@@ -3828,6 +3871,7 @@ trigger {
   triggers: "vm-kernel-precomp-linux-release-x64"
   triggers: "vm-kernel-precomp-mac-release-simarm64"
   triggers: "vm-kernel-precomp-msan-linux-release-x64"
+  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm64"
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64"
   triggers: "vm-kernel-precomp-tsan-linux-release-x64"
diff --git a/main.star b/main.star
index 554969b18a65..9b3708b04e6a 100755
--- a/main.star
+++ b/main.star
@@ -718,7 +718,11 @@ dart_vm_extra_builder(
 )
 dart_vm_extra_builder(
     "vm-kernel-precomp-nnbd-linux-release-x64",
-    category = "vm|nnbd|pr",
+    category = "vm|nnbd|aot|r",
+)
+dart_vm_extra_builder(
+    "vm-kernel-precomp-nnbd-linux-release-simarm64",
+    category = "vm|nnbd|aot|a64",
 )
 
 # vm|app-kernel

From f3e2bbd21d70e20ad186b49d9802a9652ea298cd Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 30 Jul 2020 13:06:31 +0000
Subject: [PATCH 397/826] [infra] Opt out dart-sdk-(beta|stable) from goma on
 RBE

The required changes haven't made the cut for 2.9 beta and stable. This
unblocks the release without requiring cherry-picks or riskier changes.

Change-Id: I26235f90a22dd9ee37e229c10a46ed1e4078947b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/156504
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg |  2 --
 main.star          | 29 +++++++++++++++++++++++------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 7a7cef2a2efc..2c483e7b6756 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -234,7 +234,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -284,7 +283,6 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
diff --git a/main.star b/main.star
index 9b3708b04e6a..ce5ee60f6c31 100755
--- a/main.star
+++ b/main.star
@@ -28,6 +28,9 @@ RELEASE_CHANNELS = ["beta", "dev", "stable"]
 CHANNELS = RELEASE_CHANNELS + ["try"]
 BRANCHES = ["master"] + RELEASE_CHANNELS
 
+# TODO(athom): remove this when 89fe12b gets merged into stable.
+RBE_MAC_CHANNELS = [None, "dev", "try"]
+
 TEST_PY_PATHS = "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
 
 STANDARD_PATHS = [
@@ -382,19 +385,28 @@ def dart_recipe(name):
         cipd_package = "dart/recipe_bundles/dart.googlesource.com/recipes",
     )
 
-def set_goma_rbe_properties(goma_rbe, dimensions, properties):
+def with_goma_rbe(goma_rbe, channel, dimensions, properties):
     """Sets the $build/goma property when goma on RBE is used.
 
     Args:
         goma_rbe: Opt-in (True), opt-out (False) or default (None).
+        channel: The channel of the builder.
         dimensions: The dimensions of the builder.
         properties: The properties object to set $build/goma on (if opted-in).
+
+    Returns:
+        A copy of the properties with GOMA on RBE properties set if applicable.
     """
+    if dimensions["os"] == "Mac" and channel not in RBE_MAC_CHANNELS:
+        return properties
     if goma_rbe or (goma_rbe == None and dimensions["os"] == "Linux"):
         goma_properties = {}
         goma_properties.update(GOMA_RBE)
         goma_properties["enable_ats"] = dimensions["os"] != "Mac"
-        properties.setdefault("$build/goma", goma_properties)
+        updated_properties = dict(properties)
+        updated_properties.setdefault("$build/goma", goma_properties)
+        return updated_properties
+    return properties
 
 def dart_try_builder(
         name,
@@ -426,7 +438,7 @@ def dart_try_builder(
     dimensions = defaults.dimensions(dimensions)
     dimensions["pool"] = "luci.dart.try"
     properties = defaults.properties(properties)
-    goma_properties = set_goma_rbe_properties(goma_rbe, dimensions, properties)
+    builder_properties = with_goma_rbe(goma_rbe, "try", dimensions, properties)
     builder = name + "-try"
 
     luci.builder(
@@ -438,7 +450,7 @@ def dart_try_builder(
         executable = dart_recipe(recipe),
         execution_timeout = execution_timeout,
         priority = HIGH,
-        properties = properties,
+        properties = builder_properties,
         service_account = TRY_ACCOUNT,
         swarming_tags = ["vpython:native-python-wrapper"],
     )
@@ -517,7 +529,6 @@ def dart_builder(
     """
     dimensions = defaults.dimensions(dimensions)
     properties = defaults.properties(properties)
-    set_goma_rbe_properties(goma_rbe, dimensions, properties)
 
     def builder(channel, triggered_by):
         if channel == "try":
@@ -533,6 +544,12 @@ def dart_builder(
                 location_regexp = location_regexp,
             )
         else:
+            builder_properties = with_goma_rbe(
+                goma_rbe,
+                channel,
+                dimensions,
+                properties,
+            )
             builder = name + "-" + channel if channel else name
             branch = channel if channel else "master"
             if schedule == "triggered" and triggered_by:
@@ -556,7 +573,7 @@ def dart_builder(
                 execution_timeout = execution_timeout,
                 expiration_timeout = expiration_timeout,
                 priority = priority,
-                properties = properties,
+                properties = builder_properties,
                 notifies = [notifies] if notifies and not channel and enabled else None,
                 schedule = schedule if enabled else None,
                 service_account = service_account,

From 25418dabd26c2623c39c01d7c5831e6a43ea7f17 Mon Sep 17 00:00:00 2001
From: Karl Klose <karlklose@google.com>
Date: Mon, 3 Aug 2020 06:14:47 +0000
Subject: [PATCH 398/826] [infra] Add property to enable bisection on
 flutter-engine-linux

This change prepares a recipe change in the flutter recipe to enable
bisection based on this input property. Currently, the recipe always
enables bisection and this change ensures that it does after the
recipe change.

Change-Id: I2d408d9aefb148421b8b025319029f03711c0bd6
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/156882
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 2 ++
 main.star          | 1 +
 2 files changed, 3 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 2c483e7b6756..1da7f89e3ae0 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -3331,6 +3331,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 50
@@ -9536,6 +9537,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 30
diff --git a/main.star b/main.star
index ce5ee60f6c31..5002a8c6cbc7 100755
--- a/main.star
+++ b/main.star
@@ -720,6 +720,7 @@ dart_ci_sandbox_builder(
     channels = ["try"],
     execution_timeout = 8 * time.hour,
     triggered_by = ["dart-gitiles-trigger-flutter"],
+    properties = {"bisection_enabled": True},
 )
 
 # vm|nnbd

From f8b32a656b64a9ef417aaf430657c84e90a7df92 Mon Sep 17 00:00:00 2001
From: Karl Klose <karlklose@google.com>
Date: Tue, 4 Aug 2020 10:30:26 +0000
Subject: [PATCH 399/826] [infra] Enable bisection on
 vm-kernel-tsan-linux-release-x64

Change-Id: I0c75b189edec3cc73f7b8b53d40d123ab146c430
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/156911
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 2 ++
 main.star          | 1 +
 2 files changed, 3 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 1da7f89e3ae0..8b22d54b03d0 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -8159,6 +8159,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 70
@@ -11060,6 +11061,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 30
diff --git a/main.star b/main.star
index 5002a8c6cbc7..308c4aa22e00 100755
--- a/main.star
+++ b/main.star
@@ -929,6 +929,7 @@ dart_vm_low_priority_builder(
 dart_vm_low_priority_builder(
     "vm-kernel-tsan-linux-release-x64",
     category = "vm|misc|t",
+    properties = {"bisection_enabled": True},
 )
 dart_vm_low_priority_builder(
     "vm-kernel-ubsan-linux-release-x64",

From 157f88b3854ee5622d16eeaf6a29789e2667a341 Mon Sep 17 00:00:00 2001
From: Karl Klose <karlklose@google.com>
Date: Thu, 6 Aug 2020 05:51:54 +0000
Subject: [PATCH 400/826] [infra] Move flutter web_tests to own builder

Change-Id: Ib2afbd559c88ba898037f8b91d28d8d57cf80666
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/157180
Reviewed-by: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg   |  4 ++++
 cr-buildbucket.cfg | 58 ++++++++++++++++++++++++++++++++++++++++++++++
 luci-milo.cfg      | 13 +++++++++++
 luci-notify.cfg    | 14 +++++++++++
 luci-scheduler.cfg | 11 +++++++++
 main.star          | 26 ++++++++++++++++++++-
 6 files changed, 125 insertions(+), 1 deletion(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 7854f693ca7b..fc346fa6ca89 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -310,6 +310,10 @@ config_groups {
         name: "dart/try/flutter-engine-linux-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/flutter-engine-linux-web_tests-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/flutter-frontend-try"
         includable_only: true
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 8b22d54b03d0..9dc25f1a6b6f 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -3333,6 +3333,35 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
+        properties_j: "flutter_test_suites:[\"add_to_app_life_cycle_tests\",\"build_tests\",\"framework_coverage\",\"framework_tests\",\"hostonly_devicelab_tests\",\"tool_coverage\",\"tool_tests\"]"
+      }
+      priority: 50
+      execution_timeout_secs: 28800
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "flutter-engine-linux-web_tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/flutter_engine"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
+        properties_j: "clobber:\"true\""
+        properties_j: "flutter_test_suites:[\"web_tests\"]"
       }
       priority: 50
       execution_timeout_secs: 28800
@@ -9540,6 +9569,35 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
+        properties_j: "flutter_test_suites:[\"add_to_app_life_cycle_tests\",\"build_tests\",\"framework_coverage\",\"framework_tests\",\"hostonly_devicelab_tests\",\"tool_coverage\",\"tool_tests\"]"
+      }
+      priority: 30
+      execution_timeout_secs: 28800
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "flutter-engine-linux-web_tests-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/flutter_engine"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
+        properties_j: "clobber:\"true\""
+        properties_j: "flutter_test_suites:[\"web_tests\"]"
       }
       priority: 30
       execution_timeout_secs: 28800
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 57745bcdb0a9..34abbf40accf 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -40,6 +40,11 @@ consoles {
     category: "flutter"
     short_name: "3H"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-web_tests"
+    category: "flutter"
+    short_name: "web"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
     category: "vm|nnbd"
@@ -587,6 +592,11 @@ consoles {
     category: "flutter"
     short_name: "3H"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-web_tests"
+    category: "flutter"
+    short_name: "web"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
@@ -2471,6 +2481,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/flutter-engine-linux-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/flutter-engine-linux-web_tests-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-x64-try"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 548c65e1bcc9..da0547bba73d 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -552,6 +552,20 @@ notifiers {
     repository: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "flutter-engine-linux-web_tests"
+    repository: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
+  }
+}
 notifiers {
   notifications {
     on_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 35049d01ad21..9ac88471f854 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1214,6 +1214,16 @@ job {
     builder: "flutter-engine-linux"
   }
 }
+job {
+  id: "flutter-engine-linux-web_tests"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "flutter-engine-linux-web_tests"
+  }
+}
 job {
   id: "flutter-frontend"
   schedule: "triggered"
@@ -3684,6 +3694,7 @@ trigger {
   id: "dart-gitiles-trigger-flutter"
   acl_sets: "ci"
   triggers: "flutter-engine-linux"
+  triggers: "flutter-engine-linux-web_tests"
   gitiles {
     repo: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
     refs: "regexp:refs/heads/master"
diff --git a/main.star b/main.star
index 308c4aa22e00..ff74e4c51789 100755
--- a/main.star
+++ b/main.star
@@ -720,7 +720,31 @@ dart_ci_sandbox_builder(
     channels = ["try"],
     execution_timeout = 8 * time.hour,
     triggered_by = ["dart-gitiles-trigger-flutter"],
-    properties = {"bisection_enabled": True},
+    properties = {
+        "bisection_enabled": True,
+        "flutter_test_suites": [
+            "add_to_app_life_cycle_tests",
+            "build_tests",
+            "framework_coverage",
+            "framework_tests",
+            "hostonly_devicelab_tests",
+            "tool_coverage",
+            "tool_tests",
+        ],
+    },
+)
+
+dart_ci_sandbox_builder(
+    "flutter-engine-linux-web_tests",
+    recipe = "dart/flutter_engine",
+    category = "flutter|web",
+    channels = ["try"],
+    execution_timeout = 8 * time.hour,
+    triggered_by = ["dart-gitiles-trigger-flutter"],
+    properties = {
+        "bisection_enabled": True,
+        "flutter_test_suites": ["web_tests"],
+    },
 )
 
 # vm|nnbd

From 6e5fc7afb92b5e0be5e56e656a4619bf28398d1c Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 7 Aug 2020 06:31:20 +0000
Subject: [PATCH 401/826] [lkgr] Add LKGR builder to the Luci config

https://github.com/dart-lang/sdk/issues/42917

Change-Id: Ideb48d15362ebd444f653ec0a2dd553421b47f05
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/157491
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 28 ++++++++++++++++++++++++++++
 luci-milo.cfg      |  3 +++
 luci-notify.cfg    | 14 ++++++++++++++
 luci-scheduler.cfg | 10 ++++++++++
 main.star          | 27 +++++++++++++++++++++++++--
 5 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 9dc25f1a6b6f..581d78610b14 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -567,6 +567,34 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     }
+    builders {
+      name: "lkgr"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      recipe {
+        name: "roller/lkgr"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "builders:[{\"bucket\":\"ci\",\"builder\":\"dart-sdk-linux\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-mac\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-win\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"debianpackage-linux\",\"project\":\"dart\"}]"
+        properties_j: "clobber:\"true\""
+        properties_j: "ref:\"refs/heads/lkgr\""
+      }
+      priority: 50
+      execution_timeout_secs: 900
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    }
     builders {
       name: "nightly"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 34abbf40accf..c03c36301a16 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2786,6 +2786,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci/linearize-flutter"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/lkgr"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/nightly"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index da0547bba73d..dfd2f295da9f 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -117,6 +117,20 @@ notifiers {
     name: "linearize-flutter"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "lkgr"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 9ac88471f854..a34d0e05caca 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1458,6 +1458,16 @@ job {
     builder: "linearize-flutter"
   }
 }
+job {
+  id: "lkgr"
+  schedule: "with 1h interval"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "lkgr"
+  }
+}
 job {
   id: "nightly"
   schedule: "0 5 * * *"
diff --git a/main.star b/main.star
index ff74e4c51789..4d64ded6ac45 100755
--- a/main.star
+++ b/main.star
@@ -477,6 +477,8 @@ luci.builder.defaults.properties.set({
     },
 })
 
+lkgr_builders = []
+
 def dart_builder(
         name,
         bucket,
@@ -499,7 +501,8 @@ def dart_builder(
         triggering_policy = None,
         on_cq = False,
         experiment_percentage = None,
-        location_regexp = None):
+        location_regexp = None,
+        lkgr = False):
     """
     Creates a Dart builder on all the specified channels.
 
@@ -526,10 +529,14 @@ def dart_builder(
         on_cq: Whether the build is added to the default set of CQ tryjobs.
         experiment_percentage: What experiment percentage to use.
         location_regexp: Locations that trigger this builder.
+        lkgr: If true, this builder needs to be green to advance the LKGR.
     """
     dimensions = defaults.dimensions(dimensions)
     properties = defaults.properties(properties)
 
+    if lkgr:
+        lkgr_builders.append({"project": "dart", "bucket": bucket, "builder": name})
+
     def builder(channel, triggered_by):
         if channel == "try":
             dart_try_builder(
@@ -1151,13 +1158,19 @@ dart_ci_sandbox_builder(
 )
 
 # sdk
-dart_ci_builder("dart-sdk-linux", category = "sdk|l", channels = CHANNELS)
+dart_ci_builder(
+    "dart-sdk-linux",
+    category = "sdk|l",
+    channels = CHANNELS,
+    lkgr = True,
+)
 dart_ci_builder(
     "dart-sdk-mac",
     category = "sdk|m",
     channels = CHANNELS,
     dimensions = mac(),
     goma_rbe = True,
+    lkgr = True,
 )
 dart_ci_builder(
     "dart-sdk-win",
@@ -1165,6 +1178,7 @@ dart_ci_builder(
     channels = CHANNELS,
     dimensions = windows(),
     on_cq = True,
+    lkgr = True,
 )
 
 # ddc
@@ -1206,6 +1220,7 @@ dart_ci_builder(
     category = "misc|dp",
     channels = RELEASE_CHANNELS,
     notifies = "infra",
+    lkgr = True,
 )
 dart_ci_builder(
     "versionchecker-linux",
@@ -1247,6 +1262,14 @@ dart_infra_builder(
     ],
     triggering_policy = scheduler.greedy_batching(max_batch_size = 1),
 )
+dart_infra_builder(
+    "lkgr",
+    execution_timeout = 15 * time.minute,
+    notifies = "infra",
+    properties = {"builders": lkgr_builders, "ref": "refs/heads/lkgr"},
+    recipe = "roller/lkgr",
+    schedule = "with 1h interval",
+)
 dart_infra_builder(
     "nightly",
     notifies = "infra",

From 15176db39c642d657b59ac7d6b4093cb2c3ea4b9 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 10 Aug 2020 14:24:49 +0000
Subject: [PATCH 402/826] [infra] Add dev autoroller to the Luci config

The roller will roll from the lkgr branch to dev every 4 hours.

See also:
https://dart-review.googlesource.com/c/recipes/+/157960/
https://github.com/dart-lang/sdk/issues/42917

Change-Id: I7146a518d6dc80c7ac688586c554aeec4a5a6950
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/157983
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 27 +++++++++++++++++++++++++++
 luci-milo.cfg      |  3 +++
 luci-notify.cfg    | 14 ++++++++++++++
 luci-scheduler.cfg | 10 ++++++++++
 main.star          |  8 ++++++++
 5 files changed, 62 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 581d78610b14..32477649d038 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -680,6 +680,33 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     }
+    builders {
+      name: "roll-to-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      recipe {
+        name: "roller/roll_to_dev"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+        properties_j: "from_ref:\"refs/heads/lkgr\""
+      }
+      priority: 50
+      execution_timeout_secs: 900
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    }
     builders {
       name: "versionchecker-linux"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index c03c36301a16..5cae9146b96b 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2789,6 +2789,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci/lkgr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/roll-to-dev"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/nightly"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index dfd2f295da9f..907d6eea763c 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -174,6 +174,20 @@ notifiers {
     name: "recipe-deps-roller"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "roll-to-dev"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index a34d0e05caca..eba013b8d898 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1628,6 +1628,16 @@ job {
     builder: "recipe-deps-roller"
   }
 }
+job {
+  id: "roll-to-dev"
+  schedule: "with 4h interval"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "roll-to-dev"
+  }
+}
 job {
   id: "versionchecker-linux"
   schedule: "triggered"
diff --git a/main.star b/main.star
index 4d64ded6ac45..5a5203a3c3eb 100755
--- a/main.star
+++ b/main.star
@@ -1270,6 +1270,14 @@ dart_infra_builder(
     recipe = "roller/lkgr",
     schedule = "with 1h interval",
 )
+dart_infra_builder(
+    "roll-to-dev",
+    execution_timeout = 15 * time.minute,
+    notifies = "infra",
+    properties = {"from_ref": "refs/heads/lkgr"},
+    recipe = "roller/roll_to_dev",
+    schedule = "with 4h interval",
+)
 dart_infra_builder(
     "nightly",
     notifies = "infra",

From 4063b7efd11def0552e74ab99bc90003f947774e Mon Sep 17 00:00:00 2001
From: Karl Klose <karlklose@google.com>
Date: Tue, 11 Aug 2020 04:19:41 +0000
Subject: [PATCH 403/826] [infra] Add flutter web_tests builder to flutter-hhh
 console

Change-Id: Ia4e8c6f81702cab4cd4b14c18c61dcb273e646f5
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/157495
Reviewed-by: Alexander Thomas <athom@google.com>
---
 luci-milo.cfg | 5 +++++
 main.star     | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/luci-milo.cfg b/luci-milo.cfg
index 5cae9146b96b..6c1e8b55187e 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2447,6 +2447,11 @@ consoles {
     category: "flutter"
     short_name: "3H"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-web_tests"
+    category: "flutter"
+    short_name: "web"
+  }
 }
 consoles {
   id: "fyi"
diff --git a/main.star b/main.star
index 5a5203a3c3eb..9fed971b17be 100755
--- a/main.star
+++ b/main.star
@@ -1343,6 +1343,13 @@ luci.console_view_entry(
     console_view = "flutter-hhh",
 )
 
+luci.console_view_entry(
+    builder = "flutter-engine-linux-web_tests",
+    short_name = "web",
+    category = "flutter",
+    console_view = "flutter-hhh",
+)
+
 # Rolls dart recipe dependencies.
 dart_infra_builder(
     name = "recipe-deps-roller",

From d4f8fb9e3b2adb4bce85d29a31527c153daf1ed6 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 11 Aug 2020 06:59:48 +0000
Subject: [PATCH 404/826] [infra] Add package_config.json to the standard paths

https://github.com/dart-lang/sdk/issues/43004

Change-Id: I1ece89556922d90927b6b7d4d9775e600c487d3e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/158004
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
Auto-Submit: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg   | 45 ++++++++++++++++++++++++++++++---------------
 luci-scheduler.cfg |  3 ++-
 main.star          |  3 ++-
 3 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index fc346fa6ca89..74ebb2acfd7a 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -89,7 +89,8 @@ config_groups {
         location_regexp: ".+/[+]/build/.+"
         location_regexp: ".+/[+]/BUILD.gn"
         location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
@@ -101,7 +102,8 @@ config_groups {
         location_regexp: ".+/[+]/build/.+"
         location_regexp: ".+/[+]/BUILD.gn"
         location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
@@ -117,7 +119,8 @@ config_groups {
         location_regexp: ".+/[+]/build/.+"
         location_regexp: ".+/[+]/BUILD.gn"
         location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
@@ -163,7 +166,8 @@ config_groups {
         location_regexp: ".+/[+]/build/.+"
         location_regexp: ".+/[+]/BUILD.gn"
         location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
@@ -178,7 +182,8 @@ config_groups {
         location_regexp: ".+/[+]/build/.+"
         location_regexp: ".+/[+]/BUILD.gn"
         location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
@@ -193,7 +198,8 @@ config_groups {
         location_regexp: ".+/[+]/build/.+"
         location_regexp: ".+/[+]/BUILD.gn"
         location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
@@ -208,7 +214,8 @@ config_groups {
         location_regexp: ".+/[+]/build/.+"
         location_regexp: ".+/[+]/BUILD.gn"
         location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
@@ -243,7 +250,8 @@ config_groups {
         location_regexp: ".+/[+]/build/.+"
         location_regexp: ".+/[+]/BUILD.gn"
         location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
@@ -258,7 +266,8 @@ config_groups {
         location_regexp: ".+/[+]/build/.+"
         location_regexp: ".+/[+]/BUILD.gn"
         location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
@@ -277,7 +286,8 @@ config_groups {
         location_regexp: ".+/[+]/build/.+"
         location_regexp: ".+/[+]/BUILD.gn"
         location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
@@ -331,7 +341,8 @@ config_groups {
         location_regexp: ".+/[+]/build/.+"
         location_regexp: ".+/[+]/BUILD.gn"
         location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
@@ -366,7 +377,8 @@ config_groups {
         location_regexp: ".+/[+]/build/.+"
         location_regexp: ".+/[+]/BUILD.gn"
         location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
@@ -436,7 +448,8 @@ config_groups {
         location_regexp: ".+/[+]/build/.+"
         location_regexp: ".+/[+]/BUILD.gn"
         location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
@@ -481,7 +494,8 @@ config_groups {
         location_regexp: ".+/[+]/build/.+"
         location_regexp: ".+/[+]/BUILD.gn"
         location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
@@ -495,7 +509,8 @@ config_groups {
         location_regexp: ".+/[+]/build/.+"
         location_regexp: ".+/[+]/BUILD.gn"
         location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/sdk(_nnbd)?/.+"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
         location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         location_regexp: ".+/[+]/tools/bots/test_matrix.json"
         location_regexp: ".+/[+]/tests/.+"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index eba013b8d898..606669079edc 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -3924,7 +3924,8 @@ trigger {
     path_regexps: "build/.+"
     path_regexps: "BUILD.gn"
     path_regexps: "sdk_args.gni"
-    path_regexps: "sdk(_nnbd)?/.+"
+    path_regexps: ".dart_tool/package_config.json"
+    path_regexps: "sdk/.+"
     path_regexps: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
     path_regexps: "tools/bots/test_matrix.json"
     path_regexps: "tests/.+"
diff --git a/main.star b/main.star
index 9fed971b17be..5aa077b7209b 100755
--- a/main.star
+++ b/main.star
@@ -40,7 +40,8 @@ STANDARD_PATHS = [
     "BUILD.gn",
     "sdk_args.gni",
     # core libraries
-    "sdk(_nnbd)?/.+",
+    ".dart_tool/package_config.json",
+    "sdk/.+",
     # testing
     TEST_PY_PATHS,
     "tools/bots/test_matrix.json",

From 4974a22323149e1a01734df489dba35092daefc8 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 13 Aug 2020 08:44:32 +0000
Subject: [PATCH 405/826] [infra] Opt-in dart-sdk-win to goma on RBE

b/144018396

Change-Id: I4b579acea070e658d60d49815a782641b51fac45
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/158382
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 5 +++++
 main.star          | 1 +
 2 files changed, 6 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 32477649d038..def2fd71c219 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -307,6 +307,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -331,6 +332,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -355,6 +357,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -379,6 +382,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9165,6 +9169,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
diff --git a/main.star b/main.star
index 5aa077b7209b..19e8ec458d0a 100755
--- a/main.star
+++ b/main.star
@@ -1178,6 +1178,7 @@ dart_ci_builder(
     category = "sdk|w",
     channels = CHANNELS,
     dimensions = windows(),
+    goma_rbe = True,
     on_cq = True,
     lkgr = True,
 )

From 50f36c49b90d186e4129f27f03e9182705b1c61c Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 13 Aug 2020 10:50:13 +0000
Subject: [PATCH 406/826] [infra] Opt-in remaining macOS builders to goma on
 RBE

This doesn't opt-in macOS builders on beta and stable, yet. Those will be
opt-in after the next merge to beta and stable.

b/144018396

Change-Id: Ib77df6dbafacd27bd18abd3d88a2617e7d7e8967
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/158384
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 30 ++++++++++++++++++++++++++++++
 main.star          |  3 +--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index def2fd71c219..a5753b231f6e 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1047,6 +1047,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1095,6 +1096,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2411,6 +2413,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2461,6 +2464,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2511,6 +2515,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2559,6 +2564,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3032,6 +3038,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3082,6 +3089,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3568,6 +3576,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3616,6 +3625,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4115,6 +4125,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4165,6 +4176,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6067,6 +6079,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6115,6 +6128,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6163,6 +6177,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6211,6 +6226,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6259,6 +6275,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6307,6 +6324,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7571,6 +7589,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7619,6 +7638,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8946,6 +8966,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9348,6 +9369,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9373,6 +9395,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9497,6 +9520,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9730,6 +9754,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9880,6 +9905,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10429,6 +10455,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10453,6 +10480,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10477,6 +10505,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10879,6 +10908,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
diff --git a/main.star b/main.star
index 19e8ec458d0a..8f6c64a3ccaa 100755
--- a/main.star
+++ b/main.star
@@ -400,7 +400,7 @@ def with_goma_rbe(goma_rbe, channel, dimensions, properties):
     """
     if dimensions["os"] == "Mac" and channel not in RBE_MAC_CHANNELS:
         return properties
-    if goma_rbe or (goma_rbe == None and dimensions["os"] == "Linux"):
+    if goma_rbe or (goma_rbe == None and dimensions["os"] in ("Mac", "Linux")):
         goma_properties = {}
         goma_properties.update(GOMA_RBE)
         goma_properties["enable_ats"] = dimensions["os"] != "Mac"
@@ -1170,7 +1170,6 @@ dart_ci_builder(
     category = "sdk|m",
     channels = CHANNELS,
     dimensions = mac(),
-    goma_rbe = True,
     lkgr = True,
 )
 dart_ci_builder(

From bf21d6be11314015aeaa278d5bb28ab6b7b498a6 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 17 Aug 2020 07:39:32 +0000
Subject: [PATCH 407/826] [infra] Grant project-dart-roller-owners access to
 schedule rolls

https://github.com/dart-lang/sdk/issues/42917

Change-Id: I2dc35ce5cacc7385c793283d1fa318d7769f86ec
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/158391
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 42 +++++++++++++++++++++++++++++++++---------
 luci-milo.cfg      |  2 +-
 luci-notify.cfg    | 14 +++++++-------
 luci-scheduler.cfg | 14 ++++++++++++--
 main.star          | 18 ++++++++++++++++--
 5 files changed, 69 insertions(+), 21 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index a5753b231f6e..731367d1c64f 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -685,7 +685,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "roll-to-dev"
+      name: "versionchecker-linux"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -693,17 +693,15 @@ buckets {
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe {
-        name: "roller/roll_to_dev"
+        name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "from_ref:\"refs/heads/lkgr\""
       }
       priority: 50
-      execution_timeout_secs: 900
       caches {
         name: "browsers"
         path: "browsers"
@@ -712,7 +710,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "versionchecker-linux"
+      name: "versionchecker-linux-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -737,7 +735,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "versionchecker-linux-beta"
+      name: "versionchecker-linux-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -762,7 +760,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "versionchecker-linux-dev"
+      name: "versionchecker-linux-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -786,8 +784,32 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     }
+  }
+}
+buckets {
+  name: "ci.roll"
+  acls {
+    group: "all"
+  }
+  acls {
+    role: SCHEDULER
+    identity: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+  }
+  acls {
+    role: SCHEDULER
+    identity: "user:luci-scheduler@appspot.gserviceaccount.com"
+  }
+  acls {
+    role: SCHEDULER
+    group: "project-dart-admins"
+  }
+  acls {
+    role: SCHEDULER
+    group: "project-dart-roller-owners"
+  }
+  swarming {
     builders {
-      name: "versionchecker-linux-stable"
+      name: "roll-to-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -795,15 +817,17 @@ buckets {
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
       recipe {
-        name: "dart/neo"
+        name: "roller/roll_to_dev"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "from_ref:\"refs/heads/lkgr\""
       }
       priority: 50
+      execution_timeout_secs: 900
       caches {
         name: "browsers"
         path: "browsers"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 6c1e8b55187e..dda86dcb6d12 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2795,7 +2795,7 @@ consoles {
     name: "buildbucket/luci.dart.ci/lkgr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/roll-to-dev"
+    name: "buildbucket/luci.dart.ci.roll/roll-to-dev"
   }
   builders {
     name: "buildbucket/luci.dart.ci/nightly"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 907d6eea763c..614efdf09398 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -179,13 +179,13 @@ notifiers {
     on_new_failure: true
     email {
       recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
     }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci"
-    name: "roll-to-dev"
+    name: "versionchecker-linux"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -193,13 +193,13 @@ notifiers {
     on_new_failure: true
     email {
       recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
     }
-    notify_blamelist {}
   }
   builders {
-    bucket: "ci"
-    name: "versionchecker-linux"
-    repository: "https://dart.googlesource.com/sdk"
+    bucket: "ci.roll"
+    name: "roll-to-dev"
   }
 }
 notifiers {
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 606669079edc..88c0f643b0e1 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1631,10 +1631,10 @@ job {
 job {
   id: "roll-to-dev"
   schedule: "with 4h interval"
-  acl_sets: "ci"
+  acl_sets: "ci.roll"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "luci.dart.ci.roll"
     builder: "roll-to-dev"
   }
 }
@@ -3953,6 +3953,16 @@ acl_sets {
     granted_to: "group:all"
   }
 }
+acl_sets {
+  name: "ci.roll"
+  acls {
+    role: OWNER
+    granted_to: "group:project-dart-admins"
+  }
+  acls {
+    granted_to: "group:all"
+  }
+}
 acl_sets {
   name: "ci.sandbox"
   acls {
diff --git a/main.star b/main.star
index 8f6c64a3ccaa..a9865392ba76 100755
--- a/main.star
+++ b/main.star
@@ -107,6 +107,13 @@ def windows():
 CI_ACCOUNT = "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
 TRY_ACCOUNT = "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
 CI_TRIGGERERS = ["luci-scheduler@appspot.gserviceaccount.com", CI_ACCOUNT]
+ROLL_TRIGGERERS = {
+    "users": [
+        "luci-scheduler@appspot.gserviceaccount.com",
+        CI_ACCOUNT,
+    ],
+    "groups": ["project-dart-roller-owners"],
+}
 CI_SANDBOX_TRIGGERERS = CI_TRIGGERERS + [TRY_ACCOUNT]
 
 lucicfg.config(
@@ -234,6 +241,12 @@ luci.bucket(
         acl.entry(acl.BUILDBUCKET_TRIGGERER, users = CI_TRIGGERERS),
     ],
 )
+luci.bucket(
+    name = "ci.roll",
+    acls = [
+        acl.entry(acl.BUILDBUCKET_TRIGGERER, **ROLL_TRIGGERERS),
+    ],
+)
 luci.bucket(
     name = "ci.sandbox",
     acls = [
@@ -619,11 +632,11 @@ def dart_builder(
         if enabled:
             builder(channel, triggered_by = triggered_by)
 
-def dart_ci_builder(name, dimensions = {}, **kwargs):
+def dart_ci_builder(name, bucket = "ci", dimensions = {}, **kwargs):
     dimensions.setdefault("pool", "luci.dart.ci")
     dart_builder(
         name,
-        bucket = "ci",
+        bucket = bucket,
         dimensions = dimensions,
         service_account = CI_ACCOUNT,
         **kwargs
@@ -1273,6 +1286,7 @@ dart_infra_builder(
 )
 dart_infra_builder(
     "roll-to-dev",
+    bucket = "ci.roll",
     execution_timeout = 15 * time.minute,
     notifies = "infra",
     properties = {"from_ref": "refs/heads/lkgr"},

From 36cd739cf93b69861110299ddba064bfd57d1268 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 17 Aug 2020 21:58:19 +0000
Subject: [PATCH 408/826] [infra] Move google builder to the ci.sandbox bucket

It doesn't need any special access granted by the ci bucket.

https://github.com/dart-lang/sdk/issues/42917

Change-Id: I065f2306ca58469a28aaf5be28ce16d5d540d17b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/158901
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 50 +++++++++++++++++++++++-----------------------
 luci-milo.cfg      |  5 +----
 luci-scheduler.cfg | 10 ++++++++++
 main.star          |  6 ++++--
 4 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 731367d1c64f..ec0098710eba 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -520,31 +520,6 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     }
-    builders {
-      name: "google"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "dart/external"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    }
     builders {
       name: "linearize-flutter"
       swarming_host: "chromium-swarm.appspot.com"
@@ -4007,6 +3982,31 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
+    builders {
+      name: "google"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/external"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 50
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
     builders {
       name: "pkg-linux-debug"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index dda86dcb6d12..88f496e13813 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2460,7 +2460,7 @@ consoles {
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci/google"
+    name: "buildbucket/luci.dart.ci.sandbox/google"
     category: "external"
     short_name: "g"
   }
@@ -2773,9 +2773,6 @@ consoles {
 consoles {
   id: "infra"
   name: "Infra Console"
-  builders {
-    name: "buildbucket/luci.dart.ci/google"
-  }
   builders {
     name: "buildbucket/luci.dart.ci/base"
   }
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 88c0f643b0e1..b67cd1e7cf04 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1444,6 +1444,16 @@ job {
     builder: "gclient-stable"
   }
 }
+job {
+  id: "google"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "google"
+  }
+}
 job {
   id: "linearize-flutter"
   schedule: "triggered"
diff --git a/main.star b/main.star
index a9865392ba76..c903abf84887 100755
--- a/main.star
+++ b/main.star
@@ -1243,12 +1243,14 @@ dart_ci_builder(
 )
 
 # external
-dart_infra_builder(
+dart_ci_sandbox_builder(
     "google",
     recipe = "dart/external",
     category = "external|g",
-    enabled = False,
+    channels = [],
+    triggered_by = None,
     fyi = True,
+    notifies = None,
 )
 
 # infra

From ad89c530622940da315dd6bab2d99956ffa8f0b8 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 18 Aug 2020 08:51:16 +0000
Subject: [PATCH 409/826] [infra] Opt-in remaining Windows builders to goma on
 RBE

b/144018396

Change-Id: I2449c834d5d9d5890215fb6a4ed3142aaebf9192
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/158840
Commit-Queue: Alexander Thomas <athom@google.com>
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 62 ++++++++++++++++++++++++++++++++++++++++++++++
 main.star          |  3 +--
 2 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index ec0098710eba..289566b48850 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -60,6 +60,7 @@ buckets {
         name: "dart/chocolatey"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1244,6 +1245,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1268,6 +1270,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1292,6 +1295,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1316,6 +1320,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2612,6 +2617,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2637,6 +2643,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2662,6 +2669,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2687,6 +2695,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2712,6 +2721,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2737,6 +2747,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2761,6 +2772,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2785,6 +2797,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2809,6 +2822,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3165,6 +3179,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3190,6 +3205,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3215,6 +3231,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3240,6 +3257,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3773,6 +3791,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3797,6 +3816,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3821,6 +3841,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3845,6 +3866,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4251,6 +4273,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4276,6 +4299,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4301,6 +4325,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4326,6 +4351,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8088,6 +8114,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8112,6 +8139,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8136,6 +8164,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8160,6 +8189,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8340,6 +8370,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8364,6 +8395,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8388,6 +8420,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8412,6 +8445,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8436,6 +8470,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8460,6 +8495,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8484,6 +8520,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8508,6 +8545,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8532,6 +8570,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8556,6 +8595,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8580,6 +8620,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8604,6 +8645,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8628,6 +8670,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8652,6 +8695,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8676,6 +8720,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8700,6 +8745,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8724,6 +8770,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8748,6 +8795,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8772,6 +8820,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8796,6 +8845,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9040,6 +9090,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9444,6 +9495,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9469,6 +9521,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9596,6 +9649,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9828,6 +9882,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9955,6 +10010,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -11106,6 +11162,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -11280,6 +11337,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -11304,6 +11362,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -11328,6 +11387,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -11352,6 +11412,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -11376,6 +11437,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
diff --git a/main.star b/main.star
index c903abf84887..57fece5f1c01 100755
--- a/main.star
+++ b/main.star
@@ -413,7 +413,7 @@ def with_goma_rbe(goma_rbe, channel, dimensions, properties):
     """
     if dimensions["os"] == "Mac" and channel not in RBE_MAC_CHANNELS:
         return properties
-    if goma_rbe or (goma_rbe == None and dimensions["os"] in ("Mac", "Linux")):
+    if goma_rbe in (None, True):
         goma_properties = {}
         goma_properties.update(GOMA_RBE)
         goma_properties["enable_ats"] = dimensions["os"] != "Mac"
@@ -1190,7 +1190,6 @@ dart_ci_builder(
     category = "sdk|w",
     channels = CHANNELS,
     dimensions = windows(),
-    goma_rbe = True,
     on_cq = True,
     lkgr = True,
 )

From 68d86f6ebf9568c6a7150cff1a6c5a535464b092 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 18 Aug 2020 08:54:06 +0000
Subject: [PATCH 410/826] [infra] Add frontend-weekly builder to the Luci
 config

The new builder runs once a week, at midnights from Saturday to Sunday.
Initially, it will not be on any consoles and only notify the
"frontend-team" notifier.

Change-Id: Ic310ab28a3d6f8d33c6acd84ff5dd2d6a024f21e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/158845
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Auto-Submit: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 52 ++++++++++++++++++++++++++++++++++++++++++++++
 luci-milo.cfg      |  3 +++
 luci-notify.cfg    | 26 +++++++++++++++++++++++
 luci-scheduler.cfg | 20 ++++++++++++++++++
 main.star          | 31 +++++++++++++++++++++++++--
 5 files changed, 130 insertions(+), 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 289566b48850..53697cae6b68 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -760,6 +760,32 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     }
+    builders {
+      name: "weekly"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      recipe {
+        name: "cron/cron"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "builders:[\"frontend-weekly\"]"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 50
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    }
   }
 }
 buckets {
@@ -3879,6 +3905,32 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
+    builders {
+      name: "frontend-weekly"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 70
+      execution_timeout_secs: 43200
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
     builders {
       name: "fuzz-linux"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 88f496e13813..bfb02b9fd920 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2797,6 +2797,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci/nightly"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/weekly"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/recipe-deps-roller"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 614efdf09398..6ac7c1b9ed23 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -188,6 +188,20 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "weekly"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -663,6 +677,18 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_failure: true
+    email {
+      recipients: "jensj@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "frontend-weekly"
+  }
+}
 notifiers {
   notifications {
     on_success: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index b67cd1e7cf04..1b988366d47a 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1394,6 +1394,16 @@ job {
     builder: "front-end-win-release-x64-stable"
   }
 }
+job {
+  id: "frontend-weekly"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "frontend-weekly"
+  }
+}
 job {
   id: "fuzz-linux"
   schedule: "0 3,4 * * *"
@@ -3518,6 +3528,16 @@ job {
     builder: "vm-precomp-ffi-qemu-linux-release-arm-stable"
   }
 }
+job {
+  id: "weekly"
+  schedule: "0 0 * * SUN"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "weekly"
+  }
+}
 trigger {
   id: "dart-ci-test-data-trigger"
   acl_sets: "ci"
diff --git a/main.star b/main.star
index 57fece5f1c01..518cb417341e 100755
--- a/main.star
+++ b/main.star
@@ -693,10 +693,10 @@ def dart_vm_low_priority_builder(name, **kwargs):
 
 nightly_builders = []
 
-def dart_vm_nightly_builder(name, **kwargs):
+def dart_vm_nightly_builder(name, notifies = None, **kwargs):
     dart_ci_sandbox_builder(
         name,
-        notifies = None,
+        notifies = notifies,
         on_cq = False,
         priority = LOW,
         schedule = "triggered",  # triggered by nightly cron builder
@@ -705,6 +705,20 @@ def dart_vm_nightly_builder(name, **kwargs):
     )
     nightly_builders.append(name)
 
+weekly_builders = []
+
+def weekly_ci_sandbox_builder(name, notifies = None, **kwargs):
+    dart_ci_sandbox_builder(
+        name,
+        notifies = notifies,
+        on_cq = False,
+        priority = LOW,
+        schedule = "triggered",  # triggered by weekly cron builder
+        triggered_by = None,
+        **kwargs
+    )
+    weekly_builders.append(name)
+
 # cfe
 dart_ci_sandbox_builder(
     "front-end-linux-release-x64",
@@ -732,6 +746,12 @@ dart_ci_sandbox_builder(
     channels = ["try"],
     notifies = "frontend-team",
 )
+weekly_ci_sandbox_builder(
+    "frontend-weekly",
+    notifies = "frontend-team",
+    channels = [],
+    execution_timeout = 12 * time.hour,
+)
 
 # flutter
 dart_ci_sandbox_builder(
@@ -1301,6 +1321,13 @@ dart_infra_builder(
     recipe = "cron/cron",
     schedule = "0 5 * * *",  # daily, at 05:00 UTC
 )
+dart_infra_builder(
+    "weekly",
+    notifies = "infra",
+    properties = {"builders": weekly_builders},
+    recipe = "cron/cron",
+    schedule = "0 0 * * SUN",  # weekly, midnight Saturday to Sunday
+)
 
 dart_ci_sandbox_builder(
     "ci-test-data",

From a6142715a8102073bd45591c3c5c05975ee08433 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 19 Aug 2020 08:42:07 +0000
Subject: [PATCH 411/826] [infra] Add cbuild builder to the Luci config

This builder triggers synthethic builds for cbuild results and updates
Gerrit CLs with labels and messages for the results.

https://github.com/dart-lang/sdk/issues/42917

Change-Id: I6a75e642ce4dabc5e172233e72f94cb8ab2b5ebf
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/159245
Reviewed-by: Karl Klose <karlklose@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 26 ++++++++++++++++++++++++++
 luci-milo.cfg      |  3 +++
 luci-notify.cfg    | 14 ++++++++++++++
 luci-scheduler.cfg | 10 ++++++++++
 main.star          |  6 ++++++
 5 files changed, 59 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 53697cae6b68..c64e7b24677a 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -48,6 +48,32 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     }
+    builders {
+      name: "cbuild"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      recipe {
+        name: "dart/cbuild"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 50
+      execution_timeout_secs: 600
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    }
     builders {
       name: "chocolatey"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index bfb02b9fd920..ea7412aae096 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2776,6 +2776,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci/base"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/cbuild"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/chocolatey"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 6ac7c1b9ed23..b7b6e1d6aae4 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -4,6 +4,20 @@
 # For the schema of this file, see ProjectConfig message:
 #   https://luci-config.appspot.com/schemas/projects:luci-notify.cfg
 
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "cbuild"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 1b988366d47a..7dc318408a3e 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -334,6 +334,16 @@ job {
     builder: "base"
   }
 }
+job {
+  id: "cbuild"
+  schedule: "with 15m interval"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "cbuild"
+  }
+}
 job {
   id: "chocolatey"
   schedule: "triggered"
diff --git a/main.star b/main.star
index 518cb417341e..1625ddcb1a22 100755
--- a/main.star
+++ b/main.star
@@ -1280,6 +1280,12 @@ dart_infra_builder(
     schedule = "with 15m interval",
     notifies = None,
 )
+dart_infra_builder(
+    "cbuild",
+    recipe = "dart/cbuild",
+    schedule = "with 15m interval",
+    execution_timeout = 10 * time.minute,
+)
 dart_infra_builder("chocolatey", recipe = "dart/chocolatey", dimensions = windows())
 dart_infra_builder("co19-roller", recipe = "dart/package_co19")
 dart_infra_builder("docker", recipe = "dart/docker")

From 530714f646d8a127ac65c6b1f29b0db89da82fc6 Mon Sep 17 00:00:00 2001
From: Karl Klose <karlklose@google.com>
Date: Wed, 19 Aug 2020 10:16:26 +0000
Subject: [PATCH 412/826] [infra] Add Karl to 'infra' notifier

Change-Id: I195109346bf64f7cf2c9f9731e728a78342d4b22
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/159246
Reviewed-by: William Hesse <whesse@google.com>
---
 luci-notify.cfg | 11 +++++++++++
 main.star       |  1 +
 2 files changed, 12 insertions(+)

diff --git a/luci-notify.cfg b/luci-notify.cfg
index b7b6e1d6aae4..cf853b607e76 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -11,6 +11,7 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -39,6 +40,7 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -95,6 +97,7 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -110,6 +113,7 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -124,6 +128,7 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -138,6 +143,7 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -152,6 +158,7 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -166,6 +173,7 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -181,6 +189,7 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -209,6 +218,7 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -223,6 +233,7 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
     }
   }
   builders {
diff --git a/main.star b/main.star
index 1625ddcb1a22..9f9fd45bd099 100755
--- a/main.star
+++ b/main.star
@@ -311,6 +311,7 @@ luci.notifier(
         "athom@google.com",
         "sortie@google.com",
         "whesse@google.com",
+        "karlklose@google.com",
     ],
 )
 

From 2b6defaadc327542dc5a0d7737626ce2b381c565 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 19 Aug 2020 12:07:11 +0000
Subject: [PATCH 413/826] [infra] Add google builder to the LKGR builders

A successful cbuild is now required for a dev roll. This also adds the
builder to the go/darto console (in the Flutter category, because it
blocks Flutter rolls now).

https://github.com/dart-lang/sdk/issues/42917

Change-Id: I1ca3b1f6abce46cbfb8e0ce57f75e4c8e3cf9342
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/159249
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: Karl Klose <karlklose@google.com>
Commit-Queue: Karl Klose <karlklose@google.com>
---
 cr-buildbucket.cfg |  2 +-
 luci-milo.cfg      | 15 ++++++++++-----
 luci-notify.cfg    |  1 +
 main.star          |  4 ++--
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index c64e7b24677a..8101e7a00a3b 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -588,7 +588,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "builders:[{\"bucket\":\"ci\",\"builder\":\"dart-sdk-linux\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-mac\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-win\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"debianpackage-linux\",\"project\":\"dart\"}]"
+        properties_j: "builders:[{\"bucket\":\"ci\",\"builder\":\"dart-sdk-linux\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-mac\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-win\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"debianpackage-linux\",\"project\":\"dart\"},{\"bucket\":\"ci.sandbox\",\"builder\":\"google\",\"project\":\"dart\"}]"
         properties_j: "clobber:\"true\""
         properties_j: "ref:\"refs/heads/lkgr\""
       }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index ea7412aae096..435e0fa545ef 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -520,6 +520,11 @@ consoles {
     category: "misc"
     short_name: "vc"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/google"
+    category: "flutter"
+    short_name: "g3"
+  }
   header {
     links {
       name: "Consoles"
@@ -762,6 +767,11 @@ consoles {
     category: "misc"
     short_name: "vc"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/google"
+    category: "flutter"
+    short_name: "g3"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
     category: "vm|nnbd"
@@ -2459,11 +2469,6 @@ consoles {
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/google"
-    category: "external"
-    short_name: "g"
-  }
 }
 consoles {
   id: "cq"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index cf853b607e76..a658fb8d673f 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -26,6 +26,7 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
     }
   }
   builders {
diff --git a/main.star b/main.star
index 9f9fd45bd099..887650d57633 100755
--- a/main.star
+++ b/main.star
@@ -1266,10 +1266,10 @@ dart_ci_builder(
 dart_ci_sandbox_builder(
     "google",
     recipe = "dart/external",
-    category = "external|g",
+    category = "flutter|g3",
     channels = [],
+    lkgr = True,
     triggered_by = None,
-    fyi = True,
     notifies = None,
 )
 

From 26daaf60b2eac9458fb0f5f88fae0fae09b164e6 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 19 Aug 2020 13:46:51 +0000
Subject: [PATCH 414/826] [infra] Remove the cross arm builder from the release
 channels

This causes a fair amount of wasted capacity because the builder fails
if more than one build is running concurrently. The automatic dev rolls
make it much more likely that there are multiple builds running at the
same time than before.

Change-Id: I682b1f7957907c718caedb71ef8f6d725010cdbd
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/159250
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 78 ----------------------------------------------
 luci-milo.cfg      | 15 ---------
 luci-scheduler.cfg | 33 --------------------
 main.star          |  2 +-
 4 files changed, 1 insertion(+), 127 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 8101e7a00a3b..762ab370588f 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1737,84 +1737,6 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
-    builders {
-      name: "cross-vm-linux-release-arm64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "shard_timeout:5400"
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "cross-vm-linux-release-arm64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "shard_timeout:5400"
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "cross-vm-linux-release-arm64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-        properties_j: "shard_timeout:5400"
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
     builders {
       name: "cross-vm-precomp-linux-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 435e0fa545ef..cd9fdc6a36df 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -1259,11 +1259,6 @@ consoles {
     category: "vm|kernel"
     short_name: "wr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-dev"
-    category: "vm|kernel"
-    short_name: "cra"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-dev"
     category: "vm|kernel-precomp"
@@ -1696,11 +1691,6 @@ consoles {
     category: "vm|kernel"
     short_name: "wr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-beta"
-    category: "vm|kernel"
-    short_name: "cra"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-beta"
     category: "vm|kernel-precomp"
@@ -2133,11 +2123,6 @@ consoles {
     category: "vm|kernel"
     short_name: "wr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64-stable"
-    category: "vm|kernel"
-    short_name: "cra"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-stable"
     category: "vm|kernel-precomp"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 7dc318408a3e..840a07a92f65 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -384,36 +384,6 @@ job {
     builder: "cross-vm-linux-release-arm64"
   }
 }
-job {
-  id: "cross-vm-linux-release-arm64-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "cross-vm-linux-release-arm64-beta"
-  }
-}
-job {
-  id: "cross-vm-linux-release-arm64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "cross-vm-linux-release-arm64-dev"
-  }
-}
-job {
-  id: "cross-vm-linux-release-arm64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "cross-vm-linux-release-arm64-stable"
-  }
-}
 job {
   id: "cross-vm-precomp-linux-release-arm64"
   schedule: "triggered"
@@ -3592,7 +3562,6 @@ trigger {
   triggers: "app-kernel-linux-debug-x64-beta"
   triggers: "app-kernel-linux-product-x64-beta"
   triggers: "app-kernel-linux-release-x64-beta"
-  triggers: "cross-vm-linux-release-arm64-beta"
   triggers: "dart2js-csp-minified-linux-x64-chrome-beta"
   triggers: "dart2js-minified-strong-linux-x64-d8-beta"
   triggers: "dart2js-nnbd-linux-x64-chrome-beta"
@@ -3679,7 +3648,6 @@ trigger {
   triggers: "app-kernel-linux-debug-x64-dev"
   triggers: "app-kernel-linux-product-x64-dev"
   triggers: "app-kernel-linux-release-x64-dev"
-  triggers: "cross-vm-linux-release-arm64-dev"
   triggers: "dart2js-csp-minified-linux-x64-chrome-dev"
   triggers: "dart2js-minified-strong-linux-x64-d8-dev"
   triggers: "dart2js-nnbd-linux-x64-chrome-dev"
@@ -3830,7 +3798,6 @@ trigger {
   triggers: "app-kernel-linux-debug-x64-stable"
   triggers: "app-kernel-linux-product-x64-stable"
   triggers: "app-kernel-linux-release-x64-stable"
-  triggers: "cross-vm-linux-release-arm64-stable"
   triggers: "dart2js-csp-minified-linux-x64-chrome-stable"
   triggers: "dart2js-minified-strong-linux-x64-d8-stable"
   triggers: "dart2js-nnbd-linux-x64-chrome-stable"
diff --git a/main.star b/main.star
index 887650d57633..1eff9a7e8683 100755
--- a/main.star
+++ b/main.star
@@ -891,7 +891,7 @@ dart_ci_sandbox_builder(
 dart_vm_extra_builder(
     "cross-vm-linux-release-arm64",
     category = "vm|kernel|cra",
-    channels = RELEASE_CHANNELS,
+    channels = [],
     properties = {"shard_timeout": (90 * time.minute) // time.second},
 )
 

From c9ef2507bf1436e5c89b38539ef254d6e3ca480f Mon Sep 17 00:00:00 2001
From: Alexander Aprelev <aam@google.com>
Date: Thu, 20 Aug 2020 21:46:06 +0000
Subject: [PATCH 415/826] [infra] Remove google bot from lkgr group.

Change-Id: Iea5964e7f1914f6be52b0f91677936d4b84fcae8
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/159580
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Aprelev <aam@google.com>
---
 cr-buildbucket.cfg | 2 +-
 main.star          | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 762ab370588f..192496d2f984 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -588,7 +588,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "builders:[{\"bucket\":\"ci\",\"builder\":\"dart-sdk-linux\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-mac\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-win\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"debianpackage-linux\",\"project\":\"dart\"},{\"bucket\":\"ci.sandbox\",\"builder\":\"google\",\"project\":\"dart\"}]"
+        properties_j: "builders:[{\"bucket\":\"ci\",\"builder\":\"dart-sdk-linux\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-mac\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-win\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"debianpackage-linux\",\"project\":\"dart\"}]"
         properties_j: "clobber:\"true\""
         properties_j: "ref:\"refs/heads/lkgr\""
       }
diff --git a/main.star b/main.star
index 1eff9a7e8683..cd39324e806b 100755
--- a/main.star
+++ b/main.star
@@ -1268,7 +1268,6 @@ dart_ci_sandbox_builder(
     recipe = "dart/external",
     category = "flutter|g3",
     channels = [],
-    lkgr = True,
     triggered_by = None,
     notifies = None,
 )

From ea4d5524e55ce03f46b2d635d15d7b0c256511f7 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 21 Aug 2020 09:46:43 +0000
Subject: [PATCH 416/826] Revert "[infra] Remove google bot from lkgr group."

This reverts commit c9ef2507bf1436e5c89b38539ef254d6e3ca480f.

Reason for revert: https://dart-review.googlesource.com/c/recipes/+/159621 fixed the root cause.

Original change's description:
> [infra] Remove google bot from lkgr group.
>
> Change-Id: Iea5964e7f1914f6be52b0f91677936d4b84fcae8
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/159580
> Reviewed-by: Alexander Thomas <athom@google.com>
> Commit-Queue: Alexander Aprelev <aam@google.com>

Change-Id: Ia857163c119f5e15eb519033ff23f569e771d532
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/159661
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: Karl Klose <karlklose@google.com>
Commit-Queue: Karl Klose <karlklose@google.com>
---
 cr-buildbucket.cfg | 2 +-
 main.star          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 192496d2f984..762ab370588f 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -588,7 +588,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "builders:[{\"bucket\":\"ci\",\"builder\":\"dart-sdk-linux\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-mac\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-win\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"debianpackage-linux\",\"project\":\"dart\"}]"
+        properties_j: "builders:[{\"bucket\":\"ci\",\"builder\":\"dart-sdk-linux\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-mac\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-win\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"debianpackage-linux\",\"project\":\"dart\"},{\"bucket\":\"ci.sandbox\",\"builder\":\"google\",\"project\":\"dart\"}]"
         properties_j: "clobber:\"true\""
         properties_j: "ref:\"refs/heads/lkgr\""
       }
diff --git a/main.star b/main.star
index cd39324e806b..1eff9a7e8683 100755
--- a/main.star
+++ b/main.star
@@ -1268,6 +1268,7 @@ dart_ci_sandbox_builder(
     recipe = "dart/external",
     category = "flutter|g3",
     channels = [],
+    lkgr = True,
     triggered_by = None,
     notifies = None,
 )

From 454f04a58a360bdaee6555ffd0f054cdb81a0464 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 24 Aug 2020 14:06:24 +0000
Subject: [PATCH 417/826] [infra] Tweak timing of lkgr and google builders

The google builder needs to be green to advance the lkgr branch, but is
competing with other jobs for it's share of the time and therefore might
be starved. Because it's very fast (<1 min) it can have a higher
priority without causing much impact. This CL gives it the same priority
as tryjobs and an aggressive 5 min execution timeout (in case it
misbehaves in the future).

The lkgr builder's frequences is increased from once per hour to 4 times
per hour. This will make it more likely that the rolls to dev will
pickup a recent commit.

Change-Id: Ia7825ec56b1b97b4188fbce8380076a6cb64e5e2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/159900
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 3 ++-
 luci-scheduler.cfg | 2 +-
 main.star          | 6 ++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 762ab370588f..2489017fa7de 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -4021,7 +4021,8 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
+      priority: 30
+      execution_timeout_secs: 300
       caches {
         name: "browsers"
         path: "browsers"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 840a07a92f65..b60c6c36c7e1 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1460,7 +1460,7 @@ job {
 }
 job {
   id: "lkgr"
-  schedule: "with 1h interval"
+  schedule: "with 15m interval"
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
diff --git a/main.star b/main.star
index 1eff9a7e8683..e6015058947f 100755
--- a/main.star
+++ b/main.star
@@ -1268,9 +1268,11 @@ dart_ci_sandbox_builder(
     recipe = "dart/external",
     category = "flutter|g3",
     channels = [],
+    execution_timeout = 5 * time.minute,
     lkgr = True,
-    triggered_by = None,
     notifies = None,
+    priority = HIGH,
+    triggered_by = None,
 )
 
 # infra
@@ -1310,7 +1312,7 @@ dart_infra_builder(
     notifies = "infra",
     properties = {"builders": lkgr_builders, "ref": "refs/heads/lkgr"},
     recipe = "roller/lkgr",
-    schedule = "with 1h interval",
+    schedule = "with 15m interval",
 )
 dart_infra_builder(
     "roll-to-dev",

From a48d940f03113945eefe374589a8883b88249cef Mon Sep 17 00:00:00 2001
From: Karl Klose <karlklose@google.com>
Date: Mon, 7 Sep 2020 10:44:08 +0000
Subject: [PATCH 418/826] [infra] Switch sanitizer builders to nightly schedule

Change-Id: Ifaaad5fc0793c1cc5c94dc2f585a401fd59b60b8
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/159441
Commit-Queue: Karl Klose <karlklose@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 24 +++++++++++++++---------
 luci-notify.cfg    | 37 +++++++++++++++++++++----------------
 luci-scheduler.cfg |  8 --------
 main.star          | 44 ++++++++++++++++++++++++++++++++------------
 4 files changed, 68 insertions(+), 45 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 2489017fa7de..58741b982c87 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -616,7 +616,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "builders:[\"cross-vm-precomp-linux-release-arm64\"]"
+        properties_j: "builders:[\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\"]"
         properties_j: "clobber:\"true\""
       }
       priority: 50
@@ -5307,10 +5307,10 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 70
-      expiration_secs: 86400
       caches {
         name: "browsers"
         path: "browsers"
@@ -6427,10 +6427,10 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 70
-      expiration_secs: 86400
       caches {
         name: "browsers"
         path: "browsers"
@@ -6913,10 +6913,10 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 70
-      expiration_secs: 86400
       caches {
         name: "browsers"
         path: "browsers"
@@ -7741,10 +7741,10 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 70
-      expiration_secs: 86400
       caches {
         name: "browsers"
         path: "browsers"
@@ -8067,10 +8067,10 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 70
-      expiration_secs: 86400
       caches {
         name: "browsers"
         path: "browsers"
@@ -8092,10 +8092,10 @@ buckets {
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 70
-      expiration_secs: 86400
       caches {
         name: "browsers"
         path: "browsers"
@@ -8326,7 +8326,6 @@ buckets {
         properties_j: "clobber:\"true\""
       }
       priority: 70
-      expiration_secs: 86400
       caches {
         name: "browsers"
         path: "browsers"
@@ -8348,10 +8347,10 @@ buckets {
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 70
-      expiration_secs: 86400
       caches {
         name: "browsers"
         path: "browsers"
@@ -10290,6 +10289,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 30
@@ -10614,6 +10614,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 30
@@ -10791,6 +10792,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 30
@@ -11017,6 +11019,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 30
@@ -11117,6 +11120,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 30
@@ -11141,6 +11145,7 @@ buckets {
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 30
@@ -11316,6 +11321,7 @@ buckets {
         cipd_version: "refs/heads/master"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 30
diff --git a/luci-notify.cfg b/luci-notify.cfg
index a658fb8d673f..0667a9aa9d52 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -382,6 +382,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "cross-vm-precomp-linux-release-arm64"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -943,14 +956,13 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
+      recipients: "karlklose@google.com"
       recipients: "athom@google.com"
     }
-    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-asan-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1111,14 +1123,13 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
+      recipients: "karlklose@google.com"
       recipients: "athom@google.com"
     }
-    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-msan-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1209,14 +1220,13 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
+      recipients: "karlklose@google.com"
       recipients: "athom@google.com"
     }
-    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-asan-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1335,14 +1345,13 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
+      recipients: "karlklose@google.com"
       recipients: "athom@google.com"
     }
-    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-msan-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1391,28 +1400,26 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
+      recipients: "karlklose@google.com"
       recipients: "athom@google.com"
     }
-    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-tsan-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
     email {
+      recipients: "karlklose@google.com"
       recipients: "athom@google.com"
     }
-    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-ubsan-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1489,28 +1496,26 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
+      recipients: "karlklose@google.com"
       recipients: "athom@google.com"
     }
-    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-tsan-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
     email {
+      recipients: "karlklose@google.com"
       recipients: "athom@google.com"
     }
-    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-ubsan-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index b60c6c36c7e1..149e30e817fb 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -3885,21 +3885,18 @@ trigger {
   triggers: "vm-ffi-android-release-arm"
   triggers: "vm-ffi-android-release-arm64"
   triggers: "vm-fuchsia-release-x64"
-  triggers: "vm-kernel-asan-linux-release-x64"
   triggers: "vm-kernel-checked-linux-release-x64"
   triggers: "vm-kernel-linux-debug-ia32"
   triggers: "vm-kernel-linux-product-x64"
   triggers: "vm-kernel-linux-release-ia32"
   triggers: "vm-kernel-linux-release-simarm"
   triggers: "vm-kernel-linux-release-simarm64"
-  triggers: "vm-kernel-msan-linux-release-x64"
   triggers: "vm-kernel-nnbd-linux-debug-x64"
   triggers: "vm-kernel-nnbd-linux-release-x64"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
   triggers: "vm-kernel-precomp-android-release-arm64"
   triggers: "vm-kernel-precomp-android-release-arm_x64"
-  triggers: "vm-kernel-precomp-asan-linux-release-x64"
   triggers: "vm-kernel-precomp-linux-debug-simarm_x64"
   triggers: "vm-kernel-precomp-linux-debug-x64"
   triggers: "vm-kernel-precomp-linux-product-x64"
@@ -3908,19 +3905,14 @@ trigger {
   triggers: "vm-kernel-precomp-linux-release-simarm_x64"
   triggers: "vm-kernel-precomp-linux-release-x64"
   triggers: "vm-kernel-precomp-mac-release-simarm64"
-  triggers: "vm-kernel-precomp-msan-linux-release-x64"
   triggers: "vm-kernel-precomp-nnbd-linux-release-simarm64"
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64"
-  triggers: "vm-kernel-precomp-tsan-linux-release-x64"
-  triggers: "vm-kernel-precomp-ubsan-linux-release-x64"
   triggers: "vm-kernel-precomp-win-release-x64"
   triggers: "vm-kernel-reload-linux-debug-x64"
   triggers: "vm-kernel-reload-linux-release-x64"
   triggers: "vm-kernel-reload-rollback-linux-debug-x64"
   triggers: "vm-kernel-reload-rollback-linux-release-x64"
-  triggers: "vm-kernel-tsan-linux-release-x64"
-  triggers: "vm-kernel-ubsan-linux-release-x64"
   triggers: "vm-kernel-win-debug-ia32"
   triggers: "vm-kernel-win-release-ia32"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm"
diff --git a/main.star b/main.star
index e6015058947f..b4503cf7e271 100755
--- a/main.star
+++ b/main.star
@@ -322,6 +322,12 @@ luci.notifier(
     notify_blamelist = True,
 )
 
+luci.notifier(
+    name = "nightly",
+    on_new_failure = True,
+    notify_emails = ["karlklose@google.com", "athom@google.com"],
+)
+
 luci.notifier(
     name = "dart-fuzz-testing",
     on_success = True,
@@ -692,9 +698,17 @@ def dart_vm_low_priority_builder(name, **kwargs):
         **kwargs
     )
 
+# These lists are used to collect all nightly/weekly builders to give them as
+# properties to the "nightly"/"weekly" builder defined below, which triggers
+# the actual builds using the "cron" recipe.
+#
+# We do not set a schedule on the individual builders because the scheduler
+# doesn't set an input commit when it triggers cron'ed builders, and without
+# an input commit, Milo doesn't know how to show the build on the console.
 nightly_builders = []
+weekly_builders = []
 
-def dart_vm_nightly_builder(name, notifies = None, **kwargs):
+def dart_vm_nightly_builder(name, notifies = "nightly", **kwargs):
     dart_ci_sandbox_builder(
         name,
         notifies = notifies,
@@ -706,8 +720,6 @@ def dart_vm_nightly_builder(name, notifies = None, **kwargs):
     )
     nightly_builders.append(name)
 
-weekly_builders = []
-
 def weekly_ci_sandbox_builder(name, notifies = None, **kwargs):
     dart_ci_sandbox_builder(
         name,
@@ -984,37 +996,45 @@ dart_vm_low_priority_builder(
     "vm-kernel-optcounter-threshold-linux-release-x64",
     category = "vm|misc|o64",
 )
-dart_vm_low_priority_builder(
+
+def dart_vm_sanitizer_builder(name, **kwargs):
+    dart_vm_nightly_builder(
+        name,
+        channels = ["try"],
+        properties = {"bisection_enabled": True},
+        **kwargs
+    )
+
+dart_vm_sanitizer_builder(
     "vm-kernel-asan-linux-release-x64",
     category = "vm|misc|a",
 )
-dart_vm_low_priority_builder(
+dart_vm_sanitizer_builder(
     "vm-kernel-msan-linux-release-x64",
     category = "vm|misc|m",
 )
-dart_vm_low_priority_builder(
+dart_vm_sanitizer_builder(
     "vm-kernel-tsan-linux-release-x64",
     category = "vm|misc|t",
-    properties = {"bisection_enabled": True},
 )
-dart_vm_low_priority_builder(
+dart_vm_sanitizer_builder(
     "vm-kernel-ubsan-linux-release-x64",
     category = "vm|misc|u",
     goma_rbe = False,
 )  # ubsan is not compatible with our sysroot.
-dart_vm_low_priority_builder(
+dart_vm_sanitizer_builder(
     "vm-kernel-precomp-asan-linux-release-x64",
     category = "vm|misc|aot|a",
 )
-dart_vm_low_priority_builder(
+dart_vm_sanitizer_builder(
     "vm-kernel-precomp-msan-linux-release-x64",
     category = "vm|misc|aot|m",
 )
-dart_vm_low_priority_builder(
+dart_vm_sanitizer_builder(
     "vm-kernel-precomp-tsan-linux-release-x64",
     category = "vm|misc|aot|t",
 )
-dart_vm_low_priority_builder(
+dart_vm_sanitizer_builder(
     "vm-kernel-precomp-ubsan-linux-release-x64",
     category = "vm|misc|aot|u",
     goma_rbe = False,

From 9ec835026b99d209fc5f98fb80df615691a0f5b4 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 17 Sep 2020 21:23:38 +0000
Subject: [PATCH 419/826] [infra] Add the remaining CFE NNBD configurations to
 the Luci config

The added configurations will run nightly for now.

https://github.com/dart-lang/sdk/issues/43463

Change-Id: I9ee6a2e667c20451585bdbbff8744123e6fe03af
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/163201
Reviewed-by: William Hesse <whesse@google.com>
---
 commit-queue.cfg   |   8 ++++
 cr-buildbucket.cfg | 102 ++++++++++++++++++++++++++++++++++++++++++++-
 luci-milo.cfg      |  46 +++++++++++++++-----
 luci-notify.cfg    |  26 ++++++++++++
 luci-scheduler.cfg |  20 +++++++++
 main.star          |  18 ++++++--
 6 files changed, 205 insertions(+), 15 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 74ebb2acfd7a..c96c5c846480 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -348,6 +348,14 @@ config_groups {
         location_regexp: ".+/[+]/tests/.+"
         location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
       }
+      builders {
+        name: "dart/try/front-end-nnbd-mac-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/front-end-nnbd-win-release-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/front-end-win-release-x64-try"
         includable_only: true
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 58741b982c87..7f7f5b8e1394 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -616,7 +616,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "builders:[\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\"]"
+        properties_j: "builders:[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\"]"
         properties_j: "clobber:\"true\""
       }
       priority: 50
@@ -3753,6 +3753,56 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
+    builders {
+      name: "front-end-nnbd-mac-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 70
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "front-end-nnbd-win-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 70
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
     builders {
       name: "front-end-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -9870,6 +9920,56 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
+    builders {
+      name: "front-end-nnbd-mac-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "front-end-nnbd-win-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
     builders {
       name: "front-end-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index cd9fdc6a36df..4e23a252a465 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -27,8 +27,18 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64"
-    category: "cfe"
-    short_name: "nn"
+    category: "cfe|nnbd"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-mac-release-x64"
+    category: "cfe|nnbd"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-win-release-x64"
+    category: "cfe|nnbd"
+    short_name: "w"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
@@ -584,8 +594,18 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64"
-    category: "cfe"
-    short_name: "nn"
+    category: "cfe|nnbd"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-mac-release-x64"
+    category: "cfe|nnbd"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-win-release-x64"
+    category: "cfe|nnbd"
+    short_name: "w"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
@@ -1141,8 +1161,8 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-dev"
-    category: "cfe"
-    short_name: "nn"
+    category: "cfe|nnbd"
+    short_name: "l"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-dev"
@@ -1573,8 +1593,8 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-beta"
-    category: "cfe"
-    short_name: "nn"
+    category: "cfe|nnbd"
+    short_name: "l"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-beta"
@@ -2005,8 +2025,8 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-stable"
-    category: "cfe"
-    short_name: "nn"
+    category: "cfe|nnbd"
+    short_name: "l"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-stable"
@@ -2470,6 +2490,12 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/front-end-nnbd-linux-release-x64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/front-end-nnbd-mac-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/front-end-nnbd-win-release-x64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/flutter-frontend-try"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 0667a9aa9d52..5389fb5883a5 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -702,6 +702,32 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "front-end-nnbd-mac-release-x64"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "front-end-nnbd-win-release-x64"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 149e30e817fb..e505da0f463f 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1334,6 +1334,26 @@ job {
     builder: "front-end-nnbd-linux-release-x64-stable"
   }
 }
+job {
+  id: "front-end-nnbd-mac-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-nnbd-mac-release-x64"
+  }
+}
+job {
+  id: "front-end-nnbd-win-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-nnbd-win-release-x64"
+  }
+}
 job {
   id: "front-end-win-release-x64"
   schedule: "triggered"
diff --git a/main.star b/main.star
index b4503cf7e271..6a71995dc65e 100755
--- a/main.star
+++ b/main.star
@@ -708,7 +708,7 @@ def dart_vm_low_priority_builder(name, **kwargs):
 nightly_builders = []
 weekly_builders = []
 
-def dart_vm_nightly_builder(name, notifies = "nightly", **kwargs):
+def nightly_builder(name, notifies = "nightly", **kwargs):
     dart_ci_sandbox_builder(
         name,
         notifies = notifies,
@@ -750,9 +750,19 @@ dart_ci_sandbox_builder(
 )
 dart_ci_sandbox_builder(
     "front-end-nnbd-linux-release-x64",
-    category = "cfe|nn",
+    category = "cfe|nnbd|l",
     location_regexp = to_location_regexp(CFE_PATHS),
 )
+nightly_builder(
+    "front-end-nnbd-mac-release-x64",
+    category = "cfe|nnbd|m",
+    channels = ["try"],
+)
+nightly_builder(
+    "front-end-nnbd-win-release-x64",
+    category = "cfe|nnbd|w",
+    channels = ["try"],
+)
 dart_ci_sandbox_builder(
     "flutter-frontend",
     category = "cfe|fl",
@@ -951,7 +961,7 @@ dart_vm_extra_builder(
     category = "vm|kernel-precomp|wr",
     dimensions = windows(),
 )
-dart_vm_nightly_builder(
+nightly_builder(
     "cross-vm-precomp-linux-release-arm64",
     category = "vm|kernel-precomp|cra",
     channels = [],
@@ -998,7 +1008,7 @@ dart_vm_low_priority_builder(
 )
 
 def dart_vm_sanitizer_builder(name, **kwargs):
-    dart_vm_nightly_builder(
+    nightly_builder(
         name,
         channels = ["try"],
         properties = {"bisection_enabled": True},

From 4604c6f96e90d313a1de80d1d8bc46f3411d0b6f Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 18 Sep 2020 10:34:14 +0000
Subject: [PATCH 420/826] [infra] Use the correct dimensions for the new CFE
 nnbd builders

https://github.com/dart-lang/sdk/issues/43463

Change-Id: I5624621014bf3e219e5d0728b8aab1dbf6a2fc7f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/163341
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 12 ++++++------
 main.star          |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 7f7f5b8e1394..00c8aab9b21e 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -3759,13 +3759,13 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3784,7 +3784,7 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -9926,13 +9926,13 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9951,7 +9951,7 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
diff --git a/main.star b/main.star
index 6a71995dc65e..3f05a0151e58 100755
--- a/main.star
+++ b/main.star
@@ -757,11 +757,13 @@ nightly_builder(
     "front-end-nnbd-mac-release-x64",
     category = "cfe|nnbd|m",
     channels = ["try"],
+    dimensions = mac(),
 )
 nightly_builder(
     "front-end-nnbd-win-release-x64",
     category = "cfe|nnbd|w",
     channels = ["try"],
+    dimensions = windows(),
 )
 dart_ci_sandbox_builder(
     "flutter-frontend",

From eef187b7e5917c6b34084fb686cd763302d955c7 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 22 Sep 2020 17:12:44 +0000
Subject: [PATCH 421/826] [infra] Remove dartkb builders

Change-Id: I1b9e3f771fbcec27147bf685eb4284e07db0c42b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/163640
Reviewed-by: Siva Annamalai <asiva@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg   |   8 --
 cr-buildbucket.cfg | 250 ---------------------------------------------
 luci-milo.cfg      |  56 ----------
 luci-notify.cfg    |  28 -----
 luci-scheduler.cfg |  88 ----------------
 main.star          |   7 --
 6 files changed, 437 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index c96c5c846480..ac042b4b8dc1 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -394,14 +394,6 @@ config_groups {
         location_regexp: ".+/[+]/pkg/vm/.+"
         location_regexp: ".+/[+]/runtime/.+"
       }
-      builders {
-        name: "dart/try/vm-dartkb-linux-release-simarm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-dartkb-linux-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-ffi-android-debug-arm-try"
         includable_only: true
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 00c8aab9b21e..fc415cd20a84 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -4516,206 +4516,6 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
-    builders {
-      name: "vm-dartkb-linux-release-simarm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-dartkb-linux-release-simarm64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-dartkb-linux-release-simarm64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-dartkb-linux-release-simarm64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-dartkb-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-dartkb-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-dartkb-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-dartkb-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
     builders {
       name: "vm-ffi-android-debug-arm"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10149,56 +9949,6 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
-    builders {
-      name: "vm-dartkb-linux-release-simarm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-dartkb-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
     builders {
       name: "vm-ffi-android-debug-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 4e23a252a465..c439d9034325 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -90,16 +90,6 @@ consoles {
     category: "vm|app-kernel"
     short_name: "r64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64"
-    category: "vm|dartkb"
-    short_name: "sr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64"
-    category: "vm|dartkb"
-    short_name: "r"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
     category: "vm|kernel"
@@ -827,16 +817,6 @@ consoles {
     category: "vm|app-kernel"
     short_name: "r64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64"
-    category: "vm|dartkb"
-    short_name: "sr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64"
-    category: "vm|dartkb"
-    short_name: "r"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
     category: "vm|kernel"
@@ -1199,16 +1179,6 @@ consoles {
     category: "vm|app-kernel"
     short_name: "r64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64-dev"
-    category: "vm|dartkb"
-    short_name: "sr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-dev"
-    category: "vm|dartkb"
-    short_name: "r"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-dev"
     category: "vm|kernel"
@@ -1631,16 +1601,6 @@ consoles {
     category: "vm|app-kernel"
     short_name: "r64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64-beta"
-    category: "vm|dartkb"
-    short_name: "sr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-beta"
-    category: "vm|dartkb"
-    short_name: "r"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-beta"
     category: "vm|kernel"
@@ -2063,16 +2023,6 @@ consoles {
     category: "vm|app-kernel"
     short_name: "r64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-simarm64-stable"
-    category: "vm|dartkb"
-    short_name: "sr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-dartkb-linux-release-x64-stable"
-    category: "vm|dartkb"
-    short_name: "r"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-stable"
     category: "vm|kernel"
@@ -2526,12 +2476,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/app-kernel-linux-release-x64-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-dartkb-linux-release-simarm64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-dartkb-linux-release-x64-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 5389fb5883a5..68e1cd649a8a 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -852,34 +852,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-dartkb-linux-release-simarm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-dartkb-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index e505da0f463f..7ccbcaf3f1aa 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1738,86 +1738,6 @@ job {
     builder: "vm-canary-linux-debug-stable"
   }
 }
-job {
-  id: "vm-dartkb-linux-release-simarm64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-simarm64"
-  }
-}
-job {
-  id: "vm-dartkb-linux-release-simarm64-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-simarm64-beta"
-  }
-}
-job {
-  id: "vm-dartkb-linux-release-simarm64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-simarm64-dev"
-  }
-}
-job {
-  id: "vm-dartkb-linux-release-simarm64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-simarm64-stable"
-  }
-}
-job {
-  id: "vm-dartkb-linux-release-x64"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-x64"
-  }
-}
-job {
-  id: "vm-dartkb-linux-release-x64-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-x64-beta"
-  }
-}
-job {
-  id: "vm-dartkb-linux-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-x64-dev"
-  }
-}
-job {
-  id: "vm-dartkb-linux-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-dartkb-linux-release-x64-stable"
-  }
-}
 job {
   id: "vm-ffi-android-debug-arm"
   schedule: "triggered"
@@ -3606,8 +3526,6 @@ trigger {
   triggers: "pkg-mac-release-beta"
   triggers: "pkg-win-release-beta"
   triggers: "vm-canary-linux-debug-beta"
-  triggers: "vm-dartkb-linux-release-simarm64-beta"
-  triggers: "vm-dartkb-linux-release-x64-beta"
   triggers: "vm-ffi-android-debug-arm-beta"
   triggers: "vm-ffi-android-debug-arm64-beta"
   triggers: "vm-ffi-android-product-arm-beta"
@@ -3692,8 +3610,6 @@ trigger {
   triggers: "pkg-mac-release-dev"
   triggers: "pkg-win-release-dev"
   triggers: "vm-canary-linux-debug-dev"
-  triggers: "vm-dartkb-linux-release-simarm64-dev"
-  triggers: "vm-dartkb-linux-release-x64-dev"
   triggers: "vm-ffi-android-debug-arm-dev"
   triggers: "vm-ffi-android-debug-arm64-dev"
   triggers: "vm-ffi-android-product-arm-dev"
@@ -3842,8 +3758,6 @@ trigger {
   triggers: "pkg-mac-release-stable"
   triggers: "pkg-win-release-stable"
   triggers: "vm-canary-linux-debug-stable"
-  triggers: "vm-dartkb-linux-release-simarm64-stable"
-  triggers: "vm-dartkb-linux-release-x64-stable"
   triggers: "vm-ffi-android-debug-arm-stable"
   triggers: "vm-ffi-android-debug-arm64-stable"
   triggers: "vm-ffi-android-product-arm-stable"
@@ -3896,8 +3810,6 @@ trigger {
   triggers: "app-kernel-linux-release-x64"
   triggers: "cross-vm-linux-release-arm64"
   triggers: "vm-canary-linux-debug"
-  triggers: "vm-dartkb-linux-release-simarm64"
-  triggers: "vm-dartkb-linux-release-x64"
   triggers: "vm-ffi-android-debug-arm"
   triggers: "vm-ffi-android-debug-arm64"
   triggers: "vm-ffi-android-product-arm"
diff --git a/main.star b/main.star
index 3f05a0151e58..be0b8b003723 100755
--- a/main.star
+++ b/main.star
@@ -847,13 +847,6 @@ dart_vm_extra_builder(
     category = "vm|app-kernel|r64",
 )
 
-# vm|dartkb
-dart_vm_extra_builder(
-    "vm-dartkb-linux-release-simarm64",
-    category = "vm|dartkb|sr",
-)
-dart_vm_extra_builder("vm-dartkb-linux-release-x64", category = "vm|dartkb|r")
-
 #vm|kernel
 dart_vm_extra_builder(
     "vm-canary-linux-debug",

From b24c4caa3ef994e377730b27e4df622e47f90fef Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 23 Sep 2020 07:26:41 +0000
Subject: [PATCH 422/826] [infra] Move JIT product mode builders to a nightly
 schedule

This also removes JIT/product mode off the CQ and the release channels.

Change-Id: I68c68b7349033adc11e71704af2d6b1215d0850b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/163660
Reviewed-by: Siva Annamalai <asiva@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg   |  13 +--
 cr-buildbucket.cfg | 231 +--------------------------------------------
 luci-milo.cfg      |  45 ---------
 luci-notify.cfg    |   9 +-
 luci-scheduler.cfg | 102 --------------------
 main.star          |  10 +-
 6 files changed, 14 insertions(+), 396 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index ac042b4b8dc1..5c169b698669 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -444,18 +444,7 @@ config_groups {
       }
       builders {
         name: "dart/try/vm-kernel-linux-product-x64-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        location_regexp: ".+/[+]/pkg/vm/.+"
-        location_regexp: ".+/[+]/runtime/.+"
+        includable_only: true
       }
       builders {
         name: "dart/try/vm-kernel-linux-release-ia32-try"
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index fc415cd20a84..18bb165bf963 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -616,7 +616,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "builders:[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\"]"
+        properties_j: "builders:[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-linux-product-x64\",\"vm-kernel-mac-product-x64\",\"vm-kernel-win-product-x64\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\"]"
         properties_j: "clobber:\"true\""
       }
       priority: 50
@@ -5485,82 +5485,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-kernel-linux-product-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-kernel-linux-product-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-kernel-linux-product-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -6083,80 +6008,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-kernel-mac-product-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-kernel-mac-product-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-kernel-mac-product-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -8425,82 +8277,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-kernel-win-product-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-kernel-win-product-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-kernel-win-product-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index c439d9034325..a95e277d28f1 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -1309,21 +1309,6 @@ consoles {
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64-dev"
-    category: "vm|product"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64-dev"
-    category: "vm|product"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64-dev"
-    category: "vm|product"
-    short_name: "w"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-dev"
     category: "vm|ffi"
@@ -1731,21 +1716,6 @@ consoles {
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64-beta"
-    category: "vm|product"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64-beta"
-    category: "vm|product"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64-beta"
-    category: "vm|product"
-    short_name: "w"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-beta"
     category: "vm|ffi"
@@ -2153,21 +2123,6 @@ consoles {
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64-stable"
-    category: "vm|product"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64-stable"
-    category: "vm|product"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64-stable"
-    category: "vm|product"
-    short_name: "w"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-stable"
     category: "vm|ffi"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 68e1cd649a8a..e7a19d8620d2 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -1009,14 +1009,13 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
+      recipients: "karlklose@google.com"
       recipients: "athom@google.com"
     }
-    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-linux-product-x64"
-    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1093,14 +1092,13 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
+      recipients: "karlklose@google.com"
       recipients: "athom@google.com"
     }
-    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-mac-product-x64"
-    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1548,14 +1546,13 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
+      recipients: "karlklose@google.com"
       recipients: "athom@google.com"
     }
-    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-win-product-x64"
-    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 7ccbcaf3f1aa..8c99b9f14c00 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -2128,36 +2128,6 @@ job {
     builder: "vm-kernel-linux-product-x64"
   }
 }
-job {
-  id: "vm-kernel-linux-product-x64-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-product-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-linux-product-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-product-x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-linux-product-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-product-x64-stable"
-  }
-}
 job {
   id: "vm-kernel-linux-release-ia32"
   schedule: "triggered"
@@ -2368,36 +2338,6 @@ job {
     builder: "vm-kernel-mac-product-x64"
   }
 }
-job {
-  id: "vm-kernel-mac-product-x64-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-product-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-mac-product-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-product-x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-mac-product-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-product-x64-stable"
-  }
-}
 job {
   id: "vm-kernel-mac-release-x64"
   schedule: "triggered"
@@ -3298,36 +3238,6 @@ job {
     builder: "vm-kernel-win-product-x64"
   }
 }
-job {
-  id: "vm-kernel-win-product-x64-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-product-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-win-product-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-product-x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-win-product-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-product-x64-stable"
-  }
-}
 job {
   id: "vm-kernel-win-release-ia32"
   schedule: "triggered"
@@ -3535,13 +3445,11 @@ trigger {
   triggers: "vm-kernel-checked-linux-release-x64-beta"
   triggers: "vm-kernel-linux-debug-ia32-beta"
   triggers: "vm-kernel-linux-debug-x64-beta"
-  triggers: "vm-kernel-linux-product-x64-beta"
   triggers: "vm-kernel-linux-release-ia32-beta"
   triggers: "vm-kernel-linux-release-simarm-beta"
   triggers: "vm-kernel-linux-release-simarm64-beta"
   triggers: "vm-kernel-linux-release-x64-beta"
   triggers: "vm-kernel-mac-debug-x64-beta"
-  triggers: "vm-kernel-mac-product-x64-beta"
   triggers: "vm-kernel-mac-release-x64-beta"
   triggers: "vm-kernel-nnbd-linux-debug-x64-beta"
   triggers: "vm-kernel-nnbd-linux-release-x64-beta"
@@ -3561,7 +3469,6 @@ trigger {
   triggers: "vm-kernel-precomp-win-release-x64-beta"
   triggers: "vm-kernel-win-debug-ia32-beta"
   triggers: "vm-kernel-win-debug-x64-beta"
-  triggers: "vm-kernel-win-product-x64-beta"
   triggers: "vm-kernel-win-release-ia32-beta"
   triggers: "vm-kernel-win-release-x64-beta"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm-beta"
@@ -3619,13 +3526,11 @@ trigger {
   triggers: "vm-kernel-checked-linux-release-x64-dev"
   triggers: "vm-kernel-linux-debug-ia32-dev"
   triggers: "vm-kernel-linux-debug-x64-dev"
-  triggers: "vm-kernel-linux-product-x64-dev"
   triggers: "vm-kernel-linux-release-ia32-dev"
   triggers: "vm-kernel-linux-release-simarm-dev"
   triggers: "vm-kernel-linux-release-simarm64-dev"
   triggers: "vm-kernel-linux-release-x64-dev"
   triggers: "vm-kernel-mac-debug-x64-dev"
-  triggers: "vm-kernel-mac-product-x64-dev"
   triggers: "vm-kernel-mac-release-x64-dev"
   triggers: "vm-kernel-nnbd-linux-debug-x64-dev"
   triggers: "vm-kernel-nnbd-linux-release-x64-dev"
@@ -3645,7 +3550,6 @@ trigger {
   triggers: "vm-kernel-precomp-win-release-x64-dev"
   triggers: "vm-kernel-win-debug-ia32-dev"
   triggers: "vm-kernel-win-debug-x64-dev"
-  triggers: "vm-kernel-win-product-x64-dev"
   triggers: "vm-kernel-win-release-ia32-dev"
   triggers: "vm-kernel-win-release-x64-dev"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm-dev"
@@ -3708,10 +3612,8 @@ trigger {
   triggers: "vm-kernel-linux-debug-x64"
   triggers: "vm-kernel-linux-release-x64"
   triggers: "vm-kernel-mac-debug-x64"
-  triggers: "vm-kernel-mac-product-x64"
   triggers: "vm-kernel-mac-release-x64"
   triggers: "vm-kernel-win-debug-x64"
-  triggers: "vm-kernel-win-product-x64"
   triggers: "vm-kernel-win-release-x64"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
@@ -3767,13 +3669,11 @@ trigger {
   triggers: "vm-kernel-checked-linux-release-x64-stable"
   triggers: "vm-kernel-linux-debug-ia32-stable"
   triggers: "vm-kernel-linux-debug-x64-stable"
-  triggers: "vm-kernel-linux-product-x64-stable"
   triggers: "vm-kernel-linux-release-ia32-stable"
   triggers: "vm-kernel-linux-release-simarm-stable"
   triggers: "vm-kernel-linux-release-simarm64-stable"
   triggers: "vm-kernel-linux-release-x64-stable"
   triggers: "vm-kernel-mac-debug-x64-stable"
-  triggers: "vm-kernel-mac-product-x64-stable"
   triggers: "vm-kernel-mac-release-x64-stable"
   triggers: "vm-kernel-nnbd-linux-debug-x64-stable"
   triggers: "vm-kernel-nnbd-linux-release-x64-stable"
@@ -3793,7 +3693,6 @@ trigger {
   triggers: "vm-kernel-precomp-win-release-x64-stable"
   triggers: "vm-kernel-win-debug-ia32-stable"
   triggers: "vm-kernel-win-debug-x64-stable"
-  triggers: "vm-kernel-win-product-x64-stable"
   triggers: "vm-kernel-win-release-ia32-stable"
   triggers: "vm-kernel-win-release-x64-stable"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm-stable"
@@ -3819,7 +3718,6 @@ trigger {
   triggers: "vm-fuchsia-release-x64"
   triggers: "vm-kernel-checked-linux-release-x64"
   triggers: "vm-kernel-linux-debug-ia32"
-  triggers: "vm-kernel-linux-product-x64"
   triggers: "vm-kernel-linux-release-ia32"
   triggers: "vm-kernel-linux-release-simarm"
   triggers: "vm-kernel-linux-release-simarm64"
diff --git a/main.star b/main.star
index be0b8b003723..3b0820a81936 100755
--- a/main.star
+++ b/main.star
@@ -976,19 +976,21 @@ dart_vm_extra_builder(
 )
 
 # vm|product
-dart_vm_extra_builder(
+nightly_builder(
     "vm-kernel-linux-product-x64",
     category = "vm|product|l",
-    on_cq = True,
+    channels = ["try"],
 )
-dart_ci_sandbox_builder(
+nightly_builder(
     "vm-kernel-mac-product-x64",
     category = "vm|product|m",
+    channels = ["try"],
     dimensions = mac(),
 )
-dart_ci_sandbox_builder(
+nightly_builder(
     "vm-kernel-win-product-x64",
     category = "vm|product|w",
+    channels = ["try"],
     dimensions = windows(),
 )
 

From 18be8990d75191785702871af4b781d6e89380d5 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 23 Sep 2020 08:56:06 +0000
Subject: [PATCH 423/826] [infra] Move ia32 builders to a nightly schedule

Builders that have a corresponding Dart SDK distribution remain on all
release channels, but the others are also removed from the release
channels.

Change-Id: I84f4dbff1e2a69aa464eaf437a2c039ac1dc07c5
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/163661
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: Siva Annamalai <asiva@google.com>
---
 cr-buildbucket.cfg | 173 +++------------------------------------------
 luci-milo.cfg      |  30 --------
 luci-notify.cfg    |  15 ++--
 luci-scheduler.cfg |  77 --------------------
 main.star          |  19 +++--
 5 files changed, 30 insertions(+), 284 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 18bb165bf963..e2dadf6138bb 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -616,7 +616,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "builders:[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-linux-product-x64\",\"vm-kernel-mac-product-x64\",\"vm-kernel-win-product-x64\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\"]"
+        properties_j: "builders:[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"vm-kernel-linux-release-ia32\",\"vm-kernel-linux-debug-ia32\",\"vm-kernel-win-debug-ia32\",\"vm-kernel-win-release-ia32\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-linux-product-x64\",\"vm-kernel-mac-product-x64\",\"vm-kernel-win-product-x64\",\"vm-kernel-optcounter-threshold-linux-release-ia32\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\"]"
         properties_j: "clobber:\"true\""
       }
       priority: 50
@@ -5285,82 +5285,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-kernel-linux-debug-ia32-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-kernel-linux-debug-ia32-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-kernel-linux-debug-ia32-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -5510,7 +5435,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -5535,7 +5460,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -5560,7 +5485,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -5585,7 +5510,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -6358,7 +6283,6 @@ buckets {
         properties_j: "clobber:\"true\""
       }
       priority: 70
-      expiration_secs: 86400
       caches {
         name: "browsers"
         path: "browsers"
@@ -8077,82 +8001,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-kernel-win-debug-ia32-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-kernel-win-debug-ia32-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-kernel-win-debug-ia32-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -8302,7 +8151,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -8327,7 +8176,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -8352,7 +8201,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -8377,7 +8226,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index a95e277d28f1..be70c1f8c457 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -1214,11 +1214,6 @@ consoles {
     category: "vm|kernel"
     short_name: "rc"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32-dev"
-    category: "vm|kernel"
-    short_name: "d32"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-dev"
     category: "vm|kernel"
@@ -1229,11 +1224,6 @@ consoles {
     category: "vm|kernel"
     short_name: "mr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32-dev"
-    category: "vm|kernel"
-    short_name: "wd3"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-dev"
     category: "vm|kernel"
@@ -1621,11 +1611,6 @@ consoles {
     category: "vm|kernel"
     short_name: "rc"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32-beta"
-    category: "vm|kernel"
-    short_name: "d32"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-beta"
     category: "vm|kernel"
@@ -1636,11 +1621,6 @@ consoles {
     category: "vm|kernel"
     short_name: "mr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32-beta"
-    category: "vm|kernel"
-    short_name: "wd3"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-beta"
     category: "vm|kernel"
@@ -2028,11 +2008,6 @@ consoles {
     category: "vm|kernel"
     short_name: "rc"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32-stable"
-    category: "vm|kernel"
-    short_name: "d32"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-stable"
     category: "vm|kernel"
@@ -2043,11 +2018,6 @@ consoles {
     category: "vm|kernel"
     short_name: "mr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32-stable"
-    category: "vm|kernel"
-    short_name: "wd3"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-stable"
     category: "vm|kernel"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index e7a19d8620d2..e3bbe4971b45 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -981,14 +981,13 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
+      recipients: "karlklose@google.com"
       recipients: "athom@google.com"
     }
-    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-linux-debug-ia32"
-    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1022,14 +1021,13 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
+      recipients: "karlklose@google.com"
       recipients: "athom@google.com"
     }
-    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-linux-release-ia32"
-    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1160,14 +1158,13 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
+      recipients: "karlklose@google.com"
       recipients: "athom@google.com"
     }
-    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-optcounter-threshold-linux-release-ia32"
-    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1518,14 +1515,13 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
+      recipients: "karlklose@google.com"
       recipients: "athom@google.com"
     }
-    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-win-debug-ia32"
-    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1559,14 +1555,13 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
+      recipients: "karlklose@google.com"
       recipients: "athom@google.com"
     }
-    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-win-release-ia32"
-    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 8c99b9f14c00..d1b793195d35 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -2048,36 +2048,6 @@ job {
     builder: "vm-kernel-linux-debug-ia32"
   }
 }
-job {
-  id: "vm-kernel-linux-debug-ia32-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-ia32-beta"
-  }
-}
-job {
-  id: "vm-kernel-linux-debug-ia32-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-ia32-dev"
-  }
-}
-job {
-  id: "vm-kernel-linux-debug-ia32-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-ia32-stable"
-  }
-}
 job {
   id: "vm-kernel-linux-debug-x64"
   schedule: "triggered"
@@ -3158,36 +3128,6 @@ job {
     builder: "vm-kernel-win-debug-ia32"
   }
 }
-job {
-  id: "vm-kernel-win-debug-ia32-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-debug-ia32-beta"
-  }
-}
-job {
-  id: "vm-kernel-win-debug-ia32-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-debug-ia32-dev"
-  }
-}
-job {
-  id: "vm-kernel-win-debug-ia32-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-debug-ia32-stable"
-  }
-}
 job {
   id: "vm-kernel-win-debug-x64"
   schedule: "triggered"
@@ -3443,9 +3383,7 @@ trigger {
   triggers: "vm-ffi-android-release-arm-beta"
   triggers: "vm-ffi-android-release-arm64-beta"
   triggers: "vm-kernel-checked-linux-release-x64-beta"
-  triggers: "vm-kernel-linux-debug-ia32-beta"
   triggers: "vm-kernel-linux-debug-x64-beta"
-  triggers: "vm-kernel-linux-release-ia32-beta"
   triggers: "vm-kernel-linux-release-simarm-beta"
   triggers: "vm-kernel-linux-release-simarm64-beta"
   triggers: "vm-kernel-linux-release-x64-beta"
@@ -3467,9 +3405,7 @@ trigger {
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
   triggers: "vm-kernel-precomp-win-release-x64-beta"
-  triggers: "vm-kernel-win-debug-ia32-beta"
   triggers: "vm-kernel-win-debug-x64-beta"
-  triggers: "vm-kernel-win-release-ia32-beta"
   triggers: "vm-kernel-win-release-x64-beta"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm-beta"
   gitiles {
@@ -3524,9 +3460,7 @@ trigger {
   triggers: "vm-ffi-android-release-arm-dev"
   triggers: "vm-ffi-android-release-arm64-dev"
   triggers: "vm-kernel-checked-linux-release-x64-dev"
-  triggers: "vm-kernel-linux-debug-ia32-dev"
   triggers: "vm-kernel-linux-debug-x64-dev"
-  triggers: "vm-kernel-linux-release-ia32-dev"
   triggers: "vm-kernel-linux-release-simarm-dev"
   triggers: "vm-kernel-linux-release-simarm64-dev"
   triggers: "vm-kernel-linux-release-x64-dev"
@@ -3548,9 +3482,7 @@ trigger {
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-win-release-x64-dev"
-  triggers: "vm-kernel-win-debug-ia32-dev"
   triggers: "vm-kernel-win-debug-x64-dev"
-  triggers: "vm-kernel-win-release-ia32-dev"
   triggers: "vm-kernel-win-release-x64-dev"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm-dev"
   gitiles {
@@ -3667,9 +3599,7 @@ trigger {
   triggers: "vm-ffi-android-release-arm-stable"
   triggers: "vm-ffi-android-release-arm64-stable"
   triggers: "vm-kernel-checked-linux-release-x64-stable"
-  triggers: "vm-kernel-linux-debug-ia32-stable"
   triggers: "vm-kernel-linux-debug-x64-stable"
-  triggers: "vm-kernel-linux-release-ia32-stable"
   triggers: "vm-kernel-linux-release-simarm-stable"
   triggers: "vm-kernel-linux-release-simarm64-stable"
   triggers: "vm-kernel-linux-release-x64-stable"
@@ -3691,9 +3621,7 @@ trigger {
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-win-release-x64-stable"
-  triggers: "vm-kernel-win-debug-ia32-stable"
   triggers: "vm-kernel-win-debug-x64-stable"
-  triggers: "vm-kernel-win-release-ia32-stable"
   triggers: "vm-kernel-win-release-x64-stable"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm-stable"
   gitiles {
@@ -3717,13 +3645,10 @@ trigger {
   triggers: "vm-ffi-android-release-arm64"
   triggers: "vm-fuchsia-release-x64"
   triggers: "vm-kernel-checked-linux-release-x64"
-  triggers: "vm-kernel-linux-debug-ia32"
-  triggers: "vm-kernel-linux-release-ia32"
   triggers: "vm-kernel-linux-release-simarm"
   triggers: "vm-kernel-linux-release-simarm64"
   triggers: "vm-kernel-nnbd-linux-debug-x64"
   triggers: "vm-kernel-nnbd-linux-release-x64"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
   triggers: "vm-kernel-precomp-android-release-arm64"
   triggers: "vm-kernel-precomp-android-release-arm_x64"
@@ -3743,8 +3668,6 @@ trigger {
   triggers: "vm-kernel-reload-linux-release-x64"
   triggers: "vm-kernel-reload-rollback-linux-debug-x64"
   triggers: "vm-kernel-reload-rollback-linux-release-x64"
-  triggers: "vm-kernel-win-debug-ia32"
-  triggers: "vm-kernel-win-release-ia32"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
diff --git a/main.star b/main.star
index 3b0820a81936..a1f104fbc3a5 100755
--- a/main.star
+++ b/main.star
@@ -862,7 +862,10 @@ dart_vm_extra_builder(
     "vm-kernel-linux-release-simarm64",
     category = "vm|kernel|a64",
 )
-dart_vm_extra_builder("vm-kernel-linux-release-ia32", category = "vm|kernel|r32")
+nightly_builder(
+    "vm-kernel-linux-release-ia32",
+    category = "vm|kernel|r32",
+)
 dart_ci_sandbox_builder(
     "vm-kernel-linux-release-x64",
     category = "vm|kernel|r",
@@ -872,7 +875,11 @@ dart_vm_extra_builder(
     "vm-kernel-checked-linux-release-x64",
     category = "vm|kernel|rc",
 )
-dart_vm_extra_builder("vm-kernel-linux-debug-ia32", category = "vm|kernel|d32")
+nightly_builder(
+    "vm-kernel-linux-debug-ia32",
+    category = "vm|kernel|d32",
+    channels = ["try"],
+)
 dart_ci_sandbox_builder(
     "vm-kernel-mac-debug-x64",
     category = "vm|kernel|md",
@@ -885,9 +892,10 @@ dart_ci_sandbox_builder(
     on_cq = True,
     experiment_percentage = 5,
 )
-dart_vm_extra_builder(
+nightly_builder(
     "vm-kernel-win-debug-ia32",
     category = "vm|kernel|wd3",
+    channels = ["try"],
     dimensions = windows(),
 )
 dart_ci_sandbox_builder(
@@ -895,7 +903,7 @@ dart_ci_sandbox_builder(
     category = "vm|kernel|wd",
     dimensions = windows(),
 )
-dart_vm_extra_builder(
+nightly_builder(
     "vm-kernel-win-release-ia32",
     category = "vm|kernel|wr3",
     dimensions = windows(),
@@ -995,9 +1003,10 @@ nightly_builder(
 )
 
 # vm|misc
-dart_vm_low_priority_builder(
+nightly_builder(
     "vm-kernel-optcounter-threshold-linux-release-ia32",
     category = "vm|misc|o32",
+    channels = ["try"],
 )
 dart_vm_low_priority_builder(
     "vm-kernel-optcounter-threshold-linux-release-x64",

From 416270dc6fbc2ebd3bf64d04b4dbded0a0785441 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 23 Sep 2020 13:37:17 +0000
Subject: [PATCH 424/826] [infra] Remove vm-kernel-(linux|win)-release-ia32
 from release channels

Change-Id: Ie97175f1e4e304124f5337714f31bfaa9a4f1df7
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/164087
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 150 ---------------------------------------------
 luci-milo.cfg      |  30 ---------
 luci-scheduler.cfg |  60 ------------------
 main.star          |   2 +
 4 files changed, 2 insertions(+), 240 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index e2dadf6138bb..5813e0c60377 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -5443,81 +5443,6 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
-    builders {
-      name: "vm-kernel-linux-release-ia32-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-kernel-linux-release-ia32-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-kernel-linux-release-ia32-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
     builders {
       name: "vm-kernel-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8159,81 +8084,6 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
-    builders {
-      name: "vm-kernel-win-release-ia32-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-kernel-win-release-ia32-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-kernel-win-release-ia32-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
     builders {
       name: "vm-kernel-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index be70c1f8c457..1bfab0bb29eb 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -1199,11 +1199,6 @@ consoles {
     category: "vm|kernel"
     short_name: "a64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32-dev"
-    category: "vm|kernel"
-    short_name: "r32"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-dev"
     category: "vm|kernel"
@@ -1229,11 +1224,6 @@ consoles {
     category: "vm|kernel"
     short_name: "wd"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32-dev"
-    category: "vm|kernel"
-    short_name: "wr3"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-dev"
     category: "vm|kernel"
@@ -1596,11 +1586,6 @@ consoles {
     category: "vm|kernel"
     short_name: "a64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32-beta"
-    category: "vm|kernel"
-    short_name: "r32"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-beta"
     category: "vm|kernel"
@@ -1626,11 +1611,6 @@ consoles {
     category: "vm|kernel"
     short_name: "wd"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32-beta"
-    category: "vm|kernel"
-    short_name: "wr3"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-beta"
     category: "vm|kernel"
@@ -1993,11 +1973,6 @@ consoles {
     category: "vm|kernel"
     short_name: "a64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32-stable"
-    category: "vm|kernel"
-    short_name: "r32"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-stable"
     category: "vm|kernel"
@@ -2023,11 +1998,6 @@ consoles {
     category: "vm|kernel"
     short_name: "wd"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32-stable"
-    category: "vm|kernel"
-    short_name: "wr3"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-stable"
     category: "vm|kernel"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index d1b793195d35..e014fcc76c8c 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -2108,36 +2108,6 @@ job {
     builder: "vm-kernel-linux-release-ia32"
   }
 }
-job {
-  id: "vm-kernel-linux-release-ia32-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-ia32-beta"
-  }
-}
-job {
-  id: "vm-kernel-linux-release-ia32-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-ia32-dev"
-  }
-}
-job {
-  id: "vm-kernel-linux-release-ia32-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-ia32-stable"
-  }
-}
 job {
   id: "vm-kernel-linux-release-simarm"
   schedule: "triggered"
@@ -3188,36 +3158,6 @@ job {
     builder: "vm-kernel-win-release-ia32"
   }
 }
-job {
-  id: "vm-kernel-win-release-ia32-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-release-ia32-beta"
-  }
-}
-job {
-  id: "vm-kernel-win-release-ia32-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-release-ia32-dev"
-  }
-}
-job {
-  id: "vm-kernel-win-release-ia32-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-release-ia32-stable"
-  }
-}
 job {
   id: "vm-kernel-win-release-x64"
   schedule: "triggered"
diff --git a/main.star b/main.star
index a1f104fbc3a5..fe6c0ff12f8b 100755
--- a/main.star
+++ b/main.star
@@ -865,6 +865,7 @@ dart_vm_extra_builder(
 nightly_builder(
     "vm-kernel-linux-release-ia32",
     category = "vm|kernel|r32",
+    channels = ["try"],
 )
 dart_ci_sandbox_builder(
     "vm-kernel-linux-release-x64",
@@ -906,6 +907,7 @@ dart_ci_sandbox_builder(
 nightly_builder(
     "vm-kernel-win-release-ia32",
     category = "vm|kernel|wr3",
+    channels = ["try"],
     dimensions = windows(),
 )
 dart_ci_sandbox_builder(

From 33a05b404afdd07a400fe050b3467c5077928557 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 29 Sep 2020 10:00:34 +0000
Subject: [PATCH 425/826] [infra] Add remaining standard nnbd VM configurations
 to the Luci config

https://github.com/dart-lang/sdk/issues/43463

Change-Id: I9abb58ee66dcb2db832004228a4196c985a40f47
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/164084
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg   |   56 ++
 cr-buildbucket.cfg | 1351 ++++++++++++++++++++++++++++++++------------
 luci-milo.cfg      |  221 +++++++-
 luci-notify.cfg    |  185 +++++-
 luci-scheduler.cfg |  130 ++++-
 main.star          |   83 ++-
 6 files changed, 1617 insertions(+), 409 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 5c169b698669..0dc852ad5ccf 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -477,6 +477,10 @@ config_groups {
         name: "dart/try/vm-kernel-msan-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-debug-ia32-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-debug-x64-try"
         location_regexp: ".+/[+]/DEPS"
@@ -492,6 +496,18 @@ config_groups {
         location_regexp: ".+/[+]/pkg/vm/.+"
         location_regexp: ".+/[+]/runtime/.+"
       }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-release-ia32-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-release-simarm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-release-simarm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-release-x64-try"
         location_regexp: ".+/[+]/DEPS"
@@ -507,6 +523,26 @@ config_groups {
         location_regexp: ".+/[+]/pkg/vm/.+"
         location_regexp: ".+/[+]/runtime/.+"
       }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-mac-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-mac-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-win-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-win-release-ia32-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-win-release-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
         includable_only: true
@@ -563,14 +599,34 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-msan-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
         includable_only: true
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 5813e0c60377..ce6d772b4d1b 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -616,7 +616,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "builders:[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"vm-kernel-linux-release-ia32\",\"vm-kernel-linux-debug-ia32\",\"vm-kernel-win-debug-ia32\",\"vm-kernel-win-release-ia32\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-linux-product-x64\",\"vm-kernel-mac-product-x64\",\"vm-kernel-win-product-x64\",\"vm-kernel-optcounter-threshold-linux-release-ia32\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\"]"
+        properties_j: "builders:[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"vm-kernel-nnbd-linux-debug-ia32\",\"vm-kernel-nnbd-linux-release-ia32\",\"vm-kernel-nnbd-linux-release-simarm\",\"vm-kernel-nnbd-linux-release-simarm64\",\"vm-kernel-nnbd-mac-debug-x64\",\"vm-kernel-nnbd-mac-release-x64\",\"vm-kernel-nnbd-win-release-ia32\",\"vm-kernel-nnbd-win-debug-x64\",\"vm-kernel-nnbd-win-release-x64\",\"vm-kernel-precomp-nnbd-linux-debug-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-debug-x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm64\",\"vm-kernel-precomp-nnbd-mac-release-simarm64\",\"vm-kernel-precomp-nnbd-win-release-x64\",\"vm-kernel-linux-release-ia32\",\"vm-kernel-linux-debug-ia32\",\"vm-kernel-win-debug-ia32\",\"vm-kernel-win-release-ia32\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-linux-product-x64\",\"vm-kernel-mac-product-x64\",\"vm-kernel-win-product-x64\",\"vm-kernel-optcounter-threshold-linux-release-ia32\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\"]"
         properties_j: "clobber:\"true\""
       }
       priority: 50
@@ -5991,7 +5991,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64"
+      name: "vm-kernel-nnbd-linux-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6007,7 +6007,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -6016,7 +6016,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64-beta"
+      name: "vm-kernel-nnbd-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6041,7 +6041,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64-dev"
+      name: "vm-kernel-nnbd-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6066,7 +6066,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64-stable"
+      name: "vm-kernel-nnbd-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6091,7 +6091,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-x64"
+      name: "vm-kernel-nnbd-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6116,7 +6116,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-x64-beta"
+      name: "vm-kernel-nnbd-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6132,7 +6132,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -6141,7 +6141,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-x64-dev"
+      name: "vm-kernel-nnbd-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6157,7 +6157,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -6166,7 +6166,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-x64-stable"
+      name: "vm-kernel-nnbd-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6182,7 +6182,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -6191,7 +6191,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-optcounter-threshold-linux-release-ia32"
+      name: "vm-kernel-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6207,7 +6207,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 70
+      priority: 50
       caches {
         name: "browsers"
         path: "browsers"
@@ -6216,7 +6216,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-optcounter-threshold-linux-release-x64"
+      name: "vm-kernel-nnbd-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6232,8 +6232,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 70
-      expiration_secs: 86400
+      priority: 50
       caches {
         name: "browsers"
         path: "browsers"
@@ -6242,7 +6241,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64"
+      name: "vm-kernel-nnbd-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6257,7 +6256,6 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "shard_timeout:5400"
       }
       priority: 50
       caches {
@@ -6268,7 +6266,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64-beta"
+      name: "vm-kernel-nnbd-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6283,7 +6281,6 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "shard_timeout:5400"
       }
       priority: 50
       caches {
@@ -6294,7 +6291,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64-dev"
+      name: "vm-kernel-nnbd-mac-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6309,9 +6306,8 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "shard_timeout:5400"
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -6320,7 +6316,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64-stable"
+      name: "vm-kernel-nnbd-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6335,9 +6331,8 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "shard_timeout:5400"
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -6346,7 +6341,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm_x64"
+      name: "vm-kernel-nnbd-win-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6361,9 +6356,8 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "shard_timeout:5400"
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -6372,7 +6366,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm_x64-beta"
+      name: "vm-kernel-nnbd-win-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6387,9 +6381,8 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "shard_timeout:5400"
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -6398,7 +6391,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm_x64-dev"
+      name: "vm-kernel-nnbd-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6413,9 +6406,8 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "shard_timeout:5400"
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -6424,7 +6416,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm_x64-stable"
+      name: "vm-kernel-optcounter-threshold-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6439,9 +6431,8 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "shard_timeout:5400"
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -6450,7 +6441,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-asan-linux-release-x64"
+      name: "vm-kernel-optcounter-threshold-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6464,10 +6455,10 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 70
+      expiration_secs: 86400
       caches {
         name: "browsers"
         path: "browsers"
@@ -6476,7 +6467,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-simarm_x64"
+      name: "vm-kernel-precomp-android-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6502,7 +6493,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
+      name: "vm-kernel-precomp-android-release-arm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6528,7 +6519,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
+      name: "vm-kernel-precomp-android-release-arm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6554,7 +6545,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
+      name: "vm-kernel-precomp-android-release-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6580,7 +6571,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64"
+      name: "vm-kernel-precomp-android-release-arm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6595,6 +6586,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       }
       priority: 50
       caches {
@@ -6605,7 +6597,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-beta"
+      name: "vm-kernel-precomp-android-release-arm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6620,6 +6612,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       }
       priority: 50
       caches {
@@ -6630,7 +6623,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-dev"
+      name: "vm-kernel-precomp-android-release-arm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6645,6 +6638,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       }
       priority: 50
       caches {
@@ -6655,7 +6649,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-stable"
+      name: "vm-kernel-precomp-android-release-arm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6670,6 +6664,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       }
       priority: 50
       caches {
@@ -6680,7 +6675,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-product-x64"
+      name: "vm-kernel-precomp-asan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6694,9 +6689,10 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -6705,7 +6701,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-product-x64-beta"
+      name: "vm-kernel-precomp-linux-debug-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6720,6 +6716,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       }
       priority: 50
       caches {
@@ -6730,7 +6727,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-product-x64-dev"
+      name: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6745,6 +6742,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       }
       priority: 50
       caches {
@@ -6755,7 +6753,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-product-x64-stable"
+      name: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6770,6 +6768,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       }
       priority: 50
       caches {
@@ -6780,7 +6779,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm"
+      name: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6795,6 +6794,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       }
       priority: 50
       caches {
@@ -6805,7 +6805,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-beta"
+      name: "vm-kernel-precomp-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6830,7 +6830,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-dev"
+      name: "vm-kernel-precomp-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6855,7 +6855,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-stable"
+      name: "vm-kernel-precomp-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6880,7 +6880,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm64"
+      name: "vm-kernel-precomp-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6905,7 +6905,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm64-beta"
+      name: "vm-kernel-precomp-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6930,7 +6930,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm64-dev"
+      name: "vm-kernel-precomp-linux-product-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6955,7 +6955,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm64-stable"
+      name: "vm-kernel-precomp-linux-product-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -6980,7 +6980,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm_x64"
+      name: "vm-kernel-precomp-linux-product-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7005,7 +7005,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm_x64-beta"
+      name: "vm-kernel-precomp-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7030,7 +7030,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm_x64-dev"
+      name: "vm-kernel-precomp-linux-release-simarm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7055,7 +7055,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm_x64-stable"
+      name: "vm-kernel-precomp-linux-release-simarm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7080,7 +7080,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64"
+      name: "vm-kernel-precomp-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7105,7 +7105,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64-beta"
+      name: "vm-kernel-precomp-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7130,7 +7130,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64-dev"
+      name: "vm-kernel-precomp-linux-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7155,7 +7155,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64-stable"
+      name: "vm-kernel-precomp-linux-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7180,18 +7180,18 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-mac-release-simarm64"
+      name: "vm-kernel-precomp-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7205,17 +7205,18 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-mac-release-simarm64-beta"
+      name: "vm-kernel-precomp-linux-release-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7229,18 +7230,18 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-mac-release-simarm64-dev"
+      name: "vm-kernel-precomp-linux-release-simarm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7254,17 +7255,18 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-mac-release-simarm64-stable"
+      name: "vm-kernel-precomp-linux-release-simarm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7278,7 +7280,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-msan-linux-release-x64"
+      name: "vm-kernel-precomp-linux-release-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7292,10 +7294,9 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
-      priority: 70
+      priority: 50
       caches {
         name: "browsers"
         path: "browsers"
@@ -7304,7 +7305,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm64"
+      name: "vm-kernel-precomp-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7329,7 +7330,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-beta"
+      name: "vm-kernel-precomp-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7354,7 +7355,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-dev"
+      name: "vm-kernel-precomp-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7379,7 +7380,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-stable"
+      name: "vm-kernel-precomp-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7404,18 +7405,18 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64"
+      name: "vm-kernel-precomp-mac-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7429,18 +7430,17 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
+      name: "vm-kernel-precomp-mac-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7454,18 +7454,18 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
+      name: "vm-kernel-precomp-mac-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7479,18 +7479,17 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
+      name: "vm-kernel-precomp-mac-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7504,7 +7503,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64"
+      name: "vm-kernel-precomp-msan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7518,9 +7517,10 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -7529,7 +7529,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7545,7 +7545,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -7554,7 +7554,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+      name: "vm-kernel-precomp-nnbd-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7570,7 +7570,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -7579,7 +7579,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7595,7 +7595,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -7604,7 +7604,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-tsan-linux-release-x64"
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7618,7 +7618,6 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 70
@@ -7630,7 +7629,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-ubsan-linux-release-x64"
+      name: "vm-kernel-precomp-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7641,12 +7640,12 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
-      priority: 70
+      priority: 50
       caches {
         name: "browsers"
         path: "browsers"
@@ -7655,12 +7654,12 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-win-release-x64"
+      name: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -7680,12 +7679,12 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-win-release-x64-beta"
+      name: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -7705,12 +7704,12 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-win-release-x64-dev"
+      name: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -7730,12 +7729,12 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-win-release-x64-stable"
+      name: "vm-kernel-precomp-nnbd-mac-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -7746,7 +7745,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -7755,7 +7754,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-reload-linux-debug-x64"
+      name: "vm-kernel-precomp-nnbd-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7772,7 +7771,6 @@ buckets {
         properties_j: "clobber:\"true\""
       }
       priority: 70
-      expiration_secs: 86400
       caches {
         name: "browsers"
         path: "browsers"
@@ -7781,7 +7779,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-reload-linux-release-x64"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7797,8 +7795,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 70
-      expiration_secs: 86400
+      priority: 50
       caches {
         name: "browsers"
         path: "browsers"
@@ -7807,7 +7804,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-reload-rollback-linux-debug-x64"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7823,8 +7820,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 70
-      expiration_secs: 86400
+      priority: 50
       caches {
         name: "browsers"
         path: "browsers"
@@ -7833,7 +7829,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-reload-rollback-linux-release-x64"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7849,8 +7845,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 70
-      expiration_secs: 86400
+      priority: 50
       caches {
         name: "browsers"
         path: "browsers"
@@ -7859,7 +7854,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-tsan-linux-release-x64"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7873,10 +7868,9 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
-      priority: 70
+      priority: 50
       caches {
         name: "browsers"
         path: "browsers"
@@ -7885,7 +7879,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-ubsan-linux-release-x64"
+      name: "vm-kernel-precomp-tsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7896,6 +7890,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
@@ -7910,20 +7905,20 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-win-debug-ia32"
+      name: "vm-kernel-precomp-ubsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 70
@@ -7935,7 +7930,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-win-debug-x64"
+      name: "vm-kernel-precomp-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7960,7 +7955,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-win-debug-x64-beta"
+      name: "vm-kernel-precomp-win-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7985,7 +7980,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-win-debug-x64-dev"
+      name: "vm-kernel-precomp-win-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8010,7 +8005,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-win-debug-x64-stable"
+      name: "vm-kernel-precomp-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8035,12 +8030,12 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-win-product-x64"
+      name: "vm-kernel-reload-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -8052,6 +8047,7 @@ buckets {
         properties_j: "clobber:\"true\""
       }
       priority: 70
+      expiration_secs: 86400
       caches {
         name: "browsers"
         path: "browsers"
@@ -8060,12 +8056,12 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-win-release-ia32"
+      name: "vm-kernel-reload-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -8077,6 +8073,7 @@ buckets {
         properties_j: "clobber:\"true\""
       }
       priority: 70
+      expiration_secs: 86400
       caches {
         name: "browsers"
         path: "browsers"
@@ -8085,12 +8082,12 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-win-release-x64"
+      name: "vm-kernel-reload-rollback-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -8101,7 +8098,8 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
+      priority: 70
+      expiration_secs: 86400
       caches {
         name: "browsers"
         path: "browsers"
@@ -8110,12 +8108,12 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-win-release-x64-beta"
+      name: "vm-kernel-reload-rollback-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -8126,7 +8124,8 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
+      priority: 70
+      expiration_secs: 86400
       caches {
         name: "browsers"
         path: "browsers"
@@ -8135,7 +8134,58 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-win-release-x64-dev"
+      name: "vm-kernel-tsan-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 70
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "vm-kernel-ubsan-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 70
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "vm-kernel-win-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8151,7 +8201,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -8160,7 +8210,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-win-release-x64-stable"
+      name: "vm-kernel-win-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8185,12 +8235,12 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm"
+      name: "vm-kernel-win-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -8210,12 +8260,12 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-beta"
+      name: "vm-kernel-win-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -8235,12 +8285,12 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-dev"
+      name: "vm-kernel-win-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -8260,12 +8310,12 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-stable"
+      name: "vm-kernel-win-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -8276,7 +8326,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -8284,33 +8334,13 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
-  }
-}
-buckets {
-  name: "try"
-  acls {
-    group: "all"
-  }
-  acls {
-    role: SCHEDULER
-    group: "project-dart-admins"
-  }
-  acls {
-    role: SCHEDULER
-    group: "project-dart-tryjob-access"
-  }
-  acls {
-    role: SCHEDULER
-    group: "service-account-cq"
-  }
-  swarming {
     builders {
-      name: "analyzer-analysis-server-linux-try"
+      name: "vm-kernel-win-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -8321,21 +8351,21 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 30
+      priority: 70
       caches {
         name: "browsers"
-        path: "third_party/browsers"
+        path: "browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "analyzer-linux-release-try"
+      name: "vm-kernel-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -8346,46 +8376,46 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 30
+      priority: 50
       caches {
         name: "browsers"
-        path: "third_party/browsers"
+        path: "browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "analyzer-mac-release-try"
+      name: "vm-kernel-win-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 30
+      priority: 50
       caches {
         name: "browsers"
-        path: "third_party/browsers"
+        path: "browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "analyzer-nnbd-linux-release-try"
+      name: "vm-kernel-win-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -8396,16 +8426,16 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 30
+      priority: 50
       caches {
         name: "browsers"
-        path: "third_party/browsers"
+        path: "browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "analyzer-win-release-try"
+      name: "vm-kernel-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8421,16 +8451,16 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 30
+      priority: 50
       caches {
         name: "browsers"
-        path: "third_party/browsers"
+        path: "browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "app-kernel-linux-debug-x64-try"
+      name: "vm-precomp-ffi-qemu-linux-release-arm"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8446,16 +8476,16 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 30
+      priority: 50
       caches {
         name: "browsers"
-        path: "third_party/browsers"
+        path: "browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "app-kernel-linux-product-x64-try"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8471,16 +8501,16 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 30
+      priority: 50
       caches {
         name: "browsers"
-        path: "third_party/browsers"
+        path: "browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "app-kernel-linux-release-x64-try"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8496,16 +8526,61 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 30
+      priority: 50
       caches {
         name: "browsers"
-        path: "third_party/browsers"
+        path: "browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "benchmark-linux-try"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 50
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+  }
+}
+buckets {
+  name: "try"
+  acls {
+    group: "all"
+  }
+  acls {
+    role: SCHEDULER
+    group: "project-dart-admins"
+  }
+  acls {
+    role: SCHEDULER
+    group: "project-dart-tryjob-access"
+  }
+  acls {
+    role: SCHEDULER
+    group: "service-account-cq"
+  }
+  swarming {
+    builders {
+      name: "analyzer-analysis-server-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8530,7 +8605,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "dart-sdk-linux-try"
+      name: "analyzer-linux-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8555,7 +8630,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "dart-sdk-mac-try"
+      name: "analyzer-mac-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8580,12 +8655,12 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "dart-sdk-win-try"
+      name: "analyzer-nnbd-linux-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -8605,12 +8680,12 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "dart2js-csp-minified-linux-x64-chrome-try"
+      name: "analyzer-win-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -8620,7 +8695,6 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
       caches {
@@ -8631,7 +8705,567 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "dart2js-minified-strong-linux-x64-d8-try"
+      name: "app-kernel-linux-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "app-kernel-linux-product-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "app-kernel-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "benchmark-linux-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "dart-sdk-linux-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "dart-sdk-mac-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "dart-sdk-win-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "dart2js-csp-minified-linux-x64-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "dart2js-minified-strong-linux-x64-d8-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "dart2js-nnbd-linux-x64-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "dart2js-strong-hostasserts-linux-ia32-d8-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "dart2js-strong-linux-x64-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "dart2js-strong-linux-x64-firefox-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_firefox\":true}"
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "dart2js-strong-mac-x64-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "dart2js-strong-mac-x64-safari-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "dart2js-strong-win-x64-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "dart2js-strong-win-x64-ie11-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "dart2js-unit-linux-x64-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "ddc-linux-release-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "ddc-mac-release-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "ddc-nnbd-linux-release-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "ddc-win-release-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "ddk-linux-release-firefox-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8646,6 +9280,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_firefox\":true}"
       }
       priority: 30
       caches {
@@ -8656,7 +9291,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "dart2js-nnbd-linux-x64-chrome-try"
+      name: "flutter-analyze-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8671,7 +9306,6 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
       caches {
@@ -8682,7 +9316,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "dart2js-strong-hostasserts-linux-ia32-d8-try"
+      name: "flutter-engine-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8690,15 +9324,18 @@ buckets {
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
-        name: "dart/neo"
+        name: "dart/flutter_engine"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
+        properties_j: "flutter_test_suites:[\"add_to_app_life_cycle_tests\",\"build_tests\",\"framework_coverage\",\"framework_tests\",\"hostonly_devicelab_tests\",\"tool_coverage\",\"tool_tests\"]"
       }
       priority: 30
+      execution_timeout_secs: 28800
       caches {
         name: "browsers"
         path: "third_party/browsers"
@@ -8707,7 +9344,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "dart2js-strong-linux-x64-chrome-try"
+      name: "flutter-engine-linux-web_tests-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8715,16 +9352,18 @@ buckets {
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
-        name: "dart/neo"
+        name: "dart/flutter_engine"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        properties_j: "flutter_test_suites:[\"web_tests\"]"
       }
       priority: 30
+      execution_timeout_secs: 28800
       caches {
         name: "browsers"
         path: "third_party/browsers"
@@ -8733,7 +9372,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "dart2js-strong-linux-x64-firefox-try"
+      name: "flutter-frontend-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8748,7 +9387,6 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "custom_vars:{\"download_firefox\":true}"
       }
       priority: 30
       caches {
@@ -8759,22 +9397,21 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "dart2js-strong-mac-x64-chrome-try"
+      name: "front-end-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
       caches {
@@ -8785,7 +9422,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "dart2js-strong-mac-x64-safari-try"
+      name: "front-end-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8810,12 +9447,12 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "dart2js-strong-win-x64-chrome-try"
+      name: "front-end-nnbd-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -8825,7 +9462,6 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
       caches {
@@ -8836,18 +9472,18 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "dart2js-strong-win-x64-ie11-try"
+      name: "front-end-nnbd-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -8861,12 +9497,12 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "dart2js-unit-linux-x64-release-try"
+      name: "front-end-nnbd-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -8886,12 +9522,12 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "ddc-linux-release-chrome-try"
+      name: "front-end-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -8901,7 +9537,6 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
       caches {
@@ -8912,22 +9547,21 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "ddc-mac-release-chrome-try"
+      name: "gclient-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
-        name: "dart/neo"
+        name: "dart/gclient"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
       caches {
@@ -8938,7 +9572,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "ddc-nnbd-linux-release-chrome-try"
+      name: "pkg-linux-debug-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8964,12 +9598,12 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "ddc-win-release-chrome-try"
+      name: "pkg-linux-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -8990,22 +9624,22 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "ddk-linux-release-firefox-try"
+      name: "pkg-mac-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "custom_vars:{\"download_firefox\":true}"
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
       caches {
@@ -9016,12 +9650,12 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "flutter-analyze-try"
+      name: "pkg-win-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -9031,6 +9665,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
       caches {
@@ -9041,7 +9676,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "flutter-engine-linux-try"
+      name: "vm-canary-linux-debug-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9049,18 +9684,15 @@ buckets {
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
-        name: "dart/flutter_engine"
+        name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
-        properties_j: "flutter_test_suites:[\"add_to_app_life_cycle_tests\",\"build_tests\",\"framework_coverage\",\"framework_tests\",\"hostonly_devicelab_tests\",\"tool_coverage\",\"tool_tests\"]"
       }
       priority: 30
-      execution_timeout_secs: 28800
       caches {
         name: "browsers"
         path: "third_party/browsers"
@@ -9069,7 +9701,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "flutter-engine-linux-web_tests-try"
+      name: "vm-ffi-android-debug-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9077,18 +9709,15 @@ buckets {
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
-        name: "dart/flutter_engine"
+        name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
-        properties_j: "flutter_test_suites:[\"web_tests\"]"
       }
       priority: 30
-      execution_timeout_secs: 28800
       caches {
         name: "browsers"
         path: "third_party/browsers"
@@ -9097,7 +9726,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "flutter-frontend-try"
+      name: "vm-ffi-android-debug-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9122,7 +9751,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "front-end-linux-release-x64-try"
+      name: "vm-ffi-android-product-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9147,18 +9776,18 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "front-end-mac-release-x64-try"
+      name: "vm-ffi-android-product-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9172,7 +9801,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "front-end-nnbd-linux-release-x64-try"
+      name: "vm-ffi-android-release-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9197,18 +9826,18 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "front-end-nnbd-mac-release-x64-try"
+      name: "vm-ffi-android-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9222,12 +9851,12 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "front-end-nnbd-win-release-x64-try"
+      name: "vm-fuchsia-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -9247,12 +9876,12 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "front-end-win-release-x64-try"
+      name: "vm-kernel-asan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -9261,6 +9890,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 30
@@ -9272,7 +9902,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "gclient-try"
+      name: "vm-kernel-checked-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9280,7 +9910,7 @@ buckets {
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
-        name: "dart/gclient"
+        name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
@@ -9297,7 +9927,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "pkg-linux-debug-try"
+      name: "vm-kernel-gcc-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9308,11 +9938,9 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
       caches {
@@ -9323,7 +9951,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "pkg-linux-release-try"
+      name: "vm-kernel-linux-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9338,7 +9966,6 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
       caches {
@@ -9349,22 +9976,21 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "pkg-mac-release-try"
+      name: "vm-kernel-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
       caches {
@@ -9375,12 +10001,12 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "pkg-win-release-try"
+      name: "vm-kernel-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -9390,7 +10016,6 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
       caches {
@@ -9401,7 +10026,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-canary-linux-debug-try"
+      name: "vm-kernel-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9426,7 +10051,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-ffi-android-debug-arm-try"
+      name: "vm-kernel-linux-release-simarm-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9451,7 +10076,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-ffi-android-debug-arm64-try"
+      name: "vm-kernel-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9476,7 +10101,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-ffi-android-product-arm-try"
+      name: "vm-kernel-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9501,18 +10126,18 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-ffi-android-product-arm64-try"
+      name: "vm-kernel-mac-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9526,18 +10151,18 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-ffi-android-release-arm-try"
+      name: "vm-kernel-mac-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9551,18 +10176,18 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-ffi-android-release-arm64-try"
+      name: "vm-kernel-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9576,7 +10201,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-fuchsia-release-x64-try"
+      name: "vm-kernel-msan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9590,6 +10215,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 30
@@ -9601,7 +10227,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-asan-linux-release-x64-try"
+      name: "vm-kernel-nnbd-linux-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9615,7 +10241,6 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 30
@@ -9627,7 +10252,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-try"
+      name: "vm-kernel-nnbd-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9652,7 +10277,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-gcc-linux-try"
+      name: "vm-kernel-nnbd-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9663,6 +10288,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9676,7 +10302,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-linux-debug-ia32-try"
+      name: "vm-kernel-nnbd-linux-release-simarm-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9701,7 +10327,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-linux-debug-x64-try"
+      name: "vm-kernel-nnbd-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9726,7 +10352,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-linux-product-x64-try"
+      name: "vm-kernel-nnbd-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9751,7 +10377,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-linux-release-ia32-try"
+      name: "vm-kernel-nnbd-mac-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9776,7 +10402,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-linux-release-simarm-try"
+      name: "vm-kernel-nnbd-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9801,7 +10427,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-linux-release-simarm64-try"
+      name: "vm-kernel-nnbd-win-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9826,7 +10452,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-linux-release-x64-try"
+      name: "vm-kernel-nnbd-win-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9851,18 +10477,18 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-mac-debug-x64-try"
+      name: "vm-kernel-nnbd-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9876,18 +10502,18 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-mac-product-x64-try"
+      name: "vm-kernel-optcounter-threshold-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9901,18 +10527,18 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-mac-release-x64-try"
+      name: "vm-kernel-optcounter-threshold-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9926,7 +10552,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-msan-linux-release-x64-try"
+      name: "vm-kernel-precomp-android-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9940,8 +10566,8 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       }
       priority: 30
       caches {
@@ -9952,7 +10578,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64-try"
+      name: "vm-kernel-precomp-android-release-arm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9967,6 +10593,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       }
       priority: 30
       caches {
@@ -9977,7 +10604,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-x64-try"
+      name: "vm-kernel-precomp-asan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -9991,6 +10618,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 30
@@ -10002,7 +10630,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-optcounter-threshold-linux-release-ia32-try"
+      name: "vm-kernel-precomp-linux-debug-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -10017,6 +10645,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       }
       priority: 30
       caches {
@@ -10027,7 +10656,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-optcounter-threshold-linux-release-x64-try"
+      name: "vm-kernel-precomp-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -10052,7 +10681,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64-try"
+      name: "vm-kernel-precomp-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -10067,7 +10696,6 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "shard_timeout:5400"
       }
       priority: 30
       caches {
@@ -10078,7 +10706,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm_x64-try"
+      name: "vm-kernel-precomp-linux-release-simarm-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -10093,7 +10721,6 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "shard_timeout:5400"
       }
       priority: 30
       caches {
@@ -10104,7 +10731,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-asan-linux-release-x64-try"
+      name: "vm-kernel-precomp-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -10118,7 +10745,6 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 30
@@ -10130,7 +10756,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-simarm_x64-try"
+      name: "vm-kernel-precomp-linux-release-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -10145,7 +10771,6 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
-        properties_j: "shard_timeout:5400"
       }
       priority: 30
       caches {
@@ -10156,7 +10781,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-try"
+      name: "vm-kernel-precomp-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -10181,18 +10806,18 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-product-x64-try"
+      name: "vm-kernel-precomp-mac-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10206,7 +10831,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-try"
+      name: "vm-kernel-precomp-msan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -10220,6 +10845,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 30
@@ -10231,7 +10857,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm64-try"
+      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -10256,7 +10882,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm_x64-try"
+      name: "vm-kernel-precomp-nnbd-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -10281,7 +10907,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64-try"
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -10306,18 +10932,18 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-mac-release-simarm64-try"
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10331,7 +10957,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-msan-linux-release-x64-try"
+      name: "vm-kernel-precomp-nnbd-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -10345,7 +10971,6 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
       }
       priority: 30
@@ -10357,7 +10982,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-try"
+      name: "vm-kernel-precomp-nnbd-mac-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -10382,7 +11007,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64-try"
+      name: "vm-kernel-precomp-nnbd-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 1bfab0bb29eb..a5c1fa9f580e 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -57,23 +57,93 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
-    category: "vm|nnbd"
+    category: "vm|nnbd|jit"
     short_name: "d"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64"
-    category: "vm|nnbd"
+    category: "vm|nnbd|jit"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-ia32"
+    category: "vm|nnbd|jit"
+    short_name: "d3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-ia32"
+    category: "vm|nnbd|jit"
+    short_name: "r3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm"
+    category: "vm|nnbd|jit"
+    short_name: "ra"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm64"
+    category: "vm|nnbd|jit"
+    short_name: "ra6"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-x64"
+    category: "vm|nnbd|jit"
+    short_name: "md"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-x64"
+    category: "vm|nnbd|jit"
+    short_name: "mr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-ia32"
+    category: "vm|nnbd|jit"
+    short_name: "wr3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64"
+    category: "vm|nnbd|jit"
+    short_name: "wd"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-x64"
+    category: "vm|nnbd|jit"
+    short_name: "wr"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64"
     category: "vm|nnbd|aot"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+    category: "vm|nnbd|aot"
+    short_name: "da"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+    category: "vm|nnbd|aot"
+    short_name: "ra"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-x64"
+    category: "vm|nnbd|aot"
+    short_name: "d"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64"
     category: "vm|nnbd|aot"
-    short_name: "a64"
+    short_name: "ra6"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64"
+    category: "vm|nnbd|aot"
+    short_name: "ma6"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-release-x64"
+    category: "vm|nnbd|aot"
+    short_name: "wr"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
@@ -784,23 +854,93 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
-    category: "vm|nnbd"
+    category: "vm|nnbd|jit"
     short_name: "d"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64"
-    category: "vm|nnbd"
+    category: "vm|nnbd|jit"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-ia32"
+    category: "vm|nnbd|jit"
+    short_name: "d3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-ia32"
+    category: "vm|nnbd|jit"
+    short_name: "r3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm"
+    category: "vm|nnbd|jit"
+    short_name: "ra"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm64"
+    category: "vm|nnbd|jit"
+    short_name: "ra6"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-x64"
+    category: "vm|nnbd|jit"
+    short_name: "md"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-x64"
+    category: "vm|nnbd|jit"
+    short_name: "mr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-ia32"
+    category: "vm|nnbd|jit"
+    short_name: "wr3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64"
+    category: "vm|nnbd|jit"
+    short_name: "wd"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-x64"
+    category: "vm|nnbd|jit"
+    short_name: "wr"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64"
     category: "vm|nnbd|aot"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+    category: "vm|nnbd|aot"
+    short_name: "da"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+    category: "vm|nnbd|aot"
+    short_name: "ra"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-x64"
+    category: "vm|nnbd|aot"
+    short_name: "d"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64"
     category: "vm|nnbd|aot"
-    short_name: "a64"
+    short_name: "ra6"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64"
+    category: "vm|nnbd|aot"
+    short_name: "ma6"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-release-x64"
+    category: "vm|nnbd|aot"
+    short_name: "wr"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
@@ -1146,12 +1286,12 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-dev"
-    category: "vm|nnbd"
+    category: "vm|nnbd|jit"
     short_name: "d"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-dev"
-    category: "vm|nnbd"
+    category: "vm|nnbd|jit"
     short_name: "r"
   }
   builders {
@@ -1159,11 +1299,6 @@ consoles {
     category: "vm|nnbd|aot"
     short_name: "r"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64-dev"
-    category: "vm|nnbd|aot"
-    short_name: "a64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-dev"
     category: "vm|app-kernel"
@@ -1533,12 +1668,12 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-beta"
-    category: "vm|nnbd"
+    category: "vm|nnbd|jit"
     short_name: "d"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-beta"
-    category: "vm|nnbd"
+    category: "vm|nnbd|jit"
     short_name: "r"
   }
   builders {
@@ -1546,11 +1681,6 @@ consoles {
     category: "vm|nnbd|aot"
     short_name: "r"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64-beta"
-    category: "vm|nnbd|aot"
-    short_name: "a64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-beta"
     category: "vm|app-kernel"
@@ -1920,12 +2050,12 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-stable"
-    category: "vm|nnbd"
+    category: "vm|nnbd|jit"
     short_name: "d"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-stable"
-    category: "vm|nnbd"
+    category: "vm|nnbd|jit"
     short_name: "r"
   }
   builders {
@@ -1933,11 +2063,6 @@ consoles {
     category: "vm|nnbd|aot"
     short_name: "r"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64-stable"
-    category: "vm|nnbd|aot"
-    short_name: "a64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-stable"
     category: "vm|app-kernel"
@@ -2356,12 +2481,54 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-x64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-ia32-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-ia32-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-simarm-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-simarm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-debug-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-release-ia32-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-debug-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-release-x64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-x64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-x64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-win-release-x64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/app-kernel-linux-debug-x64-try"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index e3bbe4971b45..1dda632b7ce9 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -1126,6 +1126,19 @@ notifiers {
     name: "vm-kernel-msan-linux-release-x64"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-linux-debug-ia32"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1140,6 +1153,45 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-linux-release-ia32"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-linux-release-simarm"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-linux-release-simarm64"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1154,6 +1206,71 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-mac-debug-x64"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-mac-release-x64"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-win-debug-x64"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-win-release-ia32"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-win-release-x64"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1351,14 +1468,52 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-nnbd-linux-debug-x64"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
       recipients: "athom@google.com"
     }
-    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-nnbd-linux-release-simarm64"
-    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
   }
 }
 notifiers {
@@ -1375,6 +1530,32 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-nnbd-mac-release-simarm64"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-nnbd-win-release-x64"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index e014fcc76c8c..2d5dc125bcf1 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -2328,6 +2328,16 @@ job {
     builder: "vm-kernel-msan-linux-release-x64"
   }
 }
+job {
+  id: "vm-kernel-nnbd-linux-debug-ia32"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-linux-debug-ia32"
+  }
+}
 job {
   id: "vm-kernel-nnbd-linux-debug-x64"
   schedule: "triggered"
@@ -2368,6 +2378,36 @@ job {
     builder: "vm-kernel-nnbd-linux-debug-x64-stable"
   }
 }
+job {
+  id: "vm-kernel-nnbd-linux-release-ia32"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-linux-release-ia32"
+  }
+}
+job {
+  id: "vm-kernel-nnbd-linux-release-simarm"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-linux-release-simarm"
+  }
+}
+job {
+  id: "vm-kernel-nnbd-linux-release-simarm64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-linux-release-simarm64"
+  }
+}
 job {
   id: "vm-kernel-nnbd-linux-release-x64"
   schedule: "triggered"
@@ -2408,6 +2448,56 @@ job {
     builder: "vm-kernel-nnbd-linux-release-x64-stable"
   }
 }
+job {
+  id: "vm-kernel-nnbd-mac-debug-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-mac-debug-x64"
+  }
+}
+job {
+  id: "vm-kernel-nnbd-mac-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-mac-release-x64"
+  }
+}
+job {
+  id: "vm-kernel-nnbd-win-debug-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-win-debug-x64"
+  }
+}
+job {
+  id: "vm-kernel-nnbd-win-release-ia32"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-win-release-ia32"
+  }
+}
+job {
+  id: "vm-kernel-nnbd-win-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-win-release-x64"
+  }
+}
 job {
   id: "vm-kernel-optcounter-threshold-linux-release-ia32"
   schedule: "triggered"
@@ -2849,43 +2939,43 @@ job {
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-simarm64"
+  id: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-simarm64"
+    builder: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-simarm64-beta"
+  id: "vm-kernel-precomp-nnbd-linux-debug-x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-simarm64-beta"
+    builder: "vm-kernel-precomp-nnbd-linux-debug-x64"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-simarm64-dev"
+  id: "vm-kernel-precomp-nnbd-linux-release-simarm64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-simarm64-dev"
+    builder: "vm-kernel-precomp-nnbd-linux-release-simarm64"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-simarm64-stable"
+  id: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-simarm64-stable"
+    builder: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
   }
 }
 job {
@@ -2928,6 +3018,26 @@ job {
     builder: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
   }
 }
+job {
+  id: "vm-kernel-precomp-nnbd-mac-release-simarm64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-nnbd-mac-release-simarm64"
+  }
+}
+job {
+  id: "vm-kernel-precomp-nnbd-win-release-x64"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-nnbd-win-release-x64"
+  }
+}
 job {
   id: "vm-kernel-precomp-obfuscate-linux-release-x64"
   schedule: "triggered"
@@ -3341,7 +3451,6 @@ trigger {
   triggers: "vm-kernel-precomp-linux-release-simarm_x64-beta"
   triggers: "vm-kernel-precomp-linux-release-x64-beta"
   triggers: "vm-kernel-precomp-mac-release-simarm64-beta"
-  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm64-beta"
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
   triggers: "vm-kernel-precomp-win-release-x64-beta"
@@ -3418,7 +3527,6 @@ trigger {
   triggers: "vm-kernel-precomp-linux-release-simarm_x64-dev"
   triggers: "vm-kernel-precomp-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-mac-release-simarm64-dev"
-  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm64-dev"
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
   triggers: "vm-kernel-precomp-win-release-x64-dev"
@@ -3557,7 +3665,6 @@ trigger {
   triggers: "vm-kernel-precomp-linux-release-simarm_x64-stable"
   triggers: "vm-kernel-precomp-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-mac-release-simarm64-stable"
-  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm64-stable"
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-win-release-x64-stable"
@@ -3600,7 +3707,6 @@ trigger {
   triggers: "vm-kernel-precomp-linux-release-simarm_x64"
   triggers: "vm-kernel-precomp-linux-release-x64"
   triggers: "vm-kernel-precomp-mac-release-simarm64"
-  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm64"
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64"
   triggers: "vm-kernel-precomp-win-release-x64"
diff --git a/main.star b/main.star
index fe6c0ff12f8b..485e380278cd 100755
--- a/main.star
+++ b/main.star
@@ -813,24 +813,97 @@ dart_ci_sandbox_builder(
     },
 )
 
-# vm|nnbd
+# vm|nnbd|jit
 dart_vm_extra_builder(
     "vm-kernel-nnbd-linux-debug-x64",
-    category = "vm|nnbd|d",
+    category = "vm|nnbd|jit|d",
     on_cq = True,
 )
 dart_vm_extra_builder(
     "vm-kernel-nnbd-linux-release-x64",
-    category = "vm|nnbd|r",
+    category = "vm|nnbd|jit|r",
     on_cq = True,
 )
+nightly_builder(
+    "vm-kernel-nnbd-linux-debug-ia32",
+    category = "vm|nnbd|jit|d3",
+    channels = ["try"],
+)
+nightly_builder(
+    "vm-kernel-nnbd-linux-release-ia32",
+    category = "vm|nnbd|jit|r3",
+    channels = ["try"],
+)
+nightly_builder(
+    "vm-kernel-nnbd-linux-release-simarm",
+    category = "vm|nnbd|jit|ra",
+    channels = ["try"],
+)
+nightly_builder(
+    "vm-kernel-nnbd-linux-release-simarm64",
+    category = "vm|nnbd|jit|ra6",
+    channels = ["try"],
+)
+nightly_builder(
+    "vm-kernel-nnbd-mac-debug-x64",
+    category = "vm|nnbd|jit|md",
+    channels = ["try"],
+)
+nightly_builder(
+    "vm-kernel-nnbd-mac-release-x64",
+    category = "vm|nnbd|jit|mr",
+    channels = ["try"],
+)
+nightly_builder(
+    "vm-kernel-nnbd-win-release-ia32",
+    category = "vm|nnbd|jit|wr3",
+    channels = ["try"],
+)
+nightly_builder(
+    "vm-kernel-nnbd-win-debug-x64",
+    category = "vm|nnbd|jit|wd",
+    channels = ["try"],
+)
+nightly_builder(
+    "vm-kernel-nnbd-win-release-x64",
+    category = "vm|nnbd|jit|wr",
+    channels = ["try"],
+)
+
+# vm|nnbd|aot
 dart_vm_extra_builder(
     "vm-kernel-precomp-nnbd-linux-release-x64",
     category = "vm|nnbd|aot|r",
 )
-dart_vm_extra_builder(
+nightly_builder(
+    "vm-kernel-precomp-nnbd-linux-debug-simarm_x64",
+    category = "vm|nnbd|aot|da",
+    channels = ["try"],
+)
+nightly_builder(
+    "vm-kernel-precomp-nnbd-linux-release-simarm_x64",
+    category = "vm|nnbd|aot|ra",
+    channels = ["try"],
+)
+nightly_builder(
+    "vm-kernel-precomp-nnbd-linux-debug-x64",
+    category = "vm|nnbd|aot|d",
+    channels = ["try"],
+)
+nightly_builder(
     "vm-kernel-precomp-nnbd-linux-release-simarm64",
-    category = "vm|nnbd|aot|a64",
+    category = "vm|nnbd|aot|ra6",
+    channels = ["try"],
+)
+nightly_builder(
+    "vm-kernel-precomp-nnbd-mac-release-simarm64",
+    category = "vm|nnbd|aot|ma6",
+    channels = ["try"],
+)
+nightly_builder(
+    "vm-kernel-precomp-nnbd-win-release-x64",
+    category = "vm|nnbd|aot|wr",
+    channels = ["try"],
 )
 
 # vm|app-kernel

From 9ae7ec0903a425327e6b81b1ac12cde9ad23a461 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 29 Sep 2020 12:36:14 +0000
Subject: [PATCH 426/826] [infra] Fix the dimensions of the new Windows/Mac
 nnbd builders

This also adds a check to prevent this from happening again.

TBR=whesse@google.com

Change-Id: Ie92ce345ef1e388cc616bbd2be9462874ec86b34
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/164967
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 40 ++++++++++++++++++++--------------------
 main.star          | 15 +++++++++++++++
 2 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index ce6d772b4d1b..25d653496fc2 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -6296,13 +6296,13 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6321,13 +6321,13 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -6346,7 +6346,7 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -6371,7 +6371,7 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -6396,7 +6396,7 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -7734,13 +7734,13 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7759,7 +7759,7 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -10382,13 +10382,13 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10407,13 +10407,13 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10432,7 +10432,7 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -10457,7 +10457,7 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -10482,7 +10482,7 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
@@ -10987,13 +10987,13 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -11012,7 +11012,7 @@ buckets {
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       recipe {
         name: "dart/neo"
diff --git a/main.star b/main.star
index 485e380278cd..fbddb362251a 100755
--- a/main.star
+++ b/main.star
@@ -555,6 +555,14 @@ def dart_builder(
     dimensions = defaults.dimensions(dimensions)
     properties = defaults.properties(properties)
 
+    os = dimensions["os"]
+    if "win" in name and os != "Windows":
+        fail("builder %s should be a Windows builder" % name)
+    if "mac" in name and os != "Mac":
+        fail("builder %s should be a macOS builder" % name)
+    if "linux" in name and os != "Linux":
+        fail("builder %s should be a Linux builder" % name)
+
     if lkgr:
         lkgr_builders.append({"project": "dart", "bucket": bucket, "builder": name})
 
@@ -848,26 +856,31 @@ nightly_builder(
     "vm-kernel-nnbd-mac-debug-x64",
     category = "vm|nnbd|jit|md",
     channels = ["try"],
+    dimensions = mac(),
 )
 nightly_builder(
     "vm-kernel-nnbd-mac-release-x64",
     category = "vm|nnbd|jit|mr",
     channels = ["try"],
+    dimensions = mac(),
 )
 nightly_builder(
     "vm-kernel-nnbd-win-release-ia32",
     category = "vm|nnbd|jit|wr3",
     channels = ["try"],
+    dimensions = windows(),
 )
 nightly_builder(
     "vm-kernel-nnbd-win-debug-x64",
     category = "vm|nnbd|jit|wd",
     channels = ["try"],
+    dimensions = windows(),
 )
 nightly_builder(
     "vm-kernel-nnbd-win-release-x64",
     category = "vm|nnbd|jit|wr",
     channels = ["try"],
+    dimensions = windows(),
 )
 
 # vm|nnbd|aot
@@ -899,11 +912,13 @@ nightly_builder(
     "vm-kernel-precomp-nnbd-mac-release-simarm64",
     category = "vm|nnbd|aot|ma6",
     channels = ["try"],
+    dimensions = mac(),
 )
 nightly_builder(
     "vm-kernel-precomp-nnbd-win-release-x64",
     category = "vm|nnbd|aot|wr",
     channels = ["try"],
+    dimensions = windows(),
 )
 
 # vm|app-kernel

From 5e8b3639d0ed19c815c27b74a60cf2e6769ca084 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 29 Sep 2020 13:25:55 +0000
Subject: [PATCH 427/826] [infra] Enable goma on RBE for macOS on beta and
 stable

The commit with the necessary property has been merged to stable.

Change-Id: If37eb9f53e24aa95470b6b33ca5ef83ea92ca08e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/164964
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 20 ++++++++++++++++++++
 main.star          |  5 -----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 25d653496fc2..a7533219ba00 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -261,6 +261,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -310,6 +311,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1124,6 +1126,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -1173,6 +1176,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2417,6 +2421,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2468,6 +2473,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2518,6 +2524,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -2567,6 +2574,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3051,6 +3059,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3102,6 +3111,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3592,6 +3602,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -3641,6 +3652,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4248,6 +4260,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -4299,6 +4312,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5780,6 +5794,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5829,6 +5844,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5903,6 +5919,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -5952,6 +5969,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7441,6 +7459,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7490,6 +7509,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
diff --git a/main.star b/main.star
index fbddb362251a..7b831788092d 100755
--- a/main.star
+++ b/main.star
@@ -28,9 +28,6 @@ RELEASE_CHANNELS = ["beta", "dev", "stable"]
 CHANNELS = RELEASE_CHANNELS + ["try"]
 BRANCHES = ["master"] + RELEASE_CHANNELS
 
-# TODO(athom): remove this when 89fe12b gets merged into stable.
-RBE_MAC_CHANNELS = [None, "dev", "try"]
-
 TEST_PY_PATHS = "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
 
 STANDARD_PATHS = [
@@ -418,8 +415,6 @@ def with_goma_rbe(goma_rbe, channel, dimensions, properties):
     Returns:
         A copy of the properties with GOMA on RBE properties set if applicable.
     """
-    if dimensions["os"] == "Mac" and channel not in RBE_MAC_CHANNELS:
-        return properties
     if goma_rbe in (None, True):
         goma_properties = {}
         goma_properties.update(GOMA_RBE)

From 1e8400df2e7180bbabe99d85ac144bddc86c337b Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 29 Sep 2020 15:30:16 +0000
Subject: [PATCH 428/826] [infra] Raise shard timeout on VM NNBD debug AOT
 builder

TBR=whesse@google.com

Change-Id: Iae6cdfaebf5fd280d6aef15763ae9a6503216b05
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/165021
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 2 ++
 main.star          | 1 +
 2 files changed, 3 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index a7533219ba00..0bc6a04f863c 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -7589,6 +7589,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       }
       priority: 70
       caches {
@@ -10917,6 +10918,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
+        properties_j: "shard_timeout:5400"
       }
       priority: 30
       caches {
diff --git a/main.star b/main.star
index 7b831788092d..2d9f23208c5e 100755
--- a/main.star
+++ b/main.star
@@ -897,6 +897,7 @@ nightly_builder(
     "vm-kernel-precomp-nnbd-linux-debug-x64",
     category = "vm|nnbd|aot|d",
     channels = ["try"],
+    properties = {"shard_timeout": (90 * time.minute) // time.second},
 )
 nightly_builder(
     "vm-kernel-precomp-nnbd-linux-release-simarm64",

From 288084742a960aa3eab6768e490a15e125690b74 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 30 Sep 2020 05:26:58 +0000
Subject: [PATCH 429/826] [infra] Remove hostonly_devicelab_tests from
 flutter-engine-linux

These tests were removed from flutter and from the validation in the
recipe. This removes the them also from the builder configuration.

See also: https://dart-review.googlesource.com/c/recipes/+/164920

Change-Id: I3730752bd243a55477a5aafab5afdd770834f8a1
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/165100
Reviewed-by: Daco Harkes <dacoharkes@google.com>
Commit-Queue: Daco Harkes <dacoharkes@google.com>
Auto-Submit: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 4 ++--
 main.star          | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 0bc6a04f863c..099198fd4d69 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -3401,7 +3401,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
-        properties_j: "flutter_test_suites:[\"add_to_app_life_cycle_tests\",\"build_tests\",\"framework_coverage\",\"framework_tests\",\"hostonly_devicelab_tests\",\"tool_coverage\",\"tool_tests\"]"
+        properties_j: "flutter_test_suites:[\"add_to_app_life_cycle_tests\",\"build_tests\",\"framework_coverage\",\"framework_tests\",\"tool_coverage\",\"tool_tests\"]"
       }
       priority: 50
       execution_timeout_secs: 28800
@@ -9353,7 +9353,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
-        properties_j: "flutter_test_suites:[\"add_to_app_life_cycle_tests\",\"build_tests\",\"framework_coverage\",\"framework_tests\",\"hostonly_devicelab_tests\",\"tool_coverage\",\"tool_tests\"]"
+        properties_j: "flutter_test_suites:[\"add_to_app_life_cycle_tests\",\"build_tests\",\"framework_coverage\",\"framework_tests\",\"tool_coverage\",\"tool_tests\"]"
       }
       priority: 30
       execution_timeout_secs: 28800
diff --git a/main.star b/main.star
index 2d9f23208c5e..d62d5b806841 100755
--- a/main.star
+++ b/main.star
@@ -796,7 +796,6 @@ dart_ci_sandbox_builder(
             "build_tests",
             "framework_coverage",
             "framework_tests",
-            "hostonly_devicelab_tests",
             "tool_coverage",
             "tool_tests",
         ],

From ffce466ec05b2b87a6e7dd10f94d3b8feb16bc4f Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 30 Sep 2020 10:22:42 +0000
Subject: [PATCH 430/826] [infra] Remove broken dart2js-ie builder

It's broken and always times out. This removes it until it can be fixed
so that people can't run it as a tryjob.

Change-Id: I2a5fad75953e6d4f6a550ba6aea345e019ff6bbd
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/165280
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: Karl Klose <karlklose@google.com>
Commit-Queue: Karl Klose <karlklose@google.com>
---
 commit-queue.cfg   |   4 --
 cr-buildbucket.cfg | 125 ---------------------------------------------
 luci-milo.cfg      |  28 ----------
 luci-notify.cfg    |  14 -----
 luci-scheduler.cfg |  44 ----------------
 main.star          |   5 --
 6 files changed, 220 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 0dc852ad5ccf..06e37b2c7164 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -240,10 +240,6 @@ config_groups {
         name: "dart/try/dart2js-strong-win-x64-chrome-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/dart2js-strong-win-x64-ie11-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/dart2js-unit-linux-x64-release-try"
         location_regexp: ".+/[+]/DEPS"
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 099198fd4d69..affde9ad628a 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -2717,106 +2717,6 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
-    builders {
-      name: "dart2js-strong-win-x64-ie11"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "dart2js-strong-win-x64-ie11-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "dart2js-strong-win-x64-ie11-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "dart2js-strong-win-x64-ie11-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
     builders {
       name: "dart2js-unit-linux-x64-release"
       swarming_host: "chromium-swarm.appspot.com"
@@ -9131,31 +9031,6 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
-    builders {
-      name: "dart2js-strong-win-x64-ie11-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
     builders {
       name: "dart2js-unit-linux-x64-release-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index a5c1fa9f580e..c9b088c6ac25 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -500,11 +500,6 @@ consoles {
     category: "dart2js|safari"
     short_name: "m"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11"
-    category: "dart2js|ms"
-    short_name: "ie"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
     category: "analyzer"
@@ -757,11 +752,6 @@ consoles {
     category: "dart2js|safari"
     short_name: "m"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11"
-    category: "dart2js|ms"
-    short_name: "ie"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
     category: "analyzer"
@@ -1524,11 +1514,6 @@ consoles {
     category: "dart2js|safari"
     short_name: "m"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11-dev"
-    category: "dart2js|ms"
-    short_name: "ie"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-dev"
     category: "analyzer"
@@ -1906,11 +1891,6 @@ consoles {
     category: "dart2js|safari"
     short_name: "m"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11-beta"
-    category: "dart2js|ms"
-    short_name: "ie"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-beta"
     category: "analyzer"
@@ -2288,11 +2268,6 @@ consoles {
     category: "dart2js|safari"
     short_name: "m"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-ie11-stable"
-    category: "dart2js|ms"
-    short_name: "ie"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-stable"
     category: "analyzer"
@@ -2733,9 +2708,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/dart2js-strong-mac-x64-safari-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-win-x64-ie11-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/flutter-analyze-try"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 1dda632b7ce9..9557570c5d7c 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -521,20 +521,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "dart2js-strong-win-x64-ie11"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 2d5dc125bcf1..b2b2ad7e4ffb 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -874,46 +874,6 @@ job {
     builder: "dart2js-strong-win-x64-chrome-stable"
   }
 }
-job {
-  id: "dart2js-strong-win-x64-ie11"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-ie11"
-  }
-}
-job {
-  id: "dart2js-strong-win-x64-ie11-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-ie11-beta"
-  }
-}
-job {
-  id: "dart2js-strong-win-x64-ie11-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-ie11-dev"
-  }
-}
-job {
-  id: "dart2js-strong-win-x64-ie11-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-ie11-stable"
-  }
-}
 job {
   id: "dart2js-unit-linux-x64-release"
   schedule: "triggered"
@@ -3411,7 +3371,6 @@ trigger {
   triggers: "dart2js-strong-mac-x64-chrome-beta"
   triggers: "dart2js-strong-mac-x64-safari-beta"
   triggers: "dart2js-strong-win-x64-chrome-beta"
-  triggers: "dart2js-strong-win-x64-ie11-beta"
   triggers: "dart2js-unit-linux-x64-release-beta"
   triggers: "ddc-linux-release-chrome-beta"
   triggers: "ddc-mac-release-chrome-beta"
@@ -3487,7 +3446,6 @@ trigger {
   triggers: "dart2js-strong-mac-x64-chrome-dev"
   triggers: "dart2js-strong-mac-x64-safari-dev"
   triggers: "dart2js-strong-win-x64-chrome-dev"
-  triggers: "dart2js-strong-win-x64-ie11-dev"
   triggers: "dart2js-unit-linux-x64-release-dev"
   triggers: "ddc-linux-release-chrome-dev"
   triggers: "ddc-mac-release-chrome-dev"
@@ -3571,7 +3529,6 @@ trigger {
   triggers: "dart2js-strong-mac-x64-chrome"
   triggers: "dart2js-strong-mac-x64-safari"
   triggers: "dart2js-strong-win-x64-chrome"
-  triggers: "dart2js-strong-win-x64-ie11"
   triggers: "dart2js-unit-linux-x64-release"
   triggers: "ddc-linux-release-chrome"
   triggers: "ddc-mac-release-chrome"
@@ -3625,7 +3582,6 @@ trigger {
   triggers: "dart2js-strong-mac-x64-chrome-stable"
   triggers: "dart2js-strong-mac-x64-safari-stable"
   triggers: "dart2js-strong-win-x64-chrome-stable"
-  triggers: "dart2js-strong-win-x64-ie11-stable"
   triggers: "dart2js-unit-linux-x64-release-stable"
   triggers: "ddc-linux-release-chrome-stable"
   triggers: "ddc-mac-release-chrome-stable"
diff --git a/main.star b/main.star
index d62d5b806841..74121a7094b3 100755
--- a/main.star
+++ b/main.star
@@ -1258,11 +1258,6 @@ dart_ci_sandbox_builder(
     category = "dart2js|safari|m",
     dimensions = mac(),
 )
-dart_ci_sandbox_builder(
-    "dart2js-strong-win-x64-ie11",
-    category = "dart2js|ms|ie",
-    dimensions = windows(),
-)
 
 # analyzer
 dart_ci_sandbox_builder(

From fb527f5477626abb773332d138c16a9b3d1e23dd Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 5 Oct 2020 10:14:49 +0000
Subject: [PATCH 431/826] [infra] Add a link to the current results UI to the
 consoles

Change-Id: I12887ec706f382e65a6b1ef623d1cb231391dcd1
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/166022
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: Karl Klose <karlklose@google.com>
Commit-Queue: Karl Klose <karlklose@google.com>
---
 console-header.textpb |  5 +++++
 luci-milo.cfg         | 25 +++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/console-header.textpb b/console-header.textpb
index 83043403b2e3..8e7d6fcaacd2 100644
--- a/console-header.textpb
+++ b/console-header.textpb
@@ -25,6 +25,11 @@ links: {
         url: "https://dart-ci.firebaseapp.com/"
         alt: "Results Feed"
     }
+    links: {
+        text: "Current Test Results"
+        url: "https://dart-ci.firebaseapp.com/current_results/"
+        alt: "Current Test Results"
+    }
 }
 console_groups: {
     console_ids: "dart/flutter"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index c9b088c6ac25..7ec288311a33 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -618,6 +618,11 @@ consoles {
         url: "https://dart-ci.firebaseapp.com/"
         alt: "Results Feed"
       }
+      links {
+        text: "Current Test Results"
+        url: "https://dart-ci.firebaseapp.com/current_results/"
+        alt: "Current Test Results"
+      }
     }
     console_groups {
       console_ids: "dart/flutter"
@@ -1240,6 +1245,11 @@ consoles {
         url: "https://dart-ci.firebaseapp.com/"
         alt: "Results Feed"
       }
+      links {
+        text: "Current Test Results"
+        url: "https://dart-ci.firebaseapp.com/current_results/"
+        alt: "Current Test Results"
+      }
     }
     console_groups {
       console_ids: "dart/flutter"
@@ -1617,6 +1627,11 @@ consoles {
         url: "https://dart-ci.firebaseapp.com/"
         alt: "Results Feed"
       }
+      links {
+        text: "Current Test Results"
+        url: "https://dart-ci.firebaseapp.com/current_results/"
+        alt: "Current Test Results"
+      }
     }
     console_groups {
       console_ids: "dart/flutter"
@@ -1994,6 +2009,11 @@ consoles {
         url: "https://dart-ci.firebaseapp.com/"
         alt: "Results Feed"
       }
+      links {
+        text: "Current Test Results"
+        url: "https://dart-ci.firebaseapp.com/current_results/"
+        alt: "Current Test Results"
+      }
     }
     console_groups {
       console_ids: "dart/flutter"
@@ -2371,6 +2391,11 @@ consoles {
         url: "https://dart-ci.firebaseapp.com/"
         alt: "Results Feed"
       }
+      links {
+        text: "Current Test Results"
+        url: "https://dart-ci.firebaseapp.com/current_results/"
+        alt: "Current Test Results"
+      }
     }
     console_groups {
       console_ids: "dart/flutter"

From d362126d39279a47d1a7daae5ab957bfe80bcddd Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 8 Oct 2020 09:02:37 +0000
Subject: [PATCH 432/826] [infra] Add analyzer NNBD macOS and Windows builders
 to the Luci config

https://github.com/dart-lang/sdk/issues/43463

Change-Id: I1a3e528371774d51f108230ec39a85363b587eb7
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/166424
Reviewed-by: Karl Klose <karlklose@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg   |   8 ++++
 cr-buildbucket.cfg | 102 ++++++++++++++++++++++++++++++++++++++++++++-
 luci-milo.cfg      |  80 +++++++++++++++++++++++------------
 luci-notify.cfg    |  26 ++++++++++++
 luci-scheduler.cfg |  20 +++++++++
 main.star          |  34 ++++++++++-----
 6 files changed, 232 insertions(+), 38 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 06e37b2c7164..ad4f08e1fdfa 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -126,6 +126,14 @@ config_groups {
         location_regexp: ".+/[+]/tests/.+"
         location_regexp: ".+/[+]/pkg/(analyzer|analyzer_cli|_fe_analyzer_shared)/.+"
       }
+      builders {
+        name: "dart/try/analyzer-nnbd-mac-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/analyzer-nnbd-win-release-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/analyzer-win-release-try"
         includable_only: true
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index affde9ad628a..5aca74dbf6aa 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -618,7 +618,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "builders:[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"vm-kernel-nnbd-linux-debug-ia32\",\"vm-kernel-nnbd-linux-release-ia32\",\"vm-kernel-nnbd-linux-release-simarm\",\"vm-kernel-nnbd-linux-release-simarm64\",\"vm-kernel-nnbd-mac-debug-x64\",\"vm-kernel-nnbd-mac-release-x64\",\"vm-kernel-nnbd-win-release-ia32\",\"vm-kernel-nnbd-win-debug-x64\",\"vm-kernel-nnbd-win-release-x64\",\"vm-kernel-precomp-nnbd-linux-debug-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-debug-x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm64\",\"vm-kernel-precomp-nnbd-mac-release-simarm64\",\"vm-kernel-precomp-nnbd-win-release-x64\",\"vm-kernel-linux-release-ia32\",\"vm-kernel-linux-debug-ia32\",\"vm-kernel-win-debug-ia32\",\"vm-kernel-win-release-ia32\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-linux-product-x64\",\"vm-kernel-mac-product-x64\",\"vm-kernel-win-product-x64\",\"vm-kernel-optcounter-threshold-linux-release-ia32\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\"]"
+        properties_j: "builders:[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"vm-kernel-nnbd-linux-debug-ia32\",\"vm-kernel-nnbd-linux-release-ia32\",\"vm-kernel-nnbd-linux-release-simarm\",\"vm-kernel-nnbd-linux-release-simarm64\",\"vm-kernel-nnbd-mac-debug-x64\",\"vm-kernel-nnbd-mac-release-x64\",\"vm-kernel-nnbd-win-release-ia32\",\"vm-kernel-nnbd-win-debug-x64\",\"vm-kernel-nnbd-win-release-x64\",\"vm-kernel-precomp-nnbd-linux-debug-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-debug-x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm64\",\"vm-kernel-precomp-nnbd-mac-release-simarm64\",\"vm-kernel-precomp-nnbd-win-release-x64\",\"vm-kernel-linux-release-ia32\",\"vm-kernel-linux-debug-ia32\",\"vm-kernel-win-debug-ia32\",\"vm-kernel-win-release-ia32\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-linux-product-x64\",\"vm-kernel-mac-product-x64\",\"vm-kernel-win-product-x64\",\"vm-kernel-optcounter-threshold-linux-release-ia32\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\",\"analyzer-nnbd-mac-release\",\"analyzer-nnbd-win-release\"]"
         properties_j: "clobber:\"true\""
       }
       priority: 50
@@ -1289,6 +1289,56 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
+    builders {
+      name: "analyzer-nnbd-mac-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 70
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "analyzer-nnbd-win-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 70
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
     builders {
       name: "analyzer-win-release"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8600,6 +8650,56 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
+    builders {
+      name: "analyzer-nnbd-mac-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "analyzer-nnbd-win-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
     builders {
       name: "analyzer-win-release-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 7ec288311a33..5e6b19be507a 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -515,11 +515,6 @@ consoles {
     category: "analyzer"
     short_name: "l"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release"
-    category: "analyzer"
-    short_name: "nn"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
     category: "analyzer"
@@ -530,6 +525,21 @@ consoles {
     category: "analyzer"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release"
+    category: "analyzer|nnbd"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-mac-release"
+    category: "analyzer|nnbd"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-win-release"
+    category: "analyzer|nnbd"
+    short_name: "w"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-linux"
     category: "sdk"
@@ -772,11 +782,6 @@ consoles {
     category: "analyzer"
     short_name: "l"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release"
-    category: "analyzer"
-    short_name: "nn"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
     category: "analyzer"
@@ -787,6 +792,21 @@ consoles {
     category: "analyzer"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release"
+    category: "analyzer|nnbd"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-mac-release"
+    category: "analyzer|nnbd"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-win-release"
+    category: "analyzer|nnbd"
+    short_name: "w"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-linux"
     category: "sdk"
@@ -1534,11 +1554,6 @@ consoles {
     category: "analyzer"
     short_name: "l"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-dev"
-    category: "analyzer"
-    short_name: "nn"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-dev"
     category: "analyzer"
@@ -1549,6 +1564,11 @@ consoles {
     category: "analyzer"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-dev"
+    category: "analyzer|nnbd"
+    short_name: "l"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-linux-dev"
     category: "sdk"
@@ -1916,11 +1936,6 @@ consoles {
     category: "analyzer"
     short_name: "l"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-beta"
-    category: "analyzer"
-    short_name: "nn"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-beta"
     category: "analyzer"
@@ -1931,6 +1946,11 @@ consoles {
     category: "analyzer"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-beta"
+    category: "analyzer|nnbd"
+    short_name: "l"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-linux-beta"
     category: "sdk"
@@ -2298,11 +2318,6 @@ consoles {
     category: "analyzer"
     short_name: "l"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-stable"
-    category: "analyzer"
-    short_name: "nn"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-stable"
     category: "analyzer"
@@ -2313,6 +2328,11 @@ consoles {
     category: "analyzer"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-stable"
+    category: "analyzer|nnbd"
+    short_name: "l"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-linux-stable"
     category: "sdk"
@@ -2742,14 +2762,20 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/analyzer-linux-release-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/analyzer-mac-release-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/analyzer-win-release-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/analyzer-nnbd-linux-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/analyzer-mac-release-try"
+    name: "buildbucket/luci.dart.try/analyzer-nnbd-mac-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/analyzer-win-release-try"
+    name: "buildbucket/luci.dart.try/analyzer-nnbd-win-release-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/dart-sdk-linux-try"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 9557570c5d7c..de9d23ed1e42 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -298,6 +298,32 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "analyzer-nnbd-mac-release"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "analyzer-nnbd-win-release"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index b2b2ad7e4ffb..345877e6967e 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -164,6 +164,26 @@ job {
     builder: "analyzer-nnbd-linux-release-stable"
   }
 }
+job {
+  id: "analyzer-nnbd-mac-release"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-nnbd-mac-release"
+  }
+}
+job {
+  id: "analyzer-nnbd-win-release"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-nnbd-win-release"
+  }
+}
 job {
   id: "analyzer-win-release"
   schedule: "triggered"
diff --git a/main.star b/main.star
index 74121a7094b3..8d1514642e25 100755
--- a/main.star
+++ b/main.star
@@ -1264,7 +1264,6 @@ dart_ci_sandbox_builder(
     "flutter-analyze",
     category = "analyzer|fa",
     channels = ["try"],
-    notifies = None,
     location_regexp = [
         ".+/[+]/DEPS",
         ".+/[+]/pkg/analysis_server/.+",
@@ -1276,37 +1275,52 @@ dart_ci_sandbox_builder(
         ".+/[+]/pkg/meta/.+",
         ".+/[+]/pkg/telemetry/.+",
     ],
+    notifies = None,
 )
 dart_ci_sandbox_builder(
     "analyzer-analysis-server-linux",
     category = "analyzer|as",
-    location_regexp = to_location_regexp(ANALYZER_PATHS),
     channels = CHANNELS,
+    location_regexp = to_location_regexp(ANALYZER_PATHS),
 )
 dart_ci_sandbox_builder(
     "analyzer-linux-release",
     category = "analyzer|l",
-    location_regexp = to_location_regexp(ANALYZER_PATHS),
-    channels = CHANNELS,
-)
-dart_ci_sandbox_builder(
-    "analyzer-nnbd-linux-release",
-    category = "analyzer|nn",
-    location_regexp = to_location_regexp(ANALYZER_NNBD_PATHS),
     channels = CHANNELS,
+    location_regexp = to_location_regexp(ANALYZER_PATHS),
 )
 dart_ci_sandbox_builder(
     "analyzer-mac-release",
     category = "analyzer|m",
-    dimensions = mac(),
     channels = CHANNELS,
+    dimensions = mac(),
 )
 dart_ci_sandbox_builder(
     "analyzer-win-release",
     category = "analyzer|w",
+    channels = CHANNELS,
     dimensions = windows(),
+)
+
+# analyzer|nnbd
+dart_ci_sandbox_builder(
+    "analyzer-nnbd-linux-release",
+    category = "analyzer|nnbd|l",
+    location_regexp = to_location_regexp(ANALYZER_NNBD_PATHS),
     channels = CHANNELS,
 )
+nightly_builder(
+    "analyzer-nnbd-mac-release",
+    category = "analyzer|nnbd|m",
+    channels = ["try"],
+    dimensions = mac(),
+)
+nightly_builder(
+    "analyzer-nnbd-win-release",
+    category = "analyzer|nnbd|w",
+    channels = ["try"],
+    dimensions = windows(),
+)
 
 # sdk
 dart_ci_builder(

From 8b38f9583ba62035de7915ae719625785260c6d7 Mon Sep 17 00:00:00 2001
From: Jens Johansen <jensj@google.com>
Date: Thu, 8 Oct 2020 12:28:53 +0000
Subject: [PATCH 433/826] [infra] Enable flutter-frontend-try by default when
 changing CFE et al

This CL should enable the flutter-frontend tryjob whenever anything in
* CFE
* kernel
* testing
* _fe_analyzer_shared
is changed in order to give an early warning if a CL breaks flutter.

Change-Id: Ifcfefdbb4ceb4517c92385542ed8ad4275a15f57
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/166624
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Jens Johansen <jensj@google.com>
---
 commit-queue.cfg | 2 +-
 main.star        | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index ad4f08e1fdfa..13a67d41b92f 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -330,7 +330,7 @@ config_groups {
       }
       builders {
         name: "dart/try/flutter-frontend-try"
-        includable_only: true
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
       }
       builders {
         name: "dart/try/front-end-linux-release-x64-try"
diff --git a/main.star b/main.star
index 8d1514642e25..59736e4e6013 100755
--- a/main.star
+++ b/main.star
@@ -46,10 +46,12 @@ STANDARD_PATHS = [
     "tests/.+",
 ]
 
-CFE_PATHS = STANDARD_PATHS + [
+CFE_PATHS_ONLY = [
     "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+",
 ]
 
+CFE_PATHS = STANDARD_PATHS + CFE_PATHS_ONLY
+
 VM_PATHS = CFE_PATHS + [
     # VM sources
     "pkg/vm/.+",
@@ -773,6 +775,7 @@ dart_ci_sandbox_builder(
     category = "cfe|fl",
     channels = ["try"],
     notifies = "frontend-team",
+    location_regexp = to_location_regexp(CFE_PATHS_ONLY),
 )
 weekly_ci_sandbox_builder(
     "frontend-weekly",

From 871e83f83210387d25b290087b52f14d32d9a244 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 14 Oct 2020 12:49:27 +0000
Subject: [PATCH 434/826] [infra] Make app-jit (product) and reload builders
 nightly builds

Change-Id: I7b81e711dc5fad71902316d42b8cf66a17303077
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/167569
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 314 +++++++++++++++++++++++++++++++++++++++++++--
 luci-milo.cfg      |  60 +++++++++
 luci-notify.cfg    |  15 +--
 luci-scheduler.cfg | 128 ++++++++++++++++--
 main.star          |  10 +-
 5 files changed, 495 insertions(+), 32 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 5aca74dbf6aa..1c7edc8c0859 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -618,7 +618,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "builders:[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"vm-kernel-nnbd-linux-debug-ia32\",\"vm-kernel-nnbd-linux-release-ia32\",\"vm-kernel-nnbd-linux-release-simarm\",\"vm-kernel-nnbd-linux-release-simarm64\",\"vm-kernel-nnbd-mac-debug-x64\",\"vm-kernel-nnbd-mac-release-x64\",\"vm-kernel-nnbd-win-release-ia32\",\"vm-kernel-nnbd-win-debug-x64\",\"vm-kernel-nnbd-win-release-x64\",\"vm-kernel-precomp-nnbd-linux-debug-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-debug-x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm64\",\"vm-kernel-precomp-nnbd-mac-release-simarm64\",\"vm-kernel-precomp-nnbd-win-release-x64\",\"vm-kernel-linux-release-ia32\",\"vm-kernel-linux-debug-ia32\",\"vm-kernel-win-debug-ia32\",\"vm-kernel-win-release-ia32\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-linux-product-x64\",\"vm-kernel-mac-product-x64\",\"vm-kernel-win-product-x64\",\"vm-kernel-optcounter-threshold-linux-release-ia32\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\",\"analyzer-nnbd-mac-release\",\"analyzer-nnbd-win-release\"]"
+        properties_j: "builders:[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"vm-kernel-nnbd-linux-debug-ia32\",\"vm-kernel-nnbd-linux-release-ia32\",\"vm-kernel-nnbd-linux-release-simarm\",\"vm-kernel-nnbd-linux-release-simarm64\",\"vm-kernel-nnbd-mac-debug-x64\",\"vm-kernel-nnbd-mac-release-x64\",\"vm-kernel-nnbd-win-release-ia32\",\"vm-kernel-nnbd-win-debug-x64\",\"vm-kernel-nnbd-win-release-x64\",\"vm-kernel-precomp-nnbd-linux-debug-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-debug-x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm64\",\"vm-kernel-precomp-nnbd-mac-release-simarm64\",\"vm-kernel-precomp-nnbd-win-release-x64\",\"app-kernel-linux-product-x64\",\"vm-kernel-linux-release-ia32\",\"vm-kernel-linux-debug-ia32\",\"vm-kernel-win-debug-ia32\",\"vm-kernel-win-release-ia32\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-linux-product-x64\",\"vm-kernel-mac-product-x64\",\"vm-kernel-win-product-x64\",\"vm-kernel-optcounter-threshold-linux-release-ia32\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\",\"vm-kernel-reload-linux-debug-x64\",\"vm-kernel-reload-linux-release-x64\",\"vm-kernel-reload-rollback-linux-debug-x64\",\"vm-kernel-reload-rollback-linux-release-x64\",\"analyzer-nnbd-mac-release\",\"analyzer-nnbd-win-release\"]"
         properties_j: "clobber:\"true\""
       }
       priority: 50
@@ -1556,7 +1556,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -1581,7 +1581,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -1606,7 +1606,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -1631,7 +1631,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
       }
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -8018,7 +8018,81 @@ buckets {
         properties_j: "clobber:\"true\""
       }
       priority: 70
-      expiration_secs: 86400
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "vm-kernel-reload-linux-debug-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 70
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "vm-kernel-reload-linux-debug-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 70
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "vm-kernel-reload-linux-debug-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -8044,7 +8118,81 @@ buckets {
         properties_j: "clobber:\"true\""
       }
       priority: 70
-      expiration_secs: 86400
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "vm-kernel-reload-linux-release-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 70
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "vm-kernel-reload-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 70
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "vm-kernel-reload-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -8070,7 +8218,81 @@ buckets {
         properties_j: "clobber:\"true\""
       }
       priority: 70
-      expiration_secs: 86400
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "vm-kernel-reload-rollback-linux-debug-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 70
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "vm-kernel-reload-rollback-linux-debug-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 70
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "vm-kernel-reload-rollback-linux-debug-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
@@ -8096,7 +8318,81 @@ buckets {
         properties_j: "clobber:\"true\""
       }
       priority: 70
-      expiration_secs: 86400
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "vm-kernel-reload-rollback-linux-release-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 70
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "vm-kernel-reload-rollback-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 70
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
+    builders {
+      name: "vm-kernel-reload-rollback-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:\"true\""
+      }
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 5e6b19be507a..da0c7185af88 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -1444,6 +1444,26 @@ consoles {
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64-dev"
+    category: "vm|misc|reload"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64-dev"
+    category: "vm|misc|reload"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64-dev"
+    category: "vm|misc|reload"
+    short_name: "drb"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64-dev"
+    category: "vm|misc|reload"
+    short_name: "rrb"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-dev"
     category: "vm|ffi"
@@ -1826,6 +1846,26 @@ consoles {
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64-beta"
+    category: "vm|misc|reload"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64-beta"
+    category: "vm|misc|reload"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64-beta"
+    category: "vm|misc|reload"
+    short_name: "drb"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64-beta"
+    category: "vm|misc|reload"
+    short_name: "rrb"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-beta"
     category: "vm|ffi"
@@ -2208,6 +2248,26 @@ consoles {
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64-stable"
+    category: "vm|misc|reload"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64-stable"
+    category: "vm|misc|reload"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64-stable"
+    category: "vm|misc|reload"
+    short_name: "drb"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64-stable"
+    category: "vm|misc|reload"
+    short_name: "rrb"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-stable"
     category: "vm|ffi"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index de9d23ed1e42..f6c089682e89 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -356,14 +356,13 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
+      recipients: "karlklose@google.com"
       recipients: "athom@google.com"
     }
-    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
     name: "app-kernel-linux-product-x64"
-    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1626,56 +1625,52 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
+      recipients: "karlklose@google.com"
       recipients: "athom@google.com"
     }
-    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-reload-linux-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
     email {
+      recipients: "karlklose@google.com"
       recipients: "athom@google.com"
     }
-    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-reload-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
     email {
+      recipients: "karlklose@google.com"
       recipients: "athom@google.com"
     }
-    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-reload-rollback-linux-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
     email {
+      recipients: "karlklose@google.com"
       recipients: "athom@google.com"
     }
-    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-reload-rollback-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 345877e6967e..4b83e3eb97ee 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -3128,6 +3128,36 @@ job {
     builder: "vm-kernel-reload-linux-debug-x64"
   }
 }
+job {
+  id: "vm-kernel-reload-linux-debug-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-linux-debug-x64-beta"
+  }
+}
+job {
+  id: "vm-kernel-reload-linux-debug-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-linux-debug-x64-dev"
+  }
+}
+job {
+  id: "vm-kernel-reload-linux-debug-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-linux-debug-x64-stable"
+  }
+}
 job {
   id: "vm-kernel-reload-linux-release-x64"
   schedule: "triggered"
@@ -3138,6 +3168,36 @@ job {
     builder: "vm-kernel-reload-linux-release-x64"
   }
 }
+job {
+  id: "vm-kernel-reload-linux-release-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-linux-release-x64-beta"
+  }
+}
+job {
+  id: "vm-kernel-reload-linux-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-linux-release-x64-dev"
+  }
+}
+job {
+  id: "vm-kernel-reload-linux-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-linux-release-x64-stable"
+  }
+}
 job {
   id: "vm-kernel-reload-rollback-linux-debug-x64"
   schedule: "triggered"
@@ -3148,6 +3208,36 @@ job {
     builder: "vm-kernel-reload-rollback-linux-debug-x64"
   }
 }
+job {
+  id: "vm-kernel-reload-rollback-linux-debug-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-rollback-linux-debug-x64-beta"
+  }
+}
+job {
+  id: "vm-kernel-reload-rollback-linux-debug-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-rollback-linux-debug-x64-dev"
+  }
+}
+job {
+  id: "vm-kernel-reload-rollback-linux-debug-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-rollback-linux-debug-x64-stable"
+  }
+}
 job {
   id: "vm-kernel-reload-rollback-linux-release-x64"
   schedule: "triggered"
@@ -3158,6 +3248,36 @@ job {
     builder: "vm-kernel-reload-rollback-linux-release-x64"
   }
 }
+job {
+  id: "vm-kernel-reload-rollback-linux-release-x64-beta"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-rollback-linux-release-x64-beta"
+  }
+}
+job {
+  id: "vm-kernel-reload-rollback-linux-release-x64-dev"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-rollback-linux-release-x64-dev"
+  }
+}
+job {
+  id: "vm-kernel-reload-rollback-linux-release-x64-stable"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-rollback-linux-release-x64-stable"
+  }
+}
 job {
   id: "vm-kernel-tsan-linux-release-x64"
   schedule: "triggered"
@@ -3380,7 +3500,6 @@ trigger {
   triggers: "analyzer-nnbd-linux-release-beta"
   triggers: "analyzer-win-release-beta"
   triggers: "app-kernel-linux-debug-x64-beta"
-  triggers: "app-kernel-linux-product-x64-beta"
   triggers: "app-kernel-linux-release-x64-beta"
   triggers: "dart2js-csp-minified-linux-x64-chrome-beta"
   triggers: "dart2js-minified-strong-linux-x64-d8-beta"
@@ -3455,7 +3574,6 @@ trigger {
   triggers: "analyzer-nnbd-linux-release-dev"
   triggers: "analyzer-win-release-dev"
   triggers: "app-kernel-linux-debug-x64-dev"
-  triggers: "app-kernel-linux-product-x64-dev"
   triggers: "app-kernel-linux-release-x64-dev"
   triggers: "dart2js-csp-minified-linux-x64-chrome-dev"
   triggers: "dart2js-minified-strong-linux-x64-d8-dev"
@@ -3591,7 +3709,6 @@ trigger {
   triggers: "analyzer-nnbd-linux-release-stable"
   triggers: "analyzer-win-release-stable"
   triggers: "app-kernel-linux-debug-x64-stable"
-  triggers: "app-kernel-linux-product-x64-stable"
   triggers: "app-kernel-linux-release-x64-stable"
   triggers: "dart2js-csp-minified-linux-x64-chrome-stable"
   triggers: "dart2js-minified-strong-linux-x64-d8-stable"
@@ -3656,7 +3773,6 @@ trigger {
   id: "dart-vm-gitiles-trigger-master"
   acl_sets: "ci"
   triggers: "app-kernel-linux-debug-x64"
-  triggers: "app-kernel-linux-product-x64"
   triggers: "app-kernel-linux-release-x64"
   triggers: "cross-vm-linux-release-arm64"
   triggers: "vm-canary-linux-debug"
@@ -3686,10 +3802,6 @@ trigger {
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64"
   triggers: "vm-kernel-precomp-win-release-x64"
-  triggers: "vm-kernel-reload-linux-debug-x64"
-  triggers: "vm-kernel-reload-linux-release-x64"
-  triggers: "vm-kernel-reload-rollback-linux-debug-x64"
-  triggers: "vm-kernel-reload-rollback-linux-release-x64"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
diff --git a/main.star b/main.star
index 59736e4e6013..817a4cef0fe3 100755
--- a/main.star
+++ b/main.star
@@ -924,7 +924,7 @@ dart_vm_extra_builder(
     "app-kernel-linux-debug-x64",
     category = "vm|app-kernel|d64",
 )
-dart_vm_extra_builder(
+nightly_builder(
     "app-kernel-linux-product-x64",
     category = "vm|app-kernel|p64",
 )
@@ -1143,19 +1143,19 @@ dart_vm_sanitizer_builder(
     category = "vm|misc|aot|u",
     goma_rbe = False,
 )  # ubsan is not compatible with our sysroot.
-dart_vm_low_priority_builder(
+nightly_builder(
     "vm-kernel-reload-linux-debug-x64",
     category = "vm|misc|reload|d",
 )
-dart_vm_low_priority_builder(
+nightly_builder(
     "vm-kernel-reload-linux-release-x64",
     category = "vm|misc|reload|r",
 )
-dart_vm_low_priority_builder(
+nightly_builder(
     "vm-kernel-reload-rollback-linux-debug-x64",
     category = "vm|misc|reload|drb",
 )
-dart_vm_low_priority_builder(
+nightly_builder(
     "vm-kernel-reload-rollback-linux-release-x64",
     category = "vm|misc|reload|rrb",
 )

From f913d4ea63ee08a78d7ad4d9eda0f1a2aa328253 Mon Sep 17 00:00:00 2001
From: Karl Klose <karlklose@google.com>
Date: Tue, 3 Nov 2020 07:59:52 +0000
Subject: [PATCH 435/826] [infra] Disable Flutter 3H build_tests step for now

Bug: https://github.com/dart-lang/sdk/issues/44033
Change-Id: Ide476cf72cde98c5abf22cbbc83ba0caaaa3e2f2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/170091
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Karl Klose <karlklose@google.com>
---
 cr-buildbucket.cfg | 4 ++--
 main.star          | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 1c7edc8c0859..f00a027df8c9 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -3351,7 +3351,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
-        properties_j: "flutter_test_suites:[\"add_to_app_life_cycle_tests\",\"build_tests\",\"framework_coverage\",\"framework_tests\",\"tool_coverage\",\"tool_tests\"]"
+        properties_j: "flutter_test_suites:[\"add_to_app_life_cycle_tests\",\"framework_coverage\",\"framework_tests\",\"tool_coverage\",\"tool_tests\"]"
       }
       priority: 50
       execution_timeout_secs: 28800
@@ -9624,7 +9624,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
-        properties_j: "flutter_test_suites:[\"add_to_app_life_cycle_tests\",\"build_tests\",\"framework_coverage\",\"framework_tests\",\"tool_coverage\",\"tool_tests\"]"
+        properties_j: "flutter_test_suites:[\"add_to_app_life_cycle_tests\",\"framework_coverage\",\"framework_tests\",\"tool_coverage\",\"tool_tests\"]"
       }
       priority: 30
       execution_timeout_secs: 28800
diff --git a/main.star b/main.star
index 817a4cef0fe3..91afbf873758 100755
--- a/main.star
+++ b/main.star
@@ -796,7 +796,6 @@ dart_ci_sandbox_builder(
         "bisection_enabled": True,
         "flutter_test_suites": [
             "add_to_app_life_cycle_tests",
-            "build_tests",
             "framework_coverage",
             "framework_tests",
             "tool_coverage",

From be7814650d60effa04088c4adec0d9a19b706bb0 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 5 Nov 2020 13:43:03 +0000
Subject: [PATCH 436/826] [infra] Remove version checker

This builder was useful when the release process was a lot more manual
than it is today. Nowadays, it provides little value.

Change-Id: I7b37a1d3d0a205559463ee074fd9c48fd20e0dc4
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/170434
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 100 ---------------------------------------------
 luci-milo.cfg      |  25 ------------
 luci-notify.cfg    |  14 -------
 luci-scheduler.cfg |  44 --------------------
 main.star          |   5 ---
 5 files changed, 188 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index f00a027df8c9..eb322062541e 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -688,106 +688,6 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     }
-    builders {
-      name: "versionchecker-linux"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "versionchecker-linux-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "versionchecker-linux-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "versionchecker-linux-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    }
     builders {
       name: "weekly"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index da0c7185af88..ddab560995fc 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -590,11 +590,6 @@ consoles {
     category: "misc"
     short_name: "dp"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/versionchecker-linux"
-    category: "misc"
-    short_name: "vc"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/google"
     category: "flutter"
@@ -857,11 +852,6 @@ consoles {
     category: "misc"
     short_name: "dp"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/versionchecker-linux"
-    category: "misc"
-    short_name: "vc"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/google"
     category: "flutter"
@@ -1634,11 +1624,6 @@ consoles {
     category: "misc"
     short_name: "dp"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/versionchecker-linux-dev"
-    category: "misc"
-    short_name: "vc"
-  }
   header {
     links {
       name: "Consoles"
@@ -2036,11 +2021,6 @@ consoles {
     category: "misc"
     short_name: "dp"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/versionchecker-linux-beta"
-    category: "misc"
-    short_name: "vc"
-  }
   header {
     links {
       name: "Consoles"
@@ -2438,11 +2418,6 @@ consoles {
     category: "misc"
     short_name: "dp"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/versionchecker-linux-stable"
-    category: "misc"
-    short_name: "vc"
-  }
   header {
     links {
       name: "Consoles"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index f6c089682e89..a42da99a52ee 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -198,20 +198,6 @@ notifiers {
     name: "recipe-deps-roller"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci"
-    name: "versionchecker-linux"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 4b83e3eb97ee..6b3f498da485 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1638,46 +1638,6 @@ job {
     builder: "roll-to-dev"
   }
 }
-job {
-  id: "versionchecker-linux"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "versionchecker-linux"
-  }
-}
-job {
-  id: "versionchecker-linux-beta"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "versionchecker-linux-beta"
-  }
-}
-job {
-  id: "versionchecker-linux-dev"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "versionchecker-linux-dev"
-  }
-}
-job {
-  id: "versionchecker-linux-stable"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "versionchecker-linux-stable"
-  }
-}
 job {
   id: "vm-canary-linux-debug"
   schedule: "triggered"
@@ -3493,7 +3453,6 @@ trigger {
   triggers: "dart-sdk-mac-beta"
   triggers: "dart-sdk-win-beta"
   triggers: "debianpackage-linux-beta"
-  triggers: "versionchecker-linux-beta"
   triggers: "analyzer-analysis-server-linux-beta"
   triggers: "analyzer-linux-release-beta"
   triggers: "analyzer-mac-release-beta"
@@ -3567,7 +3526,6 @@ trigger {
   triggers: "dart-sdk-mac-dev"
   triggers: "dart-sdk-win-dev"
   triggers: "debianpackage-linux-dev"
-  triggers: "versionchecker-linux-dev"
   triggers: "analyzer-analysis-server-linux-dev"
   triggers: "analyzer-linux-release-dev"
   triggers: "analyzer-mac-release-dev"
@@ -3652,7 +3610,6 @@ trigger {
   triggers: "dart-sdk-win"
   triggers: "debianpackage-linux"
   triggers: "linearize-flutter"
-  triggers: "versionchecker-linux"
   triggers: "analyzer-analysis-server-linux"
   triggers: "analyzer-linux-release"
   triggers: "analyzer-mac-release"
@@ -3702,7 +3659,6 @@ trigger {
   triggers: "dart-sdk-mac-stable"
   triggers: "dart-sdk-win-stable"
   triggers: "debianpackage-linux-stable"
-  triggers: "versionchecker-linux-stable"
   triggers: "analyzer-analysis-server-linux-stable"
   triggers: "analyzer-linux-release-stable"
   triggers: "analyzer-mac-release-stable"
diff --git a/main.star b/main.star
index 91afbf873758..52de04718aed 100755
--- a/main.star
+++ b/main.star
@@ -1388,11 +1388,6 @@ dart_ci_builder(
     notifies = "infra",
     lkgr = True,
 )
-dart_ci_builder(
-    "versionchecker-linux",
-    category = "misc|vc",
-    channels = RELEASE_CHANNELS,
-)
 
 # external
 dart_ci_sandbox_builder(

From 3cd6e0fd23fe0c5fc790b8a1962b62237e669c32 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 13 Nov 2020 10:33:16 +0000
Subject: [PATCH 437/826] [infra] Remove nightly builders from the release
 branch consoles

Change-Id: I242faba3c989dd91785b1de8cd87717f9668897a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/171885
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: Karl Klose <karlklose@google.com>
Commit-Queue: Karl Klose <karlklose@google.com>
---
 cr-buildbucket.cfg | 375 ---------------------------------------------
 luci-milo.cfg      |  75 ---------
 luci-scheduler.cfg | 150 ------------------
 main.star          |   5 +
 4 files changed, 5 insertions(+), 600 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index eb322062541e..04f6dafa539a 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1464,81 +1464,6 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
-    builders {
-      name: "app-kernel-linux-product-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "app-kernel-linux-product-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "app-kernel-linux-product-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
     builders {
       name: "app-kernel-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -7925,81 +7850,6 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
-    builders {
-      name: "vm-kernel-reload-linux-debug-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-kernel-reload-linux-debug-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-kernel-reload-linux-debug-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
     builders {
       name: "vm-kernel-reload-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8025,81 +7875,6 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
-    builders {
-      name: "vm-kernel-reload-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-kernel-reload-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-kernel-reload-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
     builders {
       name: "vm-kernel-reload-rollback-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8125,81 +7900,6 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
-    builders {
-      name: "vm-kernel-reload-rollback-linux-debug-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-kernel-reload-rollback-linux-debug-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-kernel-reload-rollback-linux-debug-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
     builders {
       name: "vm-kernel-reload-rollback-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8225,81 +7925,6 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
-    builders {
-      name: "vm-kernel-reload-rollback-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-kernel-reload-rollback-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
-    builders {
-      name: "vm-kernel-reload-rollback-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
-      }
-      priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-    }
     builders {
       name: "vm-kernel-tsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index ddab560995fc..4928b429ed5a 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -1314,11 +1314,6 @@ consoles {
     category: "vm|app-kernel"
     short_name: "d64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64-dev"
-    category: "vm|app-kernel"
-    short_name: "p64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-dev"
     category: "vm|app-kernel"
@@ -1434,26 +1429,6 @@ consoles {
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64-dev"
-    category: "vm|misc|reload"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64-dev"
-    category: "vm|misc|reload"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64-dev"
-    category: "vm|misc|reload"
-    short_name: "drb"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64-dev"
-    category: "vm|misc|reload"
-    short_name: "rrb"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-dev"
     category: "vm|ffi"
@@ -1711,11 +1686,6 @@ consoles {
     category: "vm|app-kernel"
     short_name: "d64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64-beta"
-    category: "vm|app-kernel"
-    short_name: "p64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-beta"
     category: "vm|app-kernel"
@@ -1831,26 +1801,6 @@ consoles {
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64-beta"
-    category: "vm|misc|reload"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64-beta"
-    category: "vm|misc|reload"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64-beta"
-    category: "vm|misc|reload"
-    short_name: "drb"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64-beta"
-    category: "vm|misc|reload"
-    short_name: "rrb"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-beta"
     category: "vm|ffi"
@@ -2108,11 +2058,6 @@ consoles {
     category: "vm|app-kernel"
     short_name: "d64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64-stable"
-    category: "vm|app-kernel"
-    short_name: "p64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-stable"
     category: "vm|app-kernel"
@@ -2228,26 +2173,6 @@ consoles {
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64-stable"
-    category: "vm|misc|reload"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64-stable"
-    category: "vm|misc|reload"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64-stable"
-    category: "vm|misc|reload"
-    short_name: "drb"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64-stable"
-    category: "vm|misc|reload"
-    short_name: "rrb"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-stable"
     category: "vm|ffi"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 6b3f498da485..5f24309e1a15 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -274,36 +274,6 @@ job {
     builder: "app-kernel-linux-product-x64"
   }
 }
-job {
-  id: "app-kernel-linux-product-x64-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-product-x64-beta"
-  }
-}
-job {
-  id: "app-kernel-linux-product-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-product-x64-dev"
-  }
-}
-job {
-  id: "app-kernel-linux-product-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-product-x64-stable"
-  }
-}
 job {
   id: "app-kernel-linux-release-x64"
   schedule: "triggered"
@@ -3088,36 +3058,6 @@ job {
     builder: "vm-kernel-reload-linux-debug-x64"
   }
 }
-job {
-  id: "vm-kernel-reload-linux-debug-x64-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-linux-debug-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-reload-linux-debug-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-linux-debug-x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-reload-linux-debug-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-linux-debug-x64-stable"
-  }
-}
 job {
   id: "vm-kernel-reload-linux-release-x64"
   schedule: "triggered"
@@ -3128,36 +3068,6 @@ job {
     builder: "vm-kernel-reload-linux-release-x64"
   }
 }
-job {
-  id: "vm-kernel-reload-linux-release-x64-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-linux-release-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-reload-linux-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-linux-release-x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-reload-linux-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-linux-release-x64-stable"
-  }
-}
 job {
   id: "vm-kernel-reload-rollback-linux-debug-x64"
   schedule: "triggered"
@@ -3168,36 +3078,6 @@ job {
     builder: "vm-kernel-reload-rollback-linux-debug-x64"
   }
 }
-job {
-  id: "vm-kernel-reload-rollback-linux-debug-x64-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-debug-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-reload-rollback-linux-debug-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-debug-x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-reload-rollback-linux-debug-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-debug-x64-stable"
-  }
-}
 job {
   id: "vm-kernel-reload-rollback-linux-release-x64"
   schedule: "triggered"
@@ -3208,36 +3088,6 @@ job {
     builder: "vm-kernel-reload-rollback-linux-release-x64"
   }
 }
-job {
-  id: "vm-kernel-reload-rollback-linux-release-x64-beta"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-release-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-reload-rollback-linux-release-x64-dev"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-release-x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-reload-rollback-linux-release-x64-stable"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-release-x64-stable"
-  }
-}
 job {
   id: "vm-kernel-tsan-linux-release-x64"
   schedule: "triggered"
diff --git a/main.star b/main.star
index 52de04718aed..6a109a2df864 100755
--- a/main.star
+++ b/main.star
@@ -926,6 +926,7 @@ dart_vm_extra_builder(
 nightly_builder(
     "app-kernel-linux-product-x64",
     category = "vm|app-kernel|p64",
+    channels = ["try"],
 )
 dart_vm_extra_builder(
     "app-kernel-linux-release-x64",
@@ -1145,18 +1146,22 @@ dart_vm_sanitizer_builder(
 nightly_builder(
     "vm-kernel-reload-linux-debug-x64",
     category = "vm|misc|reload|d",
+    channels = ["try"],
 )
 nightly_builder(
     "vm-kernel-reload-linux-release-x64",
     category = "vm|misc|reload|r",
+    channels = ["try"],
 )
 nightly_builder(
     "vm-kernel-reload-rollback-linux-debug-x64",
     category = "vm|misc|reload|drb",
+    channels = ["try"],
 )
 nightly_builder(
     "vm-kernel-reload-rollback-linux-release-x64",
     category = "vm|misc|reload|rrb",
+    channels = ["try"],
 )
 dart_vm_low_priority_builder("vm-fuchsia-release-x64", category = "vm|misc|f")
 

From 4e91fef7b125bf494e3513c2f6f3479a1cbaeed0 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 25 Nov 2020 09:59:39 +0000
Subject: [PATCH 438/826] [infra] Add web_tool_tests shard to the web 3xH
 builder

Change-Id: Iba5c9de34db1175c79482f79384187dda69b9933
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/170421
Reviewed-by: Karl Klose <karlklose@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 4 ++--
 main.star          | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 04f6dafa539a..977dfd1f9647 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -3204,7 +3204,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
-        properties_j: "flutter_test_suites:[\"web_tests\"]"
+        properties_j: "flutter_test_suites:[\"web_tests\",\"web_tool_tests\"]"
       }
       priority: 50
       execution_timeout_secs: 28800
@@ -9177,7 +9177,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
         properties_j: "clobber:\"true\""
-        properties_j: "flutter_test_suites:[\"web_tests\"]"
+        properties_j: "flutter_test_suites:[\"web_tests\",\"web_tool_tests\"]"
       }
       priority: 30
       execution_timeout_secs: 28800
diff --git a/main.star b/main.star
index 6a109a2df864..34265c56de7c 100755
--- a/main.star
+++ b/main.star
@@ -813,7 +813,10 @@ dart_ci_sandbox_builder(
     triggered_by = ["dart-gitiles-trigger-flutter"],
     properties = {
         "bisection_enabled": True,
-        "flutter_test_suites": ["web_tests"],
+        "flutter_test_suites": [
+            "web_tests",
+            "web_tool_tests",
+        ],
     },
 )
 

From 330e8934f87141fd2a5757ceb8a295a24ed634b2 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 26 Nov 2020 12:14:15 +0000
Subject: [PATCH 439/826] [goma] Complete goma on RBE migration

* Replace option to run without RBE with disabling goma.
* Only allow goma on the TRY_ACCOUNT.
* Set a custom timeout on dart-sdk-linux.

b/144018396

Change-Id: I3c2c0866b7e6f1299863e7b7e34919509bb6bfbc
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/174121
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: Karl Klose <karlklose@google.com>
---
 cr-buildbucket.cfg | 62 +++++++++++++++++++++++++---------------------
 main.star          | 49 ++++++++++++++++++++++--------------
 2 files changed, 64 insertions(+), 47 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 977dfd1f9647..3496cc43374c 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -34,7 +34,7 @@ buckets {
         name: "dart/forward_branch"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -60,7 +60,7 @@ buckets {
         name: "dart/cbuild"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -86,7 +86,7 @@ buckets {
         name: "dart/chocolatey"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -111,7 +111,7 @@ buckets {
         name: "dart/package_co19"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -136,7 +136,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true,\"timeout\":4800}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -161,7 +161,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true,\"timeout\":4800}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -186,7 +186,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true,\"timeout\":4800}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -211,7 +211,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true,\"timeout\":4800}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -236,7 +236,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -261,7 +261,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -286,7 +286,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -311,7 +311,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -336,7 +336,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -361,7 +361,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -386,7 +386,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -411,7 +411,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -436,7 +436,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -461,7 +461,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -486,7 +486,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -511,7 +511,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -536,7 +536,7 @@ buckets {
         name: "dart/docker"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -561,7 +561,7 @@ buckets {
         name: "dart/linearize"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -587,7 +587,7 @@ buckets {
         name: "roller/lkgr"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "builders:[{\"bucket\":\"ci\",\"builder\":\"dart-sdk-linux\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-mac\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-win\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"debianpackage-linux\",\"project\":\"dart\"},{\"bucket\":\"ci.sandbox\",\"builder\":\"google\",\"project\":\"dart\"}]"
@@ -615,7 +615,7 @@ buckets {
         name: "cron/cron"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "builders:[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"vm-kernel-nnbd-linux-debug-ia32\",\"vm-kernel-nnbd-linux-release-ia32\",\"vm-kernel-nnbd-linux-release-simarm\",\"vm-kernel-nnbd-linux-release-simarm64\",\"vm-kernel-nnbd-mac-debug-x64\",\"vm-kernel-nnbd-mac-release-x64\",\"vm-kernel-nnbd-win-release-ia32\",\"vm-kernel-nnbd-win-debug-x64\",\"vm-kernel-nnbd-win-release-x64\",\"vm-kernel-precomp-nnbd-linux-debug-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-debug-x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm64\",\"vm-kernel-precomp-nnbd-mac-release-simarm64\",\"vm-kernel-precomp-nnbd-win-release-x64\",\"app-kernel-linux-product-x64\",\"vm-kernel-linux-release-ia32\",\"vm-kernel-linux-debug-ia32\",\"vm-kernel-win-debug-ia32\",\"vm-kernel-win-release-ia32\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-linux-product-x64\",\"vm-kernel-mac-product-x64\",\"vm-kernel-win-product-x64\",\"vm-kernel-optcounter-threshold-linux-release-ia32\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\",\"vm-kernel-reload-linux-debug-x64\",\"vm-kernel-reload-linux-release-x64\",\"vm-kernel-reload-rollback-linux-debug-x64\",\"vm-kernel-reload-rollback-linux-release-x64\",\"analyzer-nnbd-mac-release\",\"analyzer-nnbd-win-release\"]"
@@ -641,7 +641,7 @@ buckets {
         name: "recipe_bundler"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
         cipd_version: "git_revision:40621e908eb88bd10451ee9d013b7ef89ea91e37"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -671,7 +671,7 @@ buckets {
         name: "recipe_autoroller"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
         cipd_version: "git_revision:905c1df843d7771bf3adc0cf21f58eb9498ff063"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -700,7 +700,7 @@ buckets {
         name: "cron/cron"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "builders:[\"frontend-weekly\"]"
@@ -750,7 +750,7 @@ buckets {
         name: "roller/roll_to_dev"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -7712,6 +7712,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
@@ -7963,6 +7964,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
@@ -8659,6 +8661,7 @@ buckets {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$dart/build:{\"disable_goma\":true,\"timeout\":4800}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -9755,6 +9758,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:\"true\""
@@ -10912,6 +10916,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
@@ -11088,6 +11093,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
diff --git a/main.star b/main.star
index 34265c56de7c..f1d84c9a77fd 100755
--- a/main.star
+++ b/main.star
@@ -405,26 +405,32 @@ def dart_recipe(name):
         cipd_package = "dart/recipe_bundles/dart.googlesource.com/recipes",
     )
 
-def with_goma_rbe(goma_rbe, channel, dimensions, properties):
-    """Sets the $build/goma property when goma on RBE is used.
+def with_goma(goma, channel, dimensions, properties):
+    """Decorates the properties to setup goma.
+
+       Adds the $build/goma property when goma is used and disables goma via
+       the $dart/build property if not.
 
     Args:
-        goma_rbe: Opt-in (True), opt-out (False) or default (None).
+        goma: Opt-in (True), opt-out (False) or default (None).
         channel: The channel of the builder.
         dimensions: The dimensions of the builder.
         properties: The properties object to set $build/goma on (if opted-in).
 
     Returns:
-        A copy of the properties with GOMA on RBE properties set if applicable.
+        A copy of the properties with goma related properties set if applicable.
     """
-    if goma_rbe in (None, True):
+    updated_properties = dict(properties)
+    if goma in (None, True):
         goma_properties = {}
         goma_properties.update(GOMA_RBE)
         goma_properties["enable_ats"] = dimensions["os"] != "Mac"
-        updated_properties = dict(properties)
         updated_properties.setdefault("$build/goma", goma_properties)
-        return updated_properties
-    return properties
+    else:
+        updated_properties = dict(properties)
+        updated_properties.setdefault("$dart/build", {})
+        updated_properties["$dart/build"].setdefault("disable_goma", True)
+    return updated_properties
 
 def dart_try_builder(
         name,
@@ -433,7 +439,7 @@ def dart_try_builder(
         dimensions = None,
         execution_timeout = None,
         experiment_percentage = None,
-        goma_rbe = None,
+        goma = None,
         location_regexp = None,
         properties = None,
         on_cq = False):
@@ -446,7 +452,7 @@ def dart_try_builder(
         dimensions: Extra swarming dimensions required by this builder.
         execution_timeout: Time to allow for the build to run.
         experiment_percentage: What experiment percentage to use.
-        goma_rbe: Whether to use goma on RBE or not.
+        goma: Whether to use goma or not.
         location_regexp: Locations that trigger this tryjob.
         properties: Extra properties to set for builds.
         on_cq: Whether the build is added to the default set of CQ tryjobs.
@@ -456,7 +462,7 @@ def dart_try_builder(
     dimensions = defaults.dimensions(dimensions)
     dimensions["pool"] = "luci.dart.try"
     properties = defaults.properties(properties)
-    builder_properties = with_goma_rbe(goma_rbe, "try", dimensions, properties)
+    builder_properties = with_goma(goma, "try", dimensions, properties)
     builder = name + "-try"
 
     luci.builder(
@@ -508,7 +514,7 @@ def dart_builder(
         executable = None,
         execution_timeout = None,
         expiration_timeout = None,
-        goma_rbe = None,
+        goma = None,
         fyi = False,
         notifies = "dart",
         priority = NORMAL,
@@ -535,7 +541,7 @@ def dart_builder(
         executable: The Luci executable to use.
         execution_timeout: Time to allow for the build to run.
         expiration_timeout: How long builds should wait for a bot to run on.
-        goma_rbe: Whether to use goma on RBE or not.
+        goma: Whether to use goma or not.
         fyi: Whether this is an FYI builder or not.
         notifies: Which luci notifier group to notify (default: "dart").
         priority: What swarming priority this builder gets (default: NORMAL).
@@ -573,12 +579,12 @@ def dart_builder(
                 on_cq = on_cq,
                 execution_timeout = execution_timeout,
                 experiment_percentage = experiment_percentage,
-                goma_rbe = goma_rbe,
+                goma = goma,
                 location_regexp = location_regexp,
             )
         else:
-            builder_properties = with_goma_rbe(
-                goma_rbe,
+            builder_properties = with_goma(
+                goma if service_account == TRY_ACCOUNT else False,
                 channel,
                 dimensions,
                 properties,
@@ -1127,7 +1133,7 @@ dart_vm_sanitizer_builder(
 dart_vm_sanitizer_builder(
     "vm-kernel-ubsan-linux-release-x64",
     category = "vm|misc|u",
-    goma_rbe = False,
+    goma = False,
 )  # ubsan is not compatible with our sysroot.
 dart_vm_sanitizer_builder(
     "vm-kernel-precomp-asan-linux-release-x64",
@@ -1144,7 +1150,7 @@ dart_vm_sanitizer_builder(
 dart_vm_sanitizer_builder(
     "vm-kernel-precomp-ubsan-linux-release-x64",
     category = "vm|misc|aot|u",
-    goma_rbe = False,
+    goma = False,
 )  # ubsan is not compatible with our sysroot.
 nightly_builder(
     "vm-kernel-reload-linux-debug-x64",
@@ -1338,6 +1344,11 @@ dart_ci_builder(
     category = "sdk|l",
     channels = CHANNELS,
     lkgr = True,
+    properties = {
+        "$dart/build": {
+            "timeout": 80 * 60,  # 80 minutes,
+        },
+    },
 )
 dart_ci_builder(
     "dart-sdk-mac",
@@ -1494,7 +1505,7 @@ dart_ci_sandbox_builder(
 dart_try_builder("benchmark-linux", on_cq = True)
 
 # Our sysroot does not support gcc, we can't use goma on RBE for this builder
-dart_try_builder("vm-kernel-gcc-linux", goma_rbe = False)
+dart_try_builder("vm-kernel-gcc-linux", goma = False)
 dart_try_builder(
     "presubmit",
     bucket = "try.shared",

From ebd5e615f0fc03a16dd9bdf56e39fe503689bb41 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Tue, 2 Feb 2021 12:37:16 +0000
Subject: [PATCH 440/826] [infra/config] Disable clobber on the Debian package
 builder

A permissions problem on the Docker build of Debian packages
means that our default clobber fails.

Change-Id: I70bcfe81fe2362b17c72c5ef5596c7291932f1ad
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/182266
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 884 ++++++++++++++++++++++-----------------------
 defaults.star      |   2 +-
 main.star          |   5 +-
 3 files changed, 447 insertions(+), 444 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 3496cc43374c..2e95b2beec14 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -37,7 +37,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       execution_timeout_secs: 900
@@ -63,7 +63,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       execution_timeout_secs: 600
@@ -89,7 +89,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -114,7 +114,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -139,7 +139,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true,\"timeout\":4800}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -164,7 +164,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true,\"timeout\":4800}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -189,7 +189,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true,\"timeout\":4800}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -214,7 +214,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true,\"timeout\":4800}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -239,7 +239,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -264,7 +264,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -289,7 +289,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -314,7 +314,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -339,7 +339,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -364,7 +364,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -389,7 +389,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -414,7 +414,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -439,7 +439,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:false"
       }
       priority: 50
       caches {
@@ -464,7 +464,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:false"
       }
       priority: 50
       caches {
@@ -489,7 +489,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:false"
       }
       priority: 50
       caches {
@@ -514,7 +514,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:false"
       }
       priority: 50
       caches {
@@ -539,7 +539,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -564,7 +564,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "repo:\"https://dart.googlesource.com/linear_sdk_flutter_engine.git\""
       }
       priority: 50
@@ -591,7 +591,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "builders:[{\"bucket\":\"ci\",\"builder\":\"dart-sdk-linux\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-mac\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-win\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"debianpackage-linux\",\"project\":\"dart\"},{\"bucket\":\"ci.sandbox\",\"builder\":\"google\",\"project\":\"dart\"}]"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "ref:\"refs/heads/lkgr\""
       }
       priority: 50
@@ -619,7 +619,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "builders:[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"vm-kernel-nnbd-linux-debug-ia32\",\"vm-kernel-nnbd-linux-release-ia32\",\"vm-kernel-nnbd-linux-release-simarm\",\"vm-kernel-nnbd-linux-release-simarm64\",\"vm-kernel-nnbd-mac-debug-x64\",\"vm-kernel-nnbd-mac-release-x64\",\"vm-kernel-nnbd-win-release-ia32\",\"vm-kernel-nnbd-win-debug-x64\",\"vm-kernel-nnbd-win-release-x64\",\"vm-kernel-precomp-nnbd-linux-debug-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-debug-x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm64\",\"vm-kernel-precomp-nnbd-mac-release-simarm64\",\"vm-kernel-precomp-nnbd-win-release-x64\",\"app-kernel-linux-product-x64\",\"vm-kernel-linux-release-ia32\",\"vm-kernel-linux-debug-ia32\",\"vm-kernel-win-debug-ia32\",\"vm-kernel-win-release-ia32\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-linux-product-x64\",\"vm-kernel-mac-product-x64\",\"vm-kernel-win-product-x64\",\"vm-kernel-optcounter-threshold-linux-release-ia32\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\",\"vm-kernel-reload-linux-debug-x64\",\"vm-kernel-reload-linux-release-x64\",\"vm-kernel-reload-rollback-linux-debug-x64\",\"vm-kernel-reload-rollback-linux-release-x64\",\"analyzer-nnbd-mac-release\",\"analyzer-nnbd-win-release\"]"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -644,7 +644,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "package_name_internal_prefix:\"dart_internal/recipe_bundles\""
         properties_j: "package_name_prefix:\"dart/recipe_bundles\""
         properties_j: "recipe_bundler_vers:\"git_revision:2ed88b2c854578b512e1c0486824175fe0d7aab6\""
@@ -674,7 +674,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "db_gcs_bucket:\"dart-recipe-roller-db\""
         properties_j: "projects:[[\"dart\",\"https://dart.googlesource.com/recipes\"]]"
       }
@@ -704,7 +704,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "builders:[\"frontend-weekly\"]"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -753,7 +753,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "from_ref:\"refs/heads/lkgr\""
       }
       priority: 50
@@ -804,7 +804,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -829,7 +829,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -854,7 +854,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -879,7 +879,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -904,7 +904,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -929,7 +929,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -954,7 +954,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -979,7 +979,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -1004,7 +1004,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -1029,7 +1029,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -1054,7 +1054,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -1079,7 +1079,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -1104,7 +1104,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -1129,7 +1129,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -1154,7 +1154,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -1179,7 +1179,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -1204,7 +1204,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -1229,7 +1229,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -1254,7 +1254,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -1279,7 +1279,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -1304,7 +1304,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -1329,7 +1329,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -1354,7 +1354,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -1379,7 +1379,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -1404,7 +1404,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -1429,7 +1429,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -1454,7 +1454,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -1479,7 +1479,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -1504,7 +1504,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -1529,7 +1529,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -1554,7 +1554,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -1580,7 +1580,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -1605,7 +1605,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "shard_timeout:5400"
       }
       priority: 50
@@ -1631,7 +1631,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "shard_timeout:5400"
       }
       priority: 70
@@ -1657,7 +1657,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -1683,7 +1683,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -1709,7 +1709,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -1735,7 +1735,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -1761,7 +1761,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -1786,7 +1786,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -1811,7 +1811,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -1836,7 +1836,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -1861,7 +1861,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -1887,7 +1887,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -1913,7 +1913,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -1939,7 +1939,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -1965,7 +1965,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -1990,7 +1990,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -2015,7 +2015,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -2040,7 +2040,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -2065,7 +2065,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -2091,7 +2091,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -2117,7 +2117,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -2143,7 +2143,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -2169,7 +2169,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_firefox\":true}"
       }
       priority: 50
@@ -2195,7 +2195,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_firefox\":true}"
       }
       priority: 50
@@ -2221,7 +2221,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_firefox\":true}"
       }
       priority: 50
@@ -2247,7 +2247,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_firefox\":true}"
       }
       priority: 50
@@ -2273,7 +2273,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -2299,7 +2299,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -2325,7 +2325,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -2351,7 +2351,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -2377,7 +2377,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -2402,7 +2402,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -2427,7 +2427,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -2452,7 +2452,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -2477,7 +2477,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -2503,7 +2503,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -2529,7 +2529,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -2555,7 +2555,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -2581,7 +2581,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_firefox\":true}"
       }
       priority: 50
@@ -2607,7 +2607,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -2632,7 +2632,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -2657,7 +2657,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -2682,7 +2682,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -2707,7 +2707,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -2733,7 +2733,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -2759,7 +2759,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -2785,7 +2785,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -2811,7 +2811,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -2837,7 +2837,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -2863,7 +2863,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -2889,7 +2889,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -2915,7 +2915,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -2941,7 +2941,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -2967,7 +2967,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -2993,7 +2993,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -3019,7 +3019,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -3045,7 +3045,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_firefox\":true}"
       }
       priority: 50
@@ -3071,7 +3071,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_firefox\":true}"
       }
       priority: 50
@@ -3097,7 +3097,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_firefox\":true}"
       }
       priority: 50
@@ -3123,7 +3123,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_firefox\":true}"
       }
       priority: 50
@@ -3149,7 +3149,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -3175,7 +3175,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "flutter_test_suites:[\"add_to_app_life_cycle_tests\",\"framework_coverage\",\"framework_tests\",\"tool_coverage\",\"tool_tests\"]"
       }
       priority: 50
@@ -3203,7 +3203,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "flutter_test_suites:[\"web_tests\",\"web_tool_tests\"]"
       }
       priority: 50
@@ -3230,7 +3230,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -3255,7 +3255,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -3280,7 +3280,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -3305,7 +3305,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -3330,7 +3330,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -3355,7 +3355,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -3380,7 +3380,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -3405,7 +3405,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -3430,7 +3430,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -3455,7 +3455,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -3480,7 +3480,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -3505,7 +3505,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -3530,7 +3530,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -3555,7 +3555,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -3580,7 +3580,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -3605,7 +3605,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -3630,7 +3630,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -3655,7 +3655,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -3680,7 +3680,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -3705,7 +3705,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       execution_timeout_secs: 43200
@@ -3731,7 +3731,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -3756,7 +3756,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -3781,7 +3781,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -3806,7 +3806,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -3831,7 +3831,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -3856,7 +3856,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       execution_timeout_secs: 300
@@ -3882,7 +3882,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -3908,7 +3908,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -3934,7 +3934,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -3960,7 +3960,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -3986,7 +3986,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -4012,7 +4012,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -4038,7 +4038,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -4064,7 +4064,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -4090,7 +4090,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -4116,7 +4116,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -4142,7 +4142,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -4168,7 +4168,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -4194,7 +4194,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 50
@@ -4220,7 +4220,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4245,7 +4245,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4270,7 +4270,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4295,7 +4295,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4320,7 +4320,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4345,7 +4345,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4370,7 +4370,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4395,7 +4395,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4420,7 +4420,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4445,7 +4445,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4470,7 +4470,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4495,7 +4495,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4520,7 +4520,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4545,7 +4545,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4570,7 +4570,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4595,7 +4595,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4620,7 +4620,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4645,7 +4645,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4670,7 +4670,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4695,7 +4695,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4720,7 +4720,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4745,7 +4745,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4770,7 +4770,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4795,7 +4795,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4820,7 +4820,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4845,7 +4845,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4870,7 +4870,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4895,7 +4895,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4920,7 +4920,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       expiration_secs: 86400
@@ -4947,7 +4947,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -4972,7 +4972,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -4997,7 +4997,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5022,7 +5022,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5047,7 +5047,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5072,7 +5072,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -5097,7 +5097,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5122,7 +5122,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5147,7 +5147,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5172,7 +5172,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5197,7 +5197,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -5222,7 +5222,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -5247,7 +5247,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5272,7 +5272,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5297,7 +5297,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5322,7 +5322,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5347,7 +5347,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5372,7 +5372,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5397,7 +5397,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5422,7 +5422,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5447,7 +5447,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5472,7 +5472,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5497,7 +5497,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5522,7 +5522,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5547,7 +5547,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5572,7 +5572,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5597,7 +5597,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5622,7 +5622,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5647,7 +5647,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -5672,7 +5672,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5697,7 +5697,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5722,7 +5722,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5747,7 +5747,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5773,7 +5773,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -5798,7 +5798,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -5823,7 +5823,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5848,7 +5848,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5873,7 +5873,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5898,7 +5898,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -5923,7 +5923,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -5948,7 +5948,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -5973,7 +5973,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -5998,7 +5998,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -6023,7 +6023,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -6048,7 +6048,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -6073,7 +6073,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -6098,7 +6098,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -6123,7 +6123,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -6148,7 +6148,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -6173,7 +6173,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -6198,7 +6198,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -6223,7 +6223,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -6248,7 +6248,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       expiration_secs: 86400
@@ -6274,7 +6274,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "shard_timeout:5400"
       }
       priority: 50
@@ -6300,7 +6300,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "shard_timeout:5400"
       }
       priority: 50
@@ -6326,7 +6326,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "shard_timeout:5400"
       }
       priority: 50
@@ -6352,7 +6352,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "shard_timeout:5400"
       }
       priority: 50
@@ -6378,7 +6378,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "shard_timeout:5400"
       }
       priority: 50
@@ -6404,7 +6404,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "shard_timeout:5400"
       }
       priority: 50
@@ -6430,7 +6430,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "shard_timeout:5400"
       }
       priority: 50
@@ -6456,7 +6456,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "shard_timeout:5400"
       }
       priority: 50
@@ -6483,7 +6483,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -6508,7 +6508,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "shard_timeout:5400"
       }
       priority: 50
@@ -6534,7 +6534,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "shard_timeout:5400"
       }
       priority: 50
@@ -6560,7 +6560,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "shard_timeout:5400"
       }
       priority: 50
@@ -6586,7 +6586,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "shard_timeout:5400"
       }
       priority: 50
@@ -6612,7 +6612,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -6637,7 +6637,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -6662,7 +6662,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -6687,7 +6687,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -6712,7 +6712,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -6737,7 +6737,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -6762,7 +6762,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -6787,7 +6787,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -6812,7 +6812,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -6837,7 +6837,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -6862,7 +6862,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -6887,7 +6887,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -6912,7 +6912,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -6937,7 +6937,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -6962,7 +6962,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -6987,7 +6987,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -7012,7 +7012,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -7037,7 +7037,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -7062,7 +7062,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -7087,7 +7087,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -7112,7 +7112,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -7137,7 +7137,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -7162,7 +7162,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -7187,7 +7187,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -7212,7 +7212,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -7237,7 +7237,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -7262,7 +7262,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -7287,7 +7287,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -7313,7 +7313,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -7338,7 +7338,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -7363,7 +7363,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "shard_timeout:5400"
       }
       priority: 70
@@ -7389,7 +7389,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -7414,7 +7414,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -7439,7 +7439,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -7464,7 +7464,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -7489,7 +7489,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -7514,7 +7514,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -7539,7 +7539,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -7564,7 +7564,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -7589,7 +7589,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -7614,7 +7614,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -7639,7 +7639,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -7664,7 +7664,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -7690,7 +7690,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -7716,7 +7716,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -7741,7 +7741,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -7766,7 +7766,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -7791,7 +7791,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -7816,7 +7816,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -7841,7 +7841,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -7866,7 +7866,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -7891,7 +7891,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -7916,7 +7916,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -7942,7 +7942,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -7968,7 +7968,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -7993,7 +7993,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -8018,7 +8018,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -8043,7 +8043,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -8068,7 +8068,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -8093,7 +8093,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -8118,7 +8118,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -8143,7 +8143,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 70
       caches {
@@ -8168,7 +8168,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -8193,7 +8193,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -8218,7 +8218,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -8243,7 +8243,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -8268,7 +8268,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -8293,7 +8293,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -8318,7 +8318,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -8343,7 +8343,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 50
       caches {
@@ -8388,7 +8388,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -8413,7 +8413,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -8438,7 +8438,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -8463,7 +8463,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -8488,7 +8488,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -8513,7 +8513,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -8538,7 +8538,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -8563,7 +8563,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -8588,7 +8588,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -8613,7 +8613,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -8638,7 +8638,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -8664,7 +8664,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true,\"timeout\":4800}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -8689,7 +8689,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -8714,7 +8714,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -8739,7 +8739,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
@@ -8765,7 +8765,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -8790,7 +8790,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
@@ -8816,7 +8816,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -8841,7 +8841,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
@@ -8867,7 +8867,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_firefox\":true}"
       }
       priority: 30
@@ -8893,7 +8893,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
@@ -8919,7 +8919,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -8944,7 +8944,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
@@ -8970,7 +8970,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -8995,7 +8995,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
@@ -9021,7 +9021,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
@@ -9047,7 +9047,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
@@ -9073,7 +9073,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
@@ -9099,7 +9099,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_firefox\":true}"
       }
       priority: 30
@@ -9125,7 +9125,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9151,7 +9151,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "flutter_test_suites:[\"add_to_app_life_cycle_tests\",\"framework_coverage\",\"framework_tests\",\"tool_coverage\",\"tool_tests\"]"
       }
       priority: 30
@@ -9179,7 +9179,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "flutter_test_suites:[\"web_tests\",\"web_tool_tests\"]"
       }
       priority: 30
@@ -9206,7 +9206,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9231,7 +9231,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9256,7 +9256,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9281,7 +9281,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9306,7 +9306,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9331,7 +9331,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9356,7 +9356,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9381,7 +9381,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9406,7 +9406,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
@@ -9432,7 +9432,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
@@ -9458,7 +9458,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
@@ -9484,7 +9484,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "custom_vars:{\"download_chrome\":true}"
       }
       priority: 30
@@ -9510,7 +9510,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9535,7 +9535,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9560,7 +9560,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9585,7 +9585,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9610,7 +9610,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9635,7 +9635,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9660,7 +9660,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9685,7 +9685,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9711,7 +9711,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9736,7 +9736,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9761,7 +9761,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9786,7 +9786,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9811,7 +9811,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9836,7 +9836,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9861,7 +9861,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9886,7 +9886,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9911,7 +9911,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9936,7 +9936,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9961,7 +9961,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -9986,7 +9986,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10011,7 +10011,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10037,7 +10037,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10062,7 +10062,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10087,7 +10087,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10112,7 +10112,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10137,7 +10137,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10162,7 +10162,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10187,7 +10187,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10212,7 +10212,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10237,7 +10237,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10262,7 +10262,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10287,7 +10287,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10312,7 +10312,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10337,7 +10337,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10362,7 +10362,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10387,7 +10387,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "shard_timeout:5400"
       }
       priority: 30
@@ -10413,7 +10413,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "shard_timeout:5400"
       }
       priority: 30
@@ -10440,7 +10440,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10465,7 +10465,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "shard_timeout:5400"
       }
       priority: 30
@@ -10491,7 +10491,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10516,7 +10516,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10541,7 +10541,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10566,7 +10566,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10591,7 +10591,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10616,7 +10616,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10641,7 +10641,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10667,7 +10667,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10692,7 +10692,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10717,7 +10717,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
         properties_j: "shard_timeout:5400"
       }
       priority: 30
@@ -10743,7 +10743,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10768,7 +10768,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10793,7 +10793,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10818,7 +10818,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10843,7 +10843,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10868,7 +10868,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10894,7 +10894,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10920,7 +10920,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10945,7 +10945,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10970,7 +10970,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -10995,7 +10995,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -11020,7 +11020,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -11045,7 +11045,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -11071,7 +11071,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -11097,7 +11097,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -11122,7 +11122,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -11147,7 +11147,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -11172,7 +11172,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -11197,7 +11197,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -11222,7 +11222,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -11247,7 +11247,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       caches {
@@ -11292,7 +11292,7 @@ buckets {
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:\"true\""
+        properties_j: "clobber:true"
       }
       priority: 30
       execution_timeout_secs: 600
diff --git a/defaults.star b/defaults.star
index 82c328f7f010..d1e5b0ff7ba1 100644
--- a/defaults.star
+++ b/defaults.star
@@ -5,7 +5,7 @@
 Defaults for properties and dimensions used in main.star.
 """
 
-_PROPERTIES = {"clobber": "true"}
+_PROPERTIES = {"clobber": True}
 _DIMENSIONS = {
     "cpu": "x86-64",
     "host_class": "default",
diff --git a/main.star b/main.star
index f1d84c9a77fd..61e38171a052 100755
--- a/main.star
+++ b/main.star
@@ -1404,8 +1404,11 @@ dart_ci_builder(
     "debianpackage-linux",
     category = "misc|dp",
     channels = RELEASE_CHANNELS,
-    notifies = "infra",
     lkgr = True,
+    notifies = "infra",
+    properties = {
+        "clobber": False,
+    },
 )
 
 # external

From 914933e8d0a618b1b12dfb5123265cdb2b7b32cf Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 4 Feb 2021 13:31:27 +0000
Subject: [PATCH 441/826] [infra] Remove obsolete tool_coverage shard

Change-Id: I07f7b6798a65066c9183aa7a164e9537fd081316
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/182628
Auto-Submit: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 4 ++--
 main.star          | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 2e95b2beec14..a7c1612db27a 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -3176,7 +3176,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
         properties_j: "clobber:true"
-        properties_j: "flutter_test_suites:[\"add_to_app_life_cycle_tests\",\"framework_coverage\",\"framework_tests\",\"tool_coverage\",\"tool_tests\"]"
+        properties_j: "flutter_test_suites:[\"add_to_app_life_cycle_tests\",\"framework_coverage\",\"framework_tests\",\"tool_tests\"]"
       }
       priority: 50
       execution_timeout_secs: 28800
@@ -9152,7 +9152,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
         properties_j: "clobber:true"
-        properties_j: "flutter_test_suites:[\"add_to_app_life_cycle_tests\",\"framework_coverage\",\"framework_tests\",\"tool_coverage\",\"tool_tests\"]"
+        properties_j: "flutter_test_suites:[\"add_to_app_life_cycle_tests\",\"framework_coverage\",\"framework_tests\",\"tool_tests\"]"
       }
       priority: 30
       execution_timeout_secs: 28800
diff --git a/main.star b/main.star
index 61e38171a052..bec373183705 100755
--- a/main.star
+++ b/main.star
@@ -804,7 +804,6 @@ dart_ci_sandbox_builder(
             "add_to_app_life_cycle_tests",
             "framework_coverage",
             "framework_tests",
-            "tool_coverage",
             "tool_tests",
         ],
     },

From 1c252c196c885eb4b7fec39d414c6906ad994d34 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Fri, 5 Feb 2021 17:47:43 +0000
Subject: [PATCH 442/826] [infra] Add nightly builders for compressed pointers.

Change-Id: I9a2caf2bbbc80b568e57a5471744375f9fd3fc49
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/182880
Reviewed-by: Liam Appelbe <liama@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 commit-queue.cfg   |  16 ++++
 cr-buildbucket.cfg | 202 ++++++++++++++++++++++++++++++++++++++++++++-
 luci-milo.cfg      |  52 ++++++++++++
 luci-notify.cfg    |  52 ++++++++++++
 luci-scheduler.cfg |  40 +++++++++
 main.star          |  20 +++++
 6 files changed, 381 insertions(+), 1 deletion(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 13a67d41b92f..66954012e506 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -442,10 +442,18 @@ config_groups {
         name: "dart/try/vm-kernel-linux-debug-ia32-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-linux-debug-simarm64c-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-linux-debug-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-linux-debug-x64c-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-linux-product-x64-try"
         includable_only: true
@@ -567,6 +575,10 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-asan-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-debug-simarm64c-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-precomp-linux-debug-simarm_x64-try"
         includable_only: true
@@ -575,6 +587,10 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-debug-x64c-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-precomp-linux-product-x64-try"
         includable_only: true
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index a7c1612db27a..ebbcf767de40 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -618,7 +618,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "builders:[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"vm-kernel-nnbd-linux-debug-ia32\",\"vm-kernel-nnbd-linux-release-ia32\",\"vm-kernel-nnbd-linux-release-simarm\",\"vm-kernel-nnbd-linux-release-simarm64\",\"vm-kernel-nnbd-mac-debug-x64\",\"vm-kernel-nnbd-mac-release-x64\",\"vm-kernel-nnbd-win-release-ia32\",\"vm-kernel-nnbd-win-debug-x64\",\"vm-kernel-nnbd-win-release-x64\",\"vm-kernel-precomp-nnbd-linux-debug-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-debug-x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm64\",\"vm-kernel-precomp-nnbd-mac-release-simarm64\",\"vm-kernel-precomp-nnbd-win-release-x64\",\"app-kernel-linux-product-x64\",\"vm-kernel-linux-release-ia32\",\"vm-kernel-linux-debug-ia32\",\"vm-kernel-win-debug-ia32\",\"vm-kernel-win-release-ia32\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-linux-product-x64\",\"vm-kernel-mac-product-x64\",\"vm-kernel-win-product-x64\",\"vm-kernel-optcounter-threshold-linux-release-ia32\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\",\"vm-kernel-reload-linux-debug-x64\",\"vm-kernel-reload-linux-release-x64\",\"vm-kernel-reload-rollback-linux-debug-x64\",\"vm-kernel-reload-rollback-linux-release-x64\",\"analyzer-nnbd-mac-release\",\"analyzer-nnbd-win-release\"]"
+        properties_j: "builders:[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"vm-kernel-nnbd-linux-debug-ia32\",\"vm-kernel-nnbd-linux-release-ia32\",\"vm-kernel-nnbd-linux-release-simarm\",\"vm-kernel-nnbd-linux-release-simarm64\",\"vm-kernel-nnbd-mac-debug-x64\",\"vm-kernel-nnbd-mac-release-x64\",\"vm-kernel-nnbd-win-release-ia32\",\"vm-kernel-nnbd-win-debug-x64\",\"vm-kernel-nnbd-win-release-x64\",\"vm-kernel-precomp-nnbd-linux-debug-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-debug-x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm64\",\"vm-kernel-precomp-nnbd-mac-release-simarm64\",\"vm-kernel-precomp-nnbd-win-release-x64\",\"app-kernel-linux-product-x64\",\"vm-kernel-linux-release-ia32\",\"vm-kernel-linux-debug-ia32\",\"vm-kernel-win-debug-ia32\",\"vm-kernel-win-release-ia32\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-linux-product-x64\",\"vm-kernel-mac-product-x64\",\"vm-kernel-win-product-x64\",\"vm-kernel-optcounter-threshold-linux-release-ia32\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\",\"vm-kernel-reload-linux-debug-x64\",\"vm-kernel-reload-linux-release-x64\",\"vm-kernel-reload-rollback-linux-debug-x64\",\"vm-kernel-reload-rollback-linux-release-x64\",\"vm-kernel-linux-debug-x64c\",\"vm-kernel-linux-debug-simarm64c\",\"vm-kernel-precomp-linux-debug-x64c\",\"vm-kernel-precomp-linux-debug-simarm64c\",\"analyzer-nnbd-mac-release\",\"analyzer-nnbd-win-release\"]"
         properties_j: "clobber:true"
       }
       priority: 50
@@ -5082,6 +5082,31 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
+    builders {
+      name: "vm-kernel-linux-debug-simarm64c"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:true"
+      }
+      priority: 70
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
     builders {
       name: "vm-kernel-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -5182,6 +5207,31 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
+    builders {
+      name: "vm-kernel-linux-debug-x64c"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:true"
+      }
+      priority: 70
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
     builders {
       name: "vm-kernel-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -6493,6 +6543,31 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
+    builders {
+      name: "vm-kernel-precomp-linux-debug-simarm64c"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:true"
+      }
+      priority: 70
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
     builders {
       name: "vm-kernel-precomp-linux-debug-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -6697,6 +6772,31 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
+    builders {
+      name: "vm-kernel-precomp-linux-debug-x64c"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:true"
+      }
+      priority: 70
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
     builders {
       name: "vm-kernel-precomp-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -9796,6 +9896,31 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
+    builders {
+      name: "vm-kernel-linux-debug-simarm64c-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:true"
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
     builders {
       name: "vm-kernel-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -9821,6 +9946,31 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
+    builders {
+      name: "vm-kernel-linux-debug-x64c-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:true"
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
     builders {
       name: "vm-kernel-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10450,6 +10600,31 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
+    builders {
+      name: "vm-kernel-precomp-linux-debug-simarm64c-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:true"
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
     builders {
       name: "vm-kernel-precomp-linux-debug-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10501,6 +10676,31 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
     }
+    builders {
+      name: "vm-kernel-precomp-linux-debug-x64c-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:true"
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+    }
     builders {
       name: "vm-kernel-precomp-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 4928b429ed5a..9d1d1d5d08b1 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -385,6 +385,26 @@ consoles {
     category: "vm|misc|reload"
     short_name: "rrb"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "ji"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simarm64c"
+    category: "vm|misc|compressed"
+    short_name: "ja"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "ai"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm64c"
+    category: "vm|misc|compressed"
+    short_name: "aa"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-fuchsia-release-x64"
     category: "vm|misc"
@@ -1187,6 +1207,26 @@ consoles {
     category: "vm|misc|reload"
     short_name: "rrb"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "ji"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simarm64c"
+    category: "vm|misc|compressed"
+    short_name: "ja"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "ai"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm64c"
+    category: "vm|misc|compressed"
+    short_name: "aa"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-fuchsia-release-x64"
     category: "vm|misc"
@@ -2647,6 +2687,18 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-reload-rollback-linux-release-x64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64c-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-simarm64c-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64c-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-simarm64c-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-fuchsia-release-x64-try"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index a42da99a52ee..bda8b143f4d6 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -987,6 +987,19 @@ notifiers {
     name: "vm-kernel-linux-debug-ia32"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-debug-simarm64c"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1001,6 +1014,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-debug-x64c"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1336,6 +1362,19 @@ notifiers {
     name: "vm-kernel-precomp-asan-linux-release-x64"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-linux-debug-simarm64c"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1364,6 +1403,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-linux-debug-x64c"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 5f24309e1a15..add29eec4bf2 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1958,6 +1958,16 @@ job {
     builder: "vm-kernel-linux-debug-ia32"
   }
 }
+job {
+  id: "vm-kernel-linux-debug-simarm64c"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-simarm64c"
+  }
+}
 job {
   id: "vm-kernel-linux-debug-x64"
   schedule: "triggered"
@@ -1998,6 +2008,16 @@ job {
     builder: "vm-kernel-linux-debug-x64-stable"
   }
 }
+job {
+  id: "vm-kernel-linux-debug-x64c"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-x64c"
+  }
+}
 job {
   id: "vm-kernel-linux-product-x64"
   schedule: "triggered"
@@ -2518,6 +2538,16 @@ job {
     builder: "vm-kernel-precomp-asan-linux-release-x64"
   }
 }
+job {
+  id: "vm-kernel-precomp-linux-debug-simarm64c"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-debug-simarm64c"
+  }
+}
 job {
   id: "vm-kernel-precomp-linux-debug-simarm_x64"
   schedule: "triggered"
@@ -2598,6 +2628,16 @@ job {
     builder: "vm-kernel-precomp-linux-debug-x64-stable"
   }
 }
+job {
+  id: "vm-kernel-precomp-linux-debug-x64c"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-debug-x64c"
+  }
+}
 job {
   id: "vm-kernel-precomp-linux-product-x64"
   schedule: "triggered"
diff --git a/main.star b/main.star
index bec373183705..0656cf1c0203 100755
--- a/main.star
+++ b/main.star
@@ -1171,6 +1171,26 @@ nightly_builder(
     category = "vm|misc|reload|rrb",
     channels = ["try"],
 )
+nightly_builder(
+    "vm-kernel-linux-debug-x64c",
+    category = "vm|misc|compressed|ji",
+    channels = ["try"],
+)
+nightly_builder(
+    "vm-kernel-linux-debug-simarm64c",
+    category = "vm|misc|compressed|ja",
+    channels = ["try"],
+)
+nightly_builder(
+    "vm-kernel-precomp-linux-debug-x64c",
+    category = "vm|misc|compressed|ai",
+    channels = ["try"],
+)
+nightly_builder(
+    "vm-kernel-precomp-linux-debug-simarm64c",
+    category = "vm|misc|compressed|aa",
+    channels = ["try"],
+)
 dart_vm_low_priority_builder("vm-fuchsia-release-x64", category = "vm|misc|f")
 
 # vm|ffi

From 011ebd6b199ae843c439ba60da0fea71140dba02 Mon Sep 17 00:00:00 2001
From: Andrii Shyshkalov <tandrii@google.com>
Date: Wed, 17 Feb 2021 13:30:21 +0000
Subject: [PATCH 443/826] Add realm ACLs definitions.

See https://groups.google.com/a/google.com/g/luci-announce/c/v4cpGwAFf4A/m/WU02e0ZvAQAJ

This is roughly a translation of configs in pools.cfg [1] into the new
language. They are not hooked up yet and will be enabled gradually in
later CLs.

Also remove unnecessary luci-scheduler@appspot.gserviceaccount.com ACL
entry. It is implied.

[1]: https://chrome-internal-review.googlesource.com/c/infradata/config/+/3612483/1/configs/chromium-swarm/pools.cfg#1343

Bug: chromium:1170330
Change-Id: I139ffb5d2e61f5b0f3fb2ea139b324d5bf2acc36
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/184784
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg |  12 --
 luci-scheduler.cfg | 340 +++++++++++++++++++++++++++++++++++++++++++++
 main.star          |  67 ++++++++-
 realms.cfg         | 143 +++++++++++++++++++
 4 files changed, 547 insertions(+), 15 deletions(-)
 create mode 100644 realms.cfg

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index ebbcf767de40..b861d3bb23d5 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -13,10 +13,6 @@ buckets {
     role: SCHEDULER
     identity: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
   }
-  acls {
-    role: SCHEDULER
-    identity: "user:luci-scheduler@appspot.gserviceaccount.com"
-  }
   acls {
     role: SCHEDULER
     group: "project-dart-admins"
@@ -725,10 +721,6 @@ buckets {
     role: SCHEDULER
     identity: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
   }
-  acls {
-    role: SCHEDULER
-    identity: "user:luci-scheduler@appspot.gserviceaccount.com"
-  }
   acls {
     role: SCHEDULER
     group: "project-dart-admins"
@@ -780,10 +772,6 @@ buckets {
     role: SCHEDULER
     identity: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
   }
-  acls {
-    role: SCHEDULER
-    identity: "user:luci-scheduler@appspot.gserviceaccount.com"
-  }
   acls {
     role: SCHEDULER
     group: "project-dart-admins"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index add29eec4bf2..a3ba802a5649 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -6,6 +6,7 @@
 
 job {
   id: "analyzer-analysis-server-linux"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -16,6 +17,7 @@ job {
 }
 job {
   id: "analyzer-analysis-server-linux-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -26,6 +28,7 @@ job {
 }
 job {
   id: "analyzer-analysis-server-linux-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -36,6 +39,7 @@ job {
 }
 job {
   id: "analyzer-analysis-server-linux-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -46,6 +50,7 @@ job {
 }
 job {
   id: "analyzer-linux-release"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -56,6 +61,7 @@ job {
 }
 job {
   id: "analyzer-linux-release-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -66,6 +72,7 @@ job {
 }
 job {
   id: "analyzer-linux-release-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -76,6 +83,7 @@ job {
 }
 job {
   id: "analyzer-linux-release-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -86,6 +94,7 @@ job {
 }
 job {
   id: "analyzer-mac-release"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -96,6 +105,7 @@ job {
 }
 job {
   id: "analyzer-mac-release-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -106,6 +116,7 @@ job {
 }
 job {
   id: "analyzer-mac-release-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -116,6 +127,7 @@ job {
 }
 job {
   id: "analyzer-mac-release-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -126,6 +138,7 @@ job {
 }
 job {
   id: "analyzer-nnbd-linux-release"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -136,6 +149,7 @@ job {
 }
 job {
   id: "analyzer-nnbd-linux-release-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -146,6 +160,7 @@ job {
 }
 job {
   id: "analyzer-nnbd-linux-release-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -156,6 +171,7 @@ job {
 }
 job {
   id: "analyzer-nnbd-linux-release-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -166,6 +182,7 @@ job {
 }
 job {
   id: "analyzer-nnbd-mac-release"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -176,6 +193,7 @@ job {
 }
 job {
   id: "analyzer-nnbd-win-release"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -186,6 +204,7 @@ job {
 }
 job {
   id: "analyzer-win-release"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -196,6 +215,7 @@ job {
 }
 job {
   id: "analyzer-win-release-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -206,6 +226,7 @@ job {
 }
 job {
   id: "analyzer-win-release-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -216,6 +237,7 @@ job {
 }
 job {
   id: "analyzer-win-release-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -226,6 +248,7 @@ job {
 }
 job {
   id: "app-kernel-linux-debug-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -236,6 +259,7 @@ job {
 }
 job {
   id: "app-kernel-linux-debug-x64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -246,6 +270,7 @@ job {
 }
 job {
   id: "app-kernel-linux-debug-x64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -256,6 +281,7 @@ job {
 }
 job {
   id: "app-kernel-linux-debug-x64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -266,6 +292,7 @@ job {
 }
 job {
   id: "app-kernel-linux-product-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -276,6 +303,7 @@ job {
 }
 job {
   id: "app-kernel-linux-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -286,6 +314,7 @@ job {
 }
 job {
   id: "app-kernel-linux-release-x64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -296,6 +325,7 @@ job {
 }
 job {
   id: "app-kernel-linux-release-x64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -306,6 +336,7 @@ job {
 }
 job {
   id: "app-kernel-linux-release-x64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -316,6 +347,7 @@ job {
 }
 job {
   id: "base"
+  realm: "ci"
   schedule: "with 15m interval"
   acl_sets: "ci"
   buildbucket {
@@ -326,6 +358,7 @@ job {
 }
 job {
   id: "cbuild"
+  realm: "ci"
   schedule: "with 15m interval"
   acl_sets: "ci"
   buildbucket {
@@ -336,6 +369,7 @@ job {
 }
 job {
   id: "chocolatey"
+  realm: "ci"
   schedule: "triggered"
   acl_sets: "ci"
   buildbucket {
@@ -346,6 +380,7 @@ job {
 }
 job {
   id: "ci-test-data"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -356,6 +391,7 @@ job {
 }
 job {
   id: "co19-roller"
+  realm: "ci"
   schedule: "triggered"
   acl_sets: "ci"
   buildbucket {
@@ -366,6 +402,7 @@ job {
 }
 job {
   id: "cross-vm-linux-release-arm64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -376,6 +413,7 @@ job {
 }
 job {
   id: "cross-vm-precomp-linux-release-arm64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -386,6 +424,7 @@ job {
 }
 job {
   id: "dart-sdk-linux"
+  realm: "ci"
   schedule: "triggered"
   acl_sets: "ci"
   buildbucket {
@@ -396,6 +435,7 @@ job {
 }
 job {
   id: "dart-sdk-linux-beta"
+  realm: "ci"
   schedule: "triggered"
   acl_sets: "ci"
   buildbucket {
@@ -406,6 +446,7 @@ job {
 }
 job {
   id: "dart-sdk-linux-dev"
+  realm: "ci"
   schedule: "triggered"
   acl_sets: "ci"
   buildbucket {
@@ -416,6 +457,7 @@ job {
 }
 job {
   id: "dart-sdk-linux-stable"
+  realm: "ci"
   schedule: "triggered"
   acl_sets: "ci"
   buildbucket {
@@ -426,6 +468,7 @@ job {
 }
 job {
   id: "dart-sdk-mac"
+  realm: "ci"
   schedule: "triggered"
   acl_sets: "ci"
   buildbucket {
@@ -436,6 +479,7 @@ job {
 }
 job {
   id: "dart-sdk-mac-beta"
+  realm: "ci"
   schedule: "triggered"
   acl_sets: "ci"
   buildbucket {
@@ -446,6 +490,7 @@ job {
 }
 job {
   id: "dart-sdk-mac-dev"
+  realm: "ci"
   schedule: "triggered"
   acl_sets: "ci"
   buildbucket {
@@ -456,6 +501,7 @@ job {
 }
 job {
   id: "dart-sdk-mac-stable"
+  realm: "ci"
   schedule: "triggered"
   acl_sets: "ci"
   buildbucket {
@@ -466,6 +512,7 @@ job {
 }
 job {
   id: "dart-sdk-win"
+  realm: "ci"
   schedule: "triggered"
   acl_sets: "ci"
   buildbucket {
@@ -476,6 +523,7 @@ job {
 }
 job {
   id: "dart-sdk-win-beta"
+  realm: "ci"
   schedule: "triggered"
   acl_sets: "ci"
   buildbucket {
@@ -486,6 +534,7 @@ job {
 }
 job {
   id: "dart-sdk-win-dev"
+  realm: "ci"
   schedule: "triggered"
   acl_sets: "ci"
   buildbucket {
@@ -496,6 +545,7 @@ job {
 }
 job {
   id: "dart-sdk-win-stable"
+  realm: "ci"
   schedule: "triggered"
   acl_sets: "ci"
   buildbucket {
@@ -506,6 +556,7 @@ job {
 }
 job {
   id: "dart2js-csp-minified-linux-x64-chrome"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -516,6 +567,7 @@ job {
 }
 job {
   id: "dart2js-csp-minified-linux-x64-chrome-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -526,6 +578,7 @@ job {
 }
 job {
   id: "dart2js-csp-minified-linux-x64-chrome-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -536,6 +589,7 @@ job {
 }
 job {
   id: "dart2js-csp-minified-linux-x64-chrome-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -546,6 +600,7 @@ job {
 }
 job {
   id: "dart2js-minified-strong-linux-x64-d8"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -556,6 +611,7 @@ job {
 }
 job {
   id: "dart2js-minified-strong-linux-x64-d8-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -566,6 +622,7 @@ job {
 }
 job {
   id: "dart2js-minified-strong-linux-x64-d8-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -576,6 +633,7 @@ job {
 }
 job {
   id: "dart2js-minified-strong-linux-x64-d8-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -586,6 +644,7 @@ job {
 }
 job {
   id: "dart2js-nnbd-linux-x64-chrome"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -596,6 +655,7 @@ job {
 }
 job {
   id: "dart2js-nnbd-linux-x64-chrome-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -606,6 +666,7 @@ job {
 }
 job {
   id: "dart2js-nnbd-linux-x64-chrome-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -616,6 +677,7 @@ job {
 }
 job {
   id: "dart2js-nnbd-linux-x64-chrome-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -626,6 +688,7 @@ job {
 }
 job {
   id: "dart2js-strong-hostasserts-linux-ia32-d8"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -636,6 +699,7 @@ job {
 }
 job {
   id: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -646,6 +710,7 @@ job {
 }
 job {
   id: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -656,6 +721,7 @@ job {
 }
 job {
   id: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -666,6 +732,7 @@ job {
 }
 job {
   id: "dart2js-strong-linux-x64-chrome"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -676,6 +743,7 @@ job {
 }
 job {
   id: "dart2js-strong-linux-x64-chrome-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -686,6 +754,7 @@ job {
 }
 job {
   id: "dart2js-strong-linux-x64-chrome-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -696,6 +765,7 @@ job {
 }
 job {
   id: "dart2js-strong-linux-x64-chrome-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -706,6 +776,7 @@ job {
 }
 job {
   id: "dart2js-strong-linux-x64-firefox"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -716,6 +787,7 @@ job {
 }
 job {
   id: "dart2js-strong-linux-x64-firefox-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -726,6 +798,7 @@ job {
 }
 job {
   id: "dart2js-strong-linux-x64-firefox-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -736,6 +809,7 @@ job {
 }
 job {
   id: "dart2js-strong-linux-x64-firefox-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -746,6 +820,7 @@ job {
 }
 job {
   id: "dart2js-strong-mac-x64-chrome"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -756,6 +831,7 @@ job {
 }
 job {
   id: "dart2js-strong-mac-x64-chrome-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -766,6 +842,7 @@ job {
 }
 job {
   id: "dart2js-strong-mac-x64-chrome-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -776,6 +853,7 @@ job {
 }
 job {
   id: "dart2js-strong-mac-x64-chrome-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -786,6 +864,7 @@ job {
 }
 job {
   id: "dart2js-strong-mac-x64-safari"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -796,6 +875,7 @@ job {
 }
 job {
   id: "dart2js-strong-mac-x64-safari-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -806,6 +886,7 @@ job {
 }
 job {
   id: "dart2js-strong-mac-x64-safari-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -816,6 +897,7 @@ job {
 }
 job {
   id: "dart2js-strong-mac-x64-safari-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -826,6 +908,7 @@ job {
 }
 job {
   id: "dart2js-strong-win-x64-chrome"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -836,6 +919,7 @@ job {
 }
 job {
   id: "dart2js-strong-win-x64-chrome-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -846,6 +930,7 @@ job {
 }
 job {
   id: "dart2js-strong-win-x64-chrome-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -856,6 +941,7 @@ job {
 }
 job {
   id: "dart2js-strong-win-x64-chrome-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -866,6 +952,7 @@ job {
 }
 job {
   id: "dart2js-unit-linux-x64-release"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -876,6 +963,7 @@ job {
 }
 job {
   id: "dart2js-unit-linux-x64-release-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -886,6 +974,7 @@ job {
 }
 job {
   id: "dart2js-unit-linux-x64-release-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -896,6 +985,7 @@ job {
 }
 job {
   id: "dart2js-unit-linux-x64-release-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -906,6 +996,7 @@ job {
 }
 job {
   id: "ddc-linux-release-chrome"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -916,6 +1007,7 @@ job {
 }
 job {
   id: "ddc-linux-release-chrome-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -926,6 +1018,7 @@ job {
 }
 job {
   id: "ddc-linux-release-chrome-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -936,6 +1029,7 @@ job {
 }
 job {
   id: "ddc-linux-release-chrome-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -946,6 +1040,7 @@ job {
 }
 job {
   id: "ddc-mac-release-chrome"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -956,6 +1051,7 @@ job {
 }
 job {
   id: "ddc-mac-release-chrome-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -966,6 +1062,7 @@ job {
 }
 job {
   id: "ddc-mac-release-chrome-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -976,6 +1073,7 @@ job {
 }
 job {
   id: "ddc-mac-release-chrome-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -986,6 +1084,7 @@ job {
 }
 job {
   id: "ddc-nnbd-linux-release-chrome"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -996,6 +1095,7 @@ job {
 }
 job {
   id: "ddc-win-release-chrome"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1006,6 +1106,7 @@ job {
 }
 job {
   id: "ddc-win-release-chrome-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1016,6 +1117,7 @@ job {
 }
 job {
   id: "ddc-win-release-chrome-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1026,6 +1128,7 @@ job {
 }
 job {
   id: "ddc-win-release-chrome-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1036,6 +1139,7 @@ job {
 }
 job {
   id: "ddk-linux-release-firefox"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1046,6 +1150,7 @@ job {
 }
 job {
   id: "ddk-linux-release-firefox-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1056,6 +1161,7 @@ job {
 }
 job {
   id: "ddk-linux-release-firefox-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1066,6 +1172,7 @@ job {
 }
 job {
   id: "ddk-linux-release-firefox-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1076,6 +1183,7 @@ job {
 }
 job {
   id: "debianpackage-linux"
+  realm: "ci"
   schedule: "triggered"
   acl_sets: "ci"
   buildbucket {
@@ -1086,6 +1194,7 @@ job {
 }
 job {
   id: "debianpackage-linux-beta"
+  realm: "ci"
   schedule: "triggered"
   acl_sets: "ci"
   buildbucket {
@@ -1096,6 +1205,7 @@ job {
 }
 job {
   id: "debianpackage-linux-dev"
+  realm: "ci"
   schedule: "triggered"
   acl_sets: "ci"
   buildbucket {
@@ -1106,6 +1216,7 @@ job {
 }
 job {
   id: "debianpackage-linux-stable"
+  realm: "ci"
   schedule: "triggered"
   acl_sets: "ci"
   buildbucket {
@@ -1116,6 +1227,7 @@ job {
 }
 job {
   id: "docker"
+  realm: "ci"
   schedule: "triggered"
   acl_sets: "ci"
   buildbucket {
@@ -1126,6 +1238,7 @@ job {
 }
 job {
   id: "flutter-analyze"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1136,6 +1249,7 @@ job {
 }
 job {
   id: "flutter-engine-linux"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1146,6 +1260,7 @@ job {
 }
 job {
   id: "flutter-engine-linux-web_tests"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1156,6 +1271,7 @@ job {
 }
 job {
   id: "flutter-frontend"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1166,6 +1282,7 @@ job {
 }
 job {
   id: "front-end-linux-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1176,6 +1293,7 @@ job {
 }
 job {
   id: "front-end-linux-release-x64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1186,6 +1304,7 @@ job {
 }
 job {
   id: "front-end-linux-release-x64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1196,6 +1315,7 @@ job {
 }
 job {
   id: "front-end-linux-release-x64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1206,6 +1326,7 @@ job {
 }
 job {
   id: "front-end-mac-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1216,6 +1337,7 @@ job {
 }
 job {
   id: "front-end-mac-release-x64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1226,6 +1348,7 @@ job {
 }
 job {
   id: "front-end-mac-release-x64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1236,6 +1359,7 @@ job {
 }
 job {
   id: "front-end-mac-release-x64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1246,6 +1370,7 @@ job {
 }
 job {
   id: "front-end-nnbd-linux-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1256,6 +1381,7 @@ job {
 }
 job {
   id: "front-end-nnbd-linux-release-x64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1266,6 +1392,7 @@ job {
 }
 job {
   id: "front-end-nnbd-linux-release-x64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1276,6 +1403,7 @@ job {
 }
 job {
   id: "front-end-nnbd-linux-release-x64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1286,6 +1414,7 @@ job {
 }
 job {
   id: "front-end-nnbd-mac-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1296,6 +1425,7 @@ job {
 }
 job {
   id: "front-end-nnbd-win-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1306,6 +1436,7 @@ job {
 }
 job {
   id: "front-end-win-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1316,6 +1447,7 @@ job {
 }
 job {
   id: "front-end-win-release-x64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1326,6 +1458,7 @@ job {
 }
 job {
   id: "front-end-win-release-x64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1336,6 +1469,7 @@ job {
 }
 job {
   id: "front-end-win-release-x64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1346,6 +1480,7 @@ job {
 }
 job {
   id: "frontend-weekly"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1356,6 +1491,7 @@ job {
 }
 job {
   id: "fuzz-linux"
+  realm: "ci.sandbox"
   schedule: "0 3,4 * * *"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1366,6 +1502,7 @@ job {
 }
 job {
   id: "gclient"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1376,6 +1513,7 @@ job {
 }
 job {
   id: "gclient-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1386,6 +1524,7 @@ job {
 }
 job {
   id: "gclient-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1396,6 +1535,7 @@ job {
 }
 job {
   id: "gclient-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1406,6 +1546,7 @@ job {
 }
 job {
   id: "google"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1416,6 +1557,7 @@ job {
 }
 job {
   id: "linearize-flutter"
+  realm: "ci"
   schedule: "triggered"
   acl_sets: "ci"
   triggering_policy {
@@ -1430,6 +1572,7 @@ job {
 }
 job {
   id: "lkgr"
+  realm: "ci"
   schedule: "with 15m interval"
   acl_sets: "ci"
   buildbucket {
@@ -1440,6 +1583,7 @@ job {
 }
 job {
   id: "nightly"
+  realm: "ci"
   schedule: "0 5 * * *"
   acl_sets: "ci"
   buildbucket {
@@ -1450,6 +1594,7 @@ job {
 }
 job {
   id: "pkg-linux-debug"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1460,6 +1605,7 @@ job {
 }
 job {
   id: "pkg-linux-release"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1470,6 +1616,7 @@ job {
 }
 job {
   id: "pkg-linux-release-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1480,6 +1627,7 @@ job {
 }
 job {
   id: "pkg-linux-release-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1490,6 +1638,7 @@ job {
 }
 job {
   id: "pkg-linux-release-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1500,6 +1649,7 @@ job {
 }
 job {
   id: "pkg-mac-release"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1510,6 +1660,7 @@ job {
 }
 job {
   id: "pkg-mac-release-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1520,6 +1671,7 @@ job {
 }
 job {
   id: "pkg-mac-release-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1530,6 +1682,7 @@ job {
 }
 job {
   id: "pkg-mac-release-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1540,6 +1693,7 @@ job {
 }
 job {
   id: "pkg-win-release"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1550,6 +1704,7 @@ job {
 }
 job {
   id: "pkg-win-release-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1560,6 +1715,7 @@ job {
 }
 job {
   id: "pkg-win-release-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1570,6 +1726,7 @@ job {
 }
 job {
   id: "pkg-win-release-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1580,6 +1737,7 @@ job {
 }
 job {
   id: "recipe-bundler"
+  realm: "ci"
   schedule: "*/30 * * * *"
   acl_sets: "ci"
   buildbucket {
@@ -1590,6 +1748,7 @@ job {
 }
 job {
   id: "recipe-deps-roller"
+  realm: "ci"
   schedule: "with 4h interval"
   acl_sets: "ci"
   buildbucket {
@@ -1600,6 +1759,7 @@ job {
 }
 job {
   id: "roll-to-dev"
+  realm: "ci.roll"
   schedule: "with 4h interval"
   acl_sets: "ci.roll"
   buildbucket {
@@ -1610,6 +1770,7 @@ job {
 }
 job {
   id: "vm-canary-linux-debug"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1620,6 +1781,7 @@ job {
 }
 job {
   id: "vm-canary-linux-debug-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1630,6 +1792,7 @@ job {
 }
 job {
   id: "vm-canary-linux-debug-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1640,6 +1803,7 @@ job {
 }
 job {
   id: "vm-canary-linux-debug-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1650,6 +1814,7 @@ job {
 }
 job {
   id: "vm-ffi-android-debug-arm"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1660,6 +1825,7 @@ job {
 }
 job {
   id: "vm-ffi-android-debug-arm-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1670,6 +1836,7 @@ job {
 }
 job {
   id: "vm-ffi-android-debug-arm-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1680,6 +1847,7 @@ job {
 }
 job {
   id: "vm-ffi-android-debug-arm-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1690,6 +1858,7 @@ job {
 }
 job {
   id: "vm-ffi-android-debug-arm64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1700,6 +1869,7 @@ job {
 }
 job {
   id: "vm-ffi-android-debug-arm64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1710,6 +1880,7 @@ job {
 }
 job {
   id: "vm-ffi-android-debug-arm64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1720,6 +1891,7 @@ job {
 }
 job {
   id: "vm-ffi-android-debug-arm64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1730,6 +1902,7 @@ job {
 }
 job {
   id: "vm-ffi-android-product-arm"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1740,6 +1913,7 @@ job {
 }
 job {
   id: "vm-ffi-android-product-arm-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1750,6 +1924,7 @@ job {
 }
 job {
   id: "vm-ffi-android-product-arm-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1760,6 +1935,7 @@ job {
 }
 job {
   id: "vm-ffi-android-product-arm-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1770,6 +1946,7 @@ job {
 }
 job {
   id: "vm-ffi-android-product-arm64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1780,6 +1957,7 @@ job {
 }
 job {
   id: "vm-ffi-android-product-arm64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1790,6 +1968,7 @@ job {
 }
 job {
   id: "vm-ffi-android-product-arm64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1800,6 +1979,7 @@ job {
 }
 job {
   id: "vm-ffi-android-product-arm64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1810,6 +1990,7 @@ job {
 }
 job {
   id: "vm-ffi-android-release-arm"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1820,6 +2001,7 @@ job {
 }
 job {
   id: "vm-ffi-android-release-arm-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1830,6 +2012,7 @@ job {
 }
 job {
   id: "vm-ffi-android-release-arm-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1840,6 +2023,7 @@ job {
 }
 job {
   id: "vm-ffi-android-release-arm-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1850,6 +2034,7 @@ job {
 }
 job {
   id: "vm-ffi-android-release-arm64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1860,6 +2045,7 @@ job {
 }
 job {
   id: "vm-ffi-android-release-arm64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1870,6 +2056,7 @@ job {
 }
 job {
   id: "vm-ffi-android-release-arm64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1880,6 +2067,7 @@ job {
 }
 job {
   id: "vm-ffi-android-release-arm64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1890,6 +2078,7 @@ job {
 }
 job {
   id: "vm-fuchsia-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1900,6 +2089,7 @@ job {
 }
 job {
   id: "vm-kernel-asan-linux-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1910,6 +2100,7 @@ job {
 }
 job {
   id: "vm-kernel-checked-linux-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1920,6 +2111,7 @@ job {
 }
 job {
   id: "vm-kernel-checked-linux-release-x64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1930,6 +2122,7 @@ job {
 }
 job {
   id: "vm-kernel-checked-linux-release-x64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1940,6 +2133,7 @@ job {
 }
 job {
   id: "vm-kernel-checked-linux-release-x64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1950,6 +2144,7 @@ job {
 }
 job {
   id: "vm-kernel-linux-debug-ia32"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1960,6 +2155,7 @@ job {
 }
 job {
   id: "vm-kernel-linux-debug-simarm64c"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1970,6 +2166,7 @@ job {
 }
 job {
   id: "vm-kernel-linux-debug-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1980,6 +2177,7 @@ job {
 }
 job {
   id: "vm-kernel-linux-debug-x64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -1990,6 +2188,7 @@ job {
 }
 job {
   id: "vm-kernel-linux-debug-x64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2000,6 +2199,7 @@ job {
 }
 job {
   id: "vm-kernel-linux-debug-x64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2010,6 +2210,7 @@ job {
 }
 job {
   id: "vm-kernel-linux-debug-x64c"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2020,6 +2221,7 @@ job {
 }
 job {
   id: "vm-kernel-linux-product-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2030,6 +2232,7 @@ job {
 }
 job {
   id: "vm-kernel-linux-release-ia32"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2040,6 +2243,7 @@ job {
 }
 job {
   id: "vm-kernel-linux-release-simarm"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2050,6 +2254,7 @@ job {
 }
 job {
   id: "vm-kernel-linux-release-simarm-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2060,6 +2265,7 @@ job {
 }
 job {
   id: "vm-kernel-linux-release-simarm-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2070,6 +2276,7 @@ job {
 }
 job {
   id: "vm-kernel-linux-release-simarm-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2080,6 +2287,7 @@ job {
 }
 job {
   id: "vm-kernel-linux-release-simarm64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2090,6 +2298,7 @@ job {
 }
 job {
   id: "vm-kernel-linux-release-simarm64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2100,6 +2309,7 @@ job {
 }
 job {
   id: "vm-kernel-linux-release-simarm64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2110,6 +2320,7 @@ job {
 }
 job {
   id: "vm-kernel-linux-release-simarm64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2120,6 +2331,7 @@ job {
 }
 job {
   id: "vm-kernel-linux-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2130,6 +2342,7 @@ job {
 }
 job {
   id: "vm-kernel-linux-release-x64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2140,6 +2353,7 @@ job {
 }
 job {
   id: "vm-kernel-linux-release-x64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2150,6 +2364,7 @@ job {
 }
 job {
   id: "vm-kernel-linux-release-x64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2160,6 +2375,7 @@ job {
 }
 job {
   id: "vm-kernel-mac-debug-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2170,6 +2386,7 @@ job {
 }
 job {
   id: "vm-kernel-mac-debug-x64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2180,6 +2397,7 @@ job {
 }
 job {
   id: "vm-kernel-mac-debug-x64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2190,6 +2408,7 @@ job {
 }
 job {
   id: "vm-kernel-mac-debug-x64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2200,6 +2419,7 @@ job {
 }
 job {
   id: "vm-kernel-mac-product-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2210,6 +2430,7 @@ job {
 }
 job {
   id: "vm-kernel-mac-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2220,6 +2441,7 @@ job {
 }
 job {
   id: "vm-kernel-mac-release-x64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2230,6 +2452,7 @@ job {
 }
 job {
   id: "vm-kernel-mac-release-x64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2240,6 +2463,7 @@ job {
 }
 job {
   id: "vm-kernel-mac-release-x64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2250,6 +2474,7 @@ job {
 }
 job {
   id: "vm-kernel-msan-linux-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2260,6 +2485,7 @@ job {
 }
 job {
   id: "vm-kernel-nnbd-linux-debug-ia32"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2270,6 +2496,7 @@ job {
 }
 job {
   id: "vm-kernel-nnbd-linux-debug-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2280,6 +2507,7 @@ job {
 }
 job {
   id: "vm-kernel-nnbd-linux-debug-x64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2290,6 +2518,7 @@ job {
 }
 job {
   id: "vm-kernel-nnbd-linux-debug-x64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2300,6 +2529,7 @@ job {
 }
 job {
   id: "vm-kernel-nnbd-linux-debug-x64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2310,6 +2540,7 @@ job {
 }
 job {
   id: "vm-kernel-nnbd-linux-release-ia32"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2320,6 +2551,7 @@ job {
 }
 job {
   id: "vm-kernel-nnbd-linux-release-simarm"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2330,6 +2562,7 @@ job {
 }
 job {
   id: "vm-kernel-nnbd-linux-release-simarm64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2340,6 +2573,7 @@ job {
 }
 job {
   id: "vm-kernel-nnbd-linux-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2350,6 +2584,7 @@ job {
 }
 job {
   id: "vm-kernel-nnbd-linux-release-x64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2360,6 +2595,7 @@ job {
 }
 job {
   id: "vm-kernel-nnbd-linux-release-x64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2370,6 +2606,7 @@ job {
 }
 job {
   id: "vm-kernel-nnbd-linux-release-x64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2380,6 +2617,7 @@ job {
 }
 job {
   id: "vm-kernel-nnbd-mac-debug-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2390,6 +2628,7 @@ job {
 }
 job {
   id: "vm-kernel-nnbd-mac-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2400,6 +2639,7 @@ job {
 }
 job {
   id: "vm-kernel-nnbd-win-debug-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2410,6 +2650,7 @@ job {
 }
 job {
   id: "vm-kernel-nnbd-win-release-ia32"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2420,6 +2661,7 @@ job {
 }
 job {
   id: "vm-kernel-nnbd-win-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2430,6 +2672,7 @@ job {
 }
 job {
   id: "vm-kernel-optcounter-threshold-linux-release-ia32"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2440,6 +2683,7 @@ job {
 }
 job {
   id: "vm-kernel-optcounter-threshold-linux-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2450,6 +2694,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-android-release-arm64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2460,6 +2705,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-android-release-arm64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2470,6 +2716,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-android-release-arm64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2480,6 +2727,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-android-release-arm64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2490,6 +2738,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-android-release-arm_x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2500,6 +2749,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-android-release-arm_x64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2510,6 +2760,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-android-release-arm_x64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2520,6 +2771,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-android-release-arm_x64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2530,6 +2782,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-asan-linux-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2540,6 +2793,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-debug-simarm64c"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2550,6 +2804,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-debug-simarm_x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2560,6 +2815,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2570,6 +2826,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2580,6 +2837,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2590,6 +2848,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-debug-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2600,6 +2859,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-debug-x64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2610,6 +2870,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-debug-x64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2620,6 +2881,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-debug-x64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2630,6 +2892,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-debug-x64c"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2640,6 +2903,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-product-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2650,6 +2914,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-product-x64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2660,6 +2925,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-product-x64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2670,6 +2936,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-product-x64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2680,6 +2947,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-release-simarm"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2690,6 +2958,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-release-simarm-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2700,6 +2969,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-release-simarm-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2710,6 +2980,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-release-simarm-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2720,6 +2991,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-release-simarm64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2730,6 +3002,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-release-simarm64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2740,6 +3013,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-release-simarm64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2750,6 +3024,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-release-simarm64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2760,6 +3035,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-release-simarm_x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2770,6 +3046,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-release-simarm_x64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2780,6 +3057,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-release-simarm_x64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2790,6 +3068,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-release-simarm_x64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2800,6 +3079,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2810,6 +3090,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-release-x64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2820,6 +3101,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-release-x64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2830,6 +3112,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-linux-release-x64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2840,6 +3123,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-mac-release-simarm64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2850,6 +3134,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-mac-release-simarm64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2860,6 +3145,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-mac-release-simarm64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2870,6 +3156,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-mac-release-simarm64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2880,6 +3167,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-msan-linux-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2890,6 +3178,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2900,6 +3189,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-nnbd-linux-debug-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2910,6 +3200,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-nnbd-linux-release-simarm64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2920,6 +3211,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2930,6 +3222,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-nnbd-linux-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2940,6 +3233,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2950,6 +3244,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2960,6 +3255,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2970,6 +3266,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-nnbd-mac-release-simarm64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2980,6 +3277,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-nnbd-win-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -2990,6 +3288,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-obfuscate-linux-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3000,6 +3299,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3010,6 +3310,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3020,6 +3321,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3030,6 +3332,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-tsan-linux-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3040,6 +3343,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-ubsan-linux-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3050,6 +3354,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-win-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3060,6 +3365,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-win-release-x64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3070,6 +3376,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-win-release-x64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3080,6 +3387,7 @@ job {
 }
 job {
   id: "vm-kernel-precomp-win-release-x64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3090,6 +3398,7 @@ job {
 }
 job {
   id: "vm-kernel-reload-linux-debug-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3100,6 +3409,7 @@ job {
 }
 job {
   id: "vm-kernel-reload-linux-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3110,6 +3420,7 @@ job {
 }
 job {
   id: "vm-kernel-reload-rollback-linux-debug-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3120,6 +3431,7 @@ job {
 }
 job {
   id: "vm-kernel-reload-rollback-linux-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3130,6 +3442,7 @@ job {
 }
 job {
   id: "vm-kernel-tsan-linux-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3140,6 +3453,7 @@ job {
 }
 job {
   id: "vm-kernel-ubsan-linux-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3150,6 +3464,7 @@ job {
 }
 job {
   id: "vm-kernel-win-debug-ia32"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3160,6 +3475,7 @@ job {
 }
 job {
   id: "vm-kernel-win-debug-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3170,6 +3486,7 @@ job {
 }
 job {
   id: "vm-kernel-win-debug-x64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3180,6 +3497,7 @@ job {
 }
 job {
   id: "vm-kernel-win-debug-x64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3190,6 +3508,7 @@ job {
 }
 job {
   id: "vm-kernel-win-debug-x64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3200,6 +3519,7 @@ job {
 }
 job {
   id: "vm-kernel-win-product-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3210,6 +3530,7 @@ job {
 }
 job {
   id: "vm-kernel-win-release-ia32"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3220,6 +3541,7 @@ job {
 }
 job {
   id: "vm-kernel-win-release-x64"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3230,6 +3552,7 @@ job {
 }
 job {
   id: "vm-kernel-win-release-x64-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3240,6 +3563,7 @@ job {
 }
 job {
   id: "vm-kernel-win-release-x64-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3250,6 +3574,7 @@ job {
 }
 job {
   id: "vm-kernel-win-release-x64-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3260,6 +3585,7 @@ job {
 }
 job {
   id: "vm-precomp-ffi-qemu-linux-release-arm"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3270,6 +3596,7 @@ job {
 }
 job {
   id: "vm-precomp-ffi-qemu-linux-release-arm-beta"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3280,6 +3607,7 @@ job {
 }
 job {
   id: "vm-precomp-ffi-qemu-linux-release-arm-dev"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3290,6 +3618,7 @@ job {
 }
 job {
   id: "vm-precomp-ffi-qemu-linux-release-arm-stable"
+  realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
@@ -3300,6 +3629,7 @@ job {
 }
 job {
   id: "weekly"
+  realm: "ci"
   schedule: "0 0 * * SUN"
   acl_sets: "ci"
   buildbucket {
@@ -3310,6 +3640,7 @@ job {
 }
 trigger {
   id: "dart-ci-test-data-trigger"
+  realm: "ci"
   acl_sets: "ci"
   triggers: "ci-test-data"
   gitiles {
@@ -3320,6 +3651,7 @@ trigger {
 }
 trigger {
   id: "dart-flutter-engine-trigger"
+  realm: "ci"
   acl_sets: "ci"
   triggers: "linearize-flutter"
   gitiles {
@@ -3329,6 +3661,7 @@ trigger {
 }
 trigger {
   id: "dart-flutter-flutter-trigger"
+  realm: "ci"
   acl_sets: "ci"
   triggers: "linearize-flutter"
   gitiles {
@@ -3338,6 +3671,7 @@ trigger {
 }
 trigger {
   id: "dart-gitiles-trigger-beta"
+  realm: "ci"
   acl_sets: "ci"
   triggers: "dart-sdk-linux-beta"
   triggers: "dart-sdk-mac-beta"
@@ -3411,6 +3745,7 @@ trigger {
 }
 trigger {
   id: "dart-gitiles-trigger-dev"
+  realm: "ci"
   acl_sets: "ci"
   triggers: "dart-sdk-linux-dev"
   triggers: "dart-sdk-mac-dev"
@@ -3484,6 +3819,7 @@ trigger {
 }
 trigger {
   id: "dart-gitiles-trigger-flutter"
+  realm: "ci"
   acl_sets: "ci"
   triggers: "flutter-engine-linux"
   triggers: "flutter-engine-linux-web_tests"
@@ -3494,6 +3830,7 @@ trigger {
 }
 trigger {
   id: "dart-gitiles-trigger-master"
+  realm: "ci"
   acl_sets: "ci"
   triggers: "dart-sdk-linux"
   triggers: "dart-sdk-mac"
@@ -3544,6 +3881,7 @@ trigger {
 }
 trigger {
   id: "dart-gitiles-trigger-stable"
+  realm: "ci"
   acl_sets: "ci"
   triggers: "dart-sdk-linux-stable"
   triggers: "dart-sdk-mac-stable"
@@ -3617,6 +3955,7 @@ trigger {
 }
 trigger {
   id: "dart-vm-gitiles-trigger-master"
+  realm: "ci"
   acl_sets: "ci"
   triggers: "app-kernel-linux-debug-x64"
   triggers: "app-kernel-linux-release-x64"
@@ -3668,6 +4007,7 @@ trigger {
 }
 trigger {
   id: "recipes-dart"
+  realm: "ci"
   acl_sets: "ci"
   triggers: "recipe-bundler"
   gitiles {
diff --git a/main.star b/main.star
index 0656cf1c0203..6ec988e5a7cc 100755
--- a/main.star
+++ b/main.star
@@ -14,7 +14,10 @@ Generates the Luci configuration for the Dart project.
 
 load("//defaults.star", "defaults")
 
-lucicfg.check_version("1.17.0")
+lucicfg.check_version("1.21.5")
+
+# Enable LUCI Realms support.
+lucicfg.enable_experiment("crbug.com/1085650")
 
 DART_GIT = "https://dart.googlesource.com/sdk"
 DART_GERRIT = "https://dart-review.googlesource.com/"
@@ -103,12 +106,17 @@ def mac():
 def windows():
     return {"os": "Windows"}
 
+# https://chrome-infra-auth.appspot.com/auth/groups/project-dart-ci-task-accounts
+CI_ACCOUNTS_GROUP = "project-dart-ci-task-accounts"
+
+# https://chrome-infra-auth.appspot.com/auth/groups/project-dart-try-task-accounts
+TRY_ACCOUNTS_GROUP = "project-dart-try-task-accounts"
+
 CI_ACCOUNT = "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
 TRY_ACCOUNT = "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-CI_TRIGGERERS = ["luci-scheduler@appspot.gserviceaccount.com", CI_ACCOUNT]
+CI_TRIGGERERS = [CI_ACCOUNT]
 ROLL_TRIGGERERS = {
     "users": [
-        "luci-scheduler@appspot.gserviceaccount.com",
         CI_ACCOUNT,
     ],
     "groups": ["project-dart-roller-owners"],
@@ -125,6 +133,7 @@ lucicfg.config(
         "luci-notify.cfg",
         "luci-scheduler.cfg",
         "project.cfg",
+        "realms.cfg",
     ],
     lint_checks = ["default"],
 )
@@ -155,6 +164,58 @@ luci.project(
         acl.entry(acl.CQ_COMMITTER, groups = ["project-dart-committers"]),
         acl.entry(acl.CQ_DRY_RUNNER, groups = ["project-dart-tryjob-access"]),
     ],
+    bindings = [
+        luci.binding(
+            roles = "role/swarming.poolOwner",
+            groups = "project-dart-admins",
+        ),
+        luci.binding(
+            roles = "role/swarming.poolViewer",
+            groups = "project-dart-committers",
+        ),
+    ],
+)
+
+# Swarming permissions in realms.cfg.
+
+luci.realm(name = "pools/ci")
+luci.realm(name = "pools/try")
+luci.realm(
+    name = "pools/tests",
+    bindings = [
+        luci.binding(
+            roles = "role/swarming.poolUser",
+            groups = [CI_ACCOUNTS_GROUP, TRY_ACCOUNTS_GROUP],
+        ),
+    ],
+)
+
+def led_users(*, pool_realms, builder_realm, groups):
+    for realm in pool_realms:
+        luci.binding(
+            realm = realm,
+            roles = "role/swarming.poolUser",
+            groups = groups,
+        )
+    luci.binding(
+        realm = builder_realm,
+        roles = "role/swarming.taskTriggerer",
+        groups = groups,
+    )
+
+# Allow admins to use LED and "Debug" button on every Dart builder and bot.
+led_users(
+    pool_realms = ["@root"],
+    builder_realm = "@root",
+    groups = ["project-dart-admins"],
+)
+
+# Allow mdb/dart-build-access to use LED and "Debug" button on try builders and
+# try and test bots.
+led_users(
+    pool_realms = ["pools/try", "pools/tests"],
+    builder_realm = "try",
+    groups = ["mdb/dart-build-access"],
 )
 
 luci.milo(
diff --git a/realms.cfg b/realms.cfg
new file mode 100644
index 000000000000..212ba020464a
--- /dev/null
+++ b/realms.cfg
@@ -0,0 +1,143 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see RealmsCfg message:
+#   https://luci-config.appspot.com/schemas/projects:realms.cfg
+
+realms {
+  name: "@root"
+  bindings {
+    role: "role/buildbucket.reader"
+    principals: "group:all"
+  }
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "group:project-dart-admins"
+  }
+  bindings {
+    role: "role/configs.reader"
+    principals: "group:all"
+  }
+  bindings {
+    role: "role/cq.committer"
+    principals: "group:project-dart-committers"
+  }
+  bindings {
+    role: "role/cq.dryRunner"
+    principals: "group:project-dart-tryjob-access"
+  }
+  bindings {
+    role: "role/logdog.reader"
+    principals: "group:all"
+  }
+  bindings {
+    role: "role/logdog.writer"
+    principals: "group:luci-logdog-chromium-writers"
+  }
+  bindings {
+    role: "role/scheduler.owner"
+    principals: "group:project-dart-admins"
+  }
+  bindings {
+    role: "role/scheduler.reader"
+    principals: "group:all"
+  }
+  bindings {
+    role: "role/swarming.poolOwner"
+    principals: "group:project-dart-admins"
+  }
+  bindings {
+    role: "role/swarming.poolUser"
+    principals: "group:project-dart-admins"
+  }
+  bindings {
+    role: "role/swarming.poolViewer"
+    principals: "group:project-dart-committers"
+  }
+  bindings {
+    role: "role/swarming.taskTriggerer"
+    principals: "group:project-dart-admins"
+  }
+}
+realms {
+  name: "ci"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+  }
+}
+realms {
+  name: "ci.roll"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "group:project-dart-roller-owners"
+    principals: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+  }
+}
+realms {
+  name: "ci.sandbox"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
+}
+realms {
+  name: "pools/ci"
+}
+realms {
+  name: "pools/tests"
+  bindings {
+    role: "role/swarming.poolUser"
+    principals: "group:mdb/dart-build-access"
+    principals: "group:project-dart-ci-task-accounts"
+    principals: "group:project-dart-try-task-accounts"
+  }
+}
+realms {
+  name: "pools/try"
+  bindings {
+    role: "role/swarming.poolUser"
+    principals: "group:mdb/dart-build-access"
+  }
+}
+realms {
+  name: "try"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "group:project-dart-tryjob-access"
+    principals: "group:service-account-cq"
+  }
+  bindings {
+    role: "role/swarming.taskTriggerer"
+    principals: "group:mdb/dart-build-access"
+  }
+}
+realms {
+  name: "try.shared"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "group:project-dart-tryjob-access"
+    principals: "group:service-account-cq"
+  }
+}

From a433c70e7b7b307c7a7efb5280725fe48b9db66d Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Wed, 17 Feb 2021 14:01:04 +0000
Subject: [PATCH 444/826] [infra] Increase step timeout on Linux SDK builder to
 100 minutes

Change-Id: Ic2eff1d6a002a8cd39c5d39b2af791793240cd26
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/185086
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 10 +++++-----
 main.star          |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index b861d3bb23d5..9b12503e8e99 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -132,7 +132,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true,\"timeout\":4800}"
+        properties_j: "$dart/build:{\"disable_goma\":true,\"timeout\":6000}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:true"
@@ -157,7 +157,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true,\"timeout\":4800}"
+        properties_j: "$dart/build:{\"disable_goma\":true,\"timeout\":6000}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:true"
@@ -182,7 +182,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true,\"timeout\":4800}"
+        properties_j: "$dart/build:{\"disable_goma\":true,\"timeout\":6000}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:true"
@@ -207,7 +207,7 @@ buckets {
         name: "dart/neo"
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true,\"timeout\":4800}"
+        properties_j: "$dart/build:{\"disable_goma\":true,\"timeout\":6000}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:true"
@@ -8749,7 +8749,7 @@ buckets {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$dart/build:{\"disable_goma\":true,\"timeout\":4800}"
+        properties_j: "$dart/build:{\"disable_goma\":true,\"timeout\":6000}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:true"
diff --git a/main.star b/main.star
index 6ec988e5a7cc..ff72e8f7e71a 100755
--- a/main.star
+++ b/main.star
@@ -1426,7 +1426,7 @@ dart_ci_builder(
     lkgr = True,
     properties = {
         "$dart/build": {
-            "timeout": 80 * 60,  # 80 minutes,
+            "timeout": 100 * 60,  # 100 minutes,
         },
     },
 )

From 373f5c885c85c97439ab54a32b28415e26b0846a Mon Sep 17 00:00:00 2001
From: Andrii Shyshkalov <tandrii@google.com>
Date: Wed, 17 Feb 2021 16:19:48 +0000
Subject: [PATCH 445/826] Delete no longer necessary CI_TRIGGERERS.

R=athom

Change-Id: I32b797aa1d7a0b48515d1f688ae47c72614c6642
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/185400
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
Auto-Submit: Andrii Shyshkalov <tandrii@google.com>
---
 main.star | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/main.star b/main.star
index ff72e8f7e71a..177bd27cd4f4 100755
--- a/main.star
+++ b/main.star
@@ -114,14 +114,13 @@ TRY_ACCOUNTS_GROUP = "project-dart-try-task-accounts"
 
 CI_ACCOUNT = "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
 TRY_ACCOUNT = "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-CI_TRIGGERERS = [CI_ACCOUNT]
 ROLL_TRIGGERERS = {
     "users": [
         CI_ACCOUNT,
     ],
     "groups": ["project-dart-roller-owners"],
 }
-CI_SANDBOX_TRIGGERERS = CI_TRIGGERERS + [TRY_ACCOUNT]
+CI_SANDBOX_TRIGGERERS = [CI_ACCOUNT, TRY_ACCOUNT]
 
 lucicfg.config(
     config_dir = ".",
@@ -298,7 +297,7 @@ luci.logdog(gs_bucket = "chromium-luci-logdog")
 luci.bucket(
     name = "ci",
     acls = [
-        acl.entry(acl.BUILDBUCKET_TRIGGERER, users = CI_TRIGGERERS),
+        acl.entry(acl.BUILDBUCKET_TRIGGERER, users = [CI_ACCOUNT]),
     ],
 )
 luci.bucket(

From 330beada499f54f3bc181c16ad844954702f990c Mon Sep 17 00:00:00 2001
From: Andrii Shyshkalov <tandrii@google.com>
Date: Wed, 17 Feb 2021 16:20:55 +0000
Subject: [PATCH 446/826] Launch 2% of Dart builds using new realm ACLs.

This may be disruptive and can be reverted any time,
but it will allow to detect potential misconfigurations.

R=athom

Bug: chromium:1170330
Change-Id: I5fc5cdb44f4cedd919d899162d52afa35ca6b36e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/185420
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 1800 ++++++++++++++++++++++++++++++++++++++++++++
 main.star          |    3 +
 2 files changed, 1803 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 9b12503e8e99..2e4d883999d8 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -43,6 +43,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "cbuild"
@@ -69,6 +73,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "chocolatey"
@@ -94,6 +102,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "co19-roller"
@@ -119,6 +131,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart-sdk-linux"
@@ -144,6 +160,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart-sdk-linux-beta"
@@ -169,6 +189,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart-sdk-linux-dev"
@@ -194,6 +218,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart-sdk-linux-stable"
@@ -219,6 +247,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart-sdk-mac"
@@ -244,6 +276,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart-sdk-mac-beta"
@@ -269,6 +305,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart-sdk-mac-dev"
@@ -294,6 +334,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart-sdk-mac-stable"
@@ -319,6 +363,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart-sdk-win"
@@ -344,6 +392,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart-sdk-win-beta"
@@ -369,6 +421,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart-sdk-win-dev"
@@ -394,6 +450,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart-sdk-win-stable"
@@ -419,6 +479,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "debianpackage-linux"
@@ -444,6 +508,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "debianpackage-linux-beta"
@@ -469,6 +537,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "debianpackage-linux-dev"
@@ -494,6 +566,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "debianpackage-linux-stable"
@@ -519,6 +595,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "docker"
@@ -544,6 +624,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "linearize-flutter"
@@ -570,6 +654,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "lkgr"
@@ -598,6 +686,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "nightly"
@@ -624,6 +716,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "recipe-bundler"
@@ -654,6 +750,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "recipe-deps-roller"
@@ -683,6 +783,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "weekly"
@@ -709,6 +813,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
   }
 }
@@ -756,6 +864,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
   }
 }
@@ -801,6 +913,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "analyzer-analysis-server-linux-beta"
@@ -826,6 +942,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "analyzer-analysis-server-linux-dev"
@@ -851,6 +971,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "analyzer-analysis-server-linux-stable"
@@ -876,6 +1000,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "analyzer-linux-release"
@@ -901,6 +1029,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "analyzer-linux-release-beta"
@@ -926,6 +1058,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "analyzer-linux-release-dev"
@@ -951,6 +1087,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "analyzer-linux-release-stable"
@@ -976,6 +1116,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "analyzer-mac-release"
@@ -1001,6 +1145,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "analyzer-mac-release-beta"
@@ -1026,6 +1174,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "analyzer-mac-release-dev"
@@ -1051,6 +1203,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "analyzer-mac-release-stable"
@@ -1076,6 +1232,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "analyzer-nnbd-linux-release"
@@ -1101,6 +1261,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "analyzer-nnbd-linux-release-beta"
@@ -1126,6 +1290,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "analyzer-nnbd-linux-release-dev"
@@ -1151,6 +1319,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "analyzer-nnbd-linux-release-stable"
@@ -1176,6 +1348,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "analyzer-nnbd-mac-release"
@@ -1201,6 +1377,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "analyzer-nnbd-win-release"
@@ -1226,6 +1406,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "analyzer-win-release"
@@ -1251,6 +1435,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "analyzer-win-release-beta"
@@ -1276,6 +1464,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "analyzer-win-release-dev"
@@ -1301,6 +1493,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "analyzer-win-release-stable"
@@ -1326,6 +1522,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "app-kernel-linux-debug-x64"
@@ -1351,6 +1551,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "app-kernel-linux-debug-x64-beta"
@@ -1376,6 +1580,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "app-kernel-linux-debug-x64-dev"
@@ -1401,6 +1609,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "app-kernel-linux-debug-x64-stable"
@@ -1426,6 +1638,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "app-kernel-linux-product-x64"
@@ -1451,6 +1667,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "app-kernel-linux-release-x64"
@@ -1476,6 +1696,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "app-kernel-linux-release-x64-beta"
@@ -1501,6 +1725,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "app-kernel-linux-release-x64-dev"
@@ -1526,6 +1754,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "app-kernel-linux-release-x64-stable"
@@ -1551,6 +1783,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "ci-test-data"
@@ -1577,6 +1813,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "cross-vm-linux-release-arm64"
@@ -1603,6 +1843,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "cross-vm-precomp-linux-release-arm64"
@@ -1629,6 +1873,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-csp-minified-linux-x64-chrome"
@@ -1655,6 +1903,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-csp-minified-linux-x64-chrome-beta"
@@ -1681,6 +1933,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-csp-minified-linux-x64-chrome-dev"
@@ -1707,6 +1963,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-csp-minified-linux-x64-chrome-stable"
@@ -1733,6 +1993,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-minified-strong-linux-x64-d8"
@@ -1758,6 +2022,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-minified-strong-linux-x64-d8-beta"
@@ -1783,6 +2051,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-minified-strong-linux-x64-d8-dev"
@@ -1808,6 +2080,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-minified-strong-linux-x64-d8-stable"
@@ -1833,6 +2109,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-nnbd-linux-x64-chrome"
@@ -1859,6 +2139,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-nnbd-linux-x64-chrome-beta"
@@ -1885,6 +2169,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-nnbd-linux-x64-chrome-dev"
@@ -1911,6 +2199,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-nnbd-linux-x64-chrome-stable"
@@ -1937,6 +2229,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-hostasserts-linux-ia32-d8"
@@ -1962,6 +2258,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
@@ -1987,6 +2287,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
@@ -2012,6 +2316,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
@@ -2037,6 +2345,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-linux-x64-chrome"
@@ -2063,6 +2375,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-linux-x64-chrome-beta"
@@ -2089,6 +2405,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-linux-x64-chrome-dev"
@@ -2115,6 +2435,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-linux-x64-chrome-stable"
@@ -2141,6 +2465,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-linux-x64-firefox"
@@ -2167,6 +2495,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-linux-x64-firefox-beta"
@@ -2193,6 +2525,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-linux-x64-firefox-dev"
@@ -2219,6 +2555,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-linux-x64-firefox-stable"
@@ -2245,6 +2585,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-mac-x64-chrome"
@@ -2271,6 +2615,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-mac-x64-chrome-beta"
@@ -2297,6 +2645,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-mac-x64-chrome-dev"
@@ -2323,6 +2675,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-mac-x64-chrome-stable"
@@ -2349,6 +2705,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-mac-x64-safari"
@@ -2374,6 +2734,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-mac-x64-safari-beta"
@@ -2399,6 +2763,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-mac-x64-safari-dev"
@@ -2424,6 +2792,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-mac-x64-safari-stable"
@@ -2449,6 +2821,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-win-x64-chrome"
@@ -2475,6 +2851,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-win-x64-chrome-beta"
@@ -2501,6 +2881,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-win-x64-chrome-dev"
@@ -2527,6 +2911,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-win-x64-chrome-stable"
@@ -2553,6 +2941,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-win-x64-firefox"
@@ -2579,6 +2971,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-unit-linux-x64-release"
@@ -2604,6 +3000,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-unit-linux-x64-release-beta"
@@ -2629,6 +3029,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-unit-linux-x64-release-dev"
@@ -2654,6 +3058,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-unit-linux-x64-release-stable"
@@ -2679,6 +3087,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "ddc-linux-release-chrome"
@@ -2705,6 +3117,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "ddc-linux-release-chrome-beta"
@@ -2731,6 +3147,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "ddc-linux-release-chrome-dev"
@@ -2757,6 +3177,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "ddc-linux-release-chrome-stable"
@@ -2783,6 +3207,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "ddc-mac-release-chrome"
@@ -2809,6 +3237,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "ddc-mac-release-chrome-beta"
@@ -2835,6 +3267,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "ddc-mac-release-chrome-dev"
@@ -2861,6 +3297,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "ddc-mac-release-chrome-stable"
@@ -2887,6 +3327,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "ddc-nnbd-linux-release-chrome"
@@ -2913,6 +3357,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "ddc-win-release-chrome"
@@ -2939,6 +3387,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "ddc-win-release-chrome-beta"
@@ -2965,6 +3417,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "ddc-win-release-chrome-dev"
@@ -2991,6 +3447,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "ddc-win-release-chrome-stable"
@@ -3017,6 +3477,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "ddk-linux-release-firefox"
@@ -3043,6 +3507,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "ddk-linux-release-firefox-beta"
@@ -3069,6 +3537,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "ddk-linux-release-firefox-dev"
@@ -3095,6 +3567,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "ddk-linux-release-firefox-stable"
@@ -3121,6 +3597,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "flutter-analyze"
@@ -3146,6 +3626,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "flutter-engine-linux"
@@ -3174,6 +3658,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "flutter-engine-linux-web_tests"
@@ -3202,6 +3690,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "flutter-frontend"
@@ -3227,6 +3719,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "front-end-linux-release-x64"
@@ -3252,6 +3748,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "front-end-linux-release-x64-beta"
@@ -3277,6 +3777,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "front-end-linux-release-x64-dev"
@@ -3302,6 +3806,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "front-end-linux-release-x64-stable"
@@ -3327,6 +3835,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "front-end-mac-release-x64"
@@ -3352,6 +3864,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "front-end-mac-release-x64-beta"
@@ -3377,6 +3893,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "front-end-mac-release-x64-dev"
@@ -3402,6 +3922,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "front-end-mac-release-x64-stable"
@@ -3427,6 +3951,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "front-end-nnbd-linux-release-x64"
@@ -3452,6 +3980,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "front-end-nnbd-linux-release-x64-beta"
@@ -3477,6 +4009,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "front-end-nnbd-linux-release-x64-dev"
@@ -3502,6 +4038,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "front-end-nnbd-linux-release-x64-stable"
@@ -3527,6 +4067,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "front-end-nnbd-mac-release-x64"
@@ -3552,6 +4096,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "front-end-nnbd-win-release-x64"
@@ -3577,6 +4125,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "front-end-win-release-x64"
@@ -3602,6 +4154,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "front-end-win-release-x64-beta"
@@ -3627,6 +4183,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "front-end-win-release-x64-dev"
@@ -3652,6 +4212,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "front-end-win-release-x64-stable"
@@ -3677,6 +4241,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "frontend-weekly"
@@ -3703,6 +4271,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "fuzz-linux"
@@ -3728,6 +4300,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "gclient"
@@ -3753,6 +4329,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "gclient-beta"
@@ -3778,6 +4358,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "gclient-dev"
@@ -3803,6 +4387,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "gclient-stable"
@@ -3828,6 +4416,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "google"
@@ -3854,6 +4446,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "pkg-linux-debug"
@@ -3880,6 +4476,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "pkg-linux-release"
@@ -3906,6 +4506,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "pkg-linux-release-beta"
@@ -3932,6 +4536,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "pkg-linux-release-dev"
@@ -3958,6 +4566,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "pkg-linux-release-stable"
@@ -3984,6 +4596,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "pkg-mac-release"
@@ -4010,6 +4626,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "pkg-mac-release-beta"
@@ -4036,6 +4656,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "pkg-mac-release-dev"
@@ -4062,6 +4686,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "pkg-mac-release-stable"
@@ -4088,6 +4716,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "pkg-win-release"
@@ -4114,6 +4746,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "pkg-win-release-beta"
@@ -4140,6 +4776,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "pkg-win-release-dev"
@@ -4166,6 +4806,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "pkg-win-release-stable"
@@ -4192,6 +4836,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-canary-linux-debug"
@@ -4217,6 +4865,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-canary-linux-debug-beta"
@@ -4242,6 +4894,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-canary-linux-debug-dev"
@@ -4267,6 +4923,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-canary-linux-debug-stable"
@@ -4292,6 +4952,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-debug-arm"
@@ -4317,6 +4981,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-debug-arm-beta"
@@ -4342,6 +5010,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-debug-arm-dev"
@@ -4367,6 +5039,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-debug-arm-stable"
@@ -4392,6 +5068,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-debug-arm64"
@@ -4417,6 +5097,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-debug-arm64-beta"
@@ -4442,6 +5126,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-debug-arm64-dev"
@@ -4467,6 +5155,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-debug-arm64-stable"
@@ -4492,6 +5184,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-product-arm"
@@ -4517,6 +5213,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-product-arm-beta"
@@ -4542,6 +5242,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-product-arm-dev"
@@ -4567,6 +5271,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-product-arm-stable"
@@ -4592,6 +5300,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-product-arm64"
@@ -4617,6 +5329,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-product-arm64-beta"
@@ -4642,6 +5358,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-product-arm64-dev"
@@ -4667,6 +5387,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-product-arm64-stable"
@@ -4692,6 +5416,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-release-arm"
@@ -4717,6 +5445,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-release-arm-beta"
@@ -4742,6 +5474,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-release-arm-dev"
@@ -4767,6 +5503,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-release-arm-stable"
@@ -4792,6 +5532,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-release-arm64"
@@ -4817,6 +5561,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-release-arm64-beta"
@@ -4842,6 +5590,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-release-arm64-dev"
@@ -4867,6 +5619,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-release-arm64-stable"
@@ -4892,6 +5648,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-fuchsia-release-x64"
@@ -4918,6 +5678,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-asan-linux-release-x64"
@@ -4944,6 +5708,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-checked-linux-release-x64"
@@ -4969,6 +5737,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-checked-linux-release-x64-beta"
@@ -4994,6 +5766,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-checked-linux-release-x64-dev"
@@ -5019,6 +5795,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-checked-linux-release-x64-stable"
@@ -5044,6 +5824,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-debug-ia32"
@@ -5069,6 +5853,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-debug-simarm64c"
@@ -5094,6 +5882,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-debug-x64"
@@ -5119,6 +5911,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-debug-x64-beta"
@@ -5144,6 +5940,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-debug-x64-dev"
@@ -5169,6 +5969,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-debug-x64-stable"
@@ -5194,6 +5998,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-debug-x64c"
@@ -5219,6 +6027,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-product-x64"
@@ -5244,6 +6056,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-release-ia32"
@@ -5269,6 +6085,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-release-simarm"
@@ -5294,6 +6114,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-release-simarm-beta"
@@ -5319,6 +6143,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-release-simarm-dev"
@@ -5344,6 +6172,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-release-simarm-stable"
@@ -5369,6 +6201,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-release-simarm64"
@@ -5394,6 +6230,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-release-simarm64-beta"
@@ -5419,6 +6259,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-release-simarm64-dev"
@@ -5444,6 +6288,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-release-simarm64-stable"
@@ -5469,6 +6317,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-release-x64"
@@ -5494,6 +6346,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-release-x64-beta"
@@ -5519,6 +6375,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-release-x64-dev"
@@ -5544,6 +6404,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-release-x64-stable"
@@ -5569,6 +6433,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-mac-debug-x64"
@@ -5594,6 +6462,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-mac-debug-x64-beta"
@@ -5619,6 +6491,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-mac-debug-x64-dev"
@@ -5644,6 +6520,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-mac-debug-x64-stable"
@@ -5669,6 +6549,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-mac-product-x64"
@@ -5694,6 +6578,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-mac-release-x64"
@@ -5719,6 +6607,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-mac-release-x64-beta"
@@ -5744,6 +6636,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-mac-release-x64-dev"
@@ -5769,6 +6665,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-mac-release-x64-stable"
@@ -5794,6 +6694,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-msan-linux-release-x64"
@@ -5820,6 +6724,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-debug-ia32"
@@ -5845,6 +6753,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-debug-x64"
@@ -5870,6 +6782,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-debug-x64-beta"
@@ -5895,6 +6811,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-debug-x64-dev"
@@ -5920,6 +6840,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-debug-x64-stable"
@@ -5945,6 +6869,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-release-ia32"
@@ -5970,6 +6898,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-release-simarm"
@@ -5995,6 +6927,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-release-simarm64"
@@ -6020,6 +6956,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-release-x64"
@@ -6045,6 +6985,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-release-x64-beta"
@@ -6070,6 +7014,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-release-x64-dev"
@@ -6095,6 +7043,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-release-x64-stable"
@@ -6120,6 +7072,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-mac-debug-x64"
@@ -6145,6 +7101,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-mac-release-x64"
@@ -6170,6 +7130,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-win-debug-x64"
@@ -6195,6 +7159,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-win-release-ia32"
@@ -6220,6 +7188,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-win-release-x64"
@@ -6245,6 +7217,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-optcounter-threshold-linux-release-ia32"
@@ -6270,6 +7246,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-optcounter-threshold-linux-release-x64"
@@ -6296,6 +7276,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-android-release-arm64"
@@ -6322,6 +7306,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-android-release-arm64-beta"
@@ -6348,6 +7336,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-android-release-arm64-dev"
@@ -6374,6 +7366,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-android-release-arm64-stable"
@@ -6400,6 +7396,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-android-release-arm_x64"
@@ -6426,6 +7426,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-android-release-arm_x64-beta"
@@ -6452,6 +7456,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-android-release-arm_x64-dev"
@@ -6478,6 +7486,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-android-release-arm_x64-stable"
@@ -6504,6 +7516,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-asan-linux-release-x64"
@@ -6530,6 +7546,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-simarm64c"
@@ -6555,6 +7575,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-simarm_x64"
@@ -6581,6 +7605,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
@@ -6607,6 +7635,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
@@ -6633,6 +7665,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
@@ -6659,6 +7695,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-x64"
@@ -6684,6 +7724,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-x64-beta"
@@ -6709,6 +7753,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-x64-dev"
@@ -6734,6 +7782,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-x64-stable"
@@ -6759,6 +7811,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-x64c"
@@ -6784,6 +7840,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-product-x64"
@@ -6809,6 +7869,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-product-x64-beta"
@@ -6834,6 +7898,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-product-x64-dev"
@@ -6859,6 +7927,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-product-x64-stable"
@@ -6884,6 +7956,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm"
@@ -6909,6 +7985,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm-beta"
@@ -6934,6 +8014,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm-dev"
@@ -6959,6 +8043,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm-stable"
@@ -6984,6 +8072,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm64"
@@ -7009,6 +8101,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm64-beta"
@@ -7034,6 +8130,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm64-dev"
@@ -7059,6 +8159,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm64-stable"
@@ -7084,6 +8188,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm_x64"
@@ -7109,6 +8217,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm_x64-beta"
@@ -7134,6 +8246,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm_x64-dev"
@@ -7159,6 +8275,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm_x64-stable"
@@ -7184,6 +8304,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-x64"
@@ -7209,6 +8333,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-x64-beta"
@@ -7234,6 +8362,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-x64-dev"
@@ -7259,6 +8391,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-x64-stable"
@@ -7284,6 +8420,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-mac-release-simarm64"
@@ -7309,6 +8449,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-mac-release-simarm64-beta"
@@ -7334,6 +8478,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-mac-release-simarm64-dev"
@@ -7359,6 +8507,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-mac-release-simarm64-stable"
@@ -7384,6 +8536,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-msan-linux-release-x64"
@@ -7410,6 +8566,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
@@ -7435,6 +8595,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-debug-x64"
@@ -7461,6 +8625,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-simarm64"
@@ -7486,6 +8654,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
@@ -7511,6 +8683,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-x64"
@@ -7536,6 +8712,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
@@ -7561,6 +8741,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
@@ -7586,6 +8770,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
@@ -7611,6 +8799,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-mac-release-simarm64"
@@ -7636,6 +8828,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-win-release-x64"
@@ -7661,6 +8857,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-obfuscate-linux-release-x64"
@@ -7686,6 +8886,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
@@ -7711,6 +8915,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
@@ -7736,6 +8944,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
@@ -7761,6 +8973,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-tsan-linux-release-x64"
@@ -7787,6 +9003,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-ubsan-linux-release-x64"
@@ -7813,6 +9033,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-win-release-x64"
@@ -7838,6 +9062,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-win-release-x64-beta"
@@ -7863,6 +9091,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-win-release-x64-dev"
@@ -7888,6 +9120,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-win-release-x64-stable"
@@ -7913,6 +9149,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-reload-linux-debug-x64"
@@ -7938,6 +9178,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-reload-linux-release-x64"
@@ -7963,6 +9207,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-reload-rollback-linux-debug-x64"
@@ -7988,6 +9236,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-reload-rollback-linux-release-x64"
@@ -8013,6 +9265,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-tsan-linux-release-x64"
@@ -8039,6 +9295,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-ubsan-linux-release-x64"
@@ -8065,6 +9325,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-win-debug-ia32"
@@ -8090,6 +9354,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-win-debug-x64"
@@ -8115,6 +9383,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-win-debug-x64-beta"
@@ -8140,6 +9412,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-win-debug-x64-dev"
@@ -8165,6 +9441,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-win-debug-x64-stable"
@@ -8190,6 +9470,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-win-product-x64"
@@ -8215,6 +9499,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-win-release-ia32"
@@ -8240,6 +9528,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-win-release-x64"
@@ -8265,6 +9557,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-win-release-x64-beta"
@@ -8290,6 +9586,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-win-release-x64-dev"
@@ -8315,6 +9615,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-win-release-x64-stable"
@@ -8340,6 +9644,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm"
@@ -8365,6 +9673,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm-beta"
@@ -8390,6 +9702,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm-dev"
@@ -8415,6 +9731,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm-stable"
@@ -8440,6 +9760,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
   }
 }
@@ -8485,6 +9809,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "analyzer-linux-release-try"
@@ -8510,6 +9838,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "analyzer-mac-release-try"
@@ -8535,6 +9867,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "analyzer-nnbd-linux-release-try"
@@ -8560,6 +9896,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "analyzer-nnbd-mac-release-try"
@@ -8585,6 +9925,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "analyzer-nnbd-win-release-try"
@@ -8610,6 +9954,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "analyzer-win-release-try"
@@ -8635,6 +9983,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "app-kernel-linux-debug-x64-try"
@@ -8660,6 +10012,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "app-kernel-linux-product-x64-try"
@@ -8685,6 +10041,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "app-kernel-linux-release-x64-try"
@@ -8710,6 +10070,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "benchmark-linux-try"
@@ -8735,6 +10099,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart-sdk-linux-try"
@@ -8761,6 +10129,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart-sdk-mac-try"
@@ -8786,6 +10158,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart-sdk-win-try"
@@ -8811,6 +10187,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-csp-minified-linux-x64-chrome-try"
@@ -8837,6 +10217,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-minified-strong-linux-x64-d8-try"
@@ -8862,6 +10246,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-nnbd-linux-x64-chrome-try"
@@ -8888,6 +10276,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-hostasserts-linux-ia32-d8-try"
@@ -8913,6 +10305,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-linux-x64-chrome-try"
@@ -8939,6 +10335,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-linux-x64-firefox-try"
@@ -8965,6 +10365,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-mac-x64-chrome-try"
@@ -8991,6 +10395,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-mac-x64-safari-try"
@@ -9016,6 +10424,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-strong-win-x64-chrome-try"
@@ -9042,6 +10454,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "dart2js-unit-linux-x64-release-try"
@@ -9067,6 +10483,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "ddc-linux-release-chrome-try"
@@ -9093,6 +10513,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "ddc-mac-release-chrome-try"
@@ -9119,6 +10543,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "ddc-nnbd-linux-release-chrome-try"
@@ -9145,6 +10573,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "ddc-win-release-chrome-try"
@@ -9171,6 +10603,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "ddk-linux-release-firefox-try"
@@ -9197,6 +10633,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "flutter-analyze-try"
@@ -9222,6 +10662,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "flutter-engine-linux-try"
@@ -9250,6 +10694,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "flutter-engine-linux-web_tests-try"
@@ -9278,6 +10726,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "flutter-frontend-try"
@@ -9303,6 +10755,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "front-end-linux-release-x64-try"
@@ -9328,6 +10784,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "front-end-mac-release-x64-try"
@@ -9353,6 +10813,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "front-end-nnbd-linux-release-x64-try"
@@ -9378,6 +10842,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "front-end-nnbd-mac-release-x64-try"
@@ -9403,6 +10871,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "front-end-nnbd-win-release-x64-try"
@@ -9428,6 +10900,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "front-end-win-release-x64-try"
@@ -9453,6 +10929,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "gclient-try"
@@ -9478,6 +10958,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "pkg-linux-debug-try"
@@ -9504,6 +10988,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "pkg-linux-release-try"
@@ -9530,6 +11018,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "pkg-mac-release-try"
@@ -9556,6 +11048,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "pkg-win-release-try"
@@ -9582,6 +11078,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-canary-linux-debug-try"
@@ -9607,6 +11107,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-debug-arm-try"
@@ -9632,6 +11136,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-debug-arm64-try"
@@ -9657,6 +11165,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-product-arm-try"
@@ -9682,6 +11194,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-product-arm64-try"
@@ -9707,6 +11223,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-release-arm-try"
@@ -9732,6 +11252,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-ffi-android-release-arm64-try"
@@ -9757,6 +11281,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-fuchsia-release-x64-try"
@@ -9782,6 +11310,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-asan-linux-release-x64-try"
@@ -9808,6 +11340,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-checked-linux-release-x64-try"
@@ -9833,6 +11369,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-gcc-linux-try"
@@ -9858,6 +11398,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-debug-ia32-try"
@@ -9883,6 +11427,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-debug-simarm64c-try"
@@ -9908,6 +11456,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-debug-x64-try"
@@ -9933,6 +11485,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-debug-x64c-try"
@@ -9958,6 +11514,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-product-x64-try"
@@ -9983,6 +11543,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-release-ia32-try"
@@ -10008,6 +11572,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-release-simarm-try"
@@ -10033,6 +11601,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-release-simarm64-try"
@@ -10058,6 +11630,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-linux-release-x64-try"
@@ -10083,6 +11659,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-mac-debug-x64-try"
@@ -10108,6 +11688,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-mac-product-x64-try"
@@ -10133,6 +11717,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-mac-release-x64-try"
@@ -10158,6 +11746,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-msan-linux-release-x64-try"
@@ -10184,6 +11776,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-debug-ia32-try"
@@ -10209,6 +11805,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-debug-x64-try"
@@ -10234,6 +11834,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-release-ia32-try"
@@ -10259,6 +11863,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-release-simarm-try"
@@ -10284,6 +11892,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-release-simarm64-try"
@@ -10309,6 +11921,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-release-x64-try"
@@ -10334,6 +11950,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-mac-debug-x64-try"
@@ -10359,6 +11979,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-mac-release-x64-try"
@@ -10384,6 +12008,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-win-debug-x64-try"
@@ -10409,6 +12037,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-win-release-ia32-try"
@@ -10434,6 +12066,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-nnbd-win-release-x64-try"
@@ -10459,6 +12095,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-optcounter-threshold-linux-release-ia32-try"
@@ -10484,6 +12124,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-optcounter-threshold-linux-release-x64-try"
@@ -10509,6 +12153,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-android-release-arm64-try"
@@ -10535,6 +12183,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-android-release-arm_x64-try"
@@ -10561,6 +12213,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-asan-linux-release-x64-try"
@@ -10587,6 +12243,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-simarm64c-try"
@@ -10612,6 +12272,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-simarm_x64-try"
@@ -10638,6 +12302,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-x64-try"
@@ -10663,6 +12331,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-x64c-try"
@@ -10688,6 +12360,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-product-x64-try"
@@ -10713,6 +12389,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm-try"
@@ -10738,6 +12418,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm64-try"
@@ -10763,6 +12447,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm_x64-try"
@@ -10788,6 +12476,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-x64-try"
@@ -10813,6 +12505,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-mac-release-simarm64-try"
@@ -10838,6 +12534,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-msan-linux-release-x64-try"
@@ -10864,6 +12564,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
@@ -10889,6 +12593,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-debug-x64-try"
@@ -10915,6 +12623,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-simarm64-try"
@@ -10940,6 +12652,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
@@ -10965,6 +12681,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-x64-try"
@@ -10990,6 +12710,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-mac-release-simarm64-try"
@@ -11015,6 +12739,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-win-release-x64-try"
@@ -11040,6 +12768,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-obfuscate-linux-release-x64-try"
@@ -11065,6 +12797,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-tsan-linux-release-x64-try"
@@ -11091,6 +12827,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-ubsan-linux-release-x64-try"
@@ -11117,6 +12857,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-precomp-win-release-x64-try"
@@ -11142,6 +12886,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-reload-linux-debug-x64-try"
@@ -11167,6 +12915,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-reload-linux-release-x64-try"
@@ -11192,6 +12944,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-reload-rollback-linux-debug-x64-try"
@@ -11217,6 +12973,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-reload-rollback-linux-release-x64-try"
@@ -11242,6 +13002,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-tsan-linux-release-x64-try"
@@ -11268,6 +13032,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-ubsan-linux-release-x64-try"
@@ -11294,6 +13062,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-win-debug-ia32-try"
@@ -11319,6 +13091,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-win-debug-x64-try"
@@ -11344,6 +13120,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-win-product-x64-try"
@@ -11369,6 +13149,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-win-release-ia32-try"
@@ -11394,6 +13178,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-kernel-win-release-x64-try"
@@ -11419,6 +13207,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm-try"
@@ -11444,6 +13236,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
   }
 }
@@ -11490,6 +13286,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 2
+      }
     }
   }
 }
diff --git a/main.star b/main.star
index 177bd27cd4f4..f20db1288be7 100755
--- a/main.star
+++ b/main.star
@@ -19,6 +19,9 @@ lucicfg.check_version("1.21.5")
 # Enable LUCI Realms support.
 lucicfg.enable_experiment("crbug.com/1085650")
 
+# Launch 2% of Swarming tasks in "realms-aware mode", crbug.com/1170330.
+luci.builder.defaults.experiments.set({"luci.use_realms": 2})
+
 DART_GIT = "https://dart.googlesource.com/sdk"
 DART_GERRIT = "https://dart-review.googlesource.com/"
 

From 7c51f642b7edbcbb21b5f45729ba1f0454bbfd1f Mon Sep 17 00:00:00 2001
From: Andrii Shyshkalov <tandrii@google.com>
Date: Wed, 17 Feb 2021 22:02:53 +0000
Subject: [PATCH 447/826] Bump realms to 20%.

2% looks good so far.

R=athom

Bug: chromium:1170330
Change-Id: I29a91934b3ee2db9a575c3ba7e4b86fb5d5eefe9
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/185421
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 900 ++++++++++++++++++++++-----------------------
 main.star          |   4 +-
 2 files changed, 452 insertions(+), 452 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 2e4d883999d8..43912d8a7cf1 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -45,7 +45,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -75,7 +75,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -104,7 +104,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -133,7 +133,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -162,7 +162,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -191,7 +191,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -220,7 +220,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -249,7 +249,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -278,7 +278,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -307,7 +307,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -336,7 +336,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -365,7 +365,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -394,7 +394,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -423,7 +423,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -452,7 +452,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -481,7 +481,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -510,7 +510,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -539,7 +539,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -568,7 +568,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -597,7 +597,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -626,7 +626,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -656,7 +656,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -688,7 +688,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -718,7 +718,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -752,7 +752,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -785,7 +785,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -815,7 +815,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
   }
@@ -866,7 +866,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
   }
@@ -915,7 +915,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -944,7 +944,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -973,7 +973,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1002,7 +1002,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1031,7 +1031,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1060,7 +1060,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1089,7 +1089,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1118,7 +1118,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1147,7 +1147,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1176,7 +1176,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1205,7 +1205,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1234,7 +1234,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1263,7 +1263,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1292,7 +1292,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1321,7 +1321,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1350,7 +1350,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1379,7 +1379,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1408,7 +1408,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1437,7 +1437,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1466,7 +1466,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1495,7 +1495,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1524,7 +1524,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1553,7 +1553,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1582,7 +1582,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1611,7 +1611,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1640,7 +1640,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1669,7 +1669,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1698,7 +1698,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1727,7 +1727,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1756,7 +1756,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1785,7 +1785,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1815,7 +1815,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1845,7 +1845,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1875,7 +1875,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1905,7 +1905,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1935,7 +1935,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1965,7 +1965,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -1995,7 +1995,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2024,7 +2024,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2053,7 +2053,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2082,7 +2082,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2111,7 +2111,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2141,7 +2141,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2171,7 +2171,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2201,7 +2201,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2231,7 +2231,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2260,7 +2260,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2289,7 +2289,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2318,7 +2318,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2347,7 +2347,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2377,7 +2377,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2407,7 +2407,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2437,7 +2437,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2467,7 +2467,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2497,7 +2497,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2527,7 +2527,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2557,7 +2557,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2587,7 +2587,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2617,7 +2617,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2647,7 +2647,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2677,7 +2677,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2707,7 +2707,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2736,7 +2736,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2765,7 +2765,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2794,7 +2794,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2823,7 +2823,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2853,7 +2853,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2883,7 +2883,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2913,7 +2913,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2943,7 +2943,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -2973,7 +2973,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3002,7 +3002,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3031,7 +3031,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3060,7 +3060,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3089,7 +3089,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3119,7 +3119,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3149,7 +3149,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3179,7 +3179,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3209,7 +3209,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3239,7 +3239,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3269,7 +3269,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3299,7 +3299,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3329,7 +3329,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3359,7 +3359,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3389,7 +3389,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3419,7 +3419,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3449,7 +3449,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3479,7 +3479,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3509,7 +3509,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3539,7 +3539,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3569,7 +3569,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3599,7 +3599,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3628,7 +3628,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3660,7 +3660,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3692,7 +3692,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3721,7 +3721,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3750,7 +3750,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3779,7 +3779,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3808,7 +3808,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3837,7 +3837,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3866,7 +3866,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3895,7 +3895,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3924,7 +3924,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3953,7 +3953,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -3982,7 +3982,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4011,7 +4011,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4040,7 +4040,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4069,7 +4069,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4098,7 +4098,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4127,7 +4127,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4156,7 +4156,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4185,7 +4185,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4214,7 +4214,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4243,7 +4243,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4273,7 +4273,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4302,7 +4302,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4331,7 +4331,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4360,7 +4360,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4389,7 +4389,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4418,7 +4418,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4448,7 +4448,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4478,7 +4478,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4508,7 +4508,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4538,7 +4538,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4568,7 +4568,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4598,7 +4598,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4628,7 +4628,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4658,7 +4658,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4688,7 +4688,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4718,7 +4718,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4748,7 +4748,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4778,7 +4778,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4808,7 +4808,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4838,7 +4838,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4867,7 +4867,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4896,7 +4896,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4925,7 +4925,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4954,7 +4954,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -4983,7 +4983,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5012,7 +5012,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5041,7 +5041,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5070,7 +5070,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5099,7 +5099,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5128,7 +5128,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5157,7 +5157,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5186,7 +5186,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5215,7 +5215,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5244,7 +5244,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5273,7 +5273,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5302,7 +5302,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5331,7 +5331,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5360,7 +5360,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5389,7 +5389,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5418,7 +5418,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5447,7 +5447,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5476,7 +5476,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5505,7 +5505,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5534,7 +5534,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5563,7 +5563,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5592,7 +5592,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5621,7 +5621,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5650,7 +5650,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5680,7 +5680,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5710,7 +5710,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5739,7 +5739,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5768,7 +5768,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5797,7 +5797,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5826,7 +5826,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5855,7 +5855,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5884,7 +5884,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5913,7 +5913,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5942,7 +5942,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -5971,7 +5971,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6000,7 +6000,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6029,7 +6029,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6058,7 +6058,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6087,7 +6087,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6116,7 +6116,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6145,7 +6145,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6174,7 +6174,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6203,7 +6203,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6232,7 +6232,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6261,7 +6261,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6290,7 +6290,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6319,7 +6319,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6348,7 +6348,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6377,7 +6377,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6406,7 +6406,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6435,7 +6435,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6464,7 +6464,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6493,7 +6493,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6522,7 +6522,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6551,7 +6551,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6580,7 +6580,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6609,7 +6609,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6638,7 +6638,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6667,7 +6667,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6696,7 +6696,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6726,7 +6726,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6755,7 +6755,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6784,7 +6784,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6813,7 +6813,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6842,7 +6842,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6871,7 +6871,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6900,7 +6900,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6929,7 +6929,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6958,7 +6958,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -6987,7 +6987,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7016,7 +7016,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7045,7 +7045,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7074,7 +7074,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7103,7 +7103,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7132,7 +7132,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7161,7 +7161,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7190,7 +7190,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7219,7 +7219,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7248,7 +7248,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7278,7 +7278,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7308,7 +7308,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7338,7 +7338,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7368,7 +7368,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7398,7 +7398,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7428,7 +7428,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7458,7 +7458,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7488,7 +7488,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7518,7 +7518,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7548,7 +7548,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7577,7 +7577,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7607,7 +7607,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7637,7 +7637,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7667,7 +7667,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7697,7 +7697,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7726,7 +7726,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7755,7 +7755,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7784,7 +7784,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7813,7 +7813,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7842,7 +7842,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7871,7 +7871,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7900,7 +7900,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7929,7 +7929,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7958,7 +7958,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -7987,7 +7987,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8016,7 +8016,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8045,7 +8045,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8074,7 +8074,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8103,7 +8103,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8132,7 +8132,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8161,7 +8161,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8190,7 +8190,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8219,7 +8219,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8248,7 +8248,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8277,7 +8277,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8306,7 +8306,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8335,7 +8335,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8364,7 +8364,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8393,7 +8393,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8422,7 +8422,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8451,7 +8451,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8480,7 +8480,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8509,7 +8509,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8538,7 +8538,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8568,7 +8568,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8597,7 +8597,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8627,7 +8627,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8656,7 +8656,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8685,7 +8685,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8714,7 +8714,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8743,7 +8743,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8772,7 +8772,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8801,7 +8801,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8830,7 +8830,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8859,7 +8859,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8888,7 +8888,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8917,7 +8917,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8946,7 +8946,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -8975,7 +8975,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9005,7 +9005,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9035,7 +9035,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9064,7 +9064,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9093,7 +9093,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9122,7 +9122,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9151,7 +9151,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9180,7 +9180,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9209,7 +9209,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9238,7 +9238,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9267,7 +9267,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9297,7 +9297,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9327,7 +9327,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9356,7 +9356,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9385,7 +9385,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9414,7 +9414,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9443,7 +9443,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9472,7 +9472,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9501,7 +9501,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9530,7 +9530,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9559,7 +9559,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9588,7 +9588,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9617,7 +9617,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9646,7 +9646,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9675,7 +9675,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9704,7 +9704,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9733,7 +9733,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9762,7 +9762,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
   }
@@ -9811,7 +9811,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9840,7 +9840,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9869,7 +9869,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9898,7 +9898,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9927,7 +9927,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9956,7 +9956,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -9985,7 +9985,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10014,7 +10014,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10043,7 +10043,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10072,7 +10072,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10101,7 +10101,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10131,7 +10131,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10160,7 +10160,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10189,7 +10189,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10219,7 +10219,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10248,7 +10248,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10278,7 +10278,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10307,7 +10307,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10337,7 +10337,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10367,7 +10367,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10397,7 +10397,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10426,7 +10426,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10456,7 +10456,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10485,7 +10485,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10515,7 +10515,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10545,7 +10545,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10575,7 +10575,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10605,7 +10605,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10635,7 +10635,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10664,7 +10664,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10696,7 +10696,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10728,7 +10728,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10757,7 +10757,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10786,7 +10786,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10815,7 +10815,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10844,7 +10844,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10873,7 +10873,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10902,7 +10902,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10931,7 +10931,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10960,7 +10960,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -10990,7 +10990,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11020,7 +11020,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11050,7 +11050,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11080,7 +11080,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11109,7 +11109,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11138,7 +11138,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11167,7 +11167,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11196,7 +11196,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11225,7 +11225,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11254,7 +11254,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11283,7 +11283,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11312,7 +11312,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11342,7 +11342,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11371,7 +11371,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11400,7 +11400,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11429,7 +11429,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11458,7 +11458,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11487,7 +11487,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11516,7 +11516,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11545,7 +11545,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11574,7 +11574,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11603,7 +11603,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11632,7 +11632,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11661,7 +11661,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11690,7 +11690,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11719,7 +11719,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11748,7 +11748,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11778,7 +11778,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11807,7 +11807,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11836,7 +11836,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11865,7 +11865,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11894,7 +11894,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11923,7 +11923,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11952,7 +11952,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -11981,7 +11981,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12010,7 +12010,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12039,7 +12039,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12068,7 +12068,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12097,7 +12097,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12126,7 +12126,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12155,7 +12155,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12185,7 +12185,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12215,7 +12215,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12245,7 +12245,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12274,7 +12274,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12304,7 +12304,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12333,7 +12333,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12362,7 +12362,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12391,7 +12391,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12420,7 +12420,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12449,7 +12449,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12478,7 +12478,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12507,7 +12507,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12536,7 +12536,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12566,7 +12566,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12595,7 +12595,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12625,7 +12625,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12654,7 +12654,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12683,7 +12683,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12712,7 +12712,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12741,7 +12741,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12770,7 +12770,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12799,7 +12799,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12829,7 +12829,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12859,7 +12859,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12888,7 +12888,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12917,7 +12917,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12946,7 +12946,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -12975,7 +12975,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -13004,7 +13004,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -13034,7 +13034,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -13064,7 +13064,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -13093,7 +13093,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -13122,7 +13122,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -13151,7 +13151,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -13180,7 +13180,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -13209,7 +13209,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
     builders {
@@ -13238,7 +13238,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
   }
@@ -13288,7 +13288,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 2
+        value: 20
       }
     }
   }
diff --git a/main.star b/main.star
index f20db1288be7..ec913254c113 100755
--- a/main.star
+++ b/main.star
@@ -19,8 +19,8 @@ lucicfg.check_version("1.21.5")
 # Enable LUCI Realms support.
 lucicfg.enable_experiment("crbug.com/1085650")
 
-# Launch 2% of Swarming tasks in "realms-aware mode", crbug.com/1170330.
-luci.builder.defaults.experiments.set({"luci.use_realms": 2})
+# Launch 20% of Swarming tasks in "realms-aware mode", crbug.com/1170330.
+luci.builder.defaults.experiments.set({"luci.use_realms": 20})
 
 DART_GIT = "https://dart.googlesource.com/sdk"
 DART_GERRIT = "https://dart-review.googlesource.com/"

From 52e68204c87e43212cf2140d28b26ea23da30cf9 Mon Sep 17 00:00:00 2001
From: Andrii Shyshkalov <tandrii@google.com>
Date: Thu, 18 Feb 2021 14:28:10 +0000
Subject: [PATCH 448/826] Bump realms usage to 100% of bb/swarming tasks.

Bug: chromium:1170330
Change-Id: Ibd4b5bd9849abe2283092c835817e97d5101d873
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/185582
Auto-Submit: Andrii Shyshkalov <tandrii@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 900 ++++++++++++++++++++++-----------------------
 main.star          |   4 +-
 2 files changed, 452 insertions(+), 452 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 43912d8a7cf1..1cf47cb62b85 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -45,7 +45,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -75,7 +75,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -104,7 +104,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -133,7 +133,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -162,7 +162,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -191,7 +191,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -220,7 +220,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -249,7 +249,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -278,7 +278,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -307,7 +307,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -336,7 +336,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -365,7 +365,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -394,7 +394,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -423,7 +423,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -452,7 +452,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -481,7 +481,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -510,7 +510,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -539,7 +539,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -568,7 +568,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -597,7 +597,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -626,7 +626,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -656,7 +656,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -688,7 +688,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -718,7 +718,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -752,7 +752,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -785,7 +785,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -815,7 +815,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
   }
@@ -866,7 +866,7 @@ buckets {
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
   }
@@ -915,7 +915,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -944,7 +944,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -973,7 +973,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1002,7 +1002,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1031,7 +1031,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1060,7 +1060,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1089,7 +1089,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1118,7 +1118,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1147,7 +1147,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1176,7 +1176,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1205,7 +1205,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1234,7 +1234,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1263,7 +1263,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1292,7 +1292,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1321,7 +1321,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1350,7 +1350,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1379,7 +1379,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1408,7 +1408,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1437,7 +1437,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1466,7 +1466,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1495,7 +1495,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1524,7 +1524,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1553,7 +1553,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1582,7 +1582,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1611,7 +1611,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1640,7 +1640,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1669,7 +1669,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1698,7 +1698,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1727,7 +1727,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1756,7 +1756,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1785,7 +1785,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1815,7 +1815,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1845,7 +1845,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1875,7 +1875,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1905,7 +1905,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1935,7 +1935,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1965,7 +1965,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -1995,7 +1995,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2024,7 +2024,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2053,7 +2053,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2082,7 +2082,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2111,7 +2111,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2141,7 +2141,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2171,7 +2171,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2201,7 +2201,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2231,7 +2231,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2260,7 +2260,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2289,7 +2289,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2318,7 +2318,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2347,7 +2347,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2377,7 +2377,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2407,7 +2407,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2437,7 +2437,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2467,7 +2467,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2497,7 +2497,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2527,7 +2527,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2557,7 +2557,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2587,7 +2587,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2617,7 +2617,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2647,7 +2647,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2677,7 +2677,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2707,7 +2707,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2736,7 +2736,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2765,7 +2765,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2794,7 +2794,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2823,7 +2823,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2853,7 +2853,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2883,7 +2883,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2913,7 +2913,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2943,7 +2943,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -2973,7 +2973,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3002,7 +3002,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3031,7 +3031,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3060,7 +3060,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3089,7 +3089,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3119,7 +3119,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3149,7 +3149,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3179,7 +3179,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3209,7 +3209,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3239,7 +3239,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3269,7 +3269,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3299,7 +3299,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3329,7 +3329,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3359,7 +3359,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3389,7 +3389,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3419,7 +3419,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3449,7 +3449,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3479,7 +3479,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3509,7 +3509,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3539,7 +3539,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3569,7 +3569,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3599,7 +3599,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3628,7 +3628,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3660,7 +3660,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3692,7 +3692,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3721,7 +3721,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3750,7 +3750,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3779,7 +3779,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3808,7 +3808,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3837,7 +3837,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3866,7 +3866,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3895,7 +3895,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3924,7 +3924,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3953,7 +3953,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -3982,7 +3982,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4011,7 +4011,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4040,7 +4040,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4069,7 +4069,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4098,7 +4098,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4127,7 +4127,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4156,7 +4156,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4185,7 +4185,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4214,7 +4214,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4243,7 +4243,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4273,7 +4273,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4302,7 +4302,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4331,7 +4331,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4360,7 +4360,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4389,7 +4389,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4418,7 +4418,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4448,7 +4448,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4478,7 +4478,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4508,7 +4508,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4538,7 +4538,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4568,7 +4568,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4598,7 +4598,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4628,7 +4628,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4658,7 +4658,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4688,7 +4688,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4718,7 +4718,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4748,7 +4748,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4778,7 +4778,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4808,7 +4808,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4838,7 +4838,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4867,7 +4867,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4896,7 +4896,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4925,7 +4925,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4954,7 +4954,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -4983,7 +4983,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5012,7 +5012,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5041,7 +5041,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5070,7 +5070,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5099,7 +5099,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5128,7 +5128,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5157,7 +5157,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5186,7 +5186,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5215,7 +5215,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5244,7 +5244,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5273,7 +5273,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5302,7 +5302,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5331,7 +5331,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5360,7 +5360,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5389,7 +5389,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5418,7 +5418,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5447,7 +5447,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5476,7 +5476,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5505,7 +5505,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5534,7 +5534,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5563,7 +5563,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5592,7 +5592,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5621,7 +5621,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5650,7 +5650,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5680,7 +5680,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5710,7 +5710,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5739,7 +5739,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5768,7 +5768,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5797,7 +5797,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5826,7 +5826,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5855,7 +5855,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5884,7 +5884,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5913,7 +5913,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5942,7 +5942,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -5971,7 +5971,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6000,7 +6000,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6029,7 +6029,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6058,7 +6058,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6087,7 +6087,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6116,7 +6116,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6145,7 +6145,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6174,7 +6174,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6203,7 +6203,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6232,7 +6232,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6261,7 +6261,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6290,7 +6290,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6319,7 +6319,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6348,7 +6348,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6377,7 +6377,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6406,7 +6406,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6435,7 +6435,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6464,7 +6464,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6493,7 +6493,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6522,7 +6522,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6551,7 +6551,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6580,7 +6580,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6609,7 +6609,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6638,7 +6638,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6667,7 +6667,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6696,7 +6696,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6726,7 +6726,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6755,7 +6755,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6784,7 +6784,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6813,7 +6813,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6842,7 +6842,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6871,7 +6871,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6900,7 +6900,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6929,7 +6929,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6958,7 +6958,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -6987,7 +6987,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7016,7 +7016,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7045,7 +7045,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7074,7 +7074,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7103,7 +7103,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7132,7 +7132,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7161,7 +7161,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7190,7 +7190,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7219,7 +7219,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7248,7 +7248,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7278,7 +7278,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7308,7 +7308,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7338,7 +7338,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7368,7 +7368,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7398,7 +7398,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7428,7 +7428,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7458,7 +7458,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7488,7 +7488,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7518,7 +7518,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7548,7 +7548,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7577,7 +7577,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7607,7 +7607,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7637,7 +7637,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7667,7 +7667,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7697,7 +7697,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7726,7 +7726,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7755,7 +7755,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7784,7 +7784,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7813,7 +7813,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7842,7 +7842,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7871,7 +7871,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7900,7 +7900,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7929,7 +7929,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7958,7 +7958,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -7987,7 +7987,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8016,7 +8016,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8045,7 +8045,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8074,7 +8074,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8103,7 +8103,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8132,7 +8132,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8161,7 +8161,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8190,7 +8190,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8219,7 +8219,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8248,7 +8248,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8277,7 +8277,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8306,7 +8306,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8335,7 +8335,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8364,7 +8364,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8393,7 +8393,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8422,7 +8422,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8451,7 +8451,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8480,7 +8480,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8509,7 +8509,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8538,7 +8538,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8568,7 +8568,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8597,7 +8597,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8627,7 +8627,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8656,7 +8656,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8685,7 +8685,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8714,7 +8714,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8743,7 +8743,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8772,7 +8772,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8801,7 +8801,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8830,7 +8830,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8859,7 +8859,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8888,7 +8888,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8917,7 +8917,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8946,7 +8946,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -8975,7 +8975,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9005,7 +9005,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9035,7 +9035,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9064,7 +9064,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9093,7 +9093,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9122,7 +9122,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9151,7 +9151,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9180,7 +9180,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9209,7 +9209,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9238,7 +9238,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9267,7 +9267,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9297,7 +9297,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9327,7 +9327,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9356,7 +9356,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9385,7 +9385,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9414,7 +9414,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9443,7 +9443,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9472,7 +9472,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9501,7 +9501,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9530,7 +9530,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9559,7 +9559,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9588,7 +9588,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9617,7 +9617,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9646,7 +9646,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9675,7 +9675,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9704,7 +9704,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9733,7 +9733,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9762,7 +9762,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
   }
@@ -9811,7 +9811,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9840,7 +9840,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9869,7 +9869,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9898,7 +9898,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9927,7 +9927,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9956,7 +9956,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -9985,7 +9985,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10014,7 +10014,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10043,7 +10043,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10072,7 +10072,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10101,7 +10101,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10131,7 +10131,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10160,7 +10160,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10189,7 +10189,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10219,7 +10219,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10248,7 +10248,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10278,7 +10278,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10307,7 +10307,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10337,7 +10337,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10367,7 +10367,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10397,7 +10397,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10426,7 +10426,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10456,7 +10456,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10485,7 +10485,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10515,7 +10515,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10545,7 +10545,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10575,7 +10575,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10605,7 +10605,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10635,7 +10635,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10664,7 +10664,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10696,7 +10696,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10728,7 +10728,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10757,7 +10757,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10786,7 +10786,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10815,7 +10815,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10844,7 +10844,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10873,7 +10873,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10902,7 +10902,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10931,7 +10931,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10960,7 +10960,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -10990,7 +10990,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11020,7 +11020,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11050,7 +11050,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11080,7 +11080,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11109,7 +11109,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11138,7 +11138,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11167,7 +11167,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11196,7 +11196,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11225,7 +11225,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11254,7 +11254,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11283,7 +11283,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11312,7 +11312,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11342,7 +11342,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11371,7 +11371,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11400,7 +11400,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11429,7 +11429,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11458,7 +11458,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11487,7 +11487,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11516,7 +11516,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11545,7 +11545,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11574,7 +11574,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11603,7 +11603,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11632,7 +11632,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11661,7 +11661,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11690,7 +11690,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11719,7 +11719,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11748,7 +11748,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11778,7 +11778,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11807,7 +11807,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11836,7 +11836,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11865,7 +11865,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11894,7 +11894,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11923,7 +11923,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11952,7 +11952,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -11981,7 +11981,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12010,7 +12010,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12039,7 +12039,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12068,7 +12068,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12097,7 +12097,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12126,7 +12126,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12155,7 +12155,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12185,7 +12185,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12215,7 +12215,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12245,7 +12245,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12274,7 +12274,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12304,7 +12304,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12333,7 +12333,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12362,7 +12362,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12391,7 +12391,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12420,7 +12420,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12449,7 +12449,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12478,7 +12478,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12507,7 +12507,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12536,7 +12536,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12566,7 +12566,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12595,7 +12595,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12625,7 +12625,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12654,7 +12654,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12683,7 +12683,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12712,7 +12712,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12741,7 +12741,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12770,7 +12770,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12799,7 +12799,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12829,7 +12829,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12859,7 +12859,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12888,7 +12888,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12917,7 +12917,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12946,7 +12946,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -12975,7 +12975,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -13004,7 +13004,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -13034,7 +13034,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -13064,7 +13064,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -13093,7 +13093,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -13122,7 +13122,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -13151,7 +13151,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -13180,7 +13180,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -13209,7 +13209,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
     builders {
@@ -13238,7 +13238,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
   }
@@ -13288,7 +13288,7 @@ buckets {
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.use_realms"
-        value: 20
+        value: 100
       }
     }
   }
diff --git a/main.star b/main.star
index ec913254c113..8365db8e14ee 100755
--- a/main.star
+++ b/main.star
@@ -19,8 +19,8 @@ lucicfg.check_version("1.21.5")
 # Enable LUCI Realms support.
 lucicfg.enable_experiment("crbug.com/1085650")
 
-# Launch 20% of Swarming tasks in "realms-aware mode", crbug.com/1170330.
-luci.builder.defaults.experiments.set({"luci.use_realms": 20})
+# Launch 100% of Swarming tasks in "realms-aware mode", crbug.com/1170330.
+luci.builder.defaults.experiments.set({"luci.use_realms": 100})
 
 DART_GIT = "https://dart.googlesource.com/sdk"
 DART_GERRIT = "https://dart-review.googlesource.com/"

From 5fe21f2ec1415aa45653eea2a7b9c186dc6d6722 Mon Sep 17 00:00:00 2001
From: Alexander Aprelev <aam@google.com>
Date: Tue, 2 Mar 2021 02:22:00 +0000
Subject: [PATCH 449/826] Add flutter-plugins to flutter-engine-linux hhh
 buildbot

Fixes https://github.com/dart-lang/sdk/issues/44811

Change-Id: Id34d7809ecf77663e24cc0be3a92cf7929bb46c4
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/188363
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Aprelev <aam@google.com>
---
 cr-buildbucket.cfg | 4 ++--
 main.star          | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 1cf47cb62b85..661cce4a773f 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -3648,7 +3648,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
         properties_j: "clobber:true"
-        properties_j: "flutter_test_suites:[\"add_to_app_life_cycle_tests\",\"framework_coverage\",\"framework_tests\",\"tool_tests\"]"
+        properties_j: "flutter_test_suites:[\"add_to_app_life_cycle_tests\",\"flutter_plugins\",\"framework_coverage\",\"framework_tests\",\"tool_tests\"]"
       }
       priority: 50
       execution_timeout_secs: 28800
@@ -10684,7 +10684,7 @@ buckets {
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "bisection_enabled:true"
         properties_j: "clobber:true"
-        properties_j: "flutter_test_suites:[\"add_to_app_life_cycle_tests\",\"framework_coverage\",\"framework_tests\",\"tool_tests\"]"
+        properties_j: "flutter_test_suites:[\"add_to_app_life_cycle_tests\",\"flutter_plugins\",\"framework_coverage\",\"framework_tests\",\"tool_tests\"]"
       }
       priority: 30
       execution_timeout_secs: 28800
diff --git a/main.star b/main.star
index 8365db8e14ee..3bf3c7752c1b 100755
--- a/main.star
+++ b/main.star
@@ -865,6 +865,7 @@ dart_ci_sandbox_builder(
         "bisection_enabled": True,
         "flutter_test_suites": [
             "add_to_app_life_cycle_tests",
+            "flutter_plugins",
             "framework_coverage",
             "framework_tests",
             "tool_tests",

From d2a0b135606b7b50144156fefba72cae6fc0fe65 Mon Sep 17 00:00:00 2001
From: Alexander Markov <alexmarkov@google.com>
Date: Tue, 2 Mar 2021 19:39:15 +0000
Subject: [PATCH 450/826] [infra] Add nightly builder for dwarf_stack_traces
 mode

Change-Id: If2e9d14bac6b02f1ea909a1ab9aa51fbb8103326
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/188141
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Markov <alexmarkov@google.com>
---
 commit-queue.cfg   |  4 ++++
 cr-buildbucket.cfg | 60 +++++++++++++++++++++++++++++++++++++++++++++-
 luci-milo.cfg      | 13 ++++++++++
 luci-notify.cfg    | 13 ++++++++++
 luci-scheduler.cfg | 11 +++++++++
 main.star          |  5 ++++
 6 files changed, 105 insertions(+), 1 deletion(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 66954012e506..6bc42b80d8fa 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -575,6 +575,10 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-asan-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-precomp-dwarf-linux-product-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-precomp-linux-debug-simarm64c-try"
         includable_only: true
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 661cce4a773f..6305af2eac9b 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -706,7 +706,7 @@ buckets {
         properties_j: "$dart/build:{\"disable_goma\":true}"
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "builders:[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"vm-kernel-nnbd-linux-debug-ia32\",\"vm-kernel-nnbd-linux-release-ia32\",\"vm-kernel-nnbd-linux-release-simarm\",\"vm-kernel-nnbd-linux-release-simarm64\",\"vm-kernel-nnbd-mac-debug-x64\",\"vm-kernel-nnbd-mac-release-x64\",\"vm-kernel-nnbd-win-release-ia32\",\"vm-kernel-nnbd-win-debug-x64\",\"vm-kernel-nnbd-win-release-x64\",\"vm-kernel-precomp-nnbd-linux-debug-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-debug-x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm64\",\"vm-kernel-precomp-nnbd-mac-release-simarm64\",\"vm-kernel-precomp-nnbd-win-release-x64\",\"app-kernel-linux-product-x64\",\"vm-kernel-linux-release-ia32\",\"vm-kernel-linux-debug-ia32\",\"vm-kernel-win-debug-ia32\",\"vm-kernel-win-release-ia32\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-linux-product-x64\",\"vm-kernel-mac-product-x64\",\"vm-kernel-win-product-x64\",\"vm-kernel-optcounter-threshold-linux-release-ia32\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\",\"vm-kernel-reload-linux-debug-x64\",\"vm-kernel-reload-linux-release-x64\",\"vm-kernel-reload-rollback-linux-debug-x64\",\"vm-kernel-reload-rollback-linux-release-x64\",\"vm-kernel-linux-debug-x64c\",\"vm-kernel-linux-debug-simarm64c\",\"vm-kernel-precomp-linux-debug-x64c\",\"vm-kernel-precomp-linux-debug-simarm64c\",\"analyzer-nnbd-mac-release\",\"analyzer-nnbd-win-release\"]"
+        properties_j: "builders:[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"vm-kernel-nnbd-linux-debug-ia32\",\"vm-kernel-nnbd-linux-release-ia32\",\"vm-kernel-nnbd-linux-release-simarm\",\"vm-kernel-nnbd-linux-release-simarm64\",\"vm-kernel-nnbd-mac-debug-x64\",\"vm-kernel-nnbd-mac-release-x64\",\"vm-kernel-nnbd-win-release-ia32\",\"vm-kernel-nnbd-win-debug-x64\",\"vm-kernel-nnbd-win-release-x64\",\"vm-kernel-precomp-nnbd-linux-debug-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-debug-x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm64\",\"vm-kernel-precomp-nnbd-mac-release-simarm64\",\"vm-kernel-precomp-nnbd-win-release-x64\",\"app-kernel-linux-product-x64\",\"vm-kernel-linux-release-ia32\",\"vm-kernel-linux-debug-ia32\",\"vm-kernel-win-debug-ia32\",\"vm-kernel-win-release-ia32\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-precomp-dwarf-linux-product-x64\",\"vm-kernel-linux-product-x64\",\"vm-kernel-mac-product-x64\",\"vm-kernel-win-product-x64\",\"vm-kernel-optcounter-threshold-linux-release-ia32\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\",\"vm-kernel-reload-linux-debug-x64\",\"vm-kernel-reload-linux-release-x64\",\"vm-kernel-reload-rollback-linux-debug-x64\",\"vm-kernel-reload-rollback-linux-release-x64\",\"vm-kernel-linux-debug-x64c\",\"vm-kernel-linux-debug-simarm64c\",\"vm-kernel-precomp-linux-debug-x64c\",\"vm-kernel-precomp-linux-debug-simarm64c\",\"analyzer-nnbd-mac-release\",\"analyzer-nnbd-win-release\"]"
         properties_j: "clobber:true"
       }
       priority: 50
@@ -7551,6 +7551,35 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-precomp-dwarf-linux-product-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:true"
+      }
+      priority: 70
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-precomp-linux-debug-simarm64c"
       swarming_host: "chromium-swarm.appspot.com"
@@ -12248,6 +12277,35 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-precomp-dwarf-linux-product-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:true"
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-precomp-linux-debug-simarm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 9d1d1d5d08b1..1ca60eb1fed2 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -290,6 +290,11 @@ consoles {
     category: "vm|kernel-precomp"
     short_name: "cra"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-dwarf-linux-product-x64"
+    category: "vm|kernel-precomp"
+    short_name: "dw"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64"
     category: "vm|kernel-precomp|android"
@@ -1112,6 +1117,11 @@ consoles {
     category: "vm|kernel-precomp"
     short_name: "cra"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-dwarf-linux-product-x64"
+    category: "vm|kernel-precomp"
+    short_name: "dw"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64"
     category: "vm|kernel-precomp|android"
@@ -2630,6 +2640,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-release-x64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-dwarf-linux-product-x64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm_x64-try"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index bda8b143f4d6..91dba22cc1e4 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -1362,6 +1362,19 @@ notifiers {
     name: "vm-kernel-precomp-asan-linux-release-x64"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-dwarf-linux-product-x64"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index a3ba802a5649..c68cbb19f6aa 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -2791,6 +2791,17 @@ job {
     builder: "vm-kernel-precomp-asan-linux-release-x64"
   }
 }
+job {
+  id: "vm-kernel-precomp-dwarf-linux-product-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-dwarf-linux-product-x64"
+  }
+}
 job {
   id: "vm-kernel-precomp-linux-debug-simarm64c"
   realm: "ci.sandbox"
diff --git a/main.star b/main.star
index 3bf3c7752c1b..f6937828bfec 100755
--- a/main.star
+++ b/main.star
@@ -1130,6 +1130,11 @@ nightly_builder(
     channels = [],
     properties = {"shard_timeout": (90 * time.minute) // time.second},
 )
+nightly_builder(
+    "vm-kernel-precomp-dwarf-linux-product-x64",
+    category = "vm|kernel-precomp|dw",
+    channels = ["try"],
+)
 
 # vm|kernel-precomp|android
 dart_vm_extra_builder(

From bf6c09704ce9d21d1655644795e118bca0266f65 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 12 Mar 2021 08:45:39 +0000
Subject: [PATCH 451/826] [infra] Notify the VM team about nightly build
 failures

* Also updates dart-fuzz-testing notifier.

Change-Id: I85a84e7e773285f1cf8c91da451ec985b277d20d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/190521
Reviewed-by: Vyacheslav Egorov <vegorov@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 luci-notify.cfg | 88 ++++++++++++++++---------------------------------
 main.star       | 79 +++++++++++++++++++++++++-------------------
 2 files changed, 74 insertions(+), 93 deletions(-)

diff --git a/luci-notify.cfg b/luci-notify.cfg
index 91dba22cc1e4..548f52aa82bd 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -342,8 +342,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -397,8 +396,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -753,11 +751,9 @@ notifiers {
 }
 notifiers {
   notifications {
-    on_success: true
     on_failure: true
     email {
-      recipients: "ajcbik@google.com"
-      recipients: "athom@google.com"
+      recipients: "bkonyi@google.com"
     }
   }
   builders {
@@ -978,8 +974,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -991,8 +986,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1018,8 +1012,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1031,8 +1024,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1044,8 +1036,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1113,8 +1104,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1153,8 +1143,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1180,8 +1169,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1193,8 +1181,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1206,8 +1193,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1233,8 +1219,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1246,8 +1231,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1259,8 +1243,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1272,8 +1255,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1285,8 +1267,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1298,8 +1279,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1366,8 +1346,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1379,8 +1358,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1420,8 +1398,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1676,8 +1653,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1689,8 +1665,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1702,8 +1677,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1715,8 +1689,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1754,8 +1727,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1781,8 +1753,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1794,8 +1765,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
diff --git a/main.star b/main.star
index f6937828bfec..4f3b347f965c 100755
--- a/main.star
+++ b/main.star
@@ -384,6 +384,12 @@ luci.notifier(
     notify_blamelist = True,
 )
 
+luci.notifier(
+    name = "dart-vm-team",
+    on_new_failure = True,
+    notify_emails = ["dart-vm-team-breakages@google.com"],
+)
+
 luci.notifier(
     name = "nightly",
     on_new_failure = True,
@@ -392,9 +398,9 @@ luci.notifier(
 
 luci.notifier(
     name = "dart-fuzz-testing",
-    on_success = True,
+    on_success = False,
     on_failure = True,
-    notify_emails = ["ajcbik@google.com", "athom@google.com"],
+    notify_emails = ["bkonyi@google.com"],
 )
 
 luci.notifier(
@@ -632,7 +638,7 @@ def dart_builder(
     if lkgr:
         lkgr_builders.append({"project": "dart", "bucket": bucket, "builder": name})
 
-    def builder(channel, triggered_by):
+    def builder(channel, notifies, triggered_by):
         if channel == "try":
             dart_try_builder(
                 name,
@@ -665,6 +671,8 @@ def dart_builder(
                         trigger.replace("dart-vm-", "dart-")
                         for trigger in triggered_by
                     ]
+
+            notifies = [notifies] if type(notifies) == type("") else notifies
             luci.builder(
                 name = builder,
                 build_numbers = True,
@@ -676,7 +684,7 @@ def dart_builder(
                 expiration_timeout = expiration_timeout,
                 priority = priority,
                 properties = builder_properties,
-                notifies = [notifies] if notifies and not channel and enabled else None,
+                notifies = notifies if enabled else None,
                 schedule = schedule if enabled else None,
                 service_account = service_account,
                 swarming_tags = ["vpython:native-python-wrapper"],
@@ -708,10 +716,10 @@ def dart_builder(
                             console_view = "alt",
                         )
 
-    builder(None, triggered_by = triggered_by)
+    builder(None, notifies = notifies, triggered_by = triggered_by)
     for channel in channels:
         if enabled:
-            builder(channel, triggered_by = triggered_by)
+            builder(channel, notifies = None, triggered_by = triggered_by)
 
 def dart_ci_builder(name, bucket = "ci", dimensions = {}, **kwargs):
     dimensions.setdefault("pool", "luci.dart.ci")
@@ -772,6 +780,9 @@ def dart_vm_low_priority_builder(name, **kwargs):
         **kwargs
     )
 
+def dart_vm_nightly_builder(name, **kwargs):
+    nightly_builder(name, notifies = "dart-vm-team", **kwargs)
+
 # These lists are used to collect all nightly/weekly builders to give them as
 # properties to the "nightly"/"weekly" builder defined below, which triggers
 # the actual builds using the "cron" recipe.
@@ -900,51 +911,51 @@ dart_vm_extra_builder(
     category = "vm|nnbd|jit|r",
     on_cq = True,
 )
-nightly_builder(
+dart_vm_nightly_builder(
     "vm-kernel-nnbd-linux-debug-ia32",
     category = "vm|nnbd|jit|d3",
     channels = ["try"],
 )
-nightly_builder(
+dart_vm_nightly_builder(
     "vm-kernel-nnbd-linux-release-ia32",
     category = "vm|nnbd|jit|r3",
     channels = ["try"],
 )
-nightly_builder(
+dart_vm_nightly_builder(
     "vm-kernel-nnbd-linux-release-simarm",
     category = "vm|nnbd|jit|ra",
     channels = ["try"],
 )
-nightly_builder(
+dart_vm_nightly_builder(
     "vm-kernel-nnbd-linux-release-simarm64",
     category = "vm|nnbd|jit|ra6",
     channels = ["try"],
 )
-nightly_builder(
+dart_vm_nightly_builder(
     "vm-kernel-nnbd-mac-debug-x64",
     category = "vm|nnbd|jit|md",
     channels = ["try"],
     dimensions = mac(),
 )
-nightly_builder(
+dart_vm_nightly_builder(
     "vm-kernel-nnbd-mac-release-x64",
     category = "vm|nnbd|jit|mr",
     channels = ["try"],
     dimensions = mac(),
 )
-nightly_builder(
+dart_vm_nightly_builder(
     "vm-kernel-nnbd-win-release-ia32",
     category = "vm|nnbd|jit|wr3",
     channels = ["try"],
     dimensions = windows(),
 )
-nightly_builder(
+dart_vm_nightly_builder(
     "vm-kernel-nnbd-win-debug-x64",
     category = "vm|nnbd|jit|wd",
     channels = ["try"],
     dimensions = windows(),
 )
-nightly_builder(
+dart_vm_nightly_builder(
     "vm-kernel-nnbd-win-release-x64",
     category = "vm|nnbd|jit|wr",
     channels = ["try"],
@@ -995,7 +1006,7 @@ dart_vm_extra_builder(
     "app-kernel-linux-debug-x64",
     category = "vm|app-kernel|d64",
 )
-nightly_builder(
+dart_vm_nightly_builder(
     "app-kernel-linux-product-x64",
     category = "vm|app-kernel|p64",
     channels = ["try"],
@@ -1020,7 +1031,7 @@ dart_vm_extra_builder(
     "vm-kernel-linux-release-simarm64",
     category = "vm|kernel|a64",
 )
-nightly_builder(
+dart_vm_nightly_builder(
     "vm-kernel-linux-release-ia32",
     category = "vm|kernel|r32",
     channels = ["try"],
@@ -1034,7 +1045,7 @@ dart_vm_extra_builder(
     "vm-kernel-checked-linux-release-x64",
     category = "vm|kernel|rc",
 )
-nightly_builder(
+dart_vm_nightly_builder(
     "vm-kernel-linux-debug-ia32",
     category = "vm|kernel|d32",
     channels = ["try"],
@@ -1051,7 +1062,7 @@ dart_ci_sandbox_builder(
     on_cq = True,
     experiment_percentage = 5,
 )
-nightly_builder(
+dart_vm_nightly_builder(
     "vm-kernel-win-debug-ia32",
     category = "vm|kernel|wd3",
     channels = ["try"],
@@ -1062,7 +1073,7 @@ dart_ci_sandbox_builder(
     category = "vm|kernel|wd",
     dimensions = windows(),
 )
-nightly_builder(
+dart_vm_nightly_builder(
     "vm-kernel-win-release-ia32",
     category = "vm|kernel|wr3",
     channels = ["try"],
@@ -1124,13 +1135,13 @@ dart_vm_extra_builder(
     category = "vm|kernel-precomp|wr",
     dimensions = windows(),
 )
-nightly_builder(
+dart_vm_nightly_builder(
     "cross-vm-precomp-linux-release-arm64",
     category = "vm|kernel-precomp|cra",
     channels = [],
     properties = {"shard_timeout": (90 * time.minute) // time.second},
 )
-nightly_builder(
+dart_vm_nightly_builder(
     "vm-kernel-precomp-dwarf-linux-product-x64",
     category = "vm|kernel-precomp|dw",
     channels = ["try"],
@@ -1149,18 +1160,18 @@ dart_vm_extra_builder(
 )
 
 # vm|product
-nightly_builder(
+dart_vm_nightly_builder(
     "vm-kernel-linux-product-x64",
     category = "vm|product|l",
     channels = ["try"],
 )
-nightly_builder(
+dart_vm_nightly_builder(
     "vm-kernel-mac-product-x64",
     category = "vm|product|m",
     channels = ["try"],
     dimensions = mac(),
 )
-nightly_builder(
+dart_vm_nightly_builder(
     "vm-kernel-win-product-x64",
     category = "vm|product|w",
     channels = ["try"],
@@ -1168,7 +1179,7 @@ nightly_builder(
 )
 
 # vm|misc
-nightly_builder(
+dart_vm_nightly_builder(
     "vm-kernel-optcounter-threshold-linux-release-ia32",
     category = "vm|misc|o32",
     channels = ["try"],
@@ -1220,42 +1231,42 @@ dart_vm_sanitizer_builder(
     category = "vm|misc|aot|u",
     goma = False,
 )  # ubsan is not compatible with our sysroot.
-nightly_builder(
+dart_vm_nightly_builder(
     "vm-kernel-reload-linux-debug-x64",
     category = "vm|misc|reload|d",
     channels = ["try"],
 )
-nightly_builder(
+dart_vm_nightly_builder(
     "vm-kernel-reload-linux-release-x64",
     category = "vm|misc|reload|r",
     channels = ["try"],
 )
-nightly_builder(
+dart_vm_nightly_builder(
     "vm-kernel-reload-rollback-linux-debug-x64",
     category = "vm|misc|reload|drb",
     channels = ["try"],
 )
-nightly_builder(
+dart_vm_nightly_builder(
     "vm-kernel-reload-rollback-linux-release-x64",
     category = "vm|misc|reload|rrb",
     channels = ["try"],
 )
-nightly_builder(
+dart_vm_nightly_builder(
     "vm-kernel-linux-debug-x64c",
     category = "vm|misc|compressed|ji",
     channels = ["try"],
 )
-nightly_builder(
+dart_vm_nightly_builder(
     "vm-kernel-linux-debug-simarm64c",
     category = "vm|misc|compressed|ja",
     channels = ["try"],
 )
-nightly_builder(
+dart_vm_nightly_builder(
     "vm-kernel-precomp-linux-debug-x64c",
     category = "vm|misc|compressed|ai",
     channels = ["try"],
 )
-nightly_builder(
+dart_vm_nightly_builder(
     "vm-kernel-precomp-linux-debug-simarm64c",
     category = "vm|misc|compressed|aa",
     channels = ["try"],

From c6b001465a26bab4f99dbd347d19efa69d445844 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 23 Mar 2021 21:41:44 +0000
Subject: [PATCH 452/826] [infra] Limit flutter-analyze to 25 minutes

This builder is currently hanging frequently and using 3 hours to time
out.

TBR=whesse@google.com

Change-Id: Iccef1a520b139347f69ff6135b09037a1ca9dc14
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/192742
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 2 ++
 main.star          | 1 +
 2 files changed, 3 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 6305af2eac9b..fb3e0655b2eb 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -3620,6 +3620,7 @@ buckets {
         properties_j: "clobber:true"
       }
       priority: 50
+      execution_timeout_secs: 1500
       caches {
         name: "browsers"
         path: "browsers"
@@ -10685,6 +10686,7 @@ buckets {
         properties_j: "clobber:true"
       }
       priority: 30
+      execution_timeout_secs: 1500
       caches {
         name: "browsers"
         path: "third_party/browsers"
diff --git a/main.star b/main.star
index 4f3b347f965c..eab2e8988e46 100755
--- a/main.star
+++ b/main.star
@@ -1379,6 +1379,7 @@ dart_ci_sandbox_builder(
     "flutter-analyze",
     category = "analyzer|fa",
     channels = ["try"],
+    execution_timeout = 25 * time.minute,
     location_regexp = [
         ".+/[+]/DEPS",
         ".+/[+]/pkg/analysis_server/.+",

From 2f73c27865ceb46535a69f33e83601e83e72b311 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Tue, 6 Apr 2021 17:09:18 +0000
Subject: [PATCH 453/826] [infra] Increase shard timeout on debug nnbd builders

Change-Id: I23c3c21e389a55c5582834c17597d71ad701e525
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/194064
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 6 ++++++
 main.star          | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index fb3e0655b2eb..7afd674f3b63 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -6746,6 +6746,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:true"
+        properties_j: "shard_timeout:5400"
       }
       priority: 70
       caches {
@@ -7094,6 +7095,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:true"
+        properties_j: "shard_timeout:5400"
       }
       priority: 70
       caches {
@@ -7152,6 +7154,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:true"
+        properties_j: "shard_timeout:5400"
       }
       priority: 70
       caches {
@@ -11828,6 +11831,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:true"
+        properties_j: "shard_timeout:5400"
       }
       priority: 30
       caches {
@@ -12002,6 +12006,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:true"
+        properties_j: "shard_timeout:5400"
       }
       priority: 30
       caches {
@@ -12060,6 +12065,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:true"
+        properties_j: "shard_timeout:5400"
       }
       priority: 30
       caches {
diff --git a/main.star b/main.star
index eab2e8988e46..1e5694ca20dc 100755
--- a/main.star
+++ b/main.star
@@ -915,6 +915,7 @@ dart_vm_nightly_builder(
     "vm-kernel-nnbd-linux-debug-ia32",
     category = "vm|nnbd|jit|d3",
     channels = ["try"],
+    properties = {"shard_timeout": (90 * time.minute) // time.second},
 )
 dart_vm_nightly_builder(
     "vm-kernel-nnbd-linux-release-ia32",
@@ -935,6 +936,7 @@ dart_vm_nightly_builder(
     "vm-kernel-nnbd-mac-debug-x64",
     category = "vm|nnbd|jit|md",
     channels = ["try"],
+    properties = {"shard_timeout": (90 * time.minute) // time.second},
     dimensions = mac(),
 )
 dart_vm_nightly_builder(
@@ -953,6 +955,7 @@ dart_vm_nightly_builder(
     "vm-kernel-nnbd-win-debug-x64",
     category = "vm|nnbd|jit|wd",
     channels = ["try"],
+    properties = {"shard_timeout": (90 * time.minute) // time.second},
     dimensions = windows(),
 )
 dart_vm_nightly_builder(

From e3c8c41eb36713c767d5f96962dd6077c5dc2f30 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 12 Apr 2021 07:27:55 +0000
Subject: [PATCH 454/826] [infra] Advertise Dart Infra chat on the consoles

Change-Id: I46f9bd0968d17adb767ca57bad9925adb268ec00
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/194784
Auto-Submit: Alexander Thomas <athom@google.com>
Commit-Queue: Karl Klose <karlklose@google.com>
Reviewed-by: Karl Klose <karlklose@google.com>
---
 console-header.textpb |  5 +++++
 luci-milo.cfg         | 25 +++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/console-header.textpb b/console-header.textpb
index 8e7d6fcaacd2..e558e00c1b0a 100644
--- a/console-header.textpb
+++ b/console-header.textpb
@@ -30,6 +30,11 @@ links: {
         url: "https://dart-ci.firebaseapp.com/current_results/"
         alt: "Current Test Results"
     }
+    links: {
+        text: "Dart Infrastructure chat"
+        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
+        alt: "Dart Infrastructure chat"
+    }
 }
 console_groups: {
     console_ids: "dart/flutter"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 1ca60eb1fed2..4d6075e510be 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -653,6 +653,11 @@ consoles {
         url: "https://dart-ci.firebaseapp.com/current_results/"
         alt: "Current Test Results"
       }
+      links {
+        text: "Dart Infrastructure chat"
+        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
+        alt: "Dart Infrastructure chat"
+      }
     }
     console_groups {
       console_ids: "dart/flutter"
@@ -1310,6 +1315,11 @@ consoles {
         url: "https://dart-ci.firebaseapp.com/current_results/"
         alt: "Current Test Results"
       }
+      links {
+        text: "Dart Infrastructure chat"
+        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
+        alt: "Dart Infrastructure chat"
+      }
     }
     console_groups {
       console_ids: "dart/flutter"
@@ -1682,6 +1692,11 @@ consoles {
         url: "https://dart-ci.firebaseapp.com/current_results/"
         alt: "Current Test Results"
       }
+      links {
+        text: "Dart Infrastructure chat"
+        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
+        alt: "Dart Infrastructure chat"
+      }
     }
     console_groups {
       console_ids: "dart/flutter"
@@ -2054,6 +2069,11 @@ consoles {
         url: "https://dart-ci.firebaseapp.com/current_results/"
         alt: "Current Test Results"
       }
+      links {
+        text: "Dart Infrastructure chat"
+        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
+        alt: "Dart Infrastructure chat"
+      }
     }
     console_groups {
       console_ids: "dart/flutter"
@@ -2426,6 +2446,11 @@ consoles {
         url: "https://dart-ci.firebaseapp.com/current_results/"
         alt: "Current Test Results"
       }
+      links {
+        text: "Dart Infrastructure chat"
+        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
+        alt: "Dart Infrastructure chat"
+      }
     }
     console_groups {
       console_ids: "dart/flutter"

From 7a6121702b470f2d180590819482b75411bee28e Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 14 Apr 2021 14:46:54 +0000
Subject: [PATCH 455/826] [infra] Increase shard timeouts for
 vm-kernel-precomp-nnbd-mac-release-simarm64

The builder's shards have started to flakily time out a couple days ago.

Change-Id: Ice90a0b68480488c07f0880ff2ed808dc15b9c22
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/195269
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 2 ++
 main.star          | 1 +
 2 files changed, 3 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 7afd674f3b63..6730d5892147 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -8853,6 +8853,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:true"
+        properties_j: "shard_timeout:5400"
       }
       priority: 70
       caches {
@@ -12797,6 +12798,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:true"
+        properties_j: "shard_timeout:5400"
       }
       priority: 30
       caches {
diff --git a/main.star b/main.star
index 1e5694ca20dc..27ff05cde5e6 100755
--- a/main.star
+++ b/main.star
@@ -996,6 +996,7 @@ nightly_builder(
     category = "vm|nnbd|aot|ma6",
     channels = ["try"],
     dimensions = mac(),
+    properties = {"shard_timeout": (90 * time.minute) // time.second},
 )
 nightly_builder(
     "vm-kernel-precomp-nnbd-win-release-x64",

From 4be829a3a9199743ccafe44b54002ed7235e8392 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 14 Apr 2021 16:09:15 +0000
Subject: [PATCH 456/826] [infra] Checkout jsshell on benchmark-linux-try

The benchmark builder runs commands that require jsshell.

TBR=whesse@google.com

Change-Id: I1f2b060c8615f8cf97aa68d2c9ceb6373ab7564a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/195273
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 1 +
 main.star          | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 6730d5892147..bf8866f53b32 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -10125,6 +10125,7 @@ buckets {
         properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
         properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
         properties_j: "clobber:true"
+        properties_j: "custom_vars:{\"checkout_javascript_engines\":true}"
       }
       priority: 30
       caches {
diff --git a/main.star b/main.star
index 27ff05cde5e6..48e623e34892 100755
--- a/main.star
+++ b/main.star
@@ -99,6 +99,7 @@ HIGHEST = 25  # Used for shards in the recipes, included here for completeness.
 
 CHROME = {"custom_vars": {"download_chrome": True}}
 FIREFOX = {"custom_vars": {"download_firefox": True}}
+JS_ENGINES = {"custom_vars": {"checkout_javascript_engines": True}}
 
 def to_location_regexp(paths):
     return [".+/[+]/%s" % path for path in paths]
@@ -1609,7 +1610,7 @@ dart_ci_sandbox_builder(
 )
 
 # Try only builders
-dart_try_builder("benchmark-linux", on_cq = True)
+dart_try_builder("benchmark-linux", on_cq = True, properties = JS_ENGINES)
 
 # Our sysroot does not support gcc, we can't use goma on RBE for this builder
 dart_try_builder("vm-kernel-gcc-linux", goma = False)

From a3014a15aab2f409d5b65c15fc9c3b2702b38dff Mon Sep 17 00:00:00 2001
From: Karl Klose <karlklose@google.com>
Date: Fri, 16 Apr 2021 07:56:47 +0000
Subject: [PATCH 457/826] [infra] Enable bbagent for autoroller and
 recipe-bundler

Change-Id: I7ff45c4d4785f61cf335299f1ba786d3334ab7fe
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/195241
Commit-Queue: Karl Klose <karlklose@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 24 ++++++------------------
 main.star          | 21 +++++++++++++--------
 2 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index bf8866f53b32..aead0b7a0015 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -729,19 +729,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "recipe_bundler"
+      exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
         cipd_version: "git_revision:40621e908eb88bd10451ee9d013b7ef89ea91e37"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "package_name_internal_prefix:\"dart_internal/recipe_bundles\""
-        properties_j: "package_name_prefix:\"dart/recipe_bundles\""
-        properties_j: "recipe_bundler_vers:\"git_revision:2ed88b2c854578b512e1c0486824175fe0d7aab6\""
-        properties_j: "repo_specs:[\"dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/master\"]"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"package_name_internal_prefix\":\"dart_internal/recipe_bundles\",\"package_name_prefix\":\"dart/recipe_bundles\",\"recipe\":\"recipe_bundler\",\"recipe_bundler_vers\":\"git_revision:2ed88b2c854578b512e1c0486824175fe0d7aab6\",\"repo_specs\":[\"dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/master\"]}"
       priority: 50
       execution_timeout_secs: 300
       caches {
@@ -763,17 +756,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "recipe_autoroller"
+      exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
         cipd_version: "git_revision:905c1df843d7771bf3adc0cf21f58eb9498ff063"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "db_gcs_bucket:\"dart-recipe-roller-db\""
-        properties_j: "projects:[[\"dart\",\"https://dart.googlesource.com/recipes\"]]"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"db_gcs_bucket\":\"dart-recipe-roller-db\",\"projects\":[[\"dart\",\"https://dart.googlesource.com/recipes\"]],\"recipe\":\"recipe_autoroller\"}"
       priority: 70
       execution_timeout_secs: 1200
       expiration_secs: 86400
diff --git a/main.star b/main.star
index 48e623e34892..ceedb1d3c426 100755
--- a/main.star
+++ b/main.star
@@ -1656,13 +1656,20 @@ luci.console_view_entry(
     console_view = "flutter-hhh",
 )
 
+def chromium_infra_recipe(name, cipd_version):
+    return luci.recipe(
+        name = name,
+        cipd_package =
+            "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
+        cipd_version = cipd_version,
+        use_bbagent = True,
+    )
+
 # Rolls dart recipe dependencies.
 dart_infra_builder(
     name = "recipe-deps-roller",
-    executable = luci.recipe(
-        name = "recipe_autoroller",
-        cipd_package =
-            "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
+    executable = chromium_infra_recipe(
+        "recipe_autoroller",
         cipd_version = "git_revision:905c1df843d7771bf3adc0cf21f58eb9498ff063",
     ),
     execution_timeout = 20 * time.minute,
@@ -1679,10 +1686,8 @@ dart_infra_builder(
 
 dart_infra_builder(
     name = "recipe-bundler",
-    executable = luci.recipe(
-        name = "recipe_bundler",
-        cipd_package =
-            "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
+    executable = chromium_infra_recipe(
+        "recipe_bundler",
         cipd_version = "git_revision:40621e908eb88bd10451ee9d013b7ef89ea91e37",
     ),
     execution_timeout = 5 * time.minute,

From ff2ef40e5f4b91f53b4801e829229f18943dc1d2 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 19 Apr 2021 07:18:20 +0000
Subject: [PATCH 458/826] [infra] Add debian-package try job

Change-Id: I41f98db756ee8c60ff00a28c3028ecb76575f06f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/195900
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 commit-queue.cfg   |  4 ++++
 cr-buildbucket.cfg | 29 +++++++++++++++++++++++++++++
 luci-milo.cfg      |  3 +++
 main.star          |  2 +-
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 6bc42b80d8fa..ef117bc88fff 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -308,6 +308,10 @@ config_groups {
         name: "dart/try/ddk-linux-release-firefox-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/debianpackage-linux-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/flutter-analyze-try"
         location_regexp: ".+/[+]/DEPS"
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index aead0b7a0015..9cce4ed2646b 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -10661,6 +10661,35 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "debianpackage-linux-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      recipe {
+        name: "dart/neo"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:false"
+      }
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "flutter-analyze-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 4d6075e510be..62fc5dc73f62 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2854,6 +2854,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/gclient-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/debianpackage-linux-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/benchmark-linux-try"
   }
diff --git a/main.star b/main.star
index ceedb1d3c426..18feb59f0b5a 100755
--- a/main.star
+++ b/main.star
@@ -1508,7 +1508,7 @@ dart_ci_sandbox_builder("gclient", recipe = "dart/gclient", category = "misc|g")
 dart_ci_builder(
     "debianpackage-linux",
     category = "misc|dp",
-    channels = RELEASE_CHANNELS,
+    channels = CHANNELS,
     lkgr = True,
     notifies = "infra",
     properties = {

From c69e16372fb6ba156d252880af634ef031281c25 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 19 Apr 2021 09:46:41 +0000
Subject: [PATCH 459/826] Revert "[infra] Add debian-package try job"

This reverts commit ff2ef40e5f4b91f53b4801e829229f18943dc1d2.

Reason for revert: no docker installed on try bots.

Original change's description:
> [infra] Add debian-package try job
>
> Change-Id: I41f98db756ee8c60ff00a28c3028ecb76575f06f
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/195900
> Auto-Submit: Alexander Thomas <athom@google.com>
> Reviewed-by: William Hesse <whesse@google.com>
> Commit-Queue: William Hesse <whesse@google.com>

TBR=whesse@google.com,athom@google.com

Change-Id: I4573daa67f0107eda8c7482da1e5f7ca1539539c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/195905
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg   |  4 ----
 cr-buildbucket.cfg | 29 -----------------------------
 luci-milo.cfg      |  3 ---
 main.star          |  2 +-
 4 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index ef117bc88fff..6bc42b80d8fa 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -308,10 +308,6 @@ config_groups {
         name: "dart/try/ddk-linux-release-firefox-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/debianpackage-linux-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/flutter-analyze-try"
         location_regexp: ".+/[+]/DEPS"
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 9cce4ed2646b..aead0b7a0015 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -10661,35 +10661,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "debianpackage-linux-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:false"
-      }
-      priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
     builders {
       name: "flutter-analyze-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 62fc5dc73f62..4d6075e510be 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2854,9 +2854,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/gclient-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/debianpackage-linux-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/benchmark-linux-try"
   }
diff --git a/main.star b/main.star
index 18feb59f0b5a..ceedb1d3c426 100755
--- a/main.star
+++ b/main.star
@@ -1508,7 +1508,7 @@ dart_ci_sandbox_builder("gclient", recipe = "dart/gclient", category = "misc|g")
 dart_ci_builder(
     "debianpackage-linux",
     category = "misc|dp",
-    channels = CHANNELS,
+    channels = RELEASE_CHANNELS,
     lkgr = True,
     notifies = "infra",
     properties = {

From 74e2baf0fc714525b186de5745b7320e75bc7b57 Mon Sep 17 00:00:00 2001
From: Karl Klose <karlklose@google.com>
Date: Tue, 20 Apr 2021 05:20:41 +0000
Subject: [PATCH 460/826] [infra] Enable bbagent for dart infra builders

Change-Id: I4c1a7cc7ff11e6fa6b91d880a12de45d5bbd4d7a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/195904
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Karl Klose <karlklose@google.com>
---
 cr-buildbucket.cfg | 105 ++++++++++++++-------------------------------
 main.star          |  19 ++++++++
 2 files changed, 52 insertions(+), 72 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index aead0b7a0015..1d4cc7a83cdb 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -26,15 +26,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "dart/forward_branch"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/forward_branch\"}"
       priority: 50
       execution_timeout_secs: 900
       caches {
@@ -56,15 +53,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "dart/cbuild"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/cbuild\"}"
       priority: 50
       execution_timeout_secs: 600
       caches {
@@ -86,15 +80,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "dart/chocolatey"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/chocolatey\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -115,15 +106,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "dart/package_co19"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/package_co19\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -608,15 +596,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "dart/docker"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/docker\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -637,16 +622,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "dart/linearize"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "repo:\"https://dart.googlesource.com/linear_sdk_flutter_engine.git\""
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/linearize\",\"repo\":\"https://dart.googlesource.com/linear_sdk_flutter_engine.git\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -667,17 +648,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "roller/lkgr"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "builders:[{\"bucket\":\"ci\",\"builder\":\"dart-sdk-linux\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-mac\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-win\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"debianpackage-linux\",\"project\":\"dart\"},{\"bucket\":\"ci.sandbox\",\"builder\":\"google\",\"project\":\"dart\"}]"
-        properties_j: "clobber:true"
-        properties_j: "ref:\"refs/heads/lkgr\""
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"builders\":[{\"bucket\":\"ci\",\"builder\":\"dart-sdk-linux\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-mac\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-win\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"debianpackage-linux\",\"project\":\"dart\"},{\"bucket\":\"ci.sandbox\",\"builder\":\"google\",\"project\":\"dart\"}],\"clobber\":true,\"recipe\":\"roller/lkgr\",\"ref\":\"refs/heads/lkgr\"}"
       priority: 50
       execution_timeout_secs: 900
       caches {
@@ -699,16 +675,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "cron/cron"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "builders:[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"vm-kernel-nnbd-linux-debug-ia32\",\"vm-kernel-nnbd-linux-release-ia32\",\"vm-kernel-nnbd-linux-release-simarm\",\"vm-kernel-nnbd-linux-release-simarm64\",\"vm-kernel-nnbd-mac-debug-x64\",\"vm-kernel-nnbd-mac-release-x64\",\"vm-kernel-nnbd-win-release-ia32\",\"vm-kernel-nnbd-win-debug-x64\",\"vm-kernel-nnbd-win-release-x64\",\"vm-kernel-precomp-nnbd-linux-debug-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-debug-x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm64\",\"vm-kernel-precomp-nnbd-mac-release-simarm64\",\"vm-kernel-precomp-nnbd-win-release-x64\",\"app-kernel-linux-product-x64\",\"vm-kernel-linux-release-ia32\",\"vm-kernel-linux-debug-ia32\",\"vm-kernel-win-debug-ia32\",\"vm-kernel-win-release-ia32\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-precomp-dwarf-linux-product-x64\",\"vm-kernel-linux-product-x64\",\"vm-kernel-mac-product-x64\",\"vm-kernel-win-product-x64\",\"vm-kernel-optcounter-threshold-linux-release-ia32\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\",\"vm-kernel-reload-linux-debug-x64\",\"vm-kernel-reload-linux-release-x64\",\"vm-kernel-reload-rollback-linux-debug-x64\",\"vm-kernel-reload-rollback-linux-release-x64\",\"vm-kernel-linux-debug-x64c\",\"vm-kernel-linux-debug-simarm64c\",\"vm-kernel-precomp-linux-debug-x64c\",\"vm-kernel-precomp-linux-debug-simarm64c\",\"analyzer-nnbd-mac-release\",\"analyzer-nnbd-win-release\"]"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"builders\":[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"vm-kernel-nnbd-linux-debug-ia32\",\"vm-kernel-nnbd-linux-release-ia32\",\"vm-kernel-nnbd-linux-release-simarm\",\"vm-kernel-nnbd-linux-release-simarm64\",\"vm-kernel-nnbd-mac-debug-x64\",\"vm-kernel-nnbd-mac-release-x64\",\"vm-kernel-nnbd-win-release-ia32\",\"vm-kernel-nnbd-win-debug-x64\",\"vm-kernel-nnbd-win-release-x64\",\"vm-kernel-precomp-nnbd-linux-debug-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-debug-x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm64\",\"vm-kernel-precomp-nnbd-mac-release-simarm64\",\"vm-kernel-precomp-nnbd-win-release-x64\",\"app-kernel-linux-product-x64\",\"vm-kernel-linux-release-ia32\",\"vm-kernel-linux-debug-ia32\",\"vm-kernel-win-debug-ia32\",\"vm-kernel-win-release-ia32\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-precomp-dwarf-linux-product-x64\",\"vm-kernel-linux-product-x64\",\"vm-kernel-mac-product-x64\",\"vm-kernel-win-product-x64\",\"vm-kernel-optcounter-threshold-linux-release-ia32\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\",\"vm-kernel-reload-linux-debug-x64\",\"vm-kernel-reload-linux-release-x64\",\"vm-kernel-reload-rollback-linux-debug-x64\",\"vm-kernel-reload-rollback-linux-release-x64\",\"vm-kernel-linux-debug-x64c\",\"vm-kernel-linux-debug-simarm64c\",\"vm-kernel-precomp-linux-debug-x64c\",\"vm-kernel-precomp-linux-debug-simarm64c\",\"analyzer-nnbd-mac-release\",\"analyzer-nnbd-win-release\"],\"clobber\":true,\"recipe\":\"cron/cron\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -784,16 +756,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "cron/cron"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "builders:[\"frontend-weekly\"]"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"builders\":[\"frontend-weekly\"],\"clobber\":true,\"recipe\":\"cron/cron\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -834,16 +802,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "roller/roll_to_dev"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "from_ref:\"refs/heads/lkgr\""
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"from_ref\":\"refs/heads/lkgr\",\"recipe\":\"roller/roll_to_dev\"}"
       priority: 50
       execution_timeout_secs: 900
       caches {
@@ -4418,15 +4382,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/external"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/external\"}"
       priority: 30
       execution_timeout_secs: 300
       caches {
diff --git a/main.star b/main.star
index ceedb1d3c426..2339d8f5cd2c 100755
--- a/main.star
+++ b/main.star
@@ -126,6 +126,20 @@ ROLL_TRIGGERERS = {
 }
 CI_SANDBOX_TRIGGERERS = [CI_ACCOUNT, TRY_ACCOUNT]
 
+# List of recipes to opt-in to using the bbagent protocol.
+BBAGENT_ALLOW_LIST = [
+    "dart/external",
+    "dart/forward_branch",
+    "dart/cbuild",
+    "dart/chocolatey",
+    "dart/package_co19",
+    "dart/docker",
+    "dart/linearize",
+    "roller/lkgr",
+    "roller/roll_to_dev",
+    "cron/cron",
+]
+
 lucicfg.config(
     config_dir = ".",
     tracked_files = [
@@ -470,9 +484,14 @@ luci.cq_group(
 )
 
 def dart_recipe(name):
+    # Use kwargs here because using the named argument `bb_agent` with value
+    # false will still change the builder definition to use 'exe' instead of
+    # 'recipe'.
+    enable_bbagent = {"use_bbagent": True} if name in BBAGENT_ALLOW_LIST else {}
     return luci.recipe(
         name = name,
         cipd_package = "dart/recipe_bundles/dart.googlesource.com/recipes",
+        **enable_bbagent
     )
 
 def with_goma(goma, channel, dimensions, properties):

From 90804b2b113f8e069d8d26556af96f86b31a8c8c Mon Sep 17 00:00:00 2001
From: Karl Klose <karlklose@google.com>
Date: Tue, 20 Apr 2021 08:28:36 +0000
Subject: [PATCH 461/826] Revert "[infra] Enable bbagent for autoroller and
 recipe-bundler"

This reverts commit a3014a15aab2f409d5b65c15fc9c3b2702b38dff.

Reason for revert: The recipe bundler does not work correctly with bbagent

TBR=athom@google.com

Original change's description:
> [infra] Enable bbagent for autoroller and recipe-bundler
>
> Change-Id: I7ff45c4d4785f61cf335299f1ba786d3334ab7fe
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/195241
> Commit-Queue: Karl Klose <karlklose@google.com>
> Reviewed-by: Alexander Thomas <athom@google.com>

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: I8c8f18cfd86d51fc642a6bf50f1684cb7631f5d0
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/195989
Reviewed-by: Karl Klose <karlklose@google.com>
Commit-Queue: Karl Klose <karlklose@google.com>
---
 cr-buildbucket.cfg | 24 ++++++++++++++++++------
 main.star          | 21 ++++++++-------------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 1d4cc7a83cdb..e0a1d9e2dc45 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -701,12 +701,19 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      exe {
+      recipe {
+        name: "recipe_bundler"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
         cipd_version: "git_revision:40621e908eb88bd10451ee9d013b7ef89ea91e37"
-        cmd: "luciexe"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:true"
+        properties_j: "package_name_internal_prefix:\"dart_internal/recipe_bundles\""
+        properties_j: "package_name_prefix:\"dart/recipe_bundles\""
+        properties_j: "recipe_bundler_vers:\"git_revision:2ed88b2c854578b512e1c0486824175fe0d7aab6\""
+        properties_j: "repo_specs:[\"dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/master\"]"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"package_name_internal_prefix\":\"dart_internal/recipe_bundles\",\"package_name_prefix\":\"dart/recipe_bundles\",\"recipe\":\"recipe_bundler\",\"recipe_bundler_vers\":\"git_revision:2ed88b2c854578b512e1c0486824175fe0d7aab6\",\"repo_specs\":[\"dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/master\"]}"
       priority: 50
       execution_timeout_secs: 300
       caches {
@@ -728,12 +735,17 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      exe {
+      recipe {
+        name: "recipe_autoroller"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
         cipd_version: "git_revision:905c1df843d7771bf3adc0cf21f58eb9498ff063"
-        cmd: "luciexe"
+        properties_j: "$dart/build:{\"disable_goma\":true}"
+        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
+        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
+        properties_j: "clobber:true"
+        properties_j: "db_gcs_bucket:\"dart-recipe-roller-db\""
+        properties_j: "projects:[[\"dart\",\"https://dart.googlesource.com/recipes\"]]"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"db_gcs_bucket\":\"dart-recipe-roller-db\",\"projects\":[[\"dart\",\"https://dart.googlesource.com/recipes\"]],\"recipe\":\"recipe_autoroller\"}"
       priority: 70
       execution_timeout_secs: 1200
       expiration_secs: 86400
diff --git a/main.star b/main.star
index 2339d8f5cd2c..8a04219d3d53 100755
--- a/main.star
+++ b/main.star
@@ -1675,20 +1675,13 @@ luci.console_view_entry(
     console_view = "flutter-hhh",
 )
 
-def chromium_infra_recipe(name, cipd_version):
-    return luci.recipe(
-        name = name,
-        cipd_package =
-            "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
-        cipd_version = cipd_version,
-        use_bbagent = True,
-    )
-
 # Rolls dart recipe dependencies.
 dart_infra_builder(
     name = "recipe-deps-roller",
-    executable = chromium_infra_recipe(
-        "recipe_autoroller",
+    executable = luci.recipe(
+        name = "recipe_autoroller",
+        cipd_package =
+            "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
         cipd_version = "git_revision:905c1df843d7771bf3adc0cf21f58eb9498ff063",
     ),
     execution_timeout = 20 * time.minute,
@@ -1705,8 +1698,10 @@ dart_infra_builder(
 
 dart_infra_builder(
     name = "recipe-bundler",
-    executable = chromium_infra_recipe(
-        "recipe_bundler",
+    executable = luci.recipe(
+        name = "recipe_bundler",
+        cipd_package =
+            "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
         cipd_version = "git_revision:40621e908eb88bd10451ee9d013b7ef89ea91e37",
     ),
     execution_timeout = 5 * time.minute,

From 78410608e0a11637c61de88819a7f4eaa8a8ffe2 Mon Sep 17 00:00:00 2001
From: Karl Klose <karlklose@google.com>
Date: Thu, 22 Apr 2021 05:29:31 +0000
Subject: [PATCH 462/826] [infra] Enable bbagent for flutter builders

Change-Id: I8fa5dd79b0a6d25cde3229be587ccb449d7fbc33
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/195983
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Karl Klose <karlklose@google.com>
---
 cr-buildbucket.cfg | 44 ++++++++++++--------------------------------
 main.star          |  9 +++++----
 2 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index e0a1d9e2dc45..c3cb1dab7230 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -3604,17 +3604,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/flutter_engine"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
-        properties_j: "clobber:true"
-        properties_j: "flutter_test_suites:[\"add_to_app_life_cycle_tests\",\"flutter_plugins\",\"framework_coverage\",\"framework_tests\",\"tool_tests\"]"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"flutter_test_suites\":[\"add_to_app_life_cycle_tests\",\"flutter_plugins\",\"framework_coverage\",\"framework_tests\",\"tool_tests\"],\"recipe\":\"dart/flutter_engine\"}"
       priority: 50
       execution_timeout_secs: 28800
       caches {
@@ -3636,17 +3631,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/flutter_engine"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
-        properties_j: "clobber:true"
-        properties_j: "flutter_test_suites:[\"web_tests\",\"web_tool_tests\"]"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"flutter_test_suites\":[\"web_tests\",\"web_tool_tests\"],\"recipe\":\"dart/flutter_engine\"}"
       priority: 50
       execution_timeout_secs: 28800
       caches {
@@ -10672,17 +10662,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/flutter_engine"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
-        properties_j: "clobber:true"
-        properties_j: "flutter_test_suites:[\"add_to_app_life_cycle_tests\",\"flutter_plugins\",\"framework_coverage\",\"framework_tests\",\"tool_tests\"]"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"flutter_test_suites\":[\"add_to_app_life_cycle_tests\",\"flutter_plugins\",\"framework_coverage\",\"framework_tests\",\"tool_tests\"],\"recipe\":\"dart/flutter_engine\"}"
       priority: 30
       execution_timeout_secs: 28800
       caches {
@@ -10704,17 +10689,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/flutter_engine"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
-        properties_j: "clobber:true"
-        properties_j: "flutter_test_suites:[\"web_tests\",\"web_tool_tests\"]"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"flutter_test_suites\":[\"web_tests\",\"web_tool_tests\"],\"recipe\":\"dart/flutter_engine\"}"
       priority: 30
       execution_timeout_secs: 28800
       caches {
diff --git a/main.star b/main.star
index 8a04219d3d53..7ce5c777b4b9 100755
--- a/main.star
+++ b/main.star
@@ -128,16 +128,17 @@ CI_SANDBOX_TRIGGERERS = [CI_ACCOUNT, TRY_ACCOUNT]
 
 # List of recipes to opt-in to using the bbagent protocol.
 BBAGENT_ALLOW_LIST = [
-    "dart/external",
-    "dart/forward_branch",
+    "cron/cron",
     "dart/cbuild",
     "dart/chocolatey",
-    "dart/package_co19",
     "dart/docker",
+    "dart/external",
+    "dart/flutter_engine",
+    "dart/forward_branch",
     "dart/linearize",
+    "dart/package_co19",
     "roller/lkgr",
     "roller/roll_to_dev",
-    "cron/cron",
 ]
 
 lucicfg.config(

From a143dc636b591fceb8a2387f01e71eeea528c309 Mon Sep 17 00:00:00 2001
From: Karl Klose <karlklose@google.com>
Date: Thu, 22 Apr 2021 06:40:06 +0000
Subject: [PATCH 463/826] [infra] Enable bbagent for builders using dart/neo

Change-Id: I41efe952e8fdfc1f74f91e37dc5b9084f6bcc52b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/195984
Commit-Queue: Karl Klose <karlklose@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 3977 ++++++++++++++------------------------------
 main.star          |    1 +
 2 files changed, 1288 insertions(+), 2690 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index c3cb1dab7230..ef3653f9c14d 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -132,15 +132,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true,\"timeout\":6000}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true,\"timeout\":6000},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -161,15 +158,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true,\"timeout\":6000}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true,\"timeout\":6000},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -190,15 +184,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true,\"timeout\":6000}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true,\"timeout\":6000},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -219,15 +210,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true,\"timeout\":6000}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true,\"timeout\":6000},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -248,15 +236,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -277,15 +262,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -306,15 +288,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -335,15 +314,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -364,15 +340,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -393,15 +366,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -422,15 +392,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -451,15 +418,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -480,15 +444,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:false"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":false,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -509,15 +470,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:false"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":false,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -538,15 +496,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:false"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":false,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -567,15 +522,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:false"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":false,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -861,15 +813,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -890,15 +839,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -919,15 +865,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -948,15 +891,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -977,15 +917,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1006,15 +943,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1035,15 +969,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1064,15 +995,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1093,15 +1021,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1122,15 +1047,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1151,15 +1073,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1180,15 +1099,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1209,15 +1125,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1238,15 +1151,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1267,15 +1177,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1296,15 +1203,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1325,15 +1229,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -1354,15 +1255,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -1383,15 +1281,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1412,15 +1307,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1441,15 +1333,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1470,15 +1359,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1499,15 +1385,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1528,15 +1411,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1557,15 +1437,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1586,15 +1463,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1615,15 +1489,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -1644,15 +1515,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1673,15 +1541,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1702,15 +1567,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1731,15 +1593,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1760,16 +1619,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1790,16 +1645,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "shard_timeout:5400"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
       caches {
         name: "browsers"
@@ -1820,16 +1671,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "shard_timeout:5400"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 70
       caches {
         name: "browsers"
@@ -1850,16 +1697,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1880,16 +1723,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1910,16 +1749,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1940,16 +1775,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1970,15 +1801,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1999,15 +1827,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2028,15 +1853,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2057,15 +1879,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2086,16 +1905,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2116,16 +1931,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2146,16 +1957,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2176,16 +1983,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2206,15 +2009,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2235,15 +2035,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2264,15 +2061,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2293,15 +2087,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2322,16 +2113,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2352,16 +2139,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2382,16 +2165,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2412,16 +2191,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2442,16 +2217,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_firefox\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2472,16 +2243,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_firefox\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2502,16 +2269,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_firefox\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2532,16 +2295,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_firefox\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2562,16 +2321,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2592,16 +2347,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2622,16 +2373,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2652,16 +2399,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2682,15 +2425,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2711,15 +2451,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2740,15 +2477,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2769,15 +2503,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2798,16 +2529,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2828,16 +2555,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2858,16 +2581,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2888,16 +2607,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2918,16 +2633,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_firefox\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2948,15 +2659,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2977,15 +2685,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3006,15 +2711,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3035,15 +2737,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3064,16 +2763,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3094,16 +2789,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3124,16 +2815,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3154,16 +2841,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3184,16 +2867,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3214,16 +2893,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3244,16 +2919,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3274,16 +2945,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3304,16 +2971,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3334,16 +2997,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3364,16 +3023,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3394,16 +3049,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3424,16 +3075,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3454,16 +3101,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_firefox\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3484,16 +3127,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_firefox\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3514,16 +3153,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_firefox\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3544,16 +3179,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_firefox\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3574,15 +3205,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       execution_timeout_secs: 1500
       caches {
@@ -3658,15 +3286,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3687,15 +3312,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3716,15 +3338,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3745,15 +3364,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3774,15 +3390,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3803,15 +3416,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3832,15 +3442,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3861,15 +3468,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3890,15 +3494,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3919,15 +3520,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3948,15 +3546,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3977,15 +3572,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4006,15 +3598,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4035,15 +3624,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -4064,15 +3650,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -4093,15 +3676,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4122,15 +3702,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4151,15 +3728,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4180,15 +3754,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4209,15 +3780,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       execution_timeout_secs: 43200
       caches {
@@ -4239,15 +3807,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4411,16 +3976,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4441,16 +4002,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4471,16 +4028,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4501,16 +4054,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4531,16 +4080,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4561,16 +4106,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4591,16 +4132,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4621,16 +4158,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4651,16 +4184,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4681,16 +4210,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4711,16 +4236,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4741,16 +4262,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4771,16 +4288,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4801,15 +4314,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4830,15 +4340,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4859,15 +4366,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4888,15 +4392,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4917,15 +4418,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4946,15 +4444,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4975,15 +4470,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5004,15 +4496,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5033,15 +4522,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5062,15 +4548,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5091,15 +4574,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5120,15 +4600,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5149,15 +4626,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5178,15 +4652,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5207,15 +4678,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5236,15 +4704,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5265,15 +4730,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5294,15 +4756,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5323,15 +4782,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5352,15 +4808,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5381,15 +4834,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5410,15 +4860,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5439,15 +4886,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5468,15 +4912,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5497,15 +4938,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5526,15 +4964,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5555,15 +4990,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5584,15 +5016,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5613,15 +5042,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       expiration_secs: 86400
       caches {
@@ -5643,16 +5069,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -5673,15 +5095,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5702,15 +5121,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5731,15 +5147,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5760,15 +5173,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5789,15 +5199,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -5818,15 +5225,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -5847,15 +5251,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5876,15 +5277,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5905,15 +5303,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5934,15 +5329,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -5963,15 +5355,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -5992,15 +5381,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -6021,15 +5407,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -6050,15 +5433,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6079,15 +5459,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6108,15 +5485,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6137,15 +5511,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6166,15 +5537,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6195,15 +5563,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6224,15 +5589,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6253,15 +5615,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6282,15 +5641,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6311,15 +5667,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6340,15 +5693,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6369,15 +5719,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6398,15 +5745,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6427,15 +5771,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6456,15 +5797,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6485,15 +5823,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6514,15 +5849,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -6543,15 +5875,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6572,15 +5901,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6601,15 +5927,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6630,15 +5953,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6659,16 +5979,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -6689,16 +6005,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "shard_timeout:5400"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 70
       caches {
         name: "browsers"
@@ -6719,15 +6031,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6748,15 +6057,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6777,15 +6083,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6806,15 +6109,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6835,15 +6135,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -6864,15 +6161,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -6893,15 +6187,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -6922,15 +6213,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6951,15 +6239,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6980,15 +6265,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -7009,15 +6291,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -7038,16 +6317,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "shard_timeout:5400"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 70
       caches {
         name: "browsers"
@@ -7068,15 +6343,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -7097,16 +6369,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "shard_timeout:5400"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 70
       caches {
         name: "browsers"
@@ -7127,15 +6395,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -7156,15 +6421,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -7185,15 +6447,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -7214,15 +6473,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       expiration_secs: 86400
       caches {
@@ -7244,16 +6500,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "shard_timeout:5400"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
       caches {
         name: "browsers"
@@ -7274,16 +6526,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "shard_timeout:5400"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
       caches {
         name: "browsers"
@@ -7304,16 +6552,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "shard_timeout:5400"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
       caches {
         name: "browsers"
@@ -7334,16 +6578,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "shard_timeout:5400"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
       caches {
         name: "browsers"
@@ -7364,16 +6604,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "shard_timeout:5400"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
       caches {
         name: "browsers"
@@ -7394,16 +6630,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "shard_timeout:5400"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
       caches {
         name: "browsers"
@@ -7424,16 +6656,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "shard_timeout:5400"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
       caches {
         name: "browsers"
@@ -7454,16 +6682,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "shard_timeout:5400"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
       caches {
         name: "browsers"
@@ -7484,16 +6708,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -7514,15 +6734,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -7543,15 +6760,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -7572,16 +6786,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "shard_timeout:5400"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
       caches {
         name: "browsers"
@@ -7602,16 +6812,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "shard_timeout:5400"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
       caches {
         name: "browsers"
@@ -7632,16 +6838,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "shard_timeout:5400"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
       caches {
         name: "browsers"
@@ -7662,16 +6864,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "shard_timeout:5400"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
       caches {
         name: "browsers"
@@ -7692,15 +6890,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -7721,15 +6916,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -7750,15 +6942,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -7779,15 +6968,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -7808,15 +6994,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -7837,15 +7020,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -7866,15 +7046,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -7895,15 +7072,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -7924,15 +7098,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -7953,15 +7124,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -7982,15 +7150,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8011,15 +7176,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8040,15 +7202,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8069,15 +7228,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8098,15 +7254,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8127,15 +7280,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8156,15 +7306,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8185,15 +7332,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8214,15 +7358,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8243,15 +7384,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8272,15 +7410,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8301,15 +7436,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8330,15 +7462,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8359,15 +7488,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8388,15 +7514,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8417,15 +7540,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8446,15 +7566,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8475,15 +7592,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8504,15 +7618,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8533,16 +7644,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -8563,15 +7670,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -8592,16 +7696,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "shard_timeout:5400"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 70
       caches {
         name: "browsers"
@@ -8622,15 +7722,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -8651,15 +7748,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -8680,15 +7774,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8709,15 +7800,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8738,15 +7826,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8767,15 +7852,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8796,16 +7878,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "shard_timeout:5400"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 70
       caches {
         name: "browsers"
@@ -8826,15 +7904,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -8855,15 +7930,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8884,15 +7956,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8913,15 +7982,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8942,15 +8008,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8971,16 +8034,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -9001,16 +8060,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -9031,15 +8086,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -9060,15 +8112,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -9089,15 +8138,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -9118,15 +8164,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -9147,15 +8190,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -9176,15 +8216,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -9205,15 +8242,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -9234,15 +8268,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -9263,16 +8294,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -9293,16 +8320,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -9323,15 +8346,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -9352,15 +8372,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -9381,15 +8398,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -9410,15 +8424,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -9439,15 +8450,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -9468,15 +8476,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -9497,15 +8502,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -9526,15 +8528,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -9555,15 +8554,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -9584,15 +8580,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -9613,15 +8606,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -9642,15 +8632,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -9671,15 +8658,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -9700,15 +8684,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -9729,15 +8710,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -9778,15 +8756,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -9807,15 +8782,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -9836,15 +8808,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -9865,15 +8834,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -9894,15 +8860,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -9923,15 +8886,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -9952,15 +8912,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -9981,15 +8938,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10010,15 +8964,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10039,15 +8990,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10068,16 +9016,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"checkout_javascript_engines\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"checkout_javascript_engines\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10098,16 +9042,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$dart/build:{\"disable_goma\":true,\"timeout\":6000}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$dart/build\":{\"disable_goma\":true,\"timeout\":6000},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10128,15 +9068,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10157,15 +9094,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10186,16 +9120,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10216,15 +9146,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10245,16 +9172,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10275,15 +9198,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10304,16 +9224,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10334,16 +9250,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_firefox\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10364,16 +9276,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10394,15 +9302,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10423,16 +9328,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10453,15 +9354,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10482,16 +9380,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10512,16 +9406,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10542,16 +9432,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10572,16 +9458,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10602,16 +9484,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_firefox\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10632,15 +9510,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       execution_timeout_secs: 1500
       caches {
@@ -10716,15 +9591,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10745,15 +9617,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10774,15 +9643,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10803,15 +9669,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10832,15 +9695,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10861,15 +9721,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10890,15 +9747,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10948,16 +9802,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10978,16 +9828,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11008,16 +9854,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11038,16 +9880,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "custom_vars:{\"download_chrome\":true}"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11068,15 +9906,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11097,15 +9932,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11126,15 +9958,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11155,15 +9984,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11184,15 +10010,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11213,15 +10036,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11242,15 +10062,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11271,15 +10088,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11300,16 +10114,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11330,15 +10140,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11359,15 +10166,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11388,15 +10192,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11417,15 +10218,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11446,15 +10244,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11475,15 +10270,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11504,15 +10296,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11533,15 +10322,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11562,15 +10348,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11591,15 +10374,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11620,15 +10400,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11649,15 +10426,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11678,15 +10452,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11707,15 +10478,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11736,16 +10504,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11766,16 +10530,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "shard_timeout:5400"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 30
       caches {
         name: "browsers"
@@ -11796,15 +10556,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11825,15 +10582,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11854,15 +10608,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11883,15 +10634,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11912,15 +10660,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11941,16 +10686,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "shard_timeout:5400"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 30
       caches {
         name: "browsers"
@@ -11971,15 +10712,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12000,16 +10738,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "shard_timeout:5400"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 30
       caches {
         name: "browsers"
@@ -12030,15 +10764,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12059,15 +10790,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12088,15 +10816,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12117,15 +10842,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12146,16 +10868,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "shard_timeout:5400"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 30
       caches {
         name: "browsers"
@@ -12176,16 +10894,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "shard_timeout:5400"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 30
       caches {
         name: "browsers"
@@ -12206,16 +10920,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12236,15 +10946,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12265,15 +10972,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12294,16 +10998,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "shard_timeout:5400"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 30
       caches {
         name: "browsers"
@@ -12324,15 +11024,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12353,15 +11050,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12382,15 +11076,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12411,15 +11102,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12440,15 +11128,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12469,15 +11154,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12498,15 +11180,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12527,15 +11206,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12556,16 +11232,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12586,15 +11258,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12615,16 +11284,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "shard_timeout:5400"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 30
       caches {
         name: "browsers"
@@ -12645,15 +11310,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12674,15 +11336,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12703,15 +11362,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12732,16 +11388,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "shard_timeout:5400"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 30
       caches {
         name: "browsers"
@@ -12762,15 +11414,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12791,15 +11440,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12820,16 +11466,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12850,16 +11492,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12880,15 +11518,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12909,15 +11544,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12938,15 +11570,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12967,15 +11596,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12996,15 +11622,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -13025,16 +11648,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -13055,16 +11674,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "bisection_enabled:true"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -13085,15 +11700,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -13114,15 +11726,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -13143,15 +11752,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -13172,15 +11778,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -13201,15 +11804,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -13230,15 +11830,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/neo"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
diff --git a/main.star b/main.star
index 7ce5c777b4b9..2721f70683ad 100755
--- a/main.star
+++ b/main.star
@@ -136,6 +136,7 @@ BBAGENT_ALLOW_LIST = [
     "dart/flutter_engine",
     "dart/forward_branch",
     "dart/linearize",
+    "dart/neo",
     "dart/package_co19",
     "roller/lkgr",
     "roller/roll_to_dev",

From fbbc8f0ba856bcb359901e6e33f6e487f9cf945d Mon Sep 17 00:00:00 2001
From: Karl Klose <karlklose@google.com>
Date: Fri, 23 Apr 2021 04:33:37 +0000
Subject: [PATCH 464/826] Reland "[infra] Enable bbagent for autoroller and
 recipe-bundler"

Change-Id: I353e1618ed0afa1cd08d7eab759a93723d7ac929
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/196487
Commit-Queue: Karl Klose <karlklose@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 28 ++++++++--------------------
 main.star          | 25 ++++++++++++-------------
 2 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index ef3653f9c14d..507e01e5ca43 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -653,19 +653,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "recipe_bundler"
+      exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
-        cipd_version: "git_revision:40621e908eb88bd10451ee9d013b7ef89ea91e37"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "package_name_internal_prefix:\"dart_internal/recipe_bundles\""
-        properties_j: "package_name_prefix:\"dart/recipe_bundles\""
-        properties_j: "recipe_bundler_vers:\"git_revision:2ed88b2c854578b512e1c0486824175fe0d7aab6\""
-        properties_j: "repo_specs:[\"dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/master\"]"
+        cipd_version: "git_revision:e1a6b1a375a07455c00cc236d2b52277aa46ea84"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"package_name_internal_prefix\":\"dart_internal/recipe_bundles\",\"package_name_prefix\":\"dart/recipe_bundles\",\"recipe\":\"recipe_bundler\",\"recipe_bundler_vers\":\"git_revision:e1a6b1a375a07455c00cc236d2b52277aa46ea84\",\"repo_specs\":[\"dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/master\"]}"
       priority: 50
       execution_timeout_secs: 300
       caches {
@@ -687,17 +680,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.ci"
-      recipe {
-        name: "recipe_autoroller"
+      exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
-        cipd_version: "git_revision:905c1df843d7771bf3adc0cf21f58eb9498ff063"
-        properties_j: "$dart/build:{\"disable_goma\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
-        properties_j: "db_gcs_bucket:\"dart-recipe-roller-db\""
-        properties_j: "projects:[[\"dart\",\"https://dart.googlesource.com/recipes\"]]"
+        cipd_version: "git_revision:e1a6b1a375a07455c00cc236d2b52277aa46ea84"
+        cmd: "luciexe"
       }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"db_gcs_bucket\":\"dart-recipe-roller-db\",\"projects\":[[\"dart\",\"https://dart.googlesource.com/recipes\"]],\"recipe\":\"recipe_autoroller\"}"
       priority: 70
       execution_timeout_secs: 1200
       expiration_secs: 86400
diff --git a/main.star b/main.star
index 2721f70683ad..4bdeb151c083 100755
--- a/main.star
+++ b/main.star
@@ -1677,15 +1677,19 @@ luci.console_view_entry(
     console_view = "flutter-hhh",
 )
 
+def chromium_infra_recipe(name):
+    return luci.recipe(
+        name = name,
+        cipd_package =
+            "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
+        cipd_version = "git_revision:e1a6b1a375a07455c00cc236d2b52277aa46ea84",
+        use_bbagent = True,
+    )
+
 # Rolls dart recipe dependencies.
 dart_infra_builder(
     name = "recipe-deps-roller",
-    executable = luci.recipe(
-        name = "recipe_autoroller",
-        cipd_package =
-            "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
-        cipd_version = "git_revision:905c1df843d7771bf3adc0cf21f58eb9498ff063",
-    ),
+    executable = chromium_infra_recipe("recipe_autoroller"),
     execution_timeout = 20 * time.minute,
     expiration_timeout = time.day,
     priority = LOW,
@@ -1700,17 +1704,12 @@ dart_infra_builder(
 
 dart_infra_builder(
     name = "recipe-bundler",
-    executable = luci.recipe(
-        name = "recipe_bundler",
-        cipd_package =
-            "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
-        cipd_version = "git_revision:40621e908eb88bd10451ee9d013b7ef89ea91e37",
-    ),
+    executable = chromium_infra_recipe("recipe_bundler"),
     execution_timeout = 5 * time.minute,
     properties = {
         # This property controls the version of the recipe_bundler go tool:
         #   https://chromium.googlesource.com/infra/infra/+/master/go/src/infra/tools/recipe_bundler
-        "recipe_bundler_vers": "git_revision:2ed88b2c854578b512e1c0486824175fe0d7aab6",
+        "recipe_bundler_vers": "git_revision:e1a6b1a375a07455c00cc236d2b52277aa46ea84",
         # These control the prefix of the CIPD package names that the tool
         # will create.
         "package_name_prefix": "dart/recipe_bundles",

From 040e449149e4cdf3897ebbb0c1c440a04061fba6 Mon Sep 17 00:00:00 2001
From: Karl Klose <karlklose@google.com>
Date: Fri, 23 Apr 2021 04:34:17 +0000
Subject: [PATCH 465/826] [infra] Enable bbagent for gclient and presubmit
 builders

Change-Id: Ide04c9e33db557fb3e6f8f5246e8612a082fa678
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/195986
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Karl Klose <karlklose@google.com>
---
 cr-buildbucket.cfg | 54 ++++++++++++++++------------------------------
 main.star          | 22 +------------------
 2 files changed, 19 insertions(+), 57 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 507e01e5ca43..f4c4ea6a9b4c 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -3821,15 +3821,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/gclient"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/gclient\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3850,15 +3847,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/gclient"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/gclient\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3879,15 +3873,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/gclient"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/gclient\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3908,15 +3899,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/gclient"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/gclient\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -9761,15 +9749,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "dart/gclient"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/gclient\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11864,15 +11849,12 @@ buckets {
       dimensions: "host_class:default"
       dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
-      recipe {
-        name: "presubmit/presubmit"
+      exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/master"
-        properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
-        properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}"
-        properties_j: "clobber:true"
+        cmd: "luciexe"
       }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"presubmit/presubmit\"}"
       priority: 30
       execution_timeout_secs: 600
       caches {
diff --git a/main.star b/main.star
index 4bdeb151c083..72828fc61381 100755
--- a/main.star
+++ b/main.star
@@ -126,22 +126,6 @@ ROLL_TRIGGERERS = {
 }
 CI_SANDBOX_TRIGGERERS = [CI_ACCOUNT, TRY_ACCOUNT]
 
-# List of recipes to opt-in to using the bbagent protocol.
-BBAGENT_ALLOW_LIST = [
-    "cron/cron",
-    "dart/cbuild",
-    "dart/chocolatey",
-    "dart/docker",
-    "dart/external",
-    "dart/flutter_engine",
-    "dart/forward_branch",
-    "dart/linearize",
-    "dart/neo",
-    "dart/package_co19",
-    "roller/lkgr",
-    "roller/roll_to_dev",
-]
-
 lucicfg.config(
     config_dir = ".",
     tracked_files = [
@@ -486,14 +470,10 @@ luci.cq_group(
 )
 
 def dart_recipe(name):
-    # Use kwargs here because using the named argument `bb_agent` with value
-    # false will still change the builder definition to use 'exe' instead of
-    # 'recipe'.
-    enable_bbagent = {"use_bbagent": True} if name in BBAGENT_ALLOW_LIST else {}
     return luci.recipe(
         name = name,
         cipd_package = "dart/recipe_bundles/dart.googlesource.com/recipes",
-        **enable_bbagent
+        use_bbagent = True,
     )
 
 def with_goma(goma, channel, dimensions, properties):

From a71043e04d058c581b3f2137924d89fa3a407770 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 7 May 2021 08:38:04 +0000
Subject: [PATCH 466/826] [infra] Add a console for the fuzzer

Change-Id: I154ca6ea1348e9570b674817b02347de03ba70e6
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/198760
Auto-Submit: Alexander Thomas <athom@google.com>
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 console-header.textpb |  1 +
 luci-milo.cfg         | 13 +++++++++++++
 main.star             | 11 +++++++++++
 3 files changed, 25 insertions(+)

diff --git a/console-header.textpb b/console-header.textpb
index e558e00c1b0a..a79835ab7412 100644
--- a/console-header.textpb
+++ b/console-header.textpb
@@ -37,6 +37,7 @@ links: {
     }
 }
 console_groups: {
+    console_ids: "dart/dart-fuzz"
     console_ids: "dart/flutter"
     console_ids: "dart/flutter-hhh"
 }
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 4d6075e510be..bd0971743f03 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -660,6 +660,7 @@ consoles {
       }
     }
     console_groups {
+      console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
     }
@@ -1322,6 +1323,7 @@ consoles {
       }
     }
     console_groups {
+      console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
     }
@@ -1699,6 +1701,7 @@ consoles {
       }
     }
     console_groups {
+      console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
     }
@@ -2076,6 +2079,7 @@ consoles {
       }
     }
     console_groups {
+      console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
     }
@@ -2453,12 +2457,21 @@ consoles {
       }
     }
     console_groups {
+      console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
     }
     tree_status_host: "dart-status.appspot.com"
   }
 }
+consoles {
+  id: "dart-fuzz"
+  name: "Dart Fuzzer Console"
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/fuzz-linux"
+  }
+  builder_view_only: true
+}
 consoles {
   id: "flutter"
   name: "Dart/Flutter Console"
diff --git a/main.star b/main.star
index 72828fc61381..89bc713ee4da 100755
--- a/main.star
+++ b/main.star
@@ -265,6 +265,11 @@ luci.console_view(
     header = "console-header.textpb",
 )
 
+luci.list_view(
+    name = "dart-fuzz",
+    title = "Dart Fuzzer Console",
+)
+
 luci.console_view(
     name = "flutter",
     repo = DART_GIT,
@@ -1628,6 +1633,12 @@ def add_postponed_alt_console_entries():
 
 add_postponed_alt_console_entries()
 
+# Dart Fuzz console
+luci.list_view_entry(
+    builder = "fuzz-linux",
+    list_view = "dart-fuzz",
+)
+
 # Flutter consoles
 luci.console_view_entry(
     builder = "flutter-analyze",

From 59dec2942ea6170296dfe3bd7c55234bcd098b19 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 17 May 2021 16:13:51 +0000
Subject: [PATCH 467/826] [infra] Add iso-stress-linux builder

Change-Id: Iad2535032f9cf593708379dc7735a144a7672fc2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/200220
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: Martin Kustermann <kustermann@google.com>
Commit-Queue: Martin Kustermann <kustermann@google.com>
---
 console-header.textpb |  1 +
 cr-buildbucket.cfg    | 28 +++++++++++++++++++++++++++-
 luci-milo.cfg         | 13 +++++++++++++
 luci-notify.cfg       | 12 ++++++++++++
 luci-scheduler.cfg    | 11 +++++++++++
 main.star             | 17 +++++++++++++++++
 6 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/console-header.textpb b/console-header.textpb
index a79835ab7412..3653f34e8d59 100644
--- a/console-header.textpb
+++ b/console-header.textpb
@@ -40,5 +40,6 @@ console_groups: {
     console_ids: "dart/dart-fuzz"
     console_ids: "dart/flutter"
     console_ids: "dart/flutter-hhh"
+    console_ids: "dart/iso-stress"
 }
 tree_status_host: "dart-status.appspot.com"
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index f4c4ea6a9b4c..f280eb7d2863 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -632,7 +632,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"builders\":[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"vm-kernel-nnbd-linux-debug-ia32\",\"vm-kernel-nnbd-linux-release-ia32\",\"vm-kernel-nnbd-linux-release-simarm\",\"vm-kernel-nnbd-linux-release-simarm64\",\"vm-kernel-nnbd-mac-debug-x64\",\"vm-kernel-nnbd-mac-release-x64\",\"vm-kernel-nnbd-win-release-ia32\",\"vm-kernel-nnbd-win-debug-x64\",\"vm-kernel-nnbd-win-release-x64\",\"vm-kernel-precomp-nnbd-linux-debug-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-debug-x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm64\",\"vm-kernel-precomp-nnbd-mac-release-simarm64\",\"vm-kernel-precomp-nnbd-win-release-x64\",\"app-kernel-linux-product-x64\",\"vm-kernel-linux-release-ia32\",\"vm-kernel-linux-debug-ia32\",\"vm-kernel-win-debug-ia32\",\"vm-kernel-win-release-ia32\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-precomp-dwarf-linux-product-x64\",\"vm-kernel-linux-product-x64\",\"vm-kernel-mac-product-x64\",\"vm-kernel-win-product-x64\",\"vm-kernel-optcounter-threshold-linux-release-ia32\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\",\"vm-kernel-reload-linux-debug-x64\",\"vm-kernel-reload-linux-release-x64\",\"vm-kernel-reload-rollback-linux-debug-x64\",\"vm-kernel-reload-rollback-linux-release-x64\",\"vm-kernel-linux-debug-x64c\",\"vm-kernel-linux-debug-simarm64c\",\"vm-kernel-precomp-linux-debug-x64c\",\"vm-kernel-precomp-linux-debug-simarm64c\",\"analyzer-nnbd-mac-release\",\"analyzer-nnbd-win-release\"],\"clobber\":true,\"recipe\":\"cron/cron\"}"
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"builders\":[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"vm-kernel-nnbd-linux-debug-ia32\",\"vm-kernel-nnbd-linux-release-ia32\",\"vm-kernel-nnbd-linux-release-simarm\",\"vm-kernel-nnbd-linux-release-simarm64\",\"vm-kernel-nnbd-mac-debug-x64\",\"vm-kernel-nnbd-mac-release-x64\",\"vm-kernel-nnbd-win-release-ia32\",\"vm-kernel-nnbd-win-debug-x64\",\"vm-kernel-nnbd-win-release-x64\",\"vm-kernel-precomp-nnbd-linux-debug-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-debug-x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm64\",\"vm-kernel-precomp-nnbd-mac-release-simarm64\",\"vm-kernel-precomp-nnbd-win-release-x64\",\"app-kernel-linux-product-x64\",\"vm-kernel-linux-release-ia32\",\"vm-kernel-linux-debug-ia32\",\"vm-kernel-win-debug-ia32\",\"vm-kernel-win-release-ia32\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-precomp-dwarf-linux-product-x64\",\"vm-kernel-linux-product-x64\",\"vm-kernel-mac-product-x64\",\"vm-kernel-win-product-x64\",\"vm-kernel-optcounter-threshold-linux-release-ia32\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\",\"vm-kernel-reload-linux-debug-x64\",\"vm-kernel-reload-linux-release-x64\",\"vm-kernel-reload-rollback-linux-debug-x64\",\"vm-kernel-reload-rollback-linux-release-x64\",\"vm-kernel-linux-debug-x64c\",\"vm-kernel-linux-debug-simarm64c\",\"vm-kernel-precomp-linux-debug-x64c\",\"vm-kernel-precomp-linux-debug-simarm64c\",\"analyzer-nnbd-mac-release\",\"analyzer-nnbd-win-release\",\"iso-stress-linux\"],\"clobber\":true,\"recipe\":\"cron/cron\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3944,6 +3944,32 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "iso-stress-linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      priority: 70
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "pkg-linux-debug"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index bd0971743f03..0fe7bc60bddb 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -663,6 +663,7 @@ consoles {
       console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
+      console_ids: "dart/iso-stress"
     }
     tree_status_host: "dart-status.appspot.com"
   }
@@ -1326,6 +1327,7 @@ consoles {
       console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
+      console_ids: "dart/iso-stress"
     }
     tree_status_host: "dart-status.appspot.com"
   }
@@ -1704,6 +1706,7 @@ consoles {
       console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
+      console_ids: "dart/iso-stress"
     }
     tree_status_host: "dart-status.appspot.com"
   }
@@ -2082,6 +2085,7 @@ consoles {
       console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
+      console_ids: "dart/iso-stress"
     }
     tree_status_host: "dart-status.appspot.com"
   }
@@ -2460,6 +2464,7 @@ consoles {
       console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
+      console_ids: "dart/iso-stress"
     }
     tree_status_host: "dart-status.appspot.com"
   }
@@ -2506,6 +2511,14 @@ consoles {
     short_name: "web"
   }
 }
+consoles {
+  id: "iso-stress"
+  name: "VM Isolate Stress Test Console"
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/iso-stress-linux"
+  }
+  builder_view_only: true
+}
 consoles {
   id: "fyi"
   name: "SDK FYI Console"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 548f52aa82bd..760bc6c962ce 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -775,6 +775,18 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "iso-stress-linux"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index c68cbb19f6aa..384c2710037b 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1555,6 +1555,17 @@ job {
     builder: "google"
   }
 }
+job {
+  id: "iso-stress-linux"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "iso-stress-linux"
+  }
+}
 job {
   id: "linearize-flutter"
   realm: "ci"
diff --git a/main.star b/main.star
index 89bc713ee4da..fbadcebed1fe 100755
--- a/main.star
+++ b/main.star
@@ -284,6 +284,11 @@ luci.console_view(
     refs = ["refs/heads/master"],
 )
 
+luci.list_view(
+    name = "iso-stress",
+    title = "VM Isolate Stress Test Console",
+)
+
 luci.console_view(
     name = "fyi",
     repo = DART_GIT,
@@ -1522,6 +1527,12 @@ dart_ci_builder(
     },
 )
 
+# Isolate stress test builder
+dart_vm_nightly_builder(
+    "iso-stress-linux",
+    channels = [],
+)
+
 # external
 dart_ci_sandbox_builder(
     "google",
@@ -1668,6 +1679,12 @@ luci.console_view_entry(
     console_view = "flutter-hhh",
 )
 
+# VM isolate stress test console
+luci.list_view_entry(
+    builder = "iso-stress-linux",
+    list_view = "iso-stress",
+)
+
 def chromium_infra_recipe(name):
     return luci.recipe(
         name = name,

From 25dc4b806de1eb6f4ebdfcb476807501775ddbfa Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 26 May 2021 14:33:12 +0000
Subject: [PATCH 468/826] [infra] Add builder to test the dev Linux images

Bug: https://crbug.com/1207358
Change-Id: I0622ceea4dcebbe6e4bf5476710c31096dd69f87
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/201266
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: Karl Klose <karlklose@google.com>
---
 cr-buildbucket.cfg | 27 +++++++++++++++++++++++++++
 luci-notify.cfg    | 15 +++++++++++++++
 luci-scheduler.cfg | 11 +++++++++++
 main.star          | 20 ++++++++++++++++++++
 4 files changed, 73 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index f280eb7d2863..1280c4424a58 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -8704,6 +8704,33 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:experimental"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      priority: 50
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experimental: YES
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 760bc6c962ce..209036037ec4 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -1813,3 +1813,18 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
+  }
+}
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 384c2710037b..123900941cd0 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -3638,6 +3638,17 @@ job {
     builder: "vm-precomp-ffi-qemu-linux-release-arm-dev"
   }
 }
+job {
+  id: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
+  realm: "ci.sandbox"
+  schedule: "0 5,7 * * 1-5"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
+  }
+}
 job {
   id: "vm-precomp-ffi-qemu-linux-release-arm-stable"
   realm: "ci.sandbox"
diff --git a/main.star b/main.star
index fbadcebed1fe..1eef485bf6c0 100755
--- a/main.star
+++ b/main.star
@@ -594,6 +594,7 @@ def dart_builder(
         dimensions = None,
         executable = None,
         execution_timeout = None,
+        experimental = None,
         expiration_timeout = None,
         goma = None,
         fyi = False,
@@ -621,6 +622,7 @@ def dart_builder(
         dimensions: Extra swarming dimensions required by this builder.
         executable: The Luci executable to use.
         execution_timeout: Time to allow for the build to run.
+        experimental: Wether the build is experimental or not.
         expiration_timeout: How long builds should wait for a bot to run on.
         goma: Whether to use goma or not.
         fyi: Whether this is an FYI builder or not.
@@ -693,6 +695,7 @@ def dart_builder(
                 dimensions = dimensions,
                 executable = executable or dart_recipe(recipe),
                 execution_timeout = execution_timeout,
+                experimental = experimental,
                 expiration_timeout = expiration_timeout,
                 priority = priority,
                 properties = builder_properties,
@@ -1617,6 +1620,23 @@ dart_ci_sandbox_builder(
     triggered_by = ["dart-ci-test-data-trigger"],
 )
 
+# Builder that tests the dev Linux image. When the image autoroller detects
+# successful builds of this builder with the dev image, it the current dev image
+# becomes the new prod image. Newly created bots will than use the updated
+# image. The `vm-precomp-ffi-qemu-linux-release-arm` is  used because qemu is
+# the primary difference, it passes all tests, triggers no shards and runs a few
+# different builds. See also https://crbug.com/1207358.
+dart_ci_sandbox_builder(
+    "vm-precomp-ffi-qemu-linux-release-arm-experimental",
+    channels = [],
+    dimensions = {"host_class": "experimental"},
+    experimental = True,
+    notifies = "infra",
+    # At minute 0 past hour 5 and 7 on every day-of-week from Mon through Fri.
+    schedule = "0 5,7 * * 1-5",
+    triggered_by = None,
+)
+
 # Fuzz testing builders
 dart_ci_sandbox_builder(
     "fuzz-linux",

From 1cfc3abc628ccfae5b516fc169c773e3d1dc8968 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 26 May 2021 15:53:50 +0000
Subject: [PATCH 469/826] [infra] Make image tester non-experimental and make
 it nightly

Having -experimental in the builder name should be enough. If the build
is marked as experimental in buildbucket it won't be visible to the
image autoroller.

Moving the image tester to a nightly schedule ensures it will have an
input commit unlike if it's triggered by a cron schedule.

Bug: https://crbug.com/1207358
Change-Id: I00f746e878e08ca8456ef594a7487810658b452b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/201405
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg |  5 ++---
 luci-scheduler.cfg |  2 +-
 main.star          | 31 ++++++++++++++-----------------
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 1280c4424a58..c7ef569e0a00 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -632,7 +632,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"builders\":[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"vm-kernel-nnbd-linux-debug-ia32\",\"vm-kernel-nnbd-linux-release-ia32\",\"vm-kernel-nnbd-linux-release-simarm\",\"vm-kernel-nnbd-linux-release-simarm64\",\"vm-kernel-nnbd-mac-debug-x64\",\"vm-kernel-nnbd-mac-release-x64\",\"vm-kernel-nnbd-win-release-ia32\",\"vm-kernel-nnbd-win-debug-x64\",\"vm-kernel-nnbd-win-release-x64\",\"vm-kernel-precomp-nnbd-linux-debug-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-debug-x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm64\",\"vm-kernel-precomp-nnbd-mac-release-simarm64\",\"vm-kernel-precomp-nnbd-win-release-x64\",\"app-kernel-linux-product-x64\",\"vm-kernel-linux-release-ia32\",\"vm-kernel-linux-debug-ia32\",\"vm-kernel-win-debug-ia32\",\"vm-kernel-win-release-ia32\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-precomp-dwarf-linux-product-x64\",\"vm-kernel-linux-product-x64\",\"vm-kernel-mac-product-x64\",\"vm-kernel-win-product-x64\",\"vm-kernel-optcounter-threshold-linux-release-ia32\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\",\"vm-kernel-reload-linux-debug-x64\",\"vm-kernel-reload-linux-release-x64\",\"vm-kernel-reload-rollback-linux-debug-x64\",\"vm-kernel-reload-rollback-linux-release-x64\",\"vm-kernel-linux-debug-x64c\",\"vm-kernel-linux-debug-simarm64c\",\"vm-kernel-precomp-linux-debug-x64c\",\"vm-kernel-precomp-linux-debug-simarm64c\",\"analyzer-nnbd-mac-release\",\"analyzer-nnbd-win-release\",\"iso-stress-linux\"],\"clobber\":true,\"recipe\":\"cron/cron\"}"
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"builders\":[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"vm-kernel-nnbd-linux-debug-ia32\",\"vm-kernel-nnbd-linux-release-ia32\",\"vm-kernel-nnbd-linux-release-simarm\",\"vm-kernel-nnbd-linux-release-simarm64\",\"vm-kernel-nnbd-mac-debug-x64\",\"vm-kernel-nnbd-mac-release-x64\",\"vm-kernel-nnbd-win-release-ia32\",\"vm-kernel-nnbd-win-debug-x64\",\"vm-kernel-nnbd-win-release-x64\",\"vm-kernel-precomp-nnbd-linux-debug-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-debug-x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm64\",\"vm-kernel-precomp-nnbd-mac-release-simarm64\",\"vm-kernel-precomp-nnbd-win-release-x64\",\"app-kernel-linux-product-x64\",\"vm-kernel-linux-release-ia32\",\"vm-kernel-linux-debug-ia32\",\"vm-kernel-win-debug-ia32\",\"vm-kernel-win-release-ia32\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-precomp-dwarf-linux-product-x64\",\"vm-kernel-linux-product-x64\",\"vm-kernel-mac-product-x64\",\"vm-kernel-win-product-x64\",\"vm-kernel-optcounter-threshold-linux-release-ia32\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\",\"vm-kernel-reload-linux-debug-x64\",\"vm-kernel-reload-linux-release-x64\",\"vm-kernel-reload-rollback-linux-debug-x64\",\"vm-kernel-reload-rollback-linux-release-x64\",\"vm-kernel-linux-debug-x64c\",\"vm-kernel-linux-debug-simarm64c\",\"vm-kernel-precomp-linux-debug-x64c\",\"vm-kernel-precomp-linux-debug-simarm64c\",\"analyzer-nnbd-mac-release\",\"analyzer-nnbd-win-release\",\"iso-stress-linux\",\"vm-precomp-ffi-qemu-linux-release-arm-experimental\"],\"clobber\":true,\"recipe\":\"cron/cron\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8718,14 +8718,13 @@ buckets {
         cmd: "luciexe"
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
-      priority: 50
+      priority: 70
       caches {
         name: "browsers"
         path: "browsers"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experimental: YES
       experiments {
         key: "luci.use_realms"
         value: 100
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 123900941cd0..63353adb314d 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -3641,7 +3641,7 @@ job {
 job {
   id: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
   realm: "ci.sandbox"
-  schedule: "0 5,7 * * 1-5"
+  schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
diff --git a/main.star b/main.star
index 1eef485bf6c0..6f4d8c62bca7 100755
--- a/main.star
+++ b/main.star
@@ -1597,6 +1597,20 @@ dart_infra_builder(
     recipe = "roller/roll_to_dev",
     schedule = "with 4h interval",
 )
+
+# Builder that tests the dev Linux image. When the image autoroller detects
+# successful builds of this builder with the dev image, it the current dev image
+# becomes the new prod image. Newly created bots will than use the updated
+# image. The `vm-precomp-ffi-qemu-linux-release-arm` is  used because qemu is
+# the primary difference, it passes all tests, triggers no shards and runs a few
+# different builds. See also https://crbug.com/1207358.
+nightly_builder(
+    "vm-precomp-ffi-qemu-linux-release-arm-experimental",
+    channels = [],
+    dimensions = {"host_class": "experimental"},
+    notifies = "infra",
+)
+
 dart_infra_builder(
     "nightly",
     notifies = "infra",
@@ -1620,23 +1634,6 @@ dart_ci_sandbox_builder(
     triggered_by = ["dart-ci-test-data-trigger"],
 )
 
-# Builder that tests the dev Linux image. When the image autoroller detects
-# successful builds of this builder with the dev image, it the current dev image
-# becomes the new prod image. Newly created bots will than use the updated
-# image. The `vm-precomp-ffi-qemu-linux-release-arm` is  used because qemu is
-# the primary difference, it passes all tests, triggers no shards and runs a few
-# different builds. See also https://crbug.com/1207358.
-dart_ci_sandbox_builder(
-    "vm-precomp-ffi-qemu-linux-release-arm-experimental",
-    channels = [],
-    dimensions = {"host_class": "experimental"},
-    experimental = True,
-    notifies = "infra",
-    # At minute 0 past hour 5 and 7 on every day-of-week from Mon through Fri.
-    schedule = "0 5,7 * * 1-5",
-    triggered_by = None,
-)
-
 # Fuzz testing builders
 dart_ci_sandbox_builder(
     "fuzz-linux",

From 85ea16e9381bdad89252e8d9f5c17d00f6a8447b Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Fri, 28 May 2021 00:42:36 +0000
Subject: [PATCH 470/826] [infra/config] Increase flutter-analyze builder
 timeout to 45 minutes.

Timeout was 25 minutes, the builder started timing out.

Change-Id: Icc96a0b8365675a7c03211484f96d877e357230e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/201680
Auto-Submit: William Hesse <whesse@google.com>
Reviewed-by: Devon Carew <devoncarew@google.com>
Commit-Queue: Devon Carew <devoncarew@google.com>
---
 cr-buildbucket.cfg | 4 ++--
 main.star          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index c7ef569e0a00..44ea6cb6ef01 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -3200,7 +3200,7 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      execution_timeout_secs: 1500
+      execution_timeout_secs: 2700
       caches {
         name: "browsers"
         path: "browsers"
@@ -9545,7 +9545,7 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      execution_timeout_secs: 1500
+      execution_timeout_secs: 2700
       caches {
         name: "browsers"
         path: "third_party/browsers"
diff --git a/main.star b/main.star
index 6f4d8c62bca7..61ea5ce10c84 100755
--- a/main.star
+++ b/main.star
@@ -1398,7 +1398,7 @@ dart_ci_sandbox_builder(
     "flutter-analyze",
     category = "analyzer|fa",
     channels = ["try"],
-    execution_timeout = 25 * time.minute,
+    execution_timeout = 45 * time.minute,
     location_regexp = [
         ".+/[+]/DEPS",
         ".+/[+]/pkg/analysis_server/.+",

From d26fd0e41e80e99f087073ed88f01296c12de7dd Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Tue, 8 Jun 2021 08:08:34 +0000
Subject: [PATCH 471/826] [infra] Remove dart-sdk-win builder from the commit
 queue

Change-Id: I5fd9bac0be00fdbc05ec2a1e8c33752f7db44988
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/202761
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg | 1 +
 main.star        | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 6bc42b80d8fa..75f3bab000b6 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -163,6 +163,7 @@ config_groups {
       }
       builders {
         name: "dart/try/dart-sdk-win-try"
+        includable_only: true
       }
       builders {
         name: "dart/try/dart2js-csp-minified-linux-x64-chrome-try"
diff --git a/main.star b/main.star
index 61ea5ce10c84..dee4aa66395b 100755
--- a/main.star
+++ b/main.star
@@ -1481,7 +1481,6 @@ dart_ci_builder(
     category = "sdk|w",
     channels = CHANNELS,
     dimensions = windows(),
-    on_cq = True,
     lkgr = True,
 )
 

From c81ea84b3c4b2d894fd32060f6ea7ac56484f0f2 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 8 Jun 2021 08:52:45 +0000
Subject: [PATCH 472/826] [infra] Add initial M1 builders to the Luci config

Change-Id: Iaaaa56b204badc7ef8f03fc648397cea2c795585
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/202626
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg   |   8 +++
 cr-buildbucket.cfg | 158 ++++++++++++++++++++++++++++++++++++++++++++-
 luci-milo.cfg      |  36 +++++++++++
 luci-notify.cfg    |  28 ++++++++
 luci-scheduler.cfg |  48 ++++++++++++++
 main.star          |  21 +++++-
 6 files changed, 296 insertions(+), 3 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 75f3bab000b6..0b4278a3a075 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -157,6 +157,10 @@ config_groups {
         name: "dart/try/dart-sdk-linux-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/dart-sdk-mac-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/dart-sdk-mac-try"
         includable_only: true
@@ -482,6 +486,10 @@ config_groups {
         name: "dart/try/vm-kernel-mac-product-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-mac-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-mac-release-x64-try"
         experiment_percentage: 5
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 44ea6cb6ef01..695080d6b775 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -254,6 +254,58 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "dart-sdk-mac-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      priority: 50
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-sdk-mac-arm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      priority: 50
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "dart-sdk-mac-beta"
       swarming_host: "chromium-swarm.appspot.com"
@@ -605,7 +657,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"builders\":[{\"bucket\":\"ci\",\"builder\":\"dart-sdk-linux\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-mac\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-win\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"debianpackage-linux\",\"project\":\"dart\"},{\"bucket\":\"ci.sandbox\",\"builder\":\"google\",\"project\":\"dart\"}],\"clobber\":true,\"recipe\":\"roller/lkgr\",\"ref\":\"refs/heads/lkgr\"}"
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"builders\":[{\"bucket\":\"ci\",\"builder\":\"dart-sdk-linux\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-mac\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-mac-arm64\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-win\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"debianpackage-linux\",\"project\":\"dart\"},{\"bucket\":\"ci.sandbox\",\"builder\":\"google\",\"project\":\"dart\"}],\"clobber\":true,\"recipe\":\"roller/lkgr\",\"ref\":\"refs/heads/lkgr\"}"
       priority: 50
       execution_timeout_secs: 900
       caches {
@@ -5869,6 +5921,58 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-mac-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      priority: 50
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-mac-release-arm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      priority: 50
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -9088,6 +9192,32 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "dart-sdk-mac-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "dart-sdk-mac-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10495,6 +10625,32 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-mac-release-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      priority: 30
+      caches {
+        name: "browsers"
+        path: "third_party/browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 0fe7bc60bddb..85be69e7e5dd 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -210,6 +210,11 @@ consoles {
     category: "vm|kernel"
     short_name: "mr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-arm64"
+    category: "vm|kernel"
+    short_name: "m1r"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
     category: "vm|kernel"
@@ -575,6 +580,11 @@ consoles {
     category: "sdk"
     short_name: "m"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64"
+    category: "sdk"
+    short_name: "m1"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-win"
     category: "sdk"
@@ -844,6 +854,11 @@ consoles {
     category: "sdk"
     short_name: "m"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64"
+    category: "sdk"
+    short_name: "m1"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-win"
     category: "sdk"
@@ -1044,6 +1059,11 @@ consoles {
     category: "vm|kernel"
     short_name: "mr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-arm64"
+    category: "vm|kernel"
+    short_name: "m1r"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
     category: "vm|kernel"
@@ -1423,6 +1443,11 @@ consoles {
     category: "vm|kernel"
     short_name: "mr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-arm64-dev"
+    category: "vm|kernel"
+    short_name: "m1r"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-dev"
     category: "vm|kernel"
@@ -1628,6 +1653,11 @@ consoles {
     category: "sdk"
     short_name: "m"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-dev"
+    category: "sdk"
+    short_name: "m1"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-win-dev"
     category: "sdk"
@@ -2649,6 +2679,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-mac-release-x64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-mac-release-arm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-win-debug-ia32-try"
   }
@@ -2859,6 +2892,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/dart-sdk-mac-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/dart-sdk-mac-arm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/dart-sdk-win-try"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 209036037ec4..1ccde1d0a07b 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -77,6 +77,20 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci"
+    name: "dart-sdk-mac-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1124,6 +1138,20 @@ notifiers {
     name: "vm-kernel-mac-product-x64"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-mac-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 63353adb314d..933d9dcfddbb 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -477,6 +477,28 @@ job {
     builder: "dart-sdk-mac"
   }
 }
+job {
+  id: "dart-sdk-mac-arm64"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-mac-arm64"
+  }
+}
+job {
+  id: "dart-sdk-mac-arm64-dev"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-mac-arm64-dev"
+  }
+}
 job {
   id: "dart-sdk-mac-beta"
   realm: "ci"
@@ -2439,6 +2461,28 @@ job {
     builder: "vm-kernel-mac-product-x64"
   }
 }
+job {
+  id: "vm-kernel-mac-release-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-release-arm64"
+  }
+}
+job {
+  id: "vm-kernel-mac-release-arm64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-release-arm64-dev"
+  }
+}
 job {
   id: "vm-kernel-mac-release-x64"
   realm: "ci.sandbox"
@@ -3781,6 +3825,7 @@ trigger {
   realm: "ci"
   acl_sets: "ci"
   triggers: "dart-sdk-linux-dev"
+  triggers: "dart-sdk-mac-arm64-dev"
   triggers: "dart-sdk-mac-dev"
   triggers: "dart-sdk-win-dev"
   triggers: "debianpackage-linux-dev"
@@ -3826,6 +3871,7 @@ trigger {
   triggers: "vm-kernel-linux-release-simarm64-dev"
   triggers: "vm-kernel-linux-release-x64-dev"
   triggers: "vm-kernel-mac-debug-x64-dev"
+  triggers: "vm-kernel-mac-release-arm64-dev"
   triggers: "vm-kernel-mac-release-x64-dev"
   triggers: "vm-kernel-nnbd-linux-debug-x64-dev"
   triggers: "vm-kernel-nnbd-linux-release-x64-dev"
@@ -3867,6 +3913,7 @@ trigger {
   acl_sets: "ci"
   triggers: "dart-sdk-linux"
   triggers: "dart-sdk-mac"
+  triggers: "dart-sdk-mac-arm64"
   triggers: "dart-sdk-win"
   triggers: "debianpackage-linux"
   triggers: "linearize-flutter"
@@ -3904,6 +3951,7 @@ trigger {
   triggers: "vm-kernel-linux-debug-x64"
   triggers: "vm-kernel-linux-release-x64"
   triggers: "vm-kernel-mac-debug-x64"
+  triggers: "vm-kernel-mac-release-arm64"
   triggers: "vm-kernel-mac-release-x64"
   triggers: "vm-kernel-win-debug-x64"
   triggers: "vm-kernel-win-release-x64"
diff --git a/main.star b/main.star
index dee4aa66395b..7a6661467f9b 100755
--- a/main.star
+++ b/main.star
@@ -104,8 +104,11 @@ JS_ENGINES = {"custom_vars": {"checkout_javascript_engines": True}}
 def to_location_regexp(paths):
     return [".+/[+]/%s" % path for path in paths]
 
-def mac():
-    return {"os": "Mac"}
+def mac(cpu = None):
+    dimensions = {"os": "Mac"}
+    if cpu:
+        dimensions["cpu"] = cpu
+    return dimensions
 
 def windows():
     return {"os": "Windows"}
@@ -1081,6 +1084,12 @@ dart_ci_sandbox_builder(
     on_cq = True,
     experiment_percentage = 5,
 )
+dart_ci_sandbox_builder(
+    "vm-kernel-mac-release-arm64",
+    category = "vm|kernel|m1r",
+    channels = ["try", "dev"],
+    dimensions = mac(cpu = "arm64"),
+)
 dart_vm_nightly_builder(
     "vm-kernel-win-debug-ia32",
     category = "vm|kernel|wd3",
@@ -1476,6 +1485,14 @@ dart_ci_builder(
     dimensions = mac(),
     lkgr = True,
 )
+dart_ci_builder(
+    "dart-sdk-mac-arm64",
+    category = "sdk|m1",
+    channels = ["try", "dev"],
+    dimensions = mac(cpu = "arm64"),
+    lkgr = True,
+)
+
 dart_ci_builder(
     "dart-sdk-win",
     category = "sdk|w",

From 2cc0aba815b2381b4c7cdb934ad8c98df2fa1b25 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 8 Jun 2021 18:10:39 +0000
Subject: [PATCH 473/826] Revert "[infra] Remove dart-sdk-win builder from the
 commit queue"

This reverts commit d26fd0e41e80e99f087073ed88f01296c12de7dd.

Reason for revert: goma issue is resolved.

Original change's description:
> [infra] Remove dart-sdk-win builder from the commit queue
>
> Change-Id: I5fd9bac0be00fdbc05ec2a1e8c33752f7db44988
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/202761
> Reviewed-by: Alexander Thomas <athom@google.com>
> Commit-Queue: Alexander Thomas <athom@google.com>

TBR=athom@google.com,whesse@google.com

Change-Id: Id826e6d204c56878253cc881d48ace81e73ff6a8
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/202773
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg | 1 -
 main.star        | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 0b4278a3a075..26a669a9b516 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -167,7 +167,6 @@ config_groups {
       }
       builders {
         name: "dart/try/dart-sdk-win-try"
-        includable_only: true
       }
       builders {
         name: "dart/try/dart2js-csp-minified-linux-x64-chrome-try"
diff --git a/main.star b/main.star
index 7a6661467f9b..049056b0315b 100755
--- a/main.star
+++ b/main.star
@@ -1498,6 +1498,7 @@ dart_ci_builder(
     category = "sdk|w",
     channels = CHANNELS,
     dimensions = windows(),
+    on_cq = True,
     lkgr = True,
 )
 

From 068e5344ec05811130378af98046bc0af5f3f836 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 9 Jun 2021 08:05:20 +0000
Subject: [PATCH 474/826] [infra] Remove dart-sdk-mac-arm64 from lkgr
 requirements until stable

It passed tryjob runs, but failed post-submit because of uploading the
generated artificats fails. When that bug has been fixed, it can be
re-instated as an lkgr builder.

Change-Id: Icd02a1dafa1304666fd1683d3ad93c8529a88970
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/202775
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: Karl Klose <karlklose@google.com>
Commit-Queue: Karl Klose <karlklose@google.com>
---
 cr-buildbucket.cfg | 2 +-
 main.star          | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 695080d6b775..73835a542b10 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -657,7 +657,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"builders\":[{\"bucket\":\"ci\",\"builder\":\"dart-sdk-linux\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-mac\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-mac-arm64\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-win\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"debianpackage-linux\",\"project\":\"dart\"},{\"bucket\":\"ci.sandbox\",\"builder\":\"google\",\"project\":\"dart\"}],\"clobber\":true,\"recipe\":\"roller/lkgr\",\"ref\":\"refs/heads/lkgr\"}"
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"builders\":[{\"bucket\":\"ci\",\"builder\":\"dart-sdk-linux\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-mac\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-win\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"debianpackage-linux\",\"project\":\"dart\"},{\"bucket\":\"ci.sandbox\",\"builder\":\"google\",\"project\":\"dart\"}],\"clobber\":true,\"recipe\":\"roller/lkgr\",\"ref\":\"refs/heads/lkgr\"}"
       priority: 50
       execution_timeout_secs: 900
       caches {
diff --git a/main.star b/main.star
index 049056b0315b..15be177cc0f9 100755
--- a/main.star
+++ b/main.star
@@ -1490,7 +1490,6 @@ dart_ci_builder(
     category = "sdk|m1",
     channels = ["try", "dev"],
     dimensions = mac(cpu = "arm64"),
-    lkgr = True,
 )
 
 dart_ci_builder(

From bd7b4e83d05de737a47c5b726b5c650f88d35176 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 14 Jun 2021 19:10:53 +0000
Subject: [PATCH 475/826] [infra] Increase shard timeout for
 app-kernel-linux-debug-x64

It's shards were timing out or close to the default 60min limit.

Change-Id: I282e29badc6b64ab09e460522fe3bd3eb3b4f9f6
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/203561
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: Alexander Markov <alexmarkov@google.com>
Commit-Queue: Alexander Markov <alexmarkov@google.com>
---
 cr-buildbucket.cfg | 10 +++++-----
 main.star          |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 73835a542b10..d34460034fbe 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1430,7 +1430,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
       caches {
         name: "browsers"
@@ -1456,7 +1456,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
       caches {
         name: "browsers"
@@ -1482,7 +1482,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
       caches {
         name: "browsers"
@@ -1508,7 +1508,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
       caches {
         name: "browsers"
@@ -9075,7 +9075,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 30
       caches {
         name: "browsers"
diff --git a/main.star b/main.star
index 15be177cc0f9..ab5862f5d8d7 100755
--- a/main.star
+++ b/main.star
@@ -1027,6 +1027,7 @@ nightly_builder(
 dart_vm_extra_builder(
     "app-kernel-linux-debug-x64",
     category = "vm|app-kernel|d64",
+    properties = {"shard_timeout": (90 * time.minute) // time.second},
 )
 dart_vm_nightly_builder(
     "app-kernel-linux-product-x64",

From 1344faf9cef852cc8f73d5724896c8cf915571f3 Mon Sep 17 00:00:00 2001
From: Karl Klose <karlklose@google.com>
Date: Wed, 16 Jun 2021 05:12:23 +0000
Subject: [PATCH 476/826] [infra] Add builders for dart_ci script executables

Change-Id: Ife5e5d72ffd41a7c4bc1fcb0b41a62a4dcb1b268
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/203682
Commit-Queue: Karl Klose <karlklose@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 104 +++++++++++++++++++++++++++++++++++++++++++++
 luci-milo.cfg      |  12 ++++++
 luci-notify.cfg    |  60 ++++++++++++++++++++++++++
 luci-scheduler.cfg |  44 +++++++++++++++++++
 main.star          |  23 ++++++++++
 5 files changed, 243 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index d34460034fbe..ed5c4c36837a 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -124,6 +124,110 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "dart-ci-scripts-linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/package_dart_ci\"}"
+      priority: 50
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-ci-scripts-mac"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/package_dart_ci\"}"
+      priority: 50
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-ci-scripts-mac-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/package_dart_ci\"}"
+      priority: 50
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-ci-scripts-win"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/package_dart_ci\"}"
+      priority: 50
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "dart-sdk-linux"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 85be69e7e5dd..7d634f0d3239 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2942,6 +2942,18 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci/co19-roller"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart-ci-scripts-linux"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart-ci-scripts-win"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart-ci-scripts-mac"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart-ci-scripts-mac-arm64"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/docker"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 1ccde1d0a07b..4f0654c5e344 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -49,6 +49,66 @@ notifiers {
     name: "co19-roller"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "dart-ci-scripts-linux"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "dart-ci-scripts-mac"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "dart-ci-scripts-mac-arm64"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "dart-ci-scripts-win"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 933d9dcfddbb..d7778a69b1ba 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -422,6 +422,50 @@ job {
     builder: "cross-vm-precomp-linux-release-arm64"
   }
 }
+job {
+  id: "dart-ci-scripts-linux"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-ci-scripts-linux"
+  }
+}
+job {
+  id: "dart-ci-scripts-mac"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-ci-scripts-mac"
+  }
+}
+job {
+  id: "dart-ci-scripts-mac-arm64"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-ci-scripts-mac-arm64"
+  }
+}
+job {
+  id: "dart-ci-scripts-win"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-ci-scripts-win"
+  }
+}
 job {
   id: "dart-sdk-linux"
   realm: "ci"
diff --git a/main.star b/main.star
index ab5862f5d8d7..8fb0363f36c6 100755
--- a/main.star
+++ b/main.star
@@ -113,6 +113,9 @@ def mac(cpu = None):
 def windows():
     return {"os": "Windows"}
 
+def linux():
+    return {"os": "Linux"}
+
 # https://chrome-infra-auth.appspot.com/auth/groups/project-dart-ci-task-accounts
 CI_ACCOUNTS_GROUP = "project-dart-ci-task-accounts"
 
@@ -1582,6 +1585,26 @@ dart_infra_builder(
 )
 dart_infra_builder("chocolatey", recipe = "dart/chocolatey", dimensions = windows())
 dart_infra_builder("co19-roller", recipe = "dart/package_co19")
+dart_infra_builder(
+    "dart-ci-scripts-linux",
+    recipe = "dart/package_dart_ci",
+    dimensions = linux(),
+)
+dart_infra_builder(
+    "dart-ci-scripts-win",
+    recipe = "dart/package_dart_ci",
+    dimensions = windows(),
+)
+dart_infra_builder(
+    "dart-ci-scripts-mac",
+    recipe = "dart/package_dart_ci",
+    dimensions = mac(),
+)
+dart_infra_builder(
+    "dart-ci-scripts-mac-arm64",
+    recipe = "dart/package_dart_ci",
+    dimensions = mac(cpu = "arm64"),
+)
 dart_infra_builder("docker", recipe = "dart/docker")
 dart_infra_builder(
     "linearize-flutter",

From 4bbbacbc975200a0494bb6c23c5bac135bda8218 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 16 Jun 2021 12:55:47 +0000
Subject: [PATCH 477/826] [infra] Enable macOS arm64 builds on beta

Change-Id: I4b22dfb6cc3e6a67d9c7c4123789880e824adac2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/203764
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: Karl Klose <karlklose@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 26 ++++++++++++++++++++++++++
 luci-milo.cfg      |  5 +++++
 luci-scheduler.cfg | 12 ++++++++++++
 main.star          |  2 +-
 4 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index ed5c4c36837a..e8568a9b0d66 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -384,6 +384,32 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "dart-sdk-mac-arm64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      priority: 50
+      caches {
+        name: "browsers"
+        path: "browsers"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "dart-sdk-mac-arm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 7d634f0d3239..39cb234361c7 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2037,6 +2037,11 @@ consoles {
     category: "sdk"
     short_name: "m"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-beta"
+    category: "sdk"
+    short_name: "m1"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-win-beta"
     category: "sdk"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index d7778a69b1ba..4f6595be4aa4 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -532,6 +532,17 @@ job {
     builder: "dart-sdk-mac-arm64"
   }
 }
+job {
+  id: "dart-sdk-mac-arm64-beta"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-mac-arm64-beta"
+  }
+}
 job {
   id: "dart-sdk-mac-arm64-dev"
   realm: "ci"
@@ -3795,6 +3806,7 @@ trigger {
   realm: "ci"
   acl_sets: "ci"
   triggers: "dart-sdk-linux-beta"
+  triggers: "dart-sdk-mac-arm64-beta"
   triggers: "dart-sdk-mac-beta"
   triggers: "dart-sdk-win-beta"
   triggers: "debianpackage-linux-beta"
diff --git a/main.star b/main.star
index 8fb0363f36c6..26303924c143 100755
--- a/main.star
+++ b/main.star
@@ -1492,7 +1492,7 @@ dart_ci_builder(
 dart_ci_builder(
     "dart-sdk-mac-arm64",
     category = "sdk|m1",
-    channels = ["try", "dev"],
+    channels = ["try", "dev", "beta"],
     dimensions = mac(cpu = "arm64"),
 )
 

From 0a126dda8c0c41b2bb80060fe7f18d9c4e5d0961 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 16 Jun 2021 15:27:18 +0000
Subject: [PATCH 478/826] Revert "[infra] Enable macOS arm64 builds on beta"

This reverts commit 4bbbacbc975200a0494bb6c23c5bac135bda8218.

Reason for revert: The macOS arm64 changes missed the branchout.

Original change's description:
> [infra] Enable macOS arm64 builds on beta
>
> Change-Id: I4b22dfb6cc3e6a67d9c7c4123789880e824adac2
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/203764
> Auto-Submit: Alexander Thomas <athom@google.com>
> Reviewed-by: Karl Klose <karlklose@google.com>
> Commit-Queue: Alexander Thomas <athom@google.com>

TBR=karlklose@google.com,athom@google.com

Change-Id: I6ca88aaaff3a5aeb3e400212974a9a3680fe55eb
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/203901
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 26 --------------------------
 luci-milo.cfg      |  5 -----
 luci-scheduler.cfg | 12 ------------
 main.star          |  2 +-
 4 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index e8568a9b0d66..ed5c4c36837a 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -384,32 +384,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "dart-sdk-mac-arm64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
-        cmd: "luciexe"
-      }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
-      priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
     builders {
       name: "dart-sdk-mac-arm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 39cb234361c7..7d634f0d3239 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2037,11 +2037,6 @@ consoles {
     category: "sdk"
     short_name: "m"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-beta"
-    category: "sdk"
-    short_name: "m1"
-  }
   builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-win-beta"
     category: "sdk"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 4f6595be4aa4..d7778a69b1ba 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -532,17 +532,6 @@ job {
     builder: "dart-sdk-mac-arm64"
   }
 }
-job {
-  id: "dart-sdk-mac-arm64-beta"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-mac-arm64-beta"
-  }
-}
 job {
   id: "dart-sdk-mac-arm64-dev"
   realm: "ci"
@@ -3806,7 +3795,6 @@ trigger {
   realm: "ci"
   acl_sets: "ci"
   triggers: "dart-sdk-linux-beta"
-  triggers: "dart-sdk-mac-arm64-beta"
   triggers: "dart-sdk-mac-beta"
   triggers: "dart-sdk-win-beta"
   triggers: "debianpackage-linux-beta"
diff --git a/main.star b/main.star
index 26303924c143..8fb0363f36c6 100755
--- a/main.star
+++ b/main.star
@@ -1492,7 +1492,7 @@ dart_ci_builder(
 dart_ci_builder(
     "dart-sdk-mac-arm64",
     category = "sdk|m1",
-    channels = ["try", "dev", "beta"],
+    channels = ["try", "dev"],
     dimensions = mac(cpu = "arm64"),
 )
 

From 497e89d6a0dae22ad956dd433b4bf8fdf7f5231c Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Sun, 20 Jun 2021 08:22:24 +0000
Subject: [PATCH 479/826] [infra] Disable ATS on Windows

https://dart-review.googlesource.com/c/sdk/+/201862 will bump the clang
version and then only ATS builds will work on Windows.

TBR=karlklose@google.com

Change-Id: I05e25384393c2ea6cf72850552a41050ef8eb829
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/204400
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 88 +++++++++++++++++++++++-----------------------
 main.star          |  9 ++++-
 2 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index ed5c4c36837a..97a48e3f4e6a 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1404,7 +1404,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -1430,7 +1430,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1482,7 +1482,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2678,7 +2678,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2730,7 +2730,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2782,7 +2782,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3146,7 +3146,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3198,7 +3198,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3799,7 +3799,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -3825,7 +3825,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3877,7 +3877,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4373,7 +4373,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4425,7 +4425,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6584,7 +6584,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 70
       caches {
         name: "browsers"
@@ -6610,7 +6610,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -6636,7 +6636,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -8119,7 +8119,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -8301,7 +8301,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8353,7 +8353,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8561,7 +8561,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -8587,7 +8587,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8639,7 +8639,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8691,7 +8691,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -8717,7 +8717,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -8743,7 +8743,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8795,7 +8795,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -9127,7 +9127,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -9153,7 +9153,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -9361,7 +9361,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -9595,7 +9595,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -9725,7 +9725,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -9988,7 +9988,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10014,7 +10014,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10144,7 +10144,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11028,7 +11028,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 30
       caches {
         name: "browsers"
@@ -11054,7 +11054,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11080,7 +11080,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11704,7 +11704,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11808,7 +11808,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11990,7 +11990,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12016,7 +12016,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12042,7 +12042,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12068,7 +12068,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12094,7 +12094,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
diff --git a/main.star b/main.star
index 8fb0363f36c6..7a94524278f5 100755
--- a/main.star
+++ b/main.star
@@ -511,7 +511,14 @@ def with_goma(goma, channel, dimensions, properties):
     if goma in (None, True):
         goma_properties = {}
         goma_properties.update(GOMA_RBE)
-        goma_properties["enable_ats"] = dimensions["os"] != "Mac"
+
+        is_win = dimensions["os"] == "Windows"
+        is_linux = dimensions["os"] == "Linux"
+
+        # TODO(athom): disable on other channels when this CL has landed there
+        #              (https://dart-review.googlesource.com/c/sdk/+/201862).
+        enable_ats = is_linux or (is_win and channel in ("beta", "stable"))
+        goma_properties["enable_ats"] = enable_ats
         updated_properties.setdefault("$build/goma", goma_properties)
     else:
         updated_properties = dict(properties)

From 02749cec2d1b33f821e2d3c4b0e49613643067d6 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Sun, 20 Jun 2021 08:46:38 +0000
Subject: [PATCH 480/826] Revert "[infra] Disable ATS on Windows"

This reverts commit 497e89d6a0dae22ad956dd433b4bf8fdf7f5231c.

Reason for revert: clang roll CL was VM tryjob failures.

Original change's description:
> [infra] Disable ATS on Windows
>
> https://dart-review.googlesource.com/c/sdk/+/201862 will bump the clang
> version and then only ATS builds will work on Windows.
>
> TBR=karlklose@google.com
>
> Change-Id: I05e25384393c2ea6cf72850552a41050ef8eb829
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/204400
> Reviewed-by: Alexander Thomas <athom@google.com>
> Commit-Queue: Alexander Thomas <athom@google.com>

TBR=karlklose@google.com,athom@google.com

Change-Id: Ib03bf65d6266a583923d7d19fd2bf1a69952dea0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/204401
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 88 +++++++++++++++++++++++-----------------------
 main.star          |  9 +----
 2 files changed, 45 insertions(+), 52 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 97a48e3f4e6a..ed5c4c36837a 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1404,7 +1404,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -1430,7 +1430,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -1482,7 +1482,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2678,7 +2678,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2730,7 +2730,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -2782,7 +2782,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3146,7 +3146,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3198,7 +3198,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3799,7 +3799,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -3825,7 +3825,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -3877,7 +3877,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4373,7 +4373,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -4425,7 +4425,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -6584,7 +6584,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 70
       caches {
         name: "browsers"
@@ -6610,7 +6610,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -6636,7 +6636,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -8119,7 +8119,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -8301,7 +8301,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8353,7 +8353,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8561,7 +8561,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -8587,7 +8587,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8639,7 +8639,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8691,7 +8691,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -8717,7 +8717,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
         name: "browsers"
@@ -8743,7 +8743,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -8795,7 +8795,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
         name: "browsers"
@@ -9127,7 +9127,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -9153,7 +9153,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -9361,7 +9361,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -9595,7 +9595,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -9725,7 +9725,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -9988,7 +9988,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10014,7 +10014,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -10144,7 +10144,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11028,7 +11028,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 30
       caches {
         name: "browsers"
@@ -11054,7 +11054,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11080,7 +11080,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11704,7 +11704,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11808,7 +11808,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -11990,7 +11990,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12016,7 +12016,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12042,7 +12042,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12068,7 +12068,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
@@ -12094,7 +12094,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
         name: "browsers"
diff --git a/main.star b/main.star
index 7a94524278f5..8fb0363f36c6 100755
--- a/main.star
+++ b/main.star
@@ -511,14 +511,7 @@ def with_goma(goma, channel, dimensions, properties):
     if goma in (None, True):
         goma_properties = {}
         goma_properties.update(GOMA_RBE)
-
-        is_win = dimensions["os"] == "Windows"
-        is_linux = dimensions["os"] == "Linux"
-
-        # TODO(athom): disable on other channels when this CL has landed there
-        #              (https://dart-review.googlesource.com/c/sdk/+/201862).
-        enable_ats = is_linux or (is_win and channel in ("beta", "stable"))
-        goma_properties["enable_ats"] = enable_ats
+        goma_properties["enable_ats"] = dimensions["os"] != "Mac"
         updated_properties.setdefault("$build/goma", goma_properties)
     else:
         updated_properties = dict(properties)

From 9adab416f0d3c124ce46ee5e58488c15d29a8f1e Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 22 Jun 2021 07:02:50 +0000
Subject: [PATCH 481/826] [infra] Remove dysfunctional browser cache, add xcode
 caches

The browser caches are outside the builder cache, and were added based
on a misunderstanding of the caching system. This CL removes these no-op
caches.

The osx_sdk cache is used by a recipe module that provisions xcode.

Change-Id: I28aa8e40bc0060aea70db12a86b906c231c592fd
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/204203
Reviewed-by: Karl Klose <karlklose@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 1856 ++++----------------------------------------
 defaults.star      |    6 +-
 main.star          |    5 +-
 3 files changed, 147 insertions(+), 1720 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index ed5c4c36837a..a5ebb3343c78 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -34,10 +34,6 @@ buckets {
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/forward_branch\"}"
       priority: 50
       execution_timeout_secs: 900
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -61,10 +57,6 @@ buckets {
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/cbuild\"}"
       priority: 50
       execution_timeout_secs: 600
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -87,10 +79,6 @@ buckets {
       }
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/chocolatey\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -113,10 +101,6 @@ buckets {
       }
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/package_co19\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -139,10 +123,6 @@ buckets {
       }
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/package_dart_ci\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -166,8 +146,8 @@ buckets {
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/package_dart_ci\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -192,8 +172,8 @@ buckets {
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/package_dart_ci\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -217,10 +197,6 @@ buckets {
       }
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/package_dart_ci\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -243,10 +219,6 @@ buckets {
       }
       properties: "{\"$dart/build\":{\"disable_goma\":true,\"timeout\":6000},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -269,10 +241,6 @@ buckets {
       }
       properties: "{\"$dart/build\":{\"disable_goma\":true,\"timeout\":6000},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -295,10 +263,6 @@ buckets {
       }
       properties: "{\"$dart/build\":{\"disable_goma\":true,\"timeout\":6000},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -321,10 +285,6 @@ buckets {
       }
       properties: "{\"$dart/build\":{\"disable_goma\":true,\"timeout\":6000},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -348,8 +308,8 @@ buckets {
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -374,8 +334,8 @@ buckets {
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -400,8 +360,8 @@ buckets {
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -426,8 +386,8 @@ buckets {
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -452,8 +412,8 @@ buckets {
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -478,8 +438,8 @@ buckets {
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -503,10 +463,6 @@ buckets {
       }
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -529,10 +485,6 @@ buckets {
       }
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -555,10 +507,6 @@ buckets {
       }
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -581,10 +529,6 @@ buckets {
       }
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -607,10 +551,6 @@ buckets {
       }
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":false,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -633,10 +573,6 @@ buckets {
       }
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":false,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -659,10 +595,6 @@ buckets {
       }
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":false,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -685,10 +617,6 @@ buckets {
       }
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":false,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -711,10 +639,6 @@ buckets {
       }
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/docker\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -737,10 +661,6 @@ buckets {
       }
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/linearize\",\"repo\":\"https://dart.googlesource.com/linear_sdk_flutter_engine.git\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -764,10 +684,6 @@ buckets {
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"builders\":[{\"bucket\":\"ci\",\"builder\":\"dart-sdk-linux\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-mac\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-win\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"debianpackage-linux\",\"project\":\"dart\"},{\"bucket\":\"ci.sandbox\",\"builder\":\"google\",\"project\":\"dart\"}],\"clobber\":true,\"recipe\":\"roller/lkgr\",\"ref\":\"refs/heads/lkgr\"}"
       priority: 50
       execution_timeout_secs: 900
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -790,10 +706,6 @@ buckets {
       }
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"builders\":[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"vm-kernel-nnbd-linux-debug-ia32\",\"vm-kernel-nnbd-linux-release-ia32\",\"vm-kernel-nnbd-linux-release-simarm\",\"vm-kernel-nnbd-linux-release-simarm64\",\"vm-kernel-nnbd-mac-debug-x64\",\"vm-kernel-nnbd-mac-release-x64\",\"vm-kernel-nnbd-win-release-ia32\",\"vm-kernel-nnbd-win-debug-x64\",\"vm-kernel-nnbd-win-release-x64\",\"vm-kernel-precomp-nnbd-linux-debug-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-debug-x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm64\",\"vm-kernel-precomp-nnbd-mac-release-simarm64\",\"vm-kernel-precomp-nnbd-win-release-x64\",\"app-kernel-linux-product-x64\",\"vm-kernel-linux-release-ia32\",\"vm-kernel-linux-debug-ia32\",\"vm-kernel-win-debug-ia32\",\"vm-kernel-win-release-ia32\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-precomp-dwarf-linux-product-x64\",\"vm-kernel-linux-product-x64\",\"vm-kernel-mac-product-x64\",\"vm-kernel-win-product-x64\",\"vm-kernel-optcounter-threshold-linux-release-ia32\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\",\"vm-kernel-reload-linux-debug-x64\",\"vm-kernel-reload-linux-release-x64\",\"vm-kernel-reload-rollback-linux-debug-x64\",\"vm-kernel-reload-rollback-linux-release-x64\",\"vm-kernel-linux-debug-x64c\",\"vm-kernel-linux-debug-simarm64c\",\"vm-kernel-precomp-linux-debug-x64c\",\"vm-kernel-precomp-linux-debug-simarm64c\",\"analyzer-nnbd-mac-release\",\"analyzer-nnbd-win-release\",\"iso-stress-linux\",\"vm-precomp-ffi-qemu-linux-release-arm-experimental\"],\"clobber\":true,\"recipe\":\"cron/cron\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -817,10 +729,6 @@ buckets {
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"package_name_internal_prefix\":\"dart_internal/recipe_bundles\",\"package_name_prefix\":\"dart/recipe_bundles\",\"recipe\":\"recipe_bundler\",\"recipe_bundler_vers\":\"git_revision:e1a6b1a375a07455c00cc236d2b52277aa46ea84\",\"repo_specs\":[\"dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/master\"]}"
       priority: 50
       execution_timeout_secs: 300
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -845,10 +753,6 @@ buckets {
       priority: 70
       execution_timeout_secs: 1200
       expiration_secs: 86400
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -871,10 +775,6 @@ buckets {
       }
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"builders\":[\"frontend-weekly\"],\"clobber\":true,\"recipe\":\"cron/cron\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -918,10 +818,6 @@ buckets {
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"from_ref\":\"refs/heads/lkgr\",\"recipe\":\"roller/roll_to_dev\"}"
       priority: 50
       execution_timeout_secs: 900
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -964,10 +860,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -990,10 +882,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1016,10 +904,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1042,10 +926,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1068,10 +948,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1094,10 +970,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1120,10 +992,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1146,10 +1014,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1173,8 +1037,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1199,8 +1063,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1225,8 +1089,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1251,8 +1115,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1276,10 +1140,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1302,10 +1162,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1328,10 +1184,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1354,10 +1206,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1381,8 +1229,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1406,10 +1254,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1432,10 +1276,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1458,10 +1298,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1484,10 +1320,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1510,10 +1342,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1536,10 +1364,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1562,10 +1386,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1588,10 +1408,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1614,10 +1430,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1640,10 +1452,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1666,10 +1474,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1692,10 +1496,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1718,10 +1518,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1744,10 +1540,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1770,10 +1562,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1796,10 +1584,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1822,10 +1606,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1848,10 +1628,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1874,10 +1650,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1900,10 +1672,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1926,10 +1694,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1952,10 +1716,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1978,10 +1738,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2004,10 +1760,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2030,10 +1782,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2056,10 +1804,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2082,10 +1826,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2108,10 +1848,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2134,10 +1870,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2160,10 +1892,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2186,10 +1914,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2212,10 +1936,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2238,10 +1958,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2264,10 +1980,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2290,10 +2002,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2316,10 +2024,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2342,10 +2046,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2368,10 +2068,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2394,10 +2090,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2420,10 +2112,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2446,10 +2134,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2473,8 +2157,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2499,8 +2183,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2525,8 +2209,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2551,8 +2235,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2577,8 +2261,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2603,8 +2287,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2629,8 +2313,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2655,8 +2339,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2680,10 +2364,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2706,10 +2386,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2732,10 +2408,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2758,10 +2430,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2784,10 +2452,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2810,10 +2474,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2836,10 +2496,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2862,10 +2518,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2888,10 +2540,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2914,10 +2562,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2940,10 +2584,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2966,10 +2606,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2992,10 +2628,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3019,8 +2651,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3045,8 +2677,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3071,8 +2703,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3097,8 +2729,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3122,10 +2754,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3148,10 +2776,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3174,10 +2798,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3200,10 +2820,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3226,10 +2842,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3252,10 +2864,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3278,10 +2886,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3304,10 +2908,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3330,10 +2930,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3357,10 +2953,6 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       execution_timeout_secs: 2700
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3384,10 +2976,6 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"flutter_test_suites\":[\"add_to_app_life_cycle_tests\",\"flutter_plugins\",\"framework_coverage\",\"framework_tests\",\"tool_tests\"],\"recipe\":\"dart/flutter_engine\"}"
       priority: 50
       execution_timeout_secs: 28800
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3411,10 +2999,6 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"flutter_test_suites\":[\"web_tests\",\"web_tool_tests\"],\"recipe\":\"dart/flutter_engine\"}"
       priority: 50
       execution_timeout_secs: 28800
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3437,10 +3021,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3463,10 +3043,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3489,10 +3065,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3515,10 +3087,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3541,10 +3109,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3568,8 +3132,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3594,8 +3158,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3620,8 +3184,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3646,8 +3210,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3671,10 +3235,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3697,10 +3257,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3723,10 +3279,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3749,10 +3301,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3776,8 +3324,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3801,10 +3349,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3827,10 +3371,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3853,10 +3393,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3879,10 +3415,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3905,10 +3437,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3932,10 +3460,6 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       execution_timeout_secs: 43200
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3958,10 +3482,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3984,10 +3504,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/gclient\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4010,10 +3526,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/gclient\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4036,10 +3548,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/gclient\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4062,10 +3570,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/gclient\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4089,10 +3593,6 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/external\"}"
       priority: 30
       execution_timeout_secs: 300
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4115,10 +3615,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4141,10 +3637,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4167,10 +3659,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4193,10 +3681,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4219,10 +3703,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4245,10 +3725,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4272,8 +3748,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4298,8 +3774,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4324,8 +3800,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4350,8 +3826,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4375,10 +3851,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4401,10 +3873,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4427,10 +3895,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4453,10 +3917,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4479,10 +3939,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4505,10 +3961,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4531,10 +3983,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4557,10 +4005,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4583,10 +4027,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4609,10 +4049,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4635,10 +4071,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4661,10 +4093,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4687,10 +4115,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4713,10 +4137,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4739,10 +4159,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4765,10 +4181,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4791,10 +4203,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4817,10 +4225,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4843,10 +4247,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4869,10 +4269,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4895,10 +4291,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4921,10 +4313,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4947,10 +4335,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4973,10 +4357,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4999,10 +4379,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5025,10 +4401,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5051,10 +4423,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5077,10 +4445,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5103,10 +4467,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5129,10 +4489,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5155,10 +4511,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5181,10 +4533,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5208,10 +4556,6 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       expiration_secs: 86400
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5234,10 +4578,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5260,10 +4600,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5286,10 +4622,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5312,10 +4644,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5338,10 +4666,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5364,10 +4688,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5390,10 +4710,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5416,10 +4732,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5442,10 +4754,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5468,10 +4776,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5494,10 +4798,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5520,10 +4820,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5546,10 +4842,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5572,10 +4864,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5598,10 +4886,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5624,10 +4908,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5650,10 +4930,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5676,10 +4952,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5702,10 +4974,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5728,10 +4996,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5754,10 +5018,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5780,10 +5040,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5806,10 +5062,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5832,10 +5084,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5858,10 +5106,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5884,10 +5128,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5911,8 +5151,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5937,8 +5177,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5963,8 +5203,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5989,8 +5229,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6015,8 +5255,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6041,8 +5281,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6067,8 +5307,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6093,8 +5333,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6119,8 +5359,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6145,8 +5385,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6171,8 +5411,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6196,10 +5436,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6222,10 +5458,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6248,10 +5480,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6274,10 +5502,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6300,10 +5524,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6326,10 +5546,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6352,10 +5568,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6378,10 +5590,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6404,10 +5612,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6430,10 +5634,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6456,10 +5656,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6482,10 +5678,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6508,10 +5700,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6535,8 +5723,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 70
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6561,8 +5749,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6586,10 +5774,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6612,10 +5796,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6638,10 +5818,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6664,10 +5840,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6691,10 +5863,6 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       expiration_secs: 86400
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6717,10 +5885,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6743,10 +5907,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6769,10 +5929,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6795,10 +5951,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6821,10 +5973,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6847,10 +5995,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6873,10 +6017,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6899,10 +6039,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6925,10 +6061,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6951,10 +6083,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6977,10 +6105,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7003,10 +6127,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7029,10 +6149,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7055,10 +6171,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7081,10 +6193,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7107,10 +6215,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7133,10 +6237,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7159,10 +6259,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7185,10 +6281,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7211,10 +6303,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7237,10 +6325,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7263,10 +6347,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7289,10 +6369,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7315,10 +6391,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7341,10 +6413,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7367,10 +6435,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7393,10 +6457,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7419,10 +6479,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7445,10 +6501,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7471,10 +6523,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7497,10 +6545,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7523,10 +6567,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7549,10 +6589,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7575,10 +6611,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7601,10 +6633,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7627,10 +6655,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7653,10 +6677,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7679,10 +6699,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7705,10 +6721,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7731,10 +6743,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7758,8 +6766,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7784,8 +6792,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7810,8 +6818,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7836,8 +6844,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7861,10 +6869,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7887,10 +6891,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7913,10 +6913,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7939,10 +6935,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7965,10 +6957,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7991,10 +6979,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8017,10 +7001,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8043,10 +7023,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8069,10 +7045,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8096,8 +7068,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 70
       caches {
-        name: "browsers"
-        path: "browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8121,10 +7093,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8147,10 +7115,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8173,10 +7137,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8199,10 +7159,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8225,10 +7181,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8251,10 +7203,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8277,10 +7225,6 @@ buckets {
       }
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8303,10 +7247,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8329,10 +7269,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8355,10 +7291,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8381,10 +7313,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8407,10 +7335,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8433,10 +7357,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8459,10 +7379,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8485,10 +7401,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8511,10 +7423,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8537,10 +7445,6 @@ buckets {
       }
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8563,10 +7467,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8589,10 +7489,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8615,10 +7511,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8641,10 +7533,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8667,10 +7555,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8693,10 +7577,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8719,10 +7599,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8745,10 +7621,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8771,10 +7643,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8797,10 +7665,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8823,10 +7687,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8849,10 +7709,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8875,10 +7731,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8901,10 +7753,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8927,10 +7775,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8953,10 +7797,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
-      caches {
-        name: "browsers"
-        path: "browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8999,10 +7839,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9025,10 +7861,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9052,8 +7884,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
-        name: "browsers"
-        path: "third_party/browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9077,10 +7909,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9104,8 +7932,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
-        name: "browsers"
-        path: "third_party/browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9129,10 +7957,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9155,10 +7979,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9181,10 +8001,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9207,10 +8023,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9233,10 +8045,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9259,10 +8067,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"checkout_javascript_engines\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9285,10 +8089,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$dart/build\":{\"disable_goma\":true,\"timeout\":6000},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9312,8 +8112,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
-        name: "browsers"
-        path: "third_party/browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9338,8 +8138,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
-        name: "browsers"
-        path: "third_party/browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9363,10 +8163,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9389,10 +8185,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9415,10 +8207,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9441,10 +8229,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9467,10 +8251,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9493,10 +8273,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9519,10 +8295,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9546,8 +8318,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
-        name: "browsers"
-        path: "third_party/browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9572,8 +8344,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
-        name: "browsers"
-        path: "third_party/browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9597,10 +8369,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9623,10 +8391,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9649,10 +8413,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9676,8 +8436,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
-        name: "browsers"
-        path: "third_party/browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9701,10 +8461,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9727,10 +8483,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9753,10 +8505,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9780,10 +8528,6 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       execution_timeout_secs: 2700
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9807,10 +8551,6 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"flutter_test_suites\":[\"add_to_app_life_cycle_tests\",\"flutter_plugins\",\"framework_coverage\",\"framework_tests\",\"tool_tests\"],\"recipe\":\"dart/flutter_engine\"}"
       priority: 30
       execution_timeout_secs: 28800
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9834,10 +8574,6 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"flutter_test_suites\":[\"web_tests\",\"web_tool_tests\"],\"recipe\":\"dart/flutter_engine\"}"
       priority: 30
       execution_timeout_secs: 28800
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9860,10 +8596,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9886,10 +8618,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9913,8 +8641,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
-        name: "browsers"
-        path: "third_party/browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9938,10 +8666,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9965,8 +8689,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
-        name: "browsers"
-        path: "third_party/browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9990,10 +8714,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10016,10 +8736,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10042,10 +8758,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/gclient\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10068,10 +8780,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10094,10 +8802,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10121,8 +8825,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
-        name: "browsers"
-        path: "third_party/browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10146,10 +8850,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10172,10 +8872,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10198,10 +8894,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10224,10 +8916,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10250,10 +8938,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10276,10 +8960,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10302,10 +8982,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10328,10 +9004,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10354,10 +9026,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10380,10 +9048,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10406,10 +9070,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10432,10 +9092,6 @@ buckets {
       }
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10458,10 +9114,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10484,10 +9136,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10510,10 +9158,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10536,10 +9180,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10562,10 +9202,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10588,10 +9224,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10614,10 +9246,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10640,10 +9268,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10666,10 +9290,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10693,8 +9313,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
-        name: "browsers"
-        path: "third_party/browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10719,8 +9339,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
-        name: "browsers"
-        path: "third_party/browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10745,8 +9365,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
-        name: "browsers"
-        path: "third_party/browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10771,8 +9391,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
-        name: "browsers"
-        path: "third_party/browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10796,10 +9416,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10822,10 +9438,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10848,10 +9460,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10874,10 +9482,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10900,10 +9504,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10926,10 +9526,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10952,10 +9548,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10979,8 +9571,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 30
       caches {
-        name: "browsers"
-        path: "third_party/browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -11005,8 +9597,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
-        name: "browsers"
-        path: "third_party/browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -11030,10 +9622,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11056,10 +9644,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11082,10 +9666,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11108,10 +9688,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11134,10 +9710,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11160,10 +9732,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11186,10 +9754,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11212,10 +9776,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11238,10 +9798,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11264,10 +9820,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11290,10 +9842,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11316,10 +9864,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11342,10 +9886,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11368,10 +9908,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11394,10 +9930,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11420,10 +9952,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11446,10 +9974,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11472,10 +9996,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11499,8 +10019,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       caches {
-        name: "browsers"
-        path: "third_party/browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -11524,10 +10044,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11550,10 +10066,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11576,10 +10088,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11602,10 +10110,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11628,10 +10132,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11654,10 +10154,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11681,8 +10177,8 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 30
       caches {
-        name: "browsers"
-        path: "third_party/browsers"
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -11706,10 +10202,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11732,10 +10224,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11758,10 +10246,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11784,10 +10268,6 @@ buckets {
       }
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11810,10 +10290,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11836,10 +10312,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11862,10 +10334,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11888,10 +10356,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11914,10 +10378,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11940,10 +10400,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11966,10 +10422,6 @@ buckets {
       }
       properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11992,10 +10444,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12018,10 +10466,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12044,10 +10488,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12070,10 +10510,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12096,10 +10532,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12122,10 +10554,6 @@ buckets {
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12169,10 +10597,6 @@ buckets {
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"presubmit/presubmit\"}"
       priority: 30
       execution_timeout_secs: 600
-      caches {
-        name: "browsers"
-        path: "third_party/browsers"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
diff --git a/defaults.star b/defaults.star
index d1e5b0ff7ba1..ca0e83a398fa 100644
--- a/defaults.star
+++ b/defaults.star
@@ -12,6 +12,9 @@ _DIMENSIONS = {
     "os": "Linux",
     "pool": "luci.dart.try",
 }
+_CACHES = {
+    "Mac": [swarming.cache("osx_sdk", name = "osx_sdk")],
+}
 
 def _default_dict(defaults, overrides):
     defaults = dict(defaults)
@@ -20,6 +23,7 @@ def _default_dict(defaults, overrides):
     return defaults
 
 defaults = struct(
-    properties = lambda properties: _default_dict(_PROPERTIES, properties),
+    caches = lambda os: _CACHES.get(os),
     dimensions = lambda dimensions: _default_dict(_DIMENSIONS, dimensions),
+    properties = lambda properties: _default_dict(_PROPERTIES, properties),
 )
diff --git a/main.star b/main.star
index 8fb0363f36c6..5d9aadc4f570 100755
--- a/main.star
+++ b/main.star
@@ -551,12 +551,11 @@ def dart_try_builder(
     properties = defaults.properties(properties)
     builder_properties = with_goma(goma, "try", dimensions, properties)
     builder = name + "-try"
-
     luci.builder(
         name = builder,
         build_numbers = True,
         bucket = bucket,
-        caches = [swarming.cache("third_party/browsers", name = "browsers")],
+        caches = defaults.caches(dimensions["os"]),
         dimensions = dimensions,
         executable = dart_recipe(recipe),
         execution_timeout = execution_timeout,
@@ -697,7 +696,7 @@ def dart_builder(
                 name = builder,
                 build_numbers = True,
                 bucket = bucket,
-                caches = [swarming.cache("browsers")],
+                caches = defaults.caches(dimensions["os"]),
                 dimensions = dimensions,
                 executable = executable or dart_recipe(recipe),
                 execution_timeout = execution_timeout,

From 517bab17ea2589f272973c22fdb3b74a966d19ce Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 22 Jun 2021 09:49:33 +0000
Subject: [PATCH 482/826] [infra] Add more arm64 configurations to the Luci
 config

Change-Id: Ibc5f0873b685f663c90205f313c54712ccb5f7f0
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/204501
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg   |  16 ++++
 cr-buildbucket.cfg | 210 ++++++++++++++++++++++++++++++++++++++++++++-
 luci-milo.cfg      |  52 +++++++++++
 luci-notify.cfg    |  54 ++++++++++++
 luci-scheduler.cfg |  47 ++++++++++
 main.star          |  27 ++++++
 6 files changed, 405 insertions(+), 1 deletion(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 26a669a9b516..daf7c8578ba7 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -379,6 +379,10 @@ config_groups {
       builders {
         name: "dart/try/pkg-linux-release-try"
       }
+      builders {
+        name: "dart/try/pkg-mac-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/pkg-mac-release-try"
         includable_only: true
@@ -543,10 +547,18 @@ config_groups {
         location_regexp: ".+/[+]/pkg/vm/.+"
         location_regexp: ".+/[+]/runtime/.+"
       }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-mac-debug-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-nnbd-mac-debug-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-mac-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-nnbd-mac-release-x64-try"
         includable_only: true
@@ -651,6 +663,10 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
         includable_only: true
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index a5ebb3343c78..4856860395e9 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -704,7 +704,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"builders\":[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"vm-kernel-nnbd-linux-debug-ia32\",\"vm-kernel-nnbd-linux-release-ia32\",\"vm-kernel-nnbd-linux-release-simarm\",\"vm-kernel-nnbd-linux-release-simarm64\",\"vm-kernel-nnbd-mac-debug-x64\",\"vm-kernel-nnbd-mac-release-x64\",\"vm-kernel-nnbd-win-release-ia32\",\"vm-kernel-nnbd-win-debug-x64\",\"vm-kernel-nnbd-win-release-x64\",\"vm-kernel-precomp-nnbd-linux-debug-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-debug-x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm64\",\"vm-kernel-precomp-nnbd-mac-release-simarm64\",\"vm-kernel-precomp-nnbd-win-release-x64\",\"app-kernel-linux-product-x64\",\"vm-kernel-linux-release-ia32\",\"vm-kernel-linux-debug-ia32\",\"vm-kernel-win-debug-ia32\",\"vm-kernel-win-release-ia32\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-precomp-dwarf-linux-product-x64\",\"vm-kernel-linux-product-x64\",\"vm-kernel-mac-product-x64\",\"vm-kernel-win-product-x64\",\"vm-kernel-optcounter-threshold-linux-release-ia32\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\",\"vm-kernel-reload-linux-debug-x64\",\"vm-kernel-reload-linux-release-x64\",\"vm-kernel-reload-rollback-linux-debug-x64\",\"vm-kernel-reload-rollback-linux-release-x64\",\"vm-kernel-linux-debug-x64c\",\"vm-kernel-linux-debug-simarm64c\",\"vm-kernel-precomp-linux-debug-x64c\",\"vm-kernel-precomp-linux-debug-simarm64c\",\"analyzer-nnbd-mac-release\",\"analyzer-nnbd-win-release\",\"iso-stress-linux\",\"vm-precomp-ffi-qemu-linux-release-arm-experimental\"],\"clobber\":true,\"recipe\":\"cron/cron\"}"
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"builders\":[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"vm-kernel-nnbd-linux-debug-ia32\",\"vm-kernel-nnbd-linux-release-ia32\",\"vm-kernel-nnbd-linux-release-simarm\",\"vm-kernel-nnbd-linux-release-simarm64\",\"vm-kernel-nnbd-mac-debug-arm64\",\"vm-kernel-nnbd-mac-debug-x64\",\"vm-kernel-nnbd-mac-release-x64\",\"vm-kernel-nnbd-win-release-ia32\",\"vm-kernel-nnbd-win-debug-x64\",\"vm-kernel-nnbd-win-release-x64\",\"vm-kernel-precomp-nnbd-linux-debug-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-debug-x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm64\",\"vm-kernel-precomp-nnbd-mac-release-simarm64\",\"vm-kernel-precomp-nnbd-win-release-x64\",\"app-kernel-linux-product-x64\",\"vm-kernel-linux-release-ia32\",\"vm-kernel-linux-debug-ia32\",\"vm-kernel-win-debug-ia32\",\"vm-kernel-win-release-ia32\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-precomp-dwarf-linux-product-x64\",\"vm-kernel-linux-product-x64\",\"vm-kernel-mac-product-x64\",\"vm-kernel-win-product-x64\",\"vm-kernel-optcounter-threshold-linux-release-ia32\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\",\"vm-kernel-reload-linux-debug-x64\",\"vm-kernel-reload-linux-release-x64\",\"vm-kernel-reload-rollback-linux-debug-x64\",\"vm-kernel-reload-rollback-linux-release-x64\",\"vm-kernel-linux-debug-x64c\",\"vm-kernel-linux-debug-simarm64c\",\"vm-kernel-precomp-linux-debug-x64c\",\"vm-kernel-precomp-linux-debug-simarm64c\",\"analyzer-nnbd-mac-release\",\"analyzer-nnbd-win-release\",\"iso-stress-linux\",\"vm-precomp-ffi-qemu-linux-release-arm-experimental\"],\"clobber\":true,\"recipe\":\"cron/cron\"}"
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -3758,6 +3758,32 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "pkg-mac-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "pkg-mac-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
@@ -5707,6 +5733,32 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-nnbd-mac-debug-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-nnbd-mac-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -5733,6 +5785,32 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-nnbd-mac-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-nnbd-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -7052,6 +7130,32 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-precomp-nnbd-mac-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-precomp-nnbd-mac-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8809,6 +8913,32 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "pkg-mac-release-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "pkg-mac-release-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -9555,6 +9685,32 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-nnbd-mac-debug-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-nnbd-mac-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -9581,6 +9737,32 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-nnbd-mac-release-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-nnbd-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10161,6 +10343,32 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-precomp-nnbd-mac-release-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-precomp-nnbd-mac-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 7d634f0d3239..c0f7ccbbf2cd 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -85,11 +85,21 @@ consoles {
     category: "vm|nnbd|jit"
     short_name: "ra6"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-arm64"
+    category: "vm|nnbd|jit"
+    short_name: "m1d"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-x64"
     category: "vm|nnbd|jit"
     short_name: "md"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-arm64"
+    category: "vm|nnbd|jit"
+    short_name: "m1r"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-x64"
     category: "vm|nnbd|jit"
@@ -135,6 +145,11 @@ consoles {
     category: "vm|nnbd|aot"
     short_name: "ra6"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-arm64"
+    category: "vm|nnbd|aot"
+    short_name: "m1"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64"
     category: "vm|nnbd|aot"
@@ -465,6 +480,11 @@ consoles {
     category: "pkg"
     short_name: "m"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-arm64"
+    category: "pkg"
+    short_name: "m1"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
     category: "pkg"
@@ -739,6 +759,11 @@ consoles {
     category: "pkg"
     short_name: "m"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-arm64"
+    category: "pkg"
+    short_name: "m1"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
     category: "pkg"
@@ -934,11 +959,21 @@ consoles {
     category: "vm|nnbd|jit"
     short_name: "ra6"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-arm64"
+    category: "vm|nnbd|jit"
+    short_name: "m1d"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-x64"
     category: "vm|nnbd|jit"
     short_name: "md"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-arm64"
+    category: "vm|nnbd|jit"
+    short_name: "m1r"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-x64"
     category: "vm|nnbd|jit"
@@ -984,6 +1019,11 @@ consoles {
     category: "vm|nnbd|aot"
     short_name: "ra6"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-arm64"
+    category: "vm|nnbd|aot"
+    short_name: "m1"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64"
     category: "vm|nnbd|aot"
@@ -2604,9 +2644,15 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-simarm64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-debug-arm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-debug-x64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-release-arm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-release-x64-try"
   }
@@ -2634,6 +2680,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-mac-release-arm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
   }
@@ -2826,6 +2875,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/pkg-mac-release-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/pkg-mac-release-arm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/pkg-win-release-try"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 4f0654c5e344..f444079a6c47 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -903,6 +903,20 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "pkg-mac-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1315,6 +1329,18 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-mac-debug-arm64"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1327,6 +1353,20 @@ notifiers {
     name: "vm-kernel-nnbd-mac-debug-x64"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-mac-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1669,6 +1709,20 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-nnbd-mac-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index d7778a69b1ba..51c6c47b9b2a 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1735,6 +1735,17 @@ job {
     builder: "pkg-mac-release"
   }
 }
+job {
+  id: "pkg-mac-release-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-mac-release-arm64"
+  }
+}
 job {
   id: "pkg-mac-release-beta"
   realm: "ci.sandbox"
@@ -2714,6 +2725,17 @@ job {
     builder: "vm-kernel-nnbd-linux-release-x64-stable"
   }
 }
+job {
+  id: "vm-kernel-nnbd-mac-debug-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-mac-debug-arm64"
+  }
+}
 job {
   id: "vm-kernel-nnbd-mac-debug-x64"
   realm: "ci.sandbox"
@@ -2725,6 +2747,17 @@ job {
     builder: "vm-kernel-nnbd-mac-debug-x64"
   }
 }
+job {
+  id: "vm-kernel-nnbd-mac-release-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-mac-release-arm64"
+  }
+}
 job {
   id: "vm-kernel-nnbd-mac-release-x64"
   realm: "ci.sandbox"
@@ -3374,6 +3407,17 @@ job {
     builder: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
   }
 }
+job {
+  id: "vm-kernel-precomp-nnbd-mac-release-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-nnbd-mac-release-arm64"
+  }
+}
 job {
   id: "vm-kernel-precomp-nnbd-mac-release-simarm64"
   realm: "ci.sandbox"
@@ -3991,6 +4035,7 @@ trigger {
   triggers: "pkg-linux-debug"
   triggers: "pkg-linux-release"
   triggers: "pkg-mac-release"
+  triggers: "pkg-mac-release-arm64"
   triggers: "pkg-win-release"
   triggers: "vm-kernel-linux-debug-x64"
   triggers: "vm-kernel-linux-release-x64"
@@ -4098,6 +4143,7 @@ trigger {
   triggers: "vm-kernel-linux-release-simarm64"
   triggers: "vm-kernel-nnbd-linux-debug-x64"
   triggers: "vm-kernel-nnbd-linux-release-x64"
+  triggers: "vm-kernel-nnbd-mac-release-arm64"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
   triggers: "vm-kernel-precomp-android-release-arm64"
   triggers: "vm-kernel-precomp-android-release-arm_x64"
@@ -4110,6 +4156,7 @@ trigger {
   triggers: "vm-kernel-precomp-linux-release-x64"
   triggers: "vm-kernel-precomp-mac-release-simarm64"
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64"
+  triggers: "vm-kernel-precomp-nnbd-mac-release-arm64"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64"
   triggers: "vm-kernel-precomp-win-release-x64"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm"
diff --git a/main.star b/main.star
index 5d9aadc4f570..3e5670dfcee8 100755
--- a/main.star
+++ b/main.star
@@ -952,6 +952,13 @@ dart_vm_nightly_builder(
     category = "vm|nnbd|jit|ra6",
     channels = ["try"],
 )
+dart_vm_nightly_builder(
+    "vm-kernel-nnbd-mac-debug-arm64",
+    category = "vm|nnbd|jit|m1d",
+    channels = ["try"],
+    properties = {"shard_timeout": (90 * time.minute) // time.second},
+    dimensions = mac(cpu = "arm64"),
+)
 dart_vm_nightly_builder(
     "vm-kernel-nnbd-mac-debug-x64",
     category = "vm|nnbd|jit|md",
@@ -959,6 +966,12 @@ dart_vm_nightly_builder(
     properties = {"shard_timeout": (90 * time.minute) // time.second},
     dimensions = mac(),
 )
+dart_vm_extra_builder(
+    "vm-kernel-nnbd-mac-release-arm64",
+    category = "vm|nnbd|jit|m1r",
+    channels = ["try"],
+    dimensions = mac(cpu = "arm64"),
+)
 dart_vm_nightly_builder(
     "vm-kernel-nnbd-mac-release-x64",
     category = "vm|nnbd|jit|mr",
@@ -1011,6 +1024,13 @@ nightly_builder(
     category = "vm|nnbd|aot|ra6",
     channels = ["try"],
 )
+dart_vm_extra_builder(
+    "vm-kernel-precomp-nnbd-mac-release-arm64",
+    category = "vm|nnbd|aot|m1",
+    channels = ["try"],
+    dimensions = mac(cpu = "arm64"),
+    properties = {"shard_timeout": (90 * time.minute) // time.second},
+)
 nightly_builder(
     "vm-kernel-precomp-nnbd-mac-release-simarm64",
     category = "vm|nnbd|aot|ma6",
@@ -1329,6 +1349,13 @@ dart_ci_sandbox_builder(
     dimensions = mac(),
     properties = CHROME,
 )
+dart_ci_sandbox_builder(
+    "pkg-mac-release-arm64",
+    category = "pkg|m1",
+    channels = ["try"],
+    dimensions = mac(cpu = "arm64"),
+    properties = CHROME,
+)
 dart_ci_sandbox_builder(
     "pkg-win-release",
     category = "pkg|w",

From 968b57a59fe0161570b94ac4821116d368d44abd Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 23 Jun 2021 07:31:06 +0000
Subject: [PATCH 483/826] Reland "[infra] Disable ATS on Windows"

This is a reland of 497e89d6a0dae22ad956dd433b4bf8fdf7f5231c

TBR=karlklose@google.com

Original change's description:
> [infra] Disable ATS on Windows
>
> https://dart-review.googlesource.com/c/sdk/+/201862 will bump the clang
> version and then only ATS builds will work on Windows.
>
> TBR=karlklose@google.com
>
> Change-Id: I05e25384393c2ea6cf72850552a41050ef8eb829
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/204400
> Reviewed-by: Alexander Thomas <athom@google.com>
> Commit-Queue: Alexander Thomas <athom@google.com>

Change-Id: I8e4309dbb30f7b089e6d07e631b5b6c258516c9c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/204581
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 88 +++++++++++++++++++++++-----------------------
 main.star          |  9 ++++-
 2 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 4856860395e9..4d8e263e2f46 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1252,7 +1252,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1274,7 +1274,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1318,7 +1318,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2362,7 +2362,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2406,7 +2406,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2450,7 +2450,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2774,7 +2774,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2818,7 +2818,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3347,7 +3347,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3369,7 +3369,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3413,7 +3413,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3875,7 +3875,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3919,7 +3919,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5850,7 +5850,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5872,7 +5872,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5894,7 +5894,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7195,7 +7195,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7349,7 +7349,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7393,7 +7393,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7569,7 +7569,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7591,7 +7591,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7635,7 +7635,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7679,7 +7679,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7701,7 +7701,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7723,7 +7723,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7767,7 +7767,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8059,7 +8059,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8081,7 +8081,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8265,7 +8265,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8471,7 +8471,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8585,7 +8585,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8816,7 +8816,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8838,7 +8838,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8978,7 +8978,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9802,7 +9802,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9824,7 +9824,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9846,7 +9846,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10408,7 +10408,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10496,7 +10496,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10650,7 +10650,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10672,7 +10672,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10694,7 +10694,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10716,7 +10716,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10738,7 +10738,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
diff --git a/main.star b/main.star
index 3e5670dfcee8..5023f1884c90 100755
--- a/main.star
+++ b/main.star
@@ -511,7 +511,14 @@ def with_goma(goma, channel, dimensions, properties):
     if goma in (None, True):
         goma_properties = {}
         goma_properties.update(GOMA_RBE)
-        goma_properties["enable_ats"] = dimensions["os"] != "Mac"
+
+        is_win = dimensions["os"] == "Windows"
+        is_linux = dimensions["os"] == "Linux"
+
+        # TODO(athom): disable on other channels when this CL has landed there
+        #              (https://dart-review.googlesource.com/c/sdk/+/201862).
+        enable_ats = is_linux or (is_win and channel in ("beta", "stable"))
+        goma_properties["enable_ats"] = enable_ats
         updated_properties.setdefault("$build/goma", goma_properties)
     else:
         updated_properties = dict(properties)

From 3fafb9c0cff3b5a7fb7691fedade4422bf029d23 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Wed, 14 Jul 2021 14:08:32 +0000
Subject: [PATCH 484/826] [infra] Run iso-stress builder on vm commits

This builder was previously run only nightly

Change-Id: Ic41bc2290871102e8c3447e962568a6185122dc6
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/206789
Auto-Submit: William Hesse <whesse@google.com>
Reviewed-by: Martin Kustermann <kustermann@google.com>
Commit-Queue: Martin Kustermann <kustermann@google.com>
---
 cr-buildbucket.cfg | 4 ++--
 luci-notify.cfg    | 1 +
 luci-scheduler.cfg | 1 +
 main.star          | 3 ++-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 4d8e263e2f46..a70806b77521 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -704,7 +704,7 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"builders\":[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"vm-kernel-nnbd-linux-debug-ia32\",\"vm-kernel-nnbd-linux-release-ia32\",\"vm-kernel-nnbd-linux-release-simarm\",\"vm-kernel-nnbd-linux-release-simarm64\",\"vm-kernel-nnbd-mac-debug-arm64\",\"vm-kernel-nnbd-mac-debug-x64\",\"vm-kernel-nnbd-mac-release-x64\",\"vm-kernel-nnbd-win-release-ia32\",\"vm-kernel-nnbd-win-debug-x64\",\"vm-kernel-nnbd-win-release-x64\",\"vm-kernel-precomp-nnbd-linux-debug-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-debug-x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm64\",\"vm-kernel-precomp-nnbd-mac-release-simarm64\",\"vm-kernel-precomp-nnbd-win-release-x64\",\"app-kernel-linux-product-x64\",\"vm-kernel-linux-release-ia32\",\"vm-kernel-linux-debug-ia32\",\"vm-kernel-win-debug-ia32\",\"vm-kernel-win-release-ia32\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-precomp-dwarf-linux-product-x64\",\"vm-kernel-linux-product-x64\",\"vm-kernel-mac-product-x64\",\"vm-kernel-win-product-x64\",\"vm-kernel-optcounter-threshold-linux-release-ia32\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\",\"vm-kernel-reload-linux-debug-x64\",\"vm-kernel-reload-linux-release-x64\",\"vm-kernel-reload-rollback-linux-debug-x64\",\"vm-kernel-reload-rollback-linux-release-x64\",\"vm-kernel-linux-debug-x64c\",\"vm-kernel-linux-debug-simarm64c\",\"vm-kernel-precomp-linux-debug-x64c\",\"vm-kernel-precomp-linux-debug-simarm64c\",\"analyzer-nnbd-mac-release\",\"analyzer-nnbd-win-release\",\"iso-stress-linux\",\"vm-precomp-ffi-qemu-linux-release-arm-experimental\"],\"clobber\":true,\"recipe\":\"cron/cron\"}"
+      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"builders\":[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"vm-kernel-nnbd-linux-debug-ia32\",\"vm-kernel-nnbd-linux-release-ia32\",\"vm-kernel-nnbd-linux-release-simarm\",\"vm-kernel-nnbd-linux-release-simarm64\",\"vm-kernel-nnbd-mac-debug-arm64\",\"vm-kernel-nnbd-mac-debug-x64\",\"vm-kernel-nnbd-mac-release-x64\",\"vm-kernel-nnbd-win-release-ia32\",\"vm-kernel-nnbd-win-debug-x64\",\"vm-kernel-nnbd-win-release-x64\",\"vm-kernel-precomp-nnbd-linux-debug-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-debug-x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm64\",\"vm-kernel-precomp-nnbd-mac-release-simarm64\",\"vm-kernel-precomp-nnbd-win-release-x64\",\"app-kernel-linux-product-x64\",\"vm-kernel-linux-release-ia32\",\"vm-kernel-linux-debug-ia32\",\"vm-kernel-win-debug-ia32\",\"vm-kernel-win-release-ia32\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-precomp-dwarf-linux-product-x64\",\"vm-kernel-linux-product-x64\",\"vm-kernel-mac-product-x64\",\"vm-kernel-win-product-x64\",\"vm-kernel-optcounter-threshold-linux-release-ia32\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\",\"vm-kernel-reload-linux-debug-x64\",\"vm-kernel-reload-linux-release-x64\",\"vm-kernel-reload-rollback-linux-debug-x64\",\"vm-kernel-reload-rollback-linux-release-x64\",\"vm-kernel-linux-debug-x64c\",\"vm-kernel-linux-debug-simarm64c\",\"vm-kernel-precomp-linux-debug-x64c\",\"vm-kernel-precomp-linux-debug-simarm64c\",\"analyzer-nnbd-mac-release\",\"analyzer-nnbd-win-release\",\"vm-precomp-ffi-qemu-linux-release-arm-experimental\"],\"clobber\":true,\"recipe\":\"cron/cron\"}"
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -3614,7 +3614,7 @@ buckets {
         cmd: "luciexe"
       }
       properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
diff --git a/luci-notify.cfg b/luci-notify.cfg
index f444079a6c47..c6368525d81e 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -859,6 +859,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "iso-stress-linux"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 51c6c47b9b2a..3fb95fc973b5 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -4130,6 +4130,7 @@ trigger {
   triggers: "app-kernel-linux-debug-x64"
   triggers: "app-kernel-linux-release-x64"
   triggers: "cross-vm-linux-release-arm64"
+  triggers: "iso-stress-linux"
   triggers: "vm-canary-linux-debug"
   triggers: "vm-ffi-android-debug-arm"
   triggers: "vm-ffi-android-debug-arm64"
diff --git a/main.star b/main.star
index 5023f1884c90..7714018abf05 100755
--- a/main.star
+++ b/main.star
@@ -1584,9 +1584,10 @@ dart_ci_builder(
 )
 
 # Isolate stress test builder
-dart_vm_nightly_builder(
+dart_vm_extra_builder(
     "iso-stress-linux",
     channels = [],
+    notifies = "dart-vm-team",
 )
 
 # external

From 62b1d708b0ccecacc4dc94c53a060920ac527aa4 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Mon, 19 Jul 2021 18:01:39 +0000
Subject: [PATCH 485/826] [infra/config] Enable ARM MacOS SDK builder for beta
 and stable branch

Change-Id: I681ecbbaa1fcbe837c0665e0765dd9dbc8b65408
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/207321
Reviewed-by: Michael Thomsen <mit@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 8426 +++++++++++++++++++++++++++++++++++++++++---
 luci-milo.cfg      |   10 +
 luci-scheduler.cfg |   24 +
 main.star          |    2 +-
 4 files changed, 7989 insertions(+), 473 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index a70806b77521..8bfdd2a99b67 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -31,7 +31,20 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/forward_branch\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/forward_branch"'
+        '}'
       priority: 50
       execution_timeout_secs: 900
       build_numbers: YES
@@ -54,7 +67,20 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/cbuild\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/cbuild"'
+        '}'
       priority: 50
       execution_timeout_secs: 600
       build_numbers: YES
@@ -77,7 +103,20 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/chocolatey\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/chocolatey"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -99,7 +138,20 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/package_co19\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/package_co19"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -121,7 +173,20 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/package_dart_ci\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/package_dart_ci"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -143,7 +208,20 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/package_dart_ci\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/package_dart_ci"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -169,7 +247,20 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/package_dart_ci\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/package_dart_ci"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -195,7 +286,20 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/package_dart_ci\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/package_dart_ci"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -217,7 +321,21 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true,\"timeout\":6000},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true,'
+        '    "timeout": 6000'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -239,7 +357,21 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true,\"timeout\":6000},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true,'
+        '    "timeout": 6000'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -261,7 +393,21 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true,\"timeout\":6000},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true,'
+        '    "timeout": 6000'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -283,7 +429,21 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true,\"timeout\":6000},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true,'
+        '    "timeout": 6000'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -305,7 +465,20 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -331,7 +504,59 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-sdk-mac-arm64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -357,7 +582,59 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-sdk-mac-arm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -383,7 +660,20 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -409,7 +699,20 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -435,7 +738,20 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -461,7 +777,20 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -483,7 +812,20 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -505,7 +847,20 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -527,7 +882,20 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -549,7 +917,20 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":false,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -571,7 +952,20 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":false,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -593,7 +987,20 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":false,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -615,7 +1022,20 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":false,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -637,7 +1057,20 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/docker\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/docker"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -659,7 +1092,21 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/linearize\",\"repo\":\"https://dart.googlesource.com/linear_sdk_flutter_engine.git\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/linearize",'
+        '  "repo": "https://dart.googlesource.com/linear_sdk_flutter_engine.git"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -681,7 +1128,48 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"builders\":[{\"bucket\":\"ci\",\"builder\":\"dart-sdk-linux\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-mac\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"dart-sdk-win\",\"project\":\"dart\"},{\"bucket\":\"ci\",\"builder\":\"debianpackage-linux\",\"project\":\"dart\"},{\"bucket\":\"ci.sandbox\",\"builder\":\"google\",\"project\":\"dart\"}],\"clobber\":true,\"recipe\":\"roller/lkgr\",\"ref\":\"refs/heads/lkgr\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "builders": ['
+        '    {'
+        '      "bucket": "ci",'
+        '      "builder": "dart-sdk-linux",'
+        '      "project": "dart"'
+        '    },'
+        '    {'
+        '      "bucket": "ci",'
+        '      "builder": "dart-sdk-mac",'
+        '      "project": "dart"'
+        '    },'
+        '    {'
+        '      "bucket": "ci",'
+        '      "builder": "dart-sdk-win",'
+        '      "project": "dart"'
+        '    },'
+        '    {'
+        '      "bucket": "ci",'
+        '      "builder": "debianpackage-linux",'
+        '      "project": "dart"'
+        '    },'
+        '    {'
+        '      "bucket": "ci.sandbox",'
+        '      "builder": "google",'
+        '      "project": "dart"'
+        '    }'
+        '  ],'
+        '  "clobber": true,'
+        '  "recipe": "roller/lkgr",'
+        '  "ref": "refs/heads/lkgr"'
+        '}'
       priority: 50
       execution_timeout_secs: 900
       build_numbers: YES
@@ -704,7 +1192,70 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"builders\":[\"front-end-nnbd-mac-release-x64\",\"front-end-nnbd-win-release-x64\",\"vm-kernel-nnbd-linux-debug-ia32\",\"vm-kernel-nnbd-linux-release-ia32\",\"vm-kernel-nnbd-linux-release-simarm\",\"vm-kernel-nnbd-linux-release-simarm64\",\"vm-kernel-nnbd-mac-debug-arm64\",\"vm-kernel-nnbd-mac-debug-x64\",\"vm-kernel-nnbd-mac-release-x64\",\"vm-kernel-nnbd-win-release-ia32\",\"vm-kernel-nnbd-win-debug-x64\",\"vm-kernel-nnbd-win-release-x64\",\"vm-kernel-precomp-nnbd-linux-debug-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm_x64\",\"vm-kernel-precomp-nnbd-linux-debug-x64\",\"vm-kernel-precomp-nnbd-linux-release-simarm64\",\"vm-kernel-precomp-nnbd-mac-release-simarm64\",\"vm-kernel-precomp-nnbd-win-release-x64\",\"app-kernel-linux-product-x64\",\"vm-kernel-linux-release-ia32\",\"vm-kernel-linux-debug-ia32\",\"vm-kernel-win-debug-ia32\",\"vm-kernel-win-release-ia32\",\"cross-vm-precomp-linux-release-arm64\",\"vm-kernel-precomp-dwarf-linux-product-x64\",\"vm-kernel-linux-product-x64\",\"vm-kernel-mac-product-x64\",\"vm-kernel-win-product-x64\",\"vm-kernel-optcounter-threshold-linux-release-ia32\",\"vm-kernel-asan-linux-release-x64\",\"vm-kernel-msan-linux-release-x64\",\"vm-kernel-tsan-linux-release-x64\",\"vm-kernel-ubsan-linux-release-x64\",\"vm-kernel-precomp-asan-linux-release-x64\",\"vm-kernel-precomp-msan-linux-release-x64\",\"vm-kernel-precomp-tsan-linux-release-x64\",\"vm-kernel-precomp-ubsan-linux-release-x64\",\"vm-kernel-reload-linux-debug-x64\",\"vm-kernel-reload-linux-release-x64\",\"vm-kernel-reload-rollback-linux-debug-x64\",\"vm-kernel-reload-rollback-linux-release-x64\",\"vm-kernel-linux-debug-x64c\",\"vm-kernel-linux-debug-simarm64c\",\"vm-kernel-precomp-linux-debug-x64c\",\"vm-kernel-precomp-linux-debug-simarm64c\",\"analyzer-nnbd-mac-release\",\"analyzer-nnbd-win-release\",\"vm-precomp-ffi-qemu-linux-release-arm-experimental\"],\"clobber\":true,\"recipe\":\"cron/cron\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "builders": ['
+        '    "front-end-nnbd-mac-release-x64",'
+        '    "front-end-nnbd-win-release-x64",'
+        '    "vm-kernel-nnbd-linux-debug-ia32",'
+        '    "vm-kernel-nnbd-linux-release-ia32",'
+        '    "vm-kernel-nnbd-linux-release-simarm",'
+        '    "vm-kernel-nnbd-linux-release-simarm64",'
+        '    "vm-kernel-nnbd-mac-debug-arm64",'
+        '    "vm-kernel-nnbd-mac-debug-x64",'
+        '    "vm-kernel-nnbd-mac-release-x64",'
+        '    "vm-kernel-nnbd-win-release-ia32",'
+        '    "vm-kernel-nnbd-win-debug-x64",'
+        '    "vm-kernel-nnbd-win-release-x64",'
+        '    "vm-kernel-precomp-nnbd-linux-debug-simarm_x64",'
+        '    "vm-kernel-precomp-nnbd-linux-release-simarm_x64",'
+        '    "vm-kernel-precomp-nnbd-linux-debug-x64",'
+        '    "vm-kernel-precomp-nnbd-linux-release-simarm64",'
+        '    "vm-kernel-precomp-nnbd-mac-release-simarm64",'
+        '    "vm-kernel-precomp-nnbd-win-release-x64",'
+        '    "app-kernel-linux-product-x64",'
+        '    "vm-kernel-linux-release-ia32",'
+        '    "vm-kernel-linux-debug-ia32",'
+        '    "vm-kernel-win-debug-ia32",'
+        '    "vm-kernel-win-release-ia32",'
+        '    "cross-vm-precomp-linux-release-arm64",'
+        '    "vm-kernel-precomp-dwarf-linux-product-x64",'
+        '    "vm-kernel-linux-product-x64",'
+        '    "vm-kernel-mac-product-x64",'
+        '    "vm-kernel-win-product-x64",'
+        '    "vm-kernel-optcounter-threshold-linux-release-ia32",'
+        '    "vm-kernel-asan-linux-release-x64",'
+        '    "vm-kernel-msan-linux-release-x64",'
+        '    "vm-kernel-tsan-linux-release-x64",'
+        '    "vm-kernel-ubsan-linux-release-x64",'
+        '    "vm-kernel-precomp-asan-linux-release-x64",'
+        '    "vm-kernel-precomp-msan-linux-release-x64",'
+        '    "vm-kernel-precomp-tsan-linux-release-x64",'
+        '    "vm-kernel-precomp-ubsan-linux-release-x64",'
+        '    "vm-kernel-reload-linux-debug-x64",'
+        '    "vm-kernel-reload-linux-release-x64",'
+        '    "vm-kernel-reload-rollback-linux-debug-x64",'
+        '    "vm-kernel-reload-rollback-linux-release-x64",'
+        '    "vm-kernel-linux-debug-x64c",'
+        '    "vm-kernel-linux-debug-simarm64c",'
+        '    "vm-kernel-precomp-linux-debug-x64c",'
+        '    "vm-kernel-precomp-linux-debug-simarm64c",'
+        '    "analyzer-nnbd-mac-release",'
+        '    "analyzer-nnbd-win-release",'
+        '    "vm-precomp-ffi-qemu-linux-release-arm-experimental"'
+        '  ],'
+        '  "clobber": true,'
+        '  "recipe": "cron/cron"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -726,7 +1277,26 @@ buckets {
         cipd_version: "git_revision:e1a6b1a375a07455c00cc236d2b52277aa46ea84"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"package_name_internal_prefix\":\"dart_internal/recipe_bundles\",\"package_name_prefix\":\"dart/recipe_bundles\",\"recipe\":\"recipe_bundler\",\"recipe_bundler_vers\":\"git_revision:e1a6b1a375a07455c00cc236d2b52277aa46ea84\",\"repo_specs\":[\"dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/master\"]}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "package_name_internal_prefix": "dart_internal/recipe_bundles",'
+        '  "package_name_prefix": "dart/recipe_bundles",'
+        '  "recipe": "recipe_bundler",'
+        '  "recipe_bundler_vers": "git_revision:e1a6b1a375a07455c00cc236d2b52277aa46ea84",'
+        '  "repo_specs": ['
+        '    "dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/master"'
+        '  ]'
+        '}'
       priority: 50
       execution_timeout_secs: 300
       build_numbers: YES
@@ -749,7 +1319,27 @@ buckets {
         cipd_version: "git_revision:e1a6b1a375a07455c00cc236d2b52277aa46ea84"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"db_gcs_bucket\":\"dart-recipe-roller-db\",\"projects\":[[\"dart\",\"https://dart.googlesource.com/recipes\"]],\"recipe\":\"recipe_autoroller\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "db_gcs_bucket": "dart-recipe-roller-db",'
+        '  "projects": ['
+        '    ['
+        '      "dart",'
+        '      "https://dart.googlesource.com/recipes"'
+        '    ]'
+        '  ],'
+        '  "recipe": "recipe_autoroller"'
+        '}'
       priority: 70
       execution_timeout_secs: 1200
       expiration_secs: 86400
@@ -773,7 +1363,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"builders\":[\"frontend-weekly\"],\"clobber\":true,\"recipe\":\"cron/cron\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "builders": ['
+        '    "frontend-weekly"'
+        '  ],'
+        '  "clobber": true,'
+        '  "recipe": "cron/cron"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -815,7 +1421,21 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"from_ref\":\"refs/heads/lkgr\",\"recipe\":\"roller/roll_to_dev\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "from_ref": "refs/heads/lkgr",'
+        '  "recipe": "roller/roll_to_dev"'
+        '}'
       priority: 50
       execution_timeout_secs: 900
       build_numbers: YES
@@ -858,7 +1478,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -880,7 +1515,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -902,7 +1552,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -924,7 +1589,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -946,7 +1626,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -968,7 +1663,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -990,7 +1700,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1012,7 +1737,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1034,7 +1774,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -1060,7 +1815,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -1086,7 +1856,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -1112,7 +1897,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -1138,7 +1938,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1160,7 +1975,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1182,7 +2012,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1204,7 +2049,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1226,7 +2086,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       caches {
         name: "osx_sdk"
@@ -1252,7 +2127,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1274,7 +2164,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1296,7 +2201,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1318,7 +2238,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1340,7 +2275,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1362,7 +2312,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1384,7 +2350,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1406,7 +2388,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1428,7 +2426,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1450,7 +2464,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1472,7 +2501,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1494,7 +2538,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1516,7 +2575,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1538,7 +2612,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1560,7 +2649,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1582,7 +2687,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1604,7 +2725,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1626,7 +2763,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1648,7 +2803,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1670,7 +2843,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1692,7 +2883,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1714,7 +2923,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1736,7 +2960,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1758,7 +2997,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1780,7 +3034,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1802,7 +3071,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1824,7 +3111,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1846,7 +3151,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1868,7 +3191,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1890,7 +3231,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1912,7 +3268,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1934,7 +3305,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1956,7 +3342,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1978,7 +3379,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2000,7 +3419,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2022,7 +3459,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2044,7 +3499,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2066,7 +3539,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2088,7 +3579,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2110,7 +3619,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2132,7 +3659,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2154,7 +3699,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -2180,7 +3743,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -2206,7 +3787,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -2232,7 +3831,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -2258,7 +3875,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -2284,7 +3916,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -2310,7 +3957,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -2336,7 +3998,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -2362,7 +4039,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2384,7 +4079,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2406,7 +4119,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2428,7 +4159,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2450,7 +4199,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2472,7 +4239,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2494,7 +4276,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2516,7 +4313,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2538,7 +4350,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2560,7 +4387,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2582,7 +4427,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2604,7 +4467,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2626,7 +4507,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2648,7 +4547,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -2674,7 +4591,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -2700,7 +4635,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -2726,7 +4679,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -2752,7 +4723,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2774,7 +4763,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2796,7 +4803,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2818,7 +4843,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2840,7 +4883,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2862,7 +4923,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2884,7 +4963,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2906,7 +5003,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2928,7 +5043,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2950,7 +5083,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       execution_timeout_secs: 2700
       build_numbers: YES
@@ -2973,7 +5121,30 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"flutter_test_suites\":[\"add_to_app_life_cycle_tests\",\"flutter_plugins\",\"framework_coverage\",\"framework_tests\",\"tool_tests\"],\"recipe\":\"dart/flutter_engine\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "flutter_test_suites": ['
+        '    "add_to_app_life_cycle_tests",'
+        '    "flutter_plugins",'
+        '    "framework_coverage",'
+        '    "framework_tests",'
+        '    "tool_tests"'
+        '  ],'
+        '  "recipe": "dart/flutter_engine"'
+        '}'
       priority: 50
       execution_timeout_secs: 28800
       build_numbers: YES
@@ -2996,7 +5167,27 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"flutter_test_suites\":[\"web_tests\",\"web_tool_tests\"],\"recipe\":\"dart/flutter_engine\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "flutter_test_suites": ['
+        '    "web_tests",'
+        '    "web_tool_tests"'
+        '  ],'
+        '  "recipe": "dart/flutter_engine"'
+        '}'
       priority: 50
       execution_timeout_secs: 28800
       build_numbers: YES
@@ -3019,7 +5210,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3041,7 +5247,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3063,7 +5284,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3085,7 +5321,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3107,7 +5358,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3129,7 +5395,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -3155,7 +5436,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -3181,7 +5477,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -3207,7 +5518,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -3233,7 +5559,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3255,7 +5596,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3277,7 +5633,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3299,7 +5670,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3321,7 +5707,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       caches {
         name: "osx_sdk"
@@ -3347,7 +5748,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3369,7 +5785,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3391,7 +5822,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3413,7 +5859,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3435,7 +5896,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3457,7 +5933,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       execution_timeout_secs: 43200
       build_numbers: YES
@@ -3480,7 +5971,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3502,7 +6008,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/gclient\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/gclient"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3524,7 +6045,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/gclient\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/gclient"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3546,7 +6082,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/gclient\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/gclient"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3568,7 +6119,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/gclient\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/gclient"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3590,7 +6156,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/external\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/external"'
+        '}'
       priority: 30
       execution_timeout_secs: 300
       build_numbers: YES
@@ -3613,7 +6194,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3635,7 +6231,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3657,7 +6271,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3679,7 +6311,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3701,7 +6351,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3723,7 +6391,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3745,7 +6431,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -3771,7 +6475,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -3797,7 +6519,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -3823,7 +6563,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -3849,7 +6607,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -3875,7 +6651,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3897,7 +6691,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3919,7 +6731,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3941,7 +6771,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3963,7 +6811,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3985,7 +6848,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4007,7 +6885,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4029,7 +6922,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4051,7 +6959,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4073,7 +6996,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4095,7 +7033,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4117,7 +7070,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4139,7 +7107,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4161,7 +7144,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4183,7 +7181,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4205,7 +7218,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4227,7 +7255,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4249,7 +7292,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4271,7 +7329,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4293,7 +7366,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4315,7 +7403,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4337,7 +7440,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4359,7 +7477,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4381,7 +7514,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4403,7 +7551,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4425,7 +7588,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4447,7 +7625,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4469,7 +7662,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4491,7 +7699,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4513,7 +7736,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4535,7 +7773,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4557,7 +7810,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4579,7 +7847,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       expiration_secs: 86400
       build_numbers: YES
@@ -4602,7 +7885,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4624,7 +7923,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4646,7 +7960,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4668,7 +7997,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4690,7 +8034,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4712,7 +8071,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4734,7 +8108,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4756,7 +8145,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4778,7 +8182,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4800,7 +8219,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4822,7 +8256,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4844,7 +8293,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4866,7 +8330,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4888,7 +8367,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4910,7 +8404,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4932,7 +8441,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4954,7 +8478,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4976,7 +8515,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4998,7 +8552,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5020,7 +8589,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5042,7 +8626,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5064,7 +8663,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5086,7 +8700,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5108,7 +8737,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5130,7 +8774,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5152,7 +8811,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5174,7 +8848,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -5200,7 +8889,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -5226,7 +8930,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -5252,7 +8971,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -5278,7 +9012,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       caches {
         name: "osx_sdk"
@@ -5304,7 +9053,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -5330,7 +9094,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -5356,7 +9135,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -5382,7 +9176,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -5408,7 +9217,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -5434,7 +9258,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -5460,7 +9299,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5482,7 +9337,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5504,7 +9375,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5526,7 +9412,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5548,7 +9449,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5570,7 +9486,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5592,7 +9523,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5614,7 +9560,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5636,7 +9597,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5658,7 +9634,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5680,7 +9671,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5702,7 +9708,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5724,7 +9745,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5746,7 +9782,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 70
       caches {
         name: "osx_sdk"
@@ -5772,7 +9824,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 70
       caches {
         name: "osx_sdk"
@@ -5798,7 +9866,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -5824,7 +9907,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       caches {
         name: "osx_sdk"
@@ -5850,7 +9948,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5872,7 +9986,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5894,7 +10023,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5916,7 +10060,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5938,7 +10097,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       expiration_secs: 86400
       build_numbers: YES
@@ -5961,7 +10135,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5983,7 +10173,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6005,7 +10211,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6027,7 +10249,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6049,7 +10287,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6071,7 +10325,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6093,7 +10363,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6115,7 +10401,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6137,7 +10439,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6159,7 +10477,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6181,7 +10514,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6203,7 +10551,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6225,7 +10589,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6247,7 +10627,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6269,7 +10665,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6291,7 +10703,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6313,7 +10740,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6335,7 +10777,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6357,7 +10814,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6379,7 +10851,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6401,7 +10888,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6423,7 +10925,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6445,7 +10962,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6467,7 +10999,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6489,7 +11036,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6511,7 +11073,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6533,7 +11110,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6555,7 +11147,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6577,7 +11184,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6599,7 +11221,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6621,7 +11258,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6643,7 +11295,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6665,7 +11332,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6687,7 +11369,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6709,7 +11406,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6731,7 +11443,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6753,7 +11480,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6775,7 +11517,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6797,7 +11554,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6819,7 +11591,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6841,7 +11628,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -6867,7 +11669,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -6893,7 +11710,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -6919,7 +11751,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -6945,7 +11792,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6967,7 +11830,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6989,7 +11867,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7011,7 +11905,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7033,7 +11942,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7055,7 +11979,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7077,7 +12016,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7099,7 +12053,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7121,7 +12090,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7143,7 +12127,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 50
       caches {
         name: "osx_sdk"
@@ -7169,7 +12169,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 70
       caches {
         name: "osx_sdk"
@@ -7195,7 +12211,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7217,7 +12248,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7239,7 +12285,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7261,7 +12322,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7283,7 +12359,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7305,7 +12396,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7327,7 +12434,21 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7349,7 +12470,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7371,7 +12507,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7393,7 +12544,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7415,7 +12581,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7437,7 +12618,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7459,7 +12655,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7481,7 +12692,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7503,7 +12729,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7525,7 +12766,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7547,7 +12804,21 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7569,7 +12840,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7591,7 +12877,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7613,7 +12914,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7635,7 +12951,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7657,7 +12988,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7679,7 +13025,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7701,7 +13062,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7723,7 +13099,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7745,7 +13136,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7767,7 +13173,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7789,7 +13210,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7811,7 +13247,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7833,7 +13284,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7855,7 +13321,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7877,7 +13358,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7899,7 +13395,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7941,7 +13452,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7963,7 +13489,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -7985,7 +13526,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       caches {
         name: "osx_sdk"
@@ -8011,7 +13567,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8033,7 +13604,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       caches {
         name: "osx_sdk"
@@ -8059,7 +13645,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8081,7 +13682,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8103,7 +13719,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8125,7 +13757,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8147,7 +13794,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8169,7 +13831,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"checkout_javascript_engines\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "checkout_javascript_engines": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8191,7 +13871,26 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$dart/build\":{\"disable_goma\":true,\"timeout\":6000},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$dart/build": {'
+        '    "disable_goma": true,'
+        '    "timeout": 6000'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8213,7 +13912,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       caches {
         name: "osx_sdk"
@@ -8239,7 +13953,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       caches {
         name: "osx_sdk"
@@ -8265,7 +13994,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8287,7 +14031,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8309,7 +14071,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8331,7 +14108,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8353,7 +14148,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8375,7 +14185,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8397,7 +14225,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8419,7 +14265,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       caches {
         name: "osx_sdk"
@@ -8445,7 +14309,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       caches {
         name: "osx_sdk"
@@ -8471,7 +14350,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8493,7 +14390,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8515,7 +14427,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8537,7 +14467,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       caches {
         name: "osx_sdk"
@@ -8563,7 +14511,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8585,7 +14551,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8607,7 +14591,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_firefox\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8629,7 +14631,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       execution_timeout_secs: 2700
       build_numbers: YES
@@ -8652,7 +14669,30 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"flutter_test_suites\":[\"add_to_app_life_cycle_tests\",\"flutter_plugins\",\"framework_coverage\",\"framework_tests\",\"tool_tests\"],\"recipe\":\"dart/flutter_engine\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "flutter_test_suites": ['
+        '    "add_to_app_life_cycle_tests",'
+        '    "flutter_plugins",'
+        '    "framework_coverage",'
+        '    "framework_tests",'
+        '    "tool_tests"'
+        '  ],'
+        '  "recipe": "dart/flutter_engine"'
+        '}'
       priority: 30
       execution_timeout_secs: 28800
       build_numbers: YES
@@ -8675,7 +14715,27 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"flutter_test_suites\":[\"web_tests\",\"web_tool_tests\"],\"recipe\":\"dart/flutter_engine\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "flutter_test_suites": ['
+        '    "web_tests",'
+        '    "web_tool_tests"'
+        '  ],'
+        '  "recipe": "dart/flutter_engine"'
+        '}'
       priority: 30
       execution_timeout_secs: 28800
       build_numbers: YES
@@ -8698,7 +14758,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8720,7 +14795,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8742,7 +14832,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       caches {
         name: "osx_sdk"
@@ -8768,7 +14873,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8790,7 +14910,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       caches {
         name: "osx_sdk"
@@ -8816,7 +14951,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8838,7 +14988,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8860,7 +15025,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/gclient\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/gclient"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8882,7 +15062,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8904,7 +15102,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8926,7 +15142,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       caches {
         name: "osx_sdk"
@@ -8952,7 +15186,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       caches {
         name: "osx_sdk"
@@ -8978,7 +15230,25 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"custom_vars\":{\"download_chrome\":true},\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9000,7 +15270,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9022,7 +15307,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9044,7 +15344,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9066,7 +15381,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9088,7 +15418,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9110,7 +15455,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9132,7 +15492,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9154,7 +15529,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9176,7 +15566,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9198,7 +15604,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9220,7 +15641,20 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9242,7 +15676,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9264,7 +15713,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9286,7 +15750,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9308,7 +15787,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9330,7 +15824,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9352,7 +15861,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9374,7 +15898,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9396,7 +15935,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9418,7 +15972,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9440,7 +16009,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       caches {
         name: "osx_sdk"
@@ -9466,7 +16050,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       caches {
         name: "osx_sdk"
@@ -9492,7 +16091,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       caches {
         name: "osx_sdk"
@@ -9518,7 +16132,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       caches {
         name: "osx_sdk"
@@ -9544,7 +16173,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9566,7 +16211,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9588,7 +16249,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9610,7 +16286,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9632,7 +16323,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9654,7 +16360,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9676,7 +16397,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9698,7 +16434,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 30
       caches {
         name: "osx_sdk"
@@ -9724,7 +16476,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 30
       caches {
         name: "osx_sdk"
@@ -9750,7 +16518,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       caches {
         name: "osx_sdk"
@@ -9776,7 +16559,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       caches {
         name: "osx_sdk"
@@ -9802,7 +16600,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9824,7 +16638,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9846,7 +16675,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9868,7 +16712,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9890,7 +16749,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9912,7 +16786,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9934,7 +16824,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9956,7 +16862,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9978,7 +16900,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10000,7 +16937,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10022,7 +16974,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10044,7 +17012,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10066,7 +17049,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10088,7 +17086,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10110,7 +17123,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10132,7 +17160,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10154,7 +17197,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10176,7 +17234,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10198,7 +17271,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       caches {
         name: "osx_sdk"
@@ -10224,7 +17312,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10246,7 +17350,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10268,7 +17387,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10290,7 +17425,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10312,7 +17462,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10334,7 +17499,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10356,7 +17536,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 30
       caches {
         name: "osx_sdk"
@@ -10382,7 +17578,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\",\"shard_timeout\":5400}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
       priority: 30
       caches {
         name: "osx_sdk"
@@ -10408,7 +17620,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10430,7 +17657,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10452,7 +17694,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10474,7 +17732,21 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10496,7 +17768,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10518,7 +17805,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10540,7 +17842,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10562,7 +17879,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10584,7 +17916,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10606,7 +17953,23 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10628,7 +17991,21 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$dart/build\":{\"disable_goma\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"bisection_enabled\":true,\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10650,7 +18027,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10672,7 +18064,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10694,7 +18101,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10716,7 +18138,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10738,7 +18175,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":false,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10760,7 +18212,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"dart/neo\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10802,7 +18269,22 @@ buckets {
         cipd_version: "refs/heads/master"
         cmd: "luciexe"
       }
-      properties: "{\"$build/goma\":{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/swarming\":{\"server\":\"https://chromium-swarm.appspot.com\"},\"clobber\":true,\"recipe\":\"presubmit/presubmit\"}"
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "presubmit/presubmit"'
+        '}'
       priority: 30
       execution_timeout_secs: 600
       build_numbers: YES
diff --git a/luci-milo.cfg b/luci-milo.cfg
index c0f7ccbbf2cd..6015463260f0 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -2077,6 +2077,11 @@ consoles {
     category: "sdk"
     short_name: "m"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-beta"
+    category: "sdk"
+    short_name: "m1"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-win-beta"
     category: "sdk"
@@ -2456,6 +2461,11 @@ consoles {
     category: "sdk"
     short_name: "m"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-stable"
+    category: "sdk"
+    short_name: "m1"
+  }
   builders {
     name: "buildbucket/luci.dart.ci/dart-sdk-win-stable"
     category: "sdk"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 3fb95fc973b5..ab587b869756 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -532,6 +532,17 @@ job {
     builder: "dart-sdk-mac-arm64"
   }
 }
+job {
+  id: "dart-sdk-mac-arm64-beta"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-mac-arm64-beta"
+  }
+}
 job {
   id: "dart-sdk-mac-arm64-dev"
   realm: "ci"
@@ -543,6 +554,17 @@ job {
     builder: "dart-sdk-mac-arm64-dev"
   }
 }
+job {
+  id: "dart-sdk-mac-arm64-stable"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-mac-arm64-stable"
+  }
+}
 job {
   id: "dart-sdk-mac-beta"
   realm: "ci"
@@ -3839,6 +3861,7 @@ trigger {
   realm: "ci"
   acl_sets: "ci"
   triggers: "dart-sdk-linux-beta"
+  triggers: "dart-sdk-mac-arm64-beta"
   triggers: "dart-sdk-mac-beta"
   triggers: "dart-sdk-win-beta"
   triggers: "debianpackage-linux-beta"
@@ -4054,6 +4077,7 @@ trigger {
   realm: "ci"
   acl_sets: "ci"
   triggers: "dart-sdk-linux-stable"
+  triggers: "dart-sdk-mac-arm64-stable"
   triggers: "dart-sdk-mac-stable"
   triggers: "dart-sdk-win-stable"
   triggers: "debianpackage-linux-stable"
diff --git a/main.star b/main.star
index 7714018abf05..b84ec8e45d58 100755
--- a/main.star
+++ b/main.star
@@ -1525,7 +1525,7 @@ dart_ci_builder(
 dart_ci_builder(
     "dart-sdk-mac-arm64",
     category = "sdk|m1",
-    channels = ["try", "dev"],
+    channels = CHANNELS,
     dimensions = mac(cpu = "arm64"),
 )
 

From 25888df0df02081458b0db9ca7e62f774fc869e0 Mon Sep 17 00:00:00 2001
From: Fumitoshi Ukai <ukai@google.com>
Date: Tue, 20 Jul 2021 02:35:14 +0000
Subject: [PATCH 486/826] don't set enable_ats=true on windows on beta channel

https://dart-review.googlesource.com/c/sdk/+/201862 landed,
so no need to use enable_ats=true on windows.

with enable_ats=true, it failed to run compiler on RBE Windows
exit=-1073741515 (missing DLLs)?

Bug: b/186194563
Change-Id: I9efe71f3e2a53b067851bfc64eb271aafad00689
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/207420
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
Auto-Submit: Fumitoshi Ukai <ukai@google.com>
---
 cr-buildbucket.cfg | 16 ++++++++--------
 main.star          |  3 ++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 8bfdd2a99b67..be1d757729b0 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -2204,7 +2204,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -4082,7 +4082,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -4806,7 +4806,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5825,7 +5825,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6694,7 +6694,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12510,7 +12510,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12917,7 +12917,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -13139,7 +13139,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
diff --git a/main.star b/main.star
index b84ec8e45d58..0778fa46f97a 100755
--- a/main.star
+++ b/main.star
@@ -517,7 +517,8 @@ def with_goma(goma, channel, dimensions, properties):
 
         # TODO(athom): disable on other channels when this CL has landed there
         #              (https://dart-review.googlesource.com/c/sdk/+/201862).
-        enable_ats = is_linux or (is_win and channel in ("beta", "stable"))
+        enable_ats = is_linux or (is_win and channel == "stable")
+
         goma_properties["enable_ats"] = enable_ats
         updated_properties.setdefault("$build/goma", goma_properties)
     else:

From 21e0d80b1bee386292394d003dbe33513f20ed8e Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Wed, 21 Jul 2021 16:09:07 +0000
Subject: [PATCH 487/826] [infra] Move the gcc bot from try-only to a nightly
 builder.

Change-Id: I6b766360af482b44c1fe42d9b1f85d3ce3108568
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/206326
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 141 +++++++++++++++++++++++++++++++++++++++++++++
 luci-milo.cfg      |  31 +++++++++-
 luci-notify.cfg    |  12 ++++
 luci-scheduler.cfg |  44 ++++++++++++++
 main.star          |   5 +-
 5 files changed, 228 insertions(+), 5 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index be1d757729b0..26110b4612f4 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1249,6 +1249,7 @@ buckets {
         '    "vm-kernel-linux-debug-simarm64c",'
         '    "vm-kernel-precomp-linux-debug-x64c",'
         '    "vm-kernel-precomp-linux-debug-simarm64c",'
+        '    "vm-kernel-gcc-linux",'
         '    "analyzer-nnbd-mac-release",'
         '    "analyzer-nnbd-win-release",'
         '    "vm-precomp-ffi-qemu-linux-release-arm-experimental"'
@@ -8058,6 +8059,146 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-gcc-linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-gcc-linux-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-gcc-linux-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-gcc-linux-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-linux-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 6015463260f0..20fd76c96ee8 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -435,6 +435,11 @@ consoles {
     category: "vm|misc"
     short_name: "f"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux"
+    category: "vm|misc"
+    short_name: "g"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
     category: "vm|ffi"
@@ -1309,6 +1314,11 @@ consoles {
     category: "vm|misc"
     short_name: "f"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux"
+    category: "vm|misc"
+    short_name: "g"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
     category: "vm|ffi"
@@ -1558,6 +1568,11 @@ consoles {
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-dev"
+    category: "vm|misc"
+    short_name: "g"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-dev"
     category: "vm|ffi"
@@ -1942,6 +1957,11 @@ consoles {
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-beta"
+    category: "vm|misc"
+    short_name: "g"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-beta"
     category: "vm|ffi"
@@ -2326,6 +2346,11 @@ consoles {
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-stable"
+    category: "vm|misc"
+    short_name: "g"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-stable"
     category: "vm|ffi"
@@ -2858,6 +2883,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-fuchsia-release-x64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-gcc-linux-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm-try"
   }
@@ -2981,9 +3009,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/benchmark-linux-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-gcc-linux-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try.shared/presubmit-try"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index c6368525d81e..e754c88ea7b3 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -1071,6 +1071,18 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-gcc-linux"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index ab587b869756..b2cf8b9e425c 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -2252,6 +2252,50 @@ job {
     builder: "vm-kernel-checked-linux-release-x64-stable"
   }
 }
+job {
+  id: "vm-kernel-gcc-linux"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-gcc-linux"
+  }
+}
+job {
+  id: "vm-kernel-gcc-linux-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-gcc-linux-beta"
+  }
+}
+job {
+  id: "vm-kernel-gcc-linux-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-gcc-linux-dev"
+  }
+}
+job {
+  id: "vm-kernel-gcc-linux-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-gcc-linux-stable"
+  }
+}
 job {
   id: "vm-kernel-linux-debug-ia32"
   realm: "ci.sandbox"
diff --git a/main.star b/main.star
index 0778fa46f97a..8ec24a349c33 100755
--- a/main.star
+++ b/main.star
@@ -1332,6 +1332,9 @@ dart_vm_nightly_builder(
 )
 dart_vm_low_priority_builder("vm-fuchsia-release-x64", category = "vm|misc|f")
 
+# Our sysroot does not support gcc, we can't use goma on RBE for this builder
+dart_vm_nightly_builder("vm-kernel-gcc-linux", category = "vm|misc|g", goma = False)
+
 # vm|ffi
 dart_vm_extra_builder("vm-ffi-android-debug-arm", category = "vm|ffi|d32")
 dart_vm_extra_builder("vm-ffi-android-release-arm", category = "vm|ffi|r32")
@@ -1721,8 +1724,6 @@ dart_ci_sandbox_builder(
 # Try only builders
 dart_try_builder("benchmark-linux", on_cq = True, properties = JS_ENGINES)
 
-# Our sysroot does not support gcc, we can't use goma on RBE for this builder
-dart_try_builder("vm-kernel-gcc-linux", goma = False)
 dart_try_builder(
     "presubmit",
     bucket = "try.shared",

From 599eea5588f37b708de9dc67bdae2af7bb70c11a Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 3 Aug 2021 12:03:52 +0000
Subject: [PATCH 488/826] [infra] Add Windows compressed pointers as nightly
 builders.

We hit issues on Windows in trial attempts to enable compressed pointers in Flutter. Windows has notably different struct packing rules, different virtual memory allocation APIs, and a different X64 ABI.

Change-Id: I4b0850255ca8c966110731f7c571197d809e5b39
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/208680
Reviewed-by: William Hesse <whesse@google.com>
---
 commit-queue.cfg   |   8 +++
 cr-buildbucket.cfg | 150 +++++++++++++++++++++++++++++++++++++++++++++
 luci-milo.cfg      |  26 ++++++++
 luci-notify.cfg    |  24 ++++++++
 luci-scheduler.cfg |  22 +++++++
 main.star          |  12 ++++
 6 files changed, 242 insertions(+)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index daf7c8578ba7..693addc3e67c 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -687,6 +687,10 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-ubsan-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-precomp-win-debug-x64c-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-precomp-win-release-x64-try"
         includable_only: true
@@ -723,6 +727,10 @@ config_groups {
         name: "dart/try/vm-kernel-win-debug-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-win-debug-x64c-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-win-product-x64-try"
         includable_only: true
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 26110b4612f4..4b3b53c0e265 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1249,6 +1249,8 @@ buckets {
         '    "vm-kernel-linux-debug-simarm64c",'
         '    "vm-kernel-precomp-linux-debug-x64c",'
         '    "vm-kernel-precomp-linux-debug-simarm64c",'
+        '    "vm-kernel-win-debug-x64c",'
+        '    "vm-kernel-precomp-win-debug-x64c",'
         '    "vm-kernel-gcc-linux",'
         '    "analyzer-nnbd-mac-release",'
         '    "analyzer-nnbd-win-release",'
@@ -12598,6 +12600,43 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-precomp-win-debug-x64c"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-precomp-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13153,6 +13192,43 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-win-debug-x64c"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-win-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -17896,6 +17972,43 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-precomp-win-debug-x64c-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-precomp-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -18229,6 +18342,43 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-win-debug-x64c-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-win-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 20fd76c96ee8..3ae9fdb73e78 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -430,6 +430,16 @@ consoles {
     category: "vm|misc|compressed"
     short_name: "aa"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "jw"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "aw"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-fuchsia-release-x64"
     category: "vm|misc"
@@ -1309,6 +1319,16 @@ consoles {
     category: "vm|misc|compressed"
     short_name: "aa"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "jw"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "aw"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-fuchsia-release-x64"
     category: "vm|misc"
@@ -2880,6 +2900,12 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-simarm64c-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-x64c-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-debug-x64c-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-fuchsia-release-x64-try"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index e754c88ea7b3..4142c6aeab46 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -1802,6 +1802,18 @@ notifiers {
     name: "vm-kernel-precomp-ubsan-linux-release-x64"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-win-debug-x64c"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1916,6 +1928,18 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-win-debug-x64c"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index b2cf8b9e425c..4beb34b06b29 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -3572,6 +3572,17 @@ job {
     builder: "vm-kernel-precomp-ubsan-linux-release-x64"
   }
 }
+job {
+  id: "vm-kernel-precomp-win-debug-x64c"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-win-debug-x64c"
+  }
+}
 job {
   id: "vm-kernel-precomp-win-release-x64"
   realm: "ci.sandbox"
@@ -3737,6 +3748,17 @@ job {
     builder: "vm-kernel-win-debug-x64-stable"
   }
 }
+job {
+  id: "vm-kernel-win-debug-x64c"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-debug-x64c"
+  }
+}
 job {
   id: "vm-kernel-win-product-x64"
   realm: "ci.sandbox"
diff --git a/main.star b/main.star
index 8ec24a349c33..775f77a8ece3 100755
--- a/main.star
+++ b/main.star
@@ -1330,6 +1330,18 @@ dart_vm_nightly_builder(
     category = "vm|misc|compressed|aa",
     channels = ["try"],
 )
+dart_vm_nightly_builder(
+    "vm-kernel-win-debug-x64c",
+    category = "vm|misc|compressed|jw",
+    channels = ["try"],
+    dimensions = windows(),
+)
+dart_vm_nightly_builder(
+    "vm-kernel-precomp-win-debug-x64c",
+    category = "vm|misc|compressed|aw",
+    channels = ["try"],
+    dimensions = windows(),
+)
 dart_vm_low_priority_builder("vm-fuchsia-release-x64", category = "vm|misc|f")
 
 # Our sysroot does not support gcc, we can't use goma on RBE for this builder

From 30dc89c6996502d2641ef8a4a3de89ebc340655f Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Fri, 6 Aug 2021 09:42:11 +0000
Subject: [PATCH 489/826] [infra/config] Increase the shard timeout for
 cross-arm builder

The tests on this builder are taking just about 90 minutes, increasing
the timeout to 120 minutes. The similar cross-arm-precomp builder
is not having a problem, running in about 70 minutes.

Change-Id: I7606918d5b49fe82c295866edd45081c4f11ba4d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/209107
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 2 +-
 main.star          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 4b3b53c0e265..34b727a94671 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -2705,7 +2705,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "shard_timeout": 7200'
         '}'
       priority: 50
       build_numbers: YES
diff --git a/main.star b/main.star
index 775f77a8ece3..c55a4a164fb0 100755
--- a/main.star
+++ b/main.star
@@ -1147,7 +1147,7 @@ dart_vm_extra_builder(
     "cross-vm-linux-release-arm64",
     category = "vm|kernel|cra",
     channels = [],
-    properties = {"shard_timeout": (90 * time.minute) // time.second},
+    properties = {"shard_timeout": (120 * time.minute) // time.second},
 )
 
 # vm|kernel-precomp

From b14a0dfe32b751795f473787d5f48ee3add90f43 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 24 Aug 2021 14:42:48 +0000
Subject: [PATCH 490/826] [infra] Force luci.buildbucket.use_bbagent experiment
 to be enabled

Change-Id: I8b20416c525d48cbbdffbd8f9c836b3eceef442c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/211025
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 1930 +++++++++++++++++++++++++++++++++++++++++++-
 main.star          |    7 +-
 2 files changed, 1934 insertions(+), 3 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 34b727a94671..f58ad0e23691 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -49,6 +49,10 @@ buckets {
       execution_timeout_secs: 900
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -85,6 +89,10 @@ buckets {
       execution_timeout_secs: 600
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -120,6 +128,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -155,6 +167,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -190,6 +206,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -229,6 +249,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -268,6 +292,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -303,6 +331,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -339,6 +371,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -375,6 +411,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -411,6 +451,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -447,6 +491,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -486,6 +534,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -525,6 +577,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -564,6 +620,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -603,6 +663,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -642,6 +706,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -681,6 +749,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -720,6 +792,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -759,6 +835,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -794,6 +874,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -829,6 +913,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -864,6 +952,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -899,6 +991,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -934,6 +1030,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -969,6 +1069,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1004,6 +1108,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1039,6 +1147,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1074,6 +1186,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1110,6 +1226,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1174,6 +1294,10 @@ buckets {
       execution_timeout_secs: 900
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1262,6 +1386,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1304,6 +1432,10 @@ buckets {
       execution_timeout_secs: 300
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1348,6 +1480,10 @@ buckets {
       expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1386,6 +1522,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1443,6 +1583,10 @@ buckets {
       execution_timeout_secs: 900
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1500,6 +1644,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1537,6 +1685,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1574,6 +1726,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1611,6 +1767,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1648,6 +1808,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1685,6 +1849,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1722,6 +1890,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1759,6 +1931,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1800,6 +1976,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1841,6 +2021,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1882,6 +2066,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1923,6 +2111,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1960,6 +2152,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1997,6 +2193,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2034,6 +2234,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2071,6 +2275,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2112,6 +2320,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2149,6 +2361,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2186,6 +2402,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2223,6 +2443,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2260,6 +2484,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2297,6 +2525,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2335,6 +2567,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2373,6 +2609,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2411,6 +2651,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2449,6 +2693,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2486,6 +2734,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2523,6 +2775,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2560,6 +2816,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2597,6 +2857,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2634,6 +2898,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2672,6 +2940,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2710,6 +2982,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2748,6 +3024,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2788,6 +3068,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2828,6 +3112,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2868,6 +3156,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2908,6 +3200,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2945,6 +3241,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2982,6 +3282,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3019,6 +3323,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3056,6 +3364,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3096,6 +3408,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3136,6 +3452,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3176,6 +3496,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3216,6 +3540,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3253,6 +3581,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3290,6 +3622,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3327,6 +3663,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3365,7 +3705,11 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
-        key: "luci.use_realms"
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
         value: 100
       }
     }
@@ -3404,6 +3748,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3444,6 +3792,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3484,6 +3836,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3524,6 +3880,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3564,6 +3924,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3604,6 +3968,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3644,6 +4012,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3684,6 +4056,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3728,6 +4104,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3772,6 +4152,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3816,6 +4200,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3860,6 +4248,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3901,6 +4293,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3942,6 +4338,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3983,6 +4383,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4024,6 +4428,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4064,6 +4472,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4104,6 +4516,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4144,6 +4560,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4184,6 +4604,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4224,6 +4648,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4261,6 +4689,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4298,6 +4730,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4335,6 +4771,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4372,6 +4812,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4412,6 +4856,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4452,6 +4900,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4492,6 +4944,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4532,6 +4988,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4576,6 +5036,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4620,6 +5084,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4664,6 +5132,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4708,6 +5180,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4748,6 +5224,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4788,6 +5268,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4828,6 +5312,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4868,6 +5356,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4908,6 +5400,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4948,6 +5444,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4988,6 +5488,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5028,6 +5532,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5068,6 +5576,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5106,6 +5618,10 @@ buckets {
       execution_timeout_secs: 2700
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5152,6 +5668,10 @@ buckets {
       execution_timeout_secs: 28800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5195,6 +5715,10 @@ buckets {
       execution_timeout_secs: 28800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5232,6 +5756,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5269,6 +5797,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5306,6 +5838,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5343,6 +5879,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5380,6 +5920,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5421,6 +5965,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5462,6 +6010,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5503,6 +6055,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5544,6 +6100,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5581,6 +6141,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5618,6 +6182,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5655,6 +6223,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5692,6 +6264,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5733,6 +6309,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5770,6 +6350,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5807,6 +6391,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5844,6 +6432,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5881,6 +6473,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5918,6 +6514,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5956,6 +6556,10 @@ buckets {
       execution_timeout_secs: 43200
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5993,6 +6597,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6030,6 +6638,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6067,6 +6679,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6104,6 +6720,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6141,6 +6761,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6179,6 +6803,10 @@ buckets {
       execution_timeout_secs: 300
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6216,6 +6844,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6256,6 +6888,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6296,6 +6932,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6336,6 +6976,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6376,6 +7020,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6416,6 +7064,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6460,6 +7112,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6504,6 +7160,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6548,6 +7208,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6592,6 +7256,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6636,6 +7304,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6676,6 +7348,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6716,6 +7392,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6756,6 +7436,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6796,6 +7480,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6833,6 +7521,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6870,6 +7562,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6907,6 +7603,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6944,6 +7644,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6981,6 +7685,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7018,6 +7726,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7055,6 +7767,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7092,6 +7808,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7129,6 +7849,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7166,6 +7890,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7203,6 +7931,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7240,6 +7972,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7277,6 +8013,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7314,6 +8054,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7351,6 +8095,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7388,6 +8136,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7425,6 +8177,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7462,6 +8218,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7499,6 +8259,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7536,6 +8300,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7573,6 +8341,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7610,6 +8382,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7647,6 +8423,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7684,6 +8464,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7721,6 +8505,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7758,6 +8546,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7795,6 +8587,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7832,6 +8628,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7870,6 +8670,10 @@ buckets {
       expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7908,6 +8712,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7945,6 +8753,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7982,6 +8794,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8019,6 +8835,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8056,6 +8876,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8091,6 +8915,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8126,6 +8954,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8161,6 +8993,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8196,6 +9032,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8233,6 +9073,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8270,6 +9114,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8307,6 +9155,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8344,6 +9196,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8381,6 +9237,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8418,6 +9278,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8455,6 +9319,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8492,6 +9360,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8529,6 +9401,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8566,6 +9442,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8603,6 +9483,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8640,6 +9524,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8677,6 +9565,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8714,6 +9606,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8751,6 +9647,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8788,6 +9688,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8825,6 +9729,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8862,6 +9770,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8899,6 +9811,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8936,6 +9852,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8973,6 +9893,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9014,6 +9938,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9055,6 +9983,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9096,6 +10028,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9137,6 +10073,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9178,6 +10118,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9219,6 +10163,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9260,6 +10208,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9301,6 +10253,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9342,6 +10298,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9383,6 +10343,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9424,6 +10388,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9462,6 +10430,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9500,6 +10472,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9537,6 +10513,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9574,6 +10554,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9611,6 +10595,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9648,6 +10636,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9685,6 +10677,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9722,6 +10718,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9759,6 +10759,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9796,6 +10800,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9833,6 +10841,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9870,6 +10882,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9907,6 +10923,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9949,6 +10969,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9991,6 +11015,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10032,6 +11060,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10073,6 +11105,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10111,6 +11147,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10148,6 +11188,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10185,6 +11229,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10222,6 +11270,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10260,6 +11312,10 @@ buckets {
       expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10298,6 +11354,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10336,6 +11396,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10374,6 +11438,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10412,6 +11480,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10450,6 +11522,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10488,6 +11564,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10526,6 +11606,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10564,6 +11648,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10602,6 +11690,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10639,6 +11731,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10676,6 +11772,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10714,6 +11814,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10752,6 +11856,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10790,6 +11898,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10828,6 +11940,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10865,6 +11981,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10902,6 +12022,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10939,6 +12063,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10976,6 +12104,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11013,6 +12145,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11050,6 +12186,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11087,6 +12227,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11124,6 +12268,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11161,6 +12309,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11198,6 +12350,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11235,6 +12391,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11272,6 +12432,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11309,6 +12473,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11346,6 +12514,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11383,6 +12555,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11420,6 +12596,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11457,6 +12637,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11494,6 +12678,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11531,6 +12719,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11568,6 +12760,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11605,6 +12801,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11642,6 +12842,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11679,6 +12883,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11716,6 +12924,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11753,6 +12965,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11794,6 +13010,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11835,6 +13055,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11876,6 +13100,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11917,6 +13145,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11955,6 +13187,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11992,6 +13228,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12030,6 +13270,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12067,6 +13311,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12104,6 +13352,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12141,6 +13393,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12178,6 +13434,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12215,6 +13475,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12252,6 +13516,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12294,6 +13562,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12336,6 +13608,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12373,6 +13649,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12410,6 +13690,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12447,6 +13731,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12484,6 +13772,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12521,6 +13813,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12559,6 +13855,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12595,6 +13895,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12632,6 +13936,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12669,6 +13977,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12706,6 +14018,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12743,6 +14059,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12780,6 +14100,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12817,6 +14141,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12854,6 +14182,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12891,6 +14223,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12928,6 +14264,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12966,6 +14306,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13002,6 +14346,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13039,6 +14387,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13076,6 +14428,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13113,6 +14469,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13150,6 +14510,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13187,6 +14551,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13224,6 +14592,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13261,6 +14633,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13298,6 +14674,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13335,6 +14715,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13372,6 +14756,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13409,6 +14797,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13446,6 +14838,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13483,6 +14879,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13520,6 +14920,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13557,6 +14961,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13594,6 +15002,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13631,6 +15043,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13688,6 +15104,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13725,6 +15145,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13766,6 +15190,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13803,6 +15231,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13844,6 +15276,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13881,6 +15317,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13918,6 +15358,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13956,6 +15400,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13993,6 +15441,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14030,6 +15482,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14070,6 +15526,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14111,6 +15571,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14152,6 +15616,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14193,6 +15661,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14230,6 +15702,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14270,6 +15746,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14307,6 +15787,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14347,6 +15831,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14384,6 +15872,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14424,6 +15916,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14464,6 +15960,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14508,6 +16008,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14549,6 +16053,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14589,6 +16097,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14626,6 +16138,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14666,6 +16182,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14710,6 +16230,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14750,6 +16274,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14790,6 +16318,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14830,6 +16362,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14868,6 +16404,10 @@ buckets {
       execution_timeout_secs: 2700
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14914,6 +16454,10 @@ buckets {
       execution_timeout_secs: 28800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14957,6 +16501,10 @@ buckets {
       execution_timeout_secs: 28800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14994,6 +16542,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15031,6 +16583,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15072,6 +16628,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15109,6 +16669,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15150,6 +16714,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15187,6 +16755,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15224,6 +16796,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15261,6 +16837,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15301,6 +16881,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15341,6 +16925,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15385,6 +16973,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15429,6 +17021,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15469,6 +17065,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15506,6 +17106,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15543,6 +17147,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15580,6 +17188,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15617,6 +17229,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15654,6 +17270,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15691,6 +17311,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15728,6 +17352,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15765,6 +17393,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15803,6 +17435,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15840,6 +17476,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15875,6 +17515,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15912,6 +17556,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15949,6 +17597,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15986,6 +17638,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16023,6 +17679,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16060,6 +17720,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16097,6 +17761,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16134,6 +17802,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16171,6 +17843,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16208,6 +17884,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16249,6 +17929,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16290,6 +17974,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16331,6 +18019,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16372,6 +18064,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16410,6 +18106,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16448,6 +18148,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16485,6 +18189,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16522,6 +18230,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16559,6 +18271,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16596,6 +18312,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16633,6 +18353,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16675,6 +18399,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16717,6 +18445,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16758,6 +18490,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16799,6 +18535,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16837,6 +18577,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16874,6 +18618,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16911,6 +18659,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16948,6 +18700,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16985,6 +18741,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17023,6 +18783,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17061,6 +18825,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17099,6 +18867,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17136,6 +18908,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17173,6 +18949,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17211,6 +18991,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17248,6 +19032,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17285,6 +19073,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17322,6 +19114,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17359,6 +19155,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17396,6 +19196,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17433,6 +19237,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17470,6 +19278,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17511,6 +19323,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17549,6 +19365,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17586,6 +19406,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17624,6 +19448,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17661,6 +19489,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17698,6 +19530,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17735,6 +19571,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17777,6 +19617,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17819,6 +19663,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17856,6 +19704,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17893,6 +19745,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17931,6 +19787,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17967,6 +19827,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18004,6 +19868,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18041,6 +19909,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18078,6 +19950,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18115,6 +19991,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18152,6 +20032,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18189,6 +20073,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18227,6 +20115,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18263,6 +20155,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18300,6 +20196,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18337,6 +20237,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18374,6 +20278,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18411,6 +20319,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18448,6 +20360,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18485,6 +20401,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18522,6 +20442,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18580,6 +20504,10 @@ buckets {
       execution_timeout_secs: 600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
diff --git a/main.star b/main.star
index c55a4a164fb0..37150e2bd035 100755
--- a/main.star
+++ b/main.star
@@ -19,8 +19,11 @@ lucicfg.check_version("1.21.5")
 # Enable LUCI Realms support.
 lucicfg.enable_experiment("crbug.com/1085650")
 
-# Launch 100% of Swarming tasks in "realms-aware mode", crbug.com/1170330.
-luci.builder.defaults.experiments.set({"luci.use_realms": 100})
+luci.builder.defaults.experiments.set({
+    # Launch 100% of Swarming tasks in "realms-aware mode", crbug.com/1170330.
+    "luci.use_realms": 100,
+    "luci.buildbucket.use_bbagent": 100,
+})
 
 DART_GIT = "https://dart.googlesource.com/sdk"
 DART_GERRIT = "https://dart-review.googlesource.com/"

From 324c54b7d0bbf3e57312d99cdc9ebee1bf811dbd Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 30 Aug 2021 16:10:10 +0000
Subject: [PATCH 491/826] [infra] Disable ATS on Windows on stable to prepare
 for 2.14

Bug: b/186194563
Change-Id: Ie3f26f202cf0b14d5bd6bae6eb06514b7c2558cf
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/211800
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 16 ++++++++--------
 main.star          |  7 +------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index f58ad0e23691..7ea3dfbcca94 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -2509,7 +2509,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -4585,7 +4585,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5381,7 +5381,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6498,7 +6498,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -7461,7 +7461,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -14084,7 +14084,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -14535,7 +14535,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -14822,7 +14822,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
diff --git a/main.star b/main.star
index 37150e2bd035..ccc1aab719cb 100755
--- a/main.star
+++ b/main.star
@@ -515,12 +515,7 @@ def with_goma(goma, channel, dimensions, properties):
         goma_properties = {}
         goma_properties.update(GOMA_RBE)
 
-        is_win = dimensions["os"] == "Windows"
-        is_linux = dimensions["os"] == "Linux"
-
-        # TODO(athom): disable on other channels when this CL has landed there
-        #              (https://dart-review.googlesource.com/c/sdk/+/201862).
-        enable_ats = is_linux or (is_win and channel == "stable")
+        enable_ats = dimensions["os"] == "Linux"
 
         goma_properties["enable_ats"] = enable_ats
         updated_properties.setdefault("$build/goma", goma_properties)

From 6c9a6d6bd3ea014bdb97c31d642bb49825450f8a Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 3 Sep 2021 09:47:27 +0000
Subject: [PATCH 492/826] [infra] Prepare for the main branch migration of the
 recipes

Bug: b/198416551
Change-Id: Ib9dca0c61e8edb0d0d8224dd26cb6d16c0b86c57
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/212287
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg   |  2 +-
 cr-buildbucket.cfg |  8 ++++----
 luci-scheduler.cfg |  2 +-
 main.star          | 14 +++++++-------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 693addc3e67c..9eb6d6e5acd5 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -36,7 +36,7 @@ config_groups {
     url: "https://dart-review.googlesource.com"
     projects {
       name: "recipes"
-      ref_regexp: "refs/heads/master"
+      ref_regexp: "refs/heads/main"
     }
   }
   verifiers {
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 7ea3dfbcca94..48729fb8bb9f 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1405,7 +1405,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
-        cipd_version: "git_revision:e1a6b1a375a07455c00cc236d2b52277aa46ea84"
+        cipd_version: "git_revision:ea071f071a42ea43d0064e3eea77d1daaaee0ecf"
         cmd: "luciexe"
       }
       properties:
@@ -1423,9 +1423,9 @@ buckets {
         '  "package_name_internal_prefix": "dart_internal/recipe_bundles",'
         '  "package_name_prefix": "dart/recipe_bundles",'
         '  "recipe": "recipe_bundler",'
-        '  "recipe_bundler_vers": "git_revision:e1a6b1a375a07455c00cc236d2b52277aa46ea84",'
+        '  "recipe_bundler_vers": "git_revision:ea071f071a42ea43d0064e3eea77d1daaaee0ecf",'
         '  "repo_specs": ['
-        '    "dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/master"'
+        '    "dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/main"'
         '  ]'
         '}'
       priority: 50
@@ -1451,7 +1451,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
-        cipd_version: "git_revision:e1a6b1a375a07455c00cc236d2b52277aa46ea84"
+        cipd_version: "git_revision:ea071f071a42ea43d0064e3eea77d1daaaee0ecf"
         cmd: "luciexe"
       }
       properties:
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 4beb34b06b29..861846cfbe80 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -4275,7 +4275,7 @@ trigger {
   triggers: "recipe-bundler"
   gitiles {
     repo: "https://dart.googlesource.com/recipes"
-    refs: "regexp:refs/heads/master"
+    refs: "regexp:refs/heads/main"
   }
 }
 acl_sets {
diff --git a/main.star b/main.star
index ccc1aab719cb..2a1a09b3cbd6 100755
--- a/main.star
+++ b/main.star
@@ -7,7 +7,7 @@
 # Use ./main.star to regenerate the Luci configuration based on this file.
 #
 # Documentation for lucicfg is here:
-# https://chromium.googlesource.com/infra/luci/luci-go/+/master/lucicfg/doc/
+# https://chromium.googlesource.com/infra/luci/luci-go/+/main/lucicfg/doc/
 """
 Generates the Luci configuration for the Dart project.
 """
@@ -472,7 +472,7 @@ luci.cq_group(
 
 luci.cq_group(
     name = "recipes",
-    watch = cq.refset(DART_GERRIT + "recipes", refs = ["refs/heads/master"]),
+    watch = cq.refset(DART_GERRIT + "recipes", refs = ["refs/heads/main"]),
     allow_submit_with_open_deps = True,
     tree_status_host = "dart-status.appspot.com",
     retry_config = cq.RETRY_NONE,
@@ -1793,7 +1793,7 @@ def chromium_infra_recipe(name):
         name = name,
         cipd_package =
             "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
-        cipd_version = "git_revision:e1a6b1a375a07455c00cc236d2b52277aa46ea84",
+        cipd_version = "git_revision:ea071f071a42ea43d0064e3eea77d1daaaee0ecf",
         use_bbagent = True,
     )
 
@@ -1819,15 +1819,15 @@ dart_infra_builder(
     execution_timeout = 5 * time.minute,
     properties = {
         # This property controls the version of the recipe_bundler go tool:
-        #   https://chromium.googlesource.com/infra/infra/+/master/go/src/infra/tools/recipe_bundler
-        "recipe_bundler_vers": "git_revision:e1a6b1a375a07455c00cc236d2b52277aa46ea84",
+        #   https://chromium.googlesource.com/infra/infra/+/main/go/src/infra/tools/recipe_bundler
+        "recipe_bundler_vers": "git_revision:ea071f071a42ea43d0064e3eea77d1daaaee0ecf",
         # These control the prefix of the CIPD package names that the tool
         # will create.
         "package_name_prefix": "dart/recipe_bundles",
         "package_name_internal_prefix": "dart_internal/recipe_bundles",
         # Where to grab the recipes to bundle.
         "repo_specs": [
-            "dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/master",
+            "dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/main",
         ],
     },
     schedule = "*/30 * * * *",
@@ -1836,7 +1836,7 @@ dart_infra_builder(
             name = "recipes-dart",
             bucket = "ci",
             repo = "https://dart.googlesource.com/recipes",
-            refs = ["refs/heads/master"],
+            refs = ["refs/heads/main"],
         ),
     ],
 )

From ef1a59d206491e07245fc454deaabc0d6b8dd451 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 9 Sep 2021 07:42:25 +0000
Subject: [PATCH 493/826] [infra] Switch Dart SDK configs to main

Bug: b/198416551
Change-Id: I723f5049db52dc7b72bcd6a2bc119aa47cac1f00
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/212740
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg   |  2 +-
 luci-milo.cfg      |  8 ++++----
 luci-scheduler.cfg |  8 ++++----
 main.star          | 16 ++++++++--------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 9eb6d6e5acd5..2bef6f9d9c0f 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -63,7 +63,7 @@ config_groups {
     url: "https://dart-review.googlesource.com"
     projects {
       name: "sdk"
-      ref_regexp: "refs/heads/master"
+      ref_regexp: "refs/heads/main"
       ref_regexp: "refs/heads/beta"
       ref_regexp: "refs/heads/dev"
       ref_regexp: "refs/heads/stable"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 3ae9fdb73e78..282837e91d82 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -8,7 +8,7 @@ consoles {
   id: "be"
   name: "SDK Bleeding Edge Console"
   repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/master"
+  refs: "regexp:refs/heads/main"
   manifest_name: "REVISION"
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
@@ -717,7 +717,7 @@ consoles {
   id: "alt"
   name: "SDK Bleeding Edge Console (alternative)"
   repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/master"
+  refs: "regexp:refs/heads/main"
   manifest_name: "REVISION"
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
@@ -2606,7 +2606,7 @@ consoles {
   id: "flutter"
   name: "Dart/Flutter Console"
   repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/master"
+  refs: "regexp:refs/heads/main"
   manifest_name: "REVISION"
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
@@ -2648,7 +2648,7 @@ consoles {
   id: "fyi"
   name: "SDK FYI Console"
   repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/master"
+  refs: "regexp:refs/heads/main"
   manifest_name: "REVISION"
 }
 consoles {
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 861846cfbe80..51246c288a4e 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -4085,7 +4085,7 @@ trigger {
   }
 }
 trigger {
-  id: "dart-gitiles-trigger-master"
+  id: "dart-gitiles-trigger-main"
   realm: "ci"
   acl_sets: "ci"
   triggers: "dart-sdk-linux"
@@ -4135,7 +4135,7 @@ trigger {
   triggers: "vm-kernel-win-release-x64"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
-    refs: "regexp:refs/heads/master"
+    refs: "regexp:refs/heads/main"
   }
 }
 trigger {
@@ -4214,7 +4214,7 @@ trigger {
   }
 }
 trigger {
-  id: "dart-vm-gitiles-trigger-master"
+  id: "dart-vm-gitiles-trigger-main"
   realm: "ci"
   acl_sets: "ci"
   triggers: "app-kernel-linux-debug-x64"
@@ -4253,7 +4253,7 @@ trigger {
   triggers: "vm-precomp-ffi-qemu-linux-release-arm"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
-    refs: "regexp:refs/heads/master"
+    refs: "regexp:refs/heads/main"
     path_regexps: "DEPS"
     path_regexps: "build/.+"
     path_regexps: "BUILD.gn"
diff --git a/main.star b/main.star
index 2a1a09b3cbd6..c42fb05ac3e8 100755
--- a/main.star
+++ b/main.star
@@ -35,7 +35,7 @@ GOMA_RBE = {
 
 RELEASE_CHANNELS = ["beta", "dev", "stable"]
 CHANNELS = RELEASE_CHANNELS + ["try"]
-BRANCHES = ["master"] + RELEASE_CHANNELS
+BRANCHES = ["main"] + RELEASE_CHANNELS
 
 TEST_PY_PATHS = "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
 
@@ -238,7 +238,7 @@ luci.console_view(
     name = "be",
     repo = "https://dart.googlesource.com/sdk",
     title = "SDK Bleeding Edge Console",
-    refs = ["refs/heads/master"],
+    refs = ["refs/heads/main"],
     header = "console-header.textpb",
 )
 
@@ -246,7 +246,7 @@ luci.console_view(
     name = "alt",
     repo = "https://dart.googlesource.com/sdk",
     title = "SDK Bleeding Edge Console (alternative)",
-    refs = ["refs/heads/master"],
+    refs = ["refs/heads/main"],
     header = "console-header.textpb",
 )
 
@@ -283,7 +283,7 @@ luci.console_view(
     name = "flutter",
     repo = DART_GIT,
     title = "Dart/Flutter Console",
-    refs = ["refs/heads/master"],
+    refs = ["refs/heads/main"],
 )
 
 luci.console_view(
@@ -302,7 +302,7 @@ luci.console_view(
     name = "fyi",
     repo = DART_GIT,
     title = "SDK FYI Console",
-    refs = ["refs/heads/master"],
+    refs = ["refs/heads/main"],
 )
 
 luci.list_view(
@@ -370,7 +370,7 @@ def dart_poller(name, bucket = "ci", branches = BRANCHES, paths = None):
         )
 
 dart_poller("dart-gitiles-trigger", branches = BRANCHES)
-dart_poller("dart-vm-gitiles-trigger", branches = ["master"], paths = VM_PATHS)
+dart_poller("dart-vm-gitiles-trigger", branches = ["main"], paths = VM_PATHS)
 
 luci.gitiles_poller(
     name = "dart-flutter-engine-trigger",
@@ -684,7 +684,7 @@ def dart_builder(
                 properties,
             )
             builder = name + "-" + channel if channel else name
-            branch = channel if channel else "master"
+            branch = channel if channel else "main"
             if schedule == "triggered" and triggered_by:
                 triggered_by = [
                     trigger.replace("%s", branch)
@@ -1662,7 +1662,7 @@ dart_infra_builder(
     },
     notifies = "infra",
     triggered_by = [
-        "dart-gitiles-trigger-master",
+        "dart-gitiles-trigger-main",
         "dart-flutter-engine-trigger",
         "dart-flutter-flutter-trigger",
     ],

From 7537d7e0ebcb51a73cdd3ab50979367d20418cd2 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 9 Sep 2021 09:50:02 +0000
Subject: [PATCH 494/826] [infra] Switch to use recipes from refs/heads/main

Bug: b/198416551
Change-Id: I2769c39cd5bc31f6c27a3cd72d8f46de199b64e7
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/212827
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 960 ++++++++++++++++++++++-----------------------
 main.star          |   1 +
 2 files changed, 481 insertions(+), 480 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 48729fb8bb9f..abe8d22ea81f 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -28,7 +28,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -68,7 +68,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -108,7 +108,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -147,7 +147,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -186,7 +186,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -225,7 +225,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -268,7 +268,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -311,7 +311,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -350,7 +350,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -390,7 +390,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -430,7 +430,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -470,7 +470,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -510,7 +510,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -553,7 +553,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -596,7 +596,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -639,7 +639,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -682,7 +682,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -725,7 +725,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -768,7 +768,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -811,7 +811,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -854,7 +854,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -893,7 +893,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -932,7 +932,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -971,7 +971,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -1010,7 +1010,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -1049,7 +1049,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -1088,7 +1088,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -1127,7 +1127,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -1166,7 +1166,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -1205,7 +1205,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -1245,7 +1245,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -1313,7 +1313,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -1499,7 +1499,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -1561,7 +1561,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -1622,7 +1622,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -1663,7 +1663,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -1704,7 +1704,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -1745,7 +1745,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -1786,7 +1786,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -1827,7 +1827,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -1868,7 +1868,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -1909,7 +1909,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -1950,7 +1950,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -1995,7 +1995,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -2040,7 +2040,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -2085,7 +2085,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -2130,7 +2130,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -2171,7 +2171,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -2212,7 +2212,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -2253,7 +2253,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -2294,7 +2294,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -2339,7 +2339,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -2380,7 +2380,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -2421,7 +2421,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -2462,7 +2462,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -2503,7 +2503,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -2544,7 +2544,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -2586,7 +2586,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -2628,7 +2628,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -2670,7 +2670,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -2712,7 +2712,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -2753,7 +2753,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -2794,7 +2794,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -2835,7 +2835,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -2876,7 +2876,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -2917,7 +2917,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -2959,7 +2959,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -3001,7 +3001,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -3043,7 +3043,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -3087,7 +3087,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -3131,7 +3131,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -3175,7 +3175,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -3219,7 +3219,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -3260,7 +3260,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -3301,7 +3301,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -3342,7 +3342,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -3383,7 +3383,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -3427,7 +3427,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -3471,7 +3471,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -3515,7 +3515,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -3559,7 +3559,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -3600,7 +3600,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -3641,7 +3641,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -3682,7 +3682,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -3723,7 +3723,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -3767,7 +3767,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -3811,7 +3811,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -3855,7 +3855,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -3899,7 +3899,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -3943,7 +3943,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -3987,7 +3987,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -4031,7 +4031,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -4075,7 +4075,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -4123,7 +4123,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -4171,7 +4171,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -4219,7 +4219,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -4267,7 +4267,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -4312,7 +4312,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -4357,7 +4357,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -4402,7 +4402,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -4447,7 +4447,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -4491,7 +4491,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -4535,7 +4535,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -4579,7 +4579,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -4623,7 +4623,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -4667,7 +4667,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -4708,7 +4708,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -4749,7 +4749,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -4790,7 +4790,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -4831,7 +4831,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -4875,7 +4875,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -4919,7 +4919,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -4963,7 +4963,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -5007,7 +5007,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -5055,7 +5055,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -5103,7 +5103,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -5151,7 +5151,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -5199,7 +5199,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -5243,7 +5243,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -5287,7 +5287,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -5331,7 +5331,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -5375,7 +5375,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -5419,7 +5419,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -5463,7 +5463,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -5507,7 +5507,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -5551,7 +5551,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -5595,7 +5595,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -5637,7 +5637,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -5687,7 +5687,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -5734,7 +5734,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -5775,7 +5775,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -5816,7 +5816,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -5857,7 +5857,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -5898,7 +5898,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -5939,7 +5939,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -5984,7 +5984,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -6029,7 +6029,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -6074,7 +6074,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -6119,7 +6119,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -6160,7 +6160,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -6201,7 +6201,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -6242,7 +6242,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -6283,7 +6283,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -6328,7 +6328,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -6369,7 +6369,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -6410,7 +6410,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -6451,7 +6451,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -6492,7 +6492,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -6533,7 +6533,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -6575,7 +6575,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -6616,7 +6616,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -6657,7 +6657,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -6698,7 +6698,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -6739,7 +6739,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -6780,7 +6780,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -6822,7 +6822,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -6863,7 +6863,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -6907,7 +6907,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -6951,7 +6951,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -6995,7 +6995,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -7039,7 +7039,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -7083,7 +7083,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -7131,7 +7131,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -7179,7 +7179,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -7227,7 +7227,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -7275,7 +7275,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -7323,7 +7323,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -7367,7 +7367,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -7411,7 +7411,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -7455,7 +7455,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -7499,7 +7499,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -7540,7 +7540,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -7581,7 +7581,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -7622,7 +7622,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -7663,7 +7663,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -7704,7 +7704,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -7745,7 +7745,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -7786,7 +7786,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -7827,7 +7827,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -7868,7 +7868,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -7909,7 +7909,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -7950,7 +7950,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -7991,7 +7991,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -8032,7 +8032,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -8073,7 +8073,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -8114,7 +8114,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -8155,7 +8155,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -8196,7 +8196,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -8237,7 +8237,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -8278,7 +8278,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -8319,7 +8319,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -8360,7 +8360,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -8401,7 +8401,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -8442,7 +8442,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -8483,7 +8483,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -8524,7 +8524,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -8565,7 +8565,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -8606,7 +8606,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -8647,7 +8647,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -8689,7 +8689,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -8731,7 +8731,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -8772,7 +8772,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -8813,7 +8813,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -8854,7 +8854,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -8895,7 +8895,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -8934,7 +8934,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -8973,7 +8973,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -9012,7 +9012,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -9051,7 +9051,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -9092,7 +9092,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -9133,7 +9133,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -9174,7 +9174,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -9215,7 +9215,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -9256,7 +9256,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -9297,7 +9297,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -9338,7 +9338,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -9379,7 +9379,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -9420,7 +9420,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -9461,7 +9461,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -9502,7 +9502,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -9543,7 +9543,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -9584,7 +9584,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -9625,7 +9625,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -9666,7 +9666,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -9707,7 +9707,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -9748,7 +9748,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -9789,7 +9789,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -9830,7 +9830,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -9871,7 +9871,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -9912,7 +9912,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -9957,7 +9957,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -10002,7 +10002,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -10047,7 +10047,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -10092,7 +10092,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -10137,7 +10137,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -10182,7 +10182,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -10227,7 +10227,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -10272,7 +10272,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -10317,7 +10317,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -10362,7 +10362,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -10407,7 +10407,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -10449,7 +10449,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -10491,7 +10491,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -10532,7 +10532,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -10573,7 +10573,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -10614,7 +10614,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -10655,7 +10655,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -10696,7 +10696,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -10737,7 +10737,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -10778,7 +10778,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -10819,7 +10819,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -10860,7 +10860,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -10901,7 +10901,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -10942,7 +10942,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -10988,7 +10988,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -11034,7 +11034,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -11079,7 +11079,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -11124,7 +11124,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -11166,7 +11166,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -11207,7 +11207,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -11248,7 +11248,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -11289,7 +11289,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -11331,7 +11331,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -11373,7 +11373,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -11415,7 +11415,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -11457,7 +11457,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -11499,7 +11499,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -11541,7 +11541,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -11583,7 +11583,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -11625,7 +11625,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -11667,7 +11667,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -11709,7 +11709,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -11750,7 +11750,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -11791,7 +11791,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -11833,7 +11833,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -11875,7 +11875,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -11917,7 +11917,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -11959,7 +11959,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -12000,7 +12000,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -12041,7 +12041,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -12082,7 +12082,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -12123,7 +12123,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -12164,7 +12164,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -12205,7 +12205,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -12246,7 +12246,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -12287,7 +12287,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -12328,7 +12328,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -12369,7 +12369,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -12410,7 +12410,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -12451,7 +12451,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -12492,7 +12492,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -12533,7 +12533,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -12574,7 +12574,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -12615,7 +12615,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -12656,7 +12656,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -12697,7 +12697,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -12738,7 +12738,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -12779,7 +12779,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -12820,7 +12820,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -12861,7 +12861,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -12902,7 +12902,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -12943,7 +12943,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -12984,7 +12984,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -13029,7 +13029,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -13074,7 +13074,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -13119,7 +13119,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -13164,7 +13164,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -13206,7 +13206,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -13247,7 +13247,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -13289,7 +13289,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -13330,7 +13330,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -13371,7 +13371,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -13412,7 +13412,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -13453,7 +13453,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -13494,7 +13494,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -13535,7 +13535,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -13581,7 +13581,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -13627,7 +13627,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -13668,7 +13668,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -13709,7 +13709,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -13750,7 +13750,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -13791,7 +13791,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -13832,7 +13832,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -13874,7 +13874,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -13914,7 +13914,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -13955,7 +13955,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -13996,7 +13996,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -14037,7 +14037,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -14078,7 +14078,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -14119,7 +14119,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -14160,7 +14160,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -14201,7 +14201,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -14242,7 +14242,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -14283,7 +14283,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -14325,7 +14325,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -14365,7 +14365,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -14406,7 +14406,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -14447,7 +14447,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -14488,7 +14488,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -14529,7 +14529,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -14570,7 +14570,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -14611,7 +14611,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -14652,7 +14652,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -14693,7 +14693,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -14734,7 +14734,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -14775,7 +14775,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -14816,7 +14816,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -14857,7 +14857,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -14898,7 +14898,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -14939,7 +14939,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -14980,7 +14980,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -15021,7 +15021,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -15082,7 +15082,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -15123,7 +15123,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -15164,7 +15164,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -15209,7 +15209,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -15250,7 +15250,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -15295,7 +15295,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -15336,7 +15336,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -15377,7 +15377,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -15419,7 +15419,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -15460,7 +15460,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -15501,7 +15501,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -15545,7 +15545,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -15590,7 +15590,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -15635,7 +15635,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -15680,7 +15680,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -15721,7 +15721,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -15765,7 +15765,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -15806,7 +15806,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -15850,7 +15850,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -15891,7 +15891,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -15935,7 +15935,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -15979,7 +15979,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -16027,7 +16027,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -16072,7 +16072,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -16116,7 +16116,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -16157,7 +16157,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -16201,7 +16201,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -16249,7 +16249,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -16293,7 +16293,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -16337,7 +16337,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -16381,7 +16381,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -16423,7 +16423,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -16473,7 +16473,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -16520,7 +16520,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -16561,7 +16561,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -16602,7 +16602,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -16647,7 +16647,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -16688,7 +16688,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -16733,7 +16733,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -16774,7 +16774,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -16815,7 +16815,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -16856,7 +16856,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -16900,7 +16900,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -16944,7 +16944,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -16992,7 +16992,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -17040,7 +17040,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -17084,7 +17084,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -17125,7 +17125,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -17166,7 +17166,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -17207,7 +17207,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -17248,7 +17248,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -17289,7 +17289,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -17330,7 +17330,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -17371,7 +17371,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -17412,7 +17412,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -17454,7 +17454,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -17495,7 +17495,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -17534,7 +17534,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -17575,7 +17575,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -17616,7 +17616,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -17657,7 +17657,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -17698,7 +17698,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -17739,7 +17739,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -17780,7 +17780,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -17821,7 +17821,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -17862,7 +17862,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -17903,7 +17903,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -17948,7 +17948,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -17993,7 +17993,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -18038,7 +18038,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -18083,7 +18083,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -18125,7 +18125,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -18167,7 +18167,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -18208,7 +18208,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -18249,7 +18249,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -18290,7 +18290,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -18331,7 +18331,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -18372,7 +18372,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -18418,7 +18418,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -18464,7 +18464,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -18509,7 +18509,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -18554,7 +18554,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -18596,7 +18596,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -18637,7 +18637,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -18678,7 +18678,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -18719,7 +18719,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -18760,7 +18760,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -18802,7 +18802,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -18844,7 +18844,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -18886,7 +18886,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -18927,7 +18927,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -18968,7 +18968,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -19010,7 +19010,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -19051,7 +19051,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -19092,7 +19092,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -19133,7 +19133,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -19174,7 +19174,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -19215,7 +19215,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -19256,7 +19256,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -19297,7 +19297,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -19342,7 +19342,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -19384,7 +19384,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -19425,7 +19425,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -19467,7 +19467,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -19508,7 +19508,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -19549,7 +19549,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -19590,7 +19590,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -19636,7 +19636,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -19682,7 +19682,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -19723,7 +19723,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -19764,7 +19764,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -19806,7 +19806,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -19846,7 +19846,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -19887,7 +19887,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -19928,7 +19928,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -19969,7 +19969,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -20010,7 +20010,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -20051,7 +20051,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -20092,7 +20092,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -20134,7 +20134,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -20174,7 +20174,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -20215,7 +20215,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -20256,7 +20256,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -20297,7 +20297,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -20338,7 +20338,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -20379,7 +20379,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -20420,7 +20420,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
@@ -20481,7 +20481,7 @@ buckets {
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/master"
+        cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
diff --git a/main.star b/main.star
index c42fb05ac3e8..b79973eea1d7 100755
--- a/main.star
+++ b/main.star
@@ -492,6 +492,7 @@ def dart_recipe(name):
     return luci.recipe(
         name = name,
         cipd_package = "dart/recipe_bundles/dart.googlesource.com/recipes",
+        cipd_version = "refs/heads/main",
         use_bbagent = True,
     )
 

From ed4720c94db91ab68936c87b6a78f736b65c2ad2 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 20 Sep 2021 16:59:54 +0000
Subject: [PATCH 495/826] [infra] Switch Android to test the compressed pointer
 variant of ARM64.

Change-Id: I3674270ce3dfc7e44f626e90e0476fe5375d46ad
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/213284
Reviewed-by: Siva Annamalai <asiva@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg   |  8 ++--
 cr-buildbucket.cfg | 40 +++++++++----------
 luci-milo.cfg      | 48 +++++++++++------------
 luci-notify.cfg    |  8 ++--
 luci-scheduler.cfg | 96 +++++++++++++++++++++++-----------------------
 main.star          |  8 ++--
 6 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 2bef6f9d9c0f..93b8c8fe24bc 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -411,7 +411,7 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-android-debug-arm64-try"
+        name: "dart/try/vm-ffi-android-debug-arm64c-try"
         includable_only: true
       }
       builders {
@@ -419,7 +419,7 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-android-product-arm64-try"
+        name: "dart/try/vm-ffi-android-product-arm64c-try"
         includable_only: true
       }
       builders {
@@ -427,7 +427,7 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-android-release-arm64-try"
+        name: "dart/try/vm-ffi-android-release-arm64c-try"
         includable_only: true
       }
       builders {
@@ -584,7 +584,7 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-android-release-arm64-try"
+        name: "dart/try/vm-kernel-precomp-android-release-arm64c-try"
         includable_only: true
       }
       builders {
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index abe8d22ea81f..2aa084b234d1 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -7818,7 +7818,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64"
+      name: "vm-ffi-android-debug-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7859,7 +7859,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64-beta"
+      name: "vm-ffi-android-debug-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7900,7 +7900,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64-dev"
+      name: "vm-ffi-android-debug-arm64c-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -7941,7 +7941,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64-stable"
+      name: "vm-ffi-android-debug-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8146,7 +8146,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64"
+      name: "vm-ffi-android-product-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8187,7 +8187,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64-beta"
+      name: "vm-ffi-android-product-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8228,7 +8228,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64-dev"
+      name: "vm-ffi-android-product-arm64c-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8269,7 +8269,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64-stable"
+      name: "vm-ffi-android-product-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8474,7 +8474,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64"
+      name: "vm-ffi-android-release-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8515,7 +8515,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64-beta"
+      name: "vm-ffi-android-release-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8556,7 +8556,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64-dev"
+      name: "vm-ffi-android-release-arm64c-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -8597,7 +8597,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64-stable"
+      name: "vm-ffi-android-release-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -11322,7 +11322,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64"
+      name: "vm-kernel-precomp-android-release-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -11364,7 +11364,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64-beta"
+      name: "vm-kernel-precomp-android-release-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -11406,7 +11406,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64-dev"
+      name: "vm-kernel-precomp-android-release-arm64c-dev"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -11448,7 +11448,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64-stable"
+      name: "vm-kernel-precomp-android-release-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -17157,7 +17157,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64-try"
+      name: "vm-ffi-android-debug-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -17239,7 +17239,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64-try"
+      name: "vm-ffi-android-product-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -17321,7 +17321,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64-try"
+      name: "vm-ffi-android-release-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -18751,7 +18751,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64-try"
+      name: "vm-kernel-precomp-android-release-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 282837e91d82..17c8b3dd0a44 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -321,7 +321,7 @@ consoles {
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c"
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   }
@@ -466,17 +466,17 @@ consoles {
     short_name: "p32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c"
     category: "vm|ffi"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c"
     category: "vm|ffi"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c"
     category: "vm|ffi"
     short_name: "p64"
   }
@@ -1210,7 +1210,7 @@ consoles {
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c"
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   }
@@ -1355,17 +1355,17 @@ consoles {
     short_name: "p32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c"
     category: "vm|ffi"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c"
     category: "vm|ffi"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c"
     category: "vm|ffi"
     short_name: "p64"
   }
@@ -1584,7 +1584,7 @@ consoles {
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-dev"
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   }
@@ -1609,17 +1609,17 @@ consoles {
     short_name: "p32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-dev"
     category: "vm|ffi"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-dev"
     category: "vm|ffi"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-dev"
     category: "vm|ffi"
     short_name: "p64"
   }
@@ -1973,7 +1973,7 @@ consoles {
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-beta"
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   }
@@ -1998,17 +1998,17 @@ consoles {
     short_name: "p32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-beta"
     category: "vm|ffi"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-beta"
     category: "vm|ffi"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-beta"
     category: "vm|ffi"
     short_name: "p64"
   }
@@ -2362,7 +2362,7 @@ consoles {
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-stable"
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   }
@@ -2387,17 +2387,17 @@ consoles {
     short_name: "p32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-stable"
     category: "vm|ffi"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-stable"
     category: "vm|ffi"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-stable"
     category: "vm|ffi"
     short_name: "p64"
   }
@@ -2835,7 +2835,7 @@ consoles {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm_x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm64-try"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm64c-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-linux-product-x64-try"
@@ -2922,13 +2922,13 @@ consoles {
     name: "buildbucket/luci.dart.try/vm-ffi-android-product-arm-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm64-try"
+    name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-ffi-android-release-arm64-try"
+    name: "buildbucket/luci.dart.try/vm-ffi-android-release-arm64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-ffi-android-product-arm64-try"
+    name: "buildbucket/luci.dart.try/vm-ffi-android-product-arm64c-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-precomp-ffi-qemu-linux-release-arm-try"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 4142c6aeab46..a017929d857a 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -970,7 +970,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-ffi-android-debug-arm64"
+    name: "vm-ffi-android-debug-arm64c"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -998,7 +998,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-ffi-android-product-arm64"
+    name: "vm-ffi-android-product-arm64c"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1026,7 +1026,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-ffi-android-release-arm64"
+    name: "vm-ffi-android-release-arm64c"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1464,7 +1464,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-android-release-arm64"
+    name: "vm-kernel-precomp-android-release-arm64c"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 51246c288a4e..4f53afd85b81 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1967,47 +1967,47 @@ job {
   }
 }
 job {
-  id: "vm-ffi-android-debug-arm64"
+  id: "vm-ffi-android-debug-arm64c"
   realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-debug-arm64"
+    builder: "vm-ffi-android-debug-arm64c"
   }
 }
 job {
-  id: "vm-ffi-android-debug-arm64-beta"
+  id: "vm-ffi-android-debug-arm64c-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-debug-arm64-beta"
+    builder: "vm-ffi-android-debug-arm64c-beta"
   }
 }
 job {
-  id: "vm-ffi-android-debug-arm64-dev"
+  id: "vm-ffi-android-debug-arm64c-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-debug-arm64-dev"
+    builder: "vm-ffi-android-debug-arm64c-dev"
   }
 }
 job {
-  id: "vm-ffi-android-debug-arm64-stable"
+  id: "vm-ffi-android-debug-arm64c-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-debug-arm64-stable"
+    builder: "vm-ffi-android-debug-arm64c-stable"
   }
 }
 job {
@@ -2055,47 +2055,47 @@ job {
   }
 }
 job {
-  id: "vm-ffi-android-product-arm64"
+  id: "vm-ffi-android-product-arm64c"
   realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-product-arm64"
+    builder: "vm-ffi-android-product-arm64c"
   }
 }
 job {
-  id: "vm-ffi-android-product-arm64-beta"
+  id: "vm-ffi-android-product-arm64c-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-product-arm64-beta"
+    builder: "vm-ffi-android-product-arm64c-beta"
   }
 }
 job {
-  id: "vm-ffi-android-product-arm64-dev"
+  id: "vm-ffi-android-product-arm64c-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-product-arm64-dev"
+    builder: "vm-ffi-android-product-arm64c-dev"
   }
 }
 job {
-  id: "vm-ffi-android-product-arm64-stable"
+  id: "vm-ffi-android-product-arm64c-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-product-arm64-stable"
+    builder: "vm-ffi-android-product-arm64c-stable"
   }
 }
 job {
@@ -2143,47 +2143,47 @@ job {
   }
 }
 job {
-  id: "vm-ffi-android-release-arm64"
+  id: "vm-ffi-android-release-arm64c"
   realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-release-arm64"
+    builder: "vm-ffi-android-release-arm64c"
   }
 }
 job {
-  id: "vm-ffi-android-release-arm64-beta"
+  id: "vm-ffi-android-release-arm64c-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-release-arm64-beta"
+    builder: "vm-ffi-android-release-arm64c-beta"
   }
 }
 job {
-  id: "vm-ffi-android-release-arm64-dev"
+  id: "vm-ffi-android-release-arm64c-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-release-arm64-dev"
+    builder: "vm-ffi-android-release-arm64c-dev"
   }
 }
 job {
-  id: "vm-ffi-android-release-arm64-stable"
+  id: "vm-ffi-android-release-arm64c-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-release-arm64-stable"
+    builder: "vm-ffi-android-release-arm64c-stable"
   }
 }
 job {
@@ -2891,47 +2891,47 @@ job {
   }
 }
 job {
-  id: "vm-kernel-precomp-android-release-arm64"
+  id: "vm-kernel-precomp-android-release-arm64c"
   realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm64"
+    builder: "vm-kernel-precomp-android-release-arm64c"
   }
 }
 job {
-  id: "vm-kernel-precomp-android-release-arm64-beta"
+  id: "vm-kernel-precomp-android-release-arm64c-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm64-beta"
+    builder: "vm-kernel-precomp-android-release-arm64c-beta"
   }
 }
 job {
-  id: "vm-kernel-precomp-android-release-arm64-dev"
+  id: "vm-kernel-precomp-android-release-arm64c-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm64-dev"
+    builder: "vm-kernel-precomp-android-release-arm64c-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-android-release-arm64-stable"
+  id: "vm-kernel-precomp-android-release-arm64c-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm64-stable"
+    builder: "vm-kernel-precomp-android-release-arm64c-stable"
   }
 }
 job {
@@ -3962,11 +3962,11 @@ trigger {
   triggers: "pkg-win-release-beta"
   triggers: "vm-canary-linux-debug-beta"
   triggers: "vm-ffi-android-debug-arm-beta"
-  triggers: "vm-ffi-android-debug-arm64-beta"
+  triggers: "vm-ffi-android-debug-arm64c-beta"
   triggers: "vm-ffi-android-product-arm-beta"
-  triggers: "vm-ffi-android-product-arm64-beta"
+  triggers: "vm-ffi-android-product-arm64c-beta"
   triggers: "vm-ffi-android-release-arm-beta"
-  triggers: "vm-ffi-android-release-arm64-beta"
+  triggers: "vm-ffi-android-release-arm64c-beta"
   triggers: "vm-kernel-checked-linux-release-x64-beta"
   triggers: "vm-kernel-linux-debug-x64-beta"
   triggers: "vm-kernel-linux-release-simarm-beta"
@@ -3976,7 +3976,7 @@ trigger {
   triggers: "vm-kernel-mac-release-x64-beta"
   triggers: "vm-kernel-nnbd-linux-debug-x64-beta"
   triggers: "vm-kernel-nnbd-linux-release-x64-beta"
-  triggers: "vm-kernel-precomp-android-release-arm64-beta"
+  triggers: "vm-kernel-precomp-android-release-arm64c-beta"
   triggers: "vm-kernel-precomp-android-release-arm_x64-beta"
   triggers: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
   triggers: "vm-kernel-precomp-linux-debug-x64-beta"
@@ -4037,11 +4037,11 @@ trigger {
   triggers: "pkg-win-release-dev"
   triggers: "vm-canary-linux-debug-dev"
   triggers: "vm-ffi-android-debug-arm-dev"
-  triggers: "vm-ffi-android-debug-arm64-dev"
+  triggers: "vm-ffi-android-debug-arm64c-dev"
   triggers: "vm-ffi-android-product-arm-dev"
-  triggers: "vm-ffi-android-product-arm64-dev"
+  triggers: "vm-ffi-android-product-arm64c-dev"
   triggers: "vm-ffi-android-release-arm-dev"
-  triggers: "vm-ffi-android-release-arm64-dev"
+  triggers: "vm-ffi-android-release-arm64c-dev"
   triggers: "vm-kernel-checked-linux-release-x64-dev"
   triggers: "vm-kernel-linux-debug-x64-dev"
   triggers: "vm-kernel-linux-release-simarm-dev"
@@ -4052,7 +4052,7 @@ trigger {
   triggers: "vm-kernel-mac-release-x64-dev"
   triggers: "vm-kernel-nnbd-linux-debug-x64-dev"
   triggers: "vm-kernel-nnbd-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-android-release-arm64-dev"
+  triggers: "vm-kernel-precomp-android-release-arm64c-dev"
   triggers: "vm-kernel-precomp-android-release-arm_x64-dev"
   triggers: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
   triggers: "vm-kernel-precomp-linux-debug-x64-dev"
@@ -4178,11 +4178,11 @@ trigger {
   triggers: "pkg-win-release-stable"
   triggers: "vm-canary-linux-debug-stable"
   triggers: "vm-ffi-android-debug-arm-stable"
-  triggers: "vm-ffi-android-debug-arm64-stable"
+  triggers: "vm-ffi-android-debug-arm64c-stable"
   triggers: "vm-ffi-android-product-arm-stable"
-  triggers: "vm-ffi-android-product-arm64-stable"
+  triggers: "vm-ffi-android-product-arm64c-stable"
   triggers: "vm-ffi-android-release-arm-stable"
-  triggers: "vm-ffi-android-release-arm64-stable"
+  triggers: "vm-ffi-android-release-arm64c-stable"
   triggers: "vm-kernel-checked-linux-release-x64-stable"
   triggers: "vm-kernel-linux-debug-x64-stable"
   triggers: "vm-kernel-linux-release-simarm-stable"
@@ -4192,7 +4192,7 @@ trigger {
   triggers: "vm-kernel-mac-release-x64-stable"
   triggers: "vm-kernel-nnbd-linux-debug-x64-stable"
   triggers: "vm-kernel-nnbd-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-android-release-arm64-stable"
+  triggers: "vm-kernel-precomp-android-release-arm64c-stable"
   triggers: "vm-kernel-precomp-android-release-arm_x64-stable"
   triggers: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
   triggers: "vm-kernel-precomp-linux-debug-x64-stable"
@@ -4223,11 +4223,11 @@ trigger {
   triggers: "iso-stress-linux"
   triggers: "vm-canary-linux-debug"
   triggers: "vm-ffi-android-debug-arm"
-  triggers: "vm-ffi-android-debug-arm64"
+  triggers: "vm-ffi-android-debug-arm64c"
   triggers: "vm-ffi-android-product-arm"
-  triggers: "vm-ffi-android-product-arm64"
+  triggers: "vm-ffi-android-product-arm64c"
   triggers: "vm-ffi-android-release-arm"
-  triggers: "vm-ffi-android-release-arm64"
+  triggers: "vm-ffi-android-release-arm64c"
   triggers: "vm-fuchsia-release-x64"
   triggers: "vm-kernel-checked-linux-release-x64"
   triggers: "vm-kernel-linux-release-simarm"
@@ -4236,7 +4236,7 @@ trigger {
   triggers: "vm-kernel-nnbd-linux-release-x64"
   triggers: "vm-kernel-nnbd-mac-release-arm64"
   triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
-  triggers: "vm-kernel-precomp-android-release-arm64"
+  triggers: "vm-kernel-precomp-android-release-arm64c"
   triggers: "vm-kernel-precomp-android-release-arm_x64"
   triggers: "vm-kernel-precomp-linux-debug-simarm_x64"
   triggers: "vm-kernel-precomp-linux-debug-x64"
diff --git a/main.star b/main.star
index b79973eea1d7..ab2ce4f8eb82 100755
--- a/main.star
+++ b/main.star
@@ -1212,7 +1212,7 @@ dart_vm_extra_builder(
     properties = {"shard_timeout": (90 * time.minute) // time.second},
 )
 dart_vm_extra_builder(
-    "vm-kernel-precomp-android-release-arm64",
+    "vm-kernel-precomp-android-release-arm64c",
     category = "vm|kernel-precomp|android|a64",
     properties = {"shard_timeout": (90 * time.minute) // time.second},
 )
@@ -1350,9 +1350,9 @@ dart_vm_nightly_builder("vm-kernel-gcc-linux", category = "vm|misc|g", goma = Fa
 dart_vm_extra_builder("vm-ffi-android-debug-arm", category = "vm|ffi|d32")
 dart_vm_extra_builder("vm-ffi-android-release-arm", category = "vm|ffi|r32")
 dart_vm_extra_builder("vm-ffi-android-product-arm", category = "vm|ffi|p32")
-dart_vm_extra_builder("vm-ffi-android-debug-arm64", category = "vm|ffi|d64")
-dart_vm_extra_builder("vm-ffi-android-release-arm64", category = "vm|ffi|r64")
-dart_vm_extra_builder("vm-ffi-android-product-arm64", category = "vm|ffi|p64")
+dart_vm_extra_builder("vm-ffi-android-debug-arm64c", category = "vm|ffi|d64")
+dart_vm_extra_builder("vm-ffi-android-release-arm64c", category = "vm|ffi|r64")
+dart_vm_extra_builder("vm-ffi-android-product-arm64c", category = "vm|ffi|p64")
 dart_vm_extra_builder(
     "vm-precomp-ffi-qemu-linux-release-arm",
     category = "vm|ffi|qe",

From 4ff50dbd280f4f5b944fdf96691c1d68effb44b0 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 21 Oct 2021 10:51:54 +0000
Subject: [PATCH 496/826] [infra] Update dart_ci CQ to use the main branch

Bug: b/198416551
Change-Id: Ibe3d796a54748a8e37f4c0a784a74cfdfcaed81b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/217301
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 commit-queue.cfg | 2 +-
 main.star        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 93b8c8fe24bc..d3483c86073c 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -16,7 +16,7 @@ config_groups {
     url: "https://dart-review.googlesource.com"
     projects {
       name: "dart_ci"
-      ref_regexp: "refs/heads/master"
+      ref_regexp: "refs/heads/main"
     }
   }
   verifiers {
diff --git a/main.star b/main.star
index ab2ce4f8eb82..ae0cc58b89db 100755
--- a/main.star
+++ b/main.star
@@ -481,7 +481,7 @@ luci.cq_group(
 
 luci.cq_group(
     name = "dart_ci",
-    watch = cq.refset(DART_GERRIT + "dart_ci", refs = ["refs/heads/master"]),
+    watch = cq.refset(DART_GERRIT + "dart_ci", refs = ["refs/heads/main"]),
     allow_submit_with_open_deps = True,
     tree_status_host = "dart-status.appspot.com",
     retry_config = cq.RETRY_NONE,

From 7b7b92f22ad6b94c7c36fcc14f99136e860d13c1 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 27 Oct 2021 09:49:21 +0000
Subject: [PATCH 497/826] Upgrade recipe infrastructure to the latest version

Also upgrade lucicfg to the latest version.

Bug: b/204105637
Change-Id: I571463d9c606c86955df5687056e1b717013e189
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/218102
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 6 +++---
 main.star          | 6 +++---
 project.cfg        | 6 ++++++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 2aa084b234d1..b8f57c480d55 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1405,7 +1405,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
-        cipd_version: "git_revision:ea071f071a42ea43d0064e3eea77d1daaaee0ecf"
+        cipd_version: "git_revision:bc0c2fb9082bc82a2d972b5cca8fc17afa55d34e"
         cmd: "luciexe"
       }
       properties:
@@ -1423,7 +1423,7 @@ buckets {
         '  "package_name_internal_prefix": "dart_internal/recipe_bundles",'
         '  "package_name_prefix": "dart/recipe_bundles",'
         '  "recipe": "recipe_bundler",'
-        '  "recipe_bundler_vers": "git_revision:ea071f071a42ea43d0064e3eea77d1daaaee0ecf",'
+        '  "recipe_bundler_vers": "git_revision:bc0c2fb9082bc82a2d972b5cca8fc17afa55d34e",'
         '  "repo_specs": ['
         '    "dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/main"'
         '  ]'
@@ -1451,7 +1451,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
-        cipd_version: "git_revision:ea071f071a42ea43d0064e3eea77d1daaaee0ecf"
+        cipd_version: "git_revision:bc0c2fb9082bc82a2d972b5cca8fc17afa55d34e"
         cmd: "luciexe"
       }
       properties:
diff --git a/main.star b/main.star
index ae0cc58b89db..18b8f22c7b5c 100755
--- a/main.star
+++ b/main.star
@@ -14,7 +14,7 @@ Generates the Luci configuration for the Dart project.
 
 load("//defaults.star", "defaults")
 
-lucicfg.check_version("1.21.5")
+lucicfg.check_version("1.29.1")
 
 # Enable LUCI Realms support.
 lucicfg.enable_experiment("crbug.com/1085650")
@@ -1794,7 +1794,7 @@ def chromium_infra_recipe(name):
         name = name,
         cipd_package =
             "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
-        cipd_version = "git_revision:ea071f071a42ea43d0064e3eea77d1daaaee0ecf",
+        cipd_version = "git_revision:bc0c2fb9082bc82a2d972b5cca8fc17afa55d34e",
         use_bbagent = True,
     )
 
@@ -1821,7 +1821,7 @@ dart_infra_builder(
     properties = {
         # This property controls the version of the recipe_bundler go tool:
         #   https://chromium.googlesource.com/infra/infra/+/main/go/src/infra/tools/recipe_bundler
-        "recipe_bundler_vers": "git_revision:ea071f071a42ea43d0064e3eea77d1daaaee0ecf",
+        "recipe_bundler_vers": "git_revision:bc0c2fb9082bc82a2d972b5cca8fc17afa55d34e",
         # These control the prefix of the CIPD package names that the tool
         # will create.
         "package_name_prefix": "dart/recipe_bundles",
diff --git a/project.cfg b/project.cfg
index aa62c97e4b8b..2a315c4a1d83 100644
--- a/project.cfg
+++ b/project.cfg
@@ -6,3 +6,9 @@
 
 name: "dart"
 access: "group:all"
+lucicfg {
+  version: "1.29.1"
+  package_dir: "."
+  config_dir: "."
+  entry_point: "main.star"
+}

From a86e79ff41d3ace817c7e88b79d21e111d5d53c7 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 9 Nov 2021 11:51:53 +0000
Subject: [PATCH 498/826] [infra] Disable Android tooling downloads on M1
 builders

Change-Id: I761856aefa713f1b7c1ffd47160f7a4bc63a9e28
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/219760
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 44 +++++++++++++++++++++++++++++++++++++
 main.star          | 55 +++++++++++++++++++++++++++++++++++-----------
 2 files changed, 86 insertions(+), 13 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index b8f57c480d55..7e04e586a282 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -568,6 +568,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -611,6 +614,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -654,6 +660,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -697,6 +706,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -7149,6 +7161,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -10154,6 +10167,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -10199,6 +10215,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -10959,6 +10978,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -11051,6 +11073,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -13552,6 +13577,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -15607,6 +15635,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -16962,6 +16993,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -18010,6 +18042,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -18389,6 +18424,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -18481,6 +18519,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -19607,6 +19648,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
diff --git a/main.star b/main.star
index 18b8f22c7b5c..35846cfe78bb 100755
--- a/main.star
+++ b/main.star
@@ -100,9 +100,11 @@ NORMAL = 50  # Used for post-submit builds.
 HIGH = 30  # Used for try-jobs.
 HIGHEST = 25  # Used for shards in the recipes, included here for completeness.
 
+NO_ANDROID = {"custom_vars": {"download_android_deps": False}}
 CHROME = {"custom_vars": {"download_chrome": True}}
 FIREFOX = {"custom_vars": {"download_firefox": True}}
 JS_ENGINES = {"custom_vars": {"checkout_javascript_engines": True}}
+SLOW_SHARDS = {"shard_timeout": (90 * time.minute) // time.second}
 
 def to_location_regexp(paths):
     return [".+/[+]/%s" % path for path in paths]
@@ -119,6 +121,30 @@ def windows():
 def linux():
     return {"os": "Linux"}
 
+def union(x, y):
+    """ Creates a new dict with the values from both passed dictionaries
+
+    If both dicts contain the same keys, their values are assumed to be dicts
+    and merged. Values in y's sub-dicts will overwrite values in x's sub-dicts.
+
+    Args:
+        x (dict): A dict.
+        y (dict): Another dict.
+
+    Returns:
+        dict: The merged dict.
+    """
+    z = {}
+    z.update(x)
+    for k in y.keys():
+        v = z.get(k)
+        if v:
+            v = dict(v, **y[k])
+            z[k] = v
+        else:
+            z[k] = y[k]
+    return z
+
 # https://chrome-infra-auth.appspot.com/auth/groups/project-dart-ci-task-accounts
 CI_ACCOUNTS_GROUP = "project-dart-ci-task-accounts"
 
@@ -942,7 +968,7 @@ dart_vm_nightly_builder(
     "vm-kernel-nnbd-linux-debug-ia32",
     category = "vm|nnbd|jit|d3",
     channels = ["try"],
-    properties = {"shard_timeout": (90 * time.minute) // time.second},
+    properties = SLOW_SHARDS,
 )
 dart_vm_nightly_builder(
     "vm-kernel-nnbd-linux-release-ia32",
@@ -963,14 +989,14 @@ dart_vm_nightly_builder(
     "vm-kernel-nnbd-mac-debug-arm64",
     category = "vm|nnbd|jit|m1d",
     channels = ["try"],
-    properties = {"shard_timeout": (90 * time.minute) // time.second},
+    properties = union(NO_ANDROID, SLOW_SHARDS),
     dimensions = mac(cpu = "arm64"),
 )
 dart_vm_nightly_builder(
     "vm-kernel-nnbd-mac-debug-x64",
     category = "vm|nnbd|jit|md",
     channels = ["try"],
-    properties = {"shard_timeout": (90 * time.minute) // time.second},
+    properties = SLOW_SHARDS,
     dimensions = mac(),
 )
 dart_vm_extra_builder(
@@ -978,6 +1004,7 @@ dart_vm_extra_builder(
     category = "vm|nnbd|jit|m1r",
     channels = ["try"],
     dimensions = mac(cpu = "arm64"),
+    properties = NO_ANDROID,
 )
 dart_vm_nightly_builder(
     "vm-kernel-nnbd-mac-release-x64",
@@ -995,7 +1022,7 @@ dart_vm_nightly_builder(
     "vm-kernel-nnbd-win-debug-x64",
     category = "vm|nnbd|jit|wd",
     channels = ["try"],
-    properties = {"shard_timeout": (90 * time.minute) // time.second},
+    properties = SLOW_SHARDS,
     dimensions = windows(),
 )
 dart_vm_nightly_builder(
@@ -1024,7 +1051,7 @@ nightly_builder(
     "vm-kernel-precomp-nnbd-linux-debug-x64",
     category = "vm|nnbd|aot|d",
     channels = ["try"],
-    properties = {"shard_timeout": (90 * time.minute) // time.second},
+    properties = SLOW_SHARDS,
 )
 nightly_builder(
     "vm-kernel-precomp-nnbd-linux-release-simarm64",
@@ -1036,14 +1063,14 @@ dart_vm_extra_builder(
     category = "vm|nnbd|aot|m1",
     channels = ["try"],
     dimensions = mac(cpu = "arm64"),
-    properties = {"shard_timeout": (90 * time.minute) // time.second},
+    properties = union(NO_ANDROID, SLOW_SHARDS),
 )
 nightly_builder(
     "vm-kernel-precomp-nnbd-mac-release-simarm64",
     category = "vm|nnbd|aot|ma6",
     channels = ["try"],
     dimensions = mac(),
-    properties = {"shard_timeout": (90 * time.minute) // time.second},
+    properties = SLOW_SHARDS,
 )
 nightly_builder(
     "vm-kernel-precomp-nnbd-win-release-x64",
@@ -1056,7 +1083,7 @@ nightly_builder(
 dart_vm_extra_builder(
     "app-kernel-linux-debug-x64",
     category = "vm|app-kernel|d64",
-    properties = {"shard_timeout": (90 * time.minute) // time.second},
+    properties = SLOW_SHARDS,
 )
 dart_vm_nightly_builder(
     "app-kernel-linux-product-x64",
@@ -1119,6 +1146,7 @@ dart_ci_sandbox_builder(
     category = "vm|kernel|m1r",
     channels = ["try", "dev"],
     dimensions = mac(cpu = "arm64"),
+    properties = NO_ANDROID,
 )
 dart_vm_nightly_builder(
     "vm-kernel-win-debug-ia32",
@@ -1177,7 +1205,7 @@ dart_vm_extra_builder(
 dart_vm_extra_builder(
     "vm-kernel-precomp-linux-debug-simarm_x64",
     category = "vm|kernel-precomp|adx",
-    properties = {"shard_timeout": (90 * time.minute) // time.second},
+    properties = SLOW_SHARDS,
 )
 dart_vm_extra_builder(
     "vm-kernel-precomp-linux-release-simarm_x64",
@@ -1197,7 +1225,7 @@ dart_vm_nightly_builder(
     "cross-vm-precomp-linux-release-arm64",
     category = "vm|kernel-precomp|cra",
     channels = [],
-    properties = {"shard_timeout": (90 * time.minute) // time.second},
+    properties = SLOW_SHARDS,
 )
 dart_vm_nightly_builder(
     "vm-kernel-precomp-dwarf-linux-product-x64",
@@ -1209,12 +1237,12 @@ dart_vm_nightly_builder(
 dart_vm_extra_builder(
     "vm-kernel-precomp-android-release-arm_x64",
     category = "vm|kernel-precomp|android|a32",
-    properties = {"shard_timeout": (90 * time.minute) // time.second},
+    properties = SLOW_SHARDS,
 )
 dart_vm_extra_builder(
     "vm-kernel-precomp-android-release-arm64c",
     category = "vm|kernel-precomp|android|a64",
-    properties = {"shard_timeout": (90 * time.minute) // time.second},
+    properties = SLOW_SHARDS,
 )
 
 # vm|product
@@ -1376,7 +1404,7 @@ dart_ci_sandbox_builder(
     category = "pkg|m1",
     channels = ["try"],
     dimensions = mac(cpu = "arm64"),
-    properties = CHROME,
+    properties = union(CHROME, NO_ANDROID),
 )
 dart_ci_sandbox_builder(
     "pkg-win-release",
@@ -1542,6 +1570,7 @@ dart_ci_builder(
     category = "sdk|m1",
     channels = CHANNELS,
     dimensions = mac(cpu = "arm64"),
+    properties = NO_ANDROID,
 )
 
 dart_ci_builder(

From 3f75d48d8cf0bd9b7777e92bf43ffb127483d386 Mon Sep 17 00:00:00 2001
From: Vadim Shtayura <vadimsh@google.com>
Date: Mon, 15 Nov 2021 09:00:46 +0000
Subject: [PATCH 499/826] Declare "role/configs.validator" binding.

It defines who is allowed to call LUCI Config validation API to
validate this LUCI project's configs. This is usually done by
presubmit jobs, and thus configs.validator role is assigned to
try job task accounts.

Previously this ACL was defined in the global "config-validation"
group. It is deprecated and being replaced with per-project ACLs
defined in per-project configs (like in this CL).

There's still a global ACL to allow any googler to call
the validation API in any LUCI project they are allowed to see.
Thus the per-project binding applies only to service accounts
(they are not googlers).

Note: this CL was generated semi-automatically and reviewers are
picked automatically based on OWNERS file.

BUG=chromium:1068817
R=kustermann@google.com, whesse@google.com

Change-Id: I749658fed582fe8e8b6bb4a76c19a593d5151401
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/220069
Auto-Submit: Vadim Shtayura <vadimsh@google.com>
Reviewed-by: Martin Kustermann <kustermann@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 main.star   | 4 ++++
 project.cfg | 2 +-
 realms.cfg  | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/main.star b/main.star
index 35846cfe78bb..08ee1ed96949 100755
--- a/main.star
+++ b/main.star
@@ -203,6 +203,10 @@ luci.project(
         acl.entry(acl.CQ_DRY_RUNNER, groups = ["project-dart-tryjob-access"]),
     ],
     bindings = [
+        luci.binding(
+            roles = "role/configs.validator",
+            users = TRY_ACCOUNT,
+        ),
         luci.binding(
             roles = "role/swarming.poolOwner",
             groups = "project-dart-admins",
diff --git a/project.cfg b/project.cfg
index 2a315c4a1d83..ef40a9e771ff 100644
--- a/project.cfg
+++ b/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.29.1"
+  version: "1.30.1"
   package_dir: "."
   config_dir: "."
   entry_point: "main.star"
diff --git a/realms.cfg b/realms.cfg
index 212ba020464a..e7954da62b3b 100644
--- a/realms.cfg
+++ b/realms.cfg
@@ -18,6 +18,10 @@ realms {
     role: "role/configs.reader"
     principals: "group:all"
   }
+  bindings {
+    role: "role/configs.validator"
+    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
   bindings {
     role: "role/cq.committer"
     principals: "group:project-dart-committers"

From b44ad1894717dd2380a463b3c5187dd6b8e5c8d7 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 15 Nov 2021 11:17:19 +0000
Subject: [PATCH 500/826] [infra] Use python3 for recipes on 5% of all builds

Bug: b/202110580
Change-Id: Iaf2c7ecf3b72ecd6bd13d758e735fe692ce0c023
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/220140
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 1928 ++++++++++++++++++++++++++++++++++++++++++++
 main.star          |    1 +
 2 files changed, 1929 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 7e04e586a282..0468816f15ef 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -53,6 +53,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -93,6 +97,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -132,6 +140,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -171,6 +183,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -210,6 +226,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -253,6 +273,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -296,6 +320,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -335,6 +363,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -375,6 +407,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -415,6 +451,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -455,6 +495,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -495,6 +539,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -538,6 +586,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -584,6 +636,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -630,6 +686,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -676,6 +736,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -722,6 +786,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -765,6 +833,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -808,6 +880,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -851,6 +927,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -890,6 +970,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -929,6 +1013,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -968,6 +1056,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1007,6 +1099,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1046,6 +1142,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1085,6 +1185,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1124,6 +1228,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1163,6 +1271,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1202,6 +1314,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1242,6 +1358,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1310,6 +1430,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1402,6 +1526,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1448,6 +1576,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1496,6 +1628,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1538,6 +1674,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1599,6 +1739,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1660,6 +1804,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1701,6 +1849,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1742,6 +1894,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1783,6 +1939,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1824,6 +1984,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1865,6 +2029,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1906,6 +2074,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1947,6 +2119,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -1992,6 +2168,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2037,6 +2217,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2082,6 +2266,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2127,6 +2315,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2168,6 +2360,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2209,6 +2405,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2250,6 +2450,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2291,6 +2495,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2336,6 +2544,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2377,6 +2589,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2418,6 +2634,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2459,6 +2679,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2500,6 +2724,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2541,6 +2769,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2583,6 +2815,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2625,6 +2861,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2667,6 +2907,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2709,6 +2953,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2750,6 +2998,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2791,6 +3043,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2832,6 +3088,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2873,6 +3133,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2914,6 +3178,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2956,6 +3224,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -2998,6 +3270,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3040,6 +3316,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3084,6 +3364,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3128,6 +3412,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3172,6 +3460,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3216,6 +3508,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3257,6 +3553,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3298,6 +3598,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3339,6 +3643,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3380,6 +3688,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3424,6 +3736,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3468,6 +3784,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3512,6 +3832,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3556,6 +3880,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3597,6 +3925,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3638,6 +3970,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3679,6 +4015,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3720,6 +4060,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3764,6 +4108,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3808,6 +4156,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3852,6 +4204,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3896,6 +4252,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3940,6 +4300,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -3984,6 +4348,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4028,6 +4396,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4072,6 +4444,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4120,6 +4496,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4168,6 +4548,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4216,6 +4600,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4264,6 +4652,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4309,6 +4701,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4354,6 +4750,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4399,6 +4799,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4444,6 +4848,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4488,6 +4896,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4532,6 +4944,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4576,6 +4992,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4620,6 +5040,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4664,6 +5088,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4705,6 +5133,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4746,6 +5178,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4787,6 +5223,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4828,6 +5268,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4872,6 +5316,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4916,6 +5364,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -4960,6 +5412,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5004,6 +5460,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5052,6 +5512,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5100,6 +5564,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5148,6 +5616,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5196,6 +5668,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5240,6 +5716,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5284,6 +5764,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5328,6 +5812,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5372,6 +5860,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5416,6 +5908,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5460,6 +5956,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5504,6 +6004,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5548,6 +6052,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5592,6 +6100,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5634,6 +6146,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5684,6 +6200,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5731,6 +6251,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5772,6 +6296,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5813,6 +6341,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5854,6 +6386,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5895,6 +6431,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5936,6 +6476,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -5981,6 +6525,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6026,6 +6574,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6071,6 +6623,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6116,6 +6672,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6157,6 +6717,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6198,6 +6762,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6239,6 +6807,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6280,6 +6852,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6325,6 +6901,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6366,6 +6946,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6407,6 +6991,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6448,6 +7036,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6489,6 +7081,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6530,6 +7126,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6572,6 +7172,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6613,6 +7217,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6654,6 +7262,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6695,6 +7307,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6736,6 +7352,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6777,6 +7397,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6819,6 +7443,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6860,6 +7488,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6904,6 +7536,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6948,6 +7584,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -6992,6 +7632,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7036,6 +7680,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7080,6 +7728,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7128,6 +7780,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7177,6 +7833,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7225,6 +7885,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7273,6 +7937,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7321,6 +7989,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7365,6 +8037,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7409,6 +8085,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7453,6 +8133,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7497,6 +8181,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7538,6 +8226,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7579,6 +8271,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7620,6 +8316,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7661,6 +8361,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7702,6 +8406,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7743,6 +8451,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7784,6 +8496,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7825,6 +8541,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7866,6 +8586,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7907,6 +8631,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7948,6 +8676,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -7989,6 +8721,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8030,6 +8766,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8071,6 +8811,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8112,6 +8856,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8153,6 +8901,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8194,6 +8946,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8235,6 +8991,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8276,6 +9036,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8317,6 +9081,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8358,6 +9126,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8399,6 +9171,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8440,6 +9216,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8481,6 +9261,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8522,6 +9306,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8563,6 +9351,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8604,6 +9396,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8645,6 +9441,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8687,6 +9487,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8729,6 +9533,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8770,6 +9578,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8811,6 +9623,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8852,6 +9668,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8893,6 +9713,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8932,6 +9756,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -8971,6 +9799,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9010,6 +9842,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9049,6 +9885,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9090,6 +9930,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9131,6 +9975,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9172,6 +10020,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9213,6 +10065,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9254,6 +10110,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9295,6 +10155,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9336,6 +10200,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9377,6 +10245,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9418,6 +10290,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9459,6 +10335,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9500,6 +10380,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9541,6 +10425,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9582,6 +10470,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9623,6 +10515,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9664,6 +10560,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9705,6 +10605,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9746,6 +10650,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9787,6 +10695,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9828,6 +10740,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9869,6 +10785,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9910,6 +10830,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -9955,6 +10879,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10000,6 +10928,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10045,6 +10977,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10090,6 +11026,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10135,6 +11075,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10183,6 +11127,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10231,6 +11179,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10276,6 +11228,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10321,6 +11277,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10366,6 +11326,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10411,6 +11375,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10453,6 +11421,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10495,6 +11467,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10536,6 +11512,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10577,6 +11557,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10618,6 +11602,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10659,6 +11647,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10700,6 +11692,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10741,6 +11737,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10782,6 +11782,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10823,6 +11827,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10864,6 +11872,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10905,6 +11917,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10946,6 +11962,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -10995,6 +12015,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11041,6 +12065,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11089,6 +12117,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11134,6 +12166,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11176,6 +12212,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11217,6 +12257,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11258,6 +12302,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11299,6 +12347,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11341,6 +12393,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11383,6 +12439,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11425,6 +12485,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11467,6 +12531,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11509,6 +12577,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11551,6 +12623,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11593,6 +12669,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11635,6 +12715,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11677,6 +12761,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11719,6 +12807,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11760,6 +12852,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11801,6 +12897,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11843,6 +12943,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11885,6 +12989,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11927,6 +13035,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -11969,6 +13081,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12010,6 +13126,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12051,6 +13171,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12092,6 +13216,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12133,6 +13261,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12174,6 +13306,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12215,6 +13351,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12256,6 +13396,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12297,6 +13441,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12338,6 +13486,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12379,6 +13531,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12420,6 +13576,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12461,6 +13621,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12502,6 +13666,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12543,6 +13711,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12584,6 +13756,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12625,6 +13801,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12666,6 +13846,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12707,6 +13891,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12748,6 +13936,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12789,6 +13981,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12830,6 +14026,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12871,6 +14071,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12912,6 +14116,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12953,6 +14161,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -12994,6 +14206,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13039,6 +14255,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13084,6 +14304,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13129,6 +14353,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13174,6 +14402,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13216,6 +14448,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13257,6 +14493,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13299,6 +14539,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13340,6 +14584,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13381,6 +14629,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13422,6 +14674,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13463,6 +14719,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13504,6 +14764,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13545,6 +14809,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13594,6 +14862,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13640,6 +14912,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13681,6 +14957,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13722,6 +15002,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13763,6 +15047,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13804,6 +15092,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13845,6 +15137,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13887,6 +15183,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13927,6 +15227,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -13968,6 +15272,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14009,6 +15317,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14050,6 +15362,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14091,6 +15407,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14132,6 +15452,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14173,6 +15497,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14214,6 +15542,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14255,6 +15587,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14296,6 +15632,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14338,6 +15678,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14378,6 +15722,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14419,6 +15767,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14460,6 +15812,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14501,6 +15857,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14542,6 +15902,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14583,6 +15947,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14624,6 +15992,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14665,6 +16037,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14706,6 +16082,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14747,6 +16127,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14788,6 +16172,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14829,6 +16217,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14870,6 +16262,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14911,6 +16307,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14952,6 +16352,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -14993,6 +16397,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15034,6 +16442,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15075,6 +16487,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15136,6 +16552,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15177,6 +16597,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15222,6 +16646,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15263,6 +16691,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15308,6 +16740,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15349,6 +16785,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15390,6 +16830,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15432,6 +16876,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15473,6 +16921,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15514,6 +16966,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15558,6 +17014,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15603,6 +17063,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15651,6 +17115,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15696,6 +17164,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15737,6 +17209,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15781,6 +17257,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15822,6 +17302,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15866,6 +17350,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15907,6 +17395,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15951,6 +17443,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -15995,6 +17491,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16043,6 +17543,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16088,6 +17592,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16132,6 +17640,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16173,6 +17685,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16217,6 +17733,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16265,6 +17785,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16309,6 +17833,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16353,6 +17881,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16397,6 +17929,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16439,6 +17975,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16489,6 +18029,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16536,6 +18080,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16577,6 +18125,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16618,6 +18170,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16663,6 +18219,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16704,6 +18264,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16749,6 +18313,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16790,6 +18358,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16831,6 +18403,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16872,6 +18448,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16916,6 +18496,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -16960,6 +18544,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17009,6 +18597,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17057,6 +18649,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17101,6 +18697,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17142,6 +18742,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17183,6 +18787,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17224,6 +18832,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17265,6 +18877,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17306,6 +18922,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17347,6 +18967,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17388,6 +19012,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17429,6 +19057,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17471,6 +19103,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17512,6 +19148,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17551,6 +19191,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17592,6 +19236,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17633,6 +19281,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17674,6 +19326,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17715,6 +19371,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17756,6 +19416,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17797,6 +19461,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17838,6 +19506,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17879,6 +19551,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17920,6 +19596,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -17965,6 +19645,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18010,6 +19694,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18058,6 +19746,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18103,6 +19795,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18145,6 +19841,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18187,6 +19887,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18228,6 +19932,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18269,6 +19977,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18310,6 +20022,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18351,6 +20067,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18392,6 +20112,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18441,6 +20165,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18487,6 +20215,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18535,6 +20267,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18580,6 +20316,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18622,6 +20362,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18663,6 +20407,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18704,6 +20452,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18745,6 +20497,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18786,6 +20542,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18828,6 +20588,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18870,6 +20634,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18912,6 +20680,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18953,6 +20725,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -18994,6 +20770,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -19036,6 +20816,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -19077,6 +20861,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -19118,6 +20906,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -19159,6 +20951,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -19200,6 +20996,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -19241,6 +21041,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -19282,6 +21086,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -19323,6 +21131,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -19368,6 +21180,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -19410,6 +21226,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -19451,6 +21271,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -19493,6 +21317,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -19534,6 +21362,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -19575,6 +21407,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -19616,6 +21452,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -19665,6 +21505,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -19711,6 +21555,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -19752,6 +21600,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -19793,6 +21645,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -19835,6 +21691,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -19875,6 +21735,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -19916,6 +21780,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -19957,6 +21825,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -19998,6 +21870,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -20039,6 +21915,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -20080,6 +21960,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -20121,6 +22005,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -20163,6 +22051,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -20203,6 +22095,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -20244,6 +22140,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -20285,6 +22185,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -20326,6 +22230,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -20367,6 +22275,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -20408,6 +22320,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -20449,6 +22365,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -20490,6 +22410,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
@@ -20552,6 +22476,10 @@ buckets {
         key: "luci.buildbucket.use_bbagent"
         value: 100
       }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 5
+      }
       experiments {
         key: "luci.use_realms"
         value: 100
diff --git a/main.star b/main.star
index 08ee1ed96949..b08565a7ae8a 100755
--- a/main.star
+++ b/main.star
@@ -23,6 +23,7 @@ luci.builder.defaults.experiments.set({
     # Launch 100% of Swarming tasks in "realms-aware mode", crbug.com/1170330.
     "luci.use_realms": 100,
     "luci.buildbucket.use_bbagent": 100,
+    "luci.recipes.use_python3": 5,
 })
 
 DART_GIT = "https://dart.googlesource.com/sdk"

From 3ec8e5c5cc4b29b438130ffddd11642a538af630 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Mon, 15 Nov 2021 16:06:42 +0000
Subject: [PATCH 501/826] [infra] Enable dart.use_update_scripts experiment on
 four builders

The new result update scripts, that write to the staging Firestore
database, are behind a buildbucket experiment flag in the recipes.

Enable them on the builders (and try builders)
      analyzer-win-release
      pkg-win-release
      pkg-mac-release-arm64
      vm-kernel-checked-linux-release-x64

Later, they will be enabled on all builders, and switched to write
to the production Firestore database.

Bug: b/205520378
Change-Id: I46bbd30cba3bb5001385f87748a8f4a81477317e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/220181
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 68 ++++++++++++++++++++++++++++++++++++++++++++++
 main.star          | 13 ++++++++-
 2 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 0468816f15ef..8b8e03523f1b 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -2630,6 +2630,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.buildbucket.use_bbagent"
         value: 100
@@ -2675,6 +2679,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.buildbucket.use_bbagent"
         value: 100
@@ -2720,6 +2728,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.buildbucket.use_bbagent"
         value: 100
@@ -2765,6 +2777,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.buildbucket.use_bbagent"
         value: 100
@@ -7829,6 +7845,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.buildbucket.use_bbagent"
         value: 100
@@ -8033,6 +8053,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.buildbucket.use_bbagent"
         value: 100
@@ -8081,6 +8105,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.buildbucket.use_bbagent"
         value: 100
@@ -8129,6 +8157,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.buildbucket.use_bbagent"
         value: 100
@@ -8177,6 +8209,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.buildbucket.use_bbagent"
         value: 100
@@ -9574,6 +9610,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.buildbucket.use_bbagent"
         value: 100
@@ -9619,6 +9659,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.buildbucket.use_bbagent"
         value: 100
@@ -9664,6 +9708,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.buildbucket.use_bbagent"
         value: 100
@@ -9709,6 +9757,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.buildbucket.use_bbagent"
         value: 100
@@ -16826,6 +16878,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.buildbucket.use_bbagent"
         value: 100
@@ -18593,6 +18649,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.buildbucket.use_bbagent"
         value: 100
@@ -18693,6 +18753,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.buildbucket.use_bbagent"
         value: 100
@@ -19144,6 +19208,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.buildbucket.use_bbagent"
         value: 100
diff --git a/main.star b/main.star
index b08565a7ae8a..0f0eb779a302 100755
--- a/main.star
+++ b/main.star
@@ -564,6 +564,7 @@ def dart_try_builder(
         dimensions = None,
         execution_timeout = None,
         experiment_percentage = None,
+        experiments = None,
         goma = None,
         location_regexp = None,
         properties = None,
@@ -577,6 +578,7 @@ def dart_try_builder(
         dimensions: Extra swarming dimensions required by this builder.
         execution_timeout: Time to allow for the build to run.
         experiment_percentage: What experiment percentage to use.
+        experiments: Experiments to run on this builder, with percentages.
         goma: Whether to use goma or not.
         location_regexp: Locations that trigger this tryjob.
         properties: Extra properties to set for builds.
@@ -597,6 +599,7 @@ def dart_try_builder(
         dimensions = dimensions,
         executable = dart_recipe(recipe),
         execution_timeout = execution_timeout,
+        experiments = experiments,
         priority = HIGH,
         properties = builder_properties,
         service_account = TRY_ACCOUNT,
@@ -638,6 +641,7 @@ def dart_builder(
         executable = None,
         execution_timeout = None,
         experimental = None,
+        experiments = None,
         expiration_timeout = None,
         goma = None,
         fyi = False,
@@ -665,7 +669,8 @@ def dart_builder(
         dimensions: Extra swarming dimensions required by this builder.
         executable: The Luci executable to use.
         execution_timeout: Time to allow for the build to run.
-        experimental: Wether the build is experimental or not.
+        experimental: Whether the build is experimental or not.
+        experiments: Experiments to run on this builder, with percentages.
         expiration_timeout: How long builds should wait for a bot to run on.
         goma: Whether to use goma or not.
         fyi: Whether this is an FYI builder or not.
@@ -705,6 +710,7 @@ def dart_builder(
                 on_cq = on_cq,
                 execution_timeout = execution_timeout,
                 experiment_percentage = experiment_percentage,
+                experiments = experiments,
                 goma = goma,
                 location_regexp = location_regexp,
             )
@@ -739,6 +745,7 @@ def dart_builder(
                 executable = executable or dart_recipe(recipe),
                 execution_timeout = execution_timeout,
                 experimental = experimental,
+                experiments = experiments,
                 expiration_timeout = expiration_timeout,
                 priority = priority,
                 properties = builder_properties,
@@ -1128,6 +1135,7 @@ dart_ci_sandbox_builder(
 dart_vm_extra_builder(
     "vm-kernel-checked-linux-release-x64",
     category = "vm|kernel|rc",
+    experiments = {"dart.use_update_script": 100},
 )
 dart_vm_nightly_builder(
     "vm-kernel-linux-debug-ia32",
@@ -1410,12 +1418,14 @@ dart_ci_sandbox_builder(
     channels = ["try"],
     dimensions = mac(cpu = "arm64"),
     properties = union(CHROME, NO_ANDROID),
+    experiments = {"dart.use_update_script": 100},
 )
 dart_ci_sandbox_builder(
     "pkg-win-release",
     category = "pkg|w",
     dimensions = windows(),
     properties = CHROME,
+    experiments = {"dart.use_update_script": 100},
 )
 dart_ci_sandbox_builder(
     "pkg-linux-debug",
@@ -1529,6 +1539,7 @@ dart_ci_sandbox_builder(
     category = "analyzer|w",
     channels = CHANNELS,
     dimensions = windows(),
+    experiments = {"dart.use_update_script": 100},
 )
 
 # analyzer|nnbd

From 7ea7c3fda555fcbc45416c95b968be56b55aa4e8 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 17 Nov 2021 10:00:02 +0000
Subject: [PATCH 502/826] [infra] Roll back python3 on regular, but ramp up on
 infra builders.

* There is a known issue for tests that log `\x85` characters.
* No known issues for infra builders.

Change-Id: I283ddc566d63d507522c3a57e1607192ef7f07f5
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/220540
Reviewed-by: Jonas Jensen <jonasfj@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 964 ++++++++++++++++++++++-----------------------
 main.star          |   5 +-
 2 files changed, 485 insertions(+), 484 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 8b8e03523f1b..027886a79b0e 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -55,7 +55,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -99,7 +99,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -142,7 +142,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -185,7 +185,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -228,7 +228,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -275,7 +275,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -322,7 +322,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -365,7 +365,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -409,7 +409,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -453,7 +453,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -497,7 +497,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -541,7 +541,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -588,7 +588,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -638,7 +638,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -688,7 +688,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -738,7 +738,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -788,7 +788,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -835,7 +835,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -882,7 +882,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -929,7 +929,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -972,7 +972,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -1015,7 +1015,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -1058,7 +1058,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -1101,7 +1101,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -1144,7 +1144,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -1187,7 +1187,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -1230,7 +1230,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -1273,7 +1273,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -1316,7 +1316,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -1360,7 +1360,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -1432,7 +1432,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -1528,7 +1528,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -1578,7 +1578,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -1630,7 +1630,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -1676,7 +1676,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -1741,7 +1741,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -1806,7 +1806,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -1851,7 +1851,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -1896,7 +1896,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -1941,7 +1941,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -1986,7 +1986,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -2031,7 +2031,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -2076,7 +2076,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -2121,7 +2121,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -2170,7 +2170,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -2219,7 +2219,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -2268,7 +2268,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -2317,7 +2317,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -2362,7 +2362,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -2407,7 +2407,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -2452,7 +2452,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -2497,7 +2497,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -2546,7 +2546,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -2591,7 +2591,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -2640,7 +2640,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -2689,7 +2689,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -2738,7 +2738,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -2787,7 +2787,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -2833,7 +2833,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -2879,7 +2879,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -2925,7 +2925,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -2971,7 +2971,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -3016,7 +3016,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -3061,7 +3061,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -3106,7 +3106,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -3151,7 +3151,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -3196,7 +3196,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -3242,7 +3242,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -3288,7 +3288,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -3334,7 +3334,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -3382,7 +3382,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -3430,7 +3430,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -3478,7 +3478,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -3526,7 +3526,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -3571,7 +3571,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -3616,7 +3616,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -3661,7 +3661,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -3706,7 +3706,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -3754,7 +3754,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -3802,7 +3802,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -3850,7 +3850,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -3898,7 +3898,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -3943,7 +3943,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -3988,7 +3988,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -4033,7 +4033,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -4078,7 +4078,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -4126,7 +4126,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -4174,7 +4174,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -4222,7 +4222,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -4270,7 +4270,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -4318,7 +4318,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -4366,7 +4366,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -4414,7 +4414,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -4462,7 +4462,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -4514,7 +4514,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -4566,7 +4566,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -4618,7 +4618,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -4670,7 +4670,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -4719,7 +4719,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -4768,7 +4768,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -4817,7 +4817,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -4866,7 +4866,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -4914,7 +4914,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -4962,7 +4962,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -5010,7 +5010,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -5058,7 +5058,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -5106,7 +5106,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -5151,7 +5151,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -5196,7 +5196,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -5241,7 +5241,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -5286,7 +5286,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -5334,7 +5334,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -5382,7 +5382,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -5430,7 +5430,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -5478,7 +5478,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -5530,7 +5530,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -5582,7 +5582,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -5634,7 +5634,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -5686,7 +5686,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -5734,7 +5734,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -5782,7 +5782,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -5830,7 +5830,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -5878,7 +5878,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -5926,7 +5926,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -5974,7 +5974,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -6022,7 +6022,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -6070,7 +6070,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -6118,7 +6118,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -6164,7 +6164,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -6218,7 +6218,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -6269,7 +6269,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -6314,7 +6314,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -6359,7 +6359,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -6404,7 +6404,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -6449,7 +6449,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -6494,7 +6494,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -6543,7 +6543,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -6592,7 +6592,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -6641,7 +6641,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -6690,7 +6690,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -6735,7 +6735,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -6780,7 +6780,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -6825,7 +6825,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -6870,7 +6870,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -6919,7 +6919,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -6964,7 +6964,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -7009,7 +7009,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -7054,7 +7054,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -7099,7 +7099,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -7144,7 +7144,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -7190,7 +7190,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -7235,7 +7235,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -7280,7 +7280,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -7325,7 +7325,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -7370,7 +7370,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -7415,7 +7415,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -7461,7 +7461,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -7506,7 +7506,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -7554,7 +7554,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -7602,7 +7602,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -7650,7 +7650,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -7698,7 +7698,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -7746,7 +7746,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -7798,7 +7798,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -7855,7 +7855,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -7907,7 +7907,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -7959,7 +7959,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -8011,7 +8011,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -8063,7 +8063,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -8115,7 +8115,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -8167,7 +8167,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -8219,7 +8219,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -8264,7 +8264,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -8309,7 +8309,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -8354,7 +8354,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -8399,7 +8399,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -8444,7 +8444,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -8489,7 +8489,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -8534,7 +8534,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -8579,7 +8579,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -8624,7 +8624,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -8669,7 +8669,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -8714,7 +8714,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -8759,7 +8759,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -8804,7 +8804,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -8849,7 +8849,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -8894,7 +8894,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -8939,7 +8939,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -8984,7 +8984,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -9029,7 +9029,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -9074,7 +9074,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -9119,7 +9119,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -9164,7 +9164,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -9209,7 +9209,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -9254,7 +9254,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -9299,7 +9299,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -9344,7 +9344,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -9389,7 +9389,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -9434,7 +9434,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -9479,7 +9479,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -9525,7 +9525,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -9571,7 +9571,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -9620,7 +9620,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -9669,7 +9669,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -9718,7 +9718,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -9767,7 +9767,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -9810,7 +9810,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -9853,7 +9853,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -9896,7 +9896,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -9939,7 +9939,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -9984,7 +9984,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -10029,7 +10029,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -10074,7 +10074,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -10119,7 +10119,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -10164,7 +10164,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -10209,7 +10209,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -10254,7 +10254,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -10299,7 +10299,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -10344,7 +10344,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -10389,7 +10389,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -10434,7 +10434,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -10479,7 +10479,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -10524,7 +10524,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -10569,7 +10569,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -10614,7 +10614,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -10659,7 +10659,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -10704,7 +10704,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -10749,7 +10749,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -10794,7 +10794,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -10839,7 +10839,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -10884,7 +10884,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -10933,7 +10933,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -10982,7 +10982,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -11031,7 +11031,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -11080,7 +11080,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -11129,7 +11129,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -11181,7 +11181,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -11233,7 +11233,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -11282,7 +11282,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -11331,7 +11331,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -11380,7 +11380,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -11429,7 +11429,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -11475,7 +11475,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -11521,7 +11521,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -11566,7 +11566,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -11611,7 +11611,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -11656,7 +11656,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -11701,7 +11701,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -11746,7 +11746,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -11791,7 +11791,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -11836,7 +11836,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -11881,7 +11881,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -11926,7 +11926,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -11971,7 +11971,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -12016,7 +12016,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -12069,7 +12069,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -12119,7 +12119,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -12171,7 +12171,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -12220,7 +12220,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -12266,7 +12266,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -12311,7 +12311,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -12356,7 +12356,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -12401,7 +12401,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -12447,7 +12447,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -12493,7 +12493,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -12539,7 +12539,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -12585,7 +12585,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -12631,7 +12631,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -12677,7 +12677,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -12723,7 +12723,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -12769,7 +12769,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -12815,7 +12815,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -12861,7 +12861,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -12906,7 +12906,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -12951,7 +12951,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -12997,7 +12997,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -13043,7 +13043,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -13089,7 +13089,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -13135,7 +13135,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -13180,7 +13180,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -13225,7 +13225,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -13270,7 +13270,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -13315,7 +13315,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -13360,7 +13360,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -13405,7 +13405,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -13450,7 +13450,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -13495,7 +13495,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -13540,7 +13540,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -13585,7 +13585,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -13630,7 +13630,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -13675,7 +13675,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -13720,7 +13720,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -13765,7 +13765,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -13810,7 +13810,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -13855,7 +13855,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -13900,7 +13900,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -13945,7 +13945,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -13990,7 +13990,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -14035,7 +14035,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -14080,7 +14080,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -14125,7 +14125,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -14170,7 +14170,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -14215,7 +14215,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -14260,7 +14260,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -14309,7 +14309,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -14358,7 +14358,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -14407,7 +14407,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -14456,7 +14456,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -14502,7 +14502,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -14547,7 +14547,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -14593,7 +14593,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -14638,7 +14638,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -14683,7 +14683,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -14728,7 +14728,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -14773,7 +14773,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -14818,7 +14818,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -14863,7 +14863,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -14916,7 +14916,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -14966,7 +14966,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -15011,7 +15011,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -15056,7 +15056,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -15101,7 +15101,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -15146,7 +15146,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -15191,7 +15191,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -15237,7 +15237,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -15281,7 +15281,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -15326,7 +15326,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -15371,7 +15371,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -15416,7 +15416,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -15461,7 +15461,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -15506,7 +15506,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -15551,7 +15551,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -15596,7 +15596,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -15641,7 +15641,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -15686,7 +15686,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -15732,7 +15732,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -15776,7 +15776,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -15821,7 +15821,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -15866,7 +15866,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -15911,7 +15911,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -15956,7 +15956,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -16001,7 +16001,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -16046,7 +16046,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -16091,7 +16091,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -16136,7 +16136,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -16181,7 +16181,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -16226,7 +16226,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -16271,7 +16271,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -16316,7 +16316,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -16361,7 +16361,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -16406,7 +16406,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -16451,7 +16451,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -16496,7 +16496,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -16541,7 +16541,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -16606,7 +16606,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -16651,7 +16651,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -16700,7 +16700,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -16745,7 +16745,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -16794,7 +16794,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -16839,7 +16839,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -16888,7 +16888,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -16934,7 +16934,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -16979,7 +16979,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -17024,7 +17024,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -17072,7 +17072,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -17121,7 +17121,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -17173,7 +17173,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -17222,7 +17222,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -17267,7 +17267,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -17315,7 +17315,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -17360,7 +17360,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -17408,7 +17408,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -17453,7 +17453,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -17501,7 +17501,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -17549,7 +17549,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -17601,7 +17601,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -17650,7 +17650,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -17698,7 +17698,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -17743,7 +17743,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -17791,7 +17791,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -17843,7 +17843,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -17891,7 +17891,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -17939,7 +17939,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -17987,7 +17987,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -18033,7 +18033,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -18087,7 +18087,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -18138,7 +18138,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -18183,7 +18183,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -18228,7 +18228,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -18277,7 +18277,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -18322,7 +18322,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -18371,7 +18371,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -18416,7 +18416,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -18461,7 +18461,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -18506,7 +18506,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -18554,7 +18554,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -18602,7 +18602,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -18659,7 +18659,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -18711,7 +18711,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -18763,7 +18763,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -18808,7 +18808,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -18853,7 +18853,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -18898,7 +18898,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -18943,7 +18943,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -18988,7 +18988,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -19033,7 +19033,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -19078,7 +19078,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -19123,7 +19123,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -19169,7 +19169,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -19218,7 +19218,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -19261,7 +19261,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -19306,7 +19306,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -19351,7 +19351,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -19396,7 +19396,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -19441,7 +19441,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -19486,7 +19486,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -19531,7 +19531,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -19576,7 +19576,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -19621,7 +19621,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -19666,7 +19666,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -19715,7 +19715,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -19764,7 +19764,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -19816,7 +19816,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -19865,7 +19865,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -19911,7 +19911,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -19957,7 +19957,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -20002,7 +20002,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -20047,7 +20047,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -20092,7 +20092,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -20137,7 +20137,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -20182,7 +20182,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -20235,7 +20235,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -20285,7 +20285,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -20337,7 +20337,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -20386,7 +20386,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -20432,7 +20432,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -20477,7 +20477,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -20522,7 +20522,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -20567,7 +20567,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -20612,7 +20612,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -20658,7 +20658,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -20704,7 +20704,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -20750,7 +20750,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -20795,7 +20795,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -20840,7 +20840,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -20886,7 +20886,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -20931,7 +20931,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -20976,7 +20976,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -21021,7 +21021,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -21066,7 +21066,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -21111,7 +21111,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -21156,7 +21156,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -21201,7 +21201,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -21250,7 +21250,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -21296,7 +21296,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -21341,7 +21341,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -21387,7 +21387,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -21432,7 +21432,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -21477,7 +21477,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -21522,7 +21522,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -21575,7 +21575,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -21625,7 +21625,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -21670,7 +21670,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -21715,7 +21715,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -21761,7 +21761,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -21805,7 +21805,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -21850,7 +21850,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -21895,7 +21895,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -21940,7 +21940,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -21985,7 +21985,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -22030,7 +22030,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -22075,7 +22075,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -22121,7 +22121,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -22165,7 +22165,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -22210,7 +22210,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -22255,7 +22255,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -22300,7 +22300,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -22345,7 +22345,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -22390,7 +22390,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -22435,7 +22435,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -22480,7 +22480,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
@@ -22546,7 +22546,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 5
+        value: 0
       }
       experiments {
         key: "luci.use_realms"
diff --git a/main.star b/main.star
index 0f0eb779a302..ec9653e3a0f0 100755
--- a/main.star
+++ b/main.star
@@ -23,7 +23,7 @@ luci.builder.defaults.experiments.set({
     # Launch 100% of Swarming tasks in "realms-aware mode", crbug.com/1170330.
     "luci.use_realms": 100,
     "luci.buildbucket.use_bbagent": 100,
-    "luci.recipes.use_python3": 5,
+    "luci.recipes.use_python3": 0,
 })
 
 DART_GIT = "https://dart.googlesource.com/sdk"
@@ -805,9 +805,10 @@ def dart_ci_sandbox_builder(name, channels = CHANNELS, **kwargs):
         **kwargs
     )
 
-def dart_infra_builder(name, notifies = "infra", triggered_by = None, **kwargs):
+def dart_infra_builder(name, experiments = {"luci.recipes.use_python3": 100}, notifies = "infra", triggered_by = None, **kwargs):
     dart_ci_builder(
         name,
+        experiments = experiments,
         notifies = notifies,
         triggered_by = triggered_by,
         **kwargs

From 4f61b4ff71b9d9831d9764164063655b7906983e Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 17 Nov 2021 14:39:40 +0000
Subject: [PATCH 503/826] [infra] Ramp-up python3 experiment to 10% on all
 builders

Bug: b/202110580
Change-Id: I1fdec4e7575a56bfa4380d918caa0aea7f7c6499
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/220544
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 932 ++++++++++++++++++++++-----------------------
 main.star          |   2 +-
 2 files changed, 467 insertions(+), 467 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 027886a79b0e..6f3a455689b9 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -409,7 +409,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -453,7 +453,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -497,7 +497,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -541,7 +541,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -588,7 +588,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -638,7 +638,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -688,7 +688,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -738,7 +738,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -788,7 +788,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -835,7 +835,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -882,7 +882,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -929,7 +929,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -972,7 +972,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -1015,7 +1015,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -1058,7 +1058,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -1101,7 +1101,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -1144,7 +1144,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -1187,7 +1187,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -1230,7 +1230,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -1273,7 +1273,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -1806,7 +1806,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -1851,7 +1851,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -1896,7 +1896,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -1941,7 +1941,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -1986,7 +1986,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -2031,7 +2031,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -2076,7 +2076,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -2121,7 +2121,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -2170,7 +2170,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -2219,7 +2219,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -2268,7 +2268,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -2317,7 +2317,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -2362,7 +2362,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -2407,7 +2407,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -2452,7 +2452,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -2497,7 +2497,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -2546,7 +2546,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -2591,7 +2591,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -2640,7 +2640,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -2689,7 +2689,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -2738,7 +2738,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -2787,7 +2787,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -2833,7 +2833,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -2879,7 +2879,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -2925,7 +2925,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -2971,7 +2971,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -3016,7 +3016,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -3061,7 +3061,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -3106,7 +3106,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -3151,7 +3151,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -3196,7 +3196,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -3242,7 +3242,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -3288,7 +3288,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -3334,7 +3334,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -3382,7 +3382,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -3430,7 +3430,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -3478,7 +3478,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -3526,7 +3526,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -3571,7 +3571,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -3616,7 +3616,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -3661,7 +3661,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -3706,7 +3706,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -3754,7 +3754,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -3802,7 +3802,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -3850,7 +3850,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -3898,7 +3898,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -3943,7 +3943,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -3988,7 +3988,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -4033,7 +4033,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -4078,7 +4078,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -4126,7 +4126,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -4174,7 +4174,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -4222,7 +4222,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -4270,7 +4270,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -4318,7 +4318,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -4366,7 +4366,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -4414,7 +4414,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -4462,7 +4462,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -4514,7 +4514,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -4566,7 +4566,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -4618,7 +4618,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -4670,7 +4670,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -4719,7 +4719,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -4768,7 +4768,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -4817,7 +4817,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -4866,7 +4866,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -4914,7 +4914,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -4962,7 +4962,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -5010,7 +5010,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -5058,7 +5058,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -5106,7 +5106,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -5151,7 +5151,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -5196,7 +5196,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -5241,7 +5241,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -5286,7 +5286,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -5334,7 +5334,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -5382,7 +5382,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -5430,7 +5430,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -5478,7 +5478,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -5530,7 +5530,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -5582,7 +5582,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -5634,7 +5634,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -5686,7 +5686,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -5734,7 +5734,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -5782,7 +5782,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -5830,7 +5830,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -5878,7 +5878,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -5926,7 +5926,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -5974,7 +5974,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -6022,7 +6022,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -6070,7 +6070,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -6118,7 +6118,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -6164,7 +6164,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -6218,7 +6218,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -6269,7 +6269,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -6314,7 +6314,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -6359,7 +6359,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -6404,7 +6404,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -6449,7 +6449,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -6494,7 +6494,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -6543,7 +6543,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -6592,7 +6592,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -6641,7 +6641,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -6690,7 +6690,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -6735,7 +6735,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -6780,7 +6780,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -6825,7 +6825,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -6870,7 +6870,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -6919,7 +6919,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -6964,7 +6964,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -7009,7 +7009,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -7054,7 +7054,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -7099,7 +7099,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -7144,7 +7144,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -7190,7 +7190,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -7235,7 +7235,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -7280,7 +7280,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -7325,7 +7325,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -7370,7 +7370,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -7415,7 +7415,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -7461,7 +7461,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -7506,7 +7506,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -7554,7 +7554,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -7602,7 +7602,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -7650,7 +7650,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -7698,7 +7698,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -7746,7 +7746,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -7798,7 +7798,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -7855,7 +7855,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -7907,7 +7907,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -7959,7 +7959,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -8011,7 +8011,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -8063,7 +8063,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -8115,7 +8115,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -8167,7 +8167,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -8219,7 +8219,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -8264,7 +8264,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -8309,7 +8309,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -8354,7 +8354,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -8399,7 +8399,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -8444,7 +8444,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -8489,7 +8489,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -8534,7 +8534,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -8579,7 +8579,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -8624,7 +8624,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -8669,7 +8669,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -8714,7 +8714,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -8759,7 +8759,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -8804,7 +8804,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -8849,7 +8849,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -8894,7 +8894,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -8939,7 +8939,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -8984,7 +8984,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -9029,7 +9029,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -9074,7 +9074,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -9119,7 +9119,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -9164,7 +9164,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -9209,7 +9209,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -9254,7 +9254,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -9299,7 +9299,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -9344,7 +9344,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -9389,7 +9389,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -9434,7 +9434,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -9479,7 +9479,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -9525,7 +9525,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -9571,7 +9571,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -9620,7 +9620,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -9669,7 +9669,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -9718,7 +9718,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -9767,7 +9767,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -9810,7 +9810,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -9853,7 +9853,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -9896,7 +9896,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -9939,7 +9939,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -9984,7 +9984,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -10029,7 +10029,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -10074,7 +10074,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -10119,7 +10119,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -10164,7 +10164,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -10209,7 +10209,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -10254,7 +10254,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -10299,7 +10299,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -10344,7 +10344,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -10389,7 +10389,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -10434,7 +10434,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -10479,7 +10479,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -10524,7 +10524,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -10569,7 +10569,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -10614,7 +10614,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -10659,7 +10659,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -10704,7 +10704,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -10749,7 +10749,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -10794,7 +10794,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -10839,7 +10839,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -10884,7 +10884,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -10933,7 +10933,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -10982,7 +10982,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -11031,7 +11031,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -11080,7 +11080,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -11129,7 +11129,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -11181,7 +11181,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -11233,7 +11233,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -11282,7 +11282,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -11331,7 +11331,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -11380,7 +11380,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -11429,7 +11429,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -11475,7 +11475,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -11521,7 +11521,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -11566,7 +11566,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -11611,7 +11611,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -11656,7 +11656,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -11701,7 +11701,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -11746,7 +11746,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -11791,7 +11791,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -11836,7 +11836,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -11881,7 +11881,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -11926,7 +11926,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -11971,7 +11971,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -12016,7 +12016,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -12069,7 +12069,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -12119,7 +12119,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -12171,7 +12171,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -12220,7 +12220,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -12266,7 +12266,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -12311,7 +12311,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -12356,7 +12356,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -12401,7 +12401,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -12447,7 +12447,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -12493,7 +12493,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -12539,7 +12539,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -12585,7 +12585,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -12631,7 +12631,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -12677,7 +12677,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -12723,7 +12723,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -12769,7 +12769,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -12815,7 +12815,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -12861,7 +12861,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -12906,7 +12906,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -12951,7 +12951,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -12997,7 +12997,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -13043,7 +13043,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -13089,7 +13089,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -13135,7 +13135,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -13180,7 +13180,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -13225,7 +13225,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -13270,7 +13270,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -13315,7 +13315,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -13360,7 +13360,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -13405,7 +13405,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -13450,7 +13450,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -13495,7 +13495,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -13540,7 +13540,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -13585,7 +13585,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -13630,7 +13630,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -13675,7 +13675,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -13720,7 +13720,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -13765,7 +13765,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -13810,7 +13810,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -13855,7 +13855,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -13900,7 +13900,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -13945,7 +13945,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -13990,7 +13990,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -14035,7 +14035,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -14080,7 +14080,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -14125,7 +14125,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -14170,7 +14170,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -14215,7 +14215,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -14260,7 +14260,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -14309,7 +14309,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -14358,7 +14358,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -14407,7 +14407,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -14456,7 +14456,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -14502,7 +14502,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -14547,7 +14547,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -14593,7 +14593,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -14638,7 +14638,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -14683,7 +14683,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -14728,7 +14728,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -14773,7 +14773,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -14818,7 +14818,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -14863,7 +14863,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -14916,7 +14916,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -14966,7 +14966,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -15011,7 +15011,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -15056,7 +15056,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -15101,7 +15101,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -15146,7 +15146,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -15191,7 +15191,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -15237,7 +15237,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -15281,7 +15281,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -15326,7 +15326,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -15371,7 +15371,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -15416,7 +15416,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -15461,7 +15461,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -15506,7 +15506,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -15551,7 +15551,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -15596,7 +15596,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -15641,7 +15641,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -15686,7 +15686,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -15732,7 +15732,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -15776,7 +15776,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -15821,7 +15821,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -15866,7 +15866,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -15911,7 +15911,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -15956,7 +15956,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -16001,7 +16001,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -16046,7 +16046,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -16091,7 +16091,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -16136,7 +16136,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -16181,7 +16181,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -16226,7 +16226,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -16271,7 +16271,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -16316,7 +16316,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -16361,7 +16361,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -16406,7 +16406,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -16451,7 +16451,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -16496,7 +16496,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -16541,7 +16541,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -16606,7 +16606,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -16651,7 +16651,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -16700,7 +16700,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -16745,7 +16745,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -16794,7 +16794,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -16839,7 +16839,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -16888,7 +16888,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -16934,7 +16934,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -16979,7 +16979,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -17024,7 +17024,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -17072,7 +17072,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -17121,7 +17121,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -17173,7 +17173,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -17222,7 +17222,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -17267,7 +17267,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -17315,7 +17315,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -17360,7 +17360,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -17408,7 +17408,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -17453,7 +17453,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -17501,7 +17501,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -17549,7 +17549,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -17601,7 +17601,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -17650,7 +17650,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -17698,7 +17698,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -17743,7 +17743,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -17791,7 +17791,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -17843,7 +17843,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -17891,7 +17891,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -17939,7 +17939,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -17987,7 +17987,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -18033,7 +18033,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -18087,7 +18087,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -18138,7 +18138,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -18183,7 +18183,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -18228,7 +18228,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -18277,7 +18277,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -18322,7 +18322,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -18371,7 +18371,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -18416,7 +18416,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -18461,7 +18461,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -18506,7 +18506,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -18554,7 +18554,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -18602,7 +18602,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -18659,7 +18659,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -18711,7 +18711,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -18763,7 +18763,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -18808,7 +18808,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -18853,7 +18853,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -18898,7 +18898,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -18943,7 +18943,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -18988,7 +18988,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -19033,7 +19033,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -19078,7 +19078,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -19123,7 +19123,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -19169,7 +19169,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -19218,7 +19218,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -19261,7 +19261,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -19306,7 +19306,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -19351,7 +19351,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -19396,7 +19396,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -19441,7 +19441,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -19486,7 +19486,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -19531,7 +19531,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -19576,7 +19576,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -19621,7 +19621,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -19666,7 +19666,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -19715,7 +19715,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -19764,7 +19764,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -19816,7 +19816,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -19865,7 +19865,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -19911,7 +19911,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -19957,7 +19957,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -20002,7 +20002,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -20047,7 +20047,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -20092,7 +20092,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -20137,7 +20137,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -20182,7 +20182,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -20235,7 +20235,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -20285,7 +20285,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -20337,7 +20337,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -20386,7 +20386,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -20432,7 +20432,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -20477,7 +20477,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -20522,7 +20522,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -20567,7 +20567,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -20612,7 +20612,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -20658,7 +20658,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -20704,7 +20704,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -20750,7 +20750,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -20795,7 +20795,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -20840,7 +20840,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -20886,7 +20886,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -20931,7 +20931,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -20976,7 +20976,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -21021,7 +21021,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -21066,7 +21066,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -21111,7 +21111,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -21156,7 +21156,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -21201,7 +21201,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -21250,7 +21250,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -21296,7 +21296,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -21341,7 +21341,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -21387,7 +21387,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -21432,7 +21432,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -21477,7 +21477,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -21522,7 +21522,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -21575,7 +21575,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -21625,7 +21625,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -21670,7 +21670,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -21715,7 +21715,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -21761,7 +21761,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -21805,7 +21805,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -21850,7 +21850,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -21895,7 +21895,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -21940,7 +21940,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -21985,7 +21985,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -22030,7 +22030,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -22075,7 +22075,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -22121,7 +22121,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -22165,7 +22165,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -22210,7 +22210,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -22255,7 +22255,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -22300,7 +22300,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -22345,7 +22345,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -22390,7 +22390,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -22435,7 +22435,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -22480,7 +22480,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
@@ -22546,7 +22546,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 0
+        value: 10
       }
       experiments {
         key: "luci.use_realms"
diff --git a/main.star b/main.star
index ec9653e3a0f0..7aec8d7def6b 100755
--- a/main.star
+++ b/main.star
@@ -23,7 +23,7 @@ luci.builder.defaults.experiments.set({
     # Launch 100% of Swarming tasks in "realms-aware mode", crbug.com/1170330.
     "luci.use_realms": 100,
     "luci.buildbucket.use_bbagent": 100,
-    "luci.recipes.use_python3": 0,
+    "luci.recipes.use_python3": 10,
 })
 
 DART_GIT = "https://dart.googlesource.com/sdk"

From 2f8db9e7b258465223b9f17b930b626a9c7aace9 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 18 Nov 2021 11:05:26 +0000
Subject: [PATCH 504/826] [infra] Ramp-up python3 builds to 100%

Bug: b/202110580
Change-Id: Id42f682372d7d33a8bf6ea2cec1fb377a1894063
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/220580
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 932 ++++++++++++++++++++++-----------------------
 main.star          |   5 +-
 2 files changed, 468 insertions(+), 469 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 6f3a455689b9..2d45dbf6de06 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -409,7 +409,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -453,7 +453,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -497,7 +497,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -541,7 +541,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -588,7 +588,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -638,7 +638,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -688,7 +688,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -738,7 +738,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -788,7 +788,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -835,7 +835,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -882,7 +882,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -929,7 +929,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -972,7 +972,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -1015,7 +1015,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -1058,7 +1058,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -1101,7 +1101,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -1144,7 +1144,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -1187,7 +1187,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -1230,7 +1230,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -1273,7 +1273,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -1806,7 +1806,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -1851,7 +1851,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -1896,7 +1896,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -1941,7 +1941,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -1986,7 +1986,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -2031,7 +2031,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -2076,7 +2076,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -2121,7 +2121,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -2170,7 +2170,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -2219,7 +2219,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -2268,7 +2268,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -2317,7 +2317,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -2362,7 +2362,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -2407,7 +2407,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -2452,7 +2452,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -2497,7 +2497,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -2546,7 +2546,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -2591,7 +2591,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -2640,7 +2640,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -2689,7 +2689,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -2738,7 +2738,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -2787,7 +2787,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -2833,7 +2833,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -2879,7 +2879,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -2925,7 +2925,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -2971,7 +2971,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -3016,7 +3016,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -3061,7 +3061,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -3106,7 +3106,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -3151,7 +3151,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -3196,7 +3196,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -3242,7 +3242,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -3288,7 +3288,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -3334,7 +3334,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -3382,7 +3382,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -3430,7 +3430,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -3478,7 +3478,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -3526,7 +3526,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -3571,7 +3571,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -3616,7 +3616,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -3661,7 +3661,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -3706,7 +3706,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -3754,7 +3754,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -3802,7 +3802,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -3850,7 +3850,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -3898,7 +3898,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -3943,7 +3943,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -3988,7 +3988,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -4033,7 +4033,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -4078,7 +4078,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -4126,7 +4126,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -4174,7 +4174,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -4222,7 +4222,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -4270,7 +4270,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -4318,7 +4318,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -4366,7 +4366,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -4414,7 +4414,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -4462,7 +4462,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -4514,7 +4514,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -4566,7 +4566,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -4618,7 +4618,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -4670,7 +4670,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -4719,7 +4719,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -4768,7 +4768,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -4817,7 +4817,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -4866,7 +4866,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -4914,7 +4914,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -4962,7 +4962,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -5010,7 +5010,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -5058,7 +5058,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -5106,7 +5106,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -5151,7 +5151,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -5196,7 +5196,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -5241,7 +5241,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -5286,7 +5286,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -5334,7 +5334,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -5382,7 +5382,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -5430,7 +5430,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -5478,7 +5478,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -5530,7 +5530,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -5582,7 +5582,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -5634,7 +5634,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -5686,7 +5686,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -5734,7 +5734,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -5782,7 +5782,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -5830,7 +5830,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -5878,7 +5878,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -5926,7 +5926,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -5974,7 +5974,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -6022,7 +6022,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -6070,7 +6070,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -6118,7 +6118,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -6164,7 +6164,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -6218,7 +6218,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -6269,7 +6269,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -6314,7 +6314,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -6359,7 +6359,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -6404,7 +6404,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -6449,7 +6449,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -6494,7 +6494,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -6543,7 +6543,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -6592,7 +6592,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -6641,7 +6641,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -6690,7 +6690,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -6735,7 +6735,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -6780,7 +6780,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -6825,7 +6825,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -6870,7 +6870,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -6919,7 +6919,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -6964,7 +6964,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -7009,7 +7009,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -7054,7 +7054,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -7099,7 +7099,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -7144,7 +7144,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -7190,7 +7190,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -7235,7 +7235,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -7280,7 +7280,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -7325,7 +7325,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -7370,7 +7370,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -7415,7 +7415,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -7461,7 +7461,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -7506,7 +7506,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -7554,7 +7554,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -7602,7 +7602,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -7650,7 +7650,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -7698,7 +7698,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -7746,7 +7746,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -7798,7 +7798,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -7855,7 +7855,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -7907,7 +7907,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -7959,7 +7959,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -8011,7 +8011,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -8063,7 +8063,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -8115,7 +8115,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -8167,7 +8167,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -8219,7 +8219,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -8264,7 +8264,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -8309,7 +8309,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -8354,7 +8354,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -8399,7 +8399,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -8444,7 +8444,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -8489,7 +8489,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -8534,7 +8534,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -8579,7 +8579,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -8624,7 +8624,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -8669,7 +8669,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -8714,7 +8714,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -8759,7 +8759,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -8804,7 +8804,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -8849,7 +8849,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -8894,7 +8894,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -8939,7 +8939,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -8984,7 +8984,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -9029,7 +9029,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -9074,7 +9074,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -9119,7 +9119,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -9164,7 +9164,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -9209,7 +9209,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -9254,7 +9254,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -9299,7 +9299,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -9344,7 +9344,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -9389,7 +9389,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -9434,7 +9434,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -9479,7 +9479,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -9525,7 +9525,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -9571,7 +9571,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -9620,7 +9620,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -9669,7 +9669,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -9718,7 +9718,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -9767,7 +9767,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -9810,7 +9810,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -9853,7 +9853,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -9896,7 +9896,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -9939,7 +9939,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -9984,7 +9984,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -10029,7 +10029,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -10074,7 +10074,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -10119,7 +10119,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -10164,7 +10164,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -10209,7 +10209,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -10254,7 +10254,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -10299,7 +10299,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -10344,7 +10344,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -10389,7 +10389,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -10434,7 +10434,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -10479,7 +10479,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -10524,7 +10524,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -10569,7 +10569,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -10614,7 +10614,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -10659,7 +10659,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -10704,7 +10704,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -10749,7 +10749,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -10794,7 +10794,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -10839,7 +10839,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -10884,7 +10884,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -10933,7 +10933,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -10982,7 +10982,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -11031,7 +11031,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -11080,7 +11080,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -11129,7 +11129,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -11181,7 +11181,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -11233,7 +11233,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -11282,7 +11282,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -11331,7 +11331,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -11380,7 +11380,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -11429,7 +11429,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -11475,7 +11475,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -11521,7 +11521,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -11566,7 +11566,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -11611,7 +11611,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -11656,7 +11656,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -11701,7 +11701,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -11746,7 +11746,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -11791,7 +11791,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -11836,7 +11836,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -11881,7 +11881,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -11926,7 +11926,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -11971,7 +11971,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -12016,7 +12016,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -12069,7 +12069,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -12119,7 +12119,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -12171,7 +12171,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -12220,7 +12220,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -12266,7 +12266,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -12311,7 +12311,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -12356,7 +12356,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -12401,7 +12401,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -12447,7 +12447,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -12493,7 +12493,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -12539,7 +12539,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -12585,7 +12585,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -12631,7 +12631,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -12677,7 +12677,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -12723,7 +12723,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -12769,7 +12769,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -12815,7 +12815,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -12861,7 +12861,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -12906,7 +12906,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -12951,7 +12951,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -12997,7 +12997,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -13043,7 +13043,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -13089,7 +13089,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -13135,7 +13135,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -13180,7 +13180,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -13225,7 +13225,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -13270,7 +13270,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -13315,7 +13315,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -13360,7 +13360,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -13405,7 +13405,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -13450,7 +13450,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -13495,7 +13495,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -13540,7 +13540,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -13585,7 +13585,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -13630,7 +13630,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -13675,7 +13675,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -13720,7 +13720,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -13765,7 +13765,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -13810,7 +13810,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -13855,7 +13855,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -13900,7 +13900,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -13945,7 +13945,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -13990,7 +13990,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -14035,7 +14035,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -14080,7 +14080,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -14125,7 +14125,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -14170,7 +14170,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -14215,7 +14215,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -14260,7 +14260,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -14309,7 +14309,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -14358,7 +14358,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -14407,7 +14407,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -14456,7 +14456,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -14502,7 +14502,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -14547,7 +14547,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -14593,7 +14593,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -14638,7 +14638,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -14683,7 +14683,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -14728,7 +14728,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -14773,7 +14773,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -14818,7 +14818,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -14863,7 +14863,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -14916,7 +14916,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -14966,7 +14966,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -15011,7 +15011,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -15056,7 +15056,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -15101,7 +15101,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -15146,7 +15146,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -15191,7 +15191,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -15237,7 +15237,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -15281,7 +15281,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -15326,7 +15326,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -15371,7 +15371,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -15416,7 +15416,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -15461,7 +15461,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -15506,7 +15506,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -15551,7 +15551,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -15596,7 +15596,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -15641,7 +15641,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -15686,7 +15686,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -15732,7 +15732,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -15776,7 +15776,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -15821,7 +15821,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -15866,7 +15866,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -15911,7 +15911,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -15956,7 +15956,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -16001,7 +16001,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -16046,7 +16046,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -16091,7 +16091,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -16136,7 +16136,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -16181,7 +16181,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -16226,7 +16226,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -16271,7 +16271,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -16316,7 +16316,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -16361,7 +16361,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -16406,7 +16406,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -16451,7 +16451,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -16496,7 +16496,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -16541,7 +16541,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -16606,7 +16606,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -16651,7 +16651,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -16700,7 +16700,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -16745,7 +16745,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -16794,7 +16794,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -16839,7 +16839,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -16888,7 +16888,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -16934,7 +16934,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -16979,7 +16979,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -17024,7 +17024,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -17072,7 +17072,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -17121,7 +17121,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -17173,7 +17173,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -17222,7 +17222,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -17267,7 +17267,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -17315,7 +17315,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -17360,7 +17360,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -17408,7 +17408,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -17453,7 +17453,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -17501,7 +17501,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -17549,7 +17549,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -17601,7 +17601,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -17650,7 +17650,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -17698,7 +17698,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -17743,7 +17743,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -17791,7 +17791,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -17843,7 +17843,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -17891,7 +17891,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -17939,7 +17939,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -17987,7 +17987,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -18033,7 +18033,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -18087,7 +18087,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -18138,7 +18138,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -18183,7 +18183,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -18228,7 +18228,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -18277,7 +18277,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -18322,7 +18322,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -18371,7 +18371,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -18416,7 +18416,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -18461,7 +18461,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -18506,7 +18506,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -18554,7 +18554,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -18602,7 +18602,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -18659,7 +18659,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -18711,7 +18711,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -18763,7 +18763,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -18808,7 +18808,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -18853,7 +18853,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -18898,7 +18898,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -18943,7 +18943,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -18988,7 +18988,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -19033,7 +19033,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -19078,7 +19078,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -19123,7 +19123,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -19169,7 +19169,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -19218,7 +19218,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -19261,7 +19261,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -19306,7 +19306,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -19351,7 +19351,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -19396,7 +19396,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -19441,7 +19441,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -19486,7 +19486,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -19531,7 +19531,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -19576,7 +19576,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -19621,7 +19621,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -19666,7 +19666,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -19715,7 +19715,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -19764,7 +19764,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -19816,7 +19816,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -19865,7 +19865,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -19911,7 +19911,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -19957,7 +19957,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -20002,7 +20002,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -20047,7 +20047,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -20092,7 +20092,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -20137,7 +20137,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -20182,7 +20182,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -20235,7 +20235,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -20285,7 +20285,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -20337,7 +20337,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -20386,7 +20386,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -20432,7 +20432,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -20477,7 +20477,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -20522,7 +20522,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -20567,7 +20567,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -20612,7 +20612,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -20658,7 +20658,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -20704,7 +20704,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -20750,7 +20750,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -20795,7 +20795,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -20840,7 +20840,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -20886,7 +20886,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -20931,7 +20931,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -20976,7 +20976,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -21021,7 +21021,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -21066,7 +21066,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -21111,7 +21111,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -21156,7 +21156,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -21201,7 +21201,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -21250,7 +21250,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -21296,7 +21296,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -21341,7 +21341,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -21387,7 +21387,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -21432,7 +21432,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -21477,7 +21477,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -21522,7 +21522,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -21575,7 +21575,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -21625,7 +21625,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -21670,7 +21670,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -21715,7 +21715,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -21761,7 +21761,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -21805,7 +21805,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -21850,7 +21850,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -21895,7 +21895,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -21940,7 +21940,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -21985,7 +21985,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -22030,7 +22030,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -22075,7 +22075,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -22121,7 +22121,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -22165,7 +22165,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -22210,7 +22210,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -22255,7 +22255,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -22300,7 +22300,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -22345,7 +22345,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -22390,7 +22390,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -22435,7 +22435,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -22480,7 +22480,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
@@ -22546,7 +22546,7 @@ buckets {
       }
       experiments {
         key: "luci.recipes.use_python3"
-        value: 10
+        value: 100
       }
       experiments {
         key: "luci.use_realms"
diff --git a/main.star b/main.star
index 7aec8d7def6b..7d272009f26a 100755
--- a/main.star
+++ b/main.star
@@ -23,7 +23,7 @@ luci.builder.defaults.experiments.set({
     # Launch 100% of Swarming tasks in "realms-aware mode", crbug.com/1170330.
     "luci.use_realms": 100,
     "luci.buildbucket.use_bbagent": 100,
-    "luci.recipes.use_python3": 10,
+    "luci.recipes.use_python3": 100,
 })
 
 DART_GIT = "https://dart.googlesource.com/sdk"
@@ -805,10 +805,9 @@ def dart_ci_sandbox_builder(name, channels = CHANNELS, **kwargs):
         **kwargs
     )
 
-def dart_infra_builder(name, experiments = {"luci.recipes.use_python3": 100}, notifies = "infra", triggered_by = None, **kwargs):
+def dart_infra_builder(name, notifies = "infra", triggered_by = None, **kwargs):
     dart_ci_builder(
         name,
-        experiments = experiments,
         notifies = notifies,
         triggered_by = triggered_by,
         **kwargs

From bef3cfe582598460d3ad4e53603a0e4a5ea78eb6 Mon Sep 17 00:00:00 2001
From: Oliver Newman <olivernewman@google.com>
Date: Tue, 7 Dec 2021 08:48:06 +0000
Subject: [PATCH 505/826] [infra] Update recipe-deps-roller CIPD package

Includes crrev.com/c/3248361, which adds support for respecting the
"NO_LABELS_APPROVE" trivial code review option. The currently pinned
version of the code doesn't know about that option, so it fails to
deserialize recipes.cfg for fuchsia recipes, resulting in the roller
CC'ing all owners of fuchsia CLs because it doesn't get a chance to read
the `no_cc_authors` field.

Change-Id: I26fa0dca724cbcd779584ae5fccc01f0684b2230
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/222180
Auto-Submit: Oliver Newman <olivernewman@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 4 ++--
 main.star          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 2d45dbf6de06..2439b6bf949d 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1545,7 +1545,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
-        cipd_version: "git_revision:bc0c2fb9082bc82a2d972b5cca8fc17afa55d34e"
+        cipd_version: "git_revision:21e1e6473db300eb5045e4483e8b53d1324cd0d8"
         cmd: "luciexe"
       }
       properties:
@@ -1595,7 +1595,7 @@ buckets {
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
-        cipd_version: "git_revision:bc0c2fb9082bc82a2d972b5cca8fc17afa55d34e"
+        cipd_version: "git_revision:21e1e6473db300eb5045e4483e8b53d1324cd0d8"
         cmd: "luciexe"
       }
       properties:
diff --git a/main.star b/main.star
index 7d272009f26a..9b17330f4d2b 100755
--- a/main.star
+++ b/main.star
@@ -1839,7 +1839,7 @@ def chromium_infra_recipe(name):
         name = name,
         cipd_package =
             "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
-        cipd_version = "git_revision:bc0c2fb9082bc82a2d972b5cca8fc17afa55d34e",
+        cipd_version = "git_revision:21e1e6473db300eb5045e4483e8b53d1324cd0d8",
         use_bbagent = True,
     )
 

From ecd9d79350689f95fb3af1f1926a8dd60715f827 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 16 Dec 2021 09:16:06 +0000
Subject: [PATCH 506/826] [infra] Add dart2js-canary-x64 builder

* Disable android tooling downloads on dart2js builders.
* Remove obsolete experiment flag (caused a warning).
* Raised lucicfg version requirement.

Change-Id: Ic0616f5d616c939711ae6ccbf2ed398a602d93a3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/222305
Reviewed-by: William Hesse <whesse@google.com>
Reviewed-by: Joshua Litt <joshualitt@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg   |  16 +++
 cr-buildbucket.cfg | 336 +++++++++++++++++++++++++++++++++++++++++++++
 luci-milo.cfg      |  28 ++++
 luci-notify.cfg    |  14 ++
 luci-scheduler.cfg |  48 +++++++
 main.star          |  29 ++--
 project.cfg        |   2 +-
 7 files changed, 461 insertions(+), 12 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index d3483c86073c..529349bea062 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -168,6 +168,22 @@ config_groups {
       builders {
         name: "dart/try/dart-sdk-win-try"
       }
+      builders {
+        name: "dart/try/dart2js-canary-x64-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
+        location_regexp: ".+/[+]/utils/compiler/.+"
+        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
+      }
       builders {
         name: "dart/try/dart2js-csp-minified-linux-x64-chrome-try"
         includable_only: true
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 2439b6bf949d..5a15df20a8ad 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -3341,6 +3341,202 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "dart2js-canary-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-canary-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-canary-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-canary-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "dart2js-csp-minified-linux-x64-chrome"
       swarming_host: "chromium-swarm.appspot.com"
@@ -3369,6 +3565,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -3417,6 +3614,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -3465,6 +3663,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -3513,6 +3712,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -3560,6 +3760,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -3605,6 +3808,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -3650,6 +3856,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -3695,6 +3904,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -3741,6 +3953,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -3789,6 +4002,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -3837,6 +4051,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -3885,6 +4100,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -3932,6 +4148,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -3977,6 +4196,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4022,6 +4244,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4067,6 +4292,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4113,6 +4341,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4161,6 +4390,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4209,6 +4439,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4257,6 +4488,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4305,6 +4537,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4353,6 +4586,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4401,6 +4635,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4449,6 +4684,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4497,6 +4733,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4549,6 +4786,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4601,6 +4839,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4653,6 +4892,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4704,6 +4944,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4753,6 +4996,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4802,6 +5048,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4851,6 +5100,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4901,6 +5153,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4949,6 +5202,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4997,6 +5251,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -5045,6 +5300,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -5093,6 +5349,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -5140,6 +5397,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5185,6 +5445,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5230,6 +5493,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5275,6 +5541,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -17274,6 +17543,55 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "dart2js-canary-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "dart2js-csp-minified-linux-x64-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -17302,6 +17620,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -17349,6 +17668,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -17395,6 +17717,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -17442,6 +17765,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -17488,6 +17814,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -17536,6 +17863,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -17584,6 +17912,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -17635,6 +17964,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -17685,6 +18017,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -17732,6 +18065,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 17c8b3dd0a44..9283a6802490 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -510,6 +510,11 @@ consoles {
     category: "pkg"
     short_name: "ld"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64"
+    category: "dart2js"
+    short_name: "c"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
     category: "dart2js|d8"
@@ -789,6 +794,11 @@ consoles {
     category: "pkg"
     short_name: "ld"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64"
+    category: "dart2js"
+    short_name: "c"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
     category: "dart2js|d8"
@@ -1643,6 +1653,11 @@ consoles {
     category: "pkg"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-dev"
+    category: "dart2js"
+    short_name: "c"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-dev"
     category: "dart2js|d8"
@@ -2032,6 +2047,11 @@ consoles {
     category: "pkg"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-beta"
+    category: "dart2js"
+    short_name: "c"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-beta"
     category: "dart2js|d8"
@@ -2421,6 +2441,11 @@ consoles {
     category: "pkg"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-stable"
+    category: "dart2js"
+    short_name: "c"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-stable"
     category: "dart2js|d8"
@@ -2948,6 +2973,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/pkg-linux-debug-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/dart2js-canary-x64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/dart2js-strong-hostasserts-linux-ia32-d8-try"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index a017929d857a..0ab945a5bec4 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -478,6 +478,20 @@ notifiers {
     name: "cross-vm-precomp-linux-release-arm64"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "dart2js-canary-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 4f53afd85b81..1d217b76cb63 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -642,6 +642,50 @@ job {
     builder: "dart-sdk-win-stable"
   }
 }
+job {
+  id: "dart2js-canary-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-canary-x64"
+  }
+}
+job {
+  id: "dart2js-canary-x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-canary-x64-beta"
+  }
+}
+job {
+  id: "dart2js-canary-x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-canary-x64-dev"
+  }
+}
+job {
+  id: "dart2js-canary-x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-canary-x64-stable"
+  }
+}
 job {
   id: "dart2js-csp-minified-linux-x64-chrome"
   realm: "ci.sandbox"
@@ -3938,6 +3982,7 @@ trigger {
   triggers: "analyzer-win-release-beta"
   triggers: "app-kernel-linux-debug-x64-beta"
   triggers: "app-kernel-linux-release-x64-beta"
+  triggers: "dart2js-canary-x64-beta"
   triggers: "dart2js-csp-minified-linux-x64-chrome-beta"
   triggers: "dart2js-minified-strong-linux-x64-d8-beta"
   triggers: "dart2js-nnbd-linux-x64-chrome-beta"
@@ -4013,6 +4058,7 @@ trigger {
   triggers: "analyzer-win-release-dev"
   triggers: "app-kernel-linux-debug-x64-dev"
   triggers: "app-kernel-linux-release-x64-dev"
+  triggers: "dart2js-canary-x64-dev"
   triggers: "dart2js-csp-minified-linux-x64-chrome-dev"
   triggers: "dart2js-minified-strong-linux-x64-d8-dev"
   triggers: "dart2js-nnbd-linux-x64-chrome-dev"
@@ -4099,6 +4145,7 @@ trigger {
   triggers: "analyzer-mac-release"
   triggers: "analyzer-nnbd-linux-release"
   triggers: "analyzer-win-release"
+  triggers: "dart2js-canary-x64"
   triggers: "dart2js-csp-minified-linux-x64-chrome"
   triggers: "dart2js-minified-strong-linux-x64-d8"
   triggers: "dart2js-nnbd-linux-x64-chrome"
@@ -4154,6 +4201,7 @@ trigger {
   triggers: "analyzer-win-release-stable"
   triggers: "app-kernel-linux-debug-x64-stable"
   triggers: "app-kernel-linux-release-x64-stable"
+  triggers: "dart2js-canary-x64-stable"
   triggers: "dart2js-csp-minified-linux-x64-chrome-stable"
   triggers: "dart2js-minified-strong-linux-x64-d8-stable"
   triggers: "dart2js-nnbd-linux-x64-chrome-stable"
diff --git a/main.star b/main.star
index 9b17330f4d2b..f9dfcf6e677e 100755
--- a/main.star
+++ b/main.star
@@ -14,10 +14,7 @@ Generates the Luci configuration for the Dart project.
 
 load("//defaults.star", "defaults")
 
-lucicfg.check_version("1.29.1")
-
-# Enable LUCI Realms support.
-lucicfg.enable_experiment("crbug.com/1085650")
+lucicfg.check_version("1.30.4")
 
 luci.builder.defaults.experiments.set({
     # Launch 100% of Swarming tasks in "realms-aware mode", crbug.com/1170330.
@@ -1435,66 +1432,76 @@ dart_ci_sandbox_builder(
 )
 
 # dart2js
+dart_ci_sandbox_builder(
+    "dart2js-canary-x64",
+    category = "dart2js|c",
+    location_regexp = to_location_regexp(DART2JS_PATHS),
+    properties = union(CHROME, NO_ANDROID),
+)
 dart_ci_sandbox_builder(
     "dart2js-strong-hostasserts-linux-ia32-d8",
     category = "dart2js|d8|ha",
     location_regexp = to_location_regexp(DART2JS_PATHS),
+    properties = NO_ANDROID,
 )
 dart_ci_sandbox_builder(
     "dart2js-minified-strong-linux-x64-d8",
     category = "dart2js|d8|mi",
     location_regexp = to_location_regexp(DART2JS_PATHS),
+    properties = NO_ANDROID,
 )
 dart_ci_sandbox_builder(
     "dart2js-unit-linux-x64-release",
     category = "dart2js|d8|u",
     location_regexp = to_location_regexp(DART2JS_PATHS),
+    properties = NO_ANDROID,
 )
 dart_ci_sandbox_builder(
     "dart2js-strong-linux-x64-chrome",
     category = "dart2js|chrome|l",
     location_regexp = to_location_regexp(DART2JS_PATHS),
-    properties = CHROME,
+    properties = union(CHROME, NO_ANDROID),
 )
 dart_ci_sandbox_builder(
     "dart2js-csp-minified-linux-x64-chrome",
     category = "dart2js|chrome|csp",
-    properties = CHROME,
+    properties = union(CHROME, NO_ANDROID),
 )
 dart_ci_sandbox_builder(
     "dart2js-strong-mac-x64-chrome",
     category = "dart2js|chrome|m",
     dimensions = mac(),
-    properties = CHROME,
+    properties = union(CHROME, NO_ANDROID),
 )
 dart_ci_sandbox_builder(
     "dart2js-strong-win-x64-chrome",
     category = "dart2js|chrome|w",
     dimensions = windows(),
-    properties = CHROME,
+    properties = union(CHROME, NO_ANDROID),
 )
 dart_ci_sandbox_builder(
     "dart2js-nnbd-linux-x64-chrome",
     category = "dart2js|chrome|nn",
     location_regexp = to_location_regexp(DART2JS_PATHS),
-    properties = CHROME,
+    properties = union(CHROME, NO_ANDROID),
 )
 dart_ci_sandbox_builder(
     "dart2js-strong-linux-x64-firefox",
     category = "dart2js|firefox|l",
-    properties = FIREFOX,
+    properties = union(FIREFOX, NO_ANDROID),
 )
 dart_ci_sandbox_builder(
     "dart2js-strong-win-x64-firefox",
     category = "dart2js|firefox|w",
     dimensions = windows(),
     enabled = False,
-    properties = FIREFOX,
+    properties = union(FIREFOX, NO_ANDROID),
 )
 dart_ci_sandbox_builder(
     "dart2js-strong-mac-x64-safari",
     category = "dart2js|safari|m",
     dimensions = mac(),
+    properties = NO_ANDROID,
 )
 
 # analyzer
diff --git a/project.cfg b/project.cfg
index ef40a9e771ff..c67a55441049 100644
--- a/project.cfg
+++ b/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.30.1"
+  version: "1.30.4"
   package_dir: "."
   config_dir: "."
   entry_point: "main.star"

From b9c60ffb3cc211cbec1a6c33134402b4c8a34819 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 16 Dec 2021 10:26:48 +0000
Subject: [PATCH 507/826] Revert "[infra] Add dart2js-canary-x64 builder"

This reverts commit ecd9d79350689f95fb3af1f1926a8dd60715f827.

Reason for revert: Bot is purple on tryjobs.

Original change's description:
> [infra] Add dart2js-canary-x64 builder
>
> * Disable android tooling downloads on dart2js builders.
> * Remove obsolete experiment flag (caused a warning).
> * Raised lucicfg version requirement.
>
> Change-Id: Ic0616f5d616c939711ae6ccbf2ed398a602d93a3
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/222305
> Reviewed-by: William Hesse <whesse@google.com>
> Reviewed-by: Joshua Litt <joshualitt@google.com>
> Commit-Queue: Alexander Thomas <athom@google.com>

TBR=whesse@google.com,athom@google.com,sigmund@google.com,joshualitt@google.com

Change-Id: I11abe3409f9190301cd3a46e5ab771b72d3f38ae
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/224521
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg   |  16 ---
 cr-buildbucket.cfg | 336 ---------------------------------------------
 luci-milo.cfg      |  28 ----
 luci-notify.cfg    |  14 --
 luci-scheduler.cfg |  48 -------
 main.star          |  29 ++--
 project.cfg        |   2 +-
 7 files changed, 12 insertions(+), 461 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 529349bea062..d3483c86073c 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -168,22 +168,6 @@ config_groups {
       builders {
         name: "dart/try/dart-sdk-win-try"
       }
-      builders {
-        name: "dart/try/dart2js-canary-x64-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
-        location_regexp: ".+/[+]/utils/compiler/.+"
-        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
-      }
       builders {
         name: "dart/try/dart2js-csp-minified-linux-x64-chrome-try"
         includable_only: true
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 5a15df20a8ad..2439b6bf949d 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -3341,202 +3341,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "dart2js-canary-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-canary-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-canary-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-canary-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
     builders {
       name: "dart2js-csp-minified-linux-x64-chrome"
       swarming_host: "chromium-swarm.appspot.com"
@@ -3565,7 +3369,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -3614,7 +3417,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -3663,7 +3465,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -3712,7 +3513,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -3760,9 +3560,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -3808,9 +3605,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -3856,9 +3650,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -3904,9 +3695,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -3953,7 +3741,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4002,7 +3789,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4051,7 +3837,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4100,7 +3885,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4148,9 +3932,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4196,9 +3977,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4244,9 +4022,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4292,9 +4067,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4341,7 +4113,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4390,7 +4161,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4439,7 +4209,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4488,7 +4257,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4537,7 +4305,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4586,7 +4353,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4635,7 +4401,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4684,7 +4449,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4733,7 +4497,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4786,7 +4549,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4839,7 +4601,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4892,7 +4653,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4944,9 +4704,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4996,9 +4753,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5048,9 +4802,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5100,9 +4851,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5153,7 +4901,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -5202,7 +4949,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -5251,7 +4997,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -5300,7 +5045,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -5349,7 +5093,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -5397,9 +5140,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5445,9 +5185,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5493,9 +5230,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5541,9 +5275,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -17543,55 +17274,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "dart2js-canary-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
     builders {
       name: "dart2js-csp-minified-linux-x64-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -17620,7 +17302,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -17668,9 +17349,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -17717,7 +17395,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -17765,9 +17442,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -17814,7 +17488,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -17863,7 +17536,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -17912,7 +17584,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -17964,9 +17635,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -18017,7 +17685,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -18065,9 +17732,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 9283a6802490..17c8b3dd0a44 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -510,11 +510,6 @@ consoles {
     category: "pkg"
     short_name: "ld"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64"
-    category: "dart2js"
-    short_name: "c"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
     category: "dart2js|d8"
@@ -794,11 +789,6 @@ consoles {
     category: "pkg"
     short_name: "ld"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64"
-    category: "dart2js"
-    short_name: "c"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
     category: "dart2js|d8"
@@ -1653,11 +1643,6 @@ consoles {
     category: "pkg"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-dev"
-    category: "dart2js"
-    short_name: "c"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-dev"
     category: "dart2js|d8"
@@ -2047,11 +2032,6 @@ consoles {
     category: "pkg"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-beta"
-    category: "dart2js"
-    short_name: "c"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-beta"
     category: "dart2js|d8"
@@ -2441,11 +2421,6 @@ consoles {
     category: "pkg"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-stable"
-    category: "dart2js"
-    short_name: "c"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-stable"
     category: "dart2js|d8"
@@ -2973,9 +2948,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/pkg-linux-debug-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/dart2js-canary-x64-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/dart2js-strong-hostasserts-linux-ia32-d8-try"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 0ab945a5bec4..a017929d857a 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -478,20 +478,6 @@ notifiers {
     name: "cross-vm-precomp-linux-release-arm64"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "dart2js-canary-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 1d217b76cb63..4f53afd85b81 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -642,50 +642,6 @@ job {
     builder: "dart-sdk-win-stable"
   }
 }
-job {
-  id: "dart2js-canary-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-canary-x64"
-  }
-}
-job {
-  id: "dart2js-canary-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-canary-x64-beta"
-  }
-}
-job {
-  id: "dart2js-canary-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-canary-x64-dev"
-  }
-}
-job {
-  id: "dart2js-canary-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-canary-x64-stable"
-  }
-}
 job {
   id: "dart2js-csp-minified-linux-x64-chrome"
   realm: "ci.sandbox"
@@ -3982,7 +3938,6 @@ trigger {
   triggers: "analyzer-win-release-beta"
   triggers: "app-kernel-linux-debug-x64-beta"
   triggers: "app-kernel-linux-release-x64-beta"
-  triggers: "dart2js-canary-x64-beta"
   triggers: "dart2js-csp-minified-linux-x64-chrome-beta"
   triggers: "dart2js-minified-strong-linux-x64-d8-beta"
   triggers: "dart2js-nnbd-linux-x64-chrome-beta"
@@ -4058,7 +4013,6 @@ trigger {
   triggers: "analyzer-win-release-dev"
   triggers: "app-kernel-linux-debug-x64-dev"
   triggers: "app-kernel-linux-release-x64-dev"
-  triggers: "dart2js-canary-x64-dev"
   triggers: "dart2js-csp-minified-linux-x64-chrome-dev"
   triggers: "dart2js-minified-strong-linux-x64-d8-dev"
   triggers: "dart2js-nnbd-linux-x64-chrome-dev"
@@ -4145,7 +4099,6 @@ trigger {
   triggers: "analyzer-mac-release"
   triggers: "analyzer-nnbd-linux-release"
   triggers: "analyzer-win-release"
-  triggers: "dart2js-canary-x64"
   triggers: "dart2js-csp-minified-linux-x64-chrome"
   triggers: "dart2js-minified-strong-linux-x64-d8"
   triggers: "dart2js-nnbd-linux-x64-chrome"
@@ -4201,7 +4154,6 @@ trigger {
   triggers: "analyzer-win-release-stable"
   triggers: "app-kernel-linux-debug-x64-stable"
   triggers: "app-kernel-linux-release-x64-stable"
-  triggers: "dart2js-canary-x64-stable"
   triggers: "dart2js-csp-minified-linux-x64-chrome-stable"
   triggers: "dart2js-minified-strong-linux-x64-d8-stable"
   triggers: "dart2js-nnbd-linux-x64-chrome-stable"
diff --git a/main.star b/main.star
index f9dfcf6e677e..9b17330f4d2b 100755
--- a/main.star
+++ b/main.star
@@ -14,7 +14,10 @@ Generates the Luci configuration for the Dart project.
 
 load("//defaults.star", "defaults")
 
-lucicfg.check_version("1.30.4")
+lucicfg.check_version("1.29.1")
+
+# Enable LUCI Realms support.
+lucicfg.enable_experiment("crbug.com/1085650")
 
 luci.builder.defaults.experiments.set({
     # Launch 100% of Swarming tasks in "realms-aware mode", crbug.com/1170330.
@@ -1432,76 +1435,66 @@ dart_ci_sandbox_builder(
 )
 
 # dart2js
-dart_ci_sandbox_builder(
-    "dart2js-canary-x64",
-    category = "dart2js|c",
-    location_regexp = to_location_regexp(DART2JS_PATHS),
-    properties = union(CHROME, NO_ANDROID),
-)
 dart_ci_sandbox_builder(
     "dart2js-strong-hostasserts-linux-ia32-d8",
     category = "dart2js|d8|ha",
     location_regexp = to_location_regexp(DART2JS_PATHS),
-    properties = NO_ANDROID,
 )
 dart_ci_sandbox_builder(
     "dart2js-minified-strong-linux-x64-d8",
     category = "dart2js|d8|mi",
     location_regexp = to_location_regexp(DART2JS_PATHS),
-    properties = NO_ANDROID,
 )
 dart_ci_sandbox_builder(
     "dart2js-unit-linux-x64-release",
     category = "dart2js|d8|u",
     location_regexp = to_location_regexp(DART2JS_PATHS),
-    properties = NO_ANDROID,
 )
 dart_ci_sandbox_builder(
     "dart2js-strong-linux-x64-chrome",
     category = "dart2js|chrome|l",
     location_regexp = to_location_regexp(DART2JS_PATHS),
-    properties = union(CHROME, NO_ANDROID),
+    properties = CHROME,
 )
 dart_ci_sandbox_builder(
     "dart2js-csp-minified-linux-x64-chrome",
     category = "dart2js|chrome|csp",
-    properties = union(CHROME, NO_ANDROID),
+    properties = CHROME,
 )
 dart_ci_sandbox_builder(
     "dart2js-strong-mac-x64-chrome",
     category = "dart2js|chrome|m",
     dimensions = mac(),
-    properties = union(CHROME, NO_ANDROID),
+    properties = CHROME,
 )
 dart_ci_sandbox_builder(
     "dart2js-strong-win-x64-chrome",
     category = "dart2js|chrome|w",
     dimensions = windows(),
-    properties = union(CHROME, NO_ANDROID),
+    properties = CHROME,
 )
 dart_ci_sandbox_builder(
     "dart2js-nnbd-linux-x64-chrome",
     category = "dart2js|chrome|nn",
     location_regexp = to_location_regexp(DART2JS_PATHS),
-    properties = union(CHROME, NO_ANDROID),
+    properties = CHROME,
 )
 dart_ci_sandbox_builder(
     "dart2js-strong-linux-x64-firefox",
     category = "dart2js|firefox|l",
-    properties = union(FIREFOX, NO_ANDROID),
+    properties = FIREFOX,
 )
 dart_ci_sandbox_builder(
     "dart2js-strong-win-x64-firefox",
     category = "dart2js|firefox|w",
     dimensions = windows(),
     enabled = False,
-    properties = union(FIREFOX, NO_ANDROID),
+    properties = FIREFOX,
 )
 dart_ci_sandbox_builder(
     "dart2js-strong-mac-x64-safari",
     category = "dart2js|safari|m",
     dimensions = mac(),
-    properties = NO_ANDROID,
 )
 
 # analyzer
diff --git a/project.cfg b/project.cfg
index c67a55441049..ef40a9e771ff 100644
--- a/project.cfg
+++ b/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.30.4"
+  version: "1.30.1"
   package_dir: "."
   config_dir: "."
   entry_point: "main.star"

From 5044cfe2aafa88952a47a2121d4c3d98b75ce815 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 16 Dec 2021 11:10:09 +0000
Subject: [PATCH 508/826] [infra] Pin xcode version on all mac bots

Bug: https://github.com/dart-lang/sdk/issues/47948
Change-Id: I3301c38abbf9c8c98651edad183dfbea7cf0b586
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/224522
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 255 +++++++++++++++++++++++++++++++++++++++++++++
 main.star          |  69 +++++++-----
 project.cfg        |   2 +-
 3 files changed, 297 insertions(+), 29 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 2439b6bf949d..c5e4cedee959 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -253,6 +253,9 @@ buckets {
         '  "$dart/build": {'
         '    "disable_goma": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -300,6 +303,9 @@ buckets {
         '  "$dart/build": {'
         '    "disable_goma": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -566,6 +572,9 @@ buckets {
         '  "$dart/build": {'
         '    "disable_goma": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -613,6 +622,9 @@ buckets {
         '  "$dart/build": {'
         '    "disable_goma": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -663,6 +675,9 @@ buckets {
         '  "$dart/build": {'
         '    "disable_goma": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -713,6 +728,9 @@ buckets {
         '  "$dart/build": {'
         '    "disable_goma": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -763,6 +781,9 @@ buckets {
         '  "$dart/build": {'
         '    "disable_goma": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -813,6 +834,9 @@ buckets {
         '  "$dart/build": {'
         '    "disable_goma": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -860,6 +884,9 @@ buckets {
         '  "$dart/build": {'
         '    "disable_goma": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -907,6 +934,9 @@ buckets {
         '  "$dart/build": {'
         '    "disable_goma": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2148,6 +2178,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2197,6 +2230,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2246,6 +2282,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2295,6 +2334,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2524,6 +2566,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4489,6 +4534,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4541,6 +4589,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4593,6 +4644,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4645,6 +4699,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4697,6 +4754,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4746,6 +4806,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4795,6 +4858,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4844,6 +4910,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5505,6 +5574,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5557,6 +5629,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5609,6 +5684,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5661,6 +5739,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6521,6 +6602,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6570,6 +6654,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6619,6 +6706,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6668,6 +6758,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6897,6 +6990,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7581,6 +7677,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7629,6 +7728,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7677,6 +7779,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7725,6 +7830,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7773,6 +7881,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7825,6 +7936,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7882,6 +7996,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7934,6 +8051,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7986,6 +8106,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10911,6 +11034,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10960,6 +11086,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11009,6 +11138,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11058,6 +11190,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11107,6 +11242,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11156,6 +11294,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11208,6 +11349,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11260,6 +11404,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11309,6 +11456,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11358,6 +11508,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11407,6 +11560,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12043,6 +12199,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12096,6 +12255,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12146,6 +12308,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12198,6 +12363,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14287,6 +14455,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14336,6 +14507,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14385,6 +14559,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14434,6 +14611,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14890,6 +15070,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14943,6 +15126,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16678,6 +16864,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16772,6 +16961,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -17148,6 +17340,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -17200,6 +17395,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -17576,6 +17774,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -17628,6 +17829,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -17818,6 +18022,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -18255,6 +18462,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -18349,6 +18559,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -18581,6 +18794,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -18629,6 +18845,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -18686,6 +18905,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -19693,6 +19915,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -19742,6 +19967,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -19791,6 +20019,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -19843,6 +20074,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -20209,6 +20443,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -20262,6 +20499,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -20312,6 +20552,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -20364,6 +20607,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -21228,6 +21474,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -21549,6 +21798,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -21602,6 +21854,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
diff --git a/main.star b/main.star
index 9b17330f4d2b..9befe3de74cd 100755
--- a/main.star
+++ b/main.star
@@ -14,10 +14,7 @@ Generates the Luci configuration for the Dart project.
 
 load("//defaults.star", "defaults")
 
-lucicfg.check_version("1.29.1")
-
-# Enable LUCI Realms support.
-lucicfg.enable_experiment("crbug.com/1085650")
+lucicfg.check_version("1.30.5")
 
 luci.builder.defaults.experiments.set({
     # Launch 100% of Swarming tasks in "realms-aware mode", crbug.com/1170330.
@@ -106,6 +103,7 @@ CHROME = {"custom_vars": {"download_chrome": True}}
 FIREFOX = {"custom_vars": {"download_firefox": True}}
 JS_ENGINES = {"custom_vars": {"checkout_javascript_engines": True}}
 SLOW_SHARDS = {"shard_timeout": (90 * time.minute) // time.second}
+PINNED_XCODE = {"$depot_tools/osx_sdk": {"sdk_version": "12d4e"}}
 
 def to_location_regexp(paths):
     return [".+/[+]/%s" % path for path in paths]
@@ -122,28 +120,30 @@ def windows():
 def linux():
     return {"os": "Linux"}
 
-def union(x, y):
-    """ Creates a new dict with the values from both passed dictionaries
+def union(x, *args):
+    """ Creates a new dict with the values from all passed dictionaries
 
-    If both dicts contain the same keys, their values are assumed to be dicts
-    and merged. Values in y's sub-dicts will overwrite values in x's sub-dicts.
+    If dicts contain the same keys, their values are assumed to be dicts
+    and merged. Values in dicts later in *args sub-dicts will overwrite
+    values in earlier sub-dicts.
 
     Args:
         x (dict): A dict.
-        y (dict): Another dict.
+        *args: dicts to merge with x.
 
     Returns:
         dict: The merged dict.
     """
     z = {}
     z.update(x)
-    for k in y.keys():
-        v = z.get(k)
-        if v:
-            v = dict(v, **y[k])
-            z[k] = v
-        else:
-            z[k] = y[k]
+    for y in args:
+        for k in y.keys():
+            v = z.get(k)
+            if v:
+                v = dict(v, **y[k])
+                z[k] = v
+            else:
+                z[k] = y[k]
     return z
 
 # https://chrome-infra-auth.appspot.com/auth/groups/project-dart-ci-task-accounts
@@ -892,6 +892,7 @@ dart_ci_sandbox_builder(
     "front-end-mac-release-x64",
     category = "cfe|m",
     dimensions = mac(),
+    properties = PINNED_XCODE,
 )
 dart_ci_sandbox_builder(
     "front-end-win-release-x64",
@@ -908,6 +909,7 @@ nightly_builder(
     category = "cfe|nnbd|m",
     channels = ["try"],
     dimensions = mac(),
+    properties = PINNED_XCODE,
 )
 nightly_builder(
     "front-end-nnbd-win-release-x64",
@@ -1001,28 +1003,29 @@ dart_vm_nightly_builder(
     "vm-kernel-nnbd-mac-debug-arm64",
     category = "vm|nnbd|jit|m1d",
     channels = ["try"],
-    properties = union(NO_ANDROID, SLOW_SHARDS),
     dimensions = mac(cpu = "arm64"),
+    properties = union(NO_ANDROID, PINNED_XCODE, SLOW_SHARDS),
 )
 dart_vm_nightly_builder(
     "vm-kernel-nnbd-mac-debug-x64",
     category = "vm|nnbd|jit|md",
     channels = ["try"],
-    properties = SLOW_SHARDS,
     dimensions = mac(),
+    properties = union(PINNED_XCODE, SLOW_SHARDS),
 )
 dart_vm_extra_builder(
     "vm-kernel-nnbd-mac-release-arm64",
     category = "vm|nnbd|jit|m1r",
     channels = ["try"],
     dimensions = mac(cpu = "arm64"),
-    properties = NO_ANDROID,
+    properties = union(NO_ANDROID, PINNED_XCODE),
 )
 dart_vm_nightly_builder(
     "vm-kernel-nnbd-mac-release-x64",
     category = "vm|nnbd|jit|mr",
     channels = ["try"],
     dimensions = mac(),
+    properties = PINNED_XCODE,
 )
 dart_vm_nightly_builder(
     "vm-kernel-nnbd-win-release-ia32",
@@ -1075,14 +1078,14 @@ dart_vm_extra_builder(
     category = "vm|nnbd|aot|m1",
     channels = ["try"],
     dimensions = mac(cpu = "arm64"),
-    properties = union(NO_ANDROID, SLOW_SHARDS),
+    properties = union(NO_ANDROID, PINNED_XCODE, SLOW_SHARDS),
 )
 nightly_builder(
     "vm-kernel-precomp-nnbd-mac-release-simarm64",
     category = "vm|nnbd|aot|ma6",
     channels = ["try"],
     dimensions = mac(),
-    properties = SLOW_SHARDS,
+    properties = union(PINNED_XCODE, SLOW_SHARDS),
 )
 nightly_builder(
     "vm-kernel-precomp-nnbd-win-release-x64",
@@ -1146,6 +1149,7 @@ dart_ci_sandbox_builder(
     "vm-kernel-mac-debug-x64",
     category = "vm|kernel|md",
     dimensions = mac(),
+    properties = PINNED_XCODE,
 )
 dart_ci_sandbox_builder(
     "vm-kernel-mac-release-x64",
@@ -1153,13 +1157,14 @@ dart_ci_sandbox_builder(
     dimensions = mac(),
     on_cq = True,
     experiment_percentage = 5,
+    properties = PINNED_XCODE,
 )
 dart_ci_sandbox_builder(
     "vm-kernel-mac-release-arm64",
     category = "vm|kernel|m1r",
     channels = ["try", "dev"],
     dimensions = mac(cpu = "arm64"),
-    properties = NO_ANDROID,
+    properties = union(NO_ANDROID, PINNED_XCODE),
 )
 dart_vm_nightly_builder(
     "vm-kernel-win-debug-ia32",
@@ -1228,6 +1233,7 @@ dart_vm_extra_builder(
     "vm-kernel-precomp-mac-release-simarm64",
     category = "vm|kernel-precomp|ma",
     dimensions = mac(),
+    properties = PINNED_XCODE,
 )
 dart_vm_extra_builder(
     "vm-kernel-precomp-win-release-x64",
@@ -1269,6 +1275,7 @@ dart_vm_nightly_builder(
     category = "vm|product|m",
     channels = ["try"],
     dimensions = mac(),
+    properties = PINNED_XCODE,
 )
 dart_vm_nightly_builder(
     "vm-kernel-win-product-x64",
@@ -1404,20 +1411,20 @@ dart_ci_sandbox_builder(
     "pkg-linux-release",
     category = "pkg|l",
     on_cq = True,
-    properties = CHROME,
+    properties = union(CHROME, PINNED_XCODE),
 )
 dart_ci_sandbox_builder(
     "pkg-mac-release",
     category = "pkg|m",
     dimensions = mac(),
-    properties = CHROME,
+    properties = union(CHROME, PINNED_XCODE),
 )
 dart_ci_sandbox_builder(
     "pkg-mac-release-arm64",
     category = "pkg|m1",
     channels = ["try"],
     dimensions = mac(cpu = "arm64"),
-    properties = union(CHROME, NO_ANDROID),
+    properties = union(CHROME, NO_ANDROID, PINNED_XCODE),
     experiments = {"dart.use_update_script": 100},
 )
 dart_ci_sandbox_builder(
@@ -1465,7 +1472,7 @@ dart_ci_sandbox_builder(
     "dart2js-strong-mac-x64-chrome",
     category = "dart2js|chrome|m",
     dimensions = mac(),
-    properties = CHROME,
+    properties = union(CHROME, PINNED_XCODE),
 )
 dart_ci_sandbox_builder(
     "dart2js-strong-win-x64-chrome",
@@ -1495,6 +1502,7 @@ dart_ci_sandbox_builder(
     "dart2js-strong-mac-x64-safari",
     category = "dart2js|safari|m",
     dimensions = mac(),
+    properties = PINNED_XCODE,
 )
 
 # analyzer
@@ -1533,6 +1541,7 @@ dart_ci_sandbox_builder(
     category = "analyzer|m",
     channels = CHANNELS,
     dimensions = mac(),
+    properties = PINNED_XCODE,
 )
 dart_ci_sandbox_builder(
     "analyzer-win-release",
@@ -1554,6 +1563,7 @@ nightly_builder(
     category = "analyzer|nnbd|m",
     channels = ["try"],
     dimensions = mac(),
+    properties = PINNED_XCODE,
 )
 nightly_builder(
     "analyzer-nnbd-win-release",
@@ -1580,13 +1590,14 @@ dart_ci_builder(
     channels = CHANNELS,
     dimensions = mac(),
     lkgr = True,
+    properties = PINNED_XCODE,
 )
 dart_ci_builder(
     "dart-sdk-mac-arm64",
     category = "sdk|m1",
     channels = CHANNELS,
     dimensions = mac(cpu = "arm64"),
-    properties = NO_ANDROID,
+    properties = union(NO_ANDROID, PINNED_XCODE),
 )
 
 dart_ci_builder(
@@ -1616,7 +1627,7 @@ dart_ci_sandbox_builder(
     "ddc-mac-release-chrome",
     category = "ddc|m",
     dimensions = mac(),
-    properties = CHROME,
+    properties = union(CHROME, PINNED_XCODE),
 )
 dart_ci_sandbox_builder(
     "ddc-win-release-chrome",
@@ -1693,11 +1704,13 @@ dart_infra_builder(
     "dart-ci-scripts-mac",
     recipe = "dart/package_dart_ci",
     dimensions = mac(),
+    properties = PINNED_XCODE,
 )
 dart_infra_builder(
     "dart-ci-scripts-mac-arm64",
     recipe = "dart/package_dart_ci",
     dimensions = mac(cpu = "arm64"),
+    properties = PINNED_XCODE,
 )
 dart_infra_builder("docker", recipe = "dart/docker")
 dart_infra_builder(
diff --git a/project.cfg b/project.cfg
index ef40a9e771ff..1e1b7e7070c9 100644
--- a/project.cfg
+++ b/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.30.1"
+  version: "1.30.5"
   package_dir: "."
   config_dir: "."
   entry_point: "main.star"

From cb13125fe4ff09e75c68e806a72d6a2e1d303a2e Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 22 Dec 2021 08:11:45 +0000
Subject: [PATCH 509/826] Reland "[infra] Add dart2js-canary-x64 builder"

This reverts commit b9c60ffb3cc211cbec1a6c33134402b4c8a34819.

Reason for revert: Test matrix was fixed.

Original change's description:
> Revert "[infra] Add dart2js-canary-x64 builder"
>
> This reverts commit ecd9d79350689f95fb3af1f1926a8dd60715f827.
>
> Reason for revert: Bot is purple on tryjobs.
>
> Original change's description:
> > [infra] Add dart2js-canary-x64 builder
> >
> > * Disable android tooling downloads on dart2js builders.
> > * Remove obsolete experiment flag (caused a warning).
> > * Raised lucicfg version requirement.
> >
> > Change-Id: Ic0616f5d616c939711ae6ccbf2ed398a602d93a3
> > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/222305
> > Reviewed-by: William Hesse <whesse@google.com>
> > Reviewed-by: Joshua Litt <joshualitt@google.com>
> > Commit-Queue: Alexander Thomas <athom@google.com>
>
> TBR=whesse@google.com,athom@google.com,sigmund@google.com,joshualitt@google.com
>
> Change-Id: I11abe3409f9190301cd3a46e5ab771b72d3f38ae
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/224521
> Reviewed-by: Alexander Thomas <athom@google.com>
> Commit-Queue: Alexander Thomas <athom@google.com>

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: I6abc4c0d415720df3f25927ef5a71b73492b9b86
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/224944
Reviewed-by: Joshua Litt <joshualitt@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg   |  16 +++
 cr-buildbucket.cfg | 336 +++++++++++++++++++++++++++++++++++++++++++++
 luci-milo.cfg      |  28 ++++
 luci-notify.cfg    |  14 ++
 luci-scheduler.cfg |  48 +++++++
 main.star          |  25 ++--
 6 files changed, 459 insertions(+), 8 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index d3483c86073c..529349bea062 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -168,6 +168,22 @@ config_groups {
       builders {
         name: "dart/try/dart-sdk-win-try"
       }
+      builders {
+        name: "dart/try/dart2js-canary-x64-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
+        location_regexp: ".+/[+]/utils/compiler/.+"
+        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
+      }
       builders {
         name: "dart/try/dart2js-csp-minified-linux-x64-chrome-try"
         includable_only: true
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index c5e4cedee959..45231f638a7a 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -3386,6 +3386,202 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "dart2js-canary-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-canary-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-canary-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-canary-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "dart2js-csp-minified-linux-x64-chrome"
       swarming_host: "chromium-swarm.appspot.com"
@@ -3414,6 +3610,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -3462,6 +3659,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -3510,6 +3708,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -3558,6 +3757,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -3605,6 +3805,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -3650,6 +3853,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -3695,6 +3901,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -3740,6 +3949,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -3786,6 +3998,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -3834,6 +4047,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -3882,6 +4096,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -3930,6 +4145,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -3977,6 +4193,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4022,6 +4241,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4067,6 +4289,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4112,6 +4337,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4158,6 +4386,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4206,6 +4435,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4254,6 +4484,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4302,6 +4533,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4350,6 +4582,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4398,6 +4631,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4446,6 +4680,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4494,6 +4729,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4545,6 +4781,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4600,6 +4837,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4655,6 +4893,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4710,6 +4949,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4764,6 +5004,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4816,6 +5059,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4868,6 +5114,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4920,6 +5169,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4970,6 +5222,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -5018,6 +5271,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -5066,6 +5320,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -5114,6 +5369,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -5162,6 +5418,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -5209,6 +5466,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5254,6 +5514,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5299,6 +5562,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5344,6 +5610,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -17472,6 +17741,55 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "dart2js-canary-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "dart2js-csp-minified-linux-x64-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -17500,6 +17818,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -17547,6 +17866,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -17593,6 +17915,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -17640,6 +17963,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -17686,6 +18012,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -17734,6 +18061,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -17785,6 +18113,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -17839,6 +18168,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -17889,6 +18221,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -17936,6 +18269,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 17c8b3dd0a44..9283a6802490 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -510,6 +510,11 @@ consoles {
     category: "pkg"
     short_name: "ld"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64"
+    category: "dart2js"
+    short_name: "c"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
     category: "dart2js|d8"
@@ -789,6 +794,11 @@ consoles {
     category: "pkg"
     short_name: "ld"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64"
+    category: "dart2js"
+    short_name: "c"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
     category: "dart2js|d8"
@@ -1643,6 +1653,11 @@ consoles {
     category: "pkg"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-dev"
+    category: "dart2js"
+    short_name: "c"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-dev"
     category: "dart2js|d8"
@@ -2032,6 +2047,11 @@ consoles {
     category: "pkg"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-beta"
+    category: "dart2js"
+    short_name: "c"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-beta"
     category: "dart2js|d8"
@@ -2421,6 +2441,11 @@ consoles {
     category: "pkg"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-stable"
+    category: "dart2js"
+    short_name: "c"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-stable"
     category: "dart2js|d8"
@@ -2948,6 +2973,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/pkg-linux-debug-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/dart2js-canary-x64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/dart2js-strong-hostasserts-linux-ia32-d8-try"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index a017929d857a..0ab945a5bec4 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -478,6 +478,20 @@ notifiers {
     name: "cross-vm-precomp-linux-release-arm64"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "dart2js-canary-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 4f53afd85b81..1d217b76cb63 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -642,6 +642,50 @@ job {
     builder: "dart-sdk-win-stable"
   }
 }
+job {
+  id: "dart2js-canary-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-canary-x64"
+  }
+}
+job {
+  id: "dart2js-canary-x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-canary-x64-beta"
+  }
+}
+job {
+  id: "dart2js-canary-x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-canary-x64-dev"
+  }
+}
+job {
+  id: "dart2js-canary-x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-canary-x64-stable"
+  }
+}
 job {
   id: "dart2js-csp-minified-linux-x64-chrome"
   realm: "ci.sandbox"
@@ -3938,6 +3982,7 @@ trigger {
   triggers: "analyzer-win-release-beta"
   triggers: "app-kernel-linux-debug-x64-beta"
   triggers: "app-kernel-linux-release-x64-beta"
+  triggers: "dart2js-canary-x64-beta"
   triggers: "dart2js-csp-minified-linux-x64-chrome-beta"
   triggers: "dart2js-minified-strong-linux-x64-d8-beta"
   triggers: "dart2js-nnbd-linux-x64-chrome-beta"
@@ -4013,6 +4058,7 @@ trigger {
   triggers: "analyzer-win-release-dev"
   triggers: "app-kernel-linux-debug-x64-dev"
   triggers: "app-kernel-linux-release-x64-dev"
+  triggers: "dart2js-canary-x64-dev"
   triggers: "dart2js-csp-minified-linux-x64-chrome-dev"
   triggers: "dart2js-minified-strong-linux-x64-d8-dev"
   triggers: "dart2js-nnbd-linux-x64-chrome-dev"
@@ -4099,6 +4145,7 @@ trigger {
   triggers: "analyzer-mac-release"
   triggers: "analyzer-nnbd-linux-release"
   triggers: "analyzer-win-release"
+  triggers: "dart2js-canary-x64"
   triggers: "dart2js-csp-minified-linux-x64-chrome"
   triggers: "dart2js-minified-strong-linux-x64-d8"
   triggers: "dart2js-nnbd-linux-x64-chrome"
@@ -4154,6 +4201,7 @@ trigger {
   triggers: "analyzer-win-release-stable"
   triggers: "app-kernel-linux-debug-x64-stable"
   triggers: "app-kernel-linux-release-x64-stable"
+  triggers: "dart2js-canary-x64-stable"
   triggers: "dart2js-csp-minified-linux-x64-chrome-stable"
   triggers: "dart2js-minified-strong-linux-x64-d8-stable"
   triggers: "dart2js-nnbd-linux-x64-chrome-stable"
diff --git a/main.star b/main.star
index 9befe3de74cd..1e254abbbd85 100755
--- a/main.star
+++ b/main.star
@@ -1442,67 +1442,76 @@ dart_ci_sandbox_builder(
 )
 
 # dart2js
+dart_ci_sandbox_builder(
+    "dart2js-canary-x64",
+    category = "dart2js|c",
+    location_regexp = to_location_regexp(DART2JS_PATHS),
+    properties = union(CHROME, NO_ANDROID),
+)
 dart_ci_sandbox_builder(
     "dart2js-strong-hostasserts-linux-ia32-d8",
     category = "dart2js|d8|ha",
     location_regexp = to_location_regexp(DART2JS_PATHS),
+    properties = NO_ANDROID,
 )
 dart_ci_sandbox_builder(
     "dart2js-minified-strong-linux-x64-d8",
     category = "dart2js|d8|mi",
     location_regexp = to_location_regexp(DART2JS_PATHS),
+    properties = NO_ANDROID,
 )
 dart_ci_sandbox_builder(
     "dart2js-unit-linux-x64-release",
     category = "dart2js|d8|u",
     location_regexp = to_location_regexp(DART2JS_PATHS),
+    properties = NO_ANDROID,
 )
 dart_ci_sandbox_builder(
     "dart2js-strong-linux-x64-chrome",
     category = "dart2js|chrome|l",
     location_regexp = to_location_regexp(DART2JS_PATHS),
-    properties = CHROME,
+    properties = union(CHROME, NO_ANDROID),
 )
 dart_ci_sandbox_builder(
     "dart2js-csp-minified-linux-x64-chrome",
     category = "dart2js|chrome|csp",
-    properties = CHROME,
+    properties = union(CHROME, NO_ANDROID),
 )
 dart_ci_sandbox_builder(
     "dart2js-strong-mac-x64-chrome",
     category = "dart2js|chrome|m",
     dimensions = mac(),
-    properties = union(CHROME, PINNED_XCODE),
+    properties = union(CHROME, PINNED_XCODE, NO_ANDROID),
 )
 dart_ci_sandbox_builder(
     "dart2js-strong-win-x64-chrome",
     category = "dart2js|chrome|w",
     dimensions = windows(),
-    properties = CHROME,
+    properties = union(CHROME, NO_ANDROID),
 )
 dart_ci_sandbox_builder(
     "dart2js-nnbd-linux-x64-chrome",
     category = "dart2js|chrome|nn",
     location_regexp = to_location_regexp(DART2JS_PATHS),
-    properties = CHROME,
+    properties = union(CHROME, NO_ANDROID),
 )
 dart_ci_sandbox_builder(
     "dart2js-strong-linux-x64-firefox",
     category = "dart2js|firefox|l",
-    properties = FIREFOX,
+    properties = union(FIREFOX, NO_ANDROID),
 )
 dart_ci_sandbox_builder(
     "dart2js-strong-win-x64-firefox",
     category = "dart2js|firefox|w",
     dimensions = windows(),
     enabled = False,
-    properties = FIREFOX,
+    properties = union(FIREFOX, NO_ANDROID),
 )
 dart_ci_sandbox_builder(
     "dart2js-strong-mac-x64-safari",
     category = "dart2js|safari|m",
     dimensions = mac(),
-    properties = PINNED_XCODE,
+    properties = union(PINNED_XCODE, NO_ANDROID),
 )
 
 # analyzer

From 24a1fadf2f2798efe2a0d62679788abcfee64995 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 22 Dec 2021 17:41:31 +0000
Subject: [PATCH 510/826] [infra] Don't add dart2js-canary to the CQ by default

`--canary` is currently a no-op so we don't want to waste CQ time on it.

Change-Id: I18e32d46beae03d55d2ca1f1d421e95a9d8e67b9
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/224951
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: Joshua Litt <joshualitt@google.com>
Commit-Queue: Joshua Litt <joshualitt@google.com>
---
 commit-queue.cfg | 14 +-------------
 main.star        |  1 -
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 529349bea062..28652b04a58c 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -170,19 +170,7 @@ config_groups {
       }
       builders {
         name: "dart/try/dart2js-canary-x64-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
-        location_regexp: ".+/[+]/utils/compiler/.+"
-        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
+        includable_only: true
       }
       builders {
         name: "dart/try/dart2js-csp-minified-linux-x64-chrome-try"
diff --git a/main.star b/main.star
index 1e254abbbd85..f6d9cefba7a0 100755
--- a/main.star
+++ b/main.star
@@ -1445,7 +1445,6 @@ dart_ci_sandbox_builder(
 dart_ci_sandbox_builder(
     "dart2js-canary-x64",
     category = "dart2js|c",
-    location_regexp = to_location_regexp(DART2JS_PATHS),
     properties = union(CHROME, NO_ANDROID),
 )
 dart_ci_sandbox_builder(

From bda970efa6dbfcc07699ccaad289b08951bacb0a Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 10 Jan 2022 13:56:03 +0000
Subject: [PATCH 511/826] [infra] Remove obsolete docker builder

Bug: b/213857358
Change-Id: I16fd7b31b8a0d482d00d13bd11fbba9217a5e709
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/227164
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 cr-buildbucket.cfg | 43 -------------------------------------------
 luci-milo.cfg      |  3 ---
 luci-notify.cfg    | 15 ---------------
 luci-scheduler.cfg | 11 -----------
 main.star          |  1 -
 5 files changed, 73 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 45231f638a7a..7c71cf65c2ef 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1310,49 +1310,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "docker"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/docker"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
     builders {
       name: "linearize-flutter"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 9283a6802490..e33f9f3db11e 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -3095,9 +3095,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci/dart-ci-scripts-mac-arm64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/docker"
-  }
   builders {
     name: "buildbucket/luci.dart.ci/linearize-flutter"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 0ab945a5bec4..a42f9c8e149f 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -181,21 +181,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "docker"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 1d217b76cb63..b05e926e5a19 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1357,17 +1357,6 @@ job {
     builder: "debianpackage-linux-stable"
   }
 }
-job {
-  id: "docker"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "docker"
-  }
-}
 job {
   id: "flutter-analyze"
   realm: "ci.sandbox"
diff --git a/main.star b/main.star
index f6d9cefba7a0..a05b5bc704a5 100755
--- a/main.star
+++ b/main.star
@@ -1720,7 +1720,6 @@ dart_infra_builder(
     dimensions = mac(cpu = "arm64"),
     properties = PINNED_XCODE,
 )
-dart_infra_builder("docker", recipe = "dart/docker")
 dart_infra_builder(
     "linearize-flutter",
     recipe = "dart/linearize",

From e0788b66d3b608e11ac009cd5c0fe80e1ae27ae2 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Thu, 13 Jan 2022 11:08:25 +0000
Subject: [PATCH 512/826] [infra] Set commit queue status_host

Change-Id: Ie3723d4e09ef73b5fa4ac49379d1b4b10dc76312
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/227821
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 commit-queue.cfg | 1 +
 main.star        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 28652b04a58c..59bd648f1e36 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -4,6 +4,7 @@
 # For the schema of this file, see Config message:
 #   https://luci-config.appspot.com/schemas/projects:commit-queue.cfg
 
+cq_status_host: "chromium-cq-status.appspot.com"
 submit_options {
   max_burst: 2
   burst_delay {
diff --git a/main.star b/main.star
index a05b5bc704a5..adf5637a7ce8 100755
--- a/main.star
+++ b/main.star
@@ -470,6 +470,7 @@ luci.notifier(
 luci.cq(
     submit_max_burst = 2,
     submit_burst_delay = 8 * time.minute,
+    status_host = "chromium-cq-status.appspot.com",
 )
 
 def default_verifiers():

From 418795cc7052e0cc12748d6c387a1b9ac48ed3e4 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 13 Jan 2022 20:02:03 +0000
Subject: [PATCH 513/826] [infra] Remove flaky flutter-analyze-try from the
 default CQ

It's currently flaking on 50% of builds, providing almost no signal.

Bug: https://github.com/dart-lang/sdk/issues/47881
Change-Id: I4376f281ac0b78f9b14cfeeefa9b555756b5008d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/228041
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: Paul Berry <paulberry@google.com>
Commit-Queue: Paul Berry <paulberry@google.com>
---
 commit-queue.cfg | 10 +---------
 main.star        | 11 -----------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 59bd648f1e36..591121f466ad 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -319,15 +319,7 @@ config_groups {
       }
       builders {
         name: "dart/try/flutter-analyze-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/pkg/analysis_server/.+"
-        location_regexp: ".+/[+]/pkg/analysis_server_client/.+"
-        location_regexp: ".+/[+]/pkg/analyzer/.+"
-        location_regexp: ".+/[+]/pkg/analyzer_plugin/.+"
-        location_regexp: ".+/[+]/pkg/front_end/.+"
-        location_regexp: ".+/[+]/pkg/_fe_analyzer_shared/.+"
-        location_regexp: ".+/[+]/pkg/meta/.+"
-        location_regexp: ".+/[+]/pkg/telemetry/.+"
+        includable_only: true
       }
       builders {
         name: "dart/try/flutter-engine-linux-try"
diff --git a/main.star b/main.star
index adf5637a7ce8..2739cd48253b 100755
--- a/main.star
+++ b/main.star
@@ -1520,17 +1520,6 @@ dart_ci_sandbox_builder(
     category = "analyzer|fa",
     channels = ["try"],
     execution_timeout = 45 * time.minute,
-    location_regexp = [
-        ".+/[+]/DEPS",
-        ".+/[+]/pkg/analysis_server/.+",
-        ".+/[+]/pkg/analysis_server_client/.+",
-        ".+/[+]/pkg/analyzer/.+",
-        ".+/[+]/pkg/analyzer_plugin/.+",
-        ".+/[+]/pkg/front_end/.+",
-        ".+/[+]/pkg/_fe_analyzer_shared/.+",
-        ".+/[+]/pkg/meta/.+",
-        ".+/[+]/pkg/telemetry/.+",
-    ],
     notifies = None,
 )
 dart_ci_sandbox_builder(

From 8073a9617b27234cbb9de78357c24c1f8129adda Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 25 Jan 2022 21:18:34 +0000
Subject: [PATCH 514/826] [infra] Remove simarm64c bots.

We have since switched our Android configurations to compressed pointers on ARM64, so the bots are mostly redundant.

Change-Id: Ie7a8c50f1e52c4148c589f75d009d128a31a0f7e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/229943
Reviewed-by: Alexander Thomas <athom@google.com>
Reviewed-by: Liam Appelbe <liama@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 commit-queue.cfg   |   8 --
 cr-buildbucket.cfg | 182 ---------------------------------------------
 luci-milo.cfg      |  34 +--------
 luci-notify.cfg    |  24 ------
 luci-scheduler.cfg |  22 ------
 main.star          |  14 +---
 6 files changed, 6 insertions(+), 278 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 591121f466ad..3b208ab50585 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -447,10 +447,6 @@ config_groups {
         name: "dart/try/vm-kernel-linux-debug-ia32-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-linux-debug-simarm64c-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-linux-debug-x64-try"
         includable_only: true
@@ -596,10 +592,6 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-dwarf-linux-product-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-simarm64c-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-precomp-linux-debug-simarm_x64-try"
         includable_only: true
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 7c71cf65c2ef..193cff8261d4 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1493,9 +1493,7 @@ buckets {
         '    "vm-kernel-reload-rollback-linux-debug-x64",'
         '    "vm-kernel-reload-rollback-linux-release-x64",'
         '    "vm-kernel-linux-debug-x64c",'
-        '    "vm-kernel-linux-debug-simarm64c",'
         '    "vm-kernel-precomp-linux-debug-x64c",'
-        '    "vm-kernel-precomp-linux-debug-simarm64c",'
         '    "vm-kernel-win-debug-x64c",'
         '    "vm-kernel-precomp-win-debug-x64c",'
         '    "vm-kernel-gcc-linux",'
@@ -10340,51 +10338,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-linux-debug-simarm64c"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13307,51 +13260,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-precomp-linux-debug-simarm64c"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-precomp-linux-debug-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -19828,51 +19736,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-linux-debug-simarm64c-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -21341,51 +21204,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-precomp-linux-debug-simarm64c-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-precomp-linux-debug-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index e33f9f3db11e..b2f6475a269e 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -413,22 +413,12 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64c"
     category: "vm|misc|compressed"
-    short_name: "ji"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simarm64c"
-    category: "vm|misc|compressed"
-    short_name: "ja"
+    short_name: "jl"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64c"
     category: "vm|misc|compressed"
-    short_name: "ai"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm64c"
-    category: "vm|misc|compressed"
-    short_name: "aa"
+    short_name: "al"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64c"
@@ -1312,22 +1302,12 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64c"
     category: "vm|misc|compressed"
-    short_name: "ji"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simarm64c"
-    category: "vm|misc|compressed"
-    short_name: "ja"
+    short_name: "jl"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64c"
     category: "vm|misc|compressed"
-    short_name: "ai"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm64c"
-    category: "vm|misc|compressed"
-    short_name: "aa"
+    short_name: "al"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64c"
@@ -2916,15 +2896,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64c-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-simarm64c-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64c-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-simarm64c-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-win-debug-x64c-try"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index a42f9c8e149f..1c9489356148 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -1094,18 +1094,6 @@ notifiers {
     name: "vm-kernel-linux-debug-ia32"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-debug-simarm64c"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1506,18 +1494,6 @@ notifiers {
     name: "vm-kernel-precomp-dwarf-linux-product-x64"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-debug-simarm64c"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index b05e926e5a19..3d8ebdb041ea 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -2340,17 +2340,6 @@ job {
     builder: "vm-kernel-linux-debug-ia32"
   }
 }
-job {
-  id: "vm-kernel-linux-debug-simarm64c"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-simarm64c"
-  }
-}
 job {
   id: "vm-kernel-linux-debug-x64"
   realm: "ci.sandbox"
@@ -3033,17 +3022,6 @@ job {
     builder: "vm-kernel-precomp-dwarf-linux-product-x64"
   }
 }
-job {
-  id: "vm-kernel-precomp-linux-debug-simarm64c"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-simarm64c"
-  }
-}
 job {
   id: "vm-kernel-precomp-linux-debug-simarm_x64"
   realm: "ci.sandbox"
diff --git a/main.star b/main.star
index 2739cd48253b..6c6935fb5df6 100755
--- a/main.star
+++ b/main.star
@@ -1360,22 +1360,12 @@ dart_vm_nightly_builder(
 )
 dart_vm_nightly_builder(
     "vm-kernel-linux-debug-x64c",
-    category = "vm|misc|compressed|ji",
-    channels = ["try"],
-)
-dart_vm_nightly_builder(
-    "vm-kernel-linux-debug-simarm64c",
-    category = "vm|misc|compressed|ja",
+    category = "vm|misc|compressed|jl",
     channels = ["try"],
 )
 dart_vm_nightly_builder(
     "vm-kernel-precomp-linux-debug-x64c",
-    category = "vm|misc|compressed|ai",
-    channels = ["try"],
-)
-dart_vm_nightly_builder(
-    "vm-kernel-precomp-linux-debug-simarm64c",
-    category = "vm|misc|compressed|aa",
+    category = "vm|misc|compressed|al",
     channels = ["try"],
 )
 dart_vm_nightly_builder(

From f05d38865d1e5fb65602b719285a5d2fa3ee6fa5 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Fri, 28 Jan 2022 11:36:13 +0000
Subject: [PATCH 515/826] [infra] Add bots for RISC-V.

Bug: https://github.com/dart-lang/sdk/issues/38587
Change-Id: Idad0f49c0c147b981e452985ee0404b2fc5e2615
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/229946
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg   |  12 ++
 cr-buildbucket.cfg | 407 +++++++++++++++++++++++++++++++++++++++++++++
 luci-milo.cfg      |  64 ++++++-
 luci-notify.cfg    |  38 +++++
 luci-scheduler.cfg |  70 ++++++++
 main.star          |  17 +-
 6 files changed, 602 insertions(+), 6 deletions(-)

diff --git a/commit-queue.cfg b/commit-queue.cfg
index 3b208ab50585..2d40cb728cdd 100644
--- a/commit-queue.cfg
+++ b/commit-queue.cfg
@@ -447,6 +447,10 @@ config_groups {
         name: "dart/try/vm-kernel-linux-debug-ia32-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-linux-debug-simriscv64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-linux-debug-x64-try"
         includable_only: true
@@ -596,6 +600,10 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-linux-debug-simarm_x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-debug-simriscv64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
         includable_only: true
@@ -736,6 +744,10 @@ config_groups {
         name: "dart/try/vm-precomp-ffi-qemu-linux-release-arm-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
+        includable_only: true
+      }
       retry_config {}
     }
   }
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 193cff8261d4..06835d743080 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1497,6 +1497,8 @@ buckets {
         '    "vm-kernel-win-debug-x64c",'
         '    "vm-kernel-precomp-win-debug-x64c",'
         '    "vm-kernel-gcc-linux",'
+        '    "vm-kernel-linux-debug-simriscv64",'
+        '    "vm-kernel-precomp-linux-debug-simriscv64",'
         '    "analyzer-nnbd-mac-release",'
         '    "analyzer-nnbd-win-release",'
         '    "vm-precomp-ffi-qemu-linux-release-arm-experimental"'
@@ -10338,6 +10340,51 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-linux-debug-simriscv64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13444,6 +13491,51 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-precomp-linux-debug-simriscv64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-precomp-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -16868,6 +16960,186 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
   }
 }
 buckets {
@@ -19736,6 +20008,51 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-linux-debug-simriscv64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -21250,6 +21567,51 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-precomp-linux-debug-simriscv64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-precomp-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -22853,6 +23215,51 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
   }
 }
 buckets {
diff --git a/luci-milo.cfg b/luci-milo.cfg
index b2f6475a269e..deffb1c1e5cf 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -440,6 +440,16 @@ consoles {
     category: "vm|misc"
     short_name: "g"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simriscv64"
+    category: "vm|misc"
+    short_name: "rv64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simriscv64"
+    category: "vm|misc"
+    short_name: "rv64"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
     category: "vm|ffi"
@@ -473,7 +483,12 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm"
     category: "vm|ffi"
-    short_name: "qe"
+    short_name: "qa"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64"
+    category: "vm|ffi"
+    short_name: "qr"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
@@ -1329,6 +1344,16 @@ consoles {
     category: "vm|misc"
     short_name: "g"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simriscv64"
+    category: "vm|misc"
+    short_name: "rv64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simriscv64"
+    category: "vm|misc"
+    short_name: "rv64"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
     category: "vm|ffi"
@@ -1362,7 +1387,12 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm"
     category: "vm|ffi"
-    short_name: "qe"
+    short_name: "qa"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64"
+    category: "vm|ffi"
+    short_name: "qr"
   }
   header {
     links {
@@ -1616,7 +1646,12 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-dev"
     category: "vm|ffi"
-    short_name: "qe"
+    short_name: "qa"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-dev"
+    category: "vm|ffi"
+    short_name: "qr"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
@@ -2010,7 +2045,12 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-beta"
     category: "vm|ffi"
-    short_name: "qe"
+    short_name: "qa"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-beta"
+    category: "vm|ffi"
+    short_name: "qr"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-beta"
@@ -2404,7 +2444,12 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-stable"
     category: "vm|ffi"
-    short_name: "qe"
+    short_name: "qa"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-stable"
+    category: "vm|ffi"
+    short_name: "qr"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
@@ -2911,6 +2956,12 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-gcc-linux-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-simriscv64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-simriscv64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm-try"
   }
@@ -2932,6 +2983,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-precomp-ffi-qemu-linux-release-arm-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/pkg-linux-release-try"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 1c9489356148..c6e7c8fe4cf9 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -1094,6 +1094,18 @@ notifiers {
     name: "vm-kernel-linux-debug-ia32"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-debug-simriscv64"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1508,6 +1520,18 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-linux-debug-simriscv64"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1982,3 +2006,17 @@ notifiers {
     name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-precomp-ffi-qemu-linux-release-riscv64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 3d8ebdb041ea..e4396c6484dc 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -2340,6 +2340,17 @@ job {
     builder: "vm-kernel-linux-debug-ia32"
   }
 }
+job {
+  id: "vm-kernel-linux-debug-simriscv64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-simriscv64"
+  }
+}
 job {
   id: "vm-kernel-linux-debug-x64"
   realm: "ci.sandbox"
@@ -3066,6 +3077,17 @@ job {
     builder: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
   }
 }
+job {
+  id: "vm-kernel-precomp-linux-debug-simriscv64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-debug-simriscv64"
+  }
+}
 job {
   id: "vm-kernel-precomp-linux-debug-x64"
   realm: "ci.sandbox"
@@ -3891,6 +3913,50 @@ job {
     builder: "vm-precomp-ffi-qemu-linux-release-arm-stable"
   }
 }
+job {
+  id: "vm-precomp-ffi-qemu-linux-release-riscv64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-precomp-ffi-qemu-linux-release-riscv64"
+  }
+}
+job {
+  id: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
+  }
+}
+job {
+  id: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
+  }
+}
+job {
+  id: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
+  }
+}
 job {
   id: "weekly"
   realm: "ci"
@@ -4004,6 +4070,7 @@ trigger {
   triggers: "vm-kernel-win-debug-x64-beta"
   triggers: "vm-kernel-win-release-x64-beta"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm-beta"
+  triggers: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/beta"
@@ -4081,6 +4148,7 @@ trigger {
   triggers: "vm-kernel-win-debug-x64-dev"
   triggers: "vm-kernel-win-release-x64-dev"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm-dev"
+  triggers: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/dev"
@@ -4223,6 +4291,7 @@ trigger {
   triggers: "vm-kernel-win-debug-x64-stable"
   triggers: "vm-kernel-win-release-x64-stable"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm-stable"
+  triggers: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/stable"
@@ -4266,6 +4335,7 @@ trigger {
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64"
   triggers: "vm-kernel-precomp-win-release-x64"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm"
+  triggers: "vm-precomp-ffi-qemu-linux-release-riscv64"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/main"
diff --git a/main.star b/main.star
index 6c6935fb5df6..983f5f466a39 100755
--- a/main.star
+++ b/main.star
@@ -1385,6 +1385,17 @@ dart_vm_low_priority_builder("vm-fuchsia-release-x64", category = "vm|misc|f")
 # Our sysroot does not support gcc, we can't use goma on RBE for this builder
 dart_vm_nightly_builder("vm-kernel-gcc-linux", category = "vm|misc|g", goma = False)
 
+dart_vm_nightly_builder(
+    "vm-kernel-linux-debug-simriscv64",
+    category = "vm|misc|rv64",
+    channels = ["try"],
+)
+dart_vm_nightly_builder(
+    "vm-kernel-precomp-linux-debug-simriscv64",
+    category = "vm|misc|rv64",
+    channels = ["try"],
+)
+
 # vm|ffi
 dart_vm_extra_builder("vm-ffi-android-debug-arm", category = "vm|ffi|d32")
 dart_vm_extra_builder("vm-ffi-android-release-arm", category = "vm|ffi|r32")
@@ -1394,7 +1405,11 @@ dart_vm_extra_builder("vm-ffi-android-release-arm64c", category = "vm|ffi|r64")
 dart_vm_extra_builder("vm-ffi-android-product-arm64c", category = "vm|ffi|p64")
 dart_vm_extra_builder(
     "vm-precomp-ffi-qemu-linux-release-arm",
-    category = "vm|ffi|qe",
+    category = "vm|ffi|qa",
+)
+dart_vm_extra_builder(
+    "vm-precomp-ffi-qemu-linux-release-riscv64",
+    category = "vm|ffi|qr",
 )
 
 # pkg

From faa9f3f4d4bad0b08b1946f7649c60365354c6bd Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 2 Feb 2022 13:06:07 +0000
Subject: [PATCH 516/826] [infra] Simplify cron builders using git pollers with
 a custom schedule

Previously, cron.py triggered builders. However, a git poller with a
custom scheduler provides exactly the same features.

Bug: b/217522299
Change-Id: I1e3668ee7ea2e9c4b2c9397e99ffc9d6c1040726
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/231241
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 142 ---------------------------------------------
 luci-milo.cfg      |   6 --
 luci-notify.cfg    |  82 ++++++++++++++++----------
 luci-scheduler.cfg |  97 ++++++++++++++++++++++++-------
 main.star          |  49 ++++++----------
 project.cfg        |   2 +-
 6 files changed, 145 insertions(+), 233 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 06835d743080..3d751b78e20a 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1426,102 +1426,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "nightly"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builders": ['
-        '    "front-end-nnbd-mac-release-x64",'
-        '    "front-end-nnbd-win-release-x64",'
-        '    "vm-kernel-nnbd-linux-debug-ia32",'
-        '    "vm-kernel-nnbd-linux-release-ia32",'
-        '    "vm-kernel-nnbd-linux-release-simarm",'
-        '    "vm-kernel-nnbd-linux-release-simarm64",'
-        '    "vm-kernel-nnbd-mac-debug-arm64",'
-        '    "vm-kernel-nnbd-mac-debug-x64",'
-        '    "vm-kernel-nnbd-mac-release-x64",'
-        '    "vm-kernel-nnbd-win-release-ia32",'
-        '    "vm-kernel-nnbd-win-debug-x64",'
-        '    "vm-kernel-nnbd-win-release-x64",'
-        '    "vm-kernel-precomp-nnbd-linux-debug-simarm_x64",'
-        '    "vm-kernel-precomp-nnbd-linux-release-simarm_x64",'
-        '    "vm-kernel-precomp-nnbd-linux-debug-x64",'
-        '    "vm-kernel-precomp-nnbd-linux-release-simarm64",'
-        '    "vm-kernel-precomp-nnbd-mac-release-simarm64",'
-        '    "vm-kernel-precomp-nnbd-win-release-x64",'
-        '    "app-kernel-linux-product-x64",'
-        '    "vm-kernel-linux-release-ia32",'
-        '    "vm-kernel-linux-debug-ia32",'
-        '    "vm-kernel-win-debug-ia32",'
-        '    "vm-kernel-win-release-ia32",'
-        '    "cross-vm-precomp-linux-release-arm64",'
-        '    "vm-kernel-precomp-dwarf-linux-product-x64",'
-        '    "vm-kernel-linux-product-x64",'
-        '    "vm-kernel-mac-product-x64",'
-        '    "vm-kernel-win-product-x64",'
-        '    "vm-kernel-optcounter-threshold-linux-release-ia32",'
-        '    "vm-kernel-asan-linux-release-x64",'
-        '    "vm-kernel-msan-linux-release-x64",'
-        '    "vm-kernel-tsan-linux-release-x64",'
-        '    "vm-kernel-ubsan-linux-release-x64",'
-        '    "vm-kernel-precomp-asan-linux-release-x64",'
-        '    "vm-kernel-precomp-msan-linux-release-x64",'
-        '    "vm-kernel-precomp-tsan-linux-release-x64",'
-        '    "vm-kernel-precomp-ubsan-linux-release-x64",'
-        '    "vm-kernel-reload-linux-debug-x64",'
-        '    "vm-kernel-reload-linux-release-x64",'
-        '    "vm-kernel-reload-rollback-linux-debug-x64",'
-        '    "vm-kernel-reload-rollback-linux-release-x64",'
-        '    "vm-kernel-linux-debug-x64c",'
-        '    "vm-kernel-precomp-linux-debug-x64c",'
-        '    "vm-kernel-win-debug-x64c",'
-        '    "vm-kernel-precomp-win-debug-x64c",'
-        '    "vm-kernel-gcc-linux",'
-        '    "vm-kernel-linux-debug-simriscv64",'
-        '    "vm-kernel-precomp-linux-debug-simriscv64",'
-        '    "analyzer-nnbd-mac-release",'
-        '    "analyzer-nnbd-win-release",'
-        '    "vm-precomp-ffi-qemu-linux-release-arm-experimental"'
-        '  ],'
-        '  "clobber": true,'
-        '  "recipe": "cron/cron"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
     builders {
       name: "recipe-bundler"
       swarming_host: "chromium-swarm.appspot.com"
@@ -1624,52 +1528,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "weekly"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builders": ['
-        '    "frontend-weekly"'
-        '  ],'
-        '  "clobber": true,'
-        '  "recipe": "cron/cron"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
   }
 }
 buckets {
diff --git a/luci-milo.cfg b/luci-milo.cfg
index deffb1c1e5cf..2ab60e42968f 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -3132,12 +3132,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci.roll/roll-to-dev"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/nightly"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/weekly"
-  }
   builders {
     name: "buildbucket/luci.dart.ci/recipe-deps-roller"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index c6e7c8fe4cf9..4bbcabe5c1ba 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -211,21 +211,6 @@ notifiers {
     name: "lkgr"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "nightly"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -257,21 +242,6 @@ notifiers {
     name: "recipe-deps-roller"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "weekly"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -354,6 +324,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "analyzer-nnbd-mac-release"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -367,6 +338,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "analyzer-nnbd-win-release"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -407,6 +379,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "app-kernel-linux-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -461,6 +434,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "cross-vm-precomp-linux-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -781,6 +755,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "front-end-nnbd-mac-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -794,6 +769,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "front-end-nnbd-win-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -820,6 +796,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "frontend-weekly"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1054,6 +1031,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-asan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1080,6 +1058,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-gcc-linux"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1092,6 +1071,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-linux-debug-ia32"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1104,6 +1084,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-linux-debug-simriscv64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1130,6 +1111,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-linux-debug-x64c"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1142,6 +1124,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-linux-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1154,6 +1137,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-linux-release-ia32"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1222,6 +1206,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-mac-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1263,6 +1248,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-msan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1275,6 +1261,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-nnbd-linux-debug-ia32"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1301,6 +1288,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-nnbd-linux-release-ia32"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1313,6 +1301,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-nnbd-linux-release-simarm"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1325,6 +1314,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-nnbd-linux-release-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1351,6 +1341,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-nnbd-mac-debug-arm64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1363,6 +1354,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-nnbd-mac-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1389,6 +1381,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-nnbd-mac-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1401,6 +1394,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-nnbd-win-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1413,6 +1407,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-nnbd-win-release-ia32"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1425,6 +1420,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-nnbd-win-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1437,6 +1433,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-optcounter-threshold-linux-release-ia32"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1492,6 +1489,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-asan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1504,6 +1502,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-dwarf-linux-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1530,6 +1529,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-linux-debug-simriscv64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1556,6 +1556,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-linux-debug-x64c"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1653,6 +1654,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-msan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1666,6 +1668,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1679,6 +1682,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-nnbd-linux-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1692,6 +1696,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-nnbd-linux-release-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1705,6 +1710,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1746,6 +1752,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-nnbd-mac-release-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1759,6 +1766,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-nnbd-win-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1786,6 +1794,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-tsan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1799,6 +1808,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-ubsan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1811,6 +1821,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-win-debug-x64c"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1837,6 +1848,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-reload-linux-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1849,6 +1861,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-reload-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1861,6 +1874,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-reload-rollback-linux-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1873,6 +1887,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-reload-rollback-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1886,6 +1901,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-tsan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1899,6 +1915,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-ubsan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1911,6 +1928,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-win-debug-ia32"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1937,6 +1955,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-win-debug-x64c"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1949,6 +1968,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-win-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -1961,6 +1981,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-win-release-ia32"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
@@ -2004,6 +2025,7 @@ notifiers {
   builders {
     bucket: "ci.sandbox"
     name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
+    repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index e4396c6484dc..1dab31e9b372 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1713,17 +1713,6 @@ job {
     builder: "lkgr"
   }
 }
-job {
-  id: "nightly"
-  realm: "ci"
-  schedule: "0 5 * * *"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "nightly"
-  }
-}
 job {
   id: "pkg-linux-debug"
   realm: "ci.sandbox"
@@ -3957,17 +3946,6 @@ job {
     builder: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
   }
 }
-job {
-  id: "weekly"
-  realm: "ci"
-  schedule: "0 0 * * SUN"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "weekly"
-  }
-}
 trigger {
   id: "dart-ci-test-data-trigger"
   realm: "ci"
@@ -4297,6 +4275,70 @@ trigger {
     refs: "regexp:refs/heads/stable"
   }
 }
+trigger {
+  id: "dart-nightly-trigger"
+  realm: "ci"
+  schedule: "0 5 * * *"
+  acl_sets: "ci"
+  triggers: "analyzer-nnbd-mac-release"
+  triggers: "analyzer-nnbd-win-release"
+  triggers: "app-kernel-linux-product-x64"
+  triggers: "cross-vm-precomp-linux-release-arm64"
+  triggers: "front-end-nnbd-mac-release-x64"
+  triggers: "front-end-nnbd-win-release-x64"
+  triggers: "vm-kernel-asan-linux-release-x64"
+  triggers: "vm-kernel-gcc-linux"
+  triggers: "vm-kernel-gcc-linux-beta"
+  triggers: "vm-kernel-gcc-linux-dev"
+  triggers: "vm-kernel-gcc-linux-stable"
+  triggers: "vm-kernel-linux-debug-ia32"
+  triggers: "vm-kernel-linux-debug-simriscv64"
+  triggers: "vm-kernel-linux-debug-x64c"
+  triggers: "vm-kernel-linux-product-x64"
+  triggers: "vm-kernel-linux-release-ia32"
+  triggers: "vm-kernel-mac-product-x64"
+  triggers: "vm-kernel-msan-linux-release-x64"
+  triggers: "vm-kernel-nnbd-linux-debug-ia32"
+  triggers: "vm-kernel-nnbd-linux-release-ia32"
+  triggers: "vm-kernel-nnbd-linux-release-simarm"
+  triggers: "vm-kernel-nnbd-linux-release-simarm64"
+  triggers: "vm-kernel-nnbd-mac-debug-arm64"
+  triggers: "vm-kernel-nnbd-mac-debug-x64"
+  triggers: "vm-kernel-nnbd-mac-release-x64"
+  triggers: "vm-kernel-nnbd-win-debug-x64"
+  triggers: "vm-kernel-nnbd-win-release-ia32"
+  triggers: "vm-kernel-nnbd-win-release-x64"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32"
+  triggers: "vm-kernel-precomp-asan-linux-release-x64"
+  triggers: "vm-kernel-precomp-dwarf-linux-product-x64"
+  triggers: "vm-kernel-precomp-linux-debug-simriscv64"
+  triggers: "vm-kernel-precomp-linux-debug-x64c"
+  triggers: "vm-kernel-precomp-msan-linux-release-x64"
+  triggers: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+  triggers: "vm-kernel-precomp-nnbd-linux-debug-x64"
+  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm64"
+  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+  triggers: "vm-kernel-precomp-nnbd-mac-release-simarm64"
+  triggers: "vm-kernel-precomp-nnbd-win-release-x64"
+  triggers: "vm-kernel-precomp-tsan-linux-release-x64"
+  triggers: "vm-kernel-precomp-ubsan-linux-release-x64"
+  triggers: "vm-kernel-precomp-win-debug-x64c"
+  triggers: "vm-kernel-reload-linux-debug-x64"
+  triggers: "vm-kernel-reload-linux-release-x64"
+  triggers: "vm-kernel-reload-rollback-linux-debug-x64"
+  triggers: "vm-kernel-reload-rollback-linux-release-x64"
+  triggers: "vm-kernel-tsan-linux-release-x64"
+  triggers: "vm-kernel-ubsan-linux-release-x64"
+  triggers: "vm-kernel-win-debug-ia32"
+  triggers: "vm-kernel-win-debug-x64c"
+  triggers: "vm-kernel-win-product-x64"
+  triggers: "vm-kernel-win-release-ia32"
+  triggers: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
+  gitiles {
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/main"
+  }
+}
 trigger {
   id: "dart-vm-gitiles-trigger-main"
   realm: "ci"
@@ -4353,6 +4395,17 @@ trigger {
     path_regexps: "runtime/.+"
   }
 }
+trigger {
+  id: "dart-weekly-trigger"
+  realm: "ci"
+  schedule: "0 0 * * SUN"
+  acl_sets: "ci"
+  triggers: "frontend-weekly"
+  gitiles {
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/main"
+  }
+}
 trigger {
   id: "recipes-dart"
   realm: "ci"
diff --git a/main.star b/main.star
index 983f5f466a39..1524b65d2f18 100755
--- a/main.star
+++ b/main.star
@@ -14,7 +14,7 @@ Generates the Luci configuration for the Dart project.
 
 load("//defaults.star", "defaults")
 
-lucicfg.check_version("1.30.5")
+lucicfg.check_version("1.30.9")
 
 luci.builder.defaults.experiments.set({
     # Launch 100% of Swarming tasks in "realms-aware mode", crbug.com/1170330.
@@ -416,6 +416,20 @@ luci.gitiles_poller(
     repo = "https://dart.googlesource.com/external/github.com/flutter/flutter",
     refs = ["refs/heads/master"],
 )
+luci.gitiles_poller(
+    name = "dart-nightly-trigger",
+    bucket = "ci",
+    repo = DART_GIT,
+    refs = ["refs/heads/main"],
+    schedule = "0 5 * * *",  # daily, at 05:00 UTC
+)
+luci.gitiles_poller(
+    name = "dart-weekly-trigger",
+    bucket = "ci",
+    repo = DART_GIT,
+    refs = ["refs/heads/main"],
+    schedule = "0 0 * * SUN",  # weekly, midnight Saturday to Sunday
+)
 
 luci.notifier(
     name = "infra",
@@ -849,27 +863,15 @@ def dart_vm_low_priority_builder(name, **kwargs):
 def dart_vm_nightly_builder(name, **kwargs):
     nightly_builder(name, notifies = "dart-vm-team", **kwargs)
 
-# These lists are used to collect all nightly/weekly builders to give them as
-# properties to the "nightly"/"weekly" builder defined below, which triggers
-# the actual builds using the "cron" recipe.
-#
-# We do not set a schedule on the individual builders because the scheduler
-# doesn't set an input commit when it triggers cron'ed builders, and without
-# an input commit, Milo doesn't know how to show the build on the console.
-nightly_builders = []
-weekly_builders = []
-
 def nightly_builder(name, notifies = "nightly", **kwargs):
     dart_ci_sandbox_builder(
         name,
         notifies = notifies,
         on_cq = False,
         priority = LOW,
-        schedule = "triggered",  # triggered by nightly cron builder
-        triggered_by = None,
+        triggered_by = ["dart-nightly-trigger"],
         **kwargs
     )
-    nightly_builders.append(name)
 
 def weekly_ci_sandbox_builder(name, notifies = None, **kwargs):
     dart_ci_sandbox_builder(
@@ -877,11 +879,9 @@ def weekly_ci_sandbox_builder(name, notifies = None, **kwargs):
         notifies = notifies,
         on_cq = False,
         priority = LOW,
-        schedule = "triggered",  # triggered by weekly cron builder
-        triggered_by = None,
+        triggered_by = ["dart-weekly-trigger"],
         **kwargs
     )
-    weekly_builders.append(name)
 
 # cfe
 dart_ci_sandbox_builder(
@@ -1760,21 +1760,6 @@ nightly_builder(
     notifies = "infra",
 )
 
-dart_infra_builder(
-    "nightly",
-    notifies = "infra",
-    properties = {"builders": nightly_builders},
-    recipe = "cron/cron",
-    schedule = "0 5 * * *",  # daily, at 05:00 UTC
-)
-dart_infra_builder(
-    "weekly",
-    notifies = "infra",
-    properties = {"builders": weekly_builders},
-    recipe = "cron/cron",
-    schedule = "0 0 * * SUN",  # weekly, midnight Saturday to Sunday
-)
-
 dart_ci_sandbox_builder(
     "ci-test-data",
     channels = [],
diff --git a/project.cfg b/project.cfg
index 1e1b7e7070c9..3b6a49f36003 100644
--- a/project.cfg
+++ b/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.30.5"
+  version: "1.30.9"
   package_dir: "."
   config_dir: "."
   entry_point: "main.star"

From 6b6103a321814b69a3f91ed987d295c231f28686 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 4 Feb 2022 07:45:27 +0000
Subject: [PATCH 517/826] [infra] Remove migrated lkgr builder.

Bug: b/216085658
Change-Id: I352dfd1dbe63a0394738c199de1a10c84e5fecec
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/231105
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cr-buildbucket.cfg | 72 ----------------------------------------------
 luci-milo.cfg      |  3 --
 luci-notify.cfg    | 15 ----------
 luci-scheduler.cfg | 11 -------
 main.star          | 22 +-------------
 5 files changed, 1 insertion(+), 122 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 3d751b78e20a..44bbed1bd345 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1354,78 +1354,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "lkgr"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "builders": ['
-        '    {'
-        '      "bucket": "ci",'
-        '      "builder": "dart-sdk-linux",'
-        '      "project": "dart"'
-        '    },'
-        '    {'
-        '      "bucket": "ci",'
-        '      "builder": "dart-sdk-mac",'
-        '      "project": "dart"'
-        '    },'
-        '    {'
-        '      "bucket": "ci",'
-        '      "builder": "dart-sdk-win",'
-        '      "project": "dart"'
-        '    },'
-        '    {'
-        '      "bucket": "ci",'
-        '      "builder": "debianpackage-linux",'
-        '      "project": "dart"'
-        '    },'
-        '    {'
-        '      "bucket": "ci.sandbox",'
-        '      "builder": "google",'
-        '      "project": "dart"'
-        '    }'
-        '  ],'
-        '  "clobber": true,'
-        '  "recipe": "roller/lkgr",'
-        '  "ref": "refs/heads/lkgr"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 900
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
     builders {
       name: "recipe-bundler"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 2ab60e42968f..3c3ba5175d92 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -3126,9 +3126,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci/linearize-flutter"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/lkgr"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.roll/roll-to-dev"
   }
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 4bbcabe5c1ba..7cbd130e213e 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -196,21 +196,6 @@ notifiers {
     name: "linearize-flutter"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "lkgr"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 1dab31e9b372..37af6b20665a 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1702,17 +1702,6 @@ job {
     builder: "linearize-flutter"
   }
 }
-job {
-  id: "lkgr"
-  realm: "ci"
-  schedule: "with 15m interval"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "lkgr"
-  }
-}
 job {
   id: "pkg-linux-debug"
   realm: "ci.sandbox"
diff --git a/main.star b/main.star
index 1524b65d2f18..88335aefcb0a 100755
--- a/main.star
+++ b/main.star
@@ -643,8 +643,6 @@ luci.builder.defaults.properties.set({
     },
 })
 
-lkgr_builders = []
-
 def dart_builder(
         name,
         bucket,
@@ -669,8 +667,7 @@ def dart_builder(
         triggering_policy = None,
         on_cq = False,
         experiment_percentage = None,
-        location_regexp = None,
-        lkgr = False):
+        location_regexp = None):
     """
     Creates a Dart builder on all the specified channels.
 
@@ -699,7 +696,6 @@ def dart_builder(
         on_cq: Whether the build is added to the default set of CQ tryjobs.
         experiment_percentage: What experiment percentage to use.
         location_regexp: Locations that trigger this builder.
-        lkgr: If true, this builder needs to be green to advance the LKGR.
     """
     dimensions = defaults.dimensions(dimensions)
     properties = defaults.properties(properties)
@@ -712,9 +708,6 @@ def dart_builder(
     if "linux" in name and os != "Linux":
         fail("builder %s should be a Linux builder" % name)
 
-    if lkgr:
-        lkgr_builders.append({"project": "dart", "bucket": bucket, "builder": name})
-
     def builder(channel, notifies, triggered_by):
         if channel == "try":
             dart_try_builder(
@@ -1580,7 +1573,6 @@ dart_ci_builder(
     "dart-sdk-linux",
     category = "sdk|l",
     channels = CHANNELS,
-    lkgr = True,
     properties = {
         "$dart/build": {
             "timeout": 100 * 60,  # 100 minutes,
@@ -1592,7 +1584,6 @@ dart_ci_builder(
     category = "sdk|m",
     channels = CHANNELS,
     dimensions = mac(),
-    lkgr = True,
     properties = PINNED_XCODE,
 )
 dart_ci_builder(
@@ -1609,7 +1600,6 @@ dart_ci_builder(
     channels = CHANNELS,
     dimensions = windows(),
     on_cq = True,
-    lkgr = True,
 )
 
 # ddc
@@ -1650,7 +1640,6 @@ dart_ci_builder(
     "debianpackage-linux",
     category = "misc|dp",
     channels = RELEASE_CHANNELS,
-    lkgr = True,
     notifies = "infra",
     properties = {
         "clobber": False,
@@ -1671,7 +1660,6 @@ dart_ci_sandbox_builder(
     category = "flutter|g3",
     channels = [],
     execution_timeout = 5 * time.minute,
-    lkgr = True,
     notifies = None,
     priority = HIGH,
     triggered_by = None,
@@ -1729,14 +1717,6 @@ dart_infra_builder(
     ],
     triggering_policy = scheduler.greedy_batching(max_batch_size = 1),
 )
-dart_infra_builder(
-    "lkgr",
-    execution_timeout = 15 * time.minute,
-    notifies = "infra",
-    properties = {"builders": lkgr_builders, "ref": "refs/heads/lkgr"},
-    recipe = "roller/lkgr",
-    schedule = "with 15m interval",
-)
 dart_infra_builder(
     "roll-to-dev",
     bucket = "ci.roll",

From dce9f1fac1d56e072cb7c10232e8759907cdd569 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Mon, 7 Feb 2022 13:05:51 +0000
Subject: [PATCH 518/826] [infra] Remove migrated sdk main branch builders.

Bug: b/216086329
Change-Id: I7a2efc82a7611a9ac0882a192186703faecc10a8
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/231946
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 cr-buildbucket.cfg | 190 ---------------------------------------------
 luci-milo.cfg      |  40 ----------
 luci-notify.cfg    |  56 -------------
 luci-scheduler.cfg |  48 ------------
 main.star          |   9 ++-
 5 files changed, 8 insertions(+), 335 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 44bbed1bd345..c651e31ed5de 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -378,50 +378,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "dart-sdk-linux"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true,'
-        '    "timeout": 6000'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
     builders {
       name: "dart-sdk-linux-beta"
       swarming_host: "chromium-swarm.appspot.com"
@@ -554,109 +510,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "dart-sdk-mac"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-mac-arm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
     builders {
       name: "dart-sdk-mac-arm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
@@ -966,49 +819,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "dart-sdk-win"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
     builders {
       name: "dart-sdk-win-beta"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 3c3ba5175d92..6c5df04e83fe 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -615,26 +615,6 @@ consoles {
     category: "analyzer|nnbd"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-linux"
-    category: "sdk"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac"
-    category: "sdk"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64"
-    category: "sdk"
-    short_name: "m1"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-win"
-    category: "sdk"
-    short_name: "w"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
     category: "ddc"
@@ -899,26 +879,6 @@ consoles {
     category: "analyzer|nnbd"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-linux"
-    category: "sdk"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac"
-    category: "sdk"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64"
-    category: "sdk"
-    short_name: "m1"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-win"
-    category: "sdk"
-    short_name: "w"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
     category: "ddc"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 7cbd130e213e..02504fc7fec9 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -109,62 +109,6 @@ notifiers {
     name: "dart-ci-scripts-win"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci"
-    name: "dart-sdk-linux"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci"
-    name: "dart-sdk-mac"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci"
-    name: "dart-sdk-mac-arm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci"
-    name: "dart-sdk-win"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 37af6b20665a..497661e4da86 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -466,17 +466,6 @@ job {
     builder: "dart-ci-scripts-win"
   }
 }
-job {
-  id: "dart-sdk-linux"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-linux"
-  }
-}
 job {
   id: "dart-sdk-linux-beta"
   realm: "ci"
@@ -510,28 +499,6 @@ job {
     builder: "dart-sdk-linux-stable"
   }
 }
-job {
-  id: "dart-sdk-mac"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-mac"
-  }
-}
-job {
-  id: "dart-sdk-mac-arm64"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-mac-arm64"
-  }
-}
 job {
   id: "dart-sdk-mac-arm64-beta"
   realm: "ci"
@@ -598,17 +565,6 @@ job {
     builder: "dart-sdk-mac-stable"
   }
 }
-job {
-  id: "dart-sdk-win"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-win"
-  }
-}
 job {
   id: "dart-sdk-win-beta"
   realm: "ci"
@@ -4136,10 +4092,6 @@ trigger {
   id: "dart-gitiles-trigger-main"
   realm: "ci"
   acl_sets: "ci"
-  triggers: "dart-sdk-linux"
-  triggers: "dart-sdk-mac"
-  triggers: "dart-sdk-mac-arm64"
-  triggers: "dart-sdk-win"
   triggers: "debianpackage-linux"
   triggers: "linearize-flutter"
   triggers: "analyzer-analysis-server-linux"
diff --git a/main.star b/main.star
index 88335aefcb0a..1c9a63e5d957 100755
--- a/main.star
+++ b/main.star
@@ -658,6 +658,7 @@ def dart_builder(
         expiration_timeout = None,
         goma = None,
         fyi = False,
+        main_channel = True,
         notifies = "dart",
         priority = NORMAL,
         properties = None,
@@ -686,6 +687,7 @@ def dart_builder(
         expiration_timeout: How long builds should wait for a bot to run on.
         goma: Whether to use goma or not.
         fyi: Whether this is an FYI builder or not.
+        main_channel: Whether to add to the main channel (default: True).
         notifies: Which luci notifier group to notify (default: "dart").
         priority: What swarming priority this builder gets (default: NORMAL).
         properties: Extra properties to set for builds.
@@ -789,7 +791,8 @@ def dart_builder(
                             console_view = "alt",
                         )
 
-    builder(None, notifies = notifies, triggered_by = triggered_by)
+    if main_channel:
+        builder(None, notifies = notifies, triggered_by = triggered_by)
     for channel in channels:
         if enabled:
             builder(channel, notifies = None, triggered_by = triggered_by)
@@ -1573,6 +1576,7 @@ dart_ci_builder(
     "dart-sdk-linux",
     category = "sdk|l",
     channels = CHANNELS,
+    main_channel = False,
     properties = {
         "$dart/build": {
             "timeout": 100 * 60,  # 100 minutes,
@@ -1584,6 +1588,7 @@ dart_ci_builder(
     category = "sdk|m",
     channels = CHANNELS,
     dimensions = mac(),
+    main_channel = False,
     properties = PINNED_XCODE,
 )
 dart_ci_builder(
@@ -1591,6 +1596,7 @@ dart_ci_builder(
     category = "sdk|m1",
     channels = CHANNELS,
     dimensions = mac(cpu = "arm64"),
+    main_channel = False,
     properties = union(NO_ANDROID, PINNED_XCODE),
 )
 
@@ -1599,6 +1605,7 @@ dart_ci_builder(
     category = "sdk|w",
     channels = CHANNELS,
     dimensions = windows(),
+    main_channel = False,
     on_cq = True,
 )
 

From 6aff4d278b837b4e40c4cee6b7a75b4cf659b719 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 9 Feb 2022 12:52:20 +0000
Subject: [PATCH 519/826] [infra] Refactor main.star into modules

* Move most common rules into modules/libraries.
* Break up parts of main.star with side effects into executed modules.
* Move generated files to generated/ (similar to dart-internal).
* Remove obsolete notifiers.
* Enable strict linting and fix all violations.

Change-Id: I6c772565ab7260ff8c0e7a7fbadfac48126a4cb0
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/231660
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cq.star                                       |   68 +
 defaults.star                                 |   29 -
 .../commit-queue.cfg                          |    0
 .../cr-buildbucket.cfg                        |    0
 luci-logdog.cfg => generated/luci-logdog.cfg  |    0
 luci-milo.cfg => generated/luci-milo.cfg      | 2572 ++++++++---------
 luci-notify.cfg => generated/luci-notify.cfg  |  296 +-
 .../email-templates/common.template           |    0
 .../email-templates/default.template          |    0
 .../luci-scheduler.cfg                        |    0
 project.cfg => generated/project.cfg          |    4 +-
 realms.cfg => generated/realms.cfg            |    0
 lib/accounts.star                             |   11 +
 lib/cron.star                                 |   49 +
 lib/dart.star                                 |  318 ++
 lib/defaults.star                             |   78 +
 lib/paths.star                                |   80 +
 lib/priority.star                             |   14 +
 main.star                                     | 1556 ++--------
 project.star                                  |  144 +
 recipes.star                                  |   65 +
 vm.star                                       |  533 ++++
 22 files changed, 2844 insertions(+), 2973 deletions(-)
 create mode 100644 cq.star
 delete mode 100644 defaults.star
 rename commit-queue.cfg => generated/commit-queue.cfg (100%)
 rename cr-buildbucket.cfg => generated/cr-buildbucket.cfg (100%)
 rename luci-logdog.cfg => generated/luci-logdog.cfg (100%)
 rename luci-milo.cfg => generated/luci-milo.cfg (100%)
 rename luci-notify.cfg => generated/luci-notify.cfg (84%)
 rename {luci-notify => generated/luci-notify}/email-templates/common.template (100%)
 rename {luci-notify => generated/luci-notify}/email-templates/default.template (100%)
 rename luci-scheduler.cfg => generated/luci-scheduler.cfg (100%)
 rename project.cfg => generated/project.cfg (85%)
 rename realms.cfg => generated/realms.cfg (100%)
 create mode 100644 lib/accounts.star
 create mode 100644 lib/cron.star
 create mode 100644 lib/dart.star
 create mode 100644 lib/defaults.star
 create mode 100644 lib/paths.star
 create mode 100644 lib/priority.star
 create mode 100644 project.star
 create mode 100644 recipes.star
 create mode 100644 vm.star

diff --git a/cq.star b/cq.star
new file mode 100644
index 000000000000..67a835fe7a57
--- /dev/null
+++ b/cq.star
@@ -0,0 +1,68 @@
+# Copyright (c) 2022 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+CQs for the dart Gerrit host.
+"""
+
+load("//lib/dart.star", "dart")
+
+luci.cq(
+    submit_max_burst = 2,
+    submit_burst_delay = 8 * time.minute,
+    status_host = "chromium-cq-status.appspot.com",
+)
+
+def default_verifiers():
+    return [
+        luci.cq_tryjob_verifier(
+            builder = "presubmit-try",
+            disable_reuse = True,
+        ),
+    ]
+
+DART_GERRIT = "https://dart-review.googlesource.com/"
+
+luci.cq_group(
+    name = "sdk",
+    watch = cq.refset(
+        DART_GERRIT + "sdk",
+        refs = ["refs/heads/%s" % branch for branch in dart.branches],
+    ),
+    allow_submit_with_open_deps = True,
+    tree_status_host = "dart-status.appspot.com",
+    retry_config = cq.RETRY_NONE,
+    verifiers = None,
+)
+
+luci.cq_group(
+    name = "sdk-infra-config",
+    watch = cq.refset(DART_GERRIT + "sdk", refs = ["refs/heads/infra/config"]),
+    allow_submit_with_open_deps = True,
+    tree_status_host = "dart-status.appspot.com",
+    retry_config = cq.RETRY_NONE,
+    verifiers = default_verifiers(),
+)
+
+luci.cq_group(
+    name = "recipes",
+    watch = cq.refset(DART_GERRIT + "recipes", refs = ["refs/heads/main"]),
+    allow_submit_with_open_deps = True,
+    tree_status_host = "dart-status.appspot.com",
+    retry_config = cq.RETRY_NONE,
+    verifiers = default_verifiers(),
+)
+
+luci.cq_group(
+    name = "dart_ci",
+    watch = cq.refset(DART_GERRIT + "dart_ci", refs = ["refs/heads/main"]),
+    allow_submit_with_open_deps = True,
+    tree_status_host = "dart-status.appspot.com",
+    retry_config = cq.RETRY_NONE,
+    verifiers = None,
+)
+
+luci.list_view(
+    name = "cq",
+    title = "SDK CQ Console",
+)
diff --git a/defaults.star b/defaults.star
deleted file mode 100644
index ca0e83a398fa..000000000000
--- a/defaults.star
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2019 The Dart project authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-"""
-Defaults for properties and dimensions used in main.star.
-"""
-
-_PROPERTIES = {"clobber": True}
-_DIMENSIONS = {
-    "cpu": "x86-64",
-    "host_class": "default",
-    "os": "Linux",
-    "pool": "luci.dart.try",
-}
-_CACHES = {
-    "Mac": [swarming.cache("osx_sdk", name = "osx_sdk")],
-}
-
-def _default_dict(defaults, overrides):
-    defaults = dict(defaults)
-    if overrides:
-        defaults.update(overrides)
-    return defaults
-
-defaults = struct(
-    caches = lambda os: _CACHES.get(os),
-    dimensions = lambda dimensions: _default_dict(_DIMENSIONS, dimensions),
-    properties = lambda properties: _default_dict(_PROPERTIES, properties),
-)
diff --git a/commit-queue.cfg b/generated/commit-queue.cfg
similarity index 100%
rename from commit-queue.cfg
rename to generated/commit-queue.cfg
diff --git a/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
similarity index 100%
rename from cr-buildbucket.cfg
rename to generated/cr-buildbucket.cfg
diff --git a/luci-logdog.cfg b/generated/luci-logdog.cfg
similarity index 100%
rename from luci-logdog.cfg
rename to generated/luci-logdog.cfg
diff --git a/luci-milo.cfg b/generated/luci-milo.cfg
similarity index 100%
rename from luci-milo.cfg
rename to generated/luci-milo.cfg
index 6c5df04e83fe..056228fb15b2 100644
--- a/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -5,707 +5,403 @@
 #   https://luci-config.appspot.com/schemas/projects:luci-milo.cfg
 
 consoles {
-  id: "be"
-  name: "SDK Bleeding Edge Console"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/main"
-  manifest_name: "REVISION"
+  id: "cq"
+  name: "SDK CQ Console"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
-    category: "cfe"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/front-end-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
-    category: "cfe"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/front-end-mac-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
-    category: "cfe"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/front-end-win-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64"
-    category: "cfe|nnbd"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/front-end-nnbd-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-mac-release-x64"
-    category: "cfe|nnbd"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/front-end-nnbd-mac-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-win-release-x64"
-    category: "cfe|nnbd"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/front-end-nnbd-win-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
-    category: "cfe"
-    short_name: "fl"
+    name: "buildbucket/luci.dart.try/flutter-frontend-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
-    category: "flutter"
-    short_name: "3H"
+    name: "buildbucket/luci.dart.try/flutter-engine-linux-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-web_tests"
-    category: "flutter"
-    short_name: "web"
+    name: "buildbucket/luci.dart.try/flutter-engine-linux-web_tests-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
-    category: "vm|nnbd|jit"
-    short_name: "d"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64"
-    category: "vm|nnbd|jit"
-    short_name: "r"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-ia32"
-    category: "vm|nnbd|jit"
-    short_name: "d3"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-ia32"
-    category: "vm|nnbd|jit"
-    short_name: "r3"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm"
-    category: "vm|nnbd|jit"
-    short_name: "ra"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-simarm-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm64"
-    category: "vm|nnbd|jit"
-    short_name: "ra6"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-simarm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-arm64"
-    category: "vm|nnbd|jit"
-    short_name: "m1d"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-debug-arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-x64"
-    category: "vm|nnbd|jit"
-    short_name: "md"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-arm64"
-    category: "vm|nnbd|jit"
-    short_name: "m1r"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-release-arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-x64"
-    category: "vm|nnbd|jit"
-    short_name: "mr"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-ia32"
-    category: "vm|nnbd|jit"
-    short_name: "wr3"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-release-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64"
-    category: "vm|nnbd|jit"
-    short_name: "wd"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-x64"
-    category: "vm|nnbd|jit"
-    short_name: "wr"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64"
-    category: "vm|nnbd|aot"
-    short_name: "r"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
-    category: "vm|nnbd|aot"
-    short_name: "da"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm_x64"
-    category: "vm|nnbd|aot"
-    short_name: "ra"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-x64"
-    category: "vm|nnbd|aot"
-    short_name: "d"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64"
-    category: "vm|nnbd|aot"
-    short_name: "ra6"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-arm64"
-    category: "vm|nnbd|aot"
-    short_name: "m1"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-mac-release-arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64"
-    category: "vm|nnbd|aot"
-    short_name: "ma6"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-release-x64"
-    category: "vm|nnbd|aot"
-    short_name: "wr"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-win-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
-    category: "vm|app-kernel"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.try/app-kernel-linux-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64"
-    category: "vm|app-kernel"
-    short_name: "p64"
+    name: "buildbucket/luci.dart.try/app-kernel-linux-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64"
-    category: "vm|app-kernel"
-    short_name: "r64"
+    name: "buildbucket/luci.dart.try/app-kernel-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
-    category: "vm|kernel"
-    short_name: "c"
+    name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
-    category: "vm|kernel"
-    short_name: "d"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
-    category: "vm|kernel"
-    short_name: "a32"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simarm-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
-    category: "vm|kernel"
-    short_name: "a64"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simarm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32"
-    category: "vm|kernel"
-    short_name: "r32"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
-    category: "vm|kernel"
-    short_name: "r"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
-    category: "vm|kernel"
-    short_name: "rc"
+    name: "buildbucket/luci.dart.try/vm-kernel-checked-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32"
-    category: "vm|kernel"
-    short_name: "d32"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
-    category: "vm|kernel"
-    short_name: "md"
+    name: "buildbucket/luci.dart.try/vm-kernel-mac-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
-    category: "vm|kernel"
-    short_name: "mr"
+    name: "buildbucket/luci.dart.try/vm-kernel-mac-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-arm64"
-    category: "vm|kernel"
-    short_name: "m1r"
+    name: "buildbucket/luci.dart.try/vm-kernel-mac-release-arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
-    category: "vm|kernel"
-    short_name: "wd3"
+    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64"
-    category: "vm|kernel"
-    short_name: "wd"
+    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32"
-    category: "vm|kernel"
-    short_name: "wr3"
+    name: "buildbucket/luci.dart.try/vm-kernel-win-release-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
-    category: "vm|kernel"
-    short_name: "wr"
+    name: "buildbucket/luci.dart.try/vm-kernel-win-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
-    category: "vm|kernel"
-    short_name: "cra"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
-    category: "vm|kernel-precomp"
-    short_name: "d"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
-    category: "vm|kernel-precomp"
-    short_name: "p"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
-    category: "vm|kernel-precomp"
-    short_name: "a32"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "a64"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "r"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "o"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-simarm_x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64"
-    category: "vm|kernel-precomp"
-    short_name: "adx"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm_x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64"
-    category: "vm|kernel-precomp"
-    short_name: "arx"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-mac-release-simarm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "ma"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "wr"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-dwarf-linux-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-precomp-linux-release-arm64"
-    category: "vm|kernel-precomp"
-    short_name: "cra"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm_x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-dwarf-linux-product-x64"
-    category: "vm|kernel-precomp"
-    short_name: "dw"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64"
-    category: "vm|kernel-precomp|android"
-    short_name: "a32"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c"
-    category: "vm|kernel-precomp|android"
-    short_name: "a64"
+    name: "buildbucket/luci.dart.try/vm-kernel-mac-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
-    category: "vm|product"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/vm-kernel-win-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
-    category: "vm|product"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
-    category: "vm|product"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
-    category: "vm|misc"
-    short_name: "o32"
+    name: "buildbucket/luci.dart.try/vm-kernel-asan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
-    category: "vm|misc"
-    short_name: "o64"
+    name: "buildbucket/luci.dart.try/vm-kernel-msan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
-    category: "vm|misc"
-    short_name: "a"
+    name: "buildbucket/luci.dart.try/vm-kernel-tsan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msan-linux-release-x64"
-    category: "vm|misc"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/vm-kernel-ubsan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-tsan-linux-release-x64"
-    category: "vm|misc"
-    short_name: "t"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-asan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ubsan-linux-release-x64"
-    category: "vm|misc"
-    short_name: "u"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-msan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-asan-linux-release-x64"
-    category: "vm|misc|aot"
-    short_name: "a"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-tsan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-msan-linux-release-x64"
-    category: "vm|misc|aot"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-ubsan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-tsan-linux-release-x64"
-    category: "vm|misc|aot"
-    short_name: "t"
+    name: "buildbucket/luci.dart.try/vm-kernel-reload-linux-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ubsan-linux-release-x64"
-    category: "vm|misc|aot"
-    short_name: "u"
+    name: "buildbucket/luci.dart.try/vm-kernel-reload-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
-    category: "vm|misc|reload"
-    short_name: "d"
+    name: "buildbucket/luci.dart.try/vm-kernel-reload-rollback-linux-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
-    category: "vm|misc|reload"
-    short_name: "r"
+    name: "buildbucket/luci.dart.try/vm-kernel-reload-rollback-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
-    category: "vm|misc|reload"
-    short_name: "drb"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64"
-    category: "vm|misc|reload"
-    short_name: "rrb"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64c"
-    category: "vm|misc|compressed"
-    short_name: "jl"
+    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-x64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64c"
-    category: "vm|misc|compressed"
-    short_name: "al"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-debug-x64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64c"
-    category: "vm|misc|compressed"
-    short_name: "jw"
+    name: "buildbucket/luci.dart.try/vm-fuchsia-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-debug-x64c"
-    category: "vm|misc|compressed"
-    short_name: "aw"
+    name: "buildbucket/luci.dart.try/vm-kernel-gcc-linux-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-fuchsia-release-x64"
-    category: "vm|misc"
-    short_name: "f"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-simriscv64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux"
-    category: "vm|misc"
-    short_name: "g"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-simriscv64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simriscv64"
-    category: "vm|misc"
-    short_name: "rv64"
+    name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simriscv64"
-    category: "vm|misc"
-    short_name: "rv64"
+    name: "buildbucket/luci.dart.try/vm-ffi-android-release-arm-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
-    category: "vm|ffi"
-    short_name: "d32"
+    name: "buildbucket/luci.dart.try/vm-ffi-android-product-arm-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm"
-    category: "vm|ffi"
-    short_name: "r32"
+    name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm"
-    category: "vm|ffi"
-    short_name: "p32"
+    name: "buildbucket/luci.dart.try/vm-ffi-android-release-arm64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c"
-    category: "vm|ffi"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.try/vm-ffi-android-product-arm64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c"
-    category: "vm|ffi"
-    short_name: "r64"
+    name: "buildbucket/luci.dart.try/vm-precomp-ffi-qemu-linux-release-arm-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c"
-    category: "vm|ffi"
-    short_name: "p64"
+    name: "buildbucket/luci.dart.try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm"
-    category: "vm|ffi"
-    short_name: "qa"
+    name: "buildbucket/luci.dart.try/pkg-linux-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64"
-    category: "vm|ffi"
-    short_name: "qr"
+    name: "buildbucket/luci.dart.try/pkg-mac-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
-    category: "pkg"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/pkg-mac-release-arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
-    category: "pkg"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/pkg-win-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-arm64"
-    category: "pkg"
-    short_name: "m1"
+    name: "buildbucket/luci.dart.try/pkg-linux-debug-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
-    category: "pkg"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/dart2js-canary-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
-    category: "pkg"
-    short_name: "ld"
+    name: "buildbucket/luci.dart.try/dart2js-strong-hostasserts-linux-ia32-d8-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64"
-    category: "dart2js"
-    short_name: "c"
+    name: "buildbucket/luci.dart.try/dart2js-minified-strong-linux-x64-d8-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
-    category: "dart2js|d8"
-    short_name: "ha"
+    name: "buildbucket/luci.dart.try/dart2js-unit-linux-x64-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
-    category: "dart2js|d8"
-    short_name: "mi"
+    name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
-    category: "dart2js|d8"
-    short_name: "u"
+    name: "buildbucket/luci.dart.try/dart2js-csp-minified-linux-x64-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/dart2js-strong-mac-x64-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "csp"
+    name: "buildbucket/luci.dart.try/dart2js-strong-win-x64-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/dart2js-nnbd-linux-x64-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-firefox-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "nn"
+    name: "buildbucket/luci.dart.try/dart2js-strong-mac-x64-safari-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/flutter-analyze-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/analyzer-analysis-server-linux-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
-    category: "dart2js|safari"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/analyzer-linux-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
-    category: "analyzer"
-    short_name: "fa"
+    name: "buildbucket/luci.dart.try/analyzer-mac-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
-    category: "analyzer"
-    short_name: "as"
+    name: "buildbucket/luci.dart.try/analyzer-win-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
-    category: "analyzer"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/analyzer-nnbd-linux-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
-    category: "analyzer"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/analyzer-nnbd-mac-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
-    category: "analyzer"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/analyzer-nnbd-win-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release"
-    category: "analyzer|nnbd"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/dart-sdk-linux-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-mac-release"
-    category: "analyzer|nnbd"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/dart-sdk-mac-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-win-release"
-    category: "analyzer|nnbd"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/dart-sdk-mac-arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
-    category: "ddc"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/dart-sdk-win-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-nnbd-linux-release-chrome"
-    category: "ddc"
-    short_name: "nn"
+    name: "buildbucket/luci.dart.try/ddc-linux-release-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
-    category: "ddc"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/ddc-nnbd-linux-release-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
-    category: "ddc"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/ddc-mac-release-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox"
-    category: "ddc"
-    short_name: "fl"
+    name: "buildbucket/luci.dart.try/ddc-win-release-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/gclient"
-    category: "misc"
-    short_name: "g"
+    name: "buildbucket/luci.dart.try/ddk-linux-release-firefox-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux"
-    category: "misc"
-    short_name: "dp"
+    name: "buildbucket/luci.dart.try/gclient-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/google"
-    category: "flutter"
-    short_name: "g3"
+    name: "buildbucket/luci.dart.try/benchmark-linux-try"
   }
-  header {
-    links {
-      name: "Consoles"
-      links {
-        text: "Bleeding Edge console"
-        url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
-      }
-      links {
-        text: "Alternative Bleeding Edge console"
-        url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
-      }
-      links {
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
-      }
-      links {
-        text: "SDK CQ Status"
-        url: "/p/dart/g/cq/builders"
-        alt: "SDK CQ Status"
-      }
-      links {
-        text: "Results Feed"
-        url: "https://dart-ci.firebaseapp.com/"
-        alt: "Results Feed"
-      }
-      links {
-        text: "Current Test Results"
-        url: "https://dart-ci.firebaseapp.com/current_results/"
-        alt: "Current Test Results"
-      }
-      links {
-        text: "Dart Infrastructure chat"
-        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
-        alt: "Dart Infrastructure chat"
-      }
-    }
-    console_groups {
-      console_ids: "dart/dart-fuzz"
-      console_ids: "dart/flutter"
-      console_ids: "dart/flutter-hhh"
-      console_ids: "dart/iso-stress"
-    }
-    tree_status_host: "dart-status.appspot.com"
+  builders {
+    name: "buildbucket/luci.dart.try.shared/presubmit-try"
   }
+  builder_view_only: true
 }
 consoles {
-  id: "alt"
-  name: "SDK Bleeding Edge Console (alternative)"
+  id: "be"
+  name: "SDK Bleeding Edge Console"
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "regexp:refs/heads/main"
   manifest_name: "REVISION"
@@ -754,171 +450,6 @@ consoles {
     category: "flutter"
     short_name: "web"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
-    category: "pkg"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
-    category: "pkg"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-arm64"
-    category: "pkg"
-    short_name: "m1"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
-    category: "pkg"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
-    category: "pkg"
-    short_name: "ld"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64"
-    category: "dart2js"
-    short_name: "c"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
-    category: "dart2js|d8"
-    short_name: "ha"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
-    category: "dart2js|d8"
-    short_name: "mi"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
-    category: "dart2js|d8"
-    short_name: "u"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "nn"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
-    category: "dart2js|safari"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
-    category: "analyzer"
-    short_name: "fa"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
-    category: "analyzer"
-    short_name: "as"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
-    category: "analyzer"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
-    category: "analyzer"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
-    category: "analyzer"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release"
-    category: "analyzer|nnbd"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-mac-release"
-    category: "analyzer|nnbd"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-win-release"
-    category: "analyzer|nnbd"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
-    category: "ddc"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-nnbd-linux-release-chrome"
-    category: "ddc"
-    short_name: "nn"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
-    category: "ddc"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
-    category: "ddc"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox"
-    category: "ddc"
-    short_name: "fl"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/gclient"
-    category: "misc"
-    short_name: "g"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux"
-    category: "misc"
-    short_name: "dp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/google"
-    category: "flutter"
-    short_name: "g3"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
     category: "vm|nnbd|jit"
@@ -1354,808 +885,869 @@ consoles {
     category: "vm|ffi"
     short_name: "qr"
   }
-  header {
-    links {
-      name: "Consoles"
-      links {
-        text: "Bleeding Edge console"
-        url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
-      }
-      links {
-        text: "Alternative Bleeding Edge console"
-        url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
-      }
-      links {
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
-      }
-      links {
-        text: "SDK CQ Status"
-        url: "/p/dart/g/cq/builders"
-        alt: "SDK CQ Status"
-      }
-      links {
-        text: "Results Feed"
-        url: "https://dart-ci.firebaseapp.com/"
-        alt: "Results Feed"
-      }
-      links {
-        text: "Current Test Results"
-        url: "https://dart-ci.firebaseapp.com/current_results/"
-        alt: "Current Test Results"
-      }
-      links {
-        text: "Dart Infrastructure chat"
-        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
-        alt: "Dart Infrastructure chat"
-      }
-    }
-    console_groups {
-      console_ids: "dart/dart-fuzz"
-      console_ids: "dart/flutter"
-      console_ids: "dart/flutter-hhh"
-      console_ids: "dart/iso-stress"
-    }
-    tree_status_host: "dart-status.appspot.com"
-  }
-}
-consoles {
-  id: "dev"
-  name: "SDK Dev Console"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/dev"
-  manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-dev"
-    category: "cfe"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
+    category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-dev"
-    category: "cfe"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
+    category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-dev"
-    category: "cfe"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-arm64"
+    category: "pkg"
+    short_name: "m1"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
+    category: "pkg"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-dev"
-    category: "cfe|nnbd"
-    short_name: "l"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
+    category: "pkg"
+    short_name: "ld"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-dev"
-    category: "vm|nnbd|jit"
-    short_name: "d"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64"
+    category: "dart2js"
+    short_name: "c"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-dev"
-    category: "vm|nnbd|jit"
-    short_name: "r"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
+    category: "dart2js|d8"
+    short_name: "ha"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-dev"
-    category: "vm|nnbd|aot"
-    short_name: "r"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
+    category: "dart2js|d8"
+    short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-dev"
-    category: "vm|app-kernel"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
+    category: "dart2js|d8"
+    short_name: "u"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-dev"
-    category: "vm|app-kernel"
-    short_name: "r64"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-dev"
-    category: "vm|kernel"
-    short_name: "c"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-dev"
-    category: "vm|kernel"
-    short_name: "d"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-dev"
-    category: "vm|kernel"
-    short_name: "a32"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-dev"
-    category: "vm|kernel"
-    short_name: "a64"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "nn"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-dev"
-    category: "vm|kernel"
-    short_name: "r"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-dev"
-    category: "vm|kernel"
-    short_name: "rc"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-dev"
-    category: "vm|kernel"
-    short_name: "md"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
+    category: "dart2js|safari"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-dev"
-    category: "vm|kernel"
-    short_name: "mr"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
+    category: "analyzer"
+    short_name: "fa"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-arm64-dev"
-    category: "vm|kernel"
-    short_name: "m1r"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
+    category: "analyzer"
+    short_name: "as"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-dev"
-    category: "vm|kernel"
-    short_name: "wd"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
+    category: "analyzer"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-dev"
-    category: "vm|kernel"
-    short_name: "wr"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
+    category: "analyzer"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "d"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
+    category: "analyzer"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "p"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release"
+    category: "analyzer|nnbd"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-dev"
-    category: "vm|kernel-precomp"
-    short_name: "a32"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-mac-release"
+    category: "analyzer|nnbd"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "a64"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-win-release"
+    category: "analyzer|nnbd"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "r"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
+    category: "ddc"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "o"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-nnbd-linux-release-chrome"
+    category: "ddc"
+    short_name: "nn"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "adx"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
+    category: "ddc"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "arx"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
+    category: "ddc"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "ma"
+    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox"
+    category: "ddc"
+    short_name: "fl"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "wr"
+    name: "buildbucket/luci.dart.ci.sandbox/gclient"
+    category: "misc"
+    short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-dev"
-    category: "vm|kernel-precomp|android"
-    short_name: "a32"
+    name: "buildbucket/luci.dart.ci/debianpackage-linux"
+    category: "misc"
+    short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-dev"
-    category: "vm|kernel-precomp|android"
-    short_name: "a64"
+    name: "buildbucket/luci.dart.ci.sandbox/google"
+    category: "flutter"
+    short_name: "g3"
   }
+  header {
+    links {
+      name: "Consoles"
+      links {
+        text: "Bleeding Edge console"
+        url: "/p/dart/g/be/console"
+        alt: "SDK BE Console"
+      }
+      links {
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (alternative)"
+      }
+      links {
+        text: "FYI console"
+        url: "/p/dart/g/fyi/console"
+        alt: "SDK FYI Console"
+      }
+      links {
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      }
+      links {
+        text: "Results Feed"
+        url: "https://dart-ci.firebaseapp.com/"
+        alt: "Results Feed"
+      }
+      links {
+        text: "Current Test Results"
+        url: "https://dart-ci.firebaseapp.com/current_results/"
+        alt: "Current Test Results"
+      }
+      links {
+        text: "Dart Infrastructure chat"
+        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
+        alt: "Dart Infrastructure chat"
+      }
+    }
+    console_groups {
+      console_ids: "dart/dart-fuzz"
+      console_ids: "dart/flutter"
+      console_ids: "dart/flutter-hhh"
+      console_ids: "dart/iso-stress"
+    }
+    tree_status_host: "dart-status.appspot.com"
+  }
+}
+consoles {
+  id: "alt"
+  name: "SDK Bleeding Edge Console (alternative)"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/main"
+  manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-dev"
-    category: "vm|misc"
-    short_name: "g"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
+    category: "cfe"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-dev"
-    category: "vm|ffi"
-    short_name: "d32"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
+    category: "cfe"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-dev"
-    category: "vm|ffi"
-    short_name: "r32"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
+    category: "cfe"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-dev"
-    category: "vm|ffi"
-    short_name: "p32"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64"
+    category: "cfe|nnbd"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-dev"
-    category: "vm|ffi"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-mac-release-x64"
+    category: "cfe|nnbd"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-dev"
-    category: "vm|ffi"
-    short_name: "r64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-win-release-x64"
+    category: "cfe|nnbd"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-dev"
-    category: "vm|ffi"
-    short_name: "p64"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
+    category: "cfe"
+    short_name: "fl"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-dev"
-    category: "vm|ffi"
-    short_name: "qa"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
+    category: "flutter"
+    short_name: "3H"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-dev"
-    category: "vm|ffi"
-    short_name: "qr"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-web_tests"
+    category: "flutter"
+    short_name: "web"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-arm64"
+    category: "pkg"
+    short_name: "m1"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
     category: "pkg"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
+    category: "pkg"
+    short_name: "ld"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64"
     category: "dart2js"
     short_name: "c"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
     category: "dart2js|d8"
     short_name: "ha"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
     category: "dart2js|d8"
     short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
     category: "dart2js|d8"
     short_name: "u"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "nn"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
     category: "dart2js|firefox"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
     category: "dart2js|safari"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
+    category: "analyzer"
+    short_name: "fa"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
     category: "analyzer"
     short_name: "as"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
     category: "analyzer"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
     category: "analyzer"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
     category: "analyzer"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release"
     category: "analyzer|nnbd"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-linux-dev"
-    category: "sdk"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-dev"
-    category: "sdk"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-mac-release"
+    category: "analyzer|nnbd"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-dev"
-    category: "sdk"
-    short_name: "m1"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-win-dev"
-    category: "sdk"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-win-release"
+    category: "analyzer|nnbd"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-nnbd-linux-release-chrome"
+    category: "ddc"
+    short_name: "nn"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox"
     category: "ddc"
     short_name: "fl"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/gclient-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/gclient"
     category: "misc"
     short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux-dev"
+    name: "buildbucket/luci.dart.ci/debianpackage-linux"
     category: "misc"
     short_name: "dp"
   }
-  header {
-    links {
-      name: "Consoles"
-      links {
-        text: "Bleeding Edge console"
-        url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
-      }
-      links {
-        text: "Alternative Bleeding Edge console"
-        url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
-      }
-      links {
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
-      }
-      links {
-        text: "SDK CQ Status"
-        url: "/p/dart/g/cq/builders"
-        alt: "SDK CQ Status"
-      }
-      links {
-        text: "Results Feed"
-        url: "https://dart-ci.firebaseapp.com/"
-        alt: "Results Feed"
-      }
-      links {
-        text: "Current Test Results"
-        url: "https://dart-ci.firebaseapp.com/current_results/"
-        alt: "Current Test Results"
-      }
-      links {
-        text: "Dart Infrastructure chat"
-        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
-        alt: "Dart Infrastructure chat"
-      }
-    }
-    console_groups {
-      console_ids: "dart/dart-fuzz"
-      console_ids: "dart/flutter"
-      console_ids: "dart/flutter-hhh"
-      console_ids: "dart/iso-stress"
-    }
-    tree_status_host: "dart-status.appspot.com"
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/google"
+    category: "flutter"
+    short_name: "g3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
+    category: "vm|nnbd|jit"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64"
+    category: "vm|nnbd|jit"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-ia32"
+    category: "vm|nnbd|jit"
+    short_name: "d3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-ia32"
+    category: "vm|nnbd|jit"
+    short_name: "r3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm"
+    category: "vm|nnbd|jit"
+    short_name: "ra"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm64"
+    category: "vm|nnbd|jit"
+    short_name: "ra6"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-arm64"
+    category: "vm|nnbd|jit"
+    short_name: "m1d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-x64"
+    category: "vm|nnbd|jit"
+    short_name: "md"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-arm64"
+    category: "vm|nnbd|jit"
+    short_name: "m1r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-x64"
+    category: "vm|nnbd|jit"
+    short_name: "mr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-ia32"
+    category: "vm|nnbd|jit"
+    short_name: "wr3"
   }
-}
-consoles {
-  id: "beta"
-  name: "SDK Beta Console"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/beta"
-  manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-beta"
-    category: "cfe"
-    short_name: "l"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64"
+    category: "vm|nnbd|jit"
+    short_name: "wd"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-beta"
-    category: "cfe"
-    short_name: "m"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-x64"
+    category: "vm|nnbd|jit"
+    short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-beta"
-    category: "cfe"
-    short_name: "w"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64"
+    category: "vm|nnbd|aot"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-beta"
-    category: "cfe|nnbd"
-    short_name: "l"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+    category: "vm|nnbd|aot"
+    short_name: "da"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-beta"
-    category: "vm|nnbd|jit"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+    category: "vm|nnbd|aot"
+    short_name: "ra"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-x64"
+    category: "vm|nnbd|aot"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-beta"
-    category: "vm|nnbd|jit"
-    short_name: "r"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64"
+    category: "vm|nnbd|aot"
+    short_name: "ra6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-arm64"
     category: "vm|nnbd|aot"
-    short_name: "r"
+    short_name: "m1"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64"
+    category: "vm|nnbd|aot"
+    short_name: "ma6"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-release-x64"
+    category: "vm|nnbd|aot"
+    short_name: "wr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
     category: "vm|app-kernel"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64"
+    category: "vm|app-kernel"
+    short_name: "p64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64"
     category: "vm|app-kernel"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
     category: "vm|kernel"
     short_name: "c"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
     category: "vm|kernel"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32"
+    category: "vm|kernel"
+    short_name: "r32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
     category: "vm|kernel"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
     category: "vm|kernel"
     short_name: "rc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32"
+    category: "vm|kernel"
+    short_name: "d32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
     category: "vm|kernel"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
     category: "vm|kernel"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-arm64"
+    category: "vm|kernel"
+    short_name: "m1r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
+    category: "vm|kernel"
+    short_name: "wd3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64"
     category: "vm|kernel"
     short_name: "wd"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32"
+    category: "vm|kernel"
+    short_name: "wr3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
     category: "vm|kernel"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
+    category: "vm|kernel"
+    short_name: "cra"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
     category: "vm|kernel-precomp"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
     category: "vm|kernel-precomp"
     short_name: "p"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
     category: "vm|kernel-precomp"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
     category: "vm|kernel-precomp"
     short_name: "o"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64"
     category: "vm|kernel-precomp"
     short_name: "adx"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64"
     category: "vm|kernel-precomp"
     short_name: "arx"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "ma"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-precomp-linux-release-arm64"
+    category: "vm|kernel-precomp"
+    short_name: "cra"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-dwarf-linux-product-x64"
+    category: "vm|kernel-precomp"
+    short_name: "dw"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64"
     category: "vm|kernel-precomp|android"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c"
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-beta"
-    category: "vm|misc"
-    short_name: "g"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
+    category: "vm|product"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-beta"
-    category: "vm|ffi"
-    short_name: "d32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
+    category: "vm|product"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-beta"
-    category: "vm|ffi"
-    short_name: "r32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
+    category: "vm|product"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-beta"
-    category: "vm|ffi"
-    short_name: "p32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
+    category: "vm|misc"
+    short_name: "o32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-beta"
-    category: "vm|ffi"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
+    category: "vm|misc"
+    short_name: "o64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-beta"
-    category: "vm|ffi"
-    short_name: "r64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "a"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-beta"
-    category: "vm|ffi"
-    short_name: "p64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-beta"
-    category: "vm|ffi"
-    short_name: "qa"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-tsan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "t"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-beta"
-    category: "vm|ffi"
-    short_name: "qr"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ubsan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "u"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-beta"
-    category: "pkg"
-    short_name: "l"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-asan-linux-release-x64"
+    category: "vm|misc|aot"
+    short_name: "a"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-beta"
-    category: "pkg"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-msan-linux-release-x64"
+    category: "vm|misc|aot"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-beta"
-    category: "pkg"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-beta"
-    category: "dart2js"
-    short_name: "c"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-beta"
-    category: "dart2js|d8"
-    short_name: "ha"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-beta"
-    category: "dart2js|d8"
-    short_name: "mi"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-tsan-linux-release-x64"
+    category: "vm|misc|aot"
+    short_name: "t"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-beta"
-    category: "dart2js|d8"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ubsan-linux-release-x64"
+    category: "vm|misc|aot"
     short_name: "u"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-beta"
-    category: "dart2js|chrome"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-beta"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-beta"
-    category: "dart2js|chrome"
-    short_name: "m"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
+    category: "vm|misc|reload"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-beta"
-    category: "dart2js|chrome"
-    short_name: "w"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
+    category: "vm|misc|reload"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-beta"
-    category: "dart2js|chrome"
-    short_name: "nn"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
+    category: "vm|misc|reload"
+    short_name: "drb"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-beta"
-    category: "dart2js|firefox"
-    short_name: "l"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64"
+    category: "vm|misc|reload"
+    short_name: "rrb"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-beta"
-    category: "dart2js|safari"
-    short_name: "m"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "jl"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-beta"
-    category: "analyzer"
-    short_name: "as"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "al"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-beta"
-    category: "analyzer"
-    short_name: "l"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "jw"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-beta"
-    category: "analyzer"
-    short_name: "m"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "aw"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-beta"
-    category: "analyzer"
-    short_name: "w"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-fuchsia-release-x64"
+    category: "vm|misc"
+    short_name: "f"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-beta"
-    category: "analyzer|nnbd"
-    short_name: "l"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux"
+    category: "vm|misc"
+    short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-linux-beta"
-    category: "sdk"
-    short_name: "l"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simriscv64"
+    category: "vm|misc"
+    short_name: "rv64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-beta"
-    category: "sdk"
-    short_name: "m"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simriscv64"
+    category: "vm|misc"
+    short_name: "rv64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-beta"
-    category: "sdk"
-    short_name: "m1"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
+    category: "vm|ffi"
+    short_name: "d32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-win-beta"
-    category: "sdk"
-    short_name: "w"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm"
+    category: "vm|ffi"
+    short_name: "r32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-beta"
-    category: "ddc"
-    short_name: "l"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm"
+    category: "vm|ffi"
+    short_name: "p32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-beta"
-    category: "ddc"
-    short_name: "m"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c"
+    category: "vm|ffi"
+    short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-beta"
-    category: "ddc"
-    short_name: "w"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c"
+    category: "vm|ffi"
+    short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-beta"
-    category: "ddc"
-    short_name: "fl"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c"
+    category: "vm|ffi"
+    short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/gclient-beta"
-    category: "misc"
-    short_name: "g"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm"
+    category: "vm|ffi"
+    short_name: "qa"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux-beta"
-    category: "misc"
-    short_name: "dp"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64"
+    category: "vm|ffi"
+    short_name: "qr"
   }
   header {
     links {
@@ -2206,353 +1798,358 @@ consoles {
   }
 }
 consoles {
-  id: "stable"
-  name: "SDK Stable Console"
+  id: "dev"
+  name: "SDK Dev Console"
   repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/stable"
+  refs: "regexp:refs/heads/dev"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-dev"
     category: "cfe"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-dev"
     category: "cfe"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-dev"
     category: "cfe"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-dev"
     category: "cfe|nnbd"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-dev"
     category: "vm|nnbd|jit"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-dev"
     category: "vm|nnbd|jit"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-dev"
     category: "vm|nnbd|aot"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-dev"
     category: "vm|app-kernel"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-dev"
     category: "vm|app-kernel"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-dev"
     category: "vm|kernel"
     short_name: "c"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-dev"
     category: "vm|kernel"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-dev"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-dev"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-dev"
     category: "vm|kernel"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-dev"
     category: "vm|kernel"
     short_name: "rc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-dev"
     category: "vm|kernel"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-dev"
     category: "vm|kernel"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-arm64-dev"
+    category: "vm|kernel"
+    short_name: "m1r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-dev"
     category: "vm|kernel"
     short_name: "wd"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-dev"
     category: "vm|kernel"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "p"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-dev"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-dev"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "o"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-dev"
     category: "vm|kernel-precomp"
     short_name: "adx"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-dev"
     category: "vm|kernel-precomp"
     short_name: "arx"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-dev"
     category: "vm|kernel-precomp"
     short_name: "ma"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-dev"
     category: "vm|kernel-precomp|android"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-dev"
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-dev"
     category: "vm|misc"
     short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-dev"
     category: "vm|ffi"
     short_name: "d32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-dev"
     category: "vm|ffi"
     short_name: "r32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-dev"
     category: "vm|ffi"
     short_name: "p32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-dev"
     category: "vm|ffi"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-dev"
     category: "vm|ffi"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-dev"
     category: "vm|ffi"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-dev"
     category: "vm|ffi"
     short_name: "qa"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-dev"
     category: "vm|ffi"
     short_name: "qr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-dev"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-dev"
     category: "pkg"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-dev"
     category: "dart2js"
     short_name: "c"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-dev"
     category: "dart2js|d8"
     short_name: "ha"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-dev"
     category: "dart2js|d8"
     short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-dev"
     category: "dart2js|d8"
     short_name: "u"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "nn"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-dev"
     category: "dart2js|firefox"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-dev"
     category: "dart2js|safari"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-dev"
     category: "analyzer"
     short_name: "as"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-dev"
     category: "analyzer"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-dev"
     category: "analyzer"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-dev"
     category: "analyzer"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-dev"
     category: "analyzer|nnbd"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-linux-stable"
+    name: "buildbucket/luci.dart.ci/dart-sdk-linux-dev"
     category: "sdk"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-stable"
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-dev"
     category: "sdk"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-stable"
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-dev"
     category: "sdk"
     short_name: "m1"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-win-stable"
+    name: "buildbucket/luci.dart.ci/dart-sdk-win-dev"
     category: "sdk"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-dev"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-dev"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-dev"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-dev"
     category: "ddc"
     short_name: "fl"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/gclient-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/gclient-dev"
     category: "misc"
     short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux-stable"
+    name: "buildbucket/luci.dart.ci/debianpackage-linux-dev"
     category: "misc"
     short_name: "dp"
   }
@@ -2605,457 +2202,860 @@ consoles {
   }
 }
 consoles {
-  id: "dart-fuzz"
-  name: "Dart Fuzzer Console"
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/fuzz-linux"
-  }
-  builder_view_only: true
-}
-consoles {
-  id: "flutter"
-  name: "Dart/Flutter Console"
+  id: "beta"
+  name: "SDK Beta Console"
   repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/main"
+  refs: "regexp:refs/heads/beta"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
-    category: "analyzer"
-    short_name: "fa"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-beta"
+    category: "cfe"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
-    category: "fasta"
-    short_name: "fl"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-beta"
+    category: "cfe"
+    short_name: "m"
   }
-}
-consoles {
-  id: "flutter-hhh"
-  name: "Dart/Flutter Linear History Console"
-  repo_url: "https://dart.googlesource.com/linear_sdk_flutter_engine"
-  refs: "regexp:refs/heads/master"
-  manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
-    category: "flutter"
-    short_name: "3H"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-beta"
+    category: "cfe"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-web_tests"
-    category: "flutter"
-    short_name: "web"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-beta"
+    category: "cfe|nnbd"
+    short_name: "l"
   }
-}
-consoles {
-  id: "iso-stress"
-  name: "VM Isolate Stress Test Console"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/iso-stress-linux"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-beta"
+    category: "vm|nnbd|jit"
+    short_name: "d"
   }
-  builder_view_only: true
-}
-consoles {
-  id: "fyi"
-  name: "SDK FYI Console"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/main"
-  manifest_name: "REVISION"
-}
-consoles {
-  id: "cq"
-  name: "SDK CQ Console"
   builders {
-    name: "buildbucket/luci.dart.try/front-end-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-beta"
+    category: "vm|nnbd|jit"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.try/front-end-mac-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-beta"
+    category: "vm|nnbd|aot"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.try/front-end-win-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-beta"
+    category: "vm|app-kernel"
+    short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/front-end-nnbd-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-beta"
+    category: "vm|app-kernel"
+    short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/front-end-nnbd-mac-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-beta"
+    category: "vm|kernel"
+    short_name: "c"
   }
   builders {
-    name: "buildbucket/luci.dart.try/front-end-nnbd-win-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-beta"
+    category: "vm|kernel"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-frontend-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-beta"
+    category: "vm|kernel"
+    short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-engine-linux-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-beta"
+    category: "vm|kernel"
+    short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-engine-linux-web_tests-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-beta"
+    category: "vm|kernel"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-beta"
+    category: "vm|kernel"
+    short_name: "rc"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-beta"
+    category: "vm|kernel"
+    short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-ia32-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-beta"
+    category: "vm|kernel"
+    short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-ia32-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-beta"
+    category: "vm|kernel"
+    short_name: "wd"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-simarm-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-beta"
+    category: "vm|kernel"
+    short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-simarm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-debug-arm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "p"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-beta"
+    category: "vm|kernel-precomp"
+    short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-release-arm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-release-ia32-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "o"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "adx"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "arx"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "ma"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-beta"
+    category: "vm|kernel-precomp|android"
+    short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-beta"
+    category: "vm|kernel-precomp|android"
+    short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-beta"
+    category: "vm|misc"
+    short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-mac-release-arm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-beta"
+    category: "vm|ffi"
+    short_name: "d32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-beta"
+    category: "vm|ffi"
+    short_name: "r32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-win-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-beta"
+    category: "vm|ffi"
+    short_name: "p32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/app-kernel-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-beta"
+    category: "vm|ffi"
+    short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/app-kernel-linux-product-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-beta"
+    category: "vm|ffi"
+    short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/app-kernel-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-beta"
+    category: "vm|ffi"
+    short_name: "p64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-beta"
+    category: "vm|ffi"
+    short_name: "qa"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-beta"
+    category: "vm|ffi"
+    short_name: "qr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-beta"
+    category: "pkg"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-beta"
+    category: "pkg"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-beta"
+    category: "pkg"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-beta"
+    category: "dart2js"
+    short_name: "c"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-beta"
+    category: "dart2js|d8"
+    short_name: "ha"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-beta"
+    category: "dart2js|d8"
+    short_name: "mi"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-beta"
+    category: "dart2js|d8"
+    short_name: "u"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-beta"
+    category: "dart2js|chrome"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-beta"
+    category: "dart2js|chrome"
+    short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-beta"
+    category: "dart2js|chrome"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simarm-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-beta"
+    category: "dart2js|chrome"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simarm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-beta"
+    category: "dart2js|chrome"
+    short_name: "nn"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-ia32-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-beta"
+    category: "dart2js|firefox"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-beta"
+    category: "dart2js|safari"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-checked-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-beta"
+    category: "analyzer"
+    short_name: "as"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-ia32-try"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-beta"
+    category: "analyzer"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-mac-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-beta"
+    category: "analyzer"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-mac-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-beta"
+    category: "analyzer"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-mac-release-arm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-beta"
+    category: "analyzer|nnbd"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-ia32-try"
+    name: "buildbucket/luci.dart.ci/dart-sdk-linux-beta"
+    category: "sdk"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-x64-try"
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-beta"
+    category: "sdk"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-release-ia32-try"
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-beta"
+    category: "sdk"
+    short_name: "m1"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-release-x64-try"
+    name: "buildbucket/luci.dart.ci/dart-sdk-win-beta"
+    category: "sdk"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-beta"
+    category: "ddc"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-product-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-beta"
+    category: "ddc"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm-try"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-beta"
+    category: "ddc"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-beta"
+    category: "ddc"
+    short_name: "fl"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/gclient-beta"
+    category: "misc"
+    short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci/debianpackage-linux-beta"
+    category: "misc"
+    short_name: "dp"
+  }
+  header {
+    links {
+      name: "Consoles"
+      links {
+        text: "Bleeding Edge console"
+        url: "/p/dart/g/be/console"
+        alt: "SDK BE Console"
+      }
+      links {
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (alternative)"
+      }
+      links {
+        text: "FYI console"
+        url: "/p/dart/g/fyi/console"
+        alt: "SDK FYI Console"
+      }
+      links {
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      }
+      links {
+        text: "Results Feed"
+        url: "https://dart-ci.firebaseapp.com/"
+        alt: "Results Feed"
+      }
+      links {
+        text: "Current Test Results"
+        url: "https://dart-ci.firebaseapp.com/current_results/"
+        alt: "Current Test Results"
+      }
+      links {
+        text: "Dart Infrastructure chat"
+        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
+        alt: "Dart Infrastructure chat"
+      }
+    }
+    console_groups {
+      console_ids: "dart/dart-fuzz"
+      console_ids: "dart/flutter"
+      console_ids: "dart/flutter-hhh"
+      console_ids: "dart/iso-stress"
+    }
+    tree_status_host: "dart-status.appspot.com"
   }
+}
+consoles {
+  id: "stable"
+  name: "SDK Stable Console"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/stable"
+  manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-simarm_x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-stable"
+    category: "cfe"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm_x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-stable"
+    category: "cfe"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-mac-release-simarm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-stable"
+    category: "cfe"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-stable"
+    category: "cfe|nnbd"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-dwarf-linux-product-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-stable"
+    category: "vm|nnbd|jit"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm_x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-stable"
+    category: "vm|nnbd|jit"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm64c-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-stable"
+    category: "vm|nnbd|aot"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-product-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-stable"
+    category: "vm|app-kernel"
+    short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-mac-product-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-stable"
+    category: "vm|app-kernel"
+    short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-product-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-stable"
+    category: "vm|kernel"
+    short_name: "c"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-stable"
+    category: "vm|kernel"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-stable"
+    category: "vm|kernel"
+    short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-asan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-stable"
+    category: "vm|kernel"
+    short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-msan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-stable"
+    category: "vm|kernel"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-tsan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-stable"
+    category: "vm|kernel"
+    short_name: "rc"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-ubsan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-stable"
+    category: "vm|kernel"
+    short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-asan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-stable"
+    category: "vm|kernel"
+    short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-msan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-stable"
+    category: "vm|kernel"
+    short_name: "wd"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-tsan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-stable"
+    category: "vm|kernel"
+    short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-ubsan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-reload-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "p"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-reload-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-stable"
+    category: "vm|kernel-precomp"
+    short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-reload-rollback-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-reload-rollback-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64c-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "o"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64c-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "adx"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-x64c-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "arx"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-debug-x64c-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "ma"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-fuchsia-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-gcc-linux-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-stable"
+    category: "vm|kernel-precomp|android"
+    short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-simriscv64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-stable"
+    category: "vm|kernel-precomp|android"
+    short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-simriscv64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-stable"
+    category: "vm|misc"
+    short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-stable"
+    category: "vm|ffi"
+    short_name: "d32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-ffi-android-release-arm-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-stable"
+    category: "vm|ffi"
+    short_name: "r32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-ffi-android-product-arm-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-stable"
+    category: "vm|ffi"
+    short_name: "p32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm64c-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-stable"
+    category: "vm|ffi"
+    short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-ffi-android-release-arm64c-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-stable"
+    category: "vm|ffi"
+    short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-ffi-android-product-arm64c-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-stable"
+    category: "vm|ffi"
+    short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-precomp-ffi-qemu-linux-release-arm-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-stable"
+    category: "vm|ffi"
+    short_name: "qa"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-stable"
+    category: "vm|ffi"
+    short_name: "qr"
   }
   builders {
-    name: "buildbucket/luci.dart.try/pkg-linux-release-try"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
+    category: "pkg"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/pkg-mac-release-try"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-stable"
+    category: "pkg"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/pkg-mac-release-arm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-stable"
+    category: "pkg"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/pkg-win-release-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-stable"
+    category: "dart2js"
+    short_name: "c"
   }
   builders {
-    name: "buildbucket/luci.dart.try/pkg-linux-debug-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-stable"
+    category: "dart2js|d8"
+    short_name: "ha"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-canary-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-stable"
+    category: "dart2js|d8"
+    short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-hostasserts-linux-ia32-d8-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-stable"
+    category: "dart2js|d8"
+    short_name: "u"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-minified-strong-linux-x64-d8-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-unit-linux-x64-release-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-chrome-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-csp-minified-linux-x64-chrome-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-mac-x64-chrome-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "nn"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-win-x64-chrome-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-stable"
+    category: "dart2js|firefox"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-nnbd-linux-x64-chrome-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-stable"
+    category: "dart2js|safari"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-firefox-try"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-stable"
+    category: "analyzer"
+    short_name: "as"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-mac-x64-safari-try"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-stable"
+    category: "analyzer"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-analyze-try"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-stable"
+    category: "analyzer"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/analyzer-analysis-server-linux-try"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-stable"
+    category: "analyzer"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/analyzer-linux-release-try"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-stable"
+    category: "analyzer|nnbd"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/analyzer-mac-release-try"
+    name: "buildbucket/luci.dart.ci/dart-sdk-linux-stable"
+    category: "sdk"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/analyzer-win-release-try"
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-stable"
+    category: "sdk"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/analyzer-nnbd-linux-release-try"
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-stable"
+    category: "sdk"
+    short_name: "m1"
   }
   builders {
-    name: "buildbucket/luci.dart.try/analyzer-nnbd-mac-release-try"
+    name: "buildbucket/luci.dart.ci/dart-sdk-win-stable"
+    category: "sdk"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/analyzer-nnbd-win-release-try"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-stable"
+    category: "ddc"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart-sdk-linux-try"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-stable"
+    category: "ddc"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart-sdk-mac-try"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-stable"
+    category: "ddc"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart-sdk-mac-arm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-stable"
+    category: "ddc"
+    short_name: "fl"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart-sdk-win-try"
+    name: "buildbucket/luci.dart.ci.sandbox/gclient-stable"
+    category: "misc"
+    short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.try/ddc-linux-release-chrome-try"
+    name: "buildbucket/luci.dart.ci/debianpackage-linux-stable"
+    category: "misc"
+    short_name: "dp"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/ddc-nnbd-linux-release-chrome-try"
+  header {
+    links {
+      name: "Consoles"
+      links {
+        text: "Bleeding Edge console"
+        url: "/p/dart/g/be/console"
+        alt: "SDK BE Console"
+      }
+      links {
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (alternative)"
+      }
+      links {
+        text: "FYI console"
+        url: "/p/dart/g/fyi/console"
+        alt: "SDK FYI Console"
+      }
+      links {
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      }
+      links {
+        text: "Results Feed"
+        url: "https://dart-ci.firebaseapp.com/"
+        alt: "Results Feed"
+      }
+      links {
+        text: "Current Test Results"
+        url: "https://dart-ci.firebaseapp.com/current_results/"
+        alt: "Current Test Results"
+      }
+      links {
+        text: "Dart Infrastructure chat"
+        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
+        alt: "Dart Infrastructure chat"
+      }
+    }
+    console_groups {
+      console_ids: "dart/dart-fuzz"
+      console_ids: "dart/flutter"
+      console_ids: "dart/flutter-hhh"
+      console_ids: "dart/iso-stress"
+    }
+    tree_status_host: "dart-status.appspot.com"
   }
+}
+consoles {
+  id: "dart-fuzz"
+  name: "Dart Fuzzer Console"
   builders {
-    name: "buildbucket/luci.dart.try/ddc-mac-release-chrome-try"
+    name: "buildbucket/luci.dart.ci.sandbox/fuzz-linux"
   }
+  builder_view_only: true
+}
+consoles {
+  id: "flutter"
+  name: "Dart/Flutter Console"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/main"
+  manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.try/ddc-win-release-chrome-try"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
+    category: "analyzer"
+    short_name: "fa"
   }
   builders {
-    name: "buildbucket/luci.dart.try/ddk-linux-release-firefox-try"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
+    category: "fasta"
+    short_name: "fl"
   }
+}
+consoles {
+  id: "flutter-hhh"
+  name: "Dart/Flutter Linear History Console"
+  repo_url: "https://dart.googlesource.com/linear_sdk_flutter_engine"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.try/gclient-try"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
+    category: "flutter"
+    short_name: "3H"
   }
   builders {
-    name: "buildbucket/luci.dart.try/benchmark-linux-try"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-web_tests"
+    category: "flutter"
+    short_name: "web"
   }
+}
+consoles {
+  id: "iso-stress"
+  name: "VM Isolate Stress Test Console"
   builders {
-    name: "buildbucket/luci.dart.try.shared/presubmit-try"
+    name: "buildbucket/luci.dart.ci.sandbox/iso-stress-linux"
   }
   builder_view_only: true
 }
+consoles {
+  id: "fyi"
+  name: "SDK FYI Console"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/main"
+  manifest_name: "REVISION"
+}
 consoles {
   id: "infra"
   name: "Infra Console"
diff --git a/luci-notify.cfg b/generated/luci-notify.cfg
similarity index 84%
rename from luci-notify.cfg
rename to generated/luci-notify.cfg
index 02504fc7fec9..727fa04f38a0 100644
--- a/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -11,7 +11,6 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -26,7 +25,6 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -41,7 +39,6 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -56,7 +53,6 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -71,7 +67,6 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -86,7 +81,6 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -101,7 +95,6 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -116,7 +109,6 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -132,7 +124,6 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -147,7 +138,6 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -163,7 +153,6 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -178,7 +167,6 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -189,9 +177,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -203,9 +188,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -217,9 +199,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -231,9 +210,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -245,10 +221,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
-    }
   }
   builders {
     bucket: "ci.sandbox"
@@ -259,10 +231,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
-    }
   }
   builders {
     bucket: "ci.sandbox"
@@ -273,9 +241,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -287,9 +252,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -314,9 +276,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -329,9 +288,6 @@ notifiers {
   notifications {
     on_success: true
     on_failure: true
-    email {
-      recipients: "karlklose@google.com"
-    }
   }
   builders {
     bucket: "ci.sandbox"
@@ -342,9 +298,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -369,9 +322,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -383,9 +333,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -397,9 +344,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -411,9 +355,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -425,9 +366,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -439,9 +377,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -453,9 +388,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -467,9 +399,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -481,9 +410,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -495,9 +421,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -509,9 +432,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -523,9 +443,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -537,9 +454,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -551,9 +465,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -565,9 +476,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -579,9 +487,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -593,9 +498,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -607,9 +509,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -634,9 +533,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -648,9 +544,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -662,9 +555,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -676,10 +566,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
-    }
   }
   builders {
     bucket: "ci.sandbox"
@@ -690,10 +576,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
-    }
   }
   builders {
     bucket: "ci.sandbox"
@@ -704,9 +586,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -743,9 +622,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -770,9 +646,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -784,9 +657,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -798,9 +668,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -812,9 +679,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -826,9 +690,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -840,9 +701,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -854,9 +712,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -868,9 +723,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -882,9 +734,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -896,9 +745,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -910,9 +756,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -924,9 +767,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -938,9 +778,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -953,8 +790,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -966,9 +802,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1019,9 +852,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1072,9 +902,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1086,9 +913,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1100,9 +924,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1114,9 +935,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1141,9 +959,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1155,9 +970,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1170,8 +982,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1196,9 +1007,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1249,9 +1057,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1289,9 +1094,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1368,9 +1170,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1382,9 +1181,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1396,9 +1192,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1411,8 +1204,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1437,9 +1229,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1464,9 +1253,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1491,9 +1277,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1505,9 +1288,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1519,9 +1299,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1533,9 +1310,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1547,9 +1321,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1561,9 +1332,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1576,8 +1344,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1590,8 +1357,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1604,8 +1370,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1618,8 +1383,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1632,8 +1396,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1645,9 +1408,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1659,9 +1419,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1674,8 +1431,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1688,8 +1444,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1701,9 +1456,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1716,8 +1468,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1730,8 +1481,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1756,9 +1506,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1823,8 +1570,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1837,8 +1583,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1863,9 +1608,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1916,9 +1658,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1930,9 +1669,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1948,7 +1684,6 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -1960,9 +1695,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
diff --git a/luci-notify/email-templates/common.template b/generated/luci-notify/email-templates/common.template
similarity index 100%
rename from luci-notify/email-templates/common.template
rename to generated/luci-notify/email-templates/common.template
diff --git a/luci-notify/email-templates/default.template b/generated/luci-notify/email-templates/default.template
similarity index 100%
rename from luci-notify/email-templates/default.template
rename to generated/luci-notify/email-templates/default.template
diff --git a/luci-scheduler.cfg b/generated/luci-scheduler.cfg
similarity index 100%
rename from luci-scheduler.cfg
rename to generated/luci-scheduler.cfg
diff --git a/project.cfg b/generated/project.cfg
similarity index 85%
rename from project.cfg
rename to generated/project.cfg
index 3b6a49f36003..654142bfda7b 100644
--- a/project.cfg
+++ b/generated/project.cfg
@@ -8,7 +8,7 @@ name: "dart"
 access: "group:all"
 lucicfg {
   version: "1.30.9"
-  package_dir: "."
-  config_dir: "."
+  package_dir: ".."
+  config_dir: "generated"
   entry_point: "main.star"
 }
diff --git a/realms.cfg b/generated/realms.cfg
similarity index 100%
rename from realms.cfg
rename to generated/realms.cfg
diff --git a/lib/accounts.star b/lib/accounts.star
new file mode 100644
index 000000000000..9cda3f04c96a
--- /dev/null
+++ b/lib/accounts.star
@@ -0,0 +1,11 @@
+# Copyright (c) 2022 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Defines accounts used on builders.
+"""
+
+accounts = struct(
+    ci_builder = "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com",
+    try_builder = "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com",
+)
diff --git a/lib/cron.star b/lib/cron.star
new file mode 100644
index 000000000000..370562f3e943
--- /dev/null
+++ b/lib/cron.star
@@ -0,0 +1,49 @@
+# Copyright (c) 2022 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Defines rules that can be used to define nightly and weekly builders.
+"""
+
+load("//lib/dart.star", "dart")
+load("//lib/priority.star", "priority")
+
+def _nightly_builder(name, notifies = None, **kwargs):
+    dart.ci_sandbox_builder(
+        name,
+        notifies = notifies or [luci.notifier(
+            name = "nightly",
+            on_new_failure = True,
+        )],
+        on_cq = False,
+        priority = priority.low,
+        triggered_by = [luci.gitiles_poller(
+            name = "dart-nightly-trigger",
+            bucket = "ci",
+            repo = dart.git,
+            refs = ["refs/heads/main"],
+            schedule = "0 5 * * *",  # daily, at 05:00 UTC
+        )],
+        **kwargs
+    )
+
+def _weekly_builder(name, notifies = None, **kwargs):
+    dart.ci_sandbox_builder(
+        name,
+        notifies = notifies,
+        on_cq = False,
+        priority = priority.low,
+        triggered_by = [luci.gitiles_poller(
+            name = "dart-weekly-trigger",
+            bucket = "ci",
+            repo = dart.git,
+            refs = ["refs/heads/main"],
+            schedule = "0 0 * * SUN",  # weekly, midnight Saturday to Sunday
+        )],
+        **kwargs
+    )
+
+cron = struct(
+    nightly_builder = _nightly_builder,
+    weekly_builder = _weekly_builder,
+)
diff --git a/lib/dart.star b/lib/dart.star
new file mode 100644
index 000000000000..f8ae68005fd4
--- /dev/null
+++ b/lib/dart.star
@@ -0,0 +1,318 @@
+# Copyright (c) 2022 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Defines rules that can be used to define nightly and weekly builders.
+"""
+
+load("//lib/accounts.star", "accounts")
+load("//lib/defaults.star", "defaults")
+load("//lib/paths.star", "paths")
+load("//lib/priority.star", "priority")
+
+_GOMA_RBE = {
+    "server_host": "goma.chromium.org",
+    "use_luci_auth": True,
+}
+
+_RELEASE_CHANNELS = ["beta", "dev", "stable"]
+_CHANNELS = _RELEASE_CHANNELS + ["try"]
+_BRANCHES = ["main"] + _RELEASE_CHANNELS
+
+_DART_GIT = "https://dart.googlesource.com/sdk"
+
+def _poller(name, bucket = "ci", branches = _BRANCHES, paths = None):
+    for branch in branches:
+        luci.gitiles_poller(
+            name = "%s-%s" % (name, branch),
+            bucket = bucket,
+            path_regexps = paths,
+            repo = _DART_GIT,
+            refs = ["refs/heads/%s" % branch],
+        )
+
+def _recipe(name):
+    return luci.recipe(
+        name = name,
+        cipd_package = "dart/recipe_bundles/dart.googlesource.com/recipes",
+        cipd_version = "refs/heads/main",
+        use_bbagent = True,
+    )
+
+def _with_goma(goma, dimensions, properties):
+    """Decorates the properties to setup goma.
+
+       Adds the $build/goma property when goma is used and disables goma via
+       the $dart/build property if not.
+
+    Args:
+        goma: Opt-in (True), opt-out (False) or default (None).
+        dimensions: The dimensions of the builder.
+        properties: The properties object to set $build/goma on (if opted-in).
+
+    Returns:
+        A copy of the properties with goma related properties set if applicable.
+    """
+    updated_properties = dict(properties)
+    if goma in (None, True):
+        goma_properties = {}
+        goma_properties.update(_GOMA_RBE)
+
+        enable_ats = dimensions["os"] == "Linux"
+
+        goma_properties["enable_ats"] = enable_ats
+        updated_properties.setdefault("$build/goma", goma_properties)
+    else:
+        updated_properties = dict(properties)
+        updated_properties.setdefault("$dart/build", {})
+        updated_properties["$dart/build"].setdefault("disable_goma", True)
+    return updated_properties
+
+def _try_builder(
+        name,
+        recipe = "dart/neo",
+        bucket = "try",
+        dimensions = None,
+        execution_timeout = None,
+        experiment_percentage = None,
+        experiments = None,
+        goma = None,
+        location_regexp = None,
+        properties = None,
+        on_cq = False):
+    """Creates a Dart tryjob.
+
+    Args:
+        name: The builder name.
+        recipe: The recipe to use (defaults to "dart/neo").
+        bucket: The bucket to use (defaults to "try").
+        dimensions: Extra swarming dimensions required by this builder.
+        execution_timeout: Time to allow for the build to run.
+        experiment_percentage: What experiment percentage to use.
+        experiments: Experiments to run on this builder, with percentages.
+        goma: Whether to use goma or not.
+        location_regexp: Locations that trigger this tryjob.
+        properties: Extra properties to set for builds.
+        on_cq: Whether the build is added to the default set of CQ tryjobs.
+    """
+    if on_cq and location_regexp:
+        fail("Can't be on the default CQ and conditionally on the CQ")
+    dimensions = defaults.dimensions(dimensions)
+    dimensions["pool"] = "luci.dart.try"
+    properties = defaults.properties(properties)
+    builder_properties = _with_goma(goma, dimensions, properties)
+    builder = name + "-try"
+    luci.builder(
+        name = builder,
+        build_numbers = True,
+        bucket = bucket,
+        caches = defaults.caches(dimensions["os"]),
+        dimensions = dimensions,
+        executable = _recipe(recipe),
+        execution_timeout = execution_timeout,
+        experiments = experiments,
+        priority = priority.high,
+        properties = builder_properties,
+        service_account = accounts.try_builder,
+        swarming_tags = ["vpython:native-python-wrapper"],
+    )
+    includable_only = (not on_cq and not experiment_percentage and
+                       not location_regexp)
+    luci.cq_tryjob_verifier(
+        builder = builder,
+        cq_group = "sdk",
+        experiment_percentage = experiment_percentage,
+        location_regexp = location_regexp,
+        includable_only = includable_only,
+    )
+    luci.list_view_entry(list_view = "cq", builder = builder)
+
+def _builder(
+        name,
+        bucket,
+        recipe = "dart/neo",
+        enabled = True,
+        category = None,
+        channels = [],
+        dimensions = None,
+        executable = None,
+        execution_timeout = None,
+        experimental = None,
+        experiments = None,
+        expiration_timeout = None,
+        goma = None,
+        fyi = False,
+        main_channel = True,
+        notifies = "dart",
+        priority = priority.normal,
+        properties = None,
+        schedule = "triggered",
+        service_account = accounts.try_builder,
+        triggered_by = ["dart-gitiles-trigger-%s"],
+        triggering_policy = None,
+        on_cq = False,
+        experiment_percentage = None,
+        location_regexp = None):
+    """
+    Creates a Dart builder on all the specified channels.
+
+    Args:
+        name: The builder name.
+        bucket: The bucket to use (defaults to "try").
+        recipe: The recipe to use (defaults to "dart/neo").
+        enabled: Whether this builder is currently running or not.
+        category: Where to show the builder on the console.
+        channels: Which other channels the builder should be added to.
+        dimensions: Extra swarming dimensions required by this builder.
+        executable: The Luci executable to use.
+        execution_timeout: Time to allow for the build to run.
+        experimental: Whether the build is experimental or not.
+        experiments: Experiments to run on this builder, with percentages.
+        expiration_timeout: How long builds should wait for a bot to run on.
+        goma: Whether to use goma or not.
+        fyi: Whether this is an FYI builder or not.
+        main_channel: Whether to add to the main channel (default: True).
+        notifies: Which luci notifier group to notify (default: "dart").
+        priority: What swarming priority this builder gets (default: NORMAL).
+        properties: Extra properties to set for builds.
+        schedule: What schedule to use (default: "triggered").
+        service_account: The task service account to use (default: accounts.try_builder).
+        triggered_by: What triggers this builder (defaults to standard trigger).
+        triggering_policy: The triggering policy used by this builder.
+        on_cq: Whether the build is added to the default set of CQ tryjobs.
+        experiment_percentage: What experiment percentage to use.
+        location_regexp: Locations that trigger this builder.
+    """
+    dimensions = defaults.dimensions(dimensions)
+    properties = defaults.properties(properties)
+
+    os = dimensions["os"]
+    if "win" in name and os != "Windows":
+        fail("builder %s should be a Windows builder" % name)
+    if "mac" in name and os != "Mac":
+        fail("builder %s should be a macOS builder" % name)
+    if "linux" in name and os != "Linux":
+        fail("builder %s should be a Linux builder" % name)
+
+    def builder(channel, notifies, triggered_by):
+        if channel == "try":
+            _try_builder(
+                name,
+                recipe = recipe,
+                dimensions = dimensions,
+                properties = properties,
+                on_cq = on_cq,
+                execution_timeout = execution_timeout,
+                experiment_percentage = experiment_percentage,
+                experiments = experiments,
+                goma = goma,
+                location_regexp = location_regexp,
+            )
+        else:
+            builder_properties = _with_goma(
+                goma if service_account == accounts.try_builder else False,
+                dimensions,
+                properties,
+            )
+            builder = name + "-" + channel if channel else name
+            branch = channel if channel else "main"
+            if schedule == "triggered" and triggered_by:
+                triggered_by = [
+                    trigger.replace("%s", branch) if type(trigger) == type("") else trigger
+                    for trigger in triggered_by
+                ]
+                if channel in _RELEASE_CHANNELS:
+                    # Always run vm builders on release channels.
+                    triggered_by = [
+                        trigger.replace("dart-vm-", "dart-") if type(trigger) == type("") else trigger
+                        for trigger in triggered_by
+                    ]
+
+            notifies = [notifies] if type(notifies) == type("") else notifies
+            luci.builder(
+                name = builder,
+                build_numbers = True,
+                bucket = bucket,
+                caches = defaults.caches(dimensions["os"]),
+                dimensions = dimensions,
+                executable = executable or _recipe(recipe),
+                execution_timeout = execution_timeout,
+                experimental = experimental,
+                experiments = experiments,
+                expiration_timeout = expiration_timeout,
+                priority = priority,
+                properties = builder_properties,
+                notifies = notifies if enabled else None,
+                schedule = schedule if enabled else None,
+                service_account = service_account,
+                swarming_tags = ["vpython:native-python-wrapper"],
+                triggered_by = triggered_by if enabled else None,
+                triggering_policy = triggering_policy,
+            )
+            if category:
+                console_category, _, short_name = category.rpartition("|")
+                toplevel_category, _, _ = console_category.partition("|")
+                console = channel or "be" if not fyi else "fyi"
+                luci.console_view_entry(
+                    builder = builder,
+                    short_name = short_name,
+                    category = console_category,
+                    console_view = console,
+                )
+                if console == "be":
+                    if toplevel_category != "vm":
+                        luci.console_view_entry(
+                            builder = builder,
+                            short_name = short_name,
+                            category = console_category,
+                            console_view = "alt",
+                        )
+
+    if main_channel:
+        builder(None, notifies = notifies, triggered_by = triggered_by)
+    for _channel in channels:
+        if enabled:
+            builder(_channel, notifies = None, triggered_by = triggered_by)
+
+def _ci_builder(name, bucket = "ci", dimensions = None, **kwargs):
+    if type(dimensions) == type({}):
+        dimensions = [dimensions]
+    dimensions = list(dimensions or [])
+    dimensions.append({"pool": "luci.dart.ci"})
+    _builder(
+        name,
+        bucket = bucket,
+        dimensions = dimensions,
+        service_account = accounts.ci_builder,
+        **kwargs
+    )
+
+def _ci_sandbox_builder(name, channels = _CHANNELS, **kwargs):
+    _builder(
+        name,
+        bucket = "ci.sandbox",
+        channels = channels,
+        service_account = accounts.try_builder,
+        **kwargs
+    )
+
+def _infra_builder(name, notifies = "infra", triggered_by = None, **kwargs):
+    _ci_builder(
+        name,
+        notifies = notifies,
+        triggered_by = triggered_by,
+        **kwargs
+    )
+    luci.list_view_entry(list_view = "infra", builder = name)
+
+dart = struct(
+    ci_builder = _ci_builder,
+    ci_sandbox_builder = _ci_sandbox_builder,
+    infra_builder = _infra_builder,
+    try_builder = _try_builder,
+    poller = _poller,
+    channels = _CHANNELS,
+    release_channels = _RELEASE_CHANNELS,
+    branches = _BRANCHES,
+    git = _DART_GIT,
+)
diff --git a/lib/defaults.star b/lib/defaults.star
new file mode 100644
index 000000000000..dc8fadc7da85
--- /dev/null
+++ b/lib/defaults.star
@@ -0,0 +1,78 @@
+# Copyright (c) 2019 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Defaults for properties and dimensions used in main.star.
+"""
+
+_PROPERTIES = {"clobber": True}
+_DIMENSIONS = {
+    "cpu": "x86-64",
+    "host_class": "default",
+    "os": "Linux",
+    "pool": "luci.dart.try",
+}
+_CACHES = {
+    "Mac": [swarming.cache("osx_sdk", name = "osx_sdk")],
+}
+_NO_ANDROID = {"custom_vars": {"download_android_deps": False}}
+_CHROME = {"custom_vars": {"download_chrome": True}}
+_FIREFOX = {"custom_vars": {"download_firefox": True}}
+_JS_ENGINES = {"custom_vars": {"checkout_javascript_engines": True}}
+_SLOW_SHARDS = {"shard_timeout": (90 * time.minute) // time.second}
+_PINNED_XCODE = {"$depot_tools/osx_sdk": {"sdk_version": "12d4e"}}
+
+_ARM64 = {"cpu": "arm64"}
+_MAC = {"os": "Mac"}
+_LINUX = {"os": "Linux"}
+_WINDOWS = {"os": "Windows"}
+
+def _union(x, overrides):
+    """ Creates a new dict with the values from all passed dictionaries
+
+    If dicts contain the same keys, their values are assumed to be dicts
+    and merged. Values in dicts later in overrides' sub-dicts will overwrite
+    values in earlier sub-dicts.
+
+    Args:
+        x (dict): A dict.
+        overrides (list): dicts to merge with x.
+
+    Returns:
+        dict: The merged dict.
+    """
+    z = {}
+    z.update(x)
+    if type(overrides) == type({}):
+        overrides = [overrides]
+    for y in overrides or []:
+        for k in y.keys():
+            v = z.get(k)
+            if v and type(v) == type({}):
+                v = dict(v, **y[k])
+                z[k] = v
+            else:
+                z[k] = y[k]
+    return z
+
+defaults = struct(
+    caches = lambda os: _CACHES.get(os),
+    dimensions = lambda overrides: _union(_DIMENSIONS, overrides),
+    properties = lambda overrides: _union(_PROPERTIES, overrides),
+)
+
+# Dimensions
+
+arm64 = _ARM64
+linux = _LINUX
+mac = _MAC
+windows = _WINDOWS
+
+# Properties
+
+chrome = _CHROME
+firefox = _FIREFOX
+js_engines = _JS_ENGINES
+no_android = _NO_ANDROID
+slow_shards = _SLOW_SHARDS
+pinned_xcode = _PINNED_XCODE
diff --git a/lib/paths.star b/lib/paths.star
new file mode 100644
index 000000000000..d80756d735b3
--- /dev/null
+++ b/lib/paths.star
@@ -0,0 +1,80 @@
+# Copyright (c) 2022 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Defines paths relevant to different parts of the Dart SDK.
+"""
+
+_TEST_PY_PATHS = "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+
+_STANDARD_PATHS = [
+    "DEPS",  # DEPS catches most third_party changes.
+    # build files
+    "build/.+",
+    "BUILD.gn",
+    "sdk_args.gni",
+    # core libraries
+    ".dart_tool/package_config.json",
+    "sdk/.+",
+    # testing
+    _TEST_PY_PATHS,
+    "tools/bots/test_matrix.json",
+    # tests
+    "tests/.+",
+]
+
+_CFE_PATHS_ONLY = [
+    "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+",
+]
+
+_CFE_PATHS = _STANDARD_PATHS + _CFE_PATHS_ONLY
+
+_VM_PATHS = _CFE_PATHS + [
+    # VM sources
+    "pkg/vm/.+",
+    "runtime/.+",
+]
+
+_DART2JS_PATHS = _CFE_PATHS + [
+    # compiler sources
+    "pkg/(compiler|dart2js_tools|js_ast)/.+",
+    "utils/compiler/.+",
+    # testing
+    "pkg/(js|modular_test|sourcemap_testing)/.+",
+]
+
+_DDC_PATHS = _CFE_PATHS + [
+    # compiler sources
+    "pkg/(build_integration|dev_compiler|meta)/.+",
+    "utils/dartdevc/.+",
+    # testing
+    "pkg/(js|modular_test|sourcemap_testing)/.+",
+]
+
+_ANALYZER_NNBD_PATHS = _STANDARD_PATHS + [
+    # analyzer sources
+    "pkg/(analyzer|analyzer_cli|_fe_analyzer_shared)/.+",
+]
+
+_ANALYZER_PATHS = _STANDARD_PATHS + [
+    # "analyzer" bots analyze everything under pkg
+    "pkg/.+",
+]
+
+def _to_location_regexp(paths):
+    return [".+/[+]/%s" % path for path in paths]
+
+paths = struct(
+    analyzer = _ANALYZER_PATHS,
+    analyzer_nnbd = _ANALYZER_NNBD_PATHS,
+    cfe = _CFE_PATHS,
+    cfe_only = _CFE_PATHS_ONLY,
+    dart2js = _DART2JS_PATHS,
+    ddc = _DDC_PATHS,
+    standard = _STANDARD_PATHS,
+    test_py = _TEST_PY_PATHS,
+    vm = _VM_PATHS,
+
+    # Utility functions
+    to_location_regexp = _to_location_regexp,
+)
diff --git a/lib/priority.star b/lib/priority.star
new file mode 100644
index 000000000000..ced75b831c22
--- /dev/null
+++ b/lib/priority.star
@@ -0,0 +1,14 @@
+# Copyright (c) 2022 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Defines priorities used by for swarming tasks. The higher the number, the lower
+the priority.
+"""
+
+priority = struct(
+    low = 70,  # Used for "FYI" post-submit builds.
+    normal = 50,  # Used for post-submit builds.
+    high = 30,  # Used for try-jobs.
+    highest = 25,  # Used for shards in the recipes, only here for completeness.
+)
diff --git a/main.star b/main.star
index 1c9a63e5d957..3ba8f08bfa2d 100755
--- a/main.star
+++ b/main.star
@@ -12,258 +12,43 @@
 Generates the Luci configuration for the Dart project.
 """
 
-load("//defaults.star", "defaults")
+load("//lib/cron.star", "cron")
+load("//lib/dart.star", "dart")
+load(
+    "//lib/defaults.star",
+    "arm64",
+    "chrome",
+    "firefox",
+    "js_engines",
+    "mac",
+    "no_android",
+    "pinned_xcode",
+    "windows",
+)
+load("//lib/paths.star", "paths")
+load("//lib/priority.star", "priority")
 
 lucicfg.check_version("1.30.9")
 
+# Global builder defaults
+# These need to be set at the top level to affect all uses of luci.builder.
 luci.builder.defaults.experiments.set({
-    # Launch 100% of Swarming tasks in "realms-aware mode", crbug.com/1170330.
-    "luci.use_realms": 100,
     "luci.buildbucket.use_bbagent": 100,
     "luci.recipes.use_python3": 100,
+    # Launch 100% of Swarming tasks in "realms-aware mode", crbug.com/1170330.
+    "luci.use_realms": 100,
+})
+luci.builder.defaults.properties.set({
+    "$recipe_engine/isolated": {
+        "server": "https://isolateserver.appspot.com",
+    },
+    "$recipe_engine/swarming": {
+        "server": "https://chromium-swarm.appspot.com",
+    },
 })
 
-DART_GIT = "https://dart.googlesource.com/sdk"
-DART_GERRIT = "https://dart-review.googlesource.com/"
-
-GOMA_RBE = {
-    "server_host": "goma.chromium.org",
-    "use_luci_auth": True,
-}
-
-RELEASE_CHANNELS = ["beta", "dev", "stable"]
-CHANNELS = RELEASE_CHANNELS + ["try"]
-BRANCHES = ["main"] + RELEASE_CHANNELS
-
-TEST_PY_PATHS = "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-
-STANDARD_PATHS = [
-    "DEPS",  # DEPS catches most third_party changes.
-    # build files
-    "build/.+",
-    "BUILD.gn",
-    "sdk_args.gni",
-    # core libraries
-    ".dart_tool/package_config.json",
-    "sdk/.+",
-    # testing
-    TEST_PY_PATHS,
-    "tools/bots/test_matrix.json",
-    # tests
-    "tests/.+",
-]
-
-CFE_PATHS_ONLY = [
-    "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+",
-]
-
-CFE_PATHS = STANDARD_PATHS + CFE_PATHS_ONLY
-
-VM_PATHS = CFE_PATHS + [
-    # VM sources
-    "pkg/vm/.+",
-    "runtime/.+",
-]
-
-DART2JS_PATHS = CFE_PATHS + [
-    # compiler sources
-    "pkg/(compiler|dart2js_tools|js_ast)/.+",
-    "utils/compiler/.+",
-    # testing
-    "pkg/(js|modular_test|sourcemap_testing)/.+",
-]
-
-DDC_PATHS = CFE_PATHS + [
-    # compiler sources
-    "pkg/(build_integration|dev_compiler|meta)/.+",
-    "utils/dartdevc/.+",
-    # testing
-    "pkg/(js|modular_test|sourcemap_testing)/.+",
-]
-
-ANALYZER_NNBD_PATHS = STANDARD_PATHS + [
-    # analyzer sources
-    "pkg/(analyzer|analyzer_cli|_fe_analyzer_shared)/.+",
-]
-
-ANALYZER_PATHS = STANDARD_PATHS + [
-    # "analyzer" bots analyze everything under pkg
-    "pkg/.+",
-]
-
-# Priorities used by the swarming scheduler. The higher the number, the lower
-# the priority.
-LOW = 70  # Used for "FYI" post-submit builds.
-NORMAL = 50  # Used for post-submit builds.
-HIGH = 30  # Used for try-jobs.
-HIGHEST = 25  # Used for shards in the recipes, included here for completeness.
-
-NO_ANDROID = {"custom_vars": {"download_android_deps": False}}
-CHROME = {"custom_vars": {"download_chrome": True}}
-FIREFOX = {"custom_vars": {"download_firefox": True}}
-JS_ENGINES = {"custom_vars": {"checkout_javascript_engines": True}}
-SLOW_SHARDS = {"shard_timeout": (90 * time.minute) // time.second}
-PINNED_XCODE = {"$depot_tools/osx_sdk": {"sdk_version": "12d4e"}}
-
-def to_location_regexp(paths):
-    return [".+/[+]/%s" % path for path in paths]
-
-def mac(cpu = None):
-    dimensions = {"os": "Mac"}
-    if cpu:
-        dimensions["cpu"] = cpu
-    return dimensions
-
-def windows():
-    return {"os": "Windows"}
-
-def linux():
-    return {"os": "Linux"}
-
-def union(x, *args):
-    """ Creates a new dict with the values from all passed dictionaries
-
-    If dicts contain the same keys, their values are assumed to be dicts
-    and merged. Values in dicts later in *args sub-dicts will overwrite
-    values in earlier sub-dicts.
-
-    Args:
-        x (dict): A dict.
-        *args: dicts to merge with x.
-
-    Returns:
-        dict: The merged dict.
-    """
-    z = {}
-    z.update(x)
-    for y in args:
-        for k in y.keys():
-            v = z.get(k)
-            if v:
-                v = dict(v, **y[k])
-                z[k] = v
-            else:
-                z[k] = y[k]
-    return z
-
-# https://chrome-infra-auth.appspot.com/auth/groups/project-dart-ci-task-accounts
-CI_ACCOUNTS_GROUP = "project-dart-ci-task-accounts"
-
-# https://chrome-infra-auth.appspot.com/auth/groups/project-dart-try-task-accounts
-TRY_ACCOUNTS_GROUP = "project-dart-try-task-accounts"
-
-CI_ACCOUNT = "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-TRY_ACCOUNT = "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-ROLL_TRIGGERERS = {
-    "users": [
-        CI_ACCOUNT,
-    ],
-    "groups": ["project-dart-roller-owners"],
-}
-CI_SANDBOX_TRIGGERERS = [CI_ACCOUNT, TRY_ACCOUNT]
-
-lucicfg.config(
-    config_dir = ".",
-    tracked_files = [
-        "commit-queue.cfg",
-        "cr-buildbucket.cfg",
-        "luci-logdog.cfg",
-        "luci-milo.cfg",
-        "luci-notify.cfg",
-        "luci-scheduler.cfg",
-        "project.cfg",
-        "realms.cfg",
-    ],
-    lint_checks = ["default"],
-)
-
-luci.project(
-    name = "dart",
-    buildbucket = "cr-buildbucket.appspot.com",
-    logdog = "luci-logdog.appspot.com",
-    milo = "luci-milo.appspot.com",
-    notify = "luci-notify.appspot.com",
-    scheduler = "luci-scheduler.appspot.com",
-    swarming = "chromium-swarm.appspot.com",
-    acls = [
-        acl.entry(
-            [
-                acl.BUILDBUCKET_READER,
-                acl.LOGDOG_READER,
-                acl.PROJECT_CONFIGS_READER,
-                acl.SCHEDULER_READER,
-            ],
-            groups = ["all"],
-        ),
-        acl.entry(acl.LOGDOG_WRITER, groups = ["luci-logdog-chromium-writers"]),
-        acl.entry(
-            [acl.SCHEDULER_OWNER, acl.BUILDBUCKET_TRIGGERER],
-            groups = ["project-dart-admins"],
-        ),
-        acl.entry(acl.CQ_COMMITTER, groups = ["project-dart-committers"]),
-        acl.entry(acl.CQ_DRY_RUNNER, groups = ["project-dart-tryjob-access"]),
-    ],
-    bindings = [
-        luci.binding(
-            roles = "role/configs.validator",
-            users = TRY_ACCOUNT,
-        ),
-        luci.binding(
-            roles = "role/swarming.poolOwner",
-            groups = "project-dart-admins",
-        ),
-        luci.binding(
-            roles = "role/swarming.poolViewer",
-            groups = "project-dart-committers",
-        ),
-    ],
-)
-
-# Swarming permissions in realms.cfg.
-
-luci.realm(name = "pools/ci")
-luci.realm(name = "pools/try")
-luci.realm(
-    name = "pools/tests",
-    bindings = [
-        luci.binding(
-            roles = "role/swarming.poolUser",
-            groups = [CI_ACCOUNTS_GROUP, TRY_ACCOUNTS_GROUP],
-        ),
-    ],
-)
-
-def led_users(*, pool_realms, builder_realm, groups):
-    for realm in pool_realms:
-        luci.binding(
-            realm = realm,
-            roles = "role/swarming.poolUser",
-            groups = groups,
-        )
-    luci.binding(
-        realm = builder_realm,
-        roles = "role/swarming.taskTriggerer",
-        groups = groups,
-    )
-
-# Allow admins to use LED and "Debug" button on every Dart builder and bot.
-led_users(
-    pool_realms = ["@root"],
-    builder_realm = "@root",
-    groups = ["project-dart-admins"],
-)
-
-# Allow mdb/dart-build-access to use LED and "Debug" button on try builders and
-# try and test bots.
-led_users(
-    pool_realms = ["pools/try", "pools/tests"],
-    builder_realm = "try",
-    groups = ["mdb/dart-build-access"],
-)
-
-luci.milo(
-    logo = "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png",
-)
+exec("//project.star")
+exec("//cq.star")
 
 luci.console_view(
     name = "be",
@@ -312,7 +97,7 @@ luci.list_view(
 
 luci.console_view(
     name = "flutter",
-    repo = DART_GIT,
+    repo = dart.git,
     title = "Dart/Flutter Console",
     refs = ["refs/heads/main"],
 )
@@ -331,50 +116,16 @@ luci.list_view(
 
 luci.console_view(
     name = "fyi",
-    repo = DART_GIT,
+    repo = dart.git,
     title = "SDK FYI Console",
     refs = ["refs/heads/main"],
 )
 
-luci.list_view(
-    name = "cq",
-    title = "SDK CQ Console",
-)
-
 luci.list_view(
     name = "infra",
     title = "Infra Console",
 )
 
-luci.logdog(gs_bucket = "chromium-luci-logdog")
-
-luci.bucket(
-    name = "ci",
-    acls = [
-        acl.entry(acl.BUILDBUCKET_TRIGGERER, users = [CI_ACCOUNT]),
-    ],
-)
-luci.bucket(
-    name = "ci.roll",
-    acls = [
-        acl.entry(acl.BUILDBUCKET_TRIGGERER, **ROLL_TRIGGERERS),
-    ],
-)
-luci.bucket(
-    name = "ci.sandbox",
-    acls = [
-        acl.entry(acl.BUILDBUCKET_TRIGGERER, users = CI_SANDBOX_TRIGGERERS),
-    ],
-)
-TRY_ACLS = [
-    acl.entry(
-        acl.BUILDBUCKET_TRIGGERER,
-        groups = ["project-dart-tryjob-access", "service-account-cq"],
-    ),
-]
-luci.bucket(name = "try", acls = TRY_ACLS)  # Tryjobs specific to the Dart SDK repo.
-luci.bucket(name = "try.shared", acls = TRY_ACLS)  # Tryjobs for all repos.
-
 luci.gitiles_poller(
     name = "dart-gitiles-trigger-flutter",
     bucket = "ci",
@@ -386,23 +137,10 @@ luci.gitiles_poller(
     name = "dart-ci-test-data-trigger",
     bucket = "ci",
     path_regexps = ["tools/bots/ci_test_data_trigger"],
-    repo = DART_GIT,
+    repo = dart.git,
     refs = ["refs/heads/ci-test-data"],
 )
 
-def dart_poller(name, bucket = "ci", branches = BRANCHES, paths = None):
-    for branch in branches:
-        luci.gitiles_poller(
-            name = "%s-%s" % (name, branch),
-            bucket = bucket,
-            path_regexps = paths,
-            repo = DART_GIT,
-            refs = ["refs/heads/%s" % branch],
-        )
-
-dart_poller("dart-gitiles-trigger", branches = BRANCHES)
-dart_poller("dart-vm-gitiles-trigger", branches = ["main"], paths = VM_PATHS)
-
 luci.gitiles_poller(
     name = "dart-flutter-engine-trigger",
     bucket = "ci",
@@ -416,49 +154,23 @@ luci.gitiles_poller(
     repo = "https://dart.googlesource.com/external/github.com/flutter/flutter",
     refs = ["refs/heads/master"],
 )
-luci.gitiles_poller(
-    name = "dart-nightly-trigger",
-    bucket = "ci",
-    repo = DART_GIT,
-    refs = ["refs/heads/main"],
-    schedule = "0 5 * * *",  # daily, at 05:00 UTC
-)
-luci.gitiles_poller(
-    name = "dart-weekly-trigger",
-    bucket = "ci",
-    repo = DART_GIT,
-    refs = ["refs/heads/main"],
-    schedule = "0 0 * * SUN",  # weekly, midnight Saturday to Sunday
-)
 
-luci.notifier(
-    name = "infra",
-    on_new_failure = True,
-    notify_emails = [
-        "athom@google.com",
-        "sortie@google.com",
-        "whesse@google.com",
-        "karlklose@google.com",
-    ],
-)
+dart.poller("dart-gitiles-trigger", branches = dart.branches)
 
 luci.notifier(
     name = "dart",
     on_new_failure = True,
-    notify_emails = ["athom@google.com"],
     notify_blamelist = True,
 )
 
 luci.notifier(
-    name = "dart-vm-team",
-    on_new_failure = True,
-    notify_emails = ["dart-vm-team-breakages@google.com"],
-)
-
-luci.notifier(
-    name = "nightly",
+    name = "infra",
     on_new_failure = True,
-    notify_emails = ["karlklose@google.com", "athom@google.com"],
+    notify_emails = [
+        "athom@google.com",
+        "sortie@google.com",
+        "whesse@google.com",
+    ],
 )
 
 luci.notifier(
@@ -478,450 +190,51 @@ luci.notifier(
     name = "ci-test-data",
     on_success = True,
     on_failure = True,
-    notify_emails = ["karlklose@google.com"],
-)
-
-luci.cq(
-    submit_max_burst = 2,
-    submit_burst_delay = 8 * time.minute,
-    status_host = "chromium-cq-status.appspot.com",
-)
-
-def default_verifiers():
-    return [
-        luci.cq_tryjob_verifier(
-            builder = "presubmit-try",
-            disable_reuse = True,
-        ),
-    ]
-
-luci.cq_group(
-    name = "sdk",
-    watch = cq.refset(
-        DART_GERRIT + "sdk",
-        refs = ["refs/heads/%s" % branch for branch in BRANCHES],
-    ),
-    allow_submit_with_open_deps = True,
-    tree_status_host = "dart-status.appspot.com",
-    retry_config = cq.RETRY_NONE,
-    verifiers = None,
-)
-
-luci.cq_group(
-    name = "sdk-infra-config",
-    watch = cq.refset(DART_GERRIT + "sdk", refs = ["refs/heads/infra/config"]),
-    allow_submit_with_open_deps = True,
-    tree_status_host = "dart-status.appspot.com",
-    retry_config = cq.RETRY_NONE,
-    verifiers = default_verifiers(),
 )
 
-luci.cq_group(
-    name = "recipes",
-    watch = cq.refset(DART_GERRIT + "recipes", refs = ["refs/heads/main"]),
-    allow_submit_with_open_deps = True,
-    tree_status_host = "dart-status.appspot.com",
-    retry_config = cq.RETRY_NONE,
-    verifiers = default_verifiers(),
-)
-
-luci.cq_group(
-    name = "dart_ci",
-    watch = cq.refset(DART_GERRIT + "dart_ci", refs = ["refs/heads/main"]),
-    allow_submit_with_open_deps = True,
-    tree_status_host = "dart-status.appspot.com",
-    retry_config = cq.RETRY_NONE,
-    verifiers = None,
-)
-
-def dart_recipe(name):
-    return luci.recipe(
-        name = name,
-        cipd_package = "dart/recipe_bundles/dart.googlesource.com/recipes",
-        cipd_version = "refs/heads/main",
-        use_bbagent = True,
-    )
-
-def with_goma(goma, channel, dimensions, properties):
-    """Decorates the properties to setup goma.
-
-       Adds the $build/goma property when goma is used and disables goma via
-       the $dart/build property if not.
-
-    Args:
-        goma: Opt-in (True), opt-out (False) or default (None).
-        channel: The channel of the builder.
-        dimensions: The dimensions of the builder.
-        properties: The properties object to set $build/goma on (if opted-in).
-
-    Returns:
-        A copy of the properties with goma related properties set if applicable.
-    """
-    updated_properties = dict(properties)
-    if goma in (None, True):
-        goma_properties = {}
-        goma_properties.update(GOMA_RBE)
-
-        enable_ats = dimensions["os"] == "Linux"
-
-        goma_properties["enable_ats"] = enable_ats
-        updated_properties.setdefault("$build/goma", goma_properties)
-    else:
-        updated_properties = dict(properties)
-        updated_properties.setdefault("$dart/build", {})
-        updated_properties["$dart/build"].setdefault("disable_goma", True)
-    return updated_properties
-
-def dart_try_builder(
-        name,
-        recipe = "dart/neo",
-        bucket = "try",
-        dimensions = None,
-        execution_timeout = None,
-        experiment_percentage = None,
-        experiments = None,
-        goma = None,
-        location_regexp = None,
-        properties = None,
-        on_cq = False):
-    """Creates a Dart tryjob.
-
-    Args:
-        name: The builder name.
-        recipe: The recipe to use (defaults to "dart/neo").
-        bucket: The bucket to use (defaults to "try").
-        dimensions: Extra swarming dimensions required by this builder.
-        execution_timeout: Time to allow for the build to run.
-        experiment_percentage: What experiment percentage to use.
-        experiments: Experiments to run on this builder, with percentages.
-        goma: Whether to use goma or not.
-        location_regexp: Locations that trigger this tryjob.
-        properties: Extra properties to set for builds.
-        on_cq: Whether the build is added to the default set of CQ tryjobs.
-    """
-    if on_cq and location_regexp:
-        fail("Can't be on the default CQ and conditionally on the CQ")
-    dimensions = defaults.dimensions(dimensions)
-    dimensions["pool"] = "luci.dart.try"
-    properties = defaults.properties(properties)
-    builder_properties = with_goma(goma, "try", dimensions, properties)
-    builder = name + "-try"
-    luci.builder(
-        name = builder,
-        build_numbers = True,
-        bucket = bucket,
-        caches = defaults.caches(dimensions["os"]),
-        dimensions = dimensions,
-        executable = dart_recipe(recipe),
-        execution_timeout = execution_timeout,
-        experiments = experiments,
-        priority = HIGH,
-        properties = builder_properties,
-        service_account = TRY_ACCOUNT,
-        swarming_tags = ["vpython:native-python-wrapper"],
-    )
-    includable_only = (not on_cq and not experiment_percentage and
-                       not location_regexp)
-    luci.cq_tryjob_verifier(
-        builder = builder,
-        cq_group = "sdk",
-        experiment_percentage = experiment_percentage,
-        location_regexp = location_regexp,
-        includable_only = includable_only,
-    )
-    luci.list_view_entry(list_view = "cq", builder = builder)
-
-postponed_alt_console_entries = []
-
-# Global builder defaults
-luci.builder.defaults.properties.set({
-    "$recipe_engine/isolated": {
-        "server": "https://isolateserver.appspot.com",
-    },
-    "$recipe_engine/swarming": {
-        "server": "https://chromium-swarm.appspot.com",
-    },
-})
-
-def dart_builder(
-        name,
-        bucket,
-        recipe = "dart/neo",
-        enabled = True,
-        category = None,
-        channels = [],
-        dimensions = None,
-        executable = None,
-        execution_timeout = None,
-        experimental = None,
-        experiments = None,
-        expiration_timeout = None,
-        goma = None,
-        fyi = False,
-        main_channel = True,
-        notifies = "dart",
-        priority = NORMAL,
-        properties = None,
-        schedule = "triggered",
-        service_account = TRY_ACCOUNT,
-        triggered_by = ["dart-gitiles-trigger-%s"],
-        triggering_policy = None,
-        on_cq = False,
-        experiment_percentage = None,
-        location_regexp = None):
-    """
-    Creates a Dart builder on all the specified channels.
-
-    Args:
-        name: The builder name.
-        bucket: The bucket to use (defaults to "try").
-        recipe: The recipe to use (defaults to "dart/neo").
-        enabled: Whether this builder is currently running or not.
-        category: Where to show the builder on the console.
-        channels: Which other channels the builder should be added to.
-        dimensions: Extra swarming dimensions required by this builder.
-        executable: The Luci executable to use.
-        execution_timeout: Time to allow for the build to run.
-        experimental: Whether the build is experimental or not.
-        experiments: Experiments to run on this builder, with percentages.
-        expiration_timeout: How long builds should wait for a bot to run on.
-        goma: Whether to use goma or not.
-        fyi: Whether this is an FYI builder or not.
-        main_channel: Whether to add to the main channel (default: True).
-        notifies: Which luci notifier group to notify (default: "dart").
-        priority: What swarming priority this builder gets (default: NORMAL).
-        properties: Extra properties to set for builds.
-        schedule: What schedule to use (default: "triggered").
-        service_account: The task service account to use (default: TRY_ACCOUNT).
-        triggered_by: What triggers this builder (defaults to standard trigger).
-        triggering_policy: The triggering policy used by this builder.
-        on_cq: Whether the build is added to the default set of CQ tryjobs.
-        experiment_percentage: What experiment percentage to use.
-        location_regexp: Locations that trigger this builder.
-    """
-    dimensions = defaults.dimensions(dimensions)
-    properties = defaults.properties(properties)
-
-    os = dimensions["os"]
-    if "win" in name and os != "Windows":
-        fail("builder %s should be a Windows builder" % name)
-    if "mac" in name and os != "Mac":
-        fail("builder %s should be a macOS builder" % name)
-    if "linux" in name and os != "Linux":
-        fail("builder %s should be a Linux builder" % name)
-
-    def builder(channel, notifies, triggered_by):
-        if channel == "try":
-            dart_try_builder(
-                name,
-                recipe = recipe,
-                dimensions = dimensions,
-                properties = properties,
-                on_cq = on_cq,
-                execution_timeout = execution_timeout,
-                experiment_percentage = experiment_percentage,
-                experiments = experiments,
-                goma = goma,
-                location_regexp = location_regexp,
-            )
-        else:
-            builder_properties = with_goma(
-                goma if service_account == TRY_ACCOUNT else False,
-                channel,
-                dimensions,
-                properties,
-            )
-            builder = name + "-" + channel if channel else name
-            branch = channel if channel else "main"
-            if schedule == "triggered" and triggered_by:
-                triggered_by = [
-                    trigger.replace("%s", branch)
-                    for trigger in triggered_by
-                ]
-                if channel in RELEASE_CHANNELS:
-                    # Always run vm builders on release channels.
-                    triggered_by = [
-                        trigger.replace("dart-vm-", "dart-")
-                        for trigger in triggered_by
-                    ]
-
-            notifies = [notifies] if type(notifies) == type("") else notifies
-            luci.builder(
-                name = builder,
-                build_numbers = True,
-                bucket = bucket,
-                caches = defaults.caches(dimensions["os"]),
-                dimensions = dimensions,
-                executable = executable or dart_recipe(recipe),
-                execution_timeout = execution_timeout,
-                experimental = experimental,
-                experiments = experiments,
-                expiration_timeout = expiration_timeout,
-                priority = priority,
-                properties = builder_properties,
-                notifies = notifies if enabled else None,
-                schedule = schedule if enabled else None,
-                service_account = service_account,
-                swarming_tags = ["vpython:native-python-wrapper"],
-                triggered_by = triggered_by if enabled else None,
-                triggering_policy = triggering_policy,
-            )
-            if category:
-                console_category, _, short_name = category.rpartition("|")
-                toplevel_category, _, _ = console_category.partition("|")
-                console = channel or "be" if not fyi else "fyi"
-                luci.console_view_entry(
-                    builder = builder,
-                    short_name = short_name,
-                    category = console_category,
-                    console_view = console,
-                )
-                if console == "be":
-                    if toplevel_category == "vm":
-                        postponed_alt_console_entries.append({
-                            "builder": builder,
-                            "short_name": short_name,
-                            "category": console_category,
-                        })
-                    else:
-                        luci.console_view_entry(
-                            builder = builder,
-                            short_name = short_name,
-                            category = console_category,
-                            console_view = "alt",
-                        )
-
-    if main_channel:
-        builder(None, notifies = notifies, triggered_by = triggered_by)
-    for channel in channels:
-        if enabled:
-            builder(channel, notifies = None, triggered_by = triggered_by)
-
-def dart_ci_builder(name, bucket = "ci", dimensions = {}, **kwargs):
-    dimensions.setdefault("pool", "luci.dart.ci")
-    dart_builder(
-        name,
-        bucket = bucket,
-        dimensions = dimensions,
-        service_account = CI_ACCOUNT,
-        **kwargs
-    )
-
-def dart_ci_sandbox_builder(name, channels = CHANNELS, **kwargs):
-    dart_builder(
-        name,
-        bucket = "ci.sandbox",
-        channels = channels,
-        service_account = TRY_ACCOUNT,
-        **kwargs
-    )
-
-def dart_infra_builder(name, notifies = "infra", triggered_by = None, **kwargs):
-    dart_ci_builder(
-        name,
-        notifies = notifies,
-        triggered_by = triggered_by,
-        **kwargs
-    )
-    luci.list_view_entry(list_view = "infra", builder = name)
-
-def dart_vm_extra_builder(name, on_cq = False, location_regexp = None, **kwargs):
-    """
-    Creates a Dart builder that is only triggered by VM commits.
-
-    Args:
-        name: The builder name.
-        on_cq: Whether the build is added to the default set of CQ tryjobs.
-        location_regexp: Locations that trigger this builder.
-        **kwargs: Extra arguments are passed on to dart_ci_sandbox_builder.
-    """
-    triggered_by = ["dart-vm-gitiles-trigger-%s"]
-    if on_cq and not location_regexp:
-        location_regexp = to_location_regexp(VM_PATHS)
-        on_cq = False
-    dart_ci_sandbox_builder(
-        name,
-        triggered_by = triggered_by,
-        on_cq = on_cq,
-        location_regexp = location_regexp,
-        **kwargs
-    )
-
-def dart_vm_low_priority_builder(name, **kwargs):
-    dart_vm_extra_builder(
-        name,
-        channels = ["try"],
-        priority = LOW,
-        expiration_timeout = time.day,
-        **kwargs
-    )
-
-def dart_vm_nightly_builder(name, **kwargs):
-    nightly_builder(name, notifies = "dart-vm-team", **kwargs)
-
-def nightly_builder(name, notifies = "nightly", **kwargs):
-    dart_ci_sandbox_builder(
-        name,
-        notifies = notifies,
-        on_cq = False,
-        priority = LOW,
-        triggered_by = ["dart-nightly-trigger"],
-        **kwargs
-    )
-
-def weekly_ci_sandbox_builder(name, notifies = None, **kwargs):
-    dart_ci_sandbox_builder(
-        name,
-        notifies = notifies,
-        on_cq = False,
-        priority = LOW,
-        triggered_by = ["dart-weekly-trigger"],
-        **kwargs
-    )
-
 # cfe
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "front-end-linux-release-x64",
     category = "cfe|l",
     on_cq = True,
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "front-end-mac-release-x64",
     category = "cfe|m",
-    dimensions = mac(),
-    properties = PINNED_XCODE,
+    dimensions = mac,
+    properties = pinned_xcode,
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "front-end-win-release-x64",
     category = "cfe|w",
-    dimensions = windows(),
+    dimensions = windows,
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "front-end-nnbd-linux-release-x64",
     category = "cfe|nnbd|l",
-    location_regexp = to_location_regexp(CFE_PATHS),
+    location_regexp = paths.to_location_regexp(paths.cfe),
 )
-nightly_builder(
+cron.nightly_builder(
     "front-end-nnbd-mac-release-x64",
     category = "cfe|nnbd|m",
     channels = ["try"],
-    dimensions = mac(),
-    properties = PINNED_XCODE,
+    dimensions = mac,
+    properties = pinned_xcode,
 )
-nightly_builder(
+cron.nightly_builder(
     "front-end-nnbd-win-release-x64",
     category = "cfe|nnbd|w",
     channels = ["try"],
-    dimensions = windows(),
+    dimensions = windows,
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "flutter-frontend",
     category = "cfe|fl",
     channels = ["try"],
     notifies = "frontend-team",
-    location_regexp = to_location_regexp(CFE_PATHS_ONLY),
+    location_regexp = paths.to_location_regexp(paths.cfe_only),
 )
-weekly_ci_sandbox_builder(
+cron.weekly_builder(
     "frontend-weekly",
     notifies = "frontend-team",
     channels = [],
@@ -929,14 +242,14 @@ weekly_ci_sandbox_builder(
 )
 
 # flutter
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "flutter-engine-linux",
     recipe = "dart/flutter_engine",
     category = "flutter|3H",
     channels = ["try"],
     execution_timeout = 8 * time.hour,
     triggered_by = ["dart-gitiles-trigger-flutter"],
-    properties = {
+    properties = [{
         "bisection_enabled": True,
         "flutter_test_suites": [
             "add_to_app_life_cycle_tests",
@@ -945,10 +258,10 @@ dart_ci_sandbox_builder(
             "framework_tests",
             "tool_tests",
         ],
-    },
+    }],
 )
 
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "flutter-engine-linux-web_tests",
     recipe = "dart/flutter_engine",
     category = "flutter|web",
@@ -964,618 +277,176 @@ dart_ci_sandbox_builder(
     },
 )
 
-# vm|nnbd|jit
-dart_vm_extra_builder(
-    "vm-kernel-nnbd-linux-debug-x64",
-    category = "vm|nnbd|jit|d",
-    on_cq = True,
-)
-dart_vm_extra_builder(
-    "vm-kernel-nnbd-linux-release-x64",
-    category = "vm|nnbd|jit|r",
-    on_cq = True,
-)
-dart_vm_nightly_builder(
-    "vm-kernel-nnbd-linux-debug-ia32",
-    category = "vm|nnbd|jit|d3",
-    channels = ["try"],
-    properties = SLOW_SHARDS,
-)
-dart_vm_nightly_builder(
-    "vm-kernel-nnbd-linux-release-ia32",
-    category = "vm|nnbd|jit|r3",
-    channels = ["try"],
-)
-dart_vm_nightly_builder(
-    "vm-kernel-nnbd-linux-release-simarm",
-    category = "vm|nnbd|jit|ra",
-    channels = ["try"],
-)
-dart_vm_nightly_builder(
-    "vm-kernel-nnbd-linux-release-simarm64",
-    category = "vm|nnbd|jit|ra6",
-    channels = ["try"],
-)
-dart_vm_nightly_builder(
-    "vm-kernel-nnbd-mac-debug-arm64",
-    category = "vm|nnbd|jit|m1d",
-    channels = ["try"],
-    dimensions = mac(cpu = "arm64"),
-    properties = union(NO_ANDROID, PINNED_XCODE, SLOW_SHARDS),
-)
-dart_vm_nightly_builder(
-    "vm-kernel-nnbd-mac-debug-x64",
-    category = "vm|nnbd|jit|md",
-    channels = ["try"],
-    dimensions = mac(),
-    properties = union(PINNED_XCODE, SLOW_SHARDS),
-)
-dart_vm_extra_builder(
-    "vm-kernel-nnbd-mac-release-arm64",
-    category = "vm|nnbd|jit|m1r",
-    channels = ["try"],
-    dimensions = mac(cpu = "arm64"),
-    properties = union(NO_ANDROID, PINNED_XCODE),
-)
-dart_vm_nightly_builder(
-    "vm-kernel-nnbd-mac-release-x64",
-    category = "vm|nnbd|jit|mr",
-    channels = ["try"],
-    dimensions = mac(),
-    properties = PINNED_XCODE,
-)
-dart_vm_nightly_builder(
-    "vm-kernel-nnbd-win-release-ia32",
-    category = "vm|nnbd|jit|wr3",
-    channels = ["try"],
-    dimensions = windows(),
-)
-dart_vm_nightly_builder(
-    "vm-kernel-nnbd-win-debug-x64",
-    category = "vm|nnbd|jit|wd",
-    channels = ["try"],
-    properties = SLOW_SHARDS,
-    dimensions = windows(),
-)
-dart_vm_nightly_builder(
-    "vm-kernel-nnbd-win-release-x64",
-    category = "vm|nnbd|jit|wr",
-    channels = ["try"],
-    dimensions = windows(),
-)
-
-# vm|nnbd|aot
-dart_vm_extra_builder(
-    "vm-kernel-precomp-nnbd-linux-release-x64",
-    category = "vm|nnbd|aot|r",
-)
-nightly_builder(
-    "vm-kernel-precomp-nnbd-linux-debug-simarm_x64",
-    category = "vm|nnbd|aot|da",
-    channels = ["try"],
-)
-nightly_builder(
-    "vm-kernel-precomp-nnbd-linux-release-simarm_x64",
-    category = "vm|nnbd|aot|ra",
-    channels = ["try"],
-)
-nightly_builder(
-    "vm-kernel-precomp-nnbd-linux-debug-x64",
-    category = "vm|nnbd|aot|d",
-    channels = ["try"],
-    properties = SLOW_SHARDS,
-)
-nightly_builder(
-    "vm-kernel-precomp-nnbd-linux-release-simarm64",
-    category = "vm|nnbd|aot|ra6",
-    channels = ["try"],
-)
-dart_vm_extra_builder(
-    "vm-kernel-precomp-nnbd-mac-release-arm64",
-    category = "vm|nnbd|aot|m1",
-    channels = ["try"],
-    dimensions = mac(cpu = "arm64"),
-    properties = union(NO_ANDROID, PINNED_XCODE, SLOW_SHARDS),
-)
-nightly_builder(
-    "vm-kernel-precomp-nnbd-mac-release-simarm64",
-    category = "vm|nnbd|aot|ma6",
-    channels = ["try"],
-    dimensions = mac(),
-    properties = union(PINNED_XCODE, SLOW_SHARDS),
-)
-nightly_builder(
-    "vm-kernel-precomp-nnbd-win-release-x64",
-    category = "vm|nnbd|aot|wr",
-    channels = ["try"],
-    dimensions = windows(),
-)
-
-# vm|app-kernel
-dart_vm_extra_builder(
-    "app-kernel-linux-debug-x64",
-    category = "vm|app-kernel|d64",
-    properties = SLOW_SHARDS,
-)
-dart_vm_nightly_builder(
-    "app-kernel-linux-product-x64",
-    category = "vm|app-kernel|p64",
-    channels = ["try"],
-)
-dart_vm_extra_builder(
-    "app-kernel-linux-release-x64",
-    category = "vm|app-kernel|r64",
-)
-
-#vm|kernel
-dart_vm_extra_builder(
-    "vm-canary-linux-debug",
-    category = "vm|kernel|c",
-    on_cq = True,
-)
-dart_ci_sandbox_builder("vm-kernel-linux-debug-x64", category = "vm|kernel|d")
-dart_vm_extra_builder(
-    "vm-kernel-linux-release-simarm",
-    category = "vm|kernel|a32",
-)
-dart_vm_extra_builder(
-    "vm-kernel-linux-release-simarm64",
-    category = "vm|kernel|a64",
-)
-dart_vm_nightly_builder(
-    "vm-kernel-linux-release-ia32",
-    category = "vm|kernel|r32",
-    channels = ["try"],
-)
-dart_ci_sandbox_builder(
-    "vm-kernel-linux-release-x64",
-    category = "vm|kernel|r",
-    on_cq = True,
-)
-dart_vm_extra_builder(
-    "vm-kernel-checked-linux-release-x64",
-    category = "vm|kernel|rc",
-    experiments = {"dart.use_update_script": 100},
-)
-dart_vm_nightly_builder(
-    "vm-kernel-linux-debug-ia32",
-    category = "vm|kernel|d32",
-    channels = ["try"],
-)
-dart_ci_sandbox_builder(
-    "vm-kernel-mac-debug-x64",
-    category = "vm|kernel|md",
-    dimensions = mac(),
-    properties = PINNED_XCODE,
-)
-dart_ci_sandbox_builder(
-    "vm-kernel-mac-release-x64",
-    category = "vm|kernel|mr",
-    dimensions = mac(),
-    on_cq = True,
-    experiment_percentage = 5,
-    properties = PINNED_XCODE,
-)
-dart_ci_sandbox_builder(
-    "vm-kernel-mac-release-arm64",
-    category = "vm|kernel|m1r",
-    channels = ["try", "dev"],
-    dimensions = mac(cpu = "arm64"),
-    properties = union(NO_ANDROID, PINNED_XCODE),
-)
-dart_vm_nightly_builder(
-    "vm-kernel-win-debug-ia32",
-    category = "vm|kernel|wd3",
-    channels = ["try"],
-    dimensions = windows(),
-)
-dart_ci_sandbox_builder(
-    "vm-kernel-win-debug-x64",
-    category = "vm|kernel|wd",
-    dimensions = windows(),
-)
-dart_vm_nightly_builder(
-    "vm-kernel-win-release-ia32",
-    category = "vm|kernel|wr3",
-    channels = ["try"],
-    dimensions = windows(),
-)
-dart_ci_sandbox_builder(
-    "vm-kernel-win-release-x64",
-    category = "vm|kernel|wr",
-    dimensions = windows(),
-)
-dart_vm_extra_builder(
-    "cross-vm-linux-release-arm64",
-    category = "vm|kernel|cra",
-    channels = [],
-    properties = {"shard_timeout": (120 * time.minute) // time.second},
-)
-
-# vm|kernel-precomp
-dart_vm_extra_builder(
-    "vm-kernel-precomp-linux-debug-x64",
-    category = "vm|kernel-precomp|d",
-)
-dart_vm_extra_builder(
-    "vm-kernel-precomp-linux-product-x64",
-    category = "vm|kernel-precomp|p",
-)
-dart_vm_extra_builder(
-    "vm-kernel-precomp-linux-release-simarm",
-    category = "vm|kernel-precomp|a32",
-)
-dart_vm_extra_builder(
-    "vm-kernel-precomp-linux-release-simarm64",
-    category = "vm|kernel-precomp|a64",
-)
-dart_vm_extra_builder(
-    "vm-kernel-precomp-linux-release-x64",
-    category = "vm|kernel-precomp|r",
-)
-dart_vm_extra_builder(
-    "vm-kernel-precomp-obfuscate-linux-release-x64",
-    category = "vm|kernel-precomp|o",
-)
-dart_vm_extra_builder(
-    "vm-kernel-precomp-linux-debug-simarm_x64",
-    category = "vm|kernel-precomp|adx",
-    properties = SLOW_SHARDS,
-)
-dart_vm_extra_builder(
-    "vm-kernel-precomp-linux-release-simarm_x64",
-    category = "vm|kernel-precomp|arx",
-)
-dart_vm_extra_builder(
-    "vm-kernel-precomp-mac-release-simarm64",
-    category = "vm|kernel-precomp|ma",
-    dimensions = mac(),
-    properties = PINNED_XCODE,
-)
-dart_vm_extra_builder(
-    "vm-kernel-precomp-win-release-x64",
-    category = "vm|kernel-precomp|wr",
-    dimensions = windows(),
-)
-dart_vm_nightly_builder(
-    "cross-vm-precomp-linux-release-arm64",
-    category = "vm|kernel-precomp|cra",
-    channels = [],
-    properties = SLOW_SHARDS,
-)
-dart_vm_nightly_builder(
-    "vm-kernel-precomp-dwarf-linux-product-x64",
-    category = "vm|kernel-precomp|dw",
-    channels = ["try"],
-)
-
-# vm|kernel-precomp|android
-dart_vm_extra_builder(
-    "vm-kernel-precomp-android-release-arm_x64",
-    category = "vm|kernel-precomp|android|a32",
-    properties = SLOW_SHARDS,
-)
-dart_vm_extra_builder(
-    "vm-kernel-precomp-android-release-arm64c",
-    category = "vm|kernel-precomp|android|a64",
-    properties = SLOW_SHARDS,
-)
-
-# vm|product
-dart_vm_nightly_builder(
-    "vm-kernel-linux-product-x64",
-    category = "vm|product|l",
-    channels = ["try"],
-)
-dart_vm_nightly_builder(
-    "vm-kernel-mac-product-x64",
-    category = "vm|product|m",
-    channels = ["try"],
-    dimensions = mac(),
-    properties = PINNED_XCODE,
-)
-dart_vm_nightly_builder(
-    "vm-kernel-win-product-x64",
-    category = "vm|product|w",
-    channels = ["try"],
-    dimensions = windows(),
-)
-
-# vm|misc
-dart_vm_nightly_builder(
-    "vm-kernel-optcounter-threshold-linux-release-ia32",
-    category = "vm|misc|o32",
-    channels = ["try"],
-)
-dart_vm_low_priority_builder(
-    "vm-kernel-optcounter-threshold-linux-release-x64",
-    category = "vm|misc|o64",
-)
-
-def dart_vm_sanitizer_builder(name, **kwargs):
-    nightly_builder(
-        name,
-        channels = ["try"],
-        properties = {"bisection_enabled": True},
-        **kwargs
-    )
-
-dart_vm_sanitizer_builder(
-    "vm-kernel-asan-linux-release-x64",
-    category = "vm|misc|a",
-)
-dart_vm_sanitizer_builder(
-    "vm-kernel-msan-linux-release-x64",
-    category = "vm|misc|m",
-)
-dart_vm_sanitizer_builder(
-    "vm-kernel-tsan-linux-release-x64",
-    category = "vm|misc|t",
-)
-dart_vm_sanitizer_builder(
-    "vm-kernel-ubsan-linux-release-x64",
-    category = "vm|misc|u",
-    goma = False,
-)  # ubsan is not compatible with our sysroot.
-dart_vm_sanitizer_builder(
-    "vm-kernel-precomp-asan-linux-release-x64",
-    category = "vm|misc|aot|a",
-)
-dart_vm_sanitizer_builder(
-    "vm-kernel-precomp-msan-linux-release-x64",
-    category = "vm|misc|aot|m",
-)
-dart_vm_sanitizer_builder(
-    "vm-kernel-precomp-tsan-linux-release-x64",
-    category = "vm|misc|aot|t",
-)
-dart_vm_sanitizer_builder(
-    "vm-kernel-precomp-ubsan-linux-release-x64",
-    category = "vm|misc|aot|u",
-    goma = False,
-)  # ubsan is not compatible with our sysroot.
-dart_vm_nightly_builder(
-    "vm-kernel-reload-linux-debug-x64",
-    category = "vm|misc|reload|d",
-    channels = ["try"],
-)
-dart_vm_nightly_builder(
-    "vm-kernel-reload-linux-release-x64",
-    category = "vm|misc|reload|r",
-    channels = ["try"],
-)
-dart_vm_nightly_builder(
-    "vm-kernel-reload-rollback-linux-debug-x64",
-    category = "vm|misc|reload|drb",
-    channels = ["try"],
-)
-dart_vm_nightly_builder(
-    "vm-kernel-reload-rollback-linux-release-x64",
-    category = "vm|misc|reload|rrb",
-    channels = ["try"],
-)
-dart_vm_nightly_builder(
-    "vm-kernel-linux-debug-x64c",
-    category = "vm|misc|compressed|jl",
-    channels = ["try"],
-)
-dart_vm_nightly_builder(
-    "vm-kernel-precomp-linux-debug-x64c",
-    category = "vm|misc|compressed|al",
-    channels = ["try"],
-)
-dart_vm_nightly_builder(
-    "vm-kernel-win-debug-x64c",
-    category = "vm|misc|compressed|jw",
-    channels = ["try"],
-    dimensions = windows(),
-)
-dart_vm_nightly_builder(
-    "vm-kernel-precomp-win-debug-x64c",
-    category = "vm|misc|compressed|aw",
-    channels = ["try"],
-    dimensions = windows(),
-)
-dart_vm_low_priority_builder("vm-fuchsia-release-x64", category = "vm|misc|f")
-
-# Our sysroot does not support gcc, we can't use goma on RBE for this builder
-dart_vm_nightly_builder("vm-kernel-gcc-linux", category = "vm|misc|g", goma = False)
-
-dart_vm_nightly_builder(
-    "vm-kernel-linux-debug-simriscv64",
-    category = "vm|misc|rv64",
-    channels = ["try"],
-)
-dart_vm_nightly_builder(
-    "vm-kernel-precomp-linux-debug-simriscv64",
-    category = "vm|misc|rv64",
-    channels = ["try"],
-)
-
-# vm|ffi
-dart_vm_extra_builder("vm-ffi-android-debug-arm", category = "vm|ffi|d32")
-dart_vm_extra_builder("vm-ffi-android-release-arm", category = "vm|ffi|r32")
-dart_vm_extra_builder("vm-ffi-android-product-arm", category = "vm|ffi|p32")
-dart_vm_extra_builder("vm-ffi-android-debug-arm64c", category = "vm|ffi|d64")
-dart_vm_extra_builder("vm-ffi-android-release-arm64c", category = "vm|ffi|r64")
-dart_vm_extra_builder("vm-ffi-android-product-arm64c", category = "vm|ffi|p64")
-dart_vm_extra_builder(
-    "vm-precomp-ffi-qemu-linux-release-arm",
-    category = "vm|ffi|qa",
-)
-dart_vm_extra_builder(
-    "vm-precomp-ffi-qemu-linux-release-riscv64",
-    category = "vm|ffi|qr",
-)
+vm = exec("//vm.star")
 
 # pkg
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "pkg-linux-release",
     category = "pkg|l",
     on_cq = True,
-    properties = union(CHROME, PINNED_XCODE),
+    properties = [chrome, pinned_xcode],
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "pkg-mac-release",
     category = "pkg|m",
-    dimensions = mac(),
-    properties = union(CHROME, PINNED_XCODE),
+    dimensions = mac,
+    properties = [chrome, pinned_xcode],
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "pkg-mac-release-arm64",
     category = "pkg|m1",
     channels = ["try"],
-    dimensions = mac(cpu = "arm64"),
-    properties = union(CHROME, NO_ANDROID, PINNED_XCODE),
+    dimensions = [mac, arm64],
+    properties = [chrome, no_android, pinned_xcode],
     experiments = {"dart.use_update_script": 100},
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "pkg-win-release",
     category = "pkg|w",
-    dimensions = windows(),
-    properties = CHROME,
+    dimensions = windows,
+    properties = chrome,
     experiments = {"dart.use_update_script": 100},
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "pkg-linux-debug",
     category = "pkg|ld",
     channels = ["try"],
-    properties = CHROME,
+    properties = chrome,
 )
 
 # dart2js
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "dart2js-canary-x64",
     category = "dart2js|c",
-    properties = union(CHROME, NO_ANDROID),
+    properties = [chrome, no_android],
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "dart2js-strong-hostasserts-linux-ia32-d8",
     category = "dart2js|d8|ha",
-    location_regexp = to_location_regexp(DART2JS_PATHS),
-    properties = NO_ANDROID,
+    location_regexp = paths.to_location_regexp(paths.dart2js),
+    properties = no_android,
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "dart2js-minified-strong-linux-x64-d8",
     category = "dart2js|d8|mi",
-    location_regexp = to_location_regexp(DART2JS_PATHS),
-    properties = NO_ANDROID,
+    location_regexp = paths.to_location_regexp(paths.dart2js),
+    properties = no_android,
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "dart2js-unit-linux-x64-release",
     category = "dart2js|d8|u",
-    location_regexp = to_location_regexp(DART2JS_PATHS),
-    properties = NO_ANDROID,
+    location_regexp = paths.to_location_regexp(paths.dart2js),
+    properties = no_android,
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "dart2js-strong-linux-x64-chrome",
     category = "dart2js|chrome|l",
-    location_regexp = to_location_regexp(DART2JS_PATHS),
-    properties = union(CHROME, NO_ANDROID),
+    location_regexp = paths.to_location_regexp(paths.dart2js),
+    properties = [chrome, no_android],
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "dart2js-csp-minified-linux-x64-chrome",
     category = "dart2js|chrome|csp",
-    properties = union(CHROME, NO_ANDROID),
+    properties = [chrome, no_android],
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "dart2js-strong-mac-x64-chrome",
     category = "dart2js|chrome|m",
-    dimensions = mac(),
-    properties = union(CHROME, PINNED_XCODE, NO_ANDROID),
+    dimensions = mac,
+    properties = [chrome, pinned_xcode, no_android],
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "dart2js-strong-win-x64-chrome",
     category = "dart2js|chrome|w",
-    dimensions = windows(),
-    properties = union(CHROME, NO_ANDROID),
+    dimensions = windows,
+    properties = [chrome, no_android],
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "dart2js-nnbd-linux-x64-chrome",
     category = "dart2js|chrome|nn",
-    location_regexp = to_location_regexp(DART2JS_PATHS),
-    properties = union(CHROME, NO_ANDROID),
+    location_regexp = paths.to_location_regexp(paths.dart2js),
+    properties = [chrome, no_android],
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "dart2js-strong-linux-x64-firefox",
     category = "dart2js|firefox|l",
-    properties = union(FIREFOX, NO_ANDROID),
+    properties = [firefox, no_android],
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "dart2js-strong-win-x64-firefox",
     category = "dart2js|firefox|w",
-    dimensions = windows(),
+    dimensions = windows,
     enabled = False,
-    properties = union(FIREFOX, NO_ANDROID),
+    properties = [firefox, no_android],
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "dart2js-strong-mac-x64-safari",
     category = "dart2js|safari|m",
-    dimensions = mac(),
-    properties = union(PINNED_XCODE, NO_ANDROID),
+    dimensions = mac,
+    properties = [pinned_xcode, no_android],
 )
 
 # analyzer
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "flutter-analyze",
     category = "analyzer|fa",
     channels = ["try"],
     execution_timeout = 45 * time.minute,
     notifies = None,
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "analyzer-analysis-server-linux",
     category = "analyzer|as",
-    channels = CHANNELS,
-    location_regexp = to_location_regexp(ANALYZER_PATHS),
+    channels = dart.channels,
+    location_regexp = paths.to_location_regexp(paths.analyzer),
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "analyzer-linux-release",
     category = "analyzer|l",
-    channels = CHANNELS,
-    location_regexp = to_location_regexp(ANALYZER_PATHS),
+    channels = dart.channels,
+    location_regexp = paths.to_location_regexp(paths.analyzer),
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "analyzer-mac-release",
     category = "analyzer|m",
-    channels = CHANNELS,
-    dimensions = mac(),
-    properties = PINNED_XCODE,
+    channels = dart.channels,
+    dimensions = mac,
+    properties = pinned_xcode,
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "analyzer-win-release",
     category = "analyzer|w",
-    channels = CHANNELS,
-    dimensions = windows(),
+    channels = dart.channels,
+    dimensions = windows,
     experiments = {"dart.use_update_script": 100},
 )
 
 # analyzer|nnbd
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "analyzer-nnbd-linux-release",
     category = "analyzer|nnbd|l",
-    location_regexp = to_location_regexp(ANALYZER_NNBD_PATHS),
-    channels = CHANNELS,
+    location_regexp = paths.to_location_regexp(paths.analyzer_nnbd),
+    channels = dart.channels,
 )
-nightly_builder(
+cron.nightly_builder(
     "analyzer-nnbd-mac-release",
     category = "analyzer|nnbd|m",
     channels = ["try"],
-    dimensions = mac(),
-    properties = PINNED_XCODE,
+    dimensions = mac,
+    properties = pinned_xcode,
 )
-nightly_builder(
+cron.nightly_builder(
     "analyzer-nnbd-win-release",
     category = "analyzer|nnbd|w",
     channels = ["try"],
-    dimensions = windows(),
+    dimensions = windows,
 )
 
 # sdk
-dart_ci_builder(
+dart.ci_builder(
     "dart-sdk-linux",
     category = "sdk|l",
-    channels = CHANNELS,
+    channels = dart.channels,
     main_channel = False,
     properties = {
         "$dart/build": {
@@ -1583,134 +454,126 @@ dart_ci_builder(
         },
     },
 )
-dart_ci_builder(
+dart.ci_builder(
     "dart-sdk-mac",
     category = "sdk|m",
-    channels = CHANNELS,
-    dimensions = mac(),
+    channels = dart.channels,
+    dimensions = mac,
     main_channel = False,
-    properties = PINNED_XCODE,
+    properties = pinned_xcode,
 )
-dart_ci_builder(
+dart.ci_builder(
     "dart-sdk-mac-arm64",
     category = "sdk|m1",
-    channels = CHANNELS,
-    dimensions = mac(cpu = "arm64"),
+    channels = dart.channels,
+    dimensions = [mac, arm64],
     main_channel = False,
-    properties = union(NO_ANDROID, PINNED_XCODE),
+    properties = [no_android, pinned_xcode],
 )
 
-dart_ci_builder(
+dart.ci_builder(
     "dart-sdk-win",
     category = "sdk|w",
-    channels = CHANNELS,
-    dimensions = windows(),
+    channels = dart.channels,
+    dimensions = windows,
     main_channel = False,
     on_cq = True,
 )
 
 # ddc
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "ddc-linux-release-chrome",
     category = "ddc|l",
-    location_regexp = to_location_regexp(DDC_PATHS),
-    properties = CHROME,
+    location_regexp = paths.to_location_regexp(paths.ddc),
+    properties = chrome,
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "ddc-nnbd-linux-release-chrome",
     category = "ddc|nn",
     channels = ["try"],
-    location_regexp = to_location_regexp(DDC_PATHS),
-    properties = CHROME,
+    location_regexp = paths.to_location_regexp(paths.ddc),
+    properties = chrome,
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "ddc-mac-release-chrome",
     category = "ddc|m",
-    dimensions = mac(),
-    properties = union(CHROME, PINNED_XCODE),
+    dimensions = mac,
+    properties = [chrome, pinned_xcode],
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "ddc-win-release-chrome",
     category = "ddc|w",
-    dimensions = windows(),
-    properties = CHROME,
+    dimensions = windows,
+    properties = chrome,
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "ddk-linux-release-firefox",
     category = "ddc|fl",
-    properties = FIREFOX,
+    properties = firefox,
 )
 
 # misc
-dart_ci_sandbox_builder("gclient", recipe = "dart/gclient", category = "misc|g")
-dart_ci_builder(
+dart.ci_sandbox_builder("gclient", recipe = "dart/gclient", category = "misc|g")
+dart.ci_builder(
     "debianpackage-linux",
     category = "misc|dp",
-    channels = RELEASE_CHANNELS,
+    channels = dart.release_channels,
     notifies = "infra",
     properties = {
         "clobber": False,
     },
 )
 
-# Isolate stress test builder
-dart_vm_extra_builder(
-    "iso-stress-linux",
-    channels = [],
-    notifies = "dart-vm-team",
-)
-
 # external
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "google",
     recipe = "dart/external",
     category = "flutter|g3",
     channels = [],
     execution_timeout = 5 * time.minute,
     notifies = None,
-    priority = HIGH,
+    priority = priority.high,
     triggered_by = None,
 )
 
 # infra
-dart_infra_builder(
+dart.infra_builder(
     "base",
     execution_timeout = 15 * time.minute,
     recipe = "dart/forward_branch",
     schedule = "with 15m interval",
     notifies = None,
 )
-dart_infra_builder(
+dart.infra_builder(
     "cbuild",
     recipe = "dart/cbuild",
     schedule = "with 15m interval",
     execution_timeout = 10 * time.minute,
 )
-dart_infra_builder("chocolatey", recipe = "dart/chocolatey", dimensions = windows())
-dart_infra_builder("co19-roller", recipe = "dart/package_co19")
-dart_infra_builder(
+dart.infra_builder("chocolatey", recipe = "dart/chocolatey", dimensions = windows)
+dart.infra_builder("co19-roller", recipe = "dart/package_co19")
+dart.infra_builder(
     "dart-ci-scripts-linux",
     recipe = "dart/package_dart_ci",
-    dimensions = linux(),
 )
-dart_infra_builder(
+dart.infra_builder(
     "dart-ci-scripts-win",
     recipe = "dart/package_dart_ci",
-    dimensions = windows(),
+    dimensions = windows,
 )
-dart_infra_builder(
+dart.infra_builder(
     "dart-ci-scripts-mac",
     recipe = "dart/package_dart_ci",
-    dimensions = mac(),
-    properties = PINNED_XCODE,
+    dimensions = mac,
+    properties = pinned_xcode,
 )
-dart_infra_builder(
+dart.infra_builder(
     "dart-ci-scripts-mac-arm64",
     recipe = "dart/package_dart_ci",
-    dimensions = mac(cpu = "arm64"),
-    properties = PINNED_XCODE,
+    dimensions = [mac, arm64],
+    properties = pinned_xcode,
 )
-dart_infra_builder(
+dart.infra_builder(
     "linearize-flutter",
     recipe = "dart/linearize",
     properties = {
@@ -1724,7 +587,7 @@ dart_infra_builder(
     ],
     triggering_policy = scheduler.greedy_batching(max_batch_size = 1),
 )
-dart_infra_builder(
+dart.infra_builder(
     "roll-to-dev",
     bucket = "ci.roll",
     execution_timeout = 15 * time.minute,
@@ -1740,14 +603,14 @@ dart_infra_builder(
 # image. The `vm-precomp-ffi-qemu-linux-release-arm` is  used because qemu is
 # the primary difference, it passes all tests, triggers no shards and runs a few
 # different builds. See also https://crbug.com/1207358.
-nightly_builder(
+cron.nightly_builder(
     "vm-precomp-ffi-qemu-linux-release-arm-experimental",
     channels = [],
     dimensions = {"host_class": "experimental"},
     notifies = "infra",
 )
 
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "ci-test-data",
     channels = [],
     properties = {"bisection_enabled": True},
@@ -1756,7 +619,7 @@ dart_ci_sandbox_builder(
 )
 
 # Fuzz testing builders
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "fuzz-linux",
     channels = [],
     notifies = "dart-fuzz-testing",
@@ -1765,20 +628,16 @@ dart_ci_sandbox_builder(
 )
 
 # Try only builders
-dart_try_builder("benchmark-linux", on_cq = True, properties = JS_ENGINES)
+dart.try_builder("benchmark-linux", on_cq = True, properties = js_engines)
 
-dart_try_builder(
+dart.try_builder(
     "presubmit",
     bucket = "try.shared",
     execution_timeout = 10 * time.minute,
     recipe = "presubmit/presubmit",
 )
 
-def add_postponed_alt_console_entries():
-    for entry in postponed_alt_console_entries:
-        luci.console_view_entry(console_view = "alt", **entry)
-
-add_postponed_alt_console_entries()
+vm.add_postponed_alt_console_entries()
 
 # Dart Fuzz console
 luci.list_view_entry(
@@ -1821,55 +680,4 @@ luci.list_view_entry(
     list_view = "iso-stress",
 )
 
-def chromium_infra_recipe(name):
-    return luci.recipe(
-        name = name,
-        cipd_package =
-            "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
-        cipd_version = "git_revision:21e1e6473db300eb5045e4483e8b53d1324cd0d8",
-        use_bbagent = True,
-    )
-
-# Rolls dart recipe dependencies.
-dart_infra_builder(
-    name = "recipe-deps-roller",
-    executable = chromium_infra_recipe("recipe_autoroller"),
-    execution_timeout = 20 * time.minute,
-    expiration_timeout = time.day,
-    priority = LOW,
-    properties = {
-        "db_gcs_bucket": "dart-recipe-roller-db",
-        "projects": {
-            "dart": "https://dart.googlesource.com/recipes",
-        }.items(),  # recipe_autoroller expects a list of tuples.
-    },
-    schedule = "with 4h interval",
-)
-
-dart_infra_builder(
-    name = "recipe-bundler",
-    executable = chromium_infra_recipe("recipe_bundler"),
-    execution_timeout = 5 * time.minute,
-    properties = {
-        # This property controls the version of the recipe_bundler go tool:
-        #   https://chromium.googlesource.com/infra/infra/+/main/go/src/infra/tools/recipe_bundler
-        "recipe_bundler_vers": "git_revision:bc0c2fb9082bc82a2d972b5cca8fc17afa55d34e",
-        # These control the prefix of the CIPD package names that the tool
-        # will create.
-        "package_name_prefix": "dart/recipe_bundles",
-        "package_name_internal_prefix": "dart_internal/recipe_bundles",
-        # Where to grab the recipes to bundle.
-        "repo_specs": [
-            "dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/main",
-        ],
-    },
-    schedule = "*/30 * * * *",
-    triggered_by = [
-        luci.gitiles_poller(
-            name = "recipes-dart",
-            bucket = "ci",
-            repo = "https://dart.googlesource.com/recipes",
-            refs = ["refs/heads/main"],
-        ),
-    ],
-)
+exec("//recipes.star")
diff --git a/project.star b/project.star
new file mode 100644
index 000000000000..277f80bde0e2
--- /dev/null
+++ b/project.star
@@ -0,0 +1,144 @@
+# Copyright (c) 2022 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Global definitions and ACLs for the project.
+"""
+
+load("//lib/accounts.star", "accounts")
+
+# https://chrome-infra-auth.appspot.com/auth/groups/project-dart-ci-task-accounts
+CI_ACCOUNTS_GROUP = "project-dart-ci-task-accounts"
+
+# https://chrome-infra-auth.appspot.com/auth/groups/project-dart-try-task-accounts
+TRY_ACCOUNTS_GROUP = "project-dart-try-task-accounts"
+
+ROLL_TRIGGERERS = {
+    "groups": ["project-dart-roller-owners"],
+    "users": [
+        accounts.ci_builder,
+    ],
+}
+CI_SANDBOX_TRIGGERERS = [accounts.ci_builder, accounts.try_builder]
+
+lucicfg.config(
+    tracked_files = ["*"],
+    lint_checks = ["all"],
+)
+
+luci.project(
+    name = "dart",
+    buildbucket = "cr-buildbucket.appspot.com",
+    logdog = "luci-logdog.appspot.com",
+    milo = "luci-milo.appspot.com",
+    notify = "luci-notify.appspot.com",
+    scheduler = "luci-scheduler.appspot.com",
+    swarming = "chromium-swarm.appspot.com",
+    acls = [
+        acl.entry(
+            [
+                acl.BUILDBUCKET_READER,
+                acl.LOGDOG_READER,
+                acl.PROJECT_CONFIGS_READER,
+                acl.SCHEDULER_READER,
+            ],
+            groups = ["all"],
+        ),
+        acl.entry(acl.LOGDOG_WRITER, groups = ["luci-logdog-chromium-writers"]),
+        acl.entry(
+            [acl.SCHEDULER_OWNER, acl.BUILDBUCKET_TRIGGERER],
+            groups = ["project-dart-admins"],
+        ),
+        acl.entry(acl.CQ_COMMITTER, groups = ["project-dart-committers"]),
+        acl.entry(acl.CQ_DRY_RUNNER, groups = ["project-dart-tryjob-access"]),
+    ],
+    bindings = [
+        luci.binding(
+            roles = "role/configs.validator",
+            users = accounts.try_builder,
+        ),
+        luci.binding(
+            roles = "role/swarming.poolOwner",
+            groups = "project-dart-admins",
+        ),
+        luci.binding(
+            roles = "role/swarming.poolViewer",
+            groups = "project-dart-committers",
+        ),
+    ],
+)
+
+luci.logdog(gs_bucket = "chromium-luci-logdog")
+
+luci.bucket(
+    name = "ci",
+    acls = [
+        acl.entry(acl.BUILDBUCKET_TRIGGERER, users = [accounts.ci_builder]),
+    ],
+)
+luci.bucket(
+    name = "ci.roll",
+    acls = [
+        acl.entry(acl.BUILDBUCKET_TRIGGERER, **ROLL_TRIGGERERS),
+    ],
+)
+luci.bucket(
+    name = "ci.sandbox",
+    acls = [
+        acl.entry(acl.BUILDBUCKET_TRIGGERER, users = CI_SANDBOX_TRIGGERERS),
+    ],
+)
+TRY_ACLS = [
+    acl.entry(
+        acl.BUILDBUCKET_TRIGGERER,
+        groups = ["project-dart-tryjob-access", "service-account-cq"],
+    ),
+]
+luci.bucket(name = "try", acls = TRY_ACLS)  # Tryjobs specific to the Dart SDK repo.
+luci.bucket(name = "try.shared", acls = TRY_ACLS)  # Tryjobs for all repos.
+
+# Swarming permissions in realms.cfg.
+
+luci.realm(name = "pools/ci")
+luci.realm(name = "pools/try")
+luci.realm(
+    name = "pools/tests",
+    bindings = [
+        luci.binding(
+            roles = "role/swarming.poolUser",
+            groups = [CI_ACCOUNTS_GROUP, TRY_ACCOUNTS_GROUP],
+        ),
+    ],
+)
+
+def led_users(*, pool_realms, builder_realm, groups):
+    for realm in pool_realms:
+        luci.binding(
+            realm = realm,
+            roles = "role/swarming.poolUser",
+            groups = groups,
+        )
+    luci.binding(
+        realm = builder_realm,
+        roles = "role/swarming.taskTriggerer",
+        groups = groups,
+    )
+
+# Allow admins to use LED and "Debug" button on every Dart builder and bot.
+led_users(
+    pool_realms = ["@root"],
+    builder_realm = "@root",
+    groups = ["project-dart-admins"],
+)
+
+# Allow mdb/dart-build-access to use LED and "Debug" button on try builders and
+# try and test bots.
+led_users(
+    pool_realms = ["pools/try", "pools/tests"],
+    builder_realm = "try",
+    groups = ["mdb/dart-build-access"],
+)
+
+luci.milo(
+    logo = "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png",
+)
diff --git a/recipes.star b/recipes.star
new file mode 100644
index 000000000000..c58f8f5448c3
--- /dev/null
+++ b/recipes.star
@@ -0,0 +1,65 @@
+# Copyright (c) 2022 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Luci recipe framework infrastructure.
+
+The recipe-deps-roller keeps recipe dependencies up-to-date and the recipe
+bundler uploads recipes as CIPD packages.
+"""
+
+load("//lib/dart.star", "dart")
+load("//lib/priority.star", "priority")
+
+def chromium_infra_recipe(name):
+    return luci.recipe(
+        name = name,
+        cipd_package =
+            "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
+        cipd_version = "git_revision:21e1e6473db300eb5045e4483e8b53d1324cd0d8",
+        use_bbagent = True,
+    )
+
+# Rolls dart recipe dependencies.
+dart.infra_builder(
+    name = "recipe-deps-roller",
+    executable = chromium_infra_recipe("recipe_autoroller"),
+    execution_timeout = 20 * time.minute,
+    expiration_timeout = time.day,
+    priority = priority.low,
+    properties = {
+        "db_gcs_bucket": "dart-recipe-roller-db",
+        "projects": {
+            "dart": "https://dart.googlesource.com/recipes",
+        }.items(),  # recipe_autoroller expects a list of tuples.
+    },
+    schedule = "with 4h interval",
+)
+
+dart.infra_builder(
+    name = "recipe-bundler",
+    executable = chromium_infra_recipe("recipe_bundler"),
+    execution_timeout = 5 * time.minute,
+    properties = {
+        # These control the prefix of the CIPD package names that the tool
+        # will create.
+        "package_name_internal_prefix": "dart_internal/recipe_bundles",
+        "package_name_prefix": "dart/recipe_bundles",
+        # This property controls the version of the recipe_bundler go tool:
+        #   https://chromium.googlesource.com/infra/infra/+/main/go/src/infra/tools/recipe_bundler
+        "recipe_bundler_vers": "git_revision:bc0c2fb9082bc82a2d972b5cca8fc17afa55d34e",
+        # Where to grab the recipes to bundle.
+        "repo_specs": [
+            "dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/main",
+        ],
+    },
+    schedule = "*/30 * * * *",
+    triggered_by = [
+        luci.gitiles_poller(
+            name = "recipes-dart",
+            bucket = "ci",
+            repo = "https://dart.googlesource.com/recipes",
+            refs = ["refs/heads/main"],
+        ),
+    ],
+)
diff --git a/vm.star b/vm.star
new file mode 100644
index 000000000000..b2a032490ed4
--- /dev/null
+++ b/vm.star
@@ -0,0 +1,533 @@
+# Copyright (c) 2022 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Defines the Dart VM builders.
+"""
+
+load("//lib/cron.star", "cron")
+load("//lib/dart.star", "dart")
+load(
+    "//lib/defaults.star",
+    "arm64",
+    "mac",
+    "no_android",
+    "pinned_xcode",
+    "slow_shards",
+    "windows",
+)
+load("//lib/paths.star", "paths")
+load("//lib/priority.star", "priority")
+
+_postponed_alt_console_entries = []
+
+dart.poller("dart-vm-gitiles-trigger", branches = ["main"], paths = paths.vm)
+luci.notifier(
+    name = "dart-vm-team",
+    on_new_failure = True,
+    notify_emails = ["dart-vm-team-breakages@google.com"],
+)
+
+def _builder(name, category = None, **kwargs):
+    dart.ci_sandbox_builder(name, category = category, **kwargs)
+    _postponed_alt_console_entry(name, category)
+
+def _extra_builder(name, on_cq = False, location_regexp = None, **kwargs):
+    """
+    Creates a Dart builder that is only triggered by VM commits.
+
+    Args:
+        name: The builder name.
+        on_cq: Whether the build is added to the default set of CQ tryjobs.
+        location_regexp: Locations that trigger this builder.
+        **kwargs: Extra arguments are passed on to dart_ci_sandbox_builder.
+    """
+    triggered_by = ["dart-vm-gitiles-trigger-%s"]
+    if on_cq and not location_regexp:
+        # Don't add extra builders to the default CQ, trigger only on VM paths.
+        location_regexp = paths.to_location_regexp(paths.vm)
+        on_cq = False
+    _builder(
+        name,
+        triggered_by = triggered_by,
+        on_cq = on_cq,
+        location_regexp = location_regexp,
+        **kwargs
+    )
+
+def _low_priority_builder(name, **kwargs):
+    _extra_builder(
+        name,
+        channels = ["try"],
+        priority = priority.low,
+        expiration_timeout = time.day,
+        **kwargs
+    )
+
+def _nightly_builder(name, category, **kwargs):
+    cron.nightly_builder(name, category = category, notifies = "dart-vm-team", **kwargs)
+    _postponed_alt_console_entry(name, category)
+
+def _postponed_alt_console_entry(name, category):
+    if category:
+        console_category, _, short_name = category.rpartition("|")
+        _postponed_alt_console_entries.append({
+            "builder": name,
+            "category": console_category,
+            "short_name": short_name,
+        })
+
+def add_postponed_alt_console_entries():
+    for entry in _postponed_alt_console_entries:
+        luci.console_view_entry(console_view = "alt", **entry)
+
+# vm|nnbd|jit
+_extra_builder(
+    "vm-kernel-nnbd-linux-debug-x64",
+    category = "vm|nnbd|jit|d",
+    on_cq = True,
+)
+_extra_builder(
+    "vm-kernel-nnbd-linux-release-x64",
+    category = "vm|nnbd|jit|r",
+    on_cq = True,
+)
+_nightly_builder(
+    "vm-kernel-nnbd-linux-debug-ia32",
+    category = "vm|nnbd|jit|d3",
+    channels = ["try"],
+    properties = slow_shards,
+)
+_nightly_builder(
+    "vm-kernel-nnbd-linux-release-ia32",
+    category = "vm|nnbd|jit|r3",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-kernel-nnbd-linux-release-simarm",
+    category = "vm|nnbd|jit|ra",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-kernel-nnbd-linux-release-simarm64",
+    category = "vm|nnbd|jit|ra6",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-kernel-nnbd-mac-debug-arm64",
+    category = "vm|nnbd|jit|m1d",
+    channels = ["try"],
+    dimensions = [mac, arm64],
+    properties = [no_android, pinned_xcode, slow_shards],
+)
+_nightly_builder(
+    "vm-kernel-nnbd-mac-debug-x64",
+    category = "vm|nnbd|jit|md",
+    channels = ["try"],
+    dimensions = mac,
+    properties = [pinned_xcode, slow_shards],
+)
+_extra_builder(
+    "vm-kernel-nnbd-mac-release-arm64",
+    category = "vm|nnbd|jit|m1r",
+    channels = ["try"],
+    dimensions = [mac, arm64],
+    properties = [no_android, pinned_xcode],
+)
+_nightly_builder(
+    "vm-kernel-nnbd-mac-release-x64",
+    category = "vm|nnbd|jit|mr",
+    channels = ["try"],
+    dimensions = mac,
+    properties = pinned_xcode,
+)
+_nightly_builder(
+    "vm-kernel-nnbd-win-release-ia32",
+    category = "vm|nnbd|jit|wr3",
+    channels = ["try"],
+    dimensions = windows,
+)
+_nightly_builder(
+    "vm-kernel-nnbd-win-debug-x64",
+    category = "vm|nnbd|jit|wd",
+    channels = ["try"],
+    properties = slow_shards,
+    dimensions = windows,
+)
+_nightly_builder(
+    "vm-kernel-nnbd-win-release-x64",
+    category = "vm|nnbd|jit|wr",
+    channels = ["try"],
+    dimensions = windows,
+)
+
+# vm|nnbd|aot
+_extra_builder(
+    "vm-kernel-precomp-nnbd-linux-release-x64",
+    category = "vm|nnbd|aot|r",
+)
+_nightly_builder(
+    "vm-kernel-precomp-nnbd-linux-debug-simarm_x64",
+    category = "vm|nnbd|aot|da",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-kernel-precomp-nnbd-linux-release-simarm_x64",
+    category = "vm|nnbd|aot|ra",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-kernel-precomp-nnbd-linux-debug-x64",
+    category = "vm|nnbd|aot|d",
+    channels = ["try"],
+    properties = slow_shards,
+)
+_nightly_builder(
+    "vm-kernel-precomp-nnbd-linux-release-simarm64",
+    category = "vm|nnbd|aot|ra6",
+    channels = ["try"],
+)
+_extra_builder(
+    "vm-kernel-precomp-nnbd-mac-release-arm64",
+    category = "vm|nnbd|aot|m1",
+    channels = ["try"],
+    dimensions = [mac, arm64],
+    properties = [no_android, pinned_xcode, slow_shards],
+)
+_nightly_builder(
+    "vm-kernel-precomp-nnbd-mac-release-simarm64",
+    category = "vm|nnbd|aot|ma6",
+    channels = ["try"],
+    dimensions = mac,
+    properties = [pinned_xcode, slow_shards],
+)
+_nightly_builder(
+    "vm-kernel-precomp-nnbd-win-release-x64",
+    category = "vm|nnbd|aot|wr",
+    channels = ["try"],
+    dimensions = windows,
+)
+
+# vm|app-kernel
+_extra_builder(
+    "app-kernel-linux-debug-x64",
+    category = "vm|app-kernel|d64",
+    properties = slow_shards,
+)
+_nightly_builder(
+    "app-kernel-linux-product-x64",
+    category = "vm|app-kernel|p64",
+    channels = ["try"],
+)
+_extra_builder(
+    "app-kernel-linux-release-x64",
+    category = "vm|app-kernel|r64",
+)
+
+#vm|kernel
+_extra_builder(
+    "vm-canary-linux-debug",
+    category = "vm|kernel|c",
+    on_cq = True,
+)
+_builder("vm-kernel-linux-debug-x64", category = "vm|kernel|d")
+_extra_builder(
+    "vm-kernel-linux-release-simarm",
+    category = "vm|kernel|a32",
+)
+_extra_builder(
+    "vm-kernel-linux-release-simarm64",
+    category = "vm|kernel|a64",
+)
+_nightly_builder(
+    "vm-kernel-linux-release-ia32",
+    category = "vm|kernel|r32",
+    channels = ["try"],
+)
+_builder(
+    "vm-kernel-linux-release-x64",
+    category = "vm|kernel|r",
+    on_cq = True,
+)
+_extra_builder(
+    "vm-kernel-checked-linux-release-x64",
+    category = "vm|kernel|rc",
+    experiments = {"dart.use_update_script": 100},
+)
+_nightly_builder(
+    "vm-kernel-linux-debug-ia32",
+    category = "vm|kernel|d32",
+    channels = ["try"],
+)
+_builder(
+    "vm-kernel-mac-debug-x64",
+    category = "vm|kernel|md",
+    dimensions = mac,
+    properties = pinned_xcode,
+)
+_builder(
+    "vm-kernel-mac-release-x64",
+    category = "vm|kernel|mr",
+    dimensions = mac,
+    on_cq = True,
+    experiment_percentage = 5,
+    properties = pinned_xcode,
+)
+_builder(
+    "vm-kernel-mac-release-arm64",
+    category = "vm|kernel|m1r",
+    channels = ["try", "dev"],
+    dimensions = [mac, arm64],
+    properties = [no_android, pinned_xcode],
+)
+_nightly_builder(
+    "vm-kernel-win-debug-ia32",
+    category = "vm|kernel|wd3",
+    channels = ["try"],
+    dimensions = windows,
+)
+_builder(
+    "vm-kernel-win-debug-x64",
+    category = "vm|kernel|wd",
+    dimensions = windows,
+)
+_nightly_builder(
+    "vm-kernel-win-release-ia32",
+    category = "vm|kernel|wr3",
+    channels = ["try"],
+    dimensions = windows,
+)
+_builder(
+    "vm-kernel-win-release-x64",
+    category = "vm|kernel|wr",
+    dimensions = windows,
+)
+_extra_builder(
+    "cross-vm-linux-release-arm64",
+    category = "vm|kernel|cra",
+    channels = [],
+    properties = {"shard_timeout": (120 * time.minute) // time.second},
+)
+
+# vm|kernel-precomp
+_extra_builder(
+    "vm-kernel-precomp-linux-debug-x64",
+    category = "vm|kernel-precomp|d",
+)
+_extra_builder(
+    "vm-kernel-precomp-linux-product-x64",
+    category = "vm|kernel-precomp|p",
+)
+_extra_builder(
+    "vm-kernel-precomp-linux-release-simarm",
+    category = "vm|kernel-precomp|a32",
+)
+_extra_builder(
+    "vm-kernel-precomp-linux-release-simarm64",
+    category = "vm|kernel-precomp|a64",
+)
+_extra_builder(
+    "vm-kernel-precomp-linux-release-x64",
+    category = "vm|kernel-precomp|r",
+)
+_extra_builder(
+    "vm-kernel-precomp-obfuscate-linux-release-x64",
+    category = "vm|kernel-precomp|o",
+)
+_extra_builder(
+    "vm-kernel-precomp-linux-debug-simarm_x64",
+    category = "vm|kernel-precomp|adx",
+    properties = slow_shards,
+)
+_extra_builder(
+    "vm-kernel-precomp-linux-release-simarm_x64",
+    category = "vm|kernel-precomp|arx",
+)
+_extra_builder(
+    "vm-kernel-precomp-mac-release-simarm64",
+    category = "vm|kernel-precomp|ma",
+    dimensions = mac,
+    properties = pinned_xcode,
+)
+_extra_builder(
+    "vm-kernel-precomp-win-release-x64",
+    category = "vm|kernel-precomp|wr",
+    dimensions = windows,
+)
+_nightly_builder(
+    "cross-vm-precomp-linux-release-arm64",
+    category = "vm|kernel-precomp|cra",
+    channels = [],
+    properties = slow_shards,
+)
+_nightly_builder(
+    "vm-kernel-precomp-dwarf-linux-product-x64",
+    category = "vm|kernel-precomp|dw",
+    channels = ["try"],
+)
+
+# vm|kernel-precomp|android
+_extra_builder(
+    "vm-kernel-precomp-android-release-arm_x64",
+    category = "vm|kernel-precomp|android|a32",
+    properties = slow_shards,
+)
+_extra_builder(
+    "vm-kernel-precomp-android-release-arm64c",
+    category = "vm|kernel-precomp|android|a64",
+    properties = slow_shards,
+)
+
+# vm|product
+_nightly_builder(
+    "vm-kernel-linux-product-x64",
+    category = "vm|product|l",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-kernel-mac-product-x64",
+    category = "vm|product|m",
+    channels = ["try"],
+    dimensions = mac,
+    properties = pinned_xcode,
+)
+_nightly_builder(
+    "vm-kernel-win-product-x64",
+    category = "vm|product|w",
+    channels = ["try"],
+    dimensions = windows,
+)
+
+# vm|misc
+_nightly_builder(
+    "vm-kernel-optcounter-threshold-linux-release-ia32",
+    category = "vm|misc|o32",
+    channels = ["try"],
+)
+_low_priority_builder(
+    "vm-kernel-optcounter-threshold-linux-release-x64",
+    category = "vm|misc|o64",
+)
+
+def dart_vm_sanitizer_builder(name, **kwargs):
+    _nightly_builder(
+        name,
+        channels = ["try"],
+        properties = {"bisection_enabled": True},
+        **kwargs
+    )
+
+dart_vm_sanitizer_builder(
+    "vm-kernel-asan-linux-release-x64",
+    category = "vm|misc|a",
+)
+dart_vm_sanitizer_builder(
+    "vm-kernel-msan-linux-release-x64",
+    category = "vm|misc|m",
+)
+dart_vm_sanitizer_builder(
+    "vm-kernel-tsan-linux-release-x64",
+    category = "vm|misc|t",
+)
+dart_vm_sanitizer_builder(
+    "vm-kernel-ubsan-linux-release-x64",
+    category = "vm|misc|u",
+    goma = False,
+)  # ubsan is not compatible with our sysroot.
+dart_vm_sanitizer_builder(
+    "vm-kernel-precomp-asan-linux-release-x64",
+    category = "vm|misc|aot|a",
+)
+dart_vm_sanitizer_builder(
+    "vm-kernel-precomp-msan-linux-release-x64",
+    category = "vm|misc|aot|m",
+)
+dart_vm_sanitizer_builder(
+    "vm-kernel-precomp-tsan-linux-release-x64",
+    category = "vm|misc|aot|t",
+)
+dart_vm_sanitizer_builder(
+    "vm-kernel-precomp-ubsan-linux-release-x64",
+    category = "vm|misc|aot|u",
+    goma = False,
+)  # ubsan is not compatible with our sysroot.
+_nightly_builder(
+    "vm-kernel-reload-linux-debug-x64",
+    category = "vm|misc|reload|d",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-kernel-reload-linux-release-x64",
+    category = "vm|misc|reload|r",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-kernel-reload-rollback-linux-debug-x64",
+    category = "vm|misc|reload|drb",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-kernel-reload-rollback-linux-release-x64",
+    category = "vm|misc|reload|rrb",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-kernel-linux-debug-x64c",
+    category = "vm|misc|compressed|jl",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-kernel-precomp-linux-debug-x64c",
+    category = "vm|misc|compressed|al",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-kernel-win-debug-x64c",
+    category = "vm|misc|compressed|jw",
+    channels = ["try"],
+    dimensions = windows,
+)
+_nightly_builder(
+    "vm-kernel-precomp-win-debug-x64c",
+    category = "vm|misc|compressed|aw",
+    channels = ["try"],
+    dimensions = windows,
+)
+_low_priority_builder("vm-fuchsia-release-x64", category = "vm|misc|f")
+
+# Our sysroot does not support gcc, we can't use goma on RBE for this builder
+_nightly_builder("vm-kernel-gcc-linux", category = "vm|misc|g", goma = False)
+
+_nightly_builder(
+    "vm-kernel-linux-debug-simriscv64",
+    category = "vm|misc|rv64",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-kernel-precomp-linux-debug-simriscv64",
+    category = "vm|misc|rv64",
+    channels = ["try"],
+)
+
+# vm|ffi
+_extra_builder("vm-ffi-android-debug-arm", category = "vm|ffi|d32")
+_extra_builder("vm-ffi-android-release-arm", category = "vm|ffi|r32")
+_extra_builder("vm-ffi-android-product-arm", category = "vm|ffi|p32")
+_extra_builder("vm-ffi-android-debug-arm64c", category = "vm|ffi|d64")
+_extra_builder("vm-ffi-android-release-arm64c", category = "vm|ffi|r64")
+_extra_builder("vm-ffi-android-product-arm64c", category = "vm|ffi|p64")
+_extra_builder(
+    "vm-precomp-ffi-qemu-linux-release-arm",
+    category = "vm|ffi|qa",
+)
+_extra_builder(
+    "vm-precomp-ffi-qemu-linux-release-riscv64",
+    category = "vm|ffi|qr",
+)
+
+# Isolate stress test builder
+_extra_builder(
+    "iso-stress-linux",
+    channels = [],
+    notifies = "dart-vm-team",
+)

From 4dfe5c6f8e16a22718c06713e75bedb40c428af9 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 9 Feb 2022 13:23:39 +0000
Subject: [PATCH 520/826] Revert "[infra] Refactor main.star into modules"

This reverts commit 6aff4d278b837b4e40c4cee6b7a75b4cf659b719.

Reason for revert: broke luci-config

Original change's description:
> [infra] Refactor main.star into modules
>
> * Move most common rules into modules/libraries.
> * Break up parts of main.star with side effects into executed modules.
> * Move generated files to generated/ (similar to dart-internal).
> * Remove obsolete notifiers.
> * Enable strict linting and fix all violations.
>
> Change-Id: I6c772565ab7260ff8c0e7a7fbadfac48126a4cb0
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/231660
> Reviewed-by: William Hesse <whesse@google.com>
> Commit-Queue: Alexander Thomas <athom@google.com>

TBR=whesse@google.com,sortie@google.com,athom@google.com

Change-Id: I74efd6af9cac8b9f24eb199acb0f664fcc8989d8
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/232095
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 .../commit-queue.cfg => commit-queue.cfg      |    0
 cq.star                                       |   68 -
 .../cr-buildbucket.cfg => cr-buildbucket.cfg  |    0
 defaults.star                                 |   29 +
 lib/accounts.star                             |   11 -
 lib/cron.star                                 |   49 -
 lib/dart.star                                 |  318 --
 lib/defaults.star                             |   78 -
 lib/paths.star                                |   80 -
 lib/priority.star                             |   14 -
 generated/luci-logdog.cfg => luci-logdog.cfg  |    0
 generated/luci-milo.cfg => luci-milo.cfg      | 2610 ++++++++---------
 generated/luci-notify.cfg => luci-notify.cfg  |  296 +-
 .../email-templates/common.template           |    0
 .../email-templates/default.template          |    0
 .../luci-scheduler.cfg => luci-scheduler.cfg  |    0
 main.star                                     | 1556 ++++++++--
 generated/project.cfg => project.cfg          |    4 +-
 project.star                                  |  144 -
 generated/realms.cfg => realms.cfg            |    0
 recipes.star                                  |   65 -
 vm.star                                       |  533 ----
 22 files changed, 2992 insertions(+), 2863 deletions(-)
 rename generated/commit-queue.cfg => commit-queue.cfg (100%)
 delete mode 100644 cq.star
 rename generated/cr-buildbucket.cfg => cr-buildbucket.cfg (100%)
 create mode 100644 defaults.star
 delete mode 100644 lib/accounts.star
 delete mode 100644 lib/cron.star
 delete mode 100644 lib/dart.star
 delete mode 100644 lib/defaults.star
 delete mode 100644 lib/paths.star
 delete mode 100644 lib/priority.star
 rename generated/luci-logdog.cfg => luci-logdog.cfg (100%)
 rename generated/luci-milo.cfg => luci-milo.cfg (100%)
 rename generated/luci-notify.cfg => luci-notify.cfg (84%)
 rename {generated/luci-notify => luci-notify}/email-templates/common.template (100%)
 rename {generated/luci-notify => luci-notify}/email-templates/default.template (100%)
 rename generated/luci-scheduler.cfg => luci-scheduler.cfg (100%)
 rename generated/project.cfg => project.cfg (85%)
 delete mode 100644 project.star
 rename generated/realms.cfg => realms.cfg (100%)
 delete mode 100644 recipes.star
 delete mode 100644 vm.star

diff --git a/generated/commit-queue.cfg b/commit-queue.cfg
similarity index 100%
rename from generated/commit-queue.cfg
rename to commit-queue.cfg
diff --git a/cq.star b/cq.star
deleted file mode 100644
index 67a835fe7a57..000000000000
--- a/cq.star
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (c) 2022 The Dart project authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-"""
-CQs for the dart Gerrit host.
-"""
-
-load("//lib/dart.star", "dart")
-
-luci.cq(
-    submit_max_burst = 2,
-    submit_burst_delay = 8 * time.minute,
-    status_host = "chromium-cq-status.appspot.com",
-)
-
-def default_verifiers():
-    return [
-        luci.cq_tryjob_verifier(
-            builder = "presubmit-try",
-            disable_reuse = True,
-        ),
-    ]
-
-DART_GERRIT = "https://dart-review.googlesource.com/"
-
-luci.cq_group(
-    name = "sdk",
-    watch = cq.refset(
-        DART_GERRIT + "sdk",
-        refs = ["refs/heads/%s" % branch for branch in dart.branches],
-    ),
-    allow_submit_with_open_deps = True,
-    tree_status_host = "dart-status.appspot.com",
-    retry_config = cq.RETRY_NONE,
-    verifiers = None,
-)
-
-luci.cq_group(
-    name = "sdk-infra-config",
-    watch = cq.refset(DART_GERRIT + "sdk", refs = ["refs/heads/infra/config"]),
-    allow_submit_with_open_deps = True,
-    tree_status_host = "dart-status.appspot.com",
-    retry_config = cq.RETRY_NONE,
-    verifiers = default_verifiers(),
-)
-
-luci.cq_group(
-    name = "recipes",
-    watch = cq.refset(DART_GERRIT + "recipes", refs = ["refs/heads/main"]),
-    allow_submit_with_open_deps = True,
-    tree_status_host = "dart-status.appspot.com",
-    retry_config = cq.RETRY_NONE,
-    verifiers = default_verifiers(),
-)
-
-luci.cq_group(
-    name = "dart_ci",
-    watch = cq.refset(DART_GERRIT + "dart_ci", refs = ["refs/heads/main"]),
-    allow_submit_with_open_deps = True,
-    tree_status_host = "dart-status.appspot.com",
-    retry_config = cq.RETRY_NONE,
-    verifiers = None,
-)
-
-luci.list_view(
-    name = "cq",
-    title = "SDK CQ Console",
-)
diff --git a/generated/cr-buildbucket.cfg b/cr-buildbucket.cfg
similarity index 100%
rename from generated/cr-buildbucket.cfg
rename to cr-buildbucket.cfg
diff --git a/defaults.star b/defaults.star
new file mode 100644
index 000000000000..ca0e83a398fa
--- /dev/null
+++ b/defaults.star
@@ -0,0 +1,29 @@
+# Copyright (c) 2019 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Defaults for properties and dimensions used in main.star.
+"""
+
+_PROPERTIES = {"clobber": True}
+_DIMENSIONS = {
+    "cpu": "x86-64",
+    "host_class": "default",
+    "os": "Linux",
+    "pool": "luci.dart.try",
+}
+_CACHES = {
+    "Mac": [swarming.cache("osx_sdk", name = "osx_sdk")],
+}
+
+def _default_dict(defaults, overrides):
+    defaults = dict(defaults)
+    if overrides:
+        defaults.update(overrides)
+    return defaults
+
+defaults = struct(
+    caches = lambda os: _CACHES.get(os),
+    dimensions = lambda dimensions: _default_dict(_DIMENSIONS, dimensions),
+    properties = lambda properties: _default_dict(_PROPERTIES, properties),
+)
diff --git a/lib/accounts.star b/lib/accounts.star
deleted file mode 100644
index 9cda3f04c96a..000000000000
--- a/lib/accounts.star
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) 2022 The Dart project authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-"""
-Defines accounts used on builders.
-"""
-
-accounts = struct(
-    ci_builder = "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com",
-    try_builder = "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com",
-)
diff --git a/lib/cron.star b/lib/cron.star
deleted file mode 100644
index 370562f3e943..000000000000
--- a/lib/cron.star
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright (c) 2022 The Dart project authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-"""
-Defines rules that can be used to define nightly and weekly builders.
-"""
-
-load("//lib/dart.star", "dart")
-load("//lib/priority.star", "priority")
-
-def _nightly_builder(name, notifies = None, **kwargs):
-    dart.ci_sandbox_builder(
-        name,
-        notifies = notifies or [luci.notifier(
-            name = "nightly",
-            on_new_failure = True,
-        )],
-        on_cq = False,
-        priority = priority.low,
-        triggered_by = [luci.gitiles_poller(
-            name = "dart-nightly-trigger",
-            bucket = "ci",
-            repo = dart.git,
-            refs = ["refs/heads/main"],
-            schedule = "0 5 * * *",  # daily, at 05:00 UTC
-        )],
-        **kwargs
-    )
-
-def _weekly_builder(name, notifies = None, **kwargs):
-    dart.ci_sandbox_builder(
-        name,
-        notifies = notifies,
-        on_cq = False,
-        priority = priority.low,
-        triggered_by = [luci.gitiles_poller(
-            name = "dart-weekly-trigger",
-            bucket = "ci",
-            repo = dart.git,
-            refs = ["refs/heads/main"],
-            schedule = "0 0 * * SUN",  # weekly, midnight Saturday to Sunday
-        )],
-        **kwargs
-    )
-
-cron = struct(
-    nightly_builder = _nightly_builder,
-    weekly_builder = _weekly_builder,
-)
diff --git a/lib/dart.star b/lib/dart.star
deleted file mode 100644
index f8ae68005fd4..000000000000
--- a/lib/dart.star
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright (c) 2022 The Dart project authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-"""
-Defines rules that can be used to define nightly and weekly builders.
-"""
-
-load("//lib/accounts.star", "accounts")
-load("//lib/defaults.star", "defaults")
-load("//lib/paths.star", "paths")
-load("//lib/priority.star", "priority")
-
-_GOMA_RBE = {
-    "server_host": "goma.chromium.org",
-    "use_luci_auth": True,
-}
-
-_RELEASE_CHANNELS = ["beta", "dev", "stable"]
-_CHANNELS = _RELEASE_CHANNELS + ["try"]
-_BRANCHES = ["main"] + _RELEASE_CHANNELS
-
-_DART_GIT = "https://dart.googlesource.com/sdk"
-
-def _poller(name, bucket = "ci", branches = _BRANCHES, paths = None):
-    for branch in branches:
-        luci.gitiles_poller(
-            name = "%s-%s" % (name, branch),
-            bucket = bucket,
-            path_regexps = paths,
-            repo = _DART_GIT,
-            refs = ["refs/heads/%s" % branch],
-        )
-
-def _recipe(name):
-    return luci.recipe(
-        name = name,
-        cipd_package = "dart/recipe_bundles/dart.googlesource.com/recipes",
-        cipd_version = "refs/heads/main",
-        use_bbagent = True,
-    )
-
-def _with_goma(goma, dimensions, properties):
-    """Decorates the properties to setup goma.
-
-       Adds the $build/goma property when goma is used and disables goma via
-       the $dart/build property if not.
-
-    Args:
-        goma: Opt-in (True), opt-out (False) or default (None).
-        dimensions: The dimensions of the builder.
-        properties: The properties object to set $build/goma on (if opted-in).
-
-    Returns:
-        A copy of the properties with goma related properties set if applicable.
-    """
-    updated_properties = dict(properties)
-    if goma in (None, True):
-        goma_properties = {}
-        goma_properties.update(_GOMA_RBE)
-
-        enable_ats = dimensions["os"] == "Linux"
-
-        goma_properties["enable_ats"] = enable_ats
-        updated_properties.setdefault("$build/goma", goma_properties)
-    else:
-        updated_properties = dict(properties)
-        updated_properties.setdefault("$dart/build", {})
-        updated_properties["$dart/build"].setdefault("disable_goma", True)
-    return updated_properties
-
-def _try_builder(
-        name,
-        recipe = "dart/neo",
-        bucket = "try",
-        dimensions = None,
-        execution_timeout = None,
-        experiment_percentage = None,
-        experiments = None,
-        goma = None,
-        location_regexp = None,
-        properties = None,
-        on_cq = False):
-    """Creates a Dart tryjob.
-
-    Args:
-        name: The builder name.
-        recipe: The recipe to use (defaults to "dart/neo").
-        bucket: The bucket to use (defaults to "try").
-        dimensions: Extra swarming dimensions required by this builder.
-        execution_timeout: Time to allow for the build to run.
-        experiment_percentage: What experiment percentage to use.
-        experiments: Experiments to run on this builder, with percentages.
-        goma: Whether to use goma or not.
-        location_regexp: Locations that trigger this tryjob.
-        properties: Extra properties to set for builds.
-        on_cq: Whether the build is added to the default set of CQ tryjobs.
-    """
-    if on_cq and location_regexp:
-        fail("Can't be on the default CQ and conditionally on the CQ")
-    dimensions = defaults.dimensions(dimensions)
-    dimensions["pool"] = "luci.dart.try"
-    properties = defaults.properties(properties)
-    builder_properties = _with_goma(goma, dimensions, properties)
-    builder = name + "-try"
-    luci.builder(
-        name = builder,
-        build_numbers = True,
-        bucket = bucket,
-        caches = defaults.caches(dimensions["os"]),
-        dimensions = dimensions,
-        executable = _recipe(recipe),
-        execution_timeout = execution_timeout,
-        experiments = experiments,
-        priority = priority.high,
-        properties = builder_properties,
-        service_account = accounts.try_builder,
-        swarming_tags = ["vpython:native-python-wrapper"],
-    )
-    includable_only = (not on_cq and not experiment_percentage and
-                       not location_regexp)
-    luci.cq_tryjob_verifier(
-        builder = builder,
-        cq_group = "sdk",
-        experiment_percentage = experiment_percentage,
-        location_regexp = location_regexp,
-        includable_only = includable_only,
-    )
-    luci.list_view_entry(list_view = "cq", builder = builder)
-
-def _builder(
-        name,
-        bucket,
-        recipe = "dart/neo",
-        enabled = True,
-        category = None,
-        channels = [],
-        dimensions = None,
-        executable = None,
-        execution_timeout = None,
-        experimental = None,
-        experiments = None,
-        expiration_timeout = None,
-        goma = None,
-        fyi = False,
-        main_channel = True,
-        notifies = "dart",
-        priority = priority.normal,
-        properties = None,
-        schedule = "triggered",
-        service_account = accounts.try_builder,
-        triggered_by = ["dart-gitiles-trigger-%s"],
-        triggering_policy = None,
-        on_cq = False,
-        experiment_percentage = None,
-        location_regexp = None):
-    """
-    Creates a Dart builder on all the specified channels.
-
-    Args:
-        name: The builder name.
-        bucket: The bucket to use (defaults to "try").
-        recipe: The recipe to use (defaults to "dart/neo").
-        enabled: Whether this builder is currently running or not.
-        category: Where to show the builder on the console.
-        channels: Which other channels the builder should be added to.
-        dimensions: Extra swarming dimensions required by this builder.
-        executable: The Luci executable to use.
-        execution_timeout: Time to allow for the build to run.
-        experimental: Whether the build is experimental or not.
-        experiments: Experiments to run on this builder, with percentages.
-        expiration_timeout: How long builds should wait for a bot to run on.
-        goma: Whether to use goma or not.
-        fyi: Whether this is an FYI builder or not.
-        main_channel: Whether to add to the main channel (default: True).
-        notifies: Which luci notifier group to notify (default: "dart").
-        priority: What swarming priority this builder gets (default: NORMAL).
-        properties: Extra properties to set for builds.
-        schedule: What schedule to use (default: "triggered").
-        service_account: The task service account to use (default: accounts.try_builder).
-        triggered_by: What triggers this builder (defaults to standard trigger).
-        triggering_policy: The triggering policy used by this builder.
-        on_cq: Whether the build is added to the default set of CQ tryjobs.
-        experiment_percentage: What experiment percentage to use.
-        location_regexp: Locations that trigger this builder.
-    """
-    dimensions = defaults.dimensions(dimensions)
-    properties = defaults.properties(properties)
-
-    os = dimensions["os"]
-    if "win" in name and os != "Windows":
-        fail("builder %s should be a Windows builder" % name)
-    if "mac" in name and os != "Mac":
-        fail("builder %s should be a macOS builder" % name)
-    if "linux" in name and os != "Linux":
-        fail("builder %s should be a Linux builder" % name)
-
-    def builder(channel, notifies, triggered_by):
-        if channel == "try":
-            _try_builder(
-                name,
-                recipe = recipe,
-                dimensions = dimensions,
-                properties = properties,
-                on_cq = on_cq,
-                execution_timeout = execution_timeout,
-                experiment_percentage = experiment_percentage,
-                experiments = experiments,
-                goma = goma,
-                location_regexp = location_regexp,
-            )
-        else:
-            builder_properties = _with_goma(
-                goma if service_account == accounts.try_builder else False,
-                dimensions,
-                properties,
-            )
-            builder = name + "-" + channel if channel else name
-            branch = channel if channel else "main"
-            if schedule == "triggered" and triggered_by:
-                triggered_by = [
-                    trigger.replace("%s", branch) if type(trigger) == type("") else trigger
-                    for trigger in triggered_by
-                ]
-                if channel in _RELEASE_CHANNELS:
-                    # Always run vm builders on release channels.
-                    triggered_by = [
-                        trigger.replace("dart-vm-", "dart-") if type(trigger) == type("") else trigger
-                        for trigger in triggered_by
-                    ]
-
-            notifies = [notifies] if type(notifies) == type("") else notifies
-            luci.builder(
-                name = builder,
-                build_numbers = True,
-                bucket = bucket,
-                caches = defaults.caches(dimensions["os"]),
-                dimensions = dimensions,
-                executable = executable or _recipe(recipe),
-                execution_timeout = execution_timeout,
-                experimental = experimental,
-                experiments = experiments,
-                expiration_timeout = expiration_timeout,
-                priority = priority,
-                properties = builder_properties,
-                notifies = notifies if enabled else None,
-                schedule = schedule if enabled else None,
-                service_account = service_account,
-                swarming_tags = ["vpython:native-python-wrapper"],
-                triggered_by = triggered_by if enabled else None,
-                triggering_policy = triggering_policy,
-            )
-            if category:
-                console_category, _, short_name = category.rpartition("|")
-                toplevel_category, _, _ = console_category.partition("|")
-                console = channel or "be" if not fyi else "fyi"
-                luci.console_view_entry(
-                    builder = builder,
-                    short_name = short_name,
-                    category = console_category,
-                    console_view = console,
-                )
-                if console == "be":
-                    if toplevel_category != "vm":
-                        luci.console_view_entry(
-                            builder = builder,
-                            short_name = short_name,
-                            category = console_category,
-                            console_view = "alt",
-                        )
-
-    if main_channel:
-        builder(None, notifies = notifies, triggered_by = triggered_by)
-    for _channel in channels:
-        if enabled:
-            builder(_channel, notifies = None, triggered_by = triggered_by)
-
-def _ci_builder(name, bucket = "ci", dimensions = None, **kwargs):
-    if type(dimensions) == type({}):
-        dimensions = [dimensions]
-    dimensions = list(dimensions or [])
-    dimensions.append({"pool": "luci.dart.ci"})
-    _builder(
-        name,
-        bucket = bucket,
-        dimensions = dimensions,
-        service_account = accounts.ci_builder,
-        **kwargs
-    )
-
-def _ci_sandbox_builder(name, channels = _CHANNELS, **kwargs):
-    _builder(
-        name,
-        bucket = "ci.sandbox",
-        channels = channels,
-        service_account = accounts.try_builder,
-        **kwargs
-    )
-
-def _infra_builder(name, notifies = "infra", triggered_by = None, **kwargs):
-    _ci_builder(
-        name,
-        notifies = notifies,
-        triggered_by = triggered_by,
-        **kwargs
-    )
-    luci.list_view_entry(list_view = "infra", builder = name)
-
-dart = struct(
-    ci_builder = _ci_builder,
-    ci_sandbox_builder = _ci_sandbox_builder,
-    infra_builder = _infra_builder,
-    try_builder = _try_builder,
-    poller = _poller,
-    channels = _CHANNELS,
-    release_channels = _RELEASE_CHANNELS,
-    branches = _BRANCHES,
-    git = _DART_GIT,
-)
diff --git a/lib/defaults.star b/lib/defaults.star
deleted file mode 100644
index dc8fadc7da85..000000000000
--- a/lib/defaults.star
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright (c) 2019 The Dart project authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-"""
-Defaults for properties and dimensions used in main.star.
-"""
-
-_PROPERTIES = {"clobber": True}
-_DIMENSIONS = {
-    "cpu": "x86-64",
-    "host_class": "default",
-    "os": "Linux",
-    "pool": "luci.dart.try",
-}
-_CACHES = {
-    "Mac": [swarming.cache("osx_sdk", name = "osx_sdk")],
-}
-_NO_ANDROID = {"custom_vars": {"download_android_deps": False}}
-_CHROME = {"custom_vars": {"download_chrome": True}}
-_FIREFOX = {"custom_vars": {"download_firefox": True}}
-_JS_ENGINES = {"custom_vars": {"checkout_javascript_engines": True}}
-_SLOW_SHARDS = {"shard_timeout": (90 * time.minute) // time.second}
-_PINNED_XCODE = {"$depot_tools/osx_sdk": {"sdk_version": "12d4e"}}
-
-_ARM64 = {"cpu": "arm64"}
-_MAC = {"os": "Mac"}
-_LINUX = {"os": "Linux"}
-_WINDOWS = {"os": "Windows"}
-
-def _union(x, overrides):
-    """ Creates a new dict with the values from all passed dictionaries
-
-    If dicts contain the same keys, their values are assumed to be dicts
-    and merged. Values in dicts later in overrides' sub-dicts will overwrite
-    values in earlier sub-dicts.
-
-    Args:
-        x (dict): A dict.
-        overrides (list): dicts to merge with x.
-
-    Returns:
-        dict: The merged dict.
-    """
-    z = {}
-    z.update(x)
-    if type(overrides) == type({}):
-        overrides = [overrides]
-    for y in overrides or []:
-        for k in y.keys():
-            v = z.get(k)
-            if v and type(v) == type({}):
-                v = dict(v, **y[k])
-                z[k] = v
-            else:
-                z[k] = y[k]
-    return z
-
-defaults = struct(
-    caches = lambda os: _CACHES.get(os),
-    dimensions = lambda overrides: _union(_DIMENSIONS, overrides),
-    properties = lambda overrides: _union(_PROPERTIES, overrides),
-)
-
-# Dimensions
-
-arm64 = _ARM64
-linux = _LINUX
-mac = _MAC
-windows = _WINDOWS
-
-# Properties
-
-chrome = _CHROME
-firefox = _FIREFOX
-js_engines = _JS_ENGINES
-no_android = _NO_ANDROID
-slow_shards = _SLOW_SHARDS
-pinned_xcode = _PINNED_XCODE
diff --git a/lib/paths.star b/lib/paths.star
deleted file mode 100644
index d80756d735b3..000000000000
--- a/lib/paths.star
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright (c) 2022 The Dart project authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-"""
-Defines paths relevant to different parts of the Dart SDK.
-"""
-
-_TEST_PY_PATHS = "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-
-_STANDARD_PATHS = [
-    "DEPS",  # DEPS catches most third_party changes.
-    # build files
-    "build/.+",
-    "BUILD.gn",
-    "sdk_args.gni",
-    # core libraries
-    ".dart_tool/package_config.json",
-    "sdk/.+",
-    # testing
-    _TEST_PY_PATHS,
-    "tools/bots/test_matrix.json",
-    # tests
-    "tests/.+",
-]
-
-_CFE_PATHS_ONLY = [
-    "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+",
-]
-
-_CFE_PATHS = _STANDARD_PATHS + _CFE_PATHS_ONLY
-
-_VM_PATHS = _CFE_PATHS + [
-    # VM sources
-    "pkg/vm/.+",
-    "runtime/.+",
-]
-
-_DART2JS_PATHS = _CFE_PATHS + [
-    # compiler sources
-    "pkg/(compiler|dart2js_tools|js_ast)/.+",
-    "utils/compiler/.+",
-    # testing
-    "pkg/(js|modular_test|sourcemap_testing)/.+",
-]
-
-_DDC_PATHS = _CFE_PATHS + [
-    # compiler sources
-    "pkg/(build_integration|dev_compiler|meta)/.+",
-    "utils/dartdevc/.+",
-    # testing
-    "pkg/(js|modular_test|sourcemap_testing)/.+",
-]
-
-_ANALYZER_NNBD_PATHS = _STANDARD_PATHS + [
-    # analyzer sources
-    "pkg/(analyzer|analyzer_cli|_fe_analyzer_shared)/.+",
-]
-
-_ANALYZER_PATHS = _STANDARD_PATHS + [
-    # "analyzer" bots analyze everything under pkg
-    "pkg/.+",
-]
-
-def _to_location_regexp(paths):
-    return [".+/[+]/%s" % path for path in paths]
-
-paths = struct(
-    analyzer = _ANALYZER_PATHS,
-    analyzer_nnbd = _ANALYZER_NNBD_PATHS,
-    cfe = _CFE_PATHS,
-    cfe_only = _CFE_PATHS_ONLY,
-    dart2js = _DART2JS_PATHS,
-    ddc = _DDC_PATHS,
-    standard = _STANDARD_PATHS,
-    test_py = _TEST_PY_PATHS,
-    vm = _VM_PATHS,
-
-    # Utility functions
-    to_location_regexp = _to_location_regexp,
-)
diff --git a/lib/priority.star b/lib/priority.star
deleted file mode 100644
index ced75b831c22..000000000000
--- a/lib/priority.star
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2022 The Dart project authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-"""
-Defines priorities used by for swarming tasks. The higher the number, the lower
-the priority.
-"""
-
-priority = struct(
-    low = 70,  # Used for "FYI" post-submit builds.
-    normal = 50,  # Used for post-submit builds.
-    high = 30,  # Used for try-jobs.
-    highest = 25,  # Used for shards in the recipes, only here for completeness.
-)
diff --git a/generated/luci-logdog.cfg b/luci-logdog.cfg
similarity index 100%
rename from generated/luci-logdog.cfg
rename to luci-logdog.cfg
diff --git a/generated/luci-milo.cfg b/luci-milo.cfg
similarity index 100%
rename from generated/luci-milo.cfg
rename to luci-milo.cfg
index 056228fb15b2..6c5df04e83fe 100644
--- a/generated/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -5,403 +5,707 @@
 #   https://luci-config.appspot.com/schemas/projects:luci-milo.cfg
 
 consoles {
-  id: "cq"
-  name: "SDK CQ Console"
+  id: "be"
+  name: "SDK Bleeding Edge Console"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/main"
+  manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.try/front-end-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
+    category: "cfe"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/front-end-mac-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
+    category: "cfe"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/front-end-win-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
+    category: "cfe"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/front-end-nnbd-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64"
+    category: "cfe|nnbd"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/front-end-nnbd-mac-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-mac-release-x64"
+    category: "cfe|nnbd"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/front-end-nnbd-win-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-win-release-x64"
+    category: "cfe|nnbd"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-frontend-try"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
+    category: "cfe"
+    short_name: "fl"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-engine-linux-try"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
+    category: "flutter"
+    short_name: "3H"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-engine-linux-web_tests-try"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-web_tests"
+    category: "flutter"
+    short_name: "web"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
+    category: "vm|nnbd|jit"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64"
+    category: "vm|nnbd|jit"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-ia32-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-ia32"
+    category: "vm|nnbd|jit"
+    short_name: "d3"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-ia32-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-ia32"
+    category: "vm|nnbd|jit"
+    short_name: "r3"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-simarm-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm"
+    category: "vm|nnbd|jit"
+    short_name: "ra"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-simarm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm64"
+    category: "vm|nnbd|jit"
+    short_name: "ra6"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-debug-arm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-arm64"
+    category: "vm|nnbd|jit"
+    short_name: "m1d"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-x64"
+    category: "vm|nnbd|jit"
+    short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-release-arm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-arm64"
+    category: "vm|nnbd|jit"
+    short_name: "m1r"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-x64"
+    category: "vm|nnbd|jit"
+    short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-release-ia32-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-ia32"
+    category: "vm|nnbd|jit"
+    short_name: "wr3"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64"
+    category: "vm|nnbd|jit"
+    short_name: "wd"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-x64"
+    category: "vm|nnbd|jit"
+    short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64"
+    category: "vm|nnbd|aot"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+    category: "vm|nnbd|aot"
+    short_name: "da"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+    category: "vm|nnbd|aot"
+    short_name: "ra"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-x64"
+    category: "vm|nnbd|aot"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64"
+    category: "vm|nnbd|aot"
+    short_name: "ra6"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-mac-release-arm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-arm64"
+    category: "vm|nnbd|aot"
+    short_name: "m1"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64"
+    category: "vm|nnbd|aot"
+    short_name: "ma6"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-win-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-release-x64"
+    category: "vm|nnbd|aot"
+    short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.try/app-kernel-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
+    category: "vm|app-kernel"
+    short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/app-kernel-linux-product-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64"
+    category: "vm|app-kernel"
+    short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/app-kernel-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64"
+    category: "vm|app-kernel"
+    short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
+    category: "vm|kernel"
+    short_name: "c"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
+    category: "vm|kernel"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simarm-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
+    category: "vm|kernel"
+    short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simarm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
+    category: "vm|kernel"
+    short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-ia32-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32"
+    category: "vm|kernel"
+    short_name: "r32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-checked-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "rc"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-ia32-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32"
+    category: "vm|kernel"
+    short_name: "d32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-mac-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
+    category: "vm|kernel"
+    short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-mac-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
+    category: "vm|kernel"
+    short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-mac-release-arm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-arm64"
+    category: "vm|kernel"
+    short_name: "m1r"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-ia32-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
+    category: "vm|kernel"
+    short_name: "wd3"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64"
+    category: "vm|kernel"
+    short_name: "wd"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-release-ia32-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32"
+    category: "vm|kernel"
+    short_name: "wr3"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
+    category: "vm|kernel"
+    short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
+    category: "vm|kernel"
+    short_name: "cra"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-product-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
+    category: "vm|kernel-precomp"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
+    category: "vm|kernel-precomp"
+    short_name: "p"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
+    category: "vm|kernel-precomp"
+    short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
+    category: "vm|kernel-precomp"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-simarm_x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
+    category: "vm|kernel-precomp"
+    short_name: "o"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm_x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64"
+    category: "vm|kernel-precomp"
+    short_name: "adx"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-mac-release-simarm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64"
+    category: "vm|kernel-precomp"
+    short_name: "arx"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "ma"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-dwarf-linux-product-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
+    category: "vm|kernel-precomp"
+    short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm_x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-precomp-linux-release-arm64"
+    category: "vm|kernel-precomp"
+    short_name: "cra"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm64c-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-dwarf-linux-product-x64"
+    category: "vm|kernel-precomp"
+    short_name: "dw"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-product-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64"
+    category: "vm|kernel-precomp|android"
+    short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-mac-product-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c"
+    category: "vm|kernel-precomp|android"
+    short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-product-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
+    category: "vm|product"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
+    category: "vm|product"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
+    category: "vm|product"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-asan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
+    category: "vm|misc"
+    short_name: "o32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-msan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
+    category: "vm|misc"
+    short_name: "o64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-tsan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "a"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-ubsan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-asan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-tsan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "t"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-msan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ubsan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "u"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-tsan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-asan-linux-release-x64"
+    category: "vm|misc|aot"
+    short_name: "a"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-ubsan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-msan-linux-release-x64"
+    category: "vm|misc|aot"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-reload-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-tsan-linux-release-x64"
+    category: "vm|misc|aot"
+    short_name: "t"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-reload-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ubsan-linux-release-x64"
+    category: "vm|misc|aot"
+    short_name: "u"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-reload-rollback-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
+    category: "vm|misc|reload"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-reload-rollback-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
+    category: "vm|misc|reload"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64c-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
+    category: "vm|misc|reload"
+    short_name: "drb"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64c-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64"
+    category: "vm|misc|reload"
+    short_name: "rrb"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-x64c-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "jl"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-debug-x64c-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "al"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-fuchsia-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "jw"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-gcc-linux-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "aw"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-simriscv64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-fuchsia-release-x64"
+    category: "vm|misc"
+    short_name: "f"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-simriscv64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux"
+    category: "vm|misc"
+    short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simriscv64"
+    category: "vm|misc"
+    short_name: "rv64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-ffi-android-release-arm-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simriscv64"
+    category: "vm|misc"
+    short_name: "rv64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-ffi-android-product-arm-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
+    category: "vm|ffi"
+    short_name: "d32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm64c-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm"
+    category: "vm|ffi"
+    short_name: "r32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-ffi-android-release-arm64c-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm"
+    category: "vm|ffi"
+    short_name: "p32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-ffi-android-product-arm64c-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c"
+    category: "vm|ffi"
+    short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-precomp-ffi-qemu-linux-release-arm-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c"
+    category: "vm|ffi"
+    short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c"
+    category: "vm|ffi"
+    short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/pkg-linux-release-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm"
+    category: "vm|ffi"
+    short_name: "qa"
   }
   builders {
-    name: "buildbucket/luci.dart.try/pkg-mac-release-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64"
+    category: "vm|ffi"
+    short_name: "qr"
   }
   builders {
-    name: "buildbucket/luci.dart.try/pkg-mac-release-arm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
+    category: "pkg"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/pkg-win-release-try"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
+    category: "pkg"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/pkg-linux-debug-try"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-arm64"
+    category: "pkg"
+    short_name: "m1"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-canary-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
+    category: "pkg"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-hostasserts-linux-ia32-d8-try"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
+    category: "pkg"
+    short_name: "ld"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-minified-strong-linux-x64-d8-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64"
+    category: "dart2js"
+    short_name: "c"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-unit-linux-x64-release-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
+    category: "dart2js|d8"
+    short_name: "ha"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-chrome-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
+    category: "dart2js|d8"
+    short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-csp-minified-linux-x64-chrome-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
+    category: "dart2js|d8"
+    short_name: "u"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-mac-x64-chrome-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-win-x64-chrome-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-nnbd-linux-x64-chrome-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-firefox-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-mac-x64-safari-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "nn"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-analyze-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/analyzer-analysis-server-linux-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/analyzer-linux-release-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
+    category: "dart2js|safari"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/analyzer-mac-release-try"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
+    category: "analyzer"
+    short_name: "fa"
   }
   builders {
-    name: "buildbucket/luci.dart.try/analyzer-win-release-try"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
+    category: "analyzer"
+    short_name: "as"
   }
   builders {
-    name: "buildbucket/luci.dart.try/analyzer-nnbd-linux-release-try"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
+    category: "analyzer"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/analyzer-nnbd-mac-release-try"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
+    category: "analyzer"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/analyzer-nnbd-win-release-try"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
+    category: "analyzer"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart-sdk-linux-try"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release"
+    category: "analyzer|nnbd"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart-sdk-mac-try"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-mac-release"
+    category: "analyzer|nnbd"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart-sdk-mac-arm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-win-release"
+    category: "analyzer|nnbd"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart-sdk-win-try"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
+    category: "ddc"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/ddc-linux-release-chrome-try"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-nnbd-linux-release-chrome"
+    category: "ddc"
+    short_name: "nn"
   }
   builders {
-    name: "buildbucket/luci.dart.try/ddc-nnbd-linux-release-chrome-try"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
+    category: "ddc"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/ddc-mac-release-chrome-try"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
+    category: "ddc"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/ddc-win-release-chrome-try"
+    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox"
+    category: "ddc"
+    short_name: "fl"
   }
   builders {
-    name: "buildbucket/luci.dart.try/ddk-linux-release-firefox-try"
+    name: "buildbucket/luci.dart.ci.sandbox/gclient"
+    category: "misc"
+    short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.try/gclient-try"
+    name: "buildbucket/luci.dart.ci/debianpackage-linux"
+    category: "misc"
+    short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.try/benchmark-linux-try"
+    name: "buildbucket/luci.dart.ci.sandbox/google"
+    category: "flutter"
+    short_name: "g3"
   }
-  builders {
-    name: "buildbucket/luci.dart.try.shared/presubmit-try"
+  header {
+    links {
+      name: "Consoles"
+      links {
+        text: "Bleeding Edge console"
+        url: "/p/dart/g/be/console"
+        alt: "SDK BE Console"
+      }
+      links {
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (alternative)"
+      }
+      links {
+        text: "FYI console"
+        url: "/p/dart/g/fyi/console"
+        alt: "SDK FYI Console"
+      }
+      links {
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      }
+      links {
+        text: "Results Feed"
+        url: "https://dart-ci.firebaseapp.com/"
+        alt: "Results Feed"
+      }
+      links {
+        text: "Current Test Results"
+        url: "https://dart-ci.firebaseapp.com/current_results/"
+        alt: "Current Test Results"
+      }
+      links {
+        text: "Dart Infrastructure chat"
+        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
+        alt: "Dart Infrastructure chat"
+      }
+    }
+    console_groups {
+      console_ids: "dart/dart-fuzz"
+      console_ids: "dart/flutter"
+      console_ids: "dart/flutter-hhh"
+      console_ids: "dart/iso-stress"
+    }
+    tree_status_host: "dart-status.appspot.com"
   }
-  builder_view_only: true
 }
 consoles {
-  id: "be"
-  name: "SDK Bleeding Edge Console"
+  id: "alt"
+  name: "SDK Bleeding Edge Console (alternative)"
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "regexp:refs/heads/main"
   manifest_name: "REVISION"
@@ -450,6 +754,171 @@ consoles {
     category: "flutter"
     short_name: "web"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
+    category: "pkg"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
+    category: "pkg"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-arm64"
+    category: "pkg"
+    short_name: "m1"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
+    category: "pkg"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
+    category: "pkg"
+    short_name: "ld"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64"
+    category: "dart2js"
+    short_name: "c"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
+    category: "dart2js|d8"
+    short_name: "ha"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
+    category: "dart2js|d8"
+    short_name: "mi"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
+    category: "dart2js|d8"
+    short_name: "u"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "csp"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "nn"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
+    category: "dart2js|safari"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
+    category: "analyzer"
+    short_name: "fa"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
+    category: "analyzer"
+    short_name: "as"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
+    category: "analyzer"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
+    category: "analyzer"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
+    category: "analyzer"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release"
+    category: "analyzer|nnbd"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-mac-release"
+    category: "analyzer|nnbd"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-win-release"
+    category: "analyzer|nnbd"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
+    category: "ddc"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-nnbd-linux-release-chrome"
+    category: "ddc"
+    short_name: "nn"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
+    category: "ddc"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
+    category: "ddc"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox"
+    category: "ddc"
+    short_name: "fl"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/gclient"
+    category: "misc"
+    short_name: "g"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/debianpackage-linux"
+    category: "misc"
+    short_name: "dp"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/google"
+    category: "flutter"
+    short_name: "g3"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
     category: "vm|nnbd|jit"
@@ -885,171 +1354,6 @@ consoles {
     category: "vm|ffi"
     short_name: "qr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
-    category: "pkg"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
-    category: "pkg"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-arm64"
-    category: "pkg"
-    short_name: "m1"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
-    category: "pkg"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
-    category: "pkg"
-    short_name: "ld"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64"
-    category: "dart2js"
-    short_name: "c"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
-    category: "dart2js|d8"
-    short_name: "ha"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
-    category: "dart2js|d8"
-    short_name: "mi"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
-    category: "dart2js|d8"
-    short_name: "u"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "nn"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
-    category: "dart2js|safari"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
-    category: "analyzer"
-    short_name: "fa"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
-    category: "analyzer"
-    short_name: "as"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
-    category: "analyzer"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
-    category: "analyzer"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
-    category: "analyzer"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release"
-    category: "analyzer|nnbd"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-mac-release"
-    category: "analyzer|nnbd"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-win-release"
-    category: "analyzer|nnbd"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
-    category: "ddc"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-nnbd-linux-release-chrome"
-    category: "ddc"
-    short_name: "nn"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
-    category: "ddc"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
-    category: "ddc"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox"
-    category: "ddc"
-    short_name: "fl"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/gclient"
-    category: "misc"
-    short_name: "g"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux"
-    category: "misc"
-    short_name: "dp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/google"
-    category: "flutter"
-    short_name: "g3"
-  }
   header {
     links {
       name: "Consoles"
@@ -1099,655 +1403,759 @@ consoles {
   }
 }
 consoles {
-  id: "alt"
-  name: "SDK Bleeding Edge Console (alternative)"
+  id: "dev"
+  name: "SDK Dev Console"
   repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/main"
+  refs: "regexp:refs/heads/dev"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-dev"
     category: "cfe"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-dev"
     category: "cfe"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-dev"
     category: "cfe"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-dev"
     category: "cfe|nnbd"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-mac-release-x64"
-    category: "cfe|nnbd"
-    short_name: "m"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-dev"
+    category: "vm|nnbd|jit"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-win-release-x64"
-    category: "cfe|nnbd"
-    short_name: "w"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-dev"
+    category: "vm|nnbd|jit"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
-    category: "cfe"
-    short_name: "fl"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-dev"
+    category: "vm|nnbd|aot"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
-    category: "flutter"
-    short_name: "3H"
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-dev"
+    category: "vm|app-kernel"
+    short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-web_tests"
-    category: "flutter"
-    short_name: "web"
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-dev"
+    category: "vm|app-kernel"
+    short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
-    category: "pkg"
-    short_name: "l"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-dev"
+    category: "vm|kernel"
+    short_name: "c"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
-    category: "pkg"
-    short_name: "m"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-dev"
+    category: "vm|kernel"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-arm64"
-    category: "pkg"
-    short_name: "m1"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-dev"
+    category: "vm|kernel"
+    short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
-    category: "pkg"
-    short_name: "w"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-dev"
+    category: "vm|kernel"
+    short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
-    category: "pkg"
-    short_name: "ld"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-dev"
+    category: "vm|kernel"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64"
-    category: "dart2js"
-    short_name: "c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-dev"
+    category: "vm|kernel"
+    short_name: "rc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
-    category: "dart2js|d8"
-    short_name: "ha"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-dev"
+    category: "vm|kernel"
+    short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
-    category: "dart2js|d8"
-    short_name: "mi"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-dev"
+    category: "vm|kernel"
+    short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
-    category: "dart2js|d8"
-    short_name: "u"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-arm64-dev"
+    category: "vm|kernel"
+    short_name: "m1r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "l"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-dev"
+    category: "vm|kernel"
+    short_name: "wd"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "csp"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-dev"
+    category: "vm|kernel"
+    short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "m"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "w"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "p"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "nn"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-dev"
+    category: "vm|kernel-precomp"
+    short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "l"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "w"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
-    category: "dart2js|safari"
-    short_name: "m"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "o"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
-    category: "analyzer"
-    short_name: "fa"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "adx"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
-    category: "analyzer"
-    short_name: "as"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "arx"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
-    category: "analyzer"
-    short_name: "l"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "ma"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
-    category: "analyzer"
-    short_name: "m"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
-    category: "analyzer"
-    short_name: "w"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-dev"
+    category: "vm|kernel-precomp|android"
+    short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release"
-    category: "analyzer|nnbd"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-dev"
+    category: "vm|kernel-precomp|android"
+    short_name: "a64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-dev"
+    category: "vm|misc"
+    short_name: "g"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-dev"
+    category: "vm|ffi"
+    short_name: "d32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-dev"
+    category: "vm|ffi"
+    short_name: "r32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-dev"
+    category: "vm|ffi"
+    short_name: "p32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-dev"
+    category: "vm|ffi"
+    short_name: "d64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-dev"
+    category: "vm|ffi"
+    short_name: "r64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-dev"
+    category: "vm|ffi"
+    short_name: "p64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-dev"
+    category: "vm|ffi"
+    short_name: "qa"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-dev"
+    category: "vm|ffi"
+    short_name: "qr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
+    category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-mac-release"
-    category: "analyzer|nnbd"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-dev"
+    category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-win-release"
-    category: "analyzer|nnbd"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-dev"
+    category: "pkg"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
-    category: "ddc"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-dev"
+    category: "dart2js"
+    short_name: "c"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-dev"
+    category: "dart2js|d8"
+    short_name: "ha"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-dev"
+    category: "dart2js|d8"
+    short_name: "mi"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-dev"
+    category: "dart2js|d8"
+    short_name: "u"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-dev"
+    category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-nnbd-linux-release-chrome"
-    category: "ddc"
-    short_name: "nn"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-dev"
+    category: "dart2js|chrome"
+    short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
-    category: "ddc"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-dev"
+    category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
-    category: "ddc"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-dev"
+    category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox"
-    category: "ddc"
-    short_name: "fl"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-dev"
+    category: "dart2js|chrome"
+    short_name: "nn"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/gclient"
-    category: "misc"
-    short_name: "g"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-dev"
+    category: "dart2js|firefox"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux"
-    category: "misc"
-    short_name: "dp"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-dev"
+    category: "dart2js|safari"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/google"
-    category: "flutter"
-    short_name: "g3"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-dev"
+    category: "analyzer"
+    short_name: "as"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
-    category: "vm|nnbd|jit"
-    short_name: "d"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-dev"
+    category: "analyzer"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64"
-    category: "vm|nnbd|jit"
-    short_name: "r"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-dev"
+    category: "analyzer"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-ia32"
-    category: "vm|nnbd|jit"
-    short_name: "d3"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-dev"
+    category: "analyzer"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-ia32"
-    category: "vm|nnbd|jit"
-    short_name: "r3"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-dev"
+    category: "analyzer|nnbd"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm"
-    category: "vm|nnbd|jit"
-    short_name: "ra"
+    name: "buildbucket/luci.dart.ci/dart-sdk-linux-dev"
+    category: "sdk"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm64"
-    category: "vm|nnbd|jit"
-    short_name: "ra6"
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-dev"
+    category: "sdk"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-arm64"
-    category: "vm|nnbd|jit"
-    short_name: "m1d"
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-dev"
+    category: "sdk"
+    short_name: "m1"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-x64"
-    category: "vm|nnbd|jit"
-    short_name: "md"
+    name: "buildbucket/luci.dart.ci/dart-sdk-win-dev"
+    category: "sdk"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-arm64"
-    category: "vm|nnbd|jit"
-    short_name: "m1r"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-dev"
+    category: "ddc"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-x64"
-    category: "vm|nnbd|jit"
-    short_name: "mr"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-dev"
+    category: "ddc"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-ia32"
-    category: "vm|nnbd|jit"
-    short_name: "wr3"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-dev"
+    category: "ddc"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64"
-    category: "vm|nnbd|jit"
-    short_name: "wd"
+    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-dev"
+    category: "ddc"
+    short_name: "fl"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-x64"
-    category: "vm|nnbd|jit"
-    short_name: "wr"
+    name: "buildbucket/luci.dart.ci.sandbox/gclient-dev"
+    category: "misc"
+    short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64"
-    category: "vm|nnbd|aot"
-    short_name: "r"
+    name: "buildbucket/luci.dart.ci/debianpackage-linux-dev"
+    category: "misc"
+    short_name: "dp"
+  }
+  header {
+    links {
+      name: "Consoles"
+      links {
+        text: "Bleeding Edge console"
+        url: "/p/dart/g/be/console"
+        alt: "SDK BE Console"
+      }
+      links {
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (alternative)"
+      }
+      links {
+        text: "FYI console"
+        url: "/p/dart/g/fyi/console"
+        alt: "SDK FYI Console"
+      }
+      links {
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      }
+      links {
+        text: "Results Feed"
+        url: "https://dart-ci.firebaseapp.com/"
+        alt: "Results Feed"
+      }
+      links {
+        text: "Current Test Results"
+        url: "https://dart-ci.firebaseapp.com/current_results/"
+        alt: "Current Test Results"
+      }
+      links {
+        text: "Dart Infrastructure chat"
+        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
+        alt: "Dart Infrastructure chat"
+      }
+    }
+    console_groups {
+      console_ids: "dart/dart-fuzz"
+      console_ids: "dart/flutter"
+      console_ids: "dart/flutter-hhh"
+      console_ids: "dart/iso-stress"
+    }
+    tree_status_host: "dart-status.appspot.com"
   }
+}
+consoles {
+  id: "beta"
+  name: "SDK Beta Console"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/beta"
+  manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
-    category: "vm|nnbd|aot"
-    short_name: "da"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-beta"
+    category: "cfe"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm_x64"
-    category: "vm|nnbd|aot"
-    short_name: "ra"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-beta"
+    category: "cfe"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-x64"
-    category: "vm|nnbd|aot"
-    short_name: "d"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-beta"
+    category: "cfe"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64"
-    category: "vm|nnbd|aot"
-    short_name: "ra6"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-beta"
+    category: "cfe|nnbd"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-arm64"
-    category: "vm|nnbd|aot"
-    short_name: "m1"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-beta"
+    category: "vm|nnbd|jit"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64"
-    category: "vm|nnbd|aot"
-    short_name: "ma6"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-beta"
+    category: "vm|nnbd|jit"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-beta"
     category: "vm|nnbd|aot"
-    short_name: "wr"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-beta"
     category: "vm|app-kernel"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64"
-    category: "vm|app-kernel"
-    short_name: "p64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-beta"
     category: "vm|app-kernel"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-beta"
     category: "vm|kernel"
     short_name: "c"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-beta"
     category: "vm|kernel"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-beta"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-beta"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32"
-    category: "vm|kernel"
-    short_name: "r32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-beta"
     category: "vm|kernel"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-beta"
     category: "vm|kernel"
     short_name: "rc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32"
-    category: "vm|kernel"
-    short_name: "d32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-beta"
     category: "vm|kernel"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-beta"
     category: "vm|kernel"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-arm64"
-    category: "vm|kernel"
-    short_name: "m1r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
-    category: "vm|kernel"
-    short_name: "wd3"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-beta"
     category: "vm|kernel"
     short_name: "wd"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32"
-    category: "vm|kernel"
-    short_name: "wr3"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-beta"
     category: "vm|kernel"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
-    category: "vm|kernel"
-    short_name: "cra"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-beta"
     category: "vm|kernel-precomp"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-beta"
     category: "vm|kernel-precomp"
     short_name: "p"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-beta"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-beta"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-beta"
     category: "vm|kernel-precomp"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-beta"
     category: "vm|kernel-precomp"
     short_name: "o"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-beta"
     category: "vm|kernel-precomp"
     short_name: "adx"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-beta"
     category: "vm|kernel-precomp"
     short_name: "arx"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-beta"
     category: "vm|kernel-precomp"
     short_name: "ma"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-beta"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-precomp-linux-release-arm64"
-    category: "vm|kernel-precomp"
-    short_name: "cra"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-dwarf-linux-product-x64"
-    category: "vm|kernel-precomp"
-    short_name: "dw"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-beta"
     category: "vm|kernel-precomp|android"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-beta"
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
-    category: "vm|product"
-    short_name: "l"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-beta"
+    category: "vm|misc"
+    short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
-    category: "vm|product"
-    short_name: "m"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-beta"
+    category: "vm|ffi"
+    short_name: "d32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
-    category: "vm|product"
-    short_name: "w"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-beta"
+    category: "vm|ffi"
+    short_name: "r32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
-    category: "vm|misc"
-    short_name: "o32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-beta"
+    category: "vm|ffi"
+    short_name: "p32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
-    category: "vm|misc"
-    short_name: "o64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-beta"
+    category: "vm|ffi"
+    short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
-    category: "vm|misc"
-    short_name: "a"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-beta"
+    category: "vm|ffi"
+    short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msan-linux-release-x64"
-    category: "vm|misc"
-    short_name: "m"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-beta"
+    category: "vm|ffi"
+    short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-tsan-linux-release-x64"
-    category: "vm|misc"
-    short_name: "t"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-beta"
+    category: "vm|ffi"
+    short_name: "qa"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ubsan-linux-release-x64"
-    category: "vm|misc"
-    short_name: "u"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-beta"
+    category: "vm|ffi"
+    short_name: "qr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-asan-linux-release-x64"
-    category: "vm|misc|aot"
-    short_name: "a"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-beta"
+    category: "pkg"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-msan-linux-release-x64"
-    category: "vm|misc|aot"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-beta"
+    category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-tsan-linux-release-x64"
-    category: "vm|misc|aot"
-    short_name: "t"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-beta"
+    category: "pkg"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ubsan-linux-release-x64"
-    category: "vm|misc|aot"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-beta"
+    category: "dart2js"
+    short_name: "c"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-beta"
+    category: "dart2js|d8"
+    short_name: "ha"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-beta"
+    category: "dart2js|d8"
+    short_name: "mi"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-beta"
+    category: "dart2js|d8"
     short_name: "u"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
-    category: "vm|misc|reload"
-    short_name: "d"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-beta"
+    category: "dart2js|chrome"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
-    category: "vm|misc|reload"
-    short_name: "r"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-beta"
+    category: "dart2js|chrome"
+    short_name: "csp"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-beta"
+    category: "dart2js|chrome"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-beta"
+    category: "dart2js|chrome"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
-    category: "vm|misc|reload"
-    short_name: "drb"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-beta"
+    category: "dart2js|chrome"
+    short_name: "nn"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64"
-    category: "vm|misc|reload"
-    short_name: "rrb"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-beta"
+    category: "dart2js|firefox"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64c"
-    category: "vm|misc|compressed"
-    short_name: "jl"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-beta"
+    category: "dart2js|safari"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64c"
-    category: "vm|misc|compressed"
-    short_name: "al"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-beta"
+    category: "analyzer"
+    short_name: "as"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64c"
-    category: "vm|misc|compressed"
-    short_name: "jw"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-beta"
+    category: "analyzer"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-debug-x64c"
-    category: "vm|misc|compressed"
-    short_name: "aw"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-beta"
+    category: "analyzer"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-fuchsia-release-x64"
-    category: "vm|misc"
-    short_name: "f"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-beta"
+    category: "analyzer"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux"
-    category: "vm|misc"
-    short_name: "g"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-beta"
+    category: "analyzer|nnbd"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simriscv64"
-    category: "vm|misc"
-    short_name: "rv64"
+    name: "buildbucket/luci.dart.ci/dart-sdk-linux-beta"
+    category: "sdk"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simriscv64"
-    category: "vm|misc"
-    short_name: "rv64"
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-beta"
+    category: "sdk"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
-    category: "vm|ffi"
-    short_name: "d32"
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-beta"
+    category: "sdk"
+    short_name: "m1"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm"
-    category: "vm|ffi"
-    short_name: "r32"
+    name: "buildbucket/luci.dart.ci/dart-sdk-win-beta"
+    category: "sdk"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm"
-    category: "vm|ffi"
-    short_name: "p32"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-beta"
+    category: "ddc"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c"
-    category: "vm|ffi"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-beta"
+    category: "ddc"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c"
-    category: "vm|ffi"
-    short_name: "r64"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-beta"
+    category: "ddc"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c"
-    category: "vm|ffi"
-    short_name: "p64"
+    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-beta"
+    category: "ddc"
+    short_name: "fl"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm"
-    category: "vm|ffi"
-    short_name: "qa"
+    name: "buildbucket/luci.dart.ci.sandbox/gclient-beta"
+    category: "misc"
+    short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64"
-    category: "vm|ffi"
-    short_name: "qr"
+    name: "buildbucket/luci.dart.ci/debianpackage-linux-beta"
+    category: "misc"
+    short_name: "dp"
   }
   header {
     links {
@@ -1798,358 +2206,353 @@ consoles {
   }
 }
 consoles {
-  id: "dev"
-  name: "SDK Dev Console"
+  id: "stable"
+  name: "SDK Stable Console"
   repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/dev"
+  refs: "regexp:refs/heads/stable"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-stable"
     category: "cfe"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-stable"
     category: "cfe"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-stable"
     category: "cfe"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-stable"
     category: "cfe|nnbd"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-stable"
     category: "vm|nnbd|jit"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-stable"
     category: "vm|nnbd|jit"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-stable"
     category: "vm|nnbd|aot"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-stable"
     category: "vm|app-kernel"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-stable"
     category: "vm|app-kernel"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-stable"
     category: "vm|kernel"
     short_name: "c"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-stable"
     category: "vm|kernel"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-stable"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-stable"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-stable"
     category: "vm|kernel"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-stable"
     category: "vm|kernel"
     short_name: "rc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-stable"
     category: "vm|kernel"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-stable"
     category: "vm|kernel"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-arm64-dev"
-    category: "vm|kernel"
-    short_name: "m1r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-stable"
     category: "vm|kernel"
     short_name: "wd"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-stable"
     category: "vm|kernel"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "p"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-stable"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-stable"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "o"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-stable"
     category: "vm|kernel-precomp"
     short_name: "adx"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-stable"
     category: "vm|kernel-precomp"
     short_name: "arx"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-stable"
     category: "vm|kernel-precomp"
     short_name: "ma"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-stable"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-stable"
     category: "vm|kernel-precomp|android"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-stable"
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-stable"
     category: "vm|misc"
     short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-stable"
     category: "vm|ffi"
     short_name: "d32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-stable"
     category: "vm|ffi"
     short_name: "r32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-stable"
     category: "vm|ffi"
     short_name: "p32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-stable"
     category: "vm|ffi"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-stable"
     category: "vm|ffi"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-stable"
     category: "vm|ffi"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-stable"
     category: "vm|ffi"
     short_name: "qa"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-stable"
     category: "vm|ffi"
     short_name: "qr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-stable"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-stable"
     category: "pkg"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-stable"
     category: "dart2js"
     short_name: "c"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-stable"
     category: "dart2js|d8"
     short_name: "ha"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-stable"
     category: "dart2js|d8"
     short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-stable"
     category: "dart2js|d8"
     short_name: "u"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-stable"
     category: "dart2js|chrome"
     short_name: "nn"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-stable"
     category: "dart2js|firefox"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-stable"
     category: "dart2js|safari"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-stable"
     category: "analyzer"
     short_name: "as"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-stable"
     category: "analyzer"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-stable"
     category: "analyzer"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-stable"
     category: "analyzer"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-stable"
     category: "analyzer|nnbd"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-linux-dev"
+    name: "buildbucket/luci.dart.ci/dart-sdk-linux-stable"
     category: "sdk"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-dev"
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-stable"
     category: "sdk"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-dev"
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-stable"
     category: "sdk"
     short_name: "m1"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-win-dev"
+    name: "buildbucket/luci.dart.ci/dart-sdk-win-stable"
     category: "sdk"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-stable"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-stable"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-stable"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-stable"
     category: "ddc"
     short_name: "fl"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/gclient-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/gclient-stable"
     category: "misc"
     short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux-dev"
+    name: "buildbucket/luci.dart.ci/debianpackage-linux-stable"
     category: "misc"
     short_name: "dp"
   }
@@ -2202,860 +2605,457 @@ consoles {
   }
 }
 consoles {
-  id: "beta"
-  name: "SDK Beta Console"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/beta"
-  manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-beta"
-    category: "cfe"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-beta"
-    category: "cfe"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-beta"
-    category: "cfe"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-beta"
-    category: "cfe|nnbd"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-beta"
-    category: "vm|nnbd|jit"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-beta"
-    category: "vm|nnbd|jit"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-beta"
-    category: "vm|nnbd|aot"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-beta"
-    category: "vm|app-kernel"
-    short_name: "d64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-beta"
-    category: "vm|app-kernel"
-    short_name: "r64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-beta"
-    category: "vm|kernel"
-    short_name: "c"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-beta"
-    category: "vm|kernel"
-    short_name: "d"
-  }
+  id: "dart-fuzz"
+  name: "Dart Fuzzer Console"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-beta"
-    category: "vm|kernel"
-    short_name: "a32"
+    name: "buildbucket/luci.dart.ci.sandbox/fuzz-linux"
   }
+  builder_view_only: true
+}
+consoles {
+  id: "flutter"
+  name: "Dart/Flutter Console"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/main"
+  manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-beta"
-    category: "vm|kernel"
-    short_name: "a64"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
+    category: "analyzer"
+    short_name: "fa"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-beta"
-    category: "vm|kernel"
-    short_name: "r"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
+    category: "fasta"
+    short_name: "fl"
   }
+}
+consoles {
+  id: "flutter-hhh"
+  name: "Dart/Flutter Linear History Console"
+  repo_url: "https://dart.googlesource.com/linear_sdk_flutter_engine"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-beta"
-    category: "vm|kernel"
-    short_name: "rc"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
+    category: "flutter"
+    short_name: "3H"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-beta"
-    category: "vm|kernel"
-    short_name: "md"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-web_tests"
+    category: "flutter"
+    short_name: "web"
   }
+}
+consoles {
+  id: "iso-stress"
+  name: "VM Isolate Stress Test Console"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-beta"
-    category: "vm|kernel"
-    short_name: "mr"
+    name: "buildbucket/luci.dart.ci.sandbox/iso-stress-linux"
   }
+  builder_view_only: true
+}
+consoles {
+  id: "fyi"
+  name: "SDK FYI Console"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/main"
+  manifest_name: "REVISION"
+}
+consoles {
+  id: "cq"
+  name: "SDK CQ Console"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-beta"
-    category: "vm|kernel"
-    short_name: "wd"
+    name: "buildbucket/luci.dart.try/front-end-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-beta"
-    category: "vm|kernel"
-    short_name: "wr"
+    name: "buildbucket/luci.dart.try/front-end-mac-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-beta"
-    category: "vm|kernel-precomp"
-    short_name: "d"
+    name: "buildbucket/luci.dart.try/front-end-win-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-beta"
-    category: "vm|kernel-precomp"
-    short_name: "p"
+    name: "buildbucket/luci.dart.try/front-end-nnbd-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-beta"
-    category: "vm|kernel-precomp"
-    short_name: "a32"
+    name: "buildbucket/luci.dart.try/front-end-nnbd-mac-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-beta"
-    category: "vm|kernel-precomp"
-    short_name: "a64"
+    name: "buildbucket/luci.dart.try/front-end-nnbd-win-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-beta"
-    category: "vm|kernel-precomp"
-    short_name: "r"
+    name: "buildbucket/luci.dart.try/flutter-frontend-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-beta"
-    category: "vm|kernel-precomp"
-    short_name: "o"
+    name: "buildbucket/luci.dart.try/flutter-engine-linux-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-beta"
-    category: "vm|kernel-precomp"
-    short_name: "adx"
+    name: "buildbucket/luci.dart.try/flutter-engine-linux-web_tests-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-beta"
-    category: "vm|kernel-precomp"
-    short_name: "arx"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-beta"
-    category: "vm|kernel-precomp"
-    short_name: "ma"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-beta"
-    category: "vm|kernel-precomp"
-    short_name: "wr"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-beta"
-    category: "vm|kernel-precomp|android"
-    short_name: "a32"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-beta"
-    category: "vm|kernel-precomp|android"
-    short_name: "a64"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-simarm-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-beta"
-    category: "vm|misc"
-    short_name: "g"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-simarm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-beta"
-    category: "vm|ffi"
-    short_name: "d32"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-debug-arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-beta"
-    category: "vm|ffi"
-    short_name: "r32"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-beta"
-    category: "vm|ffi"
-    short_name: "p32"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-release-arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-beta"
-    category: "vm|ffi"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-beta"
-    category: "vm|ffi"
-    short_name: "r64"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-release-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-beta"
-    category: "vm|ffi"
-    short_name: "p64"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-beta"
-    category: "vm|ffi"
-    short_name: "qa"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-beta"
-    category: "vm|ffi"
-    short_name: "qr"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-beta"
-    category: "pkg"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-beta"
-    category: "pkg"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-beta"
-    category: "pkg"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-beta"
-    category: "dart2js"
-    short_name: "c"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-beta"
-    category: "dart2js|d8"
-    short_name: "ha"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-mac-release-arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-beta"
-    category: "dart2js|d8"
-    short_name: "mi"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-beta"
-    category: "dart2js|d8"
-    short_name: "u"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-win-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-beta"
-    category: "dart2js|chrome"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/app-kernel-linux-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-beta"
-    category: "dart2js|chrome"
-    short_name: "csp"
+    name: "buildbucket/luci.dart.try/app-kernel-linux-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-beta"
-    category: "dart2js|chrome"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/app-kernel-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-beta"
-    category: "dart2js|chrome"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-beta"
-    category: "dart2js|chrome"
-    short_name: "nn"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-beta"
-    category: "dart2js|firefox"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simarm-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-beta"
-    category: "dart2js|safari"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simarm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-beta"
-    category: "analyzer"
-    short_name: "as"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-beta"
-    category: "analyzer"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-beta"
-    category: "analyzer"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/vm-kernel-checked-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-beta"
-    category: "analyzer"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-beta"
-    category: "analyzer|nnbd"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/vm-kernel-mac-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-linux-beta"
-    category: "sdk"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/vm-kernel-mac-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-beta"
-    category: "sdk"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/vm-kernel-mac-release-arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-beta"
-    category: "sdk"
-    short_name: "m1"
+    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-win-beta"
-    category: "sdk"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-beta"
-    category: "ddc"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/vm-kernel-win-release-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-beta"
-    category: "ddc"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/vm-kernel-win-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-beta"
-    category: "ddc"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-beta"
-    category: "ddc"
-    short_name: "fl"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/gclient-beta"
-    category: "misc"
-    short_name: "g"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux-beta"
-    category: "misc"
-    short_name: "dp"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm64-try"
   }
-  header {
-    links {
-      name: "Consoles"
-      links {
-        text: "Bleeding Edge console"
-        url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
-      }
-      links {
-        text: "Alternative Bleeding Edge console"
-        url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
-      }
-      links {
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
-      }
-      links {
-        text: "SDK CQ Status"
-        url: "/p/dart/g/cq/builders"
-        alt: "SDK CQ Status"
-      }
-      links {
-        text: "Results Feed"
-        url: "https://dart-ci.firebaseapp.com/"
-        alt: "Results Feed"
-      }
-      links {
-        text: "Current Test Results"
-        url: "https://dart-ci.firebaseapp.com/current_results/"
-        alt: "Current Test Results"
-      }
-      links {
-        text: "Dart Infrastructure chat"
-        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
-        alt: "Dart Infrastructure chat"
-      }
-    }
-    console_groups {
-      console_ids: "dart/dart-fuzz"
-      console_ids: "dart/flutter"
-      console_ids: "dart/flutter-hhh"
-      console_ids: "dart/iso-stress"
-    }
-    tree_status_host: "dart-status.appspot.com"
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-x64-try"
   }
-}
-consoles {
-  id: "stable"
-  name: "SDK Stable Console"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/stable"
-  manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-stable"
-    category: "cfe"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-stable"
-    category: "cfe"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-simarm_x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-stable"
-    category: "cfe"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm_x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-stable"
-    category: "cfe|nnbd"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-mac-release-simarm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-stable"
-    category: "vm|nnbd|jit"
-    short_name: "d"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-stable"
-    category: "vm|nnbd|jit"
-    short_name: "r"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-dwarf-linux-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-stable"
-    category: "vm|nnbd|aot"
-    short_name: "r"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm_x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-stable"
-    category: "vm|app-kernel"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-stable"
-    category: "vm|app-kernel"
-    short_name: "r64"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-stable"
-    category: "vm|kernel"
-    short_name: "c"
+    name: "buildbucket/luci.dart.try/vm-kernel-mac-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-stable"
-    category: "vm|kernel"
-    short_name: "d"
+    name: "buildbucket/luci.dart.try/vm-kernel-win-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-stable"
-    category: "vm|kernel"
-    short_name: "a32"
+    name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-stable"
-    category: "vm|kernel"
-    short_name: "a64"
+    name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-stable"
-    category: "vm|kernel"
-    short_name: "r"
+    name: "buildbucket/luci.dart.try/vm-kernel-asan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-stable"
-    category: "vm|kernel"
-    short_name: "rc"
+    name: "buildbucket/luci.dart.try/vm-kernel-msan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-stable"
-    category: "vm|kernel"
-    short_name: "md"
+    name: "buildbucket/luci.dart.try/vm-kernel-tsan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-stable"
-    category: "vm|kernel"
-    short_name: "mr"
+    name: "buildbucket/luci.dart.try/vm-kernel-ubsan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-stable"
-    category: "vm|kernel"
-    short_name: "wd"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-asan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-stable"
-    category: "vm|kernel"
-    short_name: "wr"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-msan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "d"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-tsan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "p"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-ubsan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-stable"
-    category: "vm|kernel-precomp"
-    short_name: "a32"
+    name: "buildbucket/luci.dart.try/vm-kernel-reload-linux-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "a64"
+    name: "buildbucket/luci.dart.try/vm-kernel-reload-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "r"
+    name: "buildbucket/luci.dart.try/vm-kernel-reload-rollback-linux-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "o"
+    name: "buildbucket/luci.dart.try/vm-kernel-reload-rollback-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "adx"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "arx"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "ma"
+    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-x64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "wr"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-debug-x64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-stable"
-    category: "vm|kernel-precomp|android"
-    short_name: "a32"
+    name: "buildbucket/luci.dart.try/vm-fuchsia-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-gcc-linux-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-stable"
-    category: "vm|kernel-precomp|android"
-    short_name: "a64"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-simriscv64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-stable"
-    category: "vm|misc"
-    short_name: "g"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-simriscv64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-stable"
-    category: "vm|ffi"
-    short_name: "d32"
+    name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-stable"
-    category: "vm|ffi"
-    short_name: "r32"
+    name: "buildbucket/luci.dart.try/vm-ffi-android-release-arm-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-stable"
-    category: "vm|ffi"
-    short_name: "p32"
+    name: "buildbucket/luci.dart.try/vm-ffi-android-product-arm-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-stable"
-    category: "vm|ffi"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-stable"
-    category: "vm|ffi"
-    short_name: "r64"
+    name: "buildbucket/luci.dart.try/vm-ffi-android-release-arm64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-stable"
-    category: "vm|ffi"
-    short_name: "p64"
+    name: "buildbucket/luci.dart.try/vm-ffi-android-product-arm64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-stable"
-    category: "vm|ffi"
-    short_name: "qa"
+    name: "buildbucket/luci.dart.try/vm-precomp-ffi-qemu-linux-release-arm-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-stable"
-    category: "vm|ffi"
-    short_name: "qr"
+    name: "buildbucket/luci.dart.try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
-    category: "pkg"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/pkg-linux-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-stable"
-    category: "pkg"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/pkg-mac-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-stable"
-    category: "pkg"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/pkg-mac-release-arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-stable"
-    category: "dart2js"
-    short_name: "c"
+    name: "buildbucket/luci.dart.try/pkg-win-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-stable"
-    category: "dart2js|d8"
-    short_name: "ha"
+    name: "buildbucket/luci.dart.try/pkg-linux-debug-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-stable"
-    category: "dart2js|d8"
-    short_name: "mi"
+    name: "buildbucket/luci.dart.try/dart2js-canary-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-stable"
-    category: "dart2js|d8"
-    short_name: "u"
+    name: "buildbucket/luci.dart.try/dart2js-strong-hostasserts-linux-ia32-d8-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/dart2js-minified-strong-linux-x64-d8-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "csp"
+    name: "buildbucket/luci.dart.try/dart2js-unit-linux-x64-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/dart2js-csp-minified-linux-x64-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "nn"
+    name: "buildbucket/luci.dart.try/dart2js-strong-mac-x64-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-stable"
-    category: "dart2js|firefox"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/dart2js-strong-win-x64-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-stable"
-    category: "dart2js|safari"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/dart2js-nnbd-linux-x64-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-stable"
-    category: "analyzer"
-    short_name: "as"
+    name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-firefox-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-stable"
-    category: "analyzer"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/dart2js-strong-mac-x64-safari-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-stable"
-    category: "analyzer"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/flutter-analyze-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-stable"
-    category: "analyzer"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/analyzer-analysis-server-linux-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-stable"
-    category: "analyzer|nnbd"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/analyzer-linux-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-linux-stable"
-    category: "sdk"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/analyzer-mac-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-stable"
-    category: "sdk"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/analyzer-win-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-stable"
-    category: "sdk"
-    short_name: "m1"
+    name: "buildbucket/luci.dart.try/analyzer-nnbd-linux-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-win-stable"
-    category: "sdk"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/analyzer-nnbd-mac-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-stable"
-    category: "ddc"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/analyzer-nnbd-win-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-stable"
-    category: "ddc"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/dart-sdk-linux-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-stable"
-    category: "ddc"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/dart-sdk-mac-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-stable"
-    category: "ddc"
-    short_name: "fl"
+    name: "buildbucket/luci.dart.try/dart-sdk-mac-arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/gclient-stable"
-    category: "misc"
-    short_name: "g"
+    name: "buildbucket/luci.dart.try/dart-sdk-win-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux-stable"
-    category: "misc"
-    short_name: "dp"
+    name: "buildbucket/luci.dart.try/ddc-linux-release-chrome-try"
   }
-  header {
-    links {
-      name: "Consoles"
-      links {
-        text: "Bleeding Edge console"
-        url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
-      }
-      links {
-        text: "Alternative Bleeding Edge console"
-        url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
-      }
-      links {
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
-      }
-      links {
-        text: "SDK CQ Status"
-        url: "/p/dart/g/cq/builders"
-        alt: "SDK CQ Status"
-      }
-      links {
-        text: "Results Feed"
-        url: "https://dart-ci.firebaseapp.com/"
-        alt: "Results Feed"
-      }
-      links {
-        text: "Current Test Results"
-        url: "https://dart-ci.firebaseapp.com/current_results/"
-        alt: "Current Test Results"
-      }
-      links {
-        text: "Dart Infrastructure chat"
-        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
-        alt: "Dart Infrastructure chat"
-      }
-    }
-    console_groups {
-      console_ids: "dart/dart-fuzz"
-      console_ids: "dart/flutter"
-      console_ids: "dart/flutter-hhh"
-      console_ids: "dart/iso-stress"
-    }
-    tree_status_host: "dart-status.appspot.com"
+  builders {
+    name: "buildbucket/luci.dart.try/ddc-nnbd-linux-release-chrome-try"
   }
-}
-consoles {
-  id: "dart-fuzz"
-  name: "Dart Fuzzer Console"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/fuzz-linux"
+    name: "buildbucket/luci.dart.try/ddc-mac-release-chrome-try"
   }
-  builder_view_only: true
-}
-consoles {
-  id: "flutter"
-  name: "Dart/Flutter Console"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/main"
-  manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
-    category: "analyzer"
-    short_name: "fa"
+    name: "buildbucket/luci.dart.try/ddc-win-release-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
-    category: "fasta"
-    short_name: "fl"
+    name: "buildbucket/luci.dart.try/ddk-linux-release-firefox-try"
   }
-}
-consoles {
-  id: "flutter-hhh"
-  name: "Dart/Flutter Linear History Console"
-  repo_url: "https://dart.googlesource.com/linear_sdk_flutter_engine"
-  refs: "regexp:refs/heads/master"
-  manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
-    category: "flutter"
-    short_name: "3H"
+    name: "buildbucket/luci.dart.try/gclient-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-web_tests"
-    category: "flutter"
-    short_name: "web"
+    name: "buildbucket/luci.dart.try/benchmark-linux-try"
   }
-}
-consoles {
-  id: "iso-stress"
-  name: "VM Isolate Stress Test Console"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/iso-stress-linux"
+    name: "buildbucket/luci.dart.try.shared/presubmit-try"
   }
   builder_view_only: true
 }
-consoles {
-  id: "fyi"
-  name: "SDK FYI Console"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/main"
-  manifest_name: "REVISION"
-}
 consoles {
   id: "infra"
   name: "Infra Console"
diff --git a/generated/luci-notify.cfg b/luci-notify.cfg
similarity index 84%
rename from generated/luci-notify.cfg
rename to luci-notify.cfg
index 727fa04f38a0..02504fc7fec9 100644
--- a/generated/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -11,6 +11,7 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -25,6 +26,7 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -39,6 +41,7 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -53,6 +56,7 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -67,6 +71,7 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -81,6 +86,7 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -95,6 +101,7 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -109,6 +116,7 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -124,6 +132,7 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -138,6 +147,7 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -153,6 +163,7 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -167,6 +178,7 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -177,6 +189,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -188,6 +203,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -199,6 +217,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -210,6 +231,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -221,6 +245,10 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
@@ -231,6 +259,10 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
@@ -241,6 +273,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -252,6 +287,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -276,6 +314,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -288,6 +329,9 @@ notifiers {
   notifications {
     on_success: true
     on_failure: true
+    email {
+      recipients: "karlklose@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
@@ -298,6 +342,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -322,6 +369,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -333,6 +383,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -344,6 +397,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -355,6 +411,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -366,6 +425,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -377,6 +439,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -388,6 +453,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -399,6 +467,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -410,6 +481,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -421,6 +495,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -432,6 +509,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -443,6 +523,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -454,6 +537,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -465,6 +551,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -476,6 +565,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -487,6 +579,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -498,6 +593,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -509,6 +607,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -533,6 +634,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -544,6 +648,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -555,6 +662,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -566,6 +676,10 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
@@ -576,6 +690,10 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
@@ -586,6 +704,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -622,6 +743,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -646,6 +770,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -657,6 +784,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -668,6 +798,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -679,6 +812,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -690,6 +826,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -701,6 +840,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -712,6 +854,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -723,6 +868,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -734,6 +882,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -745,6 +896,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -756,6 +910,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -767,6 +924,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -778,6 +938,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -790,7 +953,8 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "dart-vm-team-breakages@google.com"
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
     }
   }
   builders {
@@ -802,6 +966,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -852,6 +1019,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -902,6 +1072,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -913,6 +1086,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -924,6 +1100,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -935,6 +1114,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -959,6 +1141,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -970,6 +1155,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -982,7 +1170,8 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "dart-vm-team-breakages@google.com"
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
     }
   }
   builders {
@@ -1007,6 +1196,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -1057,6 +1249,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -1094,6 +1289,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -1170,6 +1368,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -1181,6 +1382,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -1192,6 +1396,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -1204,7 +1411,8 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "dart-vm-team-breakages@google.com"
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
     }
   }
   builders {
@@ -1229,6 +1437,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -1253,6 +1464,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -1277,6 +1491,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -1288,6 +1505,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -1299,6 +1519,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -1310,6 +1533,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -1321,6 +1547,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -1332,6 +1561,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -1344,7 +1576,8 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "dart-vm-team-breakages@google.com"
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
     }
   }
   builders {
@@ -1357,7 +1590,8 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "dart-vm-team-breakages@google.com"
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
     }
   }
   builders {
@@ -1370,7 +1604,8 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "dart-vm-team-breakages@google.com"
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
     }
   }
   builders {
@@ -1383,7 +1618,8 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "dart-vm-team-breakages@google.com"
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
     }
   }
   builders {
@@ -1396,7 +1632,8 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "dart-vm-team-breakages@google.com"
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
     }
   }
   builders {
@@ -1408,6 +1645,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -1419,6 +1659,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -1431,7 +1674,8 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "dart-vm-team-breakages@google.com"
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
     }
   }
   builders {
@@ -1444,7 +1688,8 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "dart-vm-team-breakages@google.com"
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
     }
   }
   builders {
@@ -1456,6 +1701,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -1468,7 +1716,8 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "dart-vm-team-breakages@google.com"
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
     }
   }
   builders {
@@ -1481,7 +1730,8 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "dart-vm-team-breakages@google.com"
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
     }
   }
   builders {
@@ -1506,6 +1756,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -1570,7 +1823,8 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "dart-vm-team-breakages@google.com"
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
     }
   }
   builders {
@@ -1583,7 +1837,8 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "dart-vm-team-breakages@google.com"
+      recipients: "karlklose@google.com"
+      recipients: "athom@google.com"
     }
   }
   builders {
@@ -1608,6 +1863,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -1658,6 +1916,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -1669,6 +1930,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
@@ -1684,6 +1948,7 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
+      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -1695,6 +1960,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+    }
     notify_blamelist {}
   }
   builders {
diff --git a/generated/luci-notify/email-templates/common.template b/luci-notify/email-templates/common.template
similarity index 100%
rename from generated/luci-notify/email-templates/common.template
rename to luci-notify/email-templates/common.template
diff --git a/generated/luci-notify/email-templates/default.template b/luci-notify/email-templates/default.template
similarity index 100%
rename from generated/luci-notify/email-templates/default.template
rename to luci-notify/email-templates/default.template
diff --git a/generated/luci-scheduler.cfg b/luci-scheduler.cfg
similarity index 100%
rename from generated/luci-scheduler.cfg
rename to luci-scheduler.cfg
diff --git a/main.star b/main.star
index 3ba8f08bfa2d..1c9a63e5d957 100755
--- a/main.star
+++ b/main.star
@@ -12,43 +12,258 @@
 Generates the Luci configuration for the Dart project.
 """
 
-load("//lib/cron.star", "cron")
-load("//lib/dart.star", "dart")
-load(
-    "//lib/defaults.star",
-    "arm64",
-    "chrome",
-    "firefox",
-    "js_engines",
-    "mac",
-    "no_android",
-    "pinned_xcode",
-    "windows",
-)
-load("//lib/paths.star", "paths")
-load("//lib/priority.star", "priority")
+load("//defaults.star", "defaults")
 
 lucicfg.check_version("1.30.9")
 
-# Global builder defaults
-# These need to be set at the top level to affect all uses of luci.builder.
 luci.builder.defaults.experiments.set({
-    "luci.buildbucket.use_bbagent": 100,
-    "luci.recipes.use_python3": 100,
     # Launch 100% of Swarming tasks in "realms-aware mode", crbug.com/1170330.
     "luci.use_realms": 100,
+    "luci.buildbucket.use_bbagent": 100,
+    "luci.recipes.use_python3": 100,
 })
-luci.builder.defaults.properties.set({
-    "$recipe_engine/isolated": {
-        "server": "https://isolateserver.appspot.com",
-    },
-    "$recipe_engine/swarming": {
-        "server": "https://chromium-swarm.appspot.com",
-    },
-})
 
-exec("//project.star")
-exec("//cq.star")
+DART_GIT = "https://dart.googlesource.com/sdk"
+DART_GERRIT = "https://dart-review.googlesource.com/"
+
+GOMA_RBE = {
+    "server_host": "goma.chromium.org",
+    "use_luci_auth": True,
+}
+
+RELEASE_CHANNELS = ["beta", "dev", "stable"]
+CHANNELS = RELEASE_CHANNELS + ["try"]
+BRANCHES = ["main"] + RELEASE_CHANNELS
+
+TEST_PY_PATHS = "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+
+STANDARD_PATHS = [
+    "DEPS",  # DEPS catches most third_party changes.
+    # build files
+    "build/.+",
+    "BUILD.gn",
+    "sdk_args.gni",
+    # core libraries
+    ".dart_tool/package_config.json",
+    "sdk/.+",
+    # testing
+    TEST_PY_PATHS,
+    "tools/bots/test_matrix.json",
+    # tests
+    "tests/.+",
+]
+
+CFE_PATHS_ONLY = [
+    "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+",
+]
+
+CFE_PATHS = STANDARD_PATHS + CFE_PATHS_ONLY
+
+VM_PATHS = CFE_PATHS + [
+    # VM sources
+    "pkg/vm/.+",
+    "runtime/.+",
+]
+
+DART2JS_PATHS = CFE_PATHS + [
+    # compiler sources
+    "pkg/(compiler|dart2js_tools|js_ast)/.+",
+    "utils/compiler/.+",
+    # testing
+    "pkg/(js|modular_test|sourcemap_testing)/.+",
+]
+
+DDC_PATHS = CFE_PATHS + [
+    # compiler sources
+    "pkg/(build_integration|dev_compiler|meta)/.+",
+    "utils/dartdevc/.+",
+    # testing
+    "pkg/(js|modular_test|sourcemap_testing)/.+",
+]
+
+ANALYZER_NNBD_PATHS = STANDARD_PATHS + [
+    # analyzer sources
+    "pkg/(analyzer|analyzer_cli|_fe_analyzer_shared)/.+",
+]
+
+ANALYZER_PATHS = STANDARD_PATHS + [
+    # "analyzer" bots analyze everything under pkg
+    "pkg/.+",
+]
+
+# Priorities used by the swarming scheduler. The higher the number, the lower
+# the priority.
+LOW = 70  # Used for "FYI" post-submit builds.
+NORMAL = 50  # Used for post-submit builds.
+HIGH = 30  # Used for try-jobs.
+HIGHEST = 25  # Used for shards in the recipes, included here for completeness.
+
+NO_ANDROID = {"custom_vars": {"download_android_deps": False}}
+CHROME = {"custom_vars": {"download_chrome": True}}
+FIREFOX = {"custom_vars": {"download_firefox": True}}
+JS_ENGINES = {"custom_vars": {"checkout_javascript_engines": True}}
+SLOW_SHARDS = {"shard_timeout": (90 * time.minute) // time.second}
+PINNED_XCODE = {"$depot_tools/osx_sdk": {"sdk_version": "12d4e"}}
+
+def to_location_regexp(paths):
+    return [".+/[+]/%s" % path for path in paths]
+
+def mac(cpu = None):
+    dimensions = {"os": "Mac"}
+    if cpu:
+        dimensions["cpu"] = cpu
+    return dimensions
+
+def windows():
+    return {"os": "Windows"}
+
+def linux():
+    return {"os": "Linux"}
+
+def union(x, *args):
+    """ Creates a new dict with the values from all passed dictionaries
+
+    If dicts contain the same keys, their values are assumed to be dicts
+    and merged. Values in dicts later in *args sub-dicts will overwrite
+    values in earlier sub-dicts.
+
+    Args:
+        x (dict): A dict.
+        *args: dicts to merge with x.
+
+    Returns:
+        dict: The merged dict.
+    """
+    z = {}
+    z.update(x)
+    for y in args:
+        for k in y.keys():
+            v = z.get(k)
+            if v:
+                v = dict(v, **y[k])
+                z[k] = v
+            else:
+                z[k] = y[k]
+    return z
+
+# https://chrome-infra-auth.appspot.com/auth/groups/project-dart-ci-task-accounts
+CI_ACCOUNTS_GROUP = "project-dart-ci-task-accounts"
+
+# https://chrome-infra-auth.appspot.com/auth/groups/project-dart-try-task-accounts
+TRY_ACCOUNTS_GROUP = "project-dart-try-task-accounts"
+
+CI_ACCOUNT = "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+TRY_ACCOUNT = "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+ROLL_TRIGGERERS = {
+    "users": [
+        CI_ACCOUNT,
+    ],
+    "groups": ["project-dart-roller-owners"],
+}
+CI_SANDBOX_TRIGGERERS = [CI_ACCOUNT, TRY_ACCOUNT]
+
+lucicfg.config(
+    config_dir = ".",
+    tracked_files = [
+        "commit-queue.cfg",
+        "cr-buildbucket.cfg",
+        "luci-logdog.cfg",
+        "luci-milo.cfg",
+        "luci-notify.cfg",
+        "luci-scheduler.cfg",
+        "project.cfg",
+        "realms.cfg",
+    ],
+    lint_checks = ["default"],
+)
+
+luci.project(
+    name = "dart",
+    buildbucket = "cr-buildbucket.appspot.com",
+    logdog = "luci-logdog.appspot.com",
+    milo = "luci-milo.appspot.com",
+    notify = "luci-notify.appspot.com",
+    scheduler = "luci-scheduler.appspot.com",
+    swarming = "chromium-swarm.appspot.com",
+    acls = [
+        acl.entry(
+            [
+                acl.BUILDBUCKET_READER,
+                acl.LOGDOG_READER,
+                acl.PROJECT_CONFIGS_READER,
+                acl.SCHEDULER_READER,
+            ],
+            groups = ["all"],
+        ),
+        acl.entry(acl.LOGDOG_WRITER, groups = ["luci-logdog-chromium-writers"]),
+        acl.entry(
+            [acl.SCHEDULER_OWNER, acl.BUILDBUCKET_TRIGGERER],
+            groups = ["project-dart-admins"],
+        ),
+        acl.entry(acl.CQ_COMMITTER, groups = ["project-dart-committers"]),
+        acl.entry(acl.CQ_DRY_RUNNER, groups = ["project-dart-tryjob-access"]),
+    ],
+    bindings = [
+        luci.binding(
+            roles = "role/configs.validator",
+            users = TRY_ACCOUNT,
+        ),
+        luci.binding(
+            roles = "role/swarming.poolOwner",
+            groups = "project-dart-admins",
+        ),
+        luci.binding(
+            roles = "role/swarming.poolViewer",
+            groups = "project-dart-committers",
+        ),
+    ],
+)
+
+# Swarming permissions in realms.cfg.
+
+luci.realm(name = "pools/ci")
+luci.realm(name = "pools/try")
+luci.realm(
+    name = "pools/tests",
+    bindings = [
+        luci.binding(
+            roles = "role/swarming.poolUser",
+            groups = [CI_ACCOUNTS_GROUP, TRY_ACCOUNTS_GROUP],
+        ),
+    ],
+)
+
+def led_users(*, pool_realms, builder_realm, groups):
+    for realm in pool_realms:
+        luci.binding(
+            realm = realm,
+            roles = "role/swarming.poolUser",
+            groups = groups,
+        )
+    luci.binding(
+        realm = builder_realm,
+        roles = "role/swarming.taskTriggerer",
+        groups = groups,
+    )
+
+# Allow admins to use LED and "Debug" button on every Dart builder and bot.
+led_users(
+    pool_realms = ["@root"],
+    builder_realm = "@root",
+    groups = ["project-dart-admins"],
+)
+
+# Allow mdb/dart-build-access to use LED and "Debug" button on try builders and
+# try and test bots.
+led_users(
+    pool_realms = ["pools/try", "pools/tests"],
+    builder_realm = "try",
+    groups = ["mdb/dart-build-access"],
+)
+
+luci.milo(
+    logo = "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png",
+)
 
 luci.console_view(
     name = "be",
@@ -97,7 +312,7 @@ luci.list_view(
 
 luci.console_view(
     name = "flutter",
-    repo = dart.git,
+    repo = DART_GIT,
     title = "Dart/Flutter Console",
     refs = ["refs/heads/main"],
 )
@@ -116,16 +331,50 @@ luci.list_view(
 
 luci.console_view(
     name = "fyi",
-    repo = dart.git,
+    repo = DART_GIT,
     title = "SDK FYI Console",
     refs = ["refs/heads/main"],
 )
 
+luci.list_view(
+    name = "cq",
+    title = "SDK CQ Console",
+)
+
 luci.list_view(
     name = "infra",
     title = "Infra Console",
 )
 
+luci.logdog(gs_bucket = "chromium-luci-logdog")
+
+luci.bucket(
+    name = "ci",
+    acls = [
+        acl.entry(acl.BUILDBUCKET_TRIGGERER, users = [CI_ACCOUNT]),
+    ],
+)
+luci.bucket(
+    name = "ci.roll",
+    acls = [
+        acl.entry(acl.BUILDBUCKET_TRIGGERER, **ROLL_TRIGGERERS),
+    ],
+)
+luci.bucket(
+    name = "ci.sandbox",
+    acls = [
+        acl.entry(acl.BUILDBUCKET_TRIGGERER, users = CI_SANDBOX_TRIGGERERS),
+    ],
+)
+TRY_ACLS = [
+    acl.entry(
+        acl.BUILDBUCKET_TRIGGERER,
+        groups = ["project-dart-tryjob-access", "service-account-cq"],
+    ),
+]
+luci.bucket(name = "try", acls = TRY_ACLS)  # Tryjobs specific to the Dart SDK repo.
+luci.bucket(name = "try.shared", acls = TRY_ACLS)  # Tryjobs for all repos.
+
 luci.gitiles_poller(
     name = "dart-gitiles-trigger-flutter",
     bucket = "ci",
@@ -137,10 +386,23 @@ luci.gitiles_poller(
     name = "dart-ci-test-data-trigger",
     bucket = "ci",
     path_regexps = ["tools/bots/ci_test_data_trigger"],
-    repo = dart.git,
+    repo = DART_GIT,
     refs = ["refs/heads/ci-test-data"],
 )
 
+def dart_poller(name, bucket = "ci", branches = BRANCHES, paths = None):
+    for branch in branches:
+        luci.gitiles_poller(
+            name = "%s-%s" % (name, branch),
+            bucket = bucket,
+            path_regexps = paths,
+            repo = DART_GIT,
+            refs = ["refs/heads/%s" % branch],
+        )
+
+dart_poller("dart-gitiles-trigger", branches = BRANCHES)
+dart_poller("dart-vm-gitiles-trigger", branches = ["main"], paths = VM_PATHS)
+
 luci.gitiles_poller(
     name = "dart-flutter-engine-trigger",
     bucket = "ci",
@@ -154,13 +416,19 @@ luci.gitiles_poller(
     repo = "https://dart.googlesource.com/external/github.com/flutter/flutter",
     refs = ["refs/heads/master"],
 )
-
-dart.poller("dart-gitiles-trigger", branches = dart.branches)
-
-luci.notifier(
-    name = "dart",
-    on_new_failure = True,
-    notify_blamelist = True,
+luci.gitiles_poller(
+    name = "dart-nightly-trigger",
+    bucket = "ci",
+    repo = DART_GIT,
+    refs = ["refs/heads/main"],
+    schedule = "0 5 * * *",  # daily, at 05:00 UTC
+)
+luci.gitiles_poller(
+    name = "dart-weekly-trigger",
+    bucket = "ci",
+    repo = DART_GIT,
+    refs = ["refs/heads/main"],
+    schedule = "0 0 * * SUN",  # weekly, midnight Saturday to Sunday
 )
 
 luci.notifier(
@@ -170,9 +438,29 @@ luci.notifier(
         "athom@google.com",
         "sortie@google.com",
         "whesse@google.com",
+        "karlklose@google.com",
     ],
 )
 
+luci.notifier(
+    name = "dart",
+    on_new_failure = True,
+    notify_emails = ["athom@google.com"],
+    notify_blamelist = True,
+)
+
+luci.notifier(
+    name = "dart-vm-team",
+    on_new_failure = True,
+    notify_emails = ["dart-vm-team-breakages@google.com"],
+)
+
+luci.notifier(
+    name = "nightly",
+    on_new_failure = True,
+    notify_emails = ["karlklose@google.com", "athom@google.com"],
+)
+
 luci.notifier(
     name = "dart-fuzz-testing",
     on_success = False,
@@ -190,51 +478,450 @@ luci.notifier(
     name = "ci-test-data",
     on_success = True,
     on_failure = True,
+    notify_emails = ["karlklose@google.com"],
+)
+
+luci.cq(
+    submit_max_burst = 2,
+    submit_burst_delay = 8 * time.minute,
+    status_host = "chromium-cq-status.appspot.com",
+)
+
+def default_verifiers():
+    return [
+        luci.cq_tryjob_verifier(
+            builder = "presubmit-try",
+            disable_reuse = True,
+        ),
+    ]
+
+luci.cq_group(
+    name = "sdk",
+    watch = cq.refset(
+        DART_GERRIT + "sdk",
+        refs = ["refs/heads/%s" % branch for branch in BRANCHES],
+    ),
+    allow_submit_with_open_deps = True,
+    tree_status_host = "dart-status.appspot.com",
+    retry_config = cq.RETRY_NONE,
+    verifiers = None,
+)
+
+luci.cq_group(
+    name = "sdk-infra-config",
+    watch = cq.refset(DART_GERRIT + "sdk", refs = ["refs/heads/infra/config"]),
+    allow_submit_with_open_deps = True,
+    tree_status_host = "dart-status.appspot.com",
+    retry_config = cq.RETRY_NONE,
+    verifiers = default_verifiers(),
 )
 
+luci.cq_group(
+    name = "recipes",
+    watch = cq.refset(DART_GERRIT + "recipes", refs = ["refs/heads/main"]),
+    allow_submit_with_open_deps = True,
+    tree_status_host = "dart-status.appspot.com",
+    retry_config = cq.RETRY_NONE,
+    verifiers = default_verifiers(),
+)
+
+luci.cq_group(
+    name = "dart_ci",
+    watch = cq.refset(DART_GERRIT + "dart_ci", refs = ["refs/heads/main"]),
+    allow_submit_with_open_deps = True,
+    tree_status_host = "dart-status.appspot.com",
+    retry_config = cq.RETRY_NONE,
+    verifiers = None,
+)
+
+def dart_recipe(name):
+    return luci.recipe(
+        name = name,
+        cipd_package = "dart/recipe_bundles/dart.googlesource.com/recipes",
+        cipd_version = "refs/heads/main",
+        use_bbagent = True,
+    )
+
+def with_goma(goma, channel, dimensions, properties):
+    """Decorates the properties to setup goma.
+
+       Adds the $build/goma property when goma is used and disables goma via
+       the $dart/build property if not.
+
+    Args:
+        goma: Opt-in (True), opt-out (False) or default (None).
+        channel: The channel of the builder.
+        dimensions: The dimensions of the builder.
+        properties: The properties object to set $build/goma on (if opted-in).
+
+    Returns:
+        A copy of the properties with goma related properties set if applicable.
+    """
+    updated_properties = dict(properties)
+    if goma in (None, True):
+        goma_properties = {}
+        goma_properties.update(GOMA_RBE)
+
+        enable_ats = dimensions["os"] == "Linux"
+
+        goma_properties["enable_ats"] = enable_ats
+        updated_properties.setdefault("$build/goma", goma_properties)
+    else:
+        updated_properties = dict(properties)
+        updated_properties.setdefault("$dart/build", {})
+        updated_properties["$dart/build"].setdefault("disable_goma", True)
+    return updated_properties
+
+def dart_try_builder(
+        name,
+        recipe = "dart/neo",
+        bucket = "try",
+        dimensions = None,
+        execution_timeout = None,
+        experiment_percentage = None,
+        experiments = None,
+        goma = None,
+        location_regexp = None,
+        properties = None,
+        on_cq = False):
+    """Creates a Dart tryjob.
+
+    Args:
+        name: The builder name.
+        recipe: The recipe to use (defaults to "dart/neo").
+        bucket: The bucket to use (defaults to "try").
+        dimensions: Extra swarming dimensions required by this builder.
+        execution_timeout: Time to allow for the build to run.
+        experiment_percentage: What experiment percentage to use.
+        experiments: Experiments to run on this builder, with percentages.
+        goma: Whether to use goma or not.
+        location_regexp: Locations that trigger this tryjob.
+        properties: Extra properties to set for builds.
+        on_cq: Whether the build is added to the default set of CQ tryjobs.
+    """
+    if on_cq and location_regexp:
+        fail("Can't be on the default CQ and conditionally on the CQ")
+    dimensions = defaults.dimensions(dimensions)
+    dimensions["pool"] = "luci.dart.try"
+    properties = defaults.properties(properties)
+    builder_properties = with_goma(goma, "try", dimensions, properties)
+    builder = name + "-try"
+    luci.builder(
+        name = builder,
+        build_numbers = True,
+        bucket = bucket,
+        caches = defaults.caches(dimensions["os"]),
+        dimensions = dimensions,
+        executable = dart_recipe(recipe),
+        execution_timeout = execution_timeout,
+        experiments = experiments,
+        priority = HIGH,
+        properties = builder_properties,
+        service_account = TRY_ACCOUNT,
+        swarming_tags = ["vpython:native-python-wrapper"],
+    )
+    includable_only = (not on_cq and not experiment_percentage and
+                       not location_regexp)
+    luci.cq_tryjob_verifier(
+        builder = builder,
+        cq_group = "sdk",
+        experiment_percentage = experiment_percentage,
+        location_regexp = location_regexp,
+        includable_only = includable_only,
+    )
+    luci.list_view_entry(list_view = "cq", builder = builder)
+
+postponed_alt_console_entries = []
+
+# Global builder defaults
+luci.builder.defaults.properties.set({
+    "$recipe_engine/isolated": {
+        "server": "https://isolateserver.appspot.com",
+    },
+    "$recipe_engine/swarming": {
+        "server": "https://chromium-swarm.appspot.com",
+    },
+})
+
+def dart_builder(
+        name,
+        bucket,
+        recipe = "dart/neo",
+        enabled = True,
+        category = None,
+        channels = [],
+        dimensions = None,
+        executable = None,
+        execution_timeout = None,
+        experimental = None,
+        experiments = None,
+        expiration_timeout = None,
+        goma = None,
+        fyi = False,
+        main_channel = True,
+        notifies = "dart",
+        priority = NORMAL,
+        properties = None,
+        schedule = "triggered",
+        service_account = TRY_ACCOUNT,
+        triggered_by = ["dart-gitiles-trigger-%s"],
+        triggering_policy = None,
+        on_cq = False,
+        experiment_percentage = None,
+        location_regexp = None):
+    """
+    Creates a Dart builder on all the specified channels.
+
+    Args:
+        name: The builder name.
+        bucket: The bucket to use (defaults to "try").
+        recipe: The recipe to use (defaults to "dart/neo").
+        enabled: Whether this builder is currently running or not.
+        category: Where to show the builder on the console.
+        channels: Which other channels the builder should be added to.
+        dimensions: Extra swarming dimensions required by this builder.
+        executable: The Luci executable to use.
+        execution_timeout: Time to allow for the build to run.
+        experimental: Whether the build is experimental or not.
+        experiments: Experiments to run on this builder, with percentages.
+        expiration_timeout: How long builds should wait for a bot to run on.
+        goma: Whether to use goma or not.
+        fyi: Whether this is an FYI builder or not.
+        main_channel: Whether to add to the main channel (default: True).
+        notifies: Which luci notifier group to notify (default: "dart").
+        priority: What swarming priority this builder gets (default: NORMAL).
+        properties: Extra properties to set for builds.
+        schedule: What schedule to use (default: "triggered").
+        service_account: The task service account to use (default: TRY_ACCOUNT).
+        triggered_by: What triggers this builder (defaults to standard trigger).
+        triggering_policy: The triggering policy used by this builder.
+        on_cq: Whether the build is added to the default set of CQ tryjobs.
+        experiment_percentage: What experiment percentage to use.
+        location_regexp: Locations that trigger this builder.
+    """
+    dimensions = defaults.dimensions(dimensions)
+    properties = defaults.properties(properties)
+
+    os = dimensions["os"]
+    if "win" in name and os != "Windows":
+        fail("builder %s should be a Windows builder" % name)
+    if "mac" in name and os != "Mac":
+        fail("builder %s should be a macOS builder" % name)
+    if "linux" in name and os != "Linux":
+        fail("builder %s should be a Linux builder" % name)
+
+    def builder(channel, notifies, triggered_by):
+        if channel == "try":
+            dart_try_builder(
+                name,
+                recipe = recipe,
+                dimensions = dimensions,
+                properties = properties,
+                on_cq = on_cq,
+                execution_timeout = execution_timeout,
+                experiment_percentage = experiment_percentage,
+                experiments = experiments,
+                goma = goma,
+                location_regexp = location_regexp,
+            )
+        else:
+            builder_properties = with_goma(
+                goma if service_account == TRY_ACCOUNT else False,
+                channel,
+                dimensions,
+                properties,
+            )
+            builder = name + "-" + channel if channel else name
+            branch = channel if channel else "main"
+            if schedule == "triggered" and triggered_by:
+                triggered_by = [
+                    trigger.replace("%s", branch)
+                    for trigger in triggered_by
+                ]
+                if channel in RELEASE_CHANNELS:
+                    # Always run vm builders on release channels.
+                    triggered_by = [
+                        trigger.replace("dart-vm-", "dart-")
+                        for trigger in triggered_by
+                    ]
+
+            notifies = [notifies] if type(notifies) == type("") else notifies
+            luci.builder(
+                name = builder,
+                build_numbers = True,
+                bucket = bucket,
+                caches = defaults.caches(dimensions["os"]),
+                dimensions = dimensions,
+                executable = executable or dart_recipe(recipe),
+                execution_timeout = execution_timeout,
+                experimental = experimental,
+                experiments = experiments,
+                expiration_timeout = expiration_timeout,
+                priority = priority,
+                properties = builder_properties,
+                notifies = notifies if enabled else None,
+                schedule = schedule if enabled else None,
+                service_account = service_account,
+                swarming_tags = ["vpython:native-python-wrapper"],
+                triggered_by = triggered_by if enabled else None,
+                triggering_policy = triggering_policy,
+            )
+            if category:
+                console_category, _, short_name = category.rpartition("|")
+                toplevel_category, _, _ = console_category.partition("|")
+                console = channel or "be" if not fyi else "fyi"
+                luci.console_view_entry(
+                    builder = builder,
+                    short_name = short_name,
+                    category = console_category,
+                    console_view = console,
+                )
+                if console == "be":
+                    if toplevel_category == "vm":
+                        postponed_alt_console_entries.append({
+                            "builder": builder,
+                            "short_name": short_name,
+                            "category": console_category,
+                        })
+                    else:
+                        luci.console_view_entry(
+                            builder = builder,
+                            short_name = short_name,
+                            category = console_category,
+                            console_view = "alt",
+                        )
+
+    if main_channel:
+        builder(None, notifies = notifies, triggered_by = triggered_by)
+    for channel in channels:
+        if enabled:
+            builder(channel, notifies = None, triggered_by = triggered_by)
+
+def dart_ci_builder(name, bucket = "ci", dimensions = {}, **kwargs):
+    dimensions.setdefault("pool", "luci.dart.ci")
+    dart_builder(
+        name,
+        bucket = bucket,
+        dimensions = dimensions,
+        service_account = CI_ACCOUNT,
+        **kwargs
+    )
+
+def dart_ci_sandbox_builder(name, channels = CHANNELS, **kwargs):
+    dart_builder(
+        name,
+        bucket = "ci.sandbox",
+        channels = channels,
+        service_account = TRY_ACCOUNT,
+        **kwargs
+    )
+
+def dart_infra_builder(name, notifies = "infra", triggered_by = None, **kwargs):
+    dart_ci_builder(
+        name,
+        notifies = notifies,
+        triggered_by = triggered_by,
+        **kwargs
+    )
+    luci.list_view_entry(list_view = "infra", builder = name)
+
+def dart_vm_extra_builder(name, on_cq = False, location_regexp = None, **kwargs):
+    """
+    Creates a Dart builder that is only triggered by VM commits.
+
+    Args:
+        name: The builder name.
+        on_cq: Whether the build is added to the default set of CQ tryjobs.
+        location_regexp: Locations that trigger this builder.
+        **kwargs: Extra arguments are passed on to dart_ci_sandbox_builder.
+    """
+    triggered_by = ["dart-vm-gitiles-trigger-%s"]
+    if on_cq and not location_regexp:
+        location_regexp = to_location_regexp(VM_PATHS)
+        on_cq = False
+    dart_ci_sandbox_builder(
+        name,
+        triggered_by = triggered_by,
+        on_cq = on_cq,
+        location_regexp = location_regexp,
+        **kwargs
+    )
+
+def dart_vm_low_priority_builder(name, **kwargs):
+    dart_vm_extra_builder(
+        name,
+        channels = ["try"],
+        priority = LOW,
+        expiration_timeout = time.day,
+        **kwargs
+    )
+
+def dart_vm_nightly_builder(name, **kwargs):
+    nightly_builder(name, notifies = "dart-vm-team", **kwargs)
+
+def nightly_builder(name, notifies = "nightly", **kwargs):
+    dart_ci_sandbox_builder(
+        name,
+        notifies = notifies,
+        on_cq = False,
+        priority = LOW,
+        triggered_by = ["dart-nightly-trigger"],
+        **kwargs
+    )
+
+def weekly_ci_sandbox_builder(name, notifies = None, **kwargs):
+    dart_ci_sandbox_builder(
+        name,
+        notifies = notifies,
+        on_cq = False,
+        priority = LOW,
+        triggered_by = ["dart-weekly-trigger"],
+        **kwargs
+    )
+
 # cfe
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "front-end-linux-release-x64",
     category = "cfe|l",
     on_cq = True,
 )
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "front-end-mac-release-x64",
     category = "cfe|m",
-    dimensions = mac,
-    properties = pinned_xcode,
+    dimensions = mac(),
+    properties = PINNED_XCODE,
 )
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "front-end-win-release-x64",
     category = "cfe|w",
-    dimensions = windows,
+    dimensions = windows(),
 )
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "front-end-nnbd-linux-release-x64",
     category = "cfe|nnbd|l",
-    location_regexp = paths.to_location_regexp(paths.cfe),
+    location_regexp = to_location_regexp(CFE_PATHS),
 )
-cron.nightly_builder(
+nightly_builder(
     "front-end-nnbd-mac-release-x64",
     category = "cfe|nnbd|m",
     channels = ["try"],
-    dimensions = mac,
-    properties = pinned_xcode,
+    dimensions = mac(),
+    properties = PINNED_XCODE,
 )
-cron.nightly_builder(
+nightly_builder(
     "front-end-nnbd-win-release-x64",
     category = "cfe|nnbd|w",
     channels = ["try"],
-    dimensions = windows,
+    dimensions = windows(),
 )
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "flutter-frontend",
     category = "cfe|fl",
     channels = ["try"],
     notifies = "frontend-team",
-    location_regexp = paths.to_location_regexp(paths.cfe_only),
+    location_regexp = to_location_regexp(CFE_PATHS_ONLY),
 )
-cron.weekly_builder(
+weekly_ci_sandbox_builder(
     "frontend-weekly",
     notifies = "frontend-team",
     channels = [],
@@ -242,14 +929,14 @@ cron.weekly_builder(
 )
 
 # flutter
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "flutter-engine-linux",
     recipe = "dart/flutter_engine",
     category = "flutter|3H",
     channels = ["try"],
     execution_timeout = 8 * time.hour,
     triggered_by = ["dart-gitiles-trigger-flutter"],
-    properties = [{
+    properties = {
         "bisection_enabled": True,
         "flutter_test_suites": [
             "add_to_app_life_cycle_tests",
@@ -258,10 +945,10 @@ dart.ci_sandbox_builder(
             "framework_tests",
             "tool_tests",
         ],
-    }],
+    },
 )
 
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "flutter-engine-linux-web_tests",
     recipe = "dart/flutter_engine",
     category = "flutter|web",
@@ -277,176 +964,618 @@ dart.ci_sandbox_builder(
     },
 )
 
-vm = exec("//vm.star")
+# vm|nnbd|jit
+dart_vm_extra_builder(
+    "vm-kernel-nnbd-linux-debug-x64",
+    category = "vm|nnbd|jit|d",
+    on_cq = True,
+)
+dart_vm_extra_builder(
+    "vm-kernel-nnbd-linux-release-x64",
+    category = "vm|nnbd|jit|r",
+    on_cq = True,
+)
+dart_vm_nightly_builder(
+    "vm-kernel-nnbd-linux-debug-ia32",
+    category = "vm|nnbd|jit|d3",
+    channels = ["try"],
+    properties = SLOW_SHARDS,
+)
+dart_vm_nightly_builder(
+    "vm-kernel-nnbd-linux-release-ia32",
+    category = "vm|nnbd|jit|r3",
+    channels = ["try"],
+)
+dart_vm_nightly_builder(
+    "vm-kernel-nnbd-linux-release-simarm",
+    category = "vm|nnbd|jit|ra",
+    channels = ["try"],
+)
+dart_vm_nightly_builder(
+    "vm-kernel-nnbd-linux-release-simarm64",
+    category = "vm|nnbd|jit|ra6",
+    channels = ["try"],
+)
+dart_vm_nightly_builder(
+    "vm-kernel-nnbd-mac-debug-arm64",
+    category = "vm|nnbd|jit|m1d",
+    channels = ["try"],
+    dimensions = mac(cpu = "arm64"),
+    properties = union(NO_ANDROID, PINNED_XCODE, SLOW_SHARDS),
+)
+dart_vm_nightly_builder(
+    "vm-kernel-nnbd-mac-debug-x64",
+    category = "vm|nnbd|jit|md",
+    channels = ["try"],
+    dimensions = mac(),
+    properties = union(PINNED_XCODE, SLOW_SHARDS),
+)
+dart_vm_extra_builder(
+    "vm-kernel-nnbd-mac-release-arm64",
+    category = "vm|nnbd|jit|m1r",
+    channels = ["try"],
+    dimensions = mac(cpu = "arm64"),
+    properties = union(NO_ANDROID, PINNED_XCODE),
+)
+dart_vm_nightly_builder(
+    "vm-kernel-nnbd-mac-release-x64",
+    category = "vm|nnbd|jit|mr",
+    channels = ["try"],
+    dimensions = mac(),
+    properties = PINNED_XCODE,
+)
+dart_vm_nightly_builder(
+    "vm-kernel-nnbd-win-release-ia32",
+    category = "vm|nnbd|jit|wr3",
+    channels = ["try"],
+    dimensions = windows(),
+)
+dart_vm_nightly_builder(
+    "vm-kernel-nnbd-win-debug-x64",
+    category = "vm|nnbd|jit|wd",
+    channels = ["try"],
+    properties = SLOW_SHARDS,
+    dimensions = windows(),
+)
+dart_vm_nightly_builder(
+    "vm-kernel-nnbd-win-release-x64",
+    category = "vm|nnbd|jit|wr",
+    channels = ["try"],
+    dimensions = windows(),
+)
+
+# vm|nnbd|aot
+dart_vm_extra_builder(
+    "vm-kernel-precomp-nnbd-linux-release-x64",
+    category = "vm|nnbd|aot|r",
+)
+nightly_builder(
+    "vm-kernel-precomp-nnbd-linux-debug-simarm_x64",
+    category = "vm|nnbd|aot|da",
+    channels = ["try"],
+)
+nightly_builder(
+    "vm-kernel-precomp-nnbd-linux-release-simarm_x64",
+    category = "vm|nnbd|aot|ra",
+    channels = ["try"],
+)
+nightly_builder(
+    "vm-kernel-precomp-nnbd-linux-debug-x64",
+    category = "vm|nnbd|aot|d",
+    channels = ["try"],
+    properties = SLOW_SHARDS,
+)
+nightly_builder(
+    "vm-kernel-precomp-nnbd-linux-release-simarm64",
+    category = "vm|nnbd|aot|ra6",
+    channels = ["try"],
+)
+dart_vm_extra_builder(
+    "vm-kernel-precomp-nnbd-mac-release-arm64",
+    category = "vm|nnbd|aot|m1",
+    channels = ["try"],
+    dimensions = mac(cpu = "arm64"),
+    properties = union(NO_ANDROID, PINNED_XCODE, SLOW_SHARDS),
+)
+nightly_builder(
+    "vm-kernel-precomp-nnbd-mac-release-simarm64",
+    category = "vm|nnbd|aot|ma6",
+    channels = ["try"],
+    dimensions = mac(),
+    properties = union(PINNED_XCODE, SLOW_SHARDS),
+)
+nightly_builder(
+    "vm-kernel-precomp-nnbd-win-release-x64",
+    category = "vm|nnbd|aot|wr",
+    channels = ["try"],
+    dimensions = windows(),
+)
+
+# vm|app-kernel
+dart_vm_extra_builder(
+    "app-kernel-linux-debug-x64",
+    category = "vm|app-kernel|d64",
+    properties = SLOW_SHARDS,
+)
+dart_vm_nightly_builder(
+    "app-kernel-linux-product-x64",
+    category = "vm|app-kernel|p64",
+    channels = ["try"],
+)
+dart_vm_extra_builder(
+    "app-kernel-linux-release-x64",
+    category = "vm|app-kernel|r64",
+)
+
+#vm|kernel
+dart_vm_extra_builder(
+    "vm-canary-linux-debug",
+    category = "vm|kernel|c",
+    on_cq = True,
+)
+dart_ci_sandbox_builder("vm-kernel-linux-debug-x64", category = "vm|kernel|d")
+dart_vm_extra_builder(
+    "vm-kernel-linux-release-simarm",
+    category = "vm|kernel|a32",
+)
+dart_vm_extra_builder(
+    "vm-kernel-linux-release-simarm64",
+    category = "vm|kernel|a64",
+)
+dart_vm_nightly_builder(
+    "vm-kernel-linux-release-ia32",
+    category = "vm|kernel|r32",
+    channels = ["try"],
+)
+dart_ci_sandbox_builder(
+    "vm-kernel-linux-release-x64",
+    category = "vm|kernel|r",
+    on_cq = True,
+)
+dart_vm_extra_builder(
+    "vm-kernel-checked-linux-release-x64",
+    category = "vm|kernel|rc",
+    experiments = {"dart.use_update_script": 100},
+)
+dart_vm_nightly_builder(
+    "vm-kernel-linux-debug-ia32",
+    category = "vm|kernel|d32",
+    channels = ["try"],
+)
+dart_ci_sandbox_builder(
+    "vm-kernel-mac-debug-x64",
+    category = "vm|kernel|md",
+    dimensions = mac(),
+    properties = PINNED_XCODE,
+)
+dart_ci_sandbox_builder(
+    "vm-kernel-mac-release-x64",
+    category = "vm|kernel|mr",
+    dimensions = mac(),
+    on_cq = True,
+    experiment_percentage = 5,
+    properties = PINNED_XCODE,
+)
+dart_ci_sandbox_builder(
+    "vm-kernel-mac-release-arm64",
+    category = "vm|kernel|m1r",
+    channels = ["try", "dev"],
+    dimensions = mac(cpu = "arm64"),
+    properties = union(NO_ANDROID, PINNED_XCODE),
+)
+dart_vm_nightly_builder(
+    "vm-kernel-win-debug-ia32",
+    category = "vm|kernel|wd3",
+    channels = ["try"],
+    dimensions = windows(),
+)
+dart_ci_sandbox_builder(
+    "vm-kernel-win-debug-x64",
+    category = "vm|kernel|wd",
+    dimensions = windows(),
+)
+dart_vm_nightly_builder(
+    "vm-kernel-win-release-ia32",
+    category = "vm|kernel|wr3",
+    channels = ["try"],
+    dimensions = windows(),
+)
+dart_ci_sandbox_builder(
+    "vm-kernel-win-release-x64",
+    category = "vm|kernel|wr",
+    dimensions = windows(),
+)
+dart_vm_extra_builder(
+    "cross-vm-linux-release-arm64",
+    category = "vm|kernel|cra",
+    channels = [],
+    properties = {"shard_timeout": (120 * time.minute) // time.second},
+)
+
+# vm|kernel-precomp
+dart_vm_extra_builder(
+    "vm-kernel-precomp-linux-debug-x64",
+    category = "vm|kernel-precomp|d",
+)
+dart_vm_extra_builder(
+    "vm-kernel-precomp-linux-product-x64",
+    category = "vm|kernel-precomp|p",
+)
+dart_vm_extra_builder(
+    "vm-kernel-precomp-linux-release-simarm",
+    category = "vm|kernel-precomp|a32",
+)
+dart_vm_extra_builder(
+    "vm-kernel-precomp-linux-release-simarm64",
+    category = "vm|kernel-precomp|a64",
+)
+dart_vm_extra_builder(
+    "vm-kernel-precomp-linux-release-x64",
+    category = "vm|kernel-precomp|r",
+)
+dart_vm_extra_builder(
+    "vm-kernel-precomp-obfuscate-linux-release-x64",
+    category = "vm|kernel-precomp|o",
+)
+dart_vm_extra_builder(
+    "vm-kernel-precomp-linux-debug-simarm_x64",
+    category = "vm|kernel-precomp|adx",
+    properties = SLOW_SHARDS,
+)
+dart_vm_extra_builder(
+    "vm-kernel-precomp-linux-release-simarm_x64",
+    category = "vm|kernel-precomp|arx",
+)
+dart_vm_extra_builder(
+    "vm-kernel-precomp-mac-release-simarm64",
+    category = "vm|kernel-precomp|ma",
+    dimensions = mac(),
+    properties = PINNED_XCODE,
+)
+dart_vm_extra_builder(
+    "vm-kernel-precomp-win-release-x64",
+    category = "vm|kernel-precomp|wr",
+    dimensions = windows(),
+)
+dart_vm_nightly_builder(
+    "cross-vm-precomp-linux-release-arm64",
+    category = "vm|kernel-precomp|cra",
+    channels = [],
+    properties = SLOW_SHARDS,
+)
+dart_vm_nightly_builder(
+    "vm-kernel-precomp-dwarf-linux-product-x64",
+    category = "vm|kernel-precomp|dw",
+    channels = ["try"],
+)
+
+# vm|kernel-precomp|android
+dart_vm_extra_builder(
+    "vm-kernel-precomp-android-release-arm_x64",
+    category = "vm|kernel-precomp|android|a32",
+    properties = SLOW_SHARDS,
+)
+dart_vm_extra_builder(
+    "vm-kernel-precomp-android-release-arm64c",
+    category = "vm|kernel-precomp|android|a64",
+    properties = SLOW_SHARDS,
+)
+
+# vm|product
+dart_vm_nightly_builder(
+    "vm-kernel-linux-product-x64",
+    category = "vm|product|l",
+    channels = ["try"],
+)
+dart_vm_nightly_builder(
+    "vm-kernel-mac-product-x64",
+    category = "vm|product|m",
+    channels = ["try"],
+    dimensions = mac(),
+    properties = PINNED_XCODE,
+)
+dart_vm_nightly_builder(
+    "vm-kernel-win-product-x64",
+    category = "vm|product|w",
+    channels = ["try"],
+    dimensions = windows(),
+)
+
+# vm|misc
+dart_vm_nightly_builder(
+    "vm-kernel-optcounter-threshold-linux-release-ia32",
+    category = "vm|misc|o32",
+    channels = ["try"],
+)
+dart_vm_low_priority_builder(
+    "vm-kernel-optcounter-threshold-linux-release-x64",
+    category = "vm|misc|o64",
+)
+
+def dart_vm_sanitizer_builder(name, **kwargs):
+    nightly_builder(
+        name,
+        channels = ["try"],
+        properties = {"bisection_enabled": True},
+        **kwargs
+    )
+
+dart_vm_sanitizer_builder(
+    "vm-kernel-asan-linux-release-x64",
+    category = "vm|misc|a",
+)
+dart_vm_sanitizer_builder(
+    "vm-kernel-msan-linux-release-x64",
+    category = "vm|misc|m",
+)
+dart_vm_sanitizer_builder(
+    "vm-kernel-tsan-linux-release-x64",
+    category = "vm|misc|t",
+)
+dart_vm_sanitizer_builder(
+    "vm-kernel-ubsan-linux-release-x64",
+    category = "vm|misc|u",
+    goma = False,
+)  # ubsan is not compatible with our sysroot.
+dart_vm_sanitizer_builder(
+    "vm-kernel-precomp-asan-linux-release-x64",
+    category = "vm|misc|aot|a",
+)
+dart_vm_sanitizer_builder(
+    "vm-kernel-precomp-msan-linux-release-x64",
+    category = "vm|misc|aot|m",
+)
+dart_vm_sanitizer_builder(
+    "vm-kernel-precomp-tsan-linux-release-x64",
+    category = "vm|misc|aot|t",
+)
+dart_vm_sanitizer_builder(
+    "vm-kernel-precomp-ubsan-linux-release-x64",
+    category = "vm|misc|aot|u",
+    goma = False,
+)  # ubsan is not compatible with our sysroot.
+dart_vm_nightly_builder(
+    "vm-kernel-reload-linux-debug-x64",
+    category = "vm|misc|reload|d",
+    channels = ["try"],
+)
+dart_vm_nightly_builder(
+    "vm-kernel-reload-linux-release-x64",
+    category = "vm|misc|reload|r",
+    channels = ["try"],
+)
+dart_vm_nightly_builder(
+    "vm-kernel-reload-rollback-linux-debug-x64",
+    category = "vm|misc|reload|drb",
+    channels = ["try"],
+)
+dart_vm_nightly_builder(
+    "vm-kernel-reload-rollback-linux-release-x64",
+    category = "vm|misc|reload|rrb",
+    channels = ["try"],
+)
+dart_vm_nightly_builder(
+    "vm-kernel-linux-debug-x64c",
+    category = "vm|misc|compressed|jl",
+    channels = ["try"],
+)
+dart_vm_nightly_builder(
+    "vm-kernel-precomp-linux-debug-x64c",
+    category = "vm|misc|compressed|al",
+    channels = ["try"],
+)
+dart_vm_nightly_builder(
+    "vm-kernel-win-debug-x64c",
+    category = "vm|misc|compressed|jw",
+    channels = ["try"],
+    dimensions = windows(),
+)
+dart_vm_nightly_builder(
+    "vm-kernel-precomp-win-debug-x64c",
+    category = "vm|misc|compressed|aw",
+    channels = ["try"],
+    dimensions = windows(),
+)
+dart_vm_low_priority_builder("vm-fuchsia-release-x64", category = "vm|misc|f")
+
+# Our sysroot does not support gcc, we can't use goma on RBE for this builder
+dart_vm_nightly_builder("vm-kernel-gcc-linux", category = "vm|misc|g", goma = False)
+
+dart_vm_nightly_builder(
+    "vm-kernel-linux-debug-simriscv64",
+    category = "vm|misc|rv64",
+    channels = ["try"],
+)
+dart_vm_nightly_builder(
+    "vm-kernel-precomp-linux-debug-simriscv64",
+    category = "vm|misc|rv64",
+    channels = ["try"],
+)
+
+# vm|ffi
+dart_vm_extra_builder("vm-ffi-android-debug-arm", category = "vm|ffi|d32")
+dart_vm_extra_builder("vm-ffi-android-release-arm", category = "vm|ffi|r32")
+dart_vm_extra_builder("vm-ffi-android-product-arm", category = "vm|ffi|p32")
+dart_vm_extra_builder("vm-ffi-android-debug-arm64c", category = "vm|ffi|d64")
+dart_vm_extra_builder("vm-ffi-android-release-arm64c", category = "vm|ffi|r64")
+dart_vm_extra_builder("vm-ffi-android-product-arm64c", category = "vm|ffi|p64")
+dart_vm_extra_builder(
+    "vm-precomp-ffi-qemu-linux-release-arm",
+    category = "vm|ffi|qa",
+)
+dart_vm_extra_builder(
+    "vm-precomp-ffi-qemu-linux-release-riscv64",
+    category = "vm|ffi|qr",
+)
 
 # pkg
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "pkg-linux-release",
     category = "pkg|l",
     on_cq = True,
-    properties = [chrome, pinned_xcode],
+    properties = union(CHROME, PINNED_XCODE),
 )
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "pkg-mac-release",
     category = "pkg|m",
-    dimensions = mac,
-    properties = [chrome, pinned_xcode],
+    dimensions = mac(),
+    properties = union(CHROME, PINNED_XCODE),
 )
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "pkg-mac-release-arm64",
     category = "pkg|m1",
     channels = ["try"],
-    dimensions = [mac, arm64],
-    properties = [chrome, no_android, pinned_xcode],
+    dimensions = mac(cpu = "arm64"),
+    properties = union(CHROME, NO_ANDROID, PINNED_XCODE),
     experiments = {"dart.use_update_script": 100},
 )
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "pkg-win-release",
     category = "pkg|w",
-    dimensions = windows,
-    properties = chrome,
+    dimensions = windows(),
+    properties = CHROME,
     experiments = {"dart.use_update_script": 100},
 )
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "pkg-linux-debug",
     category = "pkg|ld",
     channels = ["try"],
-    properties = chrome,
+    properties = CHROME,
 )
 
 # dart2js
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "dart2js-canary-x64",
     category = "dart2js|c",
-    properties = [chrome, no_android],
+    properties = union(CHROME, NO_ANDROID),
 )
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "dart2js-strong-hostasserts-linux-ia32-d8",
     category = "dart2js|d8|ha",
-    location_regexp = paths.to_location_regexp(paths.dart2js),
-    properties = no_android,
+    location_regexp = to_location_regexp(DART2JS_PATHS),
+    properties = NO_ANDROID,
 )
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "dart2js-minified-strong-linux-x64-d8",
     category = "dart2js|d8|mi",
-    location_regexp = paths.to_location_regexp(paths.dart2js),
-    properties = no_android,
+    location_regexp = to_location_regexp(DART2JS_PATHS),
+    properties = NO_ANDROID,
 )
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "dart2js-unit-linux-x64-release",
     category = "dart2js|d8|u",
-    location_regexp = paths.to_location_regexp(paths.dart2js),
-    properties = no_android,
+    location_regexp = to_location_regexp(DART2JS_PATHS),
+    properties = NO_ANDROID,
 )
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "dart2js-strong-linux-x64-chrome",
     category = "dart2js|chrome|l",
-    location_regexp = paths.to_location_regexp(paths.dart2js),
-    properties = [chrome, no_android],
+    location_regexp = to_location_regexp(DART2JS_PATHS),
+    properties = union(CHROME, NO_ANDROID),
 )
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "dart2js-csp-minified-linux-x64-chrome",
     category = "dart2js|chrome|csp",
-    properties = [chrome, no_android],
+    properties = union(CHROME, NO_ANDROID),
 )
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "dart2js-strong-mac-x64-chrome",
     category = "dart2js|chrome|m",
-    dimensions = mac,
-    properties = [chrome, pinned_xcode, no_android],
+    dimensions = mac(),
+    properties = union(CHROME, PINNED_XCODE, NO_ANDROID),
 )
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "dart2js-strong-win-x64-chrome",
     category = "dart2js|chrome|w",
-    dimensions = windows,
-    properties = [chrome, no_android],
+    dimensions = windows(),
+    properties = union(CHROME, NO_ANDROID),
 )
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "dart2js-nnbd-linux-x64-chrome",
     category = "dart2js|chrome|nn",
-    location_regexp = paths.to_location_regexp(paths.dart2js),
-    properties = [chrome, no_android],
+    location_regexp = to_location_regexp(DART2JS_PATHS),
+    properties = union(CHROME, NO_ANDROID),
 )
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "dart2js-strong-linux-x64-firefox",
     category = "dart2js|firefox|l",
-    properties = [firefox, no_android],
+    properties = union(FIREFOX, NO_ANDROID),
 )
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "dart2js-strong-win-x64-firefox",
     category = "dart2js|firefox|w",
-    dimensions = windows,
+    dimensions = windows(),
     enabled = False,
-    properties = [firefox, no_android],
+    properties = union(FIREFOX, NO_ANDROID),
 )
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "dart2js-strong-mac-x64-safari",
     category = "dart2js|safari|m",
-    dimensions = mac,
-    properties = [pinned_xcode, no_android],
+    dimensions = mac(),
+    properties = union(PINNED_XCODE, NO_ANDROID),
 )
 
 # analyzer
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "flutter-analyze",
     category = "analyzer|fa",
     channels = ["try"],
     execution_timeout = 45 * time.minute,
     notifies = None,
 )
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "analyzer-analysis-server-linux",
     category = "analyzer|as",
-    channels = dart.channels,
-    location_regexp = paths.to_location_regexp(paths.analyzer),
+    channels = CHANNELS,
+    location_regexp = to_location_regexp(ANALYZER_PATHS),
 )
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "analyzer-linux-release",
     category = "analyzer|l",
-    channels = dart.channels,
-    location_regexp = paths.to_location_regexp(paths.analyzer),
+    channels = CHANNELS,
+    location_regexp = to_location_regexp(ANALYZER_PATHS),
 )
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "analyzer-mac-release",
     category = "analyzer|m",
-    channels = dart.channels,
-    dimensions = mac,
-    properties = pinned_xcode,
+    channels = CHANNELS,
+    dimensions = mac(),
+    properties = PINNED_XCODE,
 )
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "analyzer-win-release",
     category = "analyzer|w",
-    channels = dart.channels,
-    dimensions = windows,
+    channels = CHANNELS,
+    dimensions = windows(),
     experiments = {"dart.use_update_script": 100},
 )
 
 # analyzer|nnbd
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "analyzer-nnbd-linux-release",
     category = "analyzer|nnbd|l",
-    location_regexp = paths.to_location_regexp(paths.analyzer_nnbd),
-    channels = dart.channels,
+    location_regexp = to_location_regexp(ANALYZER_NNBD_PATHS),
+    channels = CHANNELS,
 )
-cron.nightly_builder(
+nightly_builder(
     "analyzer-nnbd-mac-release",
     category = "analyzer|nnbd|m",
     channels = ["try"],
-    dimensions = mac,
-    properties = pinned_xcode,
+    dimensions = mac(),
+    properties = PINNED_XCODE,
 )
-cron.nightly_builder(
+nightly_builder(
     "analyzer-nnbd-win-release",
     category = "analyzer|nnbd|w",
     channels = ["try"],
-    dimensions = windows,
+    dimensions = windows(),
 )
 
 # sdk
-dart.ci_builder(
+dart_ci_builder(
     "dart-sdk-linux",
     category = "sdk|l",
-    channels = dart.channels,
+    channels = CHANNELS,
     main_channel = False,
     properties = {
         "$dart/build": {
@@ -454,126 +1583,134 @@ dart.ci_builder(
         },
     },
 )
-dart.ci_builder(
+dart_ci_builder(
     "dart-sdk-mac",
     category = "sdk|m",
-    channels = dart.channels,
-    dimensions = mac,
+    channels = CHANNELS,
+    dimensions = mac(),
     main_channel = False,
-    properties = pinned_xcode,
+    properties = PINNED_XCODE,
 )
-dart.ci_builder(
+dart_ci_builder(
     "dart-sdk-mac-arm64",
     category = "sdk|m1",
-    channels = dart.channels,
-    dimensions = [mac, arm64],
+    channels = CHANNELS,
+    dimensions = mac(cpu = "arm64"),
     main_channel = False,
-    properties = [no_android, pinned_xcode],
+    properties = union(NO_ANDROID, PINNED_XCODE),
 )
 
-dart.ci_builder(
+dart_ci_builder(
     "dart-sdk-win",
     category = "sdk|w",
-    channels = dart.channels,
-    dimensions = windows,
+    channels = CHANNELS,
+    dimensions = windows(),
     main_channel = False,
     on_cq = True,
 )
 
 # ddc
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "ddc-linux-release-chrome",
     category = "ddc|l",
-    location_regexp = paths.to_location_regexp(paths.ddc),
-    properties = chrome,
+    location_regexp = to_location_regexp(DDC_PATHS),
+    properties = CHROME,
 )
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "ddc-nnbd-linux-release-chrome",
     category = "ddc|nn",
     channels = ["try"],
-    location_regexp = paths.to_location_regexp(paths.ddc),
-    properties = chrome,
+    location_regexp = to_location_regexp(DDC_PATHS),
+    properties = CHROME,
 )
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "ddc-mac-release-chrome",
     category = "ddc|m",
-    dimensions = mac,
-    properties = [chrome, pinned_xcode],
+    dimensions = mac(),
+    properties = union(CHROME, PINNED_XCODE),
 )
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "ddc-win-release-chrome",
     category = "ddc|w",
-    dimensions = windows,
-    properties = chrome,
+    dimensions = windows(),
+    properties = CHROME,
 )
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "ddk-linux-release-firefox",
     category = "ddc|fl",
-    properties = firefox,
+    properties = FIREFOX,
 )
 
 # misc
-dart.ci_sandbox_builder("gclient", recipe = "dart/gclient", category = "misc|g")
-dart.ci_builder(
+dart_ci_sandbox_builder("gclient", recipe = "dart/gclient", category = "misc|g")
+dart_ci_builder(
     "debianpackage-linux",
     category = "misc|dp",
-    channels = dart.release_channels,
+    channels = RELEASE_CHANNELS,
     notifies = "infra",
     properties = {
         "clobber": False,
     },
 )
 
+# Isolate stress test builder
+dart_vm_extra_builder(
+    "iso-stress-linux",
+    channels = [],
+    notifies = "dart-vm-team",
+)
+
 # external
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "google",
     recipe = "dart/external",
     category = "flutter|g3",
     channels = [],
     execution_timeout = 5 * time.minute,
     notifies = None,
-    priority = priority.high,
+    priority = HIGH,
     triggered_by = None,
 )
 
 # infra
-dart.infra_builder(
+dart_infra_builder(
     "base",
     execution_timeout = 15 * time.minute,
     recipe = "dart/forward_branch",
     schedule = "with 15m interval",
     notifies = None,
 )
-dart.infra_builder(
+dart_infra_builder(
     "cbuild",
     recipe = "dart/cbuild",
     schedule = "with 15m interval",
     execution_timeout = 10 * time.minute,
 )
-dart.infra_builder("chocolatey", recipe = "dart/chocolatey", dimensions = windows)
-dart.infra_builder("co19-roller", recipe = "dart/package_co19")
-dart.infra_builder(
+dart_infra_builder("chocolatey", recipe = "dart/chocolatey", dimensions = windows())
+dart_infra_builder("co19-roller", recipe = "dart/package_co19")
+dart_infra_builder(
     "dart-ci-scripts-linux",
     recipe = "dart/package_dart_ci",
+    dimensions = linux(),
 )
-dart.infra_builder(
+dart_infra_builder(
     "dart-ci-scripts-win",
     recipe = "dart/package_dart_ci",
-    dimensions = windows,
+    dimensions = windows(),
 )
-dart.infra_builder(
+dart_infra_builder(
     "dart-ci-scripts-mac",
     recipe = "dart/package_dart_ci",
-    dimensions = mac,
-    properties = pinned_xcode,
+    dimensions = mac(),
+    properties = PINNED_XCODE,
 )
-dart.infra_builder(
+dart_infra_builder(
     "dart-ci-scripts-mac-arm64",
     recipe = "dart/package_dart_ci",
-    dimensions = [mac, arm64],
-    properties = pinned_xcode,
+    dimensions = mac(cpu = "arm64"),
+    properties = PINNED_XCODE,
 )
-dart.infra_builder(
+dart_infra_builder(
     "linearize-flutter",
     recipe = "dart/linearize",
     properties = {
@@ -587,7 +1724,7 @@ dart.infra_builder(
     ],
     triggering_policy = scheduler.greedy_batching(max_batch_size = 1),
 )
-dart.infra_builder(
+dart_infra_builder(
     "roll-to-dev",
     bucket = "ci.roll",
     execution_timeout = 15 * time.minute,
@@ -603,14 +1740,14 @@ dart.infra_builder(
 # image. The `vm-precomp-ffi-qemu-linux-release-arm` is  used because qemu is
 # the primary difference, it passes all tests, triggers no shards and runs a few
 # different builds. See also https://crbug.com/1207358.
-cron.nightly_builder(
+nightly_builder(
     "vm-precomp-ffi-qemu-linux-release-arm-experimental",
     channels = [],
     dimensions = {"host_class": "experimental"},
     notifies = "infra",
 )
 
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "ci-test-data",
     channels = [],
     properties = {"bisection_enabled": True},
@@ -619,7 +1756,7 @@ dart.ci_sandbox_builder(
 )
 
 # Fuzz testing builders
-dart.ci_sandbox_builder(
+dart_ci_sandbox_builder(
     "fuzz-linux",
     channels = [],
     notifies = "dart-fuzz-testing",
@@ -628,16 +1765,20 @@ dart.ci_sandbox_builder(
 )
 
 # Try only builders
-dart.try_builder("benchmark-linux", on_cq = True, properties = js_engines)
+dart_try_builder("benchmark-linux", on_cq = True, properties = JS_ENGINES)
 
-dart.try_builder(
+dart_try_builder(
     "presubmit",
     bucket = "try.shared",
     execution_timeout = 10 * time.minute,
     recipe = "presubmit/presubmit",
 )
 
-vm.add_postponed_alt_console_entries()
+def add_postponed_alt_console_entries():
+    for entry in postponed_alt_console_entries:
+        luci.console_view_entry(console_view = "alt", **entry)
+
+add_postponed_alt_console_entries()
 
 # Dart Fuzz console
 luci.list_view_entry(
@@ -680,4 +1821,55 @@ luci.list_view_entry(
     list_view = "iso-stress",
 )
 
-exec("//recipes.star")
+def chromium_infra_recipe(name):
+    return luci.recipe(
+        name = name,
+        cipd_package =
+            "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
+        cipd_version = "git_revision:21e1e6473db300eb5045e4483e8b53d1324cd0d8",
+        use_bbagent = True,
+    )
+
+# Rolls dart recipe dependencies.
+dart_infra_builder(
+    name = "recipe-deps-roller",
+    executable = chromium_infra_recipe("recipe_autoroller"),
+    execution_timeout = 20 * time.minute,
+    expiration_timeout = time.day,
+    priority = LOW,
+    properties = {
+        "db_gcs_bucket": "dart-recipe-roller-db",
+        "projects": {
+            "dart": "https://dart.googlesource.com/recipes",
+        }.items(),  # recipe_autoroller expects a list of tuples.
+    },
+    schedule = "with 4h interval",
+)
+
+dart_infra_builder(
+    name = "recipe-bundler",
+    executable = chromium_infra_recipe("recipe_bundler"),
+    execution_timeout = 5 * time.minute,
+    properties = {
+        # This property controls the version of the recipe_bundler go tool:
+        #   https://chromium.googlesource.com/infra/infra/+/main/go/src/infra/tools/recipe_bundler
+        "recipe_bundler_vers": "git_revision:bc0c2fb9082bc82a2d972b5cca8fc17afa55d34e",
+        # These control the prefix of the CIPD package names that the tool
+        # will create.
+        "package_name_prefix": "dart/recipe_bundles",
+        "package_name_internal_prefix": "dart_internal/recipe_bundles",
+        # Where to grab the recipes to bundle.
+        "repo_specs": [
+            "dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/main",
+        ],
+    },
+    schedule = "*/30 * * * *",
+    triggered_by = [
+        luci.gitiles_poller(
+            name = "recipes-dart",
+            bucket = "ci",
+            repo = "https://dart.googlesource.com/recipes",
+            refs = ["refs/heads/main"],
+        ),
+    ],
+)
diff --git a/generated/project.cfg b/project.cfg
similarity index 85%
rename from generated/project.cfg
rename to project.cfg
index 654142bfda7b..3b6a49f36003 100644
--- a/generated/project.cfg
+++ b/project.cfg
@@ -8,7 +8,7 @@ name: "dart"
 access: "group:all"
 lucicfg {
   version: "1.30.9"
-  package_dir: ".."
-  config_dir: "generated"
+  package_dir: "."
+  config_dir: "."
   entry_point: "main.star"
 }
diff --git a/project.star b/project.star
deleted file mode 100644
index 277f80bde0e2..000000000000
--- a/project.star
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright (c) 2022 The Dart project authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-"""
-Global definitions and ACLs for the project.
-"""
-
-load("//lib/accounts.star", "accounts")
-
-# https://chrome-infra-auth.appspot.com/auth/groups/project-dart-ci-task-accounts
-CI_ACCOUNTS_GROUP = "project-dart-ci-task-accounts"
-
-# https://chrome-infra-auth.appspot.com/auth/groups/project-dart-try-task-accounts
-TRY_ACCOUNTS_GROUP = "project-dart-try-task-accounts"
-
-ROLL_TRIGGERERS = {
-    "groups": ["project-dart-roller-owners"],
-    "users": [
-        accounts.ci_builder,
-    ],
-}
-CI_SANDBOX_TRIGGERERS = [accounts.ci_builder, accounts.try_builder]
-
-lucicfg.config(
-    tracked_files = ["*"],
-    lint_checks = ["all"],
-)
-
-luci.project(
-    name = "dart",
-    buildbucket = "cr-buildbucket.appspot.com",
-    logdog = "luci-logdog.appspot.com",
-    milo = "luci-milo.appspot.com",
-    notify = "luci-notify.appspot.com",
-    scheduler = "luci-scheduler.appspot.com",
-    swarming = "chromium-swarm.appspot.com",
-    acls = [
-        acl.entry(
-            [
-                acl.BUILDBUCKET_READER,
-                acl.LOGDOG_READER,
-                acl.PROJECT_CONFIGS_READER,
-                acl.SCHEDULER_READER,
-            ],
-            groups = ["all"],
-        ),
-        acl.entry(acl.LOGDOG_WRITER, groups = ["luci-logdog-chromium-writers"]),
-        acl.entry(
-            [acl.SCHEDULER_OWNER, acl.BUILDBUCKET_TRIGGERER],
-            groups = ["project-dart-admins"],
-        ),
-        acl.entry(acl.CQ_COMMITTER, groups = ["project-dart-committers"]),
-        acl.entry(acl.CQ_DRY_RUNNER, groups = ["project-dart-tryjob-access"]),
-    ],
-    bindings = [
-        luci.binding(
-            roles = "role/configs.validator",
-            users = accounts.try_builder,
-        ),
-        luci.binding(
-            roles = "role/swarming.poolOwner",
-            groups = "project-dart-admins",
-        ),
-        luci.binding(
-            roles = "role/swarming.poolViewer",
-            groups = "project-dart-committers",
-        ),
-    ],
-)
-
-luci.logdog(gs_bucket = "chromium-luci-logdog")
-
-luci.bucket(
-    name = "ci",
-    acls = [
-        acl.entry(acl.BUILDBUCKET_TRIGGERER, users = [accounts.ci_builder]),
-    ],
-)
-luci.bucket(
-    name = "ci.roll",
-    acls = [
-        acl.entry(acl.BUILDBUCKET_TRIGGERER, **ROLL_TRIGGERERS),
-    ],
-)
-luci.bucket(
-    name = "ci.sandbox",
-    acls = [
-        acl.entry(acl.BUILDBUCKET_TRIGGERER, users = CI_SANDBOX_TRIGGERERS),
-    ],
-)
-TRY_ACLS = [
-    acl.entry(
-        acl.BUILDBUCKET_TRIGGERER,
-        groups = ["project-dart-tryjob-access", "service-account-cq"],
-    ),
-]
-luci.bucket(name = "try", acls = TRY_ACLS)  # Tryjobs specific to the Dart SDK repo.
-luci.bucket(name = "try.shared", acls = TRY_ACLS)  # Tryjobs for all repos.
-
-# Swarming permissions in realms.cfg.
-
-luci.realm(name = "pools/ci")
-luci.realm(name = "pools/try")
-luci.realm(
-    name = "pools/tests",
-    bindings = [
-        luci.binding(
-            roles = "role/swarming.poolUser",
-            groups = [CI_ACCOUNTS_GROUP, TRY_ACCOUNTS_GROUP],
-        ),
-    ],
-)
-
-def led_users(*, pool_realms, builder_realm, groups):
-    for realm in pool_realms:
-        luci.binding(
-            realm = realm,
-            roles = "role/swarming.poolUser",
-            groups = groups,
-        )
-    luci.binding(
-        realm = builder_realm,
-        roles = "role/swarming.taskTriggerer",
-        groups = groups,
-    )
-
-# Allow admins to use LED and "Debug" button on every Dart builder and bot.
-led_users(
-    pool_realms = ["@root"],
-    builder_realm = "@root",
-    groups = ["project-dart-admins"],
-)
-
-# Allow mdb/dart-build-access to use LED and "Debug" button on try builders and
-# try and test bots.
-led_users(
-    pool_realms = ["pools/try", "pools/tests"],
-    builder_realm = "try",
-    groups = ["mdb/dart-build-access"],
-)
-
-luci.milo(
-    logo = "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png",
-)
diff --git a/generated/realms.cfg b/realms.cfg
similarity index 100%
rename from generated/realms.cfg
rename to realms.cfg
diff --git a/recipes.star b/recipes.star
deleted file mode 100644
index c58f8f5448c3..000000000000
--- a/recipes.star
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright (c) 2022 The Dart project authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-"""
-Luci recipe framework infrastructure.
-
-The recipe-deps-roller keeps recipe dependencies up-to-date and the recipe
-bundler uploads recipes as CIPD packages.
-"""
-
-load("//lib/dart.star", "dart")
-load("//lib/priority.star", "priority")
-
-def chromium_infra_recipe(name):
-    return luci.recipe(
-        name = name,
-        cipd_package =
-            "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
-        cipd_version = "git_revision:21e1e6473db300eb5045e4483e8b53d1324cd0d8",
-        use_bbagent = True,
-    )
-
-# Rolls dart recipe dependencies.
-dart.infra_builder(
-    name = "recipe-deps-roller",
-    executable = chromium_infra_recipe("recipe_autoroller"),
-    execution_timeout = 20 * time.minute,
-    expiration_timeout = time.day,
-    priority = priority.low,
-    properties = {
-        "db_gcs_bucket": "dart-recipe-roller-db",
-        "projects": {
-            "dart": "https://dart.googlesource.com/recipes",
-        }.items(),  # recipe_autoroller expects a list of tuples.
-    },
-    schedule = "with 4h interval",
-)
-
-dart.infra_builder(
-    name = "recipe-bundler",
-    executable = chromium_infra_recipe("recipe_bundler"),
-    execution_timeout = 5 * time.minute,
-    properties = {
-        # These control the prefix of the CIPD package names that the tool
-        # will create.
-        "package_name_internal_prefix": "dart_internal/recipe_bundles",
-        "package_name_prefix": "dart/recipe_bundles",
-        # This property controls the version of the recipe_bundler go tool:
-        #   https://chromium.googlesource.com/infra/infra/+/main/go/src/infra/tools/recipe_bundler
-        "recipe_bundler_vers": "git_revision:bc0c2fb9082bc82a2d972b5cca8fc17afa55d34e",
-        # Where to grab the recipes to bundle.
-        "repo_specs": [
-            "dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/main",
-        ],
-    },
-    schedule = "*/30 * * * *",
-    triggered_by = [
-        luci.gitiles_poller(
-            name = "recipes-dart",
-            bucket = "ci",
-            repo = "https://dart.googlesource.com/recipes",
-            refs = ["refs/heads/main"],
-        ),
-    ],
-)
diff --git a/vm.star b/vm.star
deleted file mode 100644
index b2a032490ed4..000000000000
--- a/vm.star
+++ /dev/null
@@ -1,533 +0,0 @@
-# Copyright (c) 2022 The Dart project authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-"""
-Defines the Dart VM builders.
-"""
-
-load("//lib/cron.star", "cron")
-load("//lib/dart.star", "dart")
-load(
-    "//lib/defaults.star",
-    "arm64",
-    "mac",
-    "no_android",
-    "pinned_xcode",
-    "slow_shards",
-    "windows",
-)
-load("//lib/paths.star", "paths")
-load("//lib/priority.star", "priority")
-
-_postponed_alt_console_entries = []
-
-dart.poller("dart-vm-gitiles-trigger", branches = ["main"], paths = paths.vm)
-luci.notifier(
-    name = "dart-vm-team",
-    on_new_failure = True,
-    notify_emails = ["dart-vm-team-breakages@google.com"],
-)
-
-def _builder(name, category = None, **kwargs):
-    dart.ci_sandbox_builder(name, category = category, **kwargs)
-    _postponed_alt_console_entry(name, category)
-
-def _extra_builder(name, on_cq = False, location_regexp = None, **kwargs):
-    """
-    Creates a Dart builder that is only triggered by VM commits.
-
-    Args:
-        name: The builder name.
-        on_cq: Whether the build is added to the default set of CQ tryjobs.
-        location_regexp: Locations that trigger this builder.
-        **kwargs: Extra arguments are passed on to dart_ci_sandbox_builder.
-    """
-    triggered_by = ["dart-vm-gitiles-trigger-%s"]
-    if on_cq and not location_regexp:
-        # Don't add extra builders to the default CQ, trigger only on VM paths.
-        location_regexp = paths.to_location_regexp(paths.vm)
-        on_cq = False
-    _builder(
-        name,
-        triggered_by = triggered_by,
-        on_cq = on_cq,
-        location_regexp = location_regexp,
-        **kwargs
-    )
-
-def _low_priority_builder(name, **kwargs):
-    _extra_builder(
-        name,
-        channels = ["try"],
-        priority = priority.low,
-        expiration_timeout = time.day,
-        **kwargs
-    )
-
-def _nightly_builder(name, category, **kwargs):
-    cron.nightly_builder(name, category = category, notifies = "dart-vm-team", **kwargs)
-    _postponed_alt_console_entry(name, category)
-
-def _postponed_alt_console_entry(name, category):
-    if category:
-        console_category, _, short_name = category.rpartition("|")
-        _postponed_alt_console_entries.append({
-            "builder": name,
-            "category": console_category,
-            "short_name": short_name,
-        })
-
-def add_postponed_alt_console_entries():
-    for entry in _postponed_alt_console_entries:
-        luci.console_view_entry(console_view = "alt", **entry)
-
-# vm|nnbd|jit
-_extra_builder(
-    "vm-kernel-nnbd-linux-debug-x64",
-    category = "vm|nnbd|jit|d",
-    on_cq = True,
-)
-_extra_builder(
-    "vm-kernel-nnbd-linux-release-x64",
-    category = "vm|nnbd|jit|r",
-    on_cq = True,
-)
-_nightly_builder(
-    "vm-kernel-nnbd-linux-debug-ia32",
-    category = "vm|nnbd|jit|d3",
-    channels = ["try"],
-    properties = slow_shards,
-)
-_nightly_builder(
-    "vm-kernel-nnbd-linux-release-ia32",
-    category = "vm|nnbd|jit|r3",
-    channels = ["try"],
-)
-_nightly_builder(
-    "vm-kernel-nnbd-linux-release-simarm",
-    category = "vm|nnbd|jit|ra",
-    channels = ["try"],
-)
-_nightly_builder(
-    "vm-kernel-nnbd-linux-release-simarm64",
-    category = "vm|nnbd|jit|ra6",
-    channels = ["try"],
-)
-_nightly_builder(
-    "vm-kernel-nnbd-mac-debug-arm64",
-    category = "vm|nnbd|jit|m1d",
-    channels = ["try"],
-    dimensions = [mac, arm64],
-    properties = [no_android, pinned_xcode, slow_shards],
-)
-_nightly_builder(
-    "vm-kernel-nnbd-mac-debug-x64",
-    category = "vm|nnbd|jit|md",
-    channels = ["try"],
-    dimensions = mac,
-    properties = [pinned_xcode, slow_shards],
-)
-_extra_builder(
-    "vm-kernel-nnbd-mac-release-arm64",
-    category = "vm|nnbd|jit|m1r",
-    channels = ["try"],
-    dimensions = [mac, arm64],
-    properties = [no_android, pinned_xcode],
-)
-_nightly_builder(
-    "vm-kernel-nnbd-mac-release-x64",
-    category = "vm|nnbd|jit|mr",
-    channels = ["try"],
-    dimensions = mac,
-    properties = pinned_xcode,
-)
-_nightly_builder(
-    "vm-kernel-nnbd-win-release-ia32",
-    category = "vm|nnbd|jit|wr3",
-    channels = ["try"],
-    dimensions = windows,
-)
-_nightly_builder(
-    "vm-kernel-nnbd-win-debug-x64",
-    category = "vm|nnbd|jit|wd",
-    channels = ["try"],
-    properties = slow_shards,
-    dimensions = windows,
-)
-_nightly_builder(
-    "vm-kernel-nnbd-win-release-x64",
-    category = "vm|nnbd|jit|wr",
-    channels = ["try"],
-    dimensions = windows,
-)
-
-# vm|nnbd|aot
-_extra_builder(
-    "vm-kernel-precomp-nnbd-linux-release-x64",
-    category = "vm|nnbd|aot|r",
-)
-_nightly_builder(
-    "vm-kernel-precomp-nnbd-linux-debug-simarm_x64",
-    category = "vm|nnbd|aot|da",
-    channels = ["try"],
-)
-_nightly_builder(
-    "vm-kernel-precomp-nnbd-linux-release-simarm_x64",
-    category = "vm|nnbd|aot|ra",
-    channels = ["try"],
-)
-_nightly_builder(
-    "vm-kernel-precomp-nnbd-linux-debug-x64",
-    category = "vm|nnbd|aot|d",
-    channels = ["try"],
-    properties = slow_shards,
-)
-_nightly_builder(
-    "vm-kernel-precomp-nnbd-linux-release-simarm64",
-    category = "vm|nnbd|aot|ra6",
-    channels = ["try"],
-)
-_extra_builder(
-    "vm-kernel-precomp-nnbd-mac-release-arm64",
-    category = "vm|nnbd|aot|m1",
-    channels = ["try"],
-    dimensions = [mac, arm64],
-    properties = [no_android, pinned_xcode, slow_shards],
-)
-_nightly_builder(
-    "vm-kernel-precomp-nnbd-mac-release-simarm64",
-    category = "vm|nnbd|aot|ma6",
-    channels = ["try"],
-    dimensions = mac,
-    properties = [pinned_xcode, slow_shards],
-)
-_nightly_builder(
-    "vm-kernel-precomp-nnbd-win-release-x64",
-    category = "vm|nnbd|aot|wr",
-    channels = ["try"],
-    dimensions = windows,
-)
-
-# vm|app-kernel
-_extra_builder(
-    "app-kernel-linux-debug-x64",
-    category = "vm|app-kernel|d64",
-    properties = slow_shards,
-)
-_nightly_builder(
-    "app-kernel-linux-product-x64",
-    category = "vm|app-kernel|p64",
-    channels = ["try"],
-)
-_extra_builder(
-    "app-kernel-linux-release-x64",
-    category = "vm|app-kernel|r64",
-)
-
-#vm|kernel
-_extra_builder(
-    "vm-canary-linux-debug",
-    category = "vm|kernel|c",
-    on_cq = True,
-)
-_builder("vm-kernel-linux-debug-x64", category = "vm|kernel|d")
-_extra_builder(
-    "vm-kernel-linux-release-simarm",
-    category = "vm|kernel|a32",
-)
-_extra_builder(
-    "vm-kernel-linux-release-simarm64",
-    category = "vm|kernel|a64",
-)
-_nightly_builder(
-    "vm-kernel-linux-release-ia32",
-    category = "vm|kernel|r32",
-    channels = ["try"],
-)
-_builder(
-    "vm-kernel-linux-release-x64",
-    category = "vm|kernel|r",
-    on_cq = True,
-)
-_extra_builder(
-    "vm-kernel-checked-linux-release-x64",
-    category = "vm|kernel|rc",
-    experiments = {"dart.use_update_script": 100},
-)
-_nightly_builder(
-    "vm-kernel-linux-debug-ia32",
-    category = "vm|kernel|d32",
-    channels = ["try"],
-)
-_builder(
-    "vm-kernel-mac-debug-x64",
-    category = "vm|kernel|md",
-    dimensions = mac,
-    properties = pinned_xcode,
-)
-_builder(
-    "vm-kernel-mac-release-x64",
-    category = "vm|kernel|mr",
-    dimensions = mac,
-    on_cq = True,
-    experiment_percentage = 5,
-    properties = pinned_xcode,
-)
-_builder(
-    "vm-kernel-mac-release-arm64",
-    category = "vm|kernel|m1r",
-    channels = ["try", "dev"],
-    dimensions = [mac, arm64],
-    properties = [no_android, pinned_xcode],
-)
-_nightly_builder(
-    "vm-kernel-win-debug-ia32",
-    category = "vm|kernel|wd3",
-    channels = ["try"],
-    dimensions = windows,
-)
-_builder(
-    "vm-kernel-win-debug-x64",
-    category = "vm|kernel|wd",
-    dimensions = windows,
-)
-_nightly_builder(
-    "vm-kernel-win-release-ia32",
-    category = "vm|kernel|wr3",
-    channels = ["try"],
-    dimensions = windows,
-)
-_builder(
-    "vm-kernel-win-release-x64",
-    category = "vm|kernel|wr",
-    dimensions = windows,
-)
-_extra_builder(
-    "cross-vm-linux-release-arm64",
-    category = "vm|kernel|cra",
-    channels = [],
-    properties = {"shard_timeout": (120 * time.minute) // time.second},
-)
-
-# vm|kernel-precomp
-_extra_builder(
-    "vm-kernel-precomp-linux-debug-x64",
-    category = "vm|kernel-precomp|d",
-)
-_extra_builder(
-    "vm-kernel-precomp-linux-product-x64",
-    category = "vm|kernel-precomp|p",
-)
-_extra_builder(
-    "vm-kernel-precomp-linux-release-simarm",
-    category = "vm|kernel-precomp|a32",
-)
-_extra_builder(
-    "vm-kernel-precomp-linux-release-simarm64",
-    category = "vm|kernel-precomp|a64",
-)
-_extra_builder(
-    "vm-kernel-precomp-linux-release-x64",
-    category = "vm|kernel-precomp|r",
-)
-_extra_builder(
-    "vm-kernel-precomp-obfuscate-linux-release-x64",
-    category = "vm|kernel-precomp|o",
-)
-_extra_builder(
-    "vm-kernel-precomp-linux-debug-simarm_x64",
-    category = "vm|kernel-precomp|adx",
-    properties = slow_shards,
-)
-_extra_builder(
-    "vm-kernel-precomp-linux-release-simarm_x64",
-    category = "vm|kernel-precomp|arx",
-)
-_extra_builder(
-    "vm-kernel-precomp-mac-release-simarm64",
-    category = "vm|kernel-precomp|ma",
-    dimensions = mac,
-    properties = pinned_xcode,
-)
-_extra_builder(
-    "vm-kernel-precomp-win-release-x64",
-    category = "vm|kernel-precomp|wr",
-    dimensions = windows,
-)
-_nightly_builder(
-    "cross-vm-precomp-linux-release-arm64",
-    category = "vm|kernel-precomp|cra",
-    channels = [],
-    properties = slow_shards,
-)
-_nightly_builder(
-    "vm-kernel-precomp-dwarf-linux-product-x64",
-    category = "vm|kernel-precomp|dw",
-    channels = ["try"],
-)
-
-# vm|kernel-precomp|android
-_extra_builder(
-    "vm-kernel-precomp-android-release-arm_x64",
-    category = "vm|kernel-precomp|android|a32",
-    properties = slow_shards,
-)
-_extra_builder(
-    "vm-kernel-precomp-android-release-arm64c",
-    category = "vm|kernel-precomp|android|a64",
-    properties = slow_shards,
-)
-
-# vm|product
-_nightly_builder(
-    "vm-kernel-linux-product-x64",
-    category = "vm|product|l",
-    channels = ["try"],
-)
-_nightly_builder(
-    "vm-kernel-mac-product-x64",
-    category = "vm|product|m",
-    channels = ["try"],
-    dimensions = mac,
-    properties = pinned_xcode,
-)
-_nightly_builder(
-    "vm-kernel-win-product-x64",
-    category = "vm|product|w",
-    channels = ["try"],
-    dimensions = windows,
-)
-
-# vm|misc
-_nightly_builder(
-    "vm-kernel-optcounter-threshold-linux-release-ia32",
-    category = "vm|misc|o32",
-    channels = ["try"],
-)
-_low_priority_builder(
-    "vm-kernel-optcounter-threshold-linux-release-x64",
-    category = "vm|misc|o64",
-)
-
-def dart_vm_sanitizer_builder(name, **kwargs):
-    _nightly_builder(
-        name,
-        channels = ["try"],
-        properties = {"bisection_enabled": True},
-        **kwargs
-    )
-
-dart_vm_sanitizer_builder(
-    "vm-kernel-asan-linux-release-x64",
-    category = "vm|misc|a",
-)
-dart_vm_sanitizer_builder(
-    "vm-kernel-msan-linux-release-x64",
-    category = "vm|misc|m",
-)
-dart_vm_sanitizer_builder(
-    "vm-kernel-tsan-linux-release-x64",
-    category = "vm|misc|t",
-)
-dart_vm_sanitizer_builder(
-    "vm-kernel-ubsan-linux-release-x64",
-    category = "vm|misc|u",
-    goma = False,
-)  # ubsan is not compatible with our sysroot.
-dart_vm_sanitizer_builder(
-    "vm-kernel-precomp-asan-linux-release-x64",
-    category = "vm|misc|aot|a",
-)
-dart_vm_sanitizer_builder(
-    "vm-kernel-precomp-msan-linux-release-x64",
-    category = "vm|misc|aot|m",
-)
-dart_vm_sanitizer_builder(
-    "vm-kernel-precomp-tsan-linux-release-x64",
-    category = "vm|misc|aot|t",
-)
-dart_vm_sanitizer_builder(
-    "vm-kernel-precomp-ubsan-linux-release-x64",
-    category = "vm|misc|aot|u",
-    goma = False,
-)  # ubsan is not compatible with our sysroot.
-_nightly_builder(
-    "vm-kernel-reload-linux-debug-x64",
-    category = "vm|misc|reload|d",
-    channels = ["try"],
-)
-_nightly_builder(
-    "vm-kernel-reload-linux-release-x64",
-    category = "vm|misc|reload|r",
-    channels = ["try"],
-)
-_nightly_builder(
-    "vm-kernel-reload-rollback-linux-debug-x64",
-    category = "vm|misc|reload|drb",
-    channels = ["try"],
-)
-_nightly_builder(
-    "vm-kernel-reload-rollback-linux-release-x64",
-    category = "vm|misc|reload|rrb",
-    channels = ["try"],
-)
-_nightly_builder(
-    "vm-kernel-linux-debug-x64c",
-    category = "vm|misc|compressed|jl",
-    channels = ["try"],
-)
-_nightly_builder(
-    "vm-kernel-precomp-linux-debug-x64c",
-    category = "vm|misc|compressed|al",
-    channels = ["try"],
-)
-_nightly_builder(
-    "vm-kernel-win-debug-x64c",
-    category = "vm|misc|compressed|jw",
-    channels = ["try"],
-    dimensions = windows,
-)
-_nightly_builder(
-    "vm-kernel-precomp-win-debug-x64c",
-    category = "vm|misc|compressed|aw",
-    channels = ["try"],
-    dimensions = windows,
-)
-_low_priority_builder("vm-fuchsia-release-x64", category = "vm|misc|f")
-
-# Our sysroot does not support gcc, we can't use goma on RBE for this builder
-_nightly_builder("vm-kernel-gcc-linux", category = "vm|misc|g", goma = False)
-
-_nightly_builder(
-    "vm-kernel-linux-debug-simriscv64",
-    category = "vm|misc|rv64",
-    channels = ["try"],
-)
-_nightly_builder(
-    "vm-kernel-precomp-linux-debug-simriscv64",
-    category = "vm|misc|rv64",
-    channels = ["try"],
-)
-
-# vm|ffi
-_extra_builder("vm-ffi-android-debug-arm", category = "vm|ffi|d32")
-_extra_builder("vm-ffi-android-release-arm", category = "vm|ffi|r32")
-_extra_builder("vm-ffi-android-product-arm", category = "vm|ffi|p32")
-_extra_builder("vm-ffi-android-debug-arm64c", category = "vm|ffi|d64")
-_extra_builder("vm-ffi-android-release-arm64c", category = "vm|ffi|r64")
-_extra_builder("vm-ffi-android-product-arm64c", category = "vm|ffi|p64")
-_extra_builder(
-    "vm-precomp-ffi-qemu-linux-release-arm",
-    category = "vm|ffi|qa",
-)
-_extra_builder(
-    "vm-precomp-ffi-qemu-linux-release-riscv64",
-    category = "vm|ffi|qr",
-)
-
-# Isolate stress test builder
-_extra_builder(
-    "iso-stress-linux",
-    channels = [],
-    notifies = "dart-vm-team",
-)

From 10b9bf238f2db4954a20568f914bf084f8ef6e89 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 9 Feb 2022 14:24:07 +0000
Subject: [PATCH 521/826] Reland "Revert "[infra] Refactor main.star into
 modules""

This reverts commit 4dfe5c6f8e16a22718c06713e75bedb40c428af9.

Reland without moving the generated files.

Change-Id: I81b0bd7ca4328e9f42ab91614a5574532b1b7759
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/232096
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cq.star           |   68 ++
 defaults.star     |   29 -
 lib/accounts.star |   11 +
 lib/cron.star     |   49 +
 lib/dart.star     |  318 ++++++
 lib/defaults.star |   78 ++
 lib/paths.star    |   80 ++
 lib/priority.star |   14 +
 luci-milo.cfg     | 2572 ++++++++++++++++++++++-----------------------
 luci-notify.cfg   |  296 +-----
 main.star         | 1556 ++++-----------------------
 project.star      |  154 +++
 recipes.star      |   65 ++
 vm.star           |  533 ++++++++++
 14 files changed, 2852 insertions(+), 2971 deletions(-)
 create mode 100644 cq.star
 delete mode 100644 defaults.star
 create mode 100644 lib/accounts.star
 create mode 100644 lib/cron.star
 create mode 100644 lib/dart.star
 create mode 100644 lib/defaults.star
 create mode 100644 lib/paths.star
 create mode 100644 lib/priority.star
 create mode 100644 project.star
 create mode 100644 recipes.star
 create mode 100644 vm.star

diff --git a/cq.star b/cq.star
new file mode 100644
index 000000000000..67a835fe7a57
--- /dev/null
+++ b/cq.star
@@ -0,0 +1,68 @@
+# Copyright (c) 2022 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+CQs for the dart Gerrit host.
+"""
+
+load("//lib/dart.star", "dart")
+
+luci.cq(
+    submit_max_burst = 2,
+    submit_burst_delay = 8 * time.minute,
+    status_host = "chromium-cq-status.appspot.com",
+)
+
+def default_verifiers():
+    return [
+        luci.cq_tryjob_verifier(
+            builder = "presubmit-try",
+            disable_reuse = True,
+        ),
+    ]
+
+DART_GERRIT = "https://dart-review.googlesource.com/"
+
+luci.cq_group(
+    name = "sdk",
+    watch = cq.refset(
+        DART_GERRIT + "sdk",
+        refs = ["refs/heads/%s" % branch for branch in dart.branches],
+    ),
+    allow_submit_with_open_deps = True,
+    tree_status_host = "dart-status.appspot.com",
+    retry_config = cq.RETRY_NONE,
+    verifiers = None,
+)
+
+luci.cq_group(
+    name = "sdk-infra-config",
+    watch = cq.refset(DART_GERRIT + "sdk", refs = ["refs/heads/infra/config"]),
+    allow_submit_with_open_deps = True,
+    tree_status_host = "dart-status.appspot.com",
+    retry_config = cq.RETRY_NONE,
+    verifiers = default_verifiers(),
+)
+
+luci.cq_group(
+    name = "recipes",
+    watch = cq.refset(DART_GERRIT + "recipes", refs = ["refs/heads/main"]),
+    allow_submit_with_open_deps = True,
+    tree_status_host = "dart-status.appspot.com",
+    retry_config = cq.RETRY_NONE,
+    verifiers = default_verifiers(),
+)
+
+luci.cq_group(
+    name = "dart_ci",
+    watch = cq.refset(DART_GERRIT + "dart_ci", refs = ["refs/heads/main"]),
+    allow_submit_with_open_deps = True,
+    tree_status_host = "dart-status.appspot.com",
+    retry_config = cq.RETRY_NONE,
+    verifiers = None,
+)
+
+luci.list_view(
+    name = "cq",
+    title = "SDK CQ Console",
+)
diff --git a/defaults.star b/defaults.star
deleted file mode 100644
index ca0e83a398fa..000000000000
--- a/defaults.star
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2019 The Dart project authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-"""
-Defaults for properties and dimensions used in main.star.
-"""
-
-_PROPERTIES = {"clobber": True}
-_DIMENSIONS = {
-    "cpu": "x86-64",
-    "host_class": "default",
-    "os": "Linux",
-    "pool": "luci.dart.try",
-}
-_CACHES = {
-    "Mac": [swarming.cache("osx_sdk", name = "osx_sdk")],
-}
-
-def _default_dict(defaults, overrides):
-    defaults = dict(defaults)
-    if overrides:
-        defaults.update(overrides)
-    return defaults
-
-defaults = struct(
-    caches = lambda os: _CACHES.get(os),
-    dimensions = lambda dimensions: _default_dict(_DIMENSIONS, dimensions),
-    properties = lambda properties: _default_dict(_PROPERTIES, properties),
-)
diff --git a/lib/accounts.star b/lib/accounts.star
new file mode 100644
index 000000000000..9cda3f04c96a
--- /dev/null
+++ b/lib/accounts.star
@@ -0,0 +1,11 @@
+# Copyright (c) 2022 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Defines accounts used on builders.
+"""
+
+accounts = struct(
+    ci_builder = "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com",
+    try_builder = "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com",
+)
diff --git a/lib/cron.star b/lib/cron.star
new file mode 100644
index 000000000000..370562f3e943
--- /dev/null
+++ b/lib/cron.star
@@ -0,0 +1,49 @@
+# Copyright (c) 2022 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Defines rules that can be used to define nightly and weekly builders.
+"""
+
+load("//lib/dart.star", "dart")
+load("//lib/priority.star", "priority")
+
+def _nightly_builder(name, notifies = None, **kwargs):
+    dart.ci_sandbox_builder(
+        name,
+        notifies = notifies or [luci.notifier(
+            name = "nightly",
+            on_new_failure = True,
+        )],
+        on_cq = False,
+        priority = priority.low,
+        triggered_by = [luci.gitiles_poller(
+            name = "dart-nightly-trigger",
+            bucket = "ci",
+            repo = dart.git,
+            refs = ["refs/heads/main"],
+            schedule = "0 5 * * *",  # daily, at 05:00 UTC
+        )],
+        **kwargs
+    )
+
+def _weekly_builder(name, notifies = None, **kwargs):
+    dart.ci_sandbox_builder(
+        name,
+        notifies = notifies,
+        on_cq = False,
+        priority = priority.low,
+        triggered_by = [luci.gitiles_poller(
+            name = "dart-weekly-trigger",
+            bucket = "ci",
+            repo = dart.git,
+            refs = ["refs/heads/main"],
+            schedule = "0 0 * * SUN",  # weekly, midnight Saturday to Sunday
+        )],
+        **kwargs
+    )
+
+cron = struct(
+    nightly_builder = _nightly_builder,
+    weekly_builder = _weekly_builder,
+)
diff --git a/lib/dart.star b/lib/dart.star
new file mode 100644
index 000000000000..f8ae68005fd4
--- /dev/null
+++ b/lib/dart.star
@@ -0,0 +1,318 @@
+# Copyright (c) 2022 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Defines rules that can be used to define nightly and weekly builders.
+"""
+
+load("//lib/accounts.star", "accounts")
+load("//lib/defaults.star", "defaults")
+load("//lib/paths.star", "paths")
+load("//lib/priority.star", "priority")
+
+_GOMA_RBE = {
+    "server_host": "goma.chromium.org",
+    "use_luci_auth": True,
+}
+
+_RELEASE_CHANNELS = ["beta", "dev", "stable"]
+_CHANNELS = _RELEASE_CHANNELS + ["try"]
+_BRANCHES = ["main"] + _RELEASE_CHANNELS
+
+_DART_GIT = "https://dart.googlesource.com/sdk"
+
+def _poller(name, bucket = "ci", branches = _BRANCHES, paths = None):
+    for branch in branches:
+        luci.gitiles_poller(
+            name = "%s-%s" % (name, branch),
+            bucket = bucket,
+            path_regexps = paths,
+            repo = _DART_GIT,
+            refs = ["refs/heads/%s" % branch],
+        )
+
+def _recipe(name):
+    return luci.recipe(
+        name = name,
+        cipd_package = "dart/recipe_bundles/dart.googlesource.com/recipes",
+        cipd_version = "refs/heads/main",
+        use_bbagent = True,
+    )
+
+def _with_goma(goma, dimensions, properties):
+    """Decorates the properties to setup goma.
+
+       Adds the $build/goma property when goma is used and disables goma via
+       the $dart/build property if not.
+
+    Args:
+        goma: Opt-in (True), opt-out (False) or default (None).
+        dimensions: The dimensions of the builder.
+        properties: The properties object to set $build/goma on (if opted-in).
+
+    Returns:
+        A copy of the properties with goma related properties set if applicable.
+    """
+    updated_properties = dict(properties)
+    if goma in (None, True):
+        goma_properties = {}
+        goma_properties.update(_GOMA_RBE)
+
+        enable_ats = dimensions["os"] == "Linux"
+
+        goma_properties["enable_ats"] = enable_ats
+        updated_properties.setdefault("$build/goma", goma_properties)
+    else:
+        updated_properties = dict(properties)
+        updated_properties.setdefault("$dart/build", {})
+        updated_properties["$dart/build"].setdefault("disable_goma", True)
+    return updated_properties
+
+def _try_builder(
+        name,
+        recipe = "dart/neo",
+        bucket = "try",
+        dimensions = None,
+        execution_timeout = None,
+        experiment_percentage = None,
+        experiments = None,
+        goma = None,
+        location_regexp = None,
+        properties = None,
+        on_cq = False):
+    """Creates a Dart tryjob.
+
+    Args:
+        name: The builder name.
+        recipe: The recipe to use (defaults to "dart/neo").
+        bucket: The bucket to use (defaults to "try").
+        dimensions: Extra swarming dimensions required by this builder.
+        execution_timeout: Time to allow for the build to run.
+        experiment_percentage: What experiment percentage to use.
+        experiments: Experiments to run on this builder, with percentages.
+        goma: Whether to use goma or not.
+        location_regexp: Locations that trigger this tryjob.
+        properties: Extra properties to set for builds.
+        on_cq: Whether the build is added to the default set of CQ tryjobs.
+    """
+    if on_cq and location_regexp:
+        fail("Can't be on the default CQ and conditionally on the CQ")
+    dimensions = defaults.dimensions(dimensions)
+    dimensions["pool"] = "luci.dart.try"
+    properties = defaults.properties(properties)
+    builder_properties = _with_goma(goma, dimensions, properties)
+    builder = name + "-try"
+    luci.builder(
+        name = builder,
+        build_numbers = True,
+        bucket = bucket,
+        caches = defaults.caches(dimensions["os"]),
+        dimensions = dimensions,
+        executable = _recipe(recipe),
+        execution_timeout = execution_timeout,
+        experiments = experiments,
+        priority = priority.high,
+        properties = builder_properties,
+        service_account = accounts.try_builder,
+        swarming_tags = ["vpython:native-python-wrapper"],
+    )
+    includable_only = (not on_cq and not experiment_percentage and
+                       not location_regexp)
+    luci.cq_tryjob_verifier(
+        builder = builder,
+        cq_group = "sdk",
+        experiment_percentage = experiment_percentage,
+        location_regexp = location_regexp,
+        includable_only = includable_only,
+    )
+    luci.list_view_entry(list_view = "cq", builder = builder)
+
+def _builder(
+        name,
+        bucket,
+        recipe = "dart/neo",
+        enabled = True,
+        category = None,
+        channels = [],
+        dimensions = None,
+        executable = None,
+        execution_timeout = None,
+        experimental = None,
+        experiments = None,
+        expiration_timeout = None,
+        goma = None,
+        fyi = False,
+        main_channel = True,
+        notifies = "dart",
+        priority = priority.normal,
+        properties = None,
+        schedule = "triggered",
+        service_account = accounts.try_builder,
+        triggered_by = ["dart-gitiles-trigger-%s"],
+        triggering_policy = None,
+        on_cq = False,
+        experiment_percentage = None,
+        location_regexp = None):
+    """
+    Creates a Dart builder on all the specified channels.
+
+    Args:
+        name: The builder name.
+        bucket: The bucket to use (defaults to "try").
+        recipe: The recipe to use (defaults to "dart/neo").
+        enabled: Whether this builder is currently running or not.
+        category: Where to show the builder on the console.
+        channels: Which other channels the builder should be added to.
+        dimensions: Extra swarming dimensions required by this builder.
+        executable: The Luci executable to use.
+        execution_timeout: Time to allow for the build to run.
+        experimental: Whether the build is experimental or not.
+        experiments: Experiments to run on this builder, with percentages.
+        expiration_timeout: How long builds should wait for a bot to run on.
+        goma: Whether to use goma or not.
+        fyi: Whether this is an FYI builder or not.
+        main_channel: Whether to add to the main channel (default: True).
+        notifies: Which luci notifier group to notify (default: "dart").
+        priority: What swarming priority this builder gets (default: NORMAL).
+        properties: Extra properties to set for builds.
+        schedule: What schedule to use (default: "triggered").
+        service_account: The task service account to use (default: accounts.try_builder).
+        triggered_by: What triggers this builder (defaults to standard trigger).
+        triggering_policy: The triggering policy used by this builder.
+        on_cq: Whether the build is added to the default set of CQ tryjobs.
+        experiment_percentage: What experiment percentage to use.
+        location_regexp: Locations that trigger this builder.
+    """
+    dimensions = defaults.dimensions(dimensions)
+    properties = defaults.properties(properties)
+
+    os = dimensions["os"]
+    if "win" in name and os != "Windows":
+        fail("builder %s should be a Windows builder" % name)
+    if "mac" in name and os != "Mac":
+        fail("builder %s should be a macOS builder" % name)
+    if "linux" in name and os != "Linux":
+        fail("builder %s should be a Linux builder" % name)
+
+    def builder(channel, notifies, triggered_by):
+        if channel == "try":
+            _try_builder(
+                name,
+                recipe = recipe,
+                dimensions = dimensions,
+                properties = properties,
+                on_cq = on_cq,
+                execution_timeout = execution_timeout,
+                experiment_percentage = experiment_percentage,
+                experiments = experiments,
+                goma = goma,
+                location_regexp = location_regexp,
+            )
+        else:
+            builder_properties = _with_goma(
+                goma if service_account == accounts.try_builder else False,
+                dimensions,
+                properties,
+            )
+            builder = name + "-" + channel if channel else name
+            branch = channel if channel else "main"
+            if schedule == "triggered" and triggered_by:
+                triggered_by = [
+                    trigger.replace("%s", branch) if type(trigger) == type("") else trigger
+                    for trigger in triggered_by
+                ]
+                if channel in _RELEASE_CHANNELS:
+                    # Always run vm builders on release channels.
+                    triggered_by = [
+                        trigger.replace("dart-vm-", "dart-") if type(trigger) == type("") else trigger
+                        for trigger in triggered_by
+                    ]
+
+            notifies = [notifies] if type(notifies) == type("") else notifies
+            luci.builder(
+                name = builder,
+                build_numbers = True,
+                bucket = bucket,
+                caches = defaults.caches(dimensions["os"]),
+                dimensions = dimensions,
+                executable = executable or _recipe(recipe),
+                execution_timeout = execution_timeout,
+                experimental = experimental,
+                experiments = experiments,
+                expiration_timeout = expiration_timeout,
+                priority = priority,
+                properties = builder_properties,
+                notifies = notifies if enabled else None,
+                schedule = schedule if enabled else None,
+                service_account = service_account,
+                swarming_tags = ["vpython:native-python-wrapper"],
+                triggered_by = triggered_by if enabled else None,
+                triggering_policy = triggering_policy,
+            )
+            if category:
+                console_category, _, short_name = category.rpartition("|")
+                toplevel_category, _, _ = console_category.partition("|")
+                console = channel or "be" if not fyi else "fyi"
+                luci.console_view_entry(
+                    builder = builder,
+                    short_name = short_name,
+                    category = console_category,
+                    console_view = console,
+                )
+                if console == "be":
+                    if toplevel_category != "vm":
+                        luci.console_view_entry(
+                            builder = builder,
+                            short_name = short_name,
+                            category = console_category,
+                            console_view = "alt",
+                        )
+
+    if main_channel:
+        builder(None, notifies = notifies, triggered_by = triggered_by)
+    for _channel in channels:
+        if enabled:
+            builder(_channel, notifies = None, triggered_by = triggered_by)
+
+def _ci_builder(name, bucket = "ci", dimensions = None, **kwargs):
+    if type(dimensions) == type({}):
+        dimensions = [dimensions]
+    dimensions = list(dimensions or [])
+    dimensions.append({"pool": "luci.dart.ci"})
+    _builder(
+        name,
+        bucket = bucket,
+        dimensions = dimensions,
+        service_account = accounts.ci_builder,
+        **kwargs
+    )
+
+def _ci_sandbox_builder(name, channels = _CHANNELS, **kwargs):
+    _builder(
+        name,
+        bucket = "ci.sandbox",
+        channels = channels,
+        service_account = accounts.try_builder,
+        **kwargs
+    )
+
+def _infra_builder(name, notifies = "infra", triggered_by = None, **kwargs):
+    _ci_builder(
+        name,
+        notifies = notifies,
+        triggered_by = triggered_by,
+        **kwargs
+    )
+    luci.list_view_entry(list_view = "infra", builder = name)
+
+dart = struct(
+    ci_builder = _ci_builder,
+    ci_sandbox_builder = _ci_sandbox_builder,
+    infra_builder = _infra_builder,
+    try_builder = _try_builder,
+    poller = _poller,
+    channels = _CHANNELS,
+    release_channels = _RELEASE_CHANNELS,
+    branches = _BRANCHES,
+    git = _DART_GIT,
+)
diff --git a/lib/defaults.star b/lib/defaults.star
new file mode 100644
index 000000000000..dc8fadc7da85
--- /dev/null
+++ b/lib/defaults.star
@@ -0,0 +1,78 @@
+# Copyright (c) 2019 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Defaults for properties and dimensions used in main.star.
+"""
+
+_PROPERTIES = {"clobber": True}
+_DIMENSIONS = {
+    "cpu": "x86-64",
+    "host_class": "default",
+    "os": "Linux",
+    "pool": "luci.dart.try",
+}
+_CACHES = {
+    "Mac": [swarming.cache("osx_sdk", name = "osx_sdk")],
+}
+_NO_ANDROID = {"custom_vars": {"download_android_deps": False}}
+_CHROME = {"custom_vars": {"download_chrome": True}}
+_FIREFOX = {"custom_vars": {"download_firefox": True}}
+_JS_ENGINES = {"custom_vars": {"checkout_javascript_engines": True}}
+_SLOW_SHARDS = {"shard_timeout": (90 * time.minute) // time.second}
+_PINNED_XCODE = {"$depot_tools/osx_sdk": {"sdk_version": "12d4e"}}
+
+_ARM64 = {"cpu": "arm64"}
+_MAC = {"os": "Mac"}
+_LINUX = {"os": "Linux"}
+_WINDOWS = {"os": "Windows"}
+
+def _union(x, overrides):
+    """ Creates a new dict with the values from all passed dictionaries
+
+    If dicts contain the same keys, their values are assumed to be dicts
+    and merged. Values in dicts later in overrides' sub-dicts will overwrite
+    values in earlier sub-dicts.
+
+    Args:
+        x (dict): A dict.
+        overrides (list): dicts to merge with x.
+
+    Returns:
+        dict: The merged dict.
+    """
+    z = {}
+    z.update(x)
+    if type(overrides) == type({}):
+        overrides = [overrides]
+    for y in overrides or []:
+        for k in y.keys():
+            v = z.get(k)
+            if v and type(v) == type({}):
+                v = dict(v, **y[k])
+                z[k] = v
+            else:
+                z[k] = y[k]
+    return z
+
+defaults = struct(
+    caches = lambda os: _CACHES.get(os),
+    dimensions = lambda overrides: _union(_DIMENSIONS, overrides),
+    properties = lambda overrides: _union(_PROPERTIES, overrides),
+)
+
+# Dimensions
+
+arm64 = _ARM64
+linux = _LINUX
+mac = _MAC
+windows = _WINDOWS
+
+# Properties
+
+chrome = _CHROME
+firefox = _FIREFOX
+js_engines = _JS_ENGINES
+no_android = _NO_ANDROID
+slow_shards = _SLOW_SHARDS
+pinned_xcode = _PINNED_XCODE
diff --git a/lib/paths.star b/lib/paths.star
new file mode 100644
index 000000000000..d80756d735b3
--- /dev/null
+++ b/lib/paths.star
@@ -0,0 +1,80 @@
+# Copyright (c) 2022 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Defines paths relevant to different parts of the Dart SDK.
+"""
+
+_TEST_PY_PATHS = "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+
+_STANDARD_PATHS = [
+    "DEPS",  # DEPS catches most third_party changes.
+    # build files
+    "build/.+",
+    "BUILD.gn",
+    "sdk_args.gni",
+    # core libraries
+    ".dart_tool/package_config.json",
+    "sdk/.+",
+    # testing
+    _TEST_PY_PATHS,
+    "tools/bots/test_matrix.json",
+    # tests
+    "tests/.+",
+]
+
+_CFE_PATHS_ONLY = [
+    "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+",
+]
+
+_CFE_PATHS = _STANDARD_PATHS + _CFE_PATHS_ONLY
+
+_VM_PATHS = _CFE_PATHS + [
+    # VM sources
+    "pkg/vm/.+",
+    "runtime/.+",
+]
+
+_DART2JS_PATHS = _CFE_PATHS + [
+    # compiler sources
+    "pkg/(compiler|dart2js_tools|js_ast)/.+",
+    "utils/compiler/.+",
+    # testing
+    "pkg/(js|modular_test|sourcemap_testing)/.+",
+]
+
+_DDC_PATHS = _CFE_PATHS + [
+    # compiler sources
+    "pkg/(build_integration|dev_compiler|meta)/.+",
+    "utils/dartdevc/.+",
+    # testing
+    "pkg/(js|modular_test|sourcemap_testing)/.+",
+]
+
+_ANALYZER_NNBD_PATHS = _STANDARD_PATHS + [
+    # analyzer sources
+    "pkg/(analyzer|analyzer_cli|_fe_analyzer_shared)/.+",
+]
+
+_ANALYZER_PATHS = _STANDARD_PATHS + [
+    # "analyzer" bots analyze everything under pkg
+    "pkg/.+",
+]
+
+def _to_location_regexp(paths):
+    return [".+/[+]/%s" % path for path in paths]
+
+paths = struct(
+    analyzer = _ANALYZER_PATHS,
+    analyzer_nnbd = _ANALYZER_NNBD_PATHS,
+    cfe = _CFE_PATHS,
+    cfe_only = _CFE_PATHS_ONLY,
+    dart2js = _DART2JS_PATHS,
+    ddc = _DDC_PATHS,
+    standard = _STANDARD_PATHS,
+    test_py = _TEST_PY_PATHS,
+    vm = _VM_PATHS,
+
+    # Utility functions
+    to_location_regexp = _to_location_regexp,
+)
diff --git a/lib/priority.star b/lib/priority.star
new file mode 100644
index 000000000000..ced75b831c22
--- /dev/null
+++ b/lib/priority.star
@@ -0,0 +1,14 @@
+# Copyright (c) 2022 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Defines priorities used by for swarming tasks. The higher the number, the lower
+the priority.
+"""
+
+priority = struct(
+    low = 70,  # Used for "FYI" post-submit builds.
+    normal = 50,  # Used for post-submit builds.
+    high = 30,  # Used for try-jobs.
+    highest = 25,  # Used for shards in the recipes, only here for completeness.
+)
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 6c5df04e83fe..056228fb15b2 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -5,707 +5,403 @@
 #   https://luci-config.appspot.com/schemas/projects:luci-milo.cfg
 
 consoles {
-  id: "be"
-  name: "SDK Bleeding Edge Console"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/main"
-  manifest_name: "REVISION"
+  id: "cq"
+  name: "SDK CQ Console"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
-    category: "cfe"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/front-end-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
-    category: "cfe"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/front-end-mac-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
-    category: "cfe"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/front-end-win-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64"
-    category: "cfe|nnbd"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/front-end-nnbd-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-mac-release-x64"
-    category: "cfe|nnbd"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/front-end-nnbd-mac-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-win-release-x64"
-    category: "cfe|nnbd"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/front-end-nnbd-win-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
-    category: "cfe"
-    short_name: "fl"
+    name: "buildbucket/luci.dart.try/flutter-frontend-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
-    category: "flutter"
-    short_name: "3H"
+    name: "buildbucket/luci.dart.try/flutter-engine-linux-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-web_tests"
-    category: "flutter"
-    short_name: "web"
+    name: "buildbucket/luci.dart.try/flutter-engine-linux-web_tests-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
-    category: "vm|nnbd|jit"
-    short_name: "d"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64"
-    category: "vm|nnbd|jit"
-    short_name: "r"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-ia32"
-    category: "vm|nnbd|jit"
-    short_name: "d3"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-ia32"
-    category: "vm|nnbd|jit"
-    short_name: "r3"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm"
-    category: "vm|nnbd|jit"
-    short_name: "ra"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-simarm-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm64"
-    category: "vm|nnbd|jit"
-    short_name: "ra6"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-simarm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-arm64"
-    category: "vm|nnbd|jit"
-    short_name: "m1d"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-debug-arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-x64"
-    category: "vm|nnbd|jit"
-    short_name: "md"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-arm64"
-    category: "vm|nnbd|jit"
-    short_name: "m1r"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-release-arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-x64"
-    category: "vm|nnbd|jit"
-    short_name: "mr"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-ia32"
-    category: "vm|nnbd|jit"
-    short_name: "wr3"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-release-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64"
-    category: "vm|nnbd|jit"
-    short_name: "wd"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-x64"
-    category: "vm|nnbd|jit"
-    short_name: "wr"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64"
-    category: "vm|nnbd|aot"
-    short_name: "r"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
-    category: "vm|nnbd|aot"
-    short_name: "da"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm_x64"
-    category: "vm|nnbd|aot"
-    short_name: "ra"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-x64"
-    category: "vm|nnbd|aot"
-    short_name: "d"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64"
-    category: "vm|nnbd|aot"
-    short_name: "ra6"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-arm64"
-    category: "vm|nnbd|aot"
-    short_name: "m1"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-mac-release-arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64"
-    category: "vm|nnbd|aot"
-    short_name: "ma6"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-release-x64"
-    category: "vm|nnbd|aot"
-    short_name: "wr"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-win-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
-    category: "vm|app-kernel"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.try/app-kernel-linux-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64"
-    category: "vm|app-kernel"
-    short_name: "p64"
+    name: "buildbucket/luci.dart.try/app-kernel-linux-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64"
-    category: "vm|app-kernel"
-    short_name: "r64"
+    name: "buildbucket/luci.dart.try/app-kernel-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
-    category: "vm|kernel"
-    short_name: "c"
+    name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
-    category: "vm|kernel"
-    short_name: "d"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
-    category: "vm|kernel"
-    short_name: "a32"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simarm-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
-    category: "vm|kernel"
-    short_name: "a64"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simarm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32"
-    category: "vm|kernel"
-    short_name: "r32"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
-    category: "vm|kernel"
-    short_name: "r"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
-    category: "vm|kernel"
-    short_name: "rc"
+    name: "buildbucket/luci.dart.try/vm-kernel-checked-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32"
-    category: "vm|kernel"
-    short_name: "d32"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
-    category: "vm|kernel"
-    short_name: "md"
+    name: "buildbucket/luci.dart.try/vm-kernel-mac-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
-    category: "vm|kernel"
-    short_name: "mr"
+    name: "buildbucket/luci.dart.try/vm-kernel-mac-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-arm64"
-    category: "vm|kernel"
-    short_name: "m1r"
+    name: "buildbucket/luci.dart.try/vm-kernel-mac-release-arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
-    category: "vm|kernel"
-    short_name: "wd3"
+    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64"
-    category: "vm|kernel"
-    short_name: "wd"
+    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32"
-    category: "vm|kernel"
-    short_name: "wr3"
+    name: "buildbucket/luci.dart.try/vm-kernel-win-release-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
-    category: "vm|kernel"
-    short_name: "wr"
+    name: "buildbucket/luci.dart.try/vm-kernel-win-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
-    category: "vm|kernel"
-    short_name: "cra"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
-    category: "vm|kernel-precomp"
-    short_name: "d"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
-    category: "vm|kernel-precomp"
-    short_name: "p"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
-    category: "vm|kernel-precomp"
-    short_name: "a32"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "a64"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "r"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "o"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-simarm_x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64"
-    category: "vm|kernel-precomp"
-    short_name: "adx"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm_x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64"
-    category: "vm|kernel-precomp"
-    short_name: "arx"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-mac-release-simarm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "ma"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "wr"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-dwarf-linux-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-precomp-linux-release-arm64"
-    category: "vm|kernel-precomp"
-    short_name: "cra"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm_x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-dwarf-linux-product-x64"
-    category: "vm|kernel-precomp"
-    short_name: "dw"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64"
-    category: "vm|kernel-precomp|android"
-    short_name: "a32"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c"
-    category: "vm|kernel-precomp|android"
-    short_name: "a64"
+    name: "buildbucket/luci.dart.try/vm-kernel-mac-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
-    category: "vm|product"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/vm-kernel-win-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
-    category: "vm|product"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
-    category: "vm|product"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
-    category: "vm|misc"
-    short_name: "o32"
+    name: "buildbucket/luci.dart.try/vm-kernel-asan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
-    category: "vm|misc"
-    short_name: "o64"
+    name: "buildbucket/luci.dart.try/vm-kernel-msan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
-    category: "vm|misc"
-    short_name: "a"
+    name: "buildbucket/luci.dart.try/vm-kernel-tsan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msan-linux-release-x64"
-    category: "vm|misc"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/vm-kernel-ubsan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-tsan-linux-release-x64"
-    category: "vm|misc"
-    short_name: "t"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-asan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ubsan-linux-release-x64"
-    category: "vm|misc"
-    short_name: "u"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-msan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-asan-linux-release-x64"
-    category: "vm|misc|aot"
-    short_name: "a"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-tsan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-msan-linux-release-x64"
-    category: "vm|misc|aot"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-ubsan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-tsan-linux-release-x64"
-    category: "vm|misc|aot"
-    short_name: "t"
+    name: "buildbucket/luci.dart.try/vm-kernel-reload-linux-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ubsan-linux-release-x64"
-    category: "vm|misc|aot"
-    short_name: "u"
+    name: "buildbucket/luci.dart.try/vm-kernel-reload-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
-    category: "vm|misc|reload"
-    short_name: "d"
+    name: "buildbucket/luci.dart.try/vm-kernel-reload-rollback-linux-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
-    category: "vm|misc|reload"
-    short_name: "r"
+    name: "buildbucket/luci.dart.try/vm-kernel-reload-rollback-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
-    category: "vm|misc|reload"
-    short_name: "drb"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64"
-    category: "vm|misc|reload"
-    short_name: "rrb"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64c"
-    category: "vm|misc|compressed"
-    short_name: "jl"
+    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-x64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64c"
-    category: "vm|misc|compressed"
-    short_name: "al"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-debug-x64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64c"
-    category: "vm|misc|compressed"
-    short_name: "jw"
+    name: "buildbucket/luci.dart.try/vm-fuchsia-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-debug-x64c"
-    category: "vm|misc|compressed"
-    short_name: "aw"
+    name: "buildbucket/luci.dart.try/vm-kernel-gcc-linux-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-fuchsia-release-x64"
-    category: "vm|misc"
-    short_name: "f"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-simriscv64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux"
-    category: "vm|misc"
-    short_name: "g"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-simriscv64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simriscv64"
-    category: "vm|misc"
-    short_name: "rv64"
+    name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simriscv64"
-    category: "vm|misc"
-    short_name: "rv64"
+    name: "buildbucket/luci.dart.try/vm-ffi-android-release-arm-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
-    category: "vm|ffi"
-    short_name: "d32"
+    name: "buildbucket/luci.dart.try/vm-ffi-android-product-arm-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm"
-    category: "vm|ffi"
-    short_name: "r32"
+    name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm"
-    category: "vm|ffi"
-    short_name: "p32"
+    name: "buildbucket/luci.dart.try/vm-ffi-android-release-arm64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c"
-    category: "vm|ffi"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.try/vm-ffi-android-product-arm64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c"
-    category: "vm|ffi"
-    short_name: "r64"
+    name: "buildbucket/luci.dart.try/vm-precomp-ffi-qemu-linux-release-arm-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c"
-    category: "vm|ffi"
-    short_name: "p64"
+    name: "buildbucket/luci.dart.try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm"
-    category: "vm|ffi"
-    short_name: "qa"
+    name: "buildbucket/luci.dart.try/pkg-linux-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64"
-    category: "vm|ffi"
-    short_name: "qr"
+    name: "buildbucket/luci.dart.try/pkg-mac-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
-    category: "pkg"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/pkg-mac-release-arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
-    category: "pkg"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/pkg-win-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-arm64"
-    category: "pkg"
-    short_name: "m1"
+    name: "buildbucket/luci.dart.try/pkg-linux-debug-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
-    category: "pkg"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/dart2js-canary-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
-    category: "pkg"
-    short_name: "ld"
+    name: "buildbucket/luci.dart.try/dart2js-strong-hostasserts-linux-ia32-d8-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64"
-    category: "dart2js"
-    short_name: "c"
+    name: "buildbucket/luci.dart.try/dart2js-minified-strong-linux-x64-d8-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
-    category: "dart2js|d8"
-    short_name: "ha"
+    name: "buildbucket/luci.dart.try/dart2js-unit-linux-x64-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
-    category: "dart2js|d8"
-    short_name: "mi"
+    name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
-    category: "dart2js|d8"
-    short_name: "u"
+    name: "buildbucket/luci.dart.try/dart2js-csp-minified-linux-x64-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/dart2js-strong-mac-x64-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "csp"
+    name: "buildbucket/luci.dart.try/dart2js-strong-win-x64-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/dart2js-nnbd-linux-x64-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-firefox-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "nn"
+    name: "buildbucket/luci.dart.try/dart2js-strong-mac-x64-safari-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/flutter-analyze-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/analyzer-analysis-server-linux-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
-    category: "dart2js|safari"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/analyzer-linux-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
-    category: "analyzer"
-    short_name: "fa"
+    name: "buildbucket/luci.dart.try/analyzer-mac-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
-    category: "analyzer"
-    short_name: "as"
+    name: "buildbucket/luci.dart.try/analyzer-win-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
-    category: "analyzer"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/analyzer-nnbd-linux-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
-    category: "analyzer"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/analyzer-nnbd-mac-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
-    category: "analyzer"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/analyzer-nnbd-win-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release"
-    category: "analyzer|nnbd"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/dart-sdk-linux-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-mac-release"
-    category: "analyzer|nnbd"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/dart-sdk-mac-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-win-release"
-    category: "analyzer|nnbd"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/dart-sdk-mac-arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
-    category: "ddc"
-    short_name: "l"
+    name: "buildbucket/luci.dart.try/dart-sdk-win-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-nnbd-linux-release-chrome"
-    category: "ddc"
-    short_name: "nn"
+    name: "buildbucket/luci.dart.try/ddc-linux-release-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
-    category: "ddc"
-    short_name: "m"
+    name: "buildbucket/luci.dart.try/ddc-nnbd-linux-release-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
-    category: "ddc"
-    short_name: "w"
+    name: "buildbucket/luci.dart.try/ddc-mac-release-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox"
-    category: "ddc"
-    short_name: "fl"
+    name: "buildbucket/luci.dart.try/ddc-win-release-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/gclient"
-    category: "misc"
-    short_name: "g"
+    name: "buildbucket/luci.dart.try/ddk-linux-release-firefox-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux"
-    category: "misc"
-    short_name: "dp"
+    name: "buildbucket/luci.dart.try/gclient-try"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/google"
-    category: "flutter"
-    short_name: "g3"
+    name: "buildbucket/luci.dart.try/benchmark-linux-try"
   }
-  header {
-    links {
-      name: "Consoles"
-      links {
-        text: "Bleeding Edge console"
-        url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
-      }
-      links {
-        text: "Alternative Bleeding Edge console"
-        url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
-      }
-      links {
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
-      }
-      links {
-        text: "SDK CQ Status"
-        url: "/p/dart/g/cq/builders"
-        alt: "SDK CQ Status"
-      }
-      links {
-        text: "Results Feed"
-        url: "https://dart-ci.firebaseapp.com/"
-        alt: "Results Feed"
-      }
-      links {
-        text: "Current Test Results"
-        url: "https://dart-ci.firebaseapp.com/current_results/"
-        alt: "Current Test Results"
-      }
-      links {
-        text: "Dart Infrastructure chat"
-        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
-        alt: "Dart Infrastructure chat"
-      }
-    }
-    console_groups {
-      console_ids: "dart/dart-fuzz"
-      console_ids: "dart/flutter"
-      console_ids: "dart/flutter-hhh"
-      console_ids: "dart/iso-stress"
-    }
-    tree_status_host: "dart-status.appspot.com"
+  builders {
+    name: "buildbucket/luci.dart.try.shared/presubmit-try"
   }
+  builder_view_only: true
 }
 consoles {
-  id: "alt"
-  name: "SDK Bleeding Edge Console (alternative)"
+  id: "be"
+  name: "SDK Bleeding Edge Console"
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "regexp:refs/heads/main"
   manifest_name: "REVISION"
@@ -754,171 +450,6 @@ consoles {
     category: "flutter"
     short_name: "web"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
-    category: "pkg"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
-    category: "pkg"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-arm64"
-    category: "pkg"
-    short_name: "m1"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
-    category: "pkg"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
-    category: "pkg"
-    short_name: "ld"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64"
-    category: "dart2js"
-    short_name: "c"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
-    category: "dart2js|d8"
-    short_name: "ha"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
-    category: "dart2js|d8"
-    short_name: "mi"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
-    category: "dart2js|d8"
-    short_name: "u"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "nn"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
-    category: "dart2js|safari"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
-    category: "analyzer"
-    short_name: "fa"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
-    category: "analyzer"
-    short_name: "as"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
-    category: "analyzer"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
-    category: "analyzer"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
-    category: "analyzer"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release"
-    category: "analyzer|nnbd"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-mac-release"
-    category: "analyzer|nnbd"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-win-release"
-    category: "analyzer|nnbd"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
-    category: "ddc"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-nnbd-linux-release-chrome"
-    category: "ddc"
-    short_name: "nn"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
-    category: "ddc"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
-    category: "ddc"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox"
-    category: "ddc"
-    short_name: "fl"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/gclient"
-    category: "misc"
-    short_name: "g"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux"
-    category: "misc"
-    short_name: "dp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/google"
-    category: "flutter"
-    short_name: "g3"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
     category: "vm|nnbd|jit"
@@ -1354,808 +885,869 @@ consoles {
     category: "vm|ffi"
     short_name: "qr"
   }
-  header {
-    links {
-      name: "Consoles"
-      links {
-        text: "Bleeding Edge console"
-        url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
-      }
-      links {
-        text: "Alternative Bleeding Edge console"
-        url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
-      }
-      links {
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
-      }
-      links {
-        text: "SDK CQ Status"
-        url: "/p/dart/g/cq/builders"
-        alt: "SDK CQ Status"
-      }
-      links {
-        text: "Results Feed"
-        url: "https://dart-ci.firebaseapp.com/"
-        alt: "Results Feed"
-      }
-      links {
-        text: "Current Test Results"
-        url: "https://dart-ci.firebaseapp.com/current_results/"
-        alt: "Current Test Results"
-      }
-      links {
-        text: "Dart Infrastructure chat"
-        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
-        alt: "Dart Infrastructure chat"
-      }
-    }
-    console_groups {
-      console_ids: "dart/dart-fuzz"
-      console_ids: "dart/flutter"
-      console_ids: "dart/flutter-hhh"
-      console_ids: "dart/iso-stress"
-    }
-    tree_status_host: "dart-status.appspot.com"
-  }
-}
-consoles {
-  id: "dev"
-  name: "SDK Dev Console"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/dev"
-  manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-dev"
-    category: "cfe"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
+    category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-dev"
-    category: "cfe"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
+    category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-dev"
-    category: "cfe"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-arm64"
+    category: "pkg"
+    short_name: "m1"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
+    category: "pkg"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-dev"
-    category: "cfe|nnbd"
-    short_name: "l"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
+    category: "pkg"
+    short_name: "ld"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-dev"
-    category: "vm|nnbd|jit"
-    short_name: "d"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64"
+    category: "dart2js"
+    short_name: "c"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-dev"
-    category: "vm|nnbd|jit"
-    short_name: "r"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
+    category: "dart2js|d8"
+    short_name: "ha"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-dev"
-    category: "vm|nnbd|aot"
-    short_name: "r"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
+    category: "dart2js|d8"
+    short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-dev"
-    category: "vm|app-kernel"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
+    category: "dart2js|d8"
+    short_name: "u"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-dev"
-    category: "vm|app-kernel"
-    short_name: "r64"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-dev"
-    category: "vm|kernel"
-    short_name: "c"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-dev"
-    category: "vm|kernel"
-    short_name: "d"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-dev"
-    category: "vm|kernel"
-    short_name: "a32"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-dev"
-    category: "vm|kernel"
-    short_name: "a64"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "nn"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-dev"
-    category: "vm|kernel"
-    short_name: "r"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-dev"
-    category: "vm|kernel"
-    short_name: "rc"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-dev"
-    category: "vm|kernel"
-    short_name: "md"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
+    category: "dart2js|safari"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-dev"
-    category: "vm|kernel"
-    short_name: "mr"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
+    category: "analyzer"
+    short_name: "fa"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-arm64-dev"
-    category: "vm|kernel"
-    short_name: "m1r"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
+    category: "analyzer"
+    short_name: "as"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-dev"
-    category: "vm|kernel"
-    short_name: "wd"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
+    category: "analyzer"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-dev"
-    category: "vm|kernel"
-    short_name: "wr"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
+    category: "analyzer"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "d"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
+    category: "analyzer"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "p"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release"
+    category: "analyzer|nnbd"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-dev"
-    category: "vm|kernel-precomp"
-    short_name: "a32"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-mac-release"
+    category: "analyzer|nnbd"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "a64"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-win-release"
+    category: "analyzer|nnbd"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "r"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
+    category: "ddc"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "o"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-nnbd-linux-release-chrome"
+    category: "ddc"
+    short_name: "nn"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "adx"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
+    category: "ddc"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "arx"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
+    category: "ddc"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "ma"
+    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox"
+    category: "ddc"
+    short_name: "fl"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "wr"
+    name: "buildbucket/luci.dart.ci.sandbox/gclient"
+    category: "misc"
+    short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-dev"
-    category: "vm|kernel-precomp|android"
-    short_name: "a32"
+    name: "buildbucket/luci.dart.ci/debianpackage-linux"
+    category: "misc"
+    short_name: "dp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-dev"
-    category: "vm|kernel-precomp|android"
-    short_name: "a64"
+    name: "buildbucket/luci.dart.ci.sandbox/google"
+    category: "flutter"
+    short_name: "g3"
   }
+  header {
+    links {
+      name: "Consoles"
+      links {
+        text: "Bleeding Edge console"
+        url: "/p/dart/g/be/console"
+        alt: "SDK BE Console"
+      }
+      links {
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (alternative)"
+      }
+      links {
+        text: "FYI console"
+        url: "/p/dart/g/fyi/console"
+        alt: "SDK FYI Console"
+      }
+      links {
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      }
+      links {
+        text: "Results Feed"
+        url: "https://dart-ci.firebaseapp.com/"
+        alt: "Results Feed"
+      }
+      links {
+        text: "Current Test Results"
+        url: "https://dart-ci.firebaseapp.com/current_results/"
+        alt: "Current Test Results"
+      }
+      links {
+        text: "Dart Infrastructure chat"
+        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
+        alt: "Dart Infrastructure chat"
+      }
+    }
+    console_groups {
+      console_ids: "dart/dart-fuzz"
+      console_ids: "dart/flutter"
+      console_ids: "dart/flutter-hhh"
+      console_ids: "dart/iso-stress"
+    }
+    tree_status_host: "dart-status.appspot.com"
+  }
+}
+consoles {
+  id: "alt"
+  name: "SDK Bleeding Edge Console (alternative)"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/main"
+  manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-dev"
-    category: "vm|misc"
-    short_name: "g"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
+    category: "cfe"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-dev"
-    category: "vm|ffi"
-    short_name: "d32"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
+    category: "cfe"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-dev"
-    category: "vm|ffi"
-    short_name: "r32"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
+    category: "cfe"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-dev"
-    category: "vm|ffi"
-    short_name: "p32"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64"
+    category: "cfe|nnbd"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-dev"
-    category: "vm|ffi"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-mac-release-x64"
+    category: "cfe|nnbd"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-dev"
-    category: "vm|ffi"
-    short_name: "r64"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-win-release-x64"
+    category: "cfe|nnbd"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-dev"
-    category: "vm|ffi"
-    short_name: "p64"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
+    category: "cfe"
+    short_name: "fl"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-dev"
-    category: "vm|ffi"
-    short_name: "qa"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
+    category: "flutter"
+    short_name: "3H"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-dev"
-    category: "vm|ffi"
-    short_name: "qr"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-web_tests"
+    category: "flutter"
+    short_name: "web"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-arm64"
+    category: "pkg"
+    short_name: "m1"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
     category: "pkg"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
+    category: "pkg"
+    short_name: "ld"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64"
     category: "dart2js"
     short_name: "c"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
     category: "dart2js|d8"
     short_name: "ha"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
     category: "dart2js|d8"
     short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
     category: "dart2js|d8"
     short_name: "u"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome"
     category: "dart2js|chrome"
     short_name: "nn"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
     category: "dart2js|firefox"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
     category: "dart2js|safari"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
+    category: "analyzer"
+    short_name: "fa"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
     category: "analyzer"
     short_name: "as"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
     category: "analyzer"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
     category: "analyzer"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
     category: "analyzer"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release"
     category: "analyzer|nnbd"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-linux-dev"
-    category: "sdk"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-dev"
-    category: "sdk"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-mac-release"
+    category: "analyzer|nnbd"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-dev"
-    category: "sdk"
-    short_name: "m1"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-win-dev"
-    category: "sdk"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-win-release"
+    category: "analyzer|nnbd"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-nnbd-linux-release-chrome"
+    category: "ddc"
+    short_name: "nn"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox"
     category: "ddc"
     short_name: "fl"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/gclient-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/gclient"
     category: "misc"
     short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux-dev"
+    name: "buildbucket/luci.dart.ci/debianpackage-linux"
     category: "misc"
     short_name: "dp"
   }
-  header {
-    links {
-      name: "Consoles"
-      links {
-        text: "Bleeding Edge console"
-        url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
-      }
-      links {
-        text: "Alternative Bleeding Edge console"
-        url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
-      }
-      links {
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
-      }
-      links {
-        text: "SDK CQ Status"
-        url: "/p/dart/g/cq/builders"
-        alt: "SDK CQ Status"
-      }
-      links {
-        text: "Results Feed"
-        url: "https://dart-ci.firebaseapp.com/"
-        alt: "Results Feed"
-      }
-      links {
-        text: "Current Test Results"
-        url: "https://dart-ci.firebaseapp.com/current_results/"
-        alt: "Current Test Results"
-      }
-      links {
-        text: "Dart Infrastructure chat"
-        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
-        alt: "Dart Infrastructure chat"
-      }
-    }
-    console_groups {
-      console_ids: "dart/dart-fuzz"
-      console_ids: "dart/flutter"
-      console_ids: "dart/flutter-hhh"
-      console_ids: "dart/iso-stress"
-    }
-    tree_status_host: "dart-status.appspot.com"
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/google"
+    category: "flutter"
+    short_name: "g3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
+    category: "vm|nnbd|jit"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64"
+    category: "vm|nnbd|jit"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-ia32"
+    category: "vm|nnbd|jit"
+    short_name: "d3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-ia32"
+    category: "vm|nnbd|jit"
+    short_name: "r3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm"
+    category: "vm|nnbd|jit"
+    short_name: "ra"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm64"
+    category: "vm|nnbd|jit"
+    short_name: "ra6"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-arm64"
+    category: "vm|nnbd|jit"
+    short_name: "m1d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-x64"
+    category: "vm|nnbd|jit"
+    short_name: "md"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-arm64"
+    category: "vm|nnbd|jit"
+    short_name: "m1r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-x64"
+    category: "vm|nnbd|jit"
+    short_name: "mr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-ia32"
+    category: "vm|nnbd|jit"
+    short_name: "wr3"
   }
-}
-consoles {
-  id: "beta"
-  name: "SDK Beta Console"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/beta"
-  manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-beta"
-    category: "cfe"
-    short_name: "l"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64"
+    category: "vm|nnbd|jit"
+    short_name: "wd"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-beta"
-    category: "cfe"
-    short_name: "m"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-x64"
+    category: "vm|nnbd|jit"
+    short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-beta"
-    category: "cfe"
-    short_name: "w"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64"
+    category: "vm|nnbd|aot"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-beta"
-    category: "cfe|nnbd"
-    short_name: "l"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+    category: "vm|nnbd|aot"
+    short_name: "da"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-beta"
-    category: "vm|nnbd|jit"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+    category: "vm|nnbd|aot"
+    short_name: "ra"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-x64"
+    category: "vm|nnbd|aot"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-beta"
-    category: "vm|nnbd|jit"
-    short_name: "r"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64"
+    category: "vm|nnbd|aot"
+    short_name: "ra6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-arm64"
     category: "vm|nnbd|aot"
-    short_name: "r"
+    short_name: "m1"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64"
+    category: "vm|nnbd|aot"
+    short_name: "ma6"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-release-x64"
+    category: "vm|nnbd|aot"
+    short_name: "wr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
     category: "vm|app-kernel"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64"
+    category: "vm|app-kernel"
+    short_name: "p64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64"
     category: "vm|app-kernel"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
     category: "vm|kernel"
     short_name: "c"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
     category: "vm|kernel"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32"
+    category: "vm|kernel"
+    short_name: "r32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
     category: "vm|kernel"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
     category: "vm|kernel"
     short_name: "rc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32"
+    category: "vm|kernel"
+    short_name: "d32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
     category: "vm|kernel"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
     category: "vm|kernel"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-arm64"
+    category: "vm|kernel"
+    short_name: "m1r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
+    category: "vm|kernel"
+    short_name: "wd3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64"
     category: "vm|kernel"
     short_name: "wd"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32"
+    category: "vm|kernel"
+    short_name: "wr3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
     category: "vm|kernel"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
+    category: "vm|kernel"
+    short_name: "cra"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
     category: "vm|kernel-precomp"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
     category: "vm|kernel-precomp"
     short_name: "p"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
     category: "vm|kernel-precomp"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
     category: "vm|kernel-precomp"
     short_name: "o"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64"
     category: "vm|kernel-precomp"
     short_name: "adx"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64"
     category: "vm|kernel-precomp"
     short_name: "arx"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
     category: "vm|kernel-precomp"
     short_name: "ma"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-precomp-linux-release-arm64"
+    category: "vm|kernel-precomp"
+    short_name: "cra"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-dwarf-linux-product-x64"
+    category: "vm|kernel-precomp"
+    short_name: "dw"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64"
     category: "vm|kernel-precomp|android"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c"
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-beta"
-    category: "vm|misc"
-    short_name: "g"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
+    category: "vm|product"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-beta"
-    category: "vm|ffi"
-    short_name: "d32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
+    category: "vm|product"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-beta"
-    category: "vm|ffi"
-    short_name: "r32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
+    category: "vm|product"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-beta"
-    category: "vm|ffi"
-    short_name: "p32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
+    category: "vm|misc"
+    short_name: "o32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-beta"
-    category: "vm|ffi"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
+    category: "vm|misc"
+    short_name: "o64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-beta"
-    category: "vm|ffi"
-    short_name: "r64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "a"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-beta"
-    category: "vm|ffi"
-    short_name: "p64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-beta"
-    category: "vm|ffi"
-    short_name: "qa"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-tsan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "t"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-beta"
-    category: "vm|ffi"
-    short_name: "qr"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ubsan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "u"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-beta"
-    category: "pkg"
-    short_name: "l"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-asan-linux-release-x64"
+    category: "vm|misc|aot"
+    short_name: "a"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-beta"
-    category: "pkg"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-msan-linux-release-x64"
+    category: "vm|misc|aot"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-beta"
-    category: "pkg"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-beta"
-    category: "dart2js"
-    short_name: "c"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-beta"
-    category: "dart2js|d8"
-    short_name: "ha"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-beta"
-    category: "dart2js|d8"
-    short_name: "mi"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-tsan-linux-release-x64"
+    category: "vm|misc|aot"
+    short_name: "t"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-beta"
-    category: "dart2js|d8"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ubsan-linux-release-x64"
+    category: "vm|misc|aot"
     short_name: "u"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-beta"
-    category: "dart2js|chrome"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-beta"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-beta"
-    category: "dart2js|chrome"
-    short_name: "m"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
+    category: "vm|misc|reload"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-beta"
-    category: "dart2js|chrome"
-    short_name: "w"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
+    category: "vm|misc|reload"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-beta"
-    category: "dart2js|chrome"
-    short_name: "nn"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
+    category: "vm|misc|reload"
+    short_name: "drb"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-beta"
-    category: "dart2js|firefox"
-    short_name: "l"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64"
+    category: "vm|misc|reload"
+    short_name: "rrb"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-beta"
-    category: "dart2js|safari"
-    short_name: "m"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "jl"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-beta"
-    category: "analyzer"
-    short_name: "as"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "al"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-beta"
-    category: "analyzer"
-    short_name: "l"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "jw"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-beta"
-    category: "analyzer"
-    short_name: "m"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "aw"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-beta"
-    category: "analyzer"
-    short_name: "w"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-fuchsia-release-x64"
+    category: "vm|misc"
+    short_name: "f"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-beta"
-    category: "analyzer|nnbd"
-    short_name: "l"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux"
+    category: "vm|misc"
+    short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-linux-beta"
-    category: "sdk"
-    short_name: "l"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simriscv64"
+    category: "vm|misc"
+    short_name: "rv64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-beta"
-    category: "sdk"
-    short_name: "m"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simriscv64"
+    category: "vm|misc"
+    short_name: "rv64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-beta"
-    category: "sdk"
-    short_name: "m1"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
+    category: "vm|ffi"
+    short_name: "d32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-win-beta"
-    category: "sdk"
-    short_name: "w"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm"
+    category: "vm|ffi"
+    short_name: "r32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-beta"
-    category: "ddc"
-    short_name: "l"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm"
+    category: "vm|ffi"
+    short_name: "p32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-beta"
-    category: "ddc"
-    short_name: "m"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c"
+    category: "vm|ffi"
+    short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-beta"
-    category: "ddc"
-    short_name: "w"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c"
+    category: "vm|ffi"
+    short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-beta"
-    category: "ddc"
-    short_name: "fl"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c"
+    category: "vm|ffi"
+    short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/gclient-beta"
-    category: "misc"
-    short_name: "g"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm"
+    category: "vm|ffi"
+    short_name: "qa"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux-beta"
-    category: "misc"
-    short_name: "dp"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64"
+    category: "vm|ffi"
+    short_name: "qr"
   }
   header {
     links {
@@ -2206,353 +1798,358 @@ consoles {
   }
 }
 consoles {
-  id: "stable"
-  name: "SDK Stable Console"
+  id: "dev"
+  name: "SDK Dev Console"
   repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/stable"
+  refs: "regexp:refs/heads/dev"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-dev"
     category: "cfe"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-dev"
     category: "cfe"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-dev"
     category: "cfe"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-dev"
     category: "cfe|nnbd"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-dev"
     category: "vm|nnbd|jit"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-dev"
     category: "vm|nnbd|jit"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-dev"
     category: "vm|nnbd|aot"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-dev"
     category: "vm|app-kernel"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-dev"
     category: "vm|app-kernel"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-dev"
     category: "vm|kernel"
     short_name: "c"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-dev"
     category: "vm|kernel"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-dev"
     category: "vm|kernel"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-dev"
     category: "vm|kernel"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-dev"
     category: "vm|kernel"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-dev"
     category: "vm|kernel"
     short_name: "rc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-dev"
     category: "vm|kernel"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-dev"
     category: "vm|kernel"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-arm64-dev"
+    category: "vm|kernel"
+    short_name: "m1r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-dev"
     category: "vm|kernel"
     short_name: "wd"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-dev"
     category: "vm|kernel"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "p"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-dev"
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-dev"
     category: "vm|kernel-precomp"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "o"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-dev"
     category: "vm|kernel-precomp"
     short_name: "adx"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-dev"
     category: "vm|kernel-precomp"
     short_name: "arx"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-dev"
     category: "vm|kernel-precomp"
     short_name: "ma"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-dev"
     category: "vm|kernel-precomp"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-dev"
     category: "vm|kernel-precomp|android"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-dev"
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-dev"
     category: "vm|misc"
     short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-dev"
     category: "vm|ffi"
     short_name: "d32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-dev"
     category: "vm|ffi"
     short_name: "r32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-dev"
     category: "vm|ffi"
     short_name: "p32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-dev"
     category: "vm|ffi"
     short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-dev"
     category: "vm|ffi"
     short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-dev"
     category: "vm|ffi"
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-dev"
     category: "vm|ffi"
     short_name: "qa"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-dev"
     category: "vm|ffi"
     short_name: "qr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
     category: "pkg"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-dev"
     category: "pkg"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-dev"
     category: "pkg"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-dev"
     category: "dart2js"
     short_name: "c"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-dev"
     category: "dart2js|d8"
     short_name: "ha"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-dev"
     category: "dart2js|d8"
     short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-dev"
     category: "dart2js|d8"
     short_name: "u"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-dev"
     category: "dart2js|chrome"
     short_name: "nn"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-dev"
     category: "dart2js|firefox"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-dev"
     category: "dart2js|safari"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-dev"
     category: "analyzer"
     short_name: "as"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-dev"
     category: "analyzer"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-dev"
     category: "analyzer"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-dev"
     category: "analyzer"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-dev"
     category: "analyzer|nnbd"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-linux-stable"
+    name: "buildbucket/luci.dart.ci/dart-sdk-linux-dev"
     category: "sdk"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-stable"
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-dev"
     category: "sdk"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-stable"
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-dev"
     category: "sdk"
     short_name: "m1"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-win-stable"
+    name: "buildbucket/luci.dart.ci/dart-sdk-win-dev"
     category: "sdk"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-dev"
     category: "ddc"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-dev"
     category: "ddc"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-dev"
     category: "ddc"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-dev"
     category: "ddc"
     short_name: "fl"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/gclient-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/gclient-dev"
     category: "misc"
     short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux-stable"
+    name: "buildbucket/luci.dart.ci/debianpackage-linux-dev"
     category: "misc"
     short_name: "dp"
   }
@@ -2605,457 +2202,860 @@ consoles {
   }
 }
 consoles {
-  id: "dart-fuzz"
-  name: "Dart Fuzzer Console"
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/fuzz-linux"
-  }
-  builder_view_only: true
-}
-consoles {
-  id: "flutter"
-  name: "Dart/Flutter Console"
+  id: "beta"
+  name: "SDK Beta Console"
   repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/main"
+  refs: "regexp:refs/heads/beta"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
-    category: "analyzer"
-    short_name: "fa"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-beta"
+    category: "cfe"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
-    category: "fasta"
-    short_name: "fl"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-beta"
+    category: "cfe"
+    short_name: "m"
   }
-}
-consoles {
-  id: "flutter-hhh"
-  name: "Dart/Flutter Linear History Console"
-  repo_url: "https://dart.googlesource.com/linear_sdk_flutter_engine"
-  refs: "regexp:refs/heads/master"
-  manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
-    category: "flutter"
-    short_name: "3H"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-beta"
+    category: "cfe"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-web_tests"
-    category: "flutter"
-    short_name: "web"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-beta"
+    category: "cfe|nnbd"
+    short_name: "l"
   }
-}
-consoles {
-  id: "iso-stress"
-  name: "VM Isolate Stress Test Console"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/iso-stress-linux"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-beta"
+    category: "vm|nnbd|jit"
+    short_name: "d"
   }
-  builder_view_only: true
-}
-consoles {
-  id: "fyi"
-  name: "SDK FYI Console"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/main"
-  manifest_name: "REVISION"
-}
-consoles {
-  id: "cq"
-  name: "SDK CQ Console"
   builders {
-    name: "buildbucket/luci.dart.try/front-end-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-beta"
+    category: "vm|nnbd|jit"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.try/front-end-mac-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-beta"
+    category: "vm|nnbd|aot"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.try/front-end-win-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-beta"
+    category: "vm|app-kernel"
+    short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/front-end-nnbd-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-beta"
+    category: "vm|app-kernel"
+    short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/front-end-nnbd-mac-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-beta"
+    category: "vm|kernel"
+    short_name: "c"
   }
   builders {
-    name: "buildbucket/luci.dart.try/front-end-nnbd-win-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-beta"
+    category: "vm|kernel"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-frontend-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-beta"
+    category: "vm|kernel"
+    short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-engine-linux-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-beta"
+    category: "vm|kernel"
+    short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-engine-linux-web_tests-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-beta"
+    category: "vm|kernel"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-beta"
+    category: "vm|kernel"
+    short_name: "rc"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-beta"
+    category: "vm|kernel"
+    short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-ia32-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-beta"
+    category: "vm|kernel"
+    short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-ia32-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-beta"
+    category: "vm|kernel"
+    short_name: "wd"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-simarm-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-beta"
+    category: "vm|kernel"
+    short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-simarm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-debug-arm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "p"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-beta"
+    category: "vm|kernel-precomp"
+    short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-release-arm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-release-ia32-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "o"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "adx"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "arx"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "ma"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-beta"
+    category: "vm|kernel-precomp|android"
+    short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-beta"
+    category: "vm|kernel-precomp|android"
+    short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-beta"
+    category: "vm|misc"
+    short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-mac-release-arm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-beta"
+    category: "vm|ffi"
+    short_name: "d32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-beta"
+    category: "vm|ffi"
+    short_name: "r32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-win-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-beta"
+    category: "vm|ffi"
+    short_name: "p32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/app-kernel-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-beta"
+    category: "vm|ffi"
+    short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/app-kernel-linux-product-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-beta"
+    category: "vm|ffi"
+    short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/app-kernel-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-beta"
+    category: "vm|ffi"
+    short_name: "p64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-beta"
+    category: "vm|ffi"
+    short_name: "qa"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-beta"
+    category: "vm|ffi"
+    short_name: "qr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-beta"
+    category: "pkg"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-beta"
+    category: "pkg"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-beta"
+    category: "pkg"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-beta"
+    category: "dart2js"
+    short_name: "c"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-beta"
+    category: "dart2js|d8"
+    short_name: "ha"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-beta"
+    category: "dart2js|d8"
+    short_name: "mi"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-beta"
+    category: "dart2js|d8"
+    short_name: "u"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-beta"
+    category: "dart2js|chrome"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-beta"
+    category: "dart2js|chrome"
+    short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-beta"
+    category: "dart2js|chrome"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simarm-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-beta"
+    category: "dart2js|chrome"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simarm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-beta"
+    category: "dart2js|chrome"
+    short_name: "nn"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-ia32-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-beta"
+    category: "dart2js|firefox"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-beta"
+    category: "dart2js|safari"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-checked-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-beta"
+    category: "analyzer"
+    short_name: "as"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-ia32-try"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-beta"
+    category: "analyzer"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-mac-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-beta"
+    category: "analyzer"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-mac-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-beta"
+    category: "analyzer"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-mac-release-arm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-beta"
+    category: "analyzer|nnbd"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-ia32-try"
+    name: "buildbucket/luci.dart.ci/dart-sdk-linux-beta"
+    category: "sdk"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-x64-try"
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-beta"
+    category: "sdk"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-release-ia32-try"
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-beta"
+    category: "sdk"
+    short_name: "m1"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-release-x64-try"
+    name: "buildbucket/luci.dart.ci/dart-sdk-win-beta"
+    category: "sdk"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-beta"
+    category: "ddc"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-product-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-beta"
+    category: "ddc"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm-try"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-beta"
+    category: "ddc"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-beta"
+    category: "ddc"
+    short_name: "fl"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/gclient-beta"
+    category: "misc"
+    short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci/debianpackage-linux-beta"
+    category: "misc"
+    short_name: "dp"
+  }
+  header {
+    links {
+      name: "Consoles"
+      links {
+        text: "Bleeding Edge console"
+        url: "/p/dart/g/be/console"
+        alt: "SDK BE Console"
+      }
+      links {
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (alternative)"
+      }
+      links {
+        text: "FYI console"
+        url: "/p/dart/g/fyi/console"
+        alt: "SDK FYI Console"
+      }
+      links {
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      }
+      links {
+        text: "Results Feed"
+        url: "https://dart-ci.firebaseapp.com/"
+        alt: "Results Feed"
+      }
+      links {
+        text: "Current Test Results"
+        url: "https://dart-ci.firebaseapp.com/current_results/"
+        alt: "Current Test Results"
+      }
+      links {
+        text: "Dart Infrastructure chat"
+        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
+        alt: "Dart Infrastructure chat"
+      }
+    }
+    console_groups {
+      console_ids: "dart/dart-fuzz"
+      console_ids: "dart/flutter"
+      console_ids: "dart/flutter-hhh"
+      console_ids: "dart/iso-stress"
+    }
+    tree_status_host: "dart-status.appspot.com"
   }
+}
+consoles {
+  id: "stable"
+  name: "SDK Stable Console"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/stable"
+  manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-simarm_x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-stable"
+    category: "cfe"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm_x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-stable"
+    category: "cfe"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-mac-release-simarm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-stable"
+    category: "cfe"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-stable"
+    category: "cfe|nnbd"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-dwarf-linux-product-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-stable"
+    category: "vm|nnbd|jit"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm_x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-stable"
+    category: "vm|nnbd|jit"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm64c-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-stable"
+    category: "vm|nnbd|aot"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-product-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-stable"
+    category: "vm|app-kernel"
+    short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-mac-product-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-stable"
+    category: "vm|app-kernel"
+    short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-product-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-stable"
+    category: "vm|kernel"
+    short_name: "c"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-stable"
+    category: "vm|kernel"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-stable"
+    category: "vm|kernel"
+    short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-asan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-stable"
+    category: "vm|kernel"
+    short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-msan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-stable"
+    category: "vm|kernel"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-tsan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-stable"
+    category: "vm|kernel"
+    short_name: "rc"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-ubsan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-stable"
+    category: "vm|kernel"
+    short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-asan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-stable"
+    category: "vm|kernel"
+    short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-msan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-stable"
+    category: "vm|kernel"
+    short_name: "wd"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-tsan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-stable"
+    category: "vm|kernel"
+    short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-ubsan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-reload-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "p"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-reload-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-stable"
+    category: "vm|kernel-precomp"
+    short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-reload-rollback-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-reload-rollback-linux-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64c-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "o"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64c-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "adx"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-x64c-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "arx"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-debug-x64c-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "ma"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-fuchsia-release-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-gcc-linux-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-stable"
+    category: "vm|kernel-precomp|android"
+    short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-simriscv64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-stable"
+    category: "vm|kernel-precomp|android"
+    short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-simriscv64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-stable"
+    category: "vm|misc"
+    short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-stable"
+    category: "vm|ffi"
+    short_name: "d32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-ffi-android-release-arm-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-stable"
+    category: "vm|ffi"
+    short_name: "r32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-ffi-android-product-arm-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-stable"
+    category: "vm|ffi"
+    short_name: "p32"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm64c-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-stable"
+    category: "vm|ffi"
+    short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-ffi-android-release-arm64c-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-stable"
+    category: "vm|ffi"
+    short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-ffi-android-product-arm64c-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-stable"
+    category: "vm|ffi"
+    short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-precomp-ffi-qemu-linux-release-arm-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-stable"
+    category: "vm|ffi"
+    short_name: "qa"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-stable"
+    category: "vm|ffi"
+    short_name: "qr"
   }
   builders {
-    name: "buildbucket/luci.dart.try/pkg-linux-release-try"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
+    category: "pkg"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/pkg-mac-release-try"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-stable"
+    category: "pkg"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/pkg-mac-release-arm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-stable"
+    category: "pkg"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/pkg-win-release-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-stable"
+    category: "dart2js"
+    short_name: "c"
   }
   builders {
-    name: "buildbucket/luci.dart.try/pkg-linux-debug-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-stable"
+    category: "dart2js|d8"
+    short_name: "ha"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-canary-x64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-stable"
+    category: "dart2js|d8"
+    short_name: "mi"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-hostasserts-linux-ia32-d8-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-stable"
+    category: "dart2js|d8"
+    short_name: "u"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-minified-strong-linux-x64-d8-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-unit-linux-x64-release-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-chrome-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-csp-minified-linux-x64-chrome-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-mac-x64-chrome-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "nn"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-win-x64-chrome-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-stable"
+    category: "dart2js|firefox"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-nnbd-linux-x64-chrome-try"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-stable"
+    category: "dart2js|safari"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-firefox-try"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-stable"
+    category: "analyzer"
+    short_name: "as"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-mac-x64-safari-try"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-stable"
+    category: "analyzer"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-analyze-try"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-stable"
+    category: "analyzer"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/analyzer-analysis-server-linux-try"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-stable"
+    category: "analyzer"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/analyzer-linux-release-try"
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-stable"
+    category: "analyzer|nnbd"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/analyzer-mac-release-try"
+    name: "buildbucket/luci.dart.ci/dart-sdk-linux-stable"
+    category: "sdk"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/analyzer-win-release-try"
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-stable"
+    category: "sdk"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/analyzer-nnbd-linux-release-try"
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-stable"
+    category: "sdk"
+    short_name: "m1"
   }
   builders {
-    name: "buildbucket/luci.dart.try/analyzer-nnbd-mac-release-try"
+    name: "buildbucket/luci.dart.ci/dart-sdk-win-stable"
+    category: "sdk"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/analyzer-nnbd-win-release-try"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-stable"
+    category: "ddc"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart-sdk-linux-try"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-stable"
+    category: "ddc"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart-sdk-mac-try"
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-stable"
+    category: "ddc"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart-sdk-mac-arm64-try"
+    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-stable"
+    category: "ddc"
+    short_name: "fl"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart-sdk-win-try"
+    name: "buildbucket/luci.dart.ci.sandbox/gclient-stable"
+    category: "misc"
+    short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.try/ddc-linux-release-chrome-try"
+    name: "buildbucket/luci.dart.ci/debianpackage-linux-stable"
+    category: "misc"
+    short_name: "dp"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/ddc-nnbd-linux-release-chrome-try"
+  header {
+    links {
+      name: "Consoles"
+      links {
+        text: "Bleeding Edge console"
+        url: "/p/dart/g/be/console"
+        alt: "SDK BE Console"
+      }
+      links {
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (alternative)"
+      }
+      links {
+        text: "FYI console"
+        url: "/p/dart/g/fyi/console"
+        alt: "SDK FYI Console"
+      }
+      links {
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      }
+      links {
+        text: "Results Feed"
+        url: "https://dart-ci.firebaseapp.com/"
+        alt: "Results Feed"
+      }
+      links {
+        text: "Current Test Results"
+        url: "https://dart-ci.firebaseapp.com/current_results/"
+        alt: "Current Test Results"
+      }
+      links {
+        text: "Dart Infrastructure chat"
+        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
+        alt: "Dart Infrastructure chat"
+      }
+    }
+    console_groups {
+      console_ids: "dart/dart-fuzz"
+      console_ids: "dart/flutter"
+      console_ids: "dart/flutter-hhh"
+      console_ids: "dart/iso-stress"
+    }
+    tree_status_host: "dart-status.appspot.com"
   }
+}
+consoles {
+  id: "dart-fuzz"
+  name: "Dart Fuzzer Console"
   builders {
-    name: "buildbucket/luci.dart.try/ddc-mac-release-chrome-try"
+    name: "buildbucket/luci.dart.ci.sandbox/fuzz-linux"
   }
+  builder_view_only: true
+}
+consoles {
+  id: "flutter"
+  name: "Dart/Flutter Console"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/main"
+  manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.try/ddc-win-release-chrome-try"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
+    category: "analyzer"
+    short_name: "fa"
   }
   builders {
-    name: "buildbucket/luci.dart.try/ddk-linux-release-firefox-try"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
+    category: "fasta"
+    short_name: "fl"
   }
+}
+consoles {
+  id: "flutter-hhh"
+  name: "Dart/Flutter Linear History Console"
+  repo_url: "https://dart.googlesource.com/linear_sdk_flutter_engine"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.try/gclient-try"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
+    category: "flutter"
+    short_name: "3H"
   }
   builders {
-    name: "buildbucket/luci.dart.try/benchmark-linux-try"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-web_tests"
+    category: "flutter"
+    short_name: "web"
   }
+}
+consoles {
+  id: "iso-stress"
+  name: "VM Isolate Stress Test Console"
   builders {
-    name: "buildbucket/luci.dart.try.shared/presubmit-try"
+    name: "buildbucket/luci.dart.ci.sandbox/iso-stress-linux"
   }
   builder_view_only: true
 }
+consoles {
+  id: "fyi"
+  name: "SDK FYI Console"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/main"
+  manifest_name: "REVISION"
+}
 consoles {
   id: "infra"
   name: "Infra Console"
diff --git a/luci-notify.cfg b/luci-notify.cfg
index 02504fc7fec9..727fa04f38a0 100644
--- a/luci-notify.cfg
+++ b/luci-notify.cfg
@@ -11,7 +11,6 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -26,7 +25,6 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -41,7 +39,6 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -56,7 +53,6 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -71,7 +67,6 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -86,7 +81,6 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -101,7 +95,6 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -116,7 +109,6 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -132,7 +124,6 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -147,7 +138,6 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -163,7 +153,6 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -178,7 +167,6 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -189,9 +177,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -203,9 +188,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -217,9 +199,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -231,9 +210,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -245,10 +221,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
-    }
   }
   builders {
     bucket: "ci.sandbox"
@@ -259,10 +231,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
-    }
   }
   builders {
     bucket: "ci.sandbox"
@@ -273,9 +241,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -287,9 +252,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -314,9 +276,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -329,9 +288,6 @@ notifiers {
   notifications {
     on_success: true
     on_failure: true
-    email {
-      recipients: "karlklose@google.com"
-    }
   }
   builders {
     bucket: "ci.sandbox"
@@ -342,9 +298,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -369,9 +322,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -383,9 +333,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -397,9 +344,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -411,9 +355,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -425,9 +366,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -439,9 +377,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -453,9 +388,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -467,9 +399,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -481,9 +410,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -495,9 +421,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -509,9 +432,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -523,9 +443,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -537,9 +454,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -551,9 +465,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -565,9 +476,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -579,9 +487,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -593,9 +498,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -607,9 +509,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -634,9 +533,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -648,9 +544,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -662,9 +555,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -676,10 +566,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
-    }
   }
   builders {
     bucket: "ci.sandbox"
@@ -690,10 +576,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
-    }
   }
   builders {
     bucket: "ci.sandbox"
@@ -704,9 +586,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -743,9 +622,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -770,9 +646,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -784,9 +657,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -798,9 +668,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -812,9 +679,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -826,9 +690,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -840,9 +701,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -854,9 +712,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -868,9 +723,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -882,9 +734,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -896,9 +745,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -910,9 +756,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -924,9 +767,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -938,9 +778,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -953,8 +790,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -966,9 +802,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1019,9 +852,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1072,9 +902,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1086,9 +913,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1100,9 +924,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1114,9 +935,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1141,9 +959,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1155,9 +970,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1170,8 +982,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1196,9 +1007,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1249,9 +1057,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1289,9 +1094,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1368,9 +1170,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1382,9 +1181,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1396,9 +1192,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1411,8 +1204,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1437,9 +1229,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1464,9 +1253,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1491,9 +1277,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1505,9 +1288,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1519,9 +1299,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1533,9 +1310,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1547,9 +1321,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1561,9 +1332,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1576,8 +1344,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1590,8 +1357,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1604,8 +1370,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1618,8 +1383,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1632,8 +1396,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1645,9 +1408,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1659,9 +1419,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1674,8 +1431,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1688,8 +1444,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1701,9 +1456,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1716,8 +1468,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1730,8 +1481,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1756,9 +1506,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1823,8 +1570,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1837,8 +1583,7 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "karlklose@google.com"
-      recipients: "athom@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
@@ -1863,9 +1608,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1916,9 +1658,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1930,9 +1669,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
@@ -1948,7 +1684,6 @@ notifiers {
       recipients: "athom@google.com"
       recipients: "sortie@google.com"
       recipients: "whesse@google.com"
-      recipients: "karlklose@google.com"
     }
   }
   builders {
@@ -1960,9 +1695,6 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
     notify_blamelist {}
   }
   builders {
diff --git a/main.star b/main.star
index 1c9a63e5d957..3ba8f08bfa2d 100755
--- a/main.star
+++ b/main.star
@@ -12,258 +12,43 @@
 Generates the Luci configuration for the Dart project.
 """
 
-load("//defaults.star", "defaults")
+load("//lib/cron.star", "cron")
+load("//lib/dart.star", "dart")
+load(
+    "//lib/defaults.star",
+    "arm64",
+    "chrome",
+    "firefox",
+    "js_engines",
+    "mac",
+    "no_android",
+    "pinned_xcode",
+    "windows",
+)
+load("//lib/paths.star", "paths")
+load("//lib/priority.star", "priority")
 
 lucicfg.check_version("1.30.9")
 
+# Global builder defaults
+# These need to be set at the top level to affect all uses of luci.builder.
 luci.builder.defaults.experiments.set({
-    # Launch 100% of Swarming tasks in "realms-aware mode", crbug.com/1170330.
-    "luci.use_realms": 100,
     "luci.buildbucket.use_bbagent": 100,
     "luci.recipes.use_python3": 100,
+    # Launch 100% of Swarming tasks in "realms-aware mode", crbug.com/1170330.
+    "luci.use_realms": 100,
+})
+luci.builder.defaults.properties.set({
+    "$recipe_engine/isolated": {
+        "server": "https://isolateserver.appspot.com",
+    },
+    "$recipe_engine/swarming": {
+        "server": "https://chromium-swarm.appspot.com",
+    },
 })
 
-DART_GIT = "https://dart.googlesource.com/sdk"
-DART_GERRIT = "https://dart-review.googlesource.com/"
-
-GOMA_RBE = {
-    "server_host": "goma.chromium.org",
-    "use_luci_auth": True,
-}
-
-RELEASE_CHANNELS = ["beta", "dev", "stable"]
-CHANNELS = RELEASE_CHANNELS + ["try"]
-BRANCHES = ["main"] + RELEASE_CHANNELS
-
-TEST_PY_PATHS = "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-
-STANDARD_PATHS = [
-    "DEPS",  # DEPS catches most third_party changes.
-    # build files
-    "build/.+",
-    "BUILD.gn",
-    "sdk_args.gni",
-    # core libraries
-    ".dart_tool/package_config.json",
-    "sdk/.+",
-    # testing
-    TEST_PY_PATHS,
-    "tools/bots/test_matrix.json",
-    # tests
-    "tests/.+",
-]
-
-CFE_PATHS_ONLY = [
-    "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+",
-]
-
-CFE_PATHS = STANDARD_PATHS + CFE_PATHS_ONLY
-
-VM_PATHS = CFE_PATHS + [
-    # VM sources
-    "pkg/vm/.+",
-    "runtime/.+",
-]
-
-DART2JS_PATHS = CFE_PATHS + [
-    # compiler sources
-    "pkg/(compiler|dart2js_tools|js_ast)/.+",
-    "utils/compiler/.+",
-    # testing
-    "pkg/(js|modular_test|sourcemap_testing)/.+",
-]
-
-DDC_PATHS = CFE_PATHS + [
-    # compiler sources
-    "pkg/(build_integration|dev_compiler|meta)/.+",
-    "utils/dartdevc/.+",
-    # testing
-    "pkg/(js|modular_test|sourcemap_testing)/.+",
-]
-
-ANALYZER_NNBD_PATHS = STANDARD_PATHS + [
-    # analyzer sources
-    "pkg/(analyzer|analyzer_cli|_fe_analyzer_shared)/.+",
-]
-
-ANALYZER_PATHS = STANDARD_PATHS + [
-    # "analyzer" bots analyze everything under pkg
-    "pkg/.+",
-]
-
-# Priorities used by the swarming scheduler. The higher the number, the lower
-# the priority.
-LOW = 70  # Used for "FYI" post-submit builds.
-NORMAL = 50  # Used for post-submit builds.
-HIGH = 30  # Used for try-jobs.
-HIGHEST = 25  # Used for shards in the recipes, included here for completeness.
-
-NO_ANDROID = {"custom_vars": {"download_android_deps": False}}
-CHROME = {"custom_vars": {"download_chrome": True}}
-FIREFOX = {"custom_vars": {"download_firefox": True}}
-JS_ENGINES = {"custom_vars": {"checkout_javascript_engines": True}}
-SLOW_SHARDS = {"shard_timeout": (90 * time.minute) // time.second}
-PINNED_XCODE = {"$depot_tools/osx_sdk": {"sdk_version": "12d4e"}}
-
-def to_location_regexp(paths):
-    return [".+/[+]/%s" % path for path in paths]
-
-def mac(cpu = None):
-    dimensions = {"os": "Mac"}
-    if cpu:
-        dimensions["cpu"] = cpu
-    return dimensions
-
-def windows():
-    return {"os": "Windows"}
-
-def linux():
-    return {"os": "Linux"}
-
-def union(x, *args):
-    """ Creates a new dict with the values from all passed dictionaries
-
-    If dicts contain the same keys, their values are assumed to be dicts
-    and merged. Values in dicts later in *args sub-dicts will overwrite
-    values in earlier sub-dicts.
-
-    Args:
-        x (dict): A dict.
-        *args: dicts to merge with x.
-
-    Returns:
-        dict: The merged dict.
-    """
-    z = {}
-    z.update(x)
-    for y in args:
-        for k in y.keys():
-            v = z.get(k)
-            if v:
-                v = dict(v, **y[k])
-                z[k] = v
-            else:
-                z[k] = y[k]
-    return z
-
-# https://chrome-infra-auth.appspot.com/auth/groups/project-dart-ci-task-accounts
-CI_ACCOUNTS_GROUP = "project-dart-ci-task-accounts"
-
-# https://chrome-infra-auth.appspot.com/auth/groups/project-dart-try-task-accounts
-TRY_ACCOUNTS_GROUP = "project-dart-try-task-accounts"
-
-CI_ACCOUNT = "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-TRY_ACCOUNT = "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-ROLL_TRIGGERERS = {
-    "users": [
-        CI_ACCOUNT,
-    ],
-    "groups": ["project-dart-roller-owners"],
-}
-CI_SANDBOX_TRIGGERERS = [CI_ACCOUNT, TRY_ACCOUNT]
-
-lucicfg.config(
-    config_dir = ".",
-    tracked_files = [
-        "commit-queue.cfg",
-        "cr-buildbucket.cfg",
-        "luci-logdog.cfg",
-        "luci-milo.cfg",
-        "luci-notify.cfg",
-        "luci-scheduler.cfg",
-        "project.cfg",
-        "realms.cfg",
-    ],
-    lint_checks = ["default"],
-)
-
-luci.project(
-    name = "dart",
-    buildbucket = "cr-buildbucket.appspot.com",
-    logdog = "luci-logdog.appspot.com",
-    milo = "luci-milo.appspot.com",
-    notify = "luci-notify.appspot.com",
-    scheduler = "luci-scheduler.appspot.com",
-    swarming = "chromium-swarm.appspot.com",
-    acls = [
-        acl.entry(
-            [
-                acl.BUILDBUCKET_READER,
-                acl.LOGDOG_READER,
-                acl.PROJECT_CONFIGS_READER,
-                acl.SCHEDULER_READER,
-            ],
-            groups = ["all"],
-        ),
-        acl.entry(acl.LOGDOG_WRITER, groups = ["luci-logdog-chromium-writers"]),
-        acl.entry(
-            [acl.SCHEDULER_OWNER, acl.BUILDBUCKET_TRIGGERER],
-            groups = ["project-dart-admins"],
-        ),
-        acl.entry(acl.CQ_COMMITTER, groups = ["project-dart-committers"]),
-        acl.entry(acl.CQ_DRY_RUNNER, groups = ["project-dart-tryjob-access"]),
-    ],
-    bindings = [
-        luci.binding(
-            roles = "role/configs.validator",
-            users = TRY_ACCOUNT,
-        ),
-        luci.binding(
-            roles = "role/swarming.poolOwner",
-            groups = "project-dart-admins",
-        ),
-        luci.binding(
-            roles = "role/swarming.poolViewer",
-            groups = "project-dart-committers",
-        ),
-    ],
-)
-
-# Swarming permissions in realms.cfg.
-
-luci.realm(name = "pools/ci")
-luci.realm(name = "pools/try")
-luci.realm(
-    name = "pools/tests",
-    bindings = [
-        luci.binding(
-            roles = "role/swarming.poolUser",
-            groups = [CI_ACCOUNTS_GROUP, TRY_ACCOUNTS_GROUP],
-        ),
-    ],
-)
-
-def led_users(*, pool_realms, builder_realm, groups):
-    for realm in pool_realms:
-        luci.binding(
-            realm = realm,
-            roles = "role/swarming.poolUser",
-            groups = groups,
-        )
-    luci.binding(
-        realm = builder_realm,
-        roles = "role/swarming.taskTriggerer",
-        groups = groups,
-    )
-
-# Allow admins to use LED and "Debug" button on every Dart builder and bot.
-led_users(
-    pool_realms = ["@root"],
-    builder_realm = "@root",
-    groups = ["project-dart-admins"],
-)
-
-# Allow mdb/dart-build-access to use LED and "Debug" button on try builders and
-# try and test bots.
-led_users(
-    pool_realms = ["pools/try", "pools/tests"],
-    builder_realm = "try",
-    groups = ["mdb/dart-build-access"],
-)
-
-luci.milo(
-    logo = "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png",
-)
+exec("//project.star")
+exec("//cq.star")
 
 luci.console_view(
     name = "be",
@@ -312,7 +97,7 @@ luci.list_view(
 
 luci.console_view(
     name = "flutter",
-    repo = DART_GIT,
+    repo = dart.git,
     title = "Dart/Flutter Console",
     refs = ["refs/heads/main"],
 )
@@ -331,50 +116,16 @@ luci.list_view(
 
 luci.console_view(
     name = "fyi",
-    repo = DART_GIT,
+    repo = dart.git,
     title = "SDK FYI Console",
     refs = ["refs/heads/main"],
 )
 
-luci.list_view(
-    name = "cq",
-    title = "SDK CQ Console",
-)
-
 luci.list_view(
     name = "infra",
     title = "Infra Console",
 )
 
-luci.logdog(gs_bucket = "chromium-luci-logdog")
-
-luci.bucket(
-    name = "ci",
-    acls = [
-        acl.entry(acl.BUILDBUCKET_TRIGGERER, users = [CI_ACCOUNT]),
-    ],
-)
-luci.bucket(
-    name = "ci.roll",
-    acls = [
-        acl.entry(acl.BUILDBUCKET_TRIGGERER, **ROLL_TRIGGERERS),
-    ],
-)
-luci.bucket(
-    name = "ci.sandbox",
-    acls = [
-        acl.entry(acl.BUILDBUCKET_TRIGGERER, users = CI_SANDBOX_TRIGGERERS),
-    ],
-)
-TRY_ACLS = [
-    acl.entry(
-        acl.BUILDBUCKET_TRIGGERER,
-        groups = ["project-dart-tryjob-access", "service-account-cq"],
-    ),
-]
-luci.bucket(name = "try", acls = TRY_ACLS)  # Tryjobs specific to the Dart SDK repo.
-luci.bucket(name = "try.shared", acls = TRY_ACLS)  # Tryjobs for all repos.
-
 luci.gitiles_poller(
     name = "dart-gitiles-trigger-flutter",
     bucket = "ci",
@@ -386,23 +137,10 @@ luci.gitiles_poller(
     name = "dart-ci-test-data-trigger",
     bucket = "ci",
     path_regexps = ["tools/bots/ci_test_data_trigger"],
-    repo = DART_GIT,
+    repo = dart.git,
     refs = ["refs/heads/ci-test-data"],
 )
 
-def dart_poller(name, bucket = "ci", branches = BRANCHES, paths = None):
-    for branch in branches:
-        luci.gitiles_poller(
-            name = "%s-%s" % (name, branch),
-            bucket = bucket,
-            path_regexps = paths,
-            repo = DART_GIT,
-            refs = ["refs/heads/%s" % branch],
-        )
-
-dart_poller("dart-gitiles-trigger", branches = BRANCHES)
-dart_poller("dart-vm-gitiles-trigger", branches = ["main"], paths = VM_PATHS)
-
 luci.gitiles_poller(
     name = "dart-flutter-engine-trigger",
     bucket = "ci",
@@ -416,49 +154,23 @@ luci.gitiles_poller(
     repo = "https://dart.googlesource.com/external/github.com/flutter/flutter",
     refs = ["refs/heads/master"],
 )
-luci.gitiles_poller(
-    name = "dart-nightly-trigger",
-    bucket = "ci",
-    repo = DART_GIT,
-    refs = ["refs/heads/main"],
-    schedule = "0 5 * * *",  # daily, at 05:00 UTC
-)
-luci.gitiles_poller(
-    name = "dart-weekly-trigger",
-    bucket = "ci",
-    repo = DART_GIT,
-    refs = ["refs/heads/main"],
-    schedule = "0 0 * * SUN",  # weekly, midnight Saturday to Sunday
-)
 
-luci.notifier(
-    name = "infra",
-    on_new_failure = True,
-    notify_emails = [
-        "athom@google.com",
-        "sortie@google.com",
-        "whesse@google.com",
-        "karlklose@google.com",
-    ],
-)
+dart.poller("dart-gitiles-trigger", branches = dart.branches)
 
 luci.notifier(
     name = "dart",
     on_new_failure = True,
-    notify_emails = ["athom@google.com"],
     notify_blamelist = True,
 )
 
 luci.notifier(
-    name = "dart-vm-team",
-    on_new_failure = True,
-    notify_emails = ["dart-vm-team-breakages@google.com"],
-)
-
-luci.notifier(
-    name = "nightly",
+    name = "infra",
     on_new_failure = True,
-    notify_emails = ["karlklose@google.com", "athom@google.com"],
+    notify_emails = [
+        "athom@google.com",
+        "sortie@google.com",
+        "whesse@google.com",
+    ],
 )
 
 luci.notifier(
@@ -478,450 +190,51 @@ luci.notifier(
     name = "ci-test-data",
     on_success = True,
     on_failure = True,
-    notify_emails = ["karlklose@google.com"],
-)
-
-luci.cq(
-    submit_max_burst = 2,
-    submit_burst_delay = 8 * time.minute,
-    status_host = "chromium-cq-status.appspot.com",
-)
-
-def default_verifiers():
-    return [
-        luci.cq_tryjob_verifier(
-            builder = "presubmit-try",
-            disable_reuse = True,
-        ),
-    ]
-
-luci.cq_group(
-    name = "sdk",
-    watch = cq.refset(
-        DART_GERRIT + "sdk",
-        refs = ["refs/heads/%s" % branch for branch in BRANCHES],
-    ),
-    allow_submit_with_open_deps = True,
-    tree_status_host = "dart-status.appspot.com",
-    retry_config = cq.RETRY_NONE,
-    verifiers = None,
-)
-
-luci.cq_group(
-    name = "sdk-infra-config",
-    watch = cq.refset(DART_GERRIT + "sdk", refs = ["refs/heads/infra/config"]),
-    allow_submit_with_open_deps = True,
-    tree_status_host = "dart-status.appspot.com",
-    retry_config = cq.RETRY_NONE,
-    verifiers = default_verifiers(),
 )
 
-luci.cq_group(
-    name = "recipes",
-    watch = cq.refset(DART_GERRIT + "recipes", refs = ["refs/heads/main"]),
-    allow_submit_with_open_deps = True,
-    tree_status_host = "dart-status.appspot.com",
-    retry_config = cq.RETRY_NONE,
-    verifiers = default_verifiers(),
-)
-
-luci.cq_group(
-    name = "dart_ci",
-    watch = cq.refset(DART_GERRIT + "dart_ci", refs = ["refs/heads/main"]),
-    allow_submit_with_open_deps = True,
-    tree_status_host = "dart-status.appspot.com",
-    retry_config = cq.RETRY_NONE,
-    verifiers = None,
-)
-
-def dart_recipe(name):
-    return luci.recipe(
-        name = name,
-        cipd_package = "dart/recipe_bundles/dart.googlesource.com/recipes",
-        cipd_version = "refs/heads/main",
-        use_bbagent = True,
-    )
-
-def with_goma(goma, channel, dimensions, properties):
-    """Decorates the properties to setup goma.
-
-       Adds the $build/goma property when goma is used and disables goma via
-       the $dart/build property if not.
-
-    Args:
-        goma: Opt-in (True), opt-out (False) or default (None).
-        channel: The channel of the builder.
-        dimensions: The dimensions of the builder.
-        properties: The properties object to set $build/goma on (if opted-in).
-
-    Returns:
-        A copy of the properties with goma related properties set if applicable.
-    """
-    updated_properties = dict(properties)
-    if goma in (None, True):
-        goma_properties = {}
-        goma_properties.update(GOMA_RBE)
-
-        enable_ats = dimensions["os"] == "Linux"
-
-        goma_properties["enable_ats"] = enable_ats
-        updated_properties.setdefault("$build/goma", goma_properties)
-    else:
-        updated_properties = dict(properties)
-        updated_properties.setdefault("$dart/build", {})
-        updated_properties["$dart/build"].setdefault("disable_goma", True)
-    return updated_properties
-
-def dart_try_builder(
-        name,
-        recipe = "dart/neo",
-        bucket = "try",
-        dimensions = None,
-        execution_timeout = None,
-        experiment_percentage = None,
-        experiments = None,
-        goma = None,
-        location_regexp = None,
-        properties = None,
-        on_cq = False):
-    """Creates a Dart tryjob.
-
-    Args:
-        name: The builder name.
-        recipe: The recipe to use (defaults to "dart/neo").
-        bucket: The bucket to use (defaults to "try").
-        dimensions: Extra swarming dimensions required by this builder.
-        execution_timeout: Time to allow for the build to run.
-        experiment_percentage: What experiment percentage to use.
-        experiments: Experiments to run on this builder, with percentages.
-        goma: Whether to use goma or not.
-        location_regexp: Locations that trigger this tryjob.
-        properties: Extra properties to set for builds.
-        on_cq: Whether the build is added to the default set of CQ tryjobs.
-    """
-    if on_cq and location_regexp:
-        fail("Can't be on the default CQ and conditionally on the CQ")
-    dimensions = defaults.dimensions(dimensions)
-    dimensions["pool"] = "luci.dart.try"
-    properties = defaults.properties(properties)
-    builder_properties = with_goma(goma, "try", dimensions, properties)
-    builder = name + "-try"
-    luci.builder(
-        name = builder,
-        build_numbers = True,
-        bucket = bucket,
-        caches = defaults.caches(dimensions["os"]),
-        dimensions = dimensions,
-        executable = dart_recipe(recipe),
-        execution_timeout = execution_timeout,
-        experiments = experiments,
-        priority = HIGH,
-        properties = builder_properties,
-        service_account = TRY_ACCOUNT,
-        swarming_tags = ["vpython:native-python-wrapper"],
-    )
-    includable_only = (not on_cq and not experiment_percentage and
-                       not location_regexp)
-    luci.cq_tryjob_verifier(
-        builder = builder,
-        cq_group = "sdk",
-        experiment_percentage = experiment_percentage,
-        location_regexp = location_regexp,
-        includable_only = includable_only,
-    )
-    luci.list_view_entry(list_view = "cq", builder = builder)
-
-postponed_alt_console_entries = []
-
-# Global builder defaults
-luci.builder.defaults.properties.set({
-    "$recipe_engine/isolated": {
-        "server": "https://isolateserver.appspot.com",
-    },
-    "$recipe_engine/swarming": {
-        "server": "https://chromium-swarm.appspot.com",
-    },
-})
-
-def dart_builder(
-        name,
-        bucket,
-        recipe = "dart/neo",
-        enabled = True,
-        category = None,
-        channels = [],
-        dimensions = None,
-        executable = None,
-        execution_timeout = None,
-        experimental = None,
-        experiments = None,
-        expiration_timeout = None,
-        goma = None,
-        fyi = False,
-        main_channel = True,
-        notifies = "dart",
-        priority = NORMAL,
-        properties = None,
-        schedule = "triggered",
-        service_account = TRY_ACCOUNT,
-        triggered_by = ["dart-gitiles-trigger-%s"],
-        triggering_policy = None,
-        on_cq = False,
-        experiment_percentage = None,
-        location_regexp = None):
-    """
-    Creates a Dart builder on all the specified channels.
-
-    Args:
-        name: The builder name.
-        bucket: The bucket to use (defaults to "try").
-        recipe: The recipe to use (defaults to "dart/neo").
-        enabled: Whether this builder is currently running or not.
-        category: Where to show the builder on the console.
-        channels: Which other channels the builder should be added to.
-        dimensions: Extra swarming dimensions required by this builder.
-        executable: The Luci executable to use.
-        execution_timeout: Time to allow for the build to run.
-        experimental: Whether the build is experimental or not.
-        experiments: Experiments to run on this builder, with percentages.
-        expiration_timeout: How long builds should wait for a bot to run on.
-        goma: Whether to use goma or not.
-        fyi: Whether this is an FYI builder or not.
-        main_channel: Whether to add to the main channel (default: True).
-        notifies: Which luci notifier group to notify (default: "dart").
-        priority: What swarming priority this builder gets (default: NORMAL).
-        properties: Extra properties to set for builds.
-        schedule: What schedule to use (default: "triggered").
-        service_account: The task service account to use (default: TRY_ACCOUNT).
-        triggered_by: What triggers this builder (defaults to standard trigger).
-        triggering_policy: The triggering policy used by this builder.
-        on_cq: Whether the build is added to the default set of CQ tryjobs.
-        experiment_percentage: What experiment percentage to use.
-        location_regexp: Locations that trigger this builder.
-    """
-    dimensions = defaults.dimensions(dimensions)
-    properties = defaults.properties(properties)
-
-    os = dimensions["os"]
-    if "win" in name and os != "Windows":
-        fail("builder %s should be a Windows builder" % name)
-    if "mac" in name and os != "Mac":
-        fail("builder %s should be a macOS builder" % name)
-    if "linux" in name and os != "Linux":
-        fail("builder %s should be a Linux builder" % name)
-
-    def builder(channel, notifies, triggered_by):
-        if channel == "try":
-            dart_try_builder(
-                name,
-                recipe = recipe,
-                dimensions = dimensions,
-                properties = properties,
-                on_cq = on_cq,
-                execution_timeout = execution_timeout,
-                experiment_percentage = experiment_percentage,
-                experiments = experiments,
-                goma = goma,
-                location_regexp = location_regexp,
-            )
-        else:
-            builder_properties = with_goma(
-                goma if service_account == TRY_ACCOUNT else False,
-                channel,
-                dimensions,
-                properties,
-            )
-            builder = name + "-" + channel if channel else name
-            branch = channel if channel else "main"
-            if schedule == "triggered" and triggered_by:
-                triggered_by = [
-                    trigger.replace("%s", branch)
-                    for trigger in triggered_by
-                ]
-                if channel in RELEASE_CHANNELS:
-                    # Always run vm builders on release channels.
-                    triggered_by = [
-                        trigger.replace("dart-vm-", "dart-")
-                        for trigger in triggered_by
-                    ]
-
-            notifies = [notifies] if type(notifies) == type("") else notifies
-            luci.builder(
-                name = builder,
-                build_numbers = True,
-                bucket = bucket,
-                caches = defaults.caches(dimensions["os"]),
-                dimensions = dimensions,
-                executable = executable or dart_recipe(recipe),
-                execution_timeout = execution_timeout,
-                experimental = experimental,
-                experiments = experiments,
-                expiration_timeout = expiration_timeout,
-                priority = priority,
-                properties = builder_properties,
-                notifies = notifies if enabled else None,
-                schedule = schedule if enabled else None,
-                service_account = service_account,
-                swarming_tags = ["vpython:native-python-wrapper"],
-                triggered_by = triggered_by if enabled else None,
-                triggering_policy = triggering_policy,
-            )
-            if category:
-                console_category, _, short_name = category.rpartition("|")
-                toplevel_category, _, _ = console_category.partition("|")
-                console = channel or "be" if not fyi else "fyi"
-                luci.console_view_entry(
-                    builder = builder,
-                    short_name = short_name,
-                    category = console_category,
-                    console_view = console,
-                )
-                if console == "be":
-                    if toplevel_category == "vm":
-                        postponed_alt_console_entries.append({
-                            "builder": builder,
-                            "short_name": short_name,
-                            "category": console_category,
-                        })
-                    else:
-                        luci.console_view_entry(
-                            builder = builder,
-                            short_name = short_name,
-                            category = console_category,
-                            console_view = "alt",
-                        )
-
-    if main_channel:
-        builder(None, notifies = notifies, triggered_by = triggered_by)
-    for channel in channels:
-        if enabled:
-            builder(channel, notifies = None, triggered_by = triggered_by)
-
-def dart_ci_builder(name, bucket = "ci", dimensions = {}, **kwargs):
-    dimensions.setdefault("pool", "luci.dart.ci")
-    dart_builder(
-        name,
-        bucket = bucket,
-        dimensions = dimensions,
-        service_account = CI_ACCOUNT,
-        **kwargs
-    )
-
-def dart_ci_sandbox_builder(name, channels = CHANNELS, **kwargs):
-    dart_builder(
-        name,
-        bucket = "ci.sandbox",
-        channels = channels,
-        service_account = TRY_ACCOUNT,
-        **kwargs
-    )
-
-def dart_infra_builder(name, notifies = "infra", triggered_by = None, **kwargs):
-    dart_ci_builder(
-        name,
-        notifies = notifies,
-        triggered_by = triggered_by,
-        **kwargs
-    )
-    luci.list_view_entry(list_view = "infra", builder = name)
-
-def dart_vm_extra_builder(name, on_cq = False, location_regexp = None, **kwargs):
-    """
-    Creates a Dart builder that is only triggered by VM commits.
-
-    Args:
-        name: The builder name.
-        on_cq: Whether the build is added to the default set of CQ tryjobs.
-        location_regexp: Locations that trigger this builder.
-        **kwargs: Extra arguments are passed on to dart_ci_sandbox_builder.
-    """
-    triggered_by = ["dart-vm-gitiles-trigger-%s"]
-    if on_cq and not location_regexp:
-        location_regexp = to_location_regexp(VM_PATHS)
-        on_cq = False
-    dart_ci_sandbox_builder(
-        name,
-        triggered_by = triggered_by,
-        on_cq = on_cq,
-        location_regexp = location_regexp,
-        **kwargs
-    )
-
-def dart_vm_low_priority_builder(name, **kwargs):
-    dart_vm_extra_builder(
-        name,
-        channels = ["try"],
-        priority = LOW,
-        expiration_timeout = time.day,
-        **kwargs
-    )
-
-def dart_vm_nightly_builder(name, **kwargs):
-    nightly_builder(name, notifies = "dart-vm-team", **kwargs)
-
-def nightly_builder(name, notifies = "nightly", **kwargs):
-    dart_ci_sandbox_builder(
-        name,
-        notifies = notifies,
-        on_cq = False,
-        priority = LOW,
-        triggered_by = ["dart-nightly-trigger"],
-        **kwargs
-    )
-
-def weekly_ci_sandbox_builder(name, notifies = None, **kwargs):
-    dart_ci_sandbox_builder(
-        name,
-        notifies = notifies,
-        on_cq = False,
-        priority = LOW,
-        triggered_by = ["dart-weekly-trigger"],
-        **kwargs
-    )
-
 # cfe
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "front-end-linux-release-x64",
     category = "cfe|l",
     on_cq = True,
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "front-end-mac-release-x64",
     category = "cfe|m",
-    dimensions = mac(),
-    properties = PINNED_XCODE,
+    dimensions = mac,
+    properties = pinned_xcode,
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "front-end-win-release-x64",
     category = "cfe|w",
-    dimensions = windows(),
+    dimensions = windows,
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "front-end-nnbd-linux-release-x64",
     category = "cfe|nnbd|l",
-    location_regexp = to_location_regexp(CFE_PATHS),
+    location_regexp = paths.to_location_regexp(paths.cfe),
 )
-nightly_builder(
+cron.nightly_builder(
     "front-end-nnbd-mac-release-x64",
     category = "cfe|nnbd|m",
     channels = ["try"],
-    dimensions = mac(),
-    properties = PINNED_XCODE,
+    dimensions = mac,
+    properties = pinned_xcode,
 )
-nightly_builder(
+cron.nightly_builder(
     "front-end-nnbd-win-release-x64",
     category = "cfe|nnbd|w",
     channels = ["try"],
-    dimensions = windows(),
+    dimensions = windows,
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "flutter-frontend",
     category = "cfe|fl",
     channels = ["try"],
     notifies = "frontend-team",
-    location_regexp = to_location_regexp(CFE_PATHS_ONLY),
+    location_regexp = paths.to_location_regexp(paths.cfe_only),
 )
-weekly_ci_sandbox_builder(
+cron.weekly_builder(
     "frontend-weekly",
     notifies = "frontend-team",
     channels = [],
@@ -929,14 +242,14 @@ weekly_ci_sandbox_builder(
 )
 
 # flutter
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "flutter-engine-linux",
     recipe = "dart/flutter_engine",
     category = "flutter|3H",
     channels = ["try"],
     execution_timeout = 8 * time.hour,
     triggered_by = ["dart-gitiles-trigger-flutter"],
-    properties = {
+    properties = [{
         "bisection_enabled": True,
         "flutter_test_suites": [
             "add_to_app_life_cycle_tests",
@@ -945,10 +258,10 @@ dart_ci_sandbox_builder(
             "framework_tests",
             "tool_tests",
         ],
-    },
+    }],
 )
 
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "flutter-engine-linux-web_tests",
     recipe = "dart/flutter_engine",
     category = "flutter|web",
@@ -964,618 +277,176 @@ dart_ci_sandbox_builder(
     },
 )
 
-# vm|nnbd|jit
-dart_vm_extra_builder(
-    "vm-kernel-nnbd-linux-debug-x64",
-    category = "vm|nnbd|jit|d",
-    on_cq = True,
-)
-dart_vm_extra_builder(
-    "vm-kernel-nnbd-linux-release-x64",
-    category = "vm|nnbd|jit|r",
-    on_cq = True,
-)
-dart_vm_nightly_builder(
-    "vm-kernel-nnbd-linux-debug-ia32",
-    category = "vm|nnbd|jit|d3",
-    channels = ["try"],
-    properties = SLOW_SHARDS,
-)
-dart_vm_nightly_builder(
-    "vm-kernel-nnbd-linux-release-ia32",
-    category = "vm|nnbd|jit|r3",
-    channels = ["try"],
-)
-dart_vm_nightly_builder(
-    "vm-kernel-nnbd-linux-release-simarm",
-    category = "vm|nnbd|jit|ra",
-    channels = ["try"],
-)
-dart_vm_nightly_builder(
-    "vm-kernel-nnbd-linux-release-simarm64",
-    category = "vm|nnbd|jit|ra6",
-    channels = ["try"],
-)
-dart_vm_nightly_builder(
-    "vm-kernel-nnbd-mac-debug-arm64",
-    category = "vm|nnbd|jit|m1d",
-    channels = ["try"],
-    dimensions = mac(cpu = "arm64"),
-    properties = union(NO_ANDROID, PINNED_XCODE, SLOW_SHARDS),
-)
-dart_vm_nightly_builder(
-    "vm-kernel-nnbd-mac-debug-x64",
-    category = "vm|nnbd|jit|md",
-    channels = ["try"],
-    dimensions = mac(),
-    properties = union(PINNED_XCODE, SLOW_SHARDS),
-)
-dart_vm_extra_builder(
-    "vm-kernel-nnbd-mac-release-arm64",
-    category = "vm|nnbd|jit|m1r",
-    channels = ["try"],
-    dimensions = mac(cpu = "arm64"),
-    properties = union(NO_ANDROID, PINNED_XCODE),
-)
-dart_vm_nightly_builder(
-    "vm-kernel-nnbd-mac-release-x64",
-    category = "vm|nnbd|jit|mr",
-    channels = ["try"],
-    dimensions = mac(),
-    properties = PINNED_XCODE,
-)
-dart_vm_nightly_builder(
-    "vm-kernel-nnbd-win-release-ia32",
-    category = "vm|nnbd|jit|wr3",
-    channels = ["try"],
-    dimensions = windows(),
-)
-dart_vm_nightly_builder(
-    "vm-kernel-nnbd-win-debug-x64",
-    category = "vm|nnbd|jit|wd",
-    channels = ["try"],
-    properties = SLOW_SHARDS,
-    dimensions = windows(),
-)
-dart_vm_nightly_builder(
-    "vm-kernel-nnbd-win-release-x64",
-    category = "vm|nnbd|jit|wr",
-    channels = ["try"],
-    dimensions = windows(),
-)
-
-# vm|nnbd|aot
-dart_vm_extra_builder(
-    "vm-kernel-precomp-nnbd-linux-release-x64",
-    category = "vm|nnbd|aot|r",
-)
-nightly_builder(
-    "vm-kernel-precomp-nnbd-linux-debug-simarm_x64",
-    category = "vm|nnbd|aot|da",
-    channels = ["try"],
-)
-nightly_builder(
-    "vm-kernel-precomp-nnbd-linux-release-simarm_x64",
-    category = "vm|nnbd|aot|ra",
-    channels = ["try"],
-)
-nightly_builder(
-    "vm-kernel-precomp-nnbd-linux-debug-x64",
-    category = "vm|nnbd|aot|d",
-    channels = ["try"],
-    properties = SLOW_SHARDS,
-)
-nightly_builder(
-    "vm-kernel-precomp-nnbd-linux-release-simarm64",
-    category = "vm|nnbd|aot|ra6",
-    channels = ["try"],
-)
-dart_vm_extra_builder(
-    "vm-kernel-precomp-nnbd-mac-release-arm64",
-    category = "vm|nnbd|aot|m1",
-    channels = ["try"],
-    dimensions = mac(cpu = "arm64"),
-    properties = union(NO_ANDROID, PINNED_XCODE, SLOW_SHARDS),
-)
-nightly_builder(
-    "vm-kernel-precomp-nnbd-mac-release-simarm64",
-    category = "vm|nnbd|aot|ma6",
-    channels = ["try"],
-    dimensions = mac(),
-    properties = union(PINNED_XCODE, SLOW_SHARDS),
-)
-nightly_builder(
-    "vm-kernel-precomp-nnbd-win-release-x64",
-    category = "vm|nnbd|aot|wr",
-    channels = ["try"],
-    dimensions = windows(),
-)
-
-# vm|app-kernel
-dart_vm_extra_builder(
-    "app-kernel-linux-debug-x64",
-    category = "vm|app-kernel|d64",
-    properties = SLOW_SHARDS,
-)
-dart_vm_nightly_builder(
-    "app-kernel-linux-product-x64",
-    category = "vm|app-kernel|p64",
-    channels = ["try"],
-)
-dart_vm_extra_builder(
-    "app-kernel-linux-release-x64",
-    category = "vm|app-kernel|r64",
-)
-
-#vm|kernel
-dart_vm_extra_builder(
-    "vm-canary-linux-debug",
-    category = "vm|kernel|c",
-    on_cq = True,
-)
-dart_ci_sandbox_builder("vm-kernel-linux-debug-x64", category = "vm|kernel|d")
-dart_vm_extra_builder(
-    "vm-kernel-linux-release-simarm",
-    category = "vm|kernel|a32",
-)
-dart_vm_extra_builder(
-    "vm-kernel-linux-release-simarm64",
-    category = "vm|kernel|a64",
-)
-dart_vm_nightly_builder(
-    "vm-kernel-linux-release-ia32",
-    category = "vm|kernel|r32",
-    channels = ["try"],
-)
-dart_ci_sandbox_builder(
-    "vm-kernel-linux-release-x64",
-    category = "vm|kernel|r",
-    on_cq = True,
-)
-dart_vm_extra_builder(
-    "vm-kernel-checked-linux-release-x64",
-    category = "vm|kernel|rc",
-    experiments = {"dart.use_update_script": 100},
-)
-dart_vm_nightly_builder(
-    "vm-kernel-linux-debug-ia32",
-    category = "vm|kernel|d32",
-    channels = ["try"],
-)
-dart_ci_sandbox_builder(
-    "vm-kernel-mac-debug-x64",
-    category = "vm|kernel|md",
-    dimensions = mac(),
-    properties = PINNED_XCODE,
-)
-dart_ci_sandbox_builder(
-    "vm-kernel-mac-release-x64",
-    category = "vm|kernel|mr",
-    dimensions = mac(),
-    on_cq = True,
-    experiment_percentage = 5,
-    properties = PINNED_XCODE,
-)
-dart_ci_sandbox_builder(
-    "vm-kernel-mac-release-arm64",
-    category = "vm|kernel|m1r",
-    channels = ["try", "dev"],
-    dimensions = mac(cpu = "arm64"),
-    properties = union(NO_ANDROID, PINNED_XCODE),
-)
-dart_vm_nightly_builder(
-    "vm-kernel-win-debug-ia32",
-    category = "vm|kernel|wd3",
-    channels = ["try"],
-    dimensions = windows(),
-)
-dart_ci_sandbox_builder(
-    "vm-kernel-win-debug-x64",
-    category = "vm|kernel|wd",
-    dimensions = windows(),
-)
-dart_vm_nightly_builder(
-    "vm-kernel-win-release-ia32",
-    category = "vm|kernel|wr3",
-    channels = ["try"],
-    dimensions = windows(),
-)
-dart_ci_sandbox_builder(
-    "vm-kernel-win-release-x64",
-    category = "vm|kernel|wr",
-    dimensions = windows(),
-)
-dart_vm_extra_builder(
-    "cross-vm-linux-release-arm64",
-    category = "vm|kernel|cra",
-    channels = [],
-    properties = {"shard_timeout": (120 * time.minute) // time.second},
-)
-
-# vm|kernel-precomp
-dart_vm_extra_builder(
-    "vm-kernel-precomp-linux-debug-x64",
-    category = "vm|kernel-precomp|d",
-)
-dart_vm_extra_builder(
-    "vm-kernel-precomp-linux-product-x64",
-    category = "vm|kernel-precomp|p",
-)
-dart_vm_extra_builder(
-    "vm-kernel-precomp-linux-release-simarm",
-    category = "vm|kernel-precomp|a32",
-)
-dart_vm_extra_builder(
-    "vm-kernel-precomp-linux-release-simarm64",
-    category = "vm|kernel-precomp|a64",
-)
-dart_vm_extra_builder(
-    "vm-kernel-precomp-linux-release-x64",
-    category = "vm|kernel-precomp|r",
-)
-dart_vm_extra_builder(
-    "vm-kernel-precomp-obfuscate-linux-release-x64",
-    category = "vm|kernel-precomp|o",
-)
-dart_vm_extra_builder(
-    "vm-kernel-precomp-linux-debug-simarm_x64",
-    category = "vm|kernel-precomp|adx",
-    properties = SLOW_SHARDS,
-)
-dart_vm_extra_builder(
-    "vm-kernel-precomp-linux-release-simarm_x64",
-    category = "vm|kernel-precomp|arx",
-)
-dart_vm_extra_builder(
-    "vm-kernel-precomp-mac-release-simarm64",
-    category = "vm|kernel-precomp|ma",
-    dimensions = mac(),
-    properties = PINNED_XCODE,
-)
-dart_vm_extra_builder(
-    "vm-kernel-precomp-win-release-x64",
-    category = "vm|kernel-precomp|wr",
-    dimensions = windows(),
-)
-dart_vm_nightly_builder(
-    "cross-vm-precomp-linux-release-arm64",
-    category = "vm|kernel-precomp|cra",
-    channels = [],
-    properties = SLOW_SHARDS,
-)
-dart_vm_nightly_builder(
-    "vm-kernel-precomp-dwarf-linux-product-x64",
-    category = "vm|kernel-precomp|dw",
-    channels = ["try"],
-)
-
-# vm|kernel-precomp|android
-dart_vm_extra_builder(
-    "vm-kernel-precomp-android-release-arm_x64",
-    category = "vm|kernel-precomp|android|a32",
-    properties = SLOW_SHARDS,
-)
-dart_vm_extra_builder(
-    "vm-kernel-precomp-android-release-arm64c",
-    category = "vm|kernel-precomp|android|a64",
-    properties = SLOW_SHARDS,
-)
-
-# vm|product
-dart_vm_nightly_builder(
-    "vm-kernel-linux-product-x64",
-    category = "vm|product|l",
-    channels = ["try"],
-)
-dart_vm_nightly_builder(
-    "vm-kernel-mac-product-x64",
-    category = "vm|product|m",
-    channels = ["try"],
-    dimensions = mac(),
-    properties = PINNED_XCODE,
-)
-dart_vm_nightly_builder(
-    "vm-kernel-win-product-x64",
-    category = "vm|product|w",
-    channels = ["try"],
-    dimensions = windows(),
-)
-
-# vm|misc
-dart_vm_nightly_builder(
-    "vm-kernel-optcounter-threshold-linux-release-ia32",
-    category = "vm|misc|o32",
-    channels = ["try"],
-)
-dart_vm_low_priority_builder(
-    "vm-kernel-optcounter-threshold-linux-release-x64",
-    category = "vm|misc|o64",
-)
-
-def dart_vm_sanitizer_builder(name, **kwargs):
-    nightly_builder(
-        name,
-        channels = ["try"],
-        properties = {"bisection_enabled": True},
-        **kwargs
-    )
-
-dart_vm_sanitizer_builder(
-    "vm-kernel-asan-linux-release-x64",
-    category = "vm|misc|a",
-)
-dart_vm_sanitizer_builder(
-    "vm-kernel-msan-linux-release-x64",
-    category = "vm|misc|m",
-)
-dart_vm_sanitizer_builder(
-    "vm-kernel-tsan-linux-release-x64",
-    category = "vm|misc|t",
-)
-dart_vm_sanitizer_builder(
-    "vm-kernel-ubsan-linux-release-x64",
-    category = "vm|misc|u",
-    goma = False,
-)  # ubsan is not compatible with our sysroot.
-dart_vm_sanitizer_builder(
-    "vm-kernel-precomp-asan-linux-release-x64",
-    category = "vm|misc|aot|a",
-)
-dart_vm_sanitizer_builder(
-    "vm-kernel-precomp-msan-linux-release-x64",
-    category = "vm|misc|aot|m",
-)
-dart_vm_sanitizer_builder(
-    "vm-kernel-precomp-tsan-linux-release-x64",
-    category = "vm|misc|aot|t",
-)
-dart_vm_sanitizer_builder(
-    "vm-kernel-precomp-ubsan-linux-release-x64",
-    category = "vm|misc|aot|u",
-    goma = False,
-)  # ubsan is not compatible with our sysroot.
-dart_vm_nightly_builder(
-    "vm-kernel-reload-linux-debug-x64",
-    category = "vm|misc|reload|d",
-    channels = ["try"],
-)
-dart_vm_nightly_builder(
-    "vm-kernel-reload-linux-release-x64",
-    category = "vm|misc|reload|r",
-    channels = ["try"],
-)
-dart_vm_nightly_builder(
-    "vm-kernel-reload-rollback-linux-debug-x64",
-    category = "vm|misc|reload|drb",
-    channels = ["try"],
-)
-dart_vm_nightly_builder(
-    "vm-kernel-reload-rollback-linux-release-x64",
-    category = "vm|misc|reload|rrb",
-    channels = ["try"],
-)
-dart_vm_nightly_builder(
-    "vm-kernel-linux-debug-x64c",
-    category = "vm|misc|compressed|jl",
-    channels = ["try"],
-)
-dart_vm_nightly_builder(
-    "vm-kernel-precomp-linux-debug-x64c",
-    category = "vm|misc|compressed|al",
-    channels = ["try"],
-)
-dart_vm_nightly_builder(
-    "vm-kernel-win-debug-x64c",
-    category = "vm|misc|compressed|jw",
-    channels = ["try"],
-    dimensions = windows(),
-)
-dart_vm_nightly_builder(
-    "vm-kernel-precomp-win-debug-x64c",
-    category = "vm|misc|compressed|aw",
-    channels = ["try"],
-    dimensions = windows(),
-)
-dart_vm_low_priority_builder("vm-fuchsia-release-x64", category = "vm|misc|f")
-
-# Our sysroot does not support gcc, we can't use goma on RBE for this builder
-dart_vm_nightly_builder("vm-kernel-gcc-linux", category = "vm|misc|g", goma = False)
-
-dart_vm_nightly_builder(
-    "vm-kernel-linux-debug-simriscv64",
-    category = "vm|misc|rv64",
-    channels = ["try"],
-)
-dart_vm_nightly_builder(
-    "vm-kernel-precomp-linux-debug-simriscv64",
-    category = "vm|misc|rv64",
-    channels = ["try"],
-)
-
-# vm|ffi
-dart_vm_extra_builder("vm-ffi-android-debug-arm", category = "vm|ffi|d32")
-dart_vm_extra_builder("vm-ffi-android-release-arm", category = "vm|ffi|r32")
-dart_vm_extra_builder("vm-ffi-android-product-arm", category = "vm|ffi|p32")
-dart_vm_extra_builder("vm-ffi-android-debug-arm64c", category = "vm|ffi|d64")
-dart_vm_extra_builder("vm-ffi-android-release-arm64c", category = "vm|ffi|r64")
-dart_vm_extra_builder("vm-ffi-android-product-arm64c", category = "vm|ffi|p64")
-dart_vm_extra_builder(
-    "vm-precomp-ffi-qemu-linux-release-arm",
-    category = "vm|ffi|qa",
-)
-dart_vm_extra_builder(
-    "vm-precomp-ffi-qemu-linux-release-riscv64",
-    category = "vm|ffi|qr",
-)
+vm = exec("//vm.star")
 
 # pkg
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "pkg-linux-release",
     category = "pkg|l",
     on_cq = True,
-    properties = union(CHROME, PINNED_XCODE),
+    properties = [chrome, pinned_xcode],
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "pkg-mac-release",
     category = "pkg|m",
-    dimensions = mac(),
-    properties = union(CHROME, PINNED_XCODE),
+    dimensions = mac,
+    properties = [chrome, pinned_xcode],
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "pkg-mac-release-arm64",
     category = "pkg|m1",
     channels = ["try"],
-    dimensions = mac(cpu = "arm64"),
-    properties = union(CHROME, NO_ANDROID, PINNED_XCODE),
+    dimensions = [mac, arm64],
+    properties = [chrome, no_android, pinned_xcode],
     experiments = {"dart.use_update_script": 100},
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "pkg-win-release",
     category = "pkg|w",
-    dimensions = windows(),
-    properties = CHROME,
+    dimensions = windows,
+    properties = chrome,
     experiments = {"dart.use_update_script": 100},
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "pkg-linux-debug",
     category = "pkg|ld",
     channels = ["try"],
-    properties = CHROME,
+    properties = chrome,
 )
 
 # dart2js
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "dart2js-canary-x64",
     category = "dart2js|c",
-    properties = union(CHROME, NO_ANDROID),
+    properties = [chrome, no_android],
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "dart2js-strong-hostasserts-linux-ia32-d8",
     category = "dart2js|d8|ha",
-    location_regexp = to_location_regexp(DART2JS_PATHS),
-    properties = NO_ANDROID,
+    location_regexp = paths.to_location_regexp(paths.dart2js),
+    properties = no_android,
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "dart2js-minified-strong-linux-x64-d8",
     category = "dart2js|d8|mi",
-    location_regexp = to_location_regexp(DART2JS_PATHS),
-    properties = NO_ANDROID,
+    location_regexp = paths.to_location_regexp(paths.dart2js),
+    properties = no_android,
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "dart2js-unit-linux-x64-release",
     category = "dart2js|d8|u",
-    location_regexp = to_location_regexp(DART2JS_PATHS),
-    properties = NO_ANDROID,
+    location_regexp = paths.to_location_regexp(paths.dart2js),
+    properties = no_android,
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "dart2js-strong-linux-x64-chrome",
     category = "dart2js|chrome|l",
-    location_regexp = to_location_regexp(DART2JS_PATHS),
-    properties = union(CHROME, NO_ANDROID),
+    location_regexp = paths.to_location_regexp(paths.dart2js),
+    properties = [chrome, no_android],
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "dart2js-csp-minified-linux-x64-chrome",
     category = "dart2js|chrome|csp",
-    properties = union(CHROME, NO_ANDROID),
+    properties = [chrome, no_android],
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "dart2js-strong-mac-x64-chrome",
     category = "dart2js|chrome|m",
-    dimensions = mac(),
-    properties = union(CHROME, PINNED_XCODE, NO_ANDROID),
+    dimensions = mac,
+    properties = [chrome, pinned_xcode, no_android],
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "dart2js-strong-win-x64-chrome",
     category = "dart2js|chrome|w",
-    dimensions = windows(),
-    properties = union(CHROME, NO_ANDROID),
+    dimensions = windows,
+    properties = [chrome, no_android],
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "dart2js-nnbd-linux-x64-chrome",
     category = "dart2js|chrome|nn",
-    location_regexp = to_location_regexp(DART2JS_PATHS),
-    properties = union(CHROME, NO_ANDROID),
+    location_regexp = paths.to_location_regexp(paths.dart2js),
+    properties = [chrome, no_android],
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "dart2js-strong-linux-x64-firefox",
     category = "dart2js|firefox|l",
-    properties = union(FIREFOX, NO_ANDROID),
+    properties = [firefox, no_android],
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "dart2js-strong-win-x64-firefox",
     category = "dart2js|firefox|w",
-    dimensions = windows(),
+    dimensions = windows,
     enabled = False,
-    properties = union(FIREFOX, NO_ANDROID),
+    properties = [firefox, no_android],
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "dart2js-strong-mac-x64-safari",
     category = "dart2js|safari|m",
-    dimensions = mac(),
-    properties = union(PINNED_XCODE, NO_ANDROID),
+    dimensions = mac,
+    properties = [pinned_xcode, no_android],
 )
 
 # analyzer
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "flutter-analyze",
     category = "analyzer|fa",
     channels = ["try"],
     execution_timeout = 45 * time.minute,
     notifies = None,
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "analyzer-analysis-server-linux",
     category = "analyzer|as",
-    channels = CHANNELS,
-    location_regexp = to_location_regexp(ANALYZER_PATHS),
+    channels = dart.channels,
+    location_regexp = paths.to_location_regexp(paths.analyzer),
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "analyzer-linux-release",
     category = "analyzer|l",
-    channels = CHANNELS,
-    location_regexp = to_location_regexp(ANALYZER_PATHS),
+    channels = dart.channels,
+    location_regexp = paths.to_location_regexp(paths.analyzer),
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "analyzer-mac-release",
     category = "analyzer|m",
-    channels = CHANNELS,
-    dimensions = mac(),
-    properties = PINNED_XCODE,
+    channels = dart.channels,
+    dimensions = mac,
+    properties = pinned_xcode,
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "analyzer-win-release",
     category = "analyzer|w",
-    channels = CHANNELS,
-    dimensions = windows(),
+    channels = dart.channels,
+    dimensions = windows,
     experiments = {"dart.use_update_script": 100},
 )
 
 # analyzer|nnbd
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "analyzer-nnbd-linux-release",
     category = "analyzer|nnbd|l",
-    location_regexp = to_location_regexp(ANALYZER_NNBD_PATHS),
-    channels = CHANNELS,
+    location_regexp = paths.to_location_regexp(paths.analyzer_nnbd),
+    channels = dart.channels,
 )
-nightly_builder(
+cron.nightly_builder(
     "analyzer-nnbd-mac-release",
     category = "analyzer|nnbd|m",
     channels = ["try"],
-    dimensions = mac(),
-    properties = PINNED_XCODE,
+    dimensions = mac,
+    properties = pinned_xcode,
 )
-nightly_builder(
+cron.nightly_builder(
     "analyzer-nnbd-win-release",
     category = "analyzer|nnbd|w",
     channels = ["try"],
-    dimensions = windows(),
+    dimensions = windows,
 )
 
 # sdk
-dart_ci_builder(
+dart.ci_builder(
     "dart-sdk-linux",
     category = "sdk|l",
-    channels = CHANNELS,
+    channels = dart.channels,
     main_channel = False,
     properties = {
         "$dart/build": {
@@ -1583,134 +454,126 @@ dart_ci_builder(
         },
     },
 )
-dart_ci_builder(
+dart.ci_builder(
     "dart-sdk-mac",
     category = "sdk|m",
-    channels = CHANNELS,
-    dimensions = mac(),
+    channels = dart.channels,
+    dimensions = mac,
     main_channel = False,
-    properties = PINNED_XCODE,
+    properties = pinned_xcode,
 )
-dart_ci_builder(
+dart.ci_builder(
     "dart-sdk-mac-arm64",
     category = "sdk|m1",
-    channels = CHANNELS,
-    dimensions = mac(cpu = "arm64"),
+    channels = dart.channels,
+    dimensions = [mac, arm64],
     main_channel = False,
-    properties = union(NO_ANDROID, PINNED_XCODE),
+    properties = [no_android, pinned_xcode],
 )
 
-dart_ci_builder(
+dart.ci_builder(
     "dart-sdk-win",
     category = "sdk|w",
-    channels = CHANNELS,
-    dimensions = windows(),
+    channels = dart.channels,
+    dimensions = windows,
     main_channel = False,
     on_cq = True,
 )
 
 # ddc
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "ddc-linux-release-chrome",
     category = "ddc|l",
-    location_regexp = to_location_regexp(DDC_PATHS),
-    properties = CHROME,
+    location_regexp = paths.to_location_regexp(paths.ddc),
+    properties = chrome,
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "ddc-nnbd-linux-release-chrome",
     category = "ddc|nn",
     channels = ["try"],
-    location_regexp = to_location_regexp(DDC_PATHS),
-    properties = CHROME,
+    location_regexp = paths.to_location_regexp(paths.ddc),
+    properties = chrome,
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "ddc-mac-release-chrome",
     category = "ddc|m",
-    dimensions = mac(),
-    properties = union(CHROME, PINNED_XCODE),
+    dimensions = mac,
+    properties = [chrome, pinned_xcode],
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "ddc-win-release-chrome",
     category = "ddc|w",
-    dimensions = windows(),
-    properties = CHROME,
+    dimensions = windows,
+    properties = chrome,
 )
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "ddk-linux-release-firefox",
     category = "ddc|fl",
-    properties = FIREFOX,
+    properties = firefox,
 )
 
 # misc
-dart_ci_sandbox_builder("gclient", recipe = "dart/gclient", category = "misc|g")
-dart_ci_builder(
+dart.ci_sandbox_builder("gclient", recipe = "dart/gclient", category = "misc|g")
+dart.ci_builder(
     "debianpackage-linux",
     category = "misc|dp",
-    channels = RELEASE_CHANNELS,
+    channels = dart.release_channels,
     notifies = "infra",
     properties = {
         "clobber": False,
     },
 )
 
-# Isolate stress test builder
-dart_vm_extra_builder(
-    "iso-stress-linux",
-    channels = [],
-    notifies = "dart-vm-team",
-)
-
 # external
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "google",
     recipe = "dart/external",
     category = "flutter|g3",
     channels = [],
     execution_timeout = 5 * time.minute,
     notifies = None,
-    priority = HIGH,
+    priority = priority.high,
     triggered_by = None,
 )
 
 # infra
-dart_infra_builder(
+dart.infra_builder(
     "base",
     execution_timeout = 15 * time.minute,
     recipe = "dart/forward_branch",
     schedule = "with 15m interval",
     notifies = None,
 )
-dart_infra_builder(
+dart.infra_builder(
     "cbuild",
     recipe = "dart/cbuild",
     schedule = "with 15m interval",
     execution_timeout = 10 * time.minute,
 )
-dart_infra_builder("chocolatey", recipe = "dart/chocolatey", dimensions = windows())
-dart_infra_builder("co19-roller", recipe = "dart/package_co19")
-dart_infra_builder(
+dart.infra_builder("chocolatey", recipe = "dart/chocolatey", dimensions = windows)
+dart.infra_builder("co19-roller", recipe = "dart/package_co19")
+dart.infra_builder(
     "dart-ci-scripts-linux",
     recipe = "dart/package_dart_ci",
-    dimensions = linux(),
 )
-dart_infra_builder(
+dart.infra_builder(
     "dart-ci-scripts-win",
     recipe = "dart/package_dart_ci",
-    dimensions = windows(),
+    dimensions = windows,
 )
-dart_infra_builder(
+dart.infra_builder(
     "dart-ci-scripts-mac",
     recipe = "dart/package_dart_ci",
-    dimensions = mac(),
-    properties = PINNED_XCODE,
+    dimensions = mac,
+    properties = pinned_xcode,
 )
-dart_infra_builder(
+dart.infra_builder(
     "dart-ci-scripts-mac-arm64",
     recipe = "dart/package_dart_ci",
-    dimensions = mac(cpu = "arm64"),
-    properties = PINNED_XCODE,
+    dimensions = [mac, arm64],
+    properties = pinned_xcode,
 )
-dart_infra_builder(
+dart.infra_builder(
     "linearize-flutter",
     recipe = "dart/linearize",
     properties = {
@@ -1724,7 +587,7 @@ dart_infra_builder(
     ],
     triggering_policy = scheduler.greedy_batching(max_batch_size = 1),
 )
-dart_infra_builder(
+dart.infra_builder(
     "roll-to-dev",
     bucket = "ci.roll",
     execution_timeout = 15 * time.minute,
@@ -1740,14 +603,14 @@ dart_infra_builder(
 # image. The `vm-precomp-ffi-qemu-linux-release-arm` is  used because qemu is
 # the primary difference, it passes all tests, triggers no shards and runs a few
 # different builds. See also https://crbug.com/1207358.
-nightly_builder(
+cron.nightly_builder(
     "vm-precomp-ffi-qemu-linux-release-arm-experimental",
     channels = [],
     dimensions = {"host_class": "experimental"},
     notifies = "infra",
 )
 
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "ci-test-data",
     channels = [],
     properties = {"bisection_enabled": True},
@@ -1756,7 +619,7 @@ dart_ci_sandbox_builder(
 )
 
 # Fuzz testing builders
-dart_ci_sandbox_builder(
+dart.ci_sandbox_builder(
     "fuzz-linux",
     channels = [],
     notifies = "dart-fuzz-testing",
@@ -1765,20 +628,16 @@ dart_ci_sandbox_builder(
 )
 
 # Try only builders
-dart_try_builder("benchmark-linux", on_cq = True, properties = JS_ENGINES)
+dart.try_builder("benchmark-linux", on_cq = True, properties = js_engines)
 
-dart_try_builder(
+dart.try_builder(
     "presubmit",
     bucket = "try.shared",
     execution_timeout = 10 * time.minute,
     recipe = "presubmit/presubmit",
 )
 
-def add_postponed_alt_console_entries():
-    for entry in postponed_alt_console_entries:
-        luci.console_view_entry(console_view = "alt", **entry)
-
-add_postponed_alt_console_entries()
+vm.add_postponed_alt_console_entries()
 
 # Dart Fuzz console
 luci.list_view_entry(
@@ -1821,55 +680,4 @@ luci.list_view_entry(
     list_view = "iso-stress",
 )
 
-def chromium_infra_recipe(name):
-    return luci.recipe(
-        name = name,
-        cipd_package =
-            "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
-        cipd_version = "git_revision:21e1e6473db300eb5045e4483e8b53d1324cd0d8",
-        use_bbagent = True,
-    )
-
-# Rolls dart recipe dependencies.
-dart_infra_builder(
-    name = "recipe-deps-roller",
-    executable = chromium_infra_recipe("recipe_autoroller"),
-    execution_timeout = 20 * time.minute,
-    expiration_timeout = time.day,
-    priority = LOW,
-    properties = {
-        "db_gcs_bucket": "dart-recipe-roller-db",
-        "projects": {
-            "dart": "https://dart.googlesource.com/recipes",
-        }.items(),  # recipe_autoroller expects a list of tuples.
-    },
-    schedule = "with 4h interval",
-)
-
-dart_infra_builder(
-    name = "recipe-bundler",
-    executable = chromium_infra_recipe("recipe_bundler"),
-    execution_timeout = 5 * time.minute,
-    properties = {
-        # This property controls the version of the recipe_bundler go tool:
-        #   https://chromium.googlesource.com/infra/infra/+/main/go/src/infra/tools/recipe_bundler
-        "recipe_bundler_vers": "git_revision:bc0c2fb9082bc82a2d972b5cca8fc17afa55d34e",
-        # These control the prefix of the CIPD package names that the tool
-        # will create.
-        "package_name_prefix": "dart/recipe_bundles",
-        "package_name_internal_prefix": "dart_internal/recipe_bundles",
-        # Where to grab the recipes to bundle.
-        "repo_specs": [
-            "dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/main",
-        ],
-    },
-    schedule = "*/30 * * * *",
-    triggered_by = [
-        luci.gitiles_poller(
-            name = "recipes-dart",
-            bucket = "ci",
-            repo = "https://dart.googlesource.com/recipes",
-            refs = ["refs/heads/main"],
-        ),
-    ],
-)
+exec("//recipes.star")
diff --git a/project.star b/project.star
new file mode 100644
index 000000000000..30533e8a9c83
--- /dev/null
+++ b/project.star
@@ -0,0 +1,154 @@
+# Copyright (c) 2022 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Global definitions and ACLs for the project.
+"""
+
+load("//lib/accounts.star", "accounts")
+
+# https://chrome-infra-auth.appspot.com/auth/groups/project-dart-ci-task-accounts
+CI_ACCOUNTS_GROUP = "project-dart-ci-task-accounts"
+
+# https://chrome-infra-auth.appspot.com/auth/groups/project-dart-try-task-accounts
+TRY_ACCOUNTS_GROUP = "project-dart-try-task-accounts"
+
+ROLL_TRIGGERERS = {
+    "groups": ["project-dart-roller-owners"],
+    "users": [
+        accounts.ci_builder,
+    ],
+}
+CI_SANDBOX_TRIGGERERS = [accounts.ci_builder, accounts.try_builder]
+
+lucicfg.config(
+    config_dir = ".",
+    tracked_files = [
+        "commit-queue.cfg",
+        "cr-buildbucket.cfg",
+        "luci-logdog.cfg",
+        "luci-milo.cfg",
+        "luci-notify.cfg",
+        "luci-scheduler.cfg",
+        "project.cfg",
+        "realms.cfg",
+    ],
+    lint_checks = ["all"],
+)
+
+luci.project(
+    name = "dart",
+    buildbucket = "cr-buildbucket.appspot.com",
+    logdog = "luci-logdog.appspot.com",
+    milo = "luci-milo.appspot.com",
+    notify = "luci-notify.appspot.com",
+    scheduler = "luci-scheduler.appspot.com",
+    swarming = "chromium-swarm.appspot.com",
+    acls = [
+        acl.entry(
+            [
+                acl.BUILDBUCKET_READER,
+                acl.LOGDOG_READER,
+                acl.PROJECT_CONFIGS_READER,
+                acl.SCHEDULER_READER,
+            ],
+            groups = ["all"],
+        ),
+        acl.entry(acl.LOGDOG_WRITER, groups = ["luci-logdog-chromium-writers"]),
+        acl.entry(
+            [acl.SCHEDULER_OWNER, acl.BUILDBUCKET_TRIGGERER],
+            groups = ["project-dart-admins"],
+        ),
+        acl.entry(acl.CQ_COMMITTER, groups = ["project-dart-committers"]),
+        acl.entry(acl.CQ_DRY_RUNNER, groups = ["project-dart-tryjob-access"]),
+    ],
+    bindings = [
+        luci.binding(
+            roles = "role/configs.validator",
+            users = accounts.try_builder,
+        ),
+        luci.binding(
+            roles = "role/swarming.poolOwner",
+            groups = "project-dart-admins",
+        ),
+        luci.binding(
+            roles = "role/swarming.poolViewer",
+            groups = "project-dart-committers",
+        ),
+    ],
+)
+
+luci.logdog(gs_bucket = "chromium-luci-logdog")
+
+luci.bucket(
+    name = "ci",
+    acls = [
+        acl.entry(acl.BUILDBUCKET_TRIGGERER, users = [accounts.ci_builder]),
+    ],
+)
+luci.bucket(
+    name = "ci.roll",
+    acls = [
+        acl.entry(acl.BUILDBUCKET_TRIGGERER, **ROLL_TRIGGERERS),
+    ],
+)
+luci.bucket(
+    name = "ci.sandbox",
+    acls = [
+        acl.entry(acl.BUILDBUCKET_TRIGGERER, users = CI_SANDBOX_TRIGGERERS),
+    ],
+)
+TRY_ACLS = [
+    acl.entry(
+        acl.BUILDBUCKET_TRIGGERER,
+        groups = ["project-dart-tryjob-access", "service-account-cq"],
+    ),
+]
+luci.bucket(name = "try", acls = TRY_ACLS)  # Tryjobs specific to the Dart SDK repo.
+luci.bucket(name = "try.shared", acls = TRY_ACLS)  # Tryjobs for all repos.
+
+# Swarming permissions in realms.cfg.
+
+luci.realm(name = "pools/ci")
+luci.realm(name = "pools/try")
+luci.realm(
+    name = "pools/tests",
+    bindings = [
+        luci.binding(
+            roles = "role/swarming.poolUser",
+            groups = [CI_ACCOUNTS_GROUP, TRY_ACCOUNTS_GROUP],
+        ),
+    ],
+)
+
+def led_users(*, pool_realms, builder_realm, groups):
+    for realm in pool_realms:
+        luci.binding(
+            realm = realm,
+            roles = "role/swarming.poolUser",
+            groups = groups,
+        )
+    luci.binding(
+        realm = builder_realm,
+        roles = "role/swarming.taskTriggerer",
+        groups = groups,
+    )
+
+# Allow admins to use LED and "Debug" button on every Dart builder and bot.
+led_users(
+    pool_realms = ["@root"],
+    builder_realm = "@root",
+    groups = ["project-dart-admins"],
+)
+
+# Allow mdb/dart-build-access to use LED and "Debug" button on try builders and
+# try and test bots.
+led_users(
+    pool_realms = ["pools/try", "pools/tests"],
+    builder_realm = "try",
+    groups = ["mdb/dart-build-access"],
+)
+
+luci.milo(
+    logo = "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png",
+)
diff --git a/recipes.star b/recipes.star
new file mode 100644
index 000000000000..c58f8f5448c3
--- /dev/null
+++ b/recipes.star
@@ -0,0 +1,65 @@
+# Copyright (c) 2022 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Luci recipe framework infrastructure.
+
+The recipe-deps-roller keeps recipe dependencies up-to-date and the recipe
+bundler uploads recipes as CIPD packages.
+"""
+
+load("//lib/dart.star", "dart")
+load("//lib/priority.star", "priority")
+
+def chromium_infra_recipe(name):
+    return luci.recipe(
+        name = name,
+        cipd_package =
+            "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
+        cipd_version = "git_revision:21e1e6473db300eb5045e4483e8b53d1324cd0d8",
+        use_bbagent = True,
+    )
+
+# Rolls dart recipe dependencies.
+dart.infra_builder(
+    name = "recipe-deps-roller",
+    executable = chromium_infra_recipe("recipe_autoroller"),
+    execution_timeout = 20 * time.minute,
+    expiration_timeout = time.day,
+    priority = priority.low,
+    properties = {
+        "db_gcs_bucket": "dart-recipe-roller-db",
+        "projects": {
+            "dart": "https://dart.googlesource.com/recipes",
+        }.items(),  # recipe_autoroller expects a list of tuples.
+    },
+    schedule = "with 4h interval",
+)
+
+dart.infra_builder(
+    name = "recipe-bundler",
+    executable = chromium_infra_recipe("recipe_bundler"),
+    execution_timeout = 5 * time.minute,
+    properties = {
+        # These control the prefix of the CIPD package names that the tool
+        # will create.
+        "package_name_internal_prefix": "dart_internal/recipe_bundles",
+        "package_name_prefix": "dart/recipe_bundles",
+        # This property controls the version of the recipe_bundler go tool:
+        #   https://chromium.googlesource.com/infra/infra/+/main/go/src/infra/tools/recipe_bundler
+        "recipe_bundler_vers": "git_revision:bc0c2fb9082bc82a2d972b5cca8fc17afa55d34e",
+        # Where to grab the recipes to bundle.
+        "repo_specs": [
+            "dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/main",
+        ],
+    },
+    schedule = "*/30 * * * *",
+    triggered_by = [
+        luci.gitiles_poller(
+            name = "recipes-dart",
+            bucket = "ci",
+            repo = "https://dart.googlesource.com/recipes",
+            refs = ["refs/heads/main"],
+        ),
+    ],
+)
diff --git a/vm.star b/vm.star
new file mode 100644
index 000000000000..b2a032490ed4
--- /dev/null
+++ b/vm.star
@@ -0,0 +1,533 @@
+# Copyright (c) 2022 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Defines the Dart VM builders.
+"""
+
+load("//lib/cron.star", "cron")
+load("//lib/dart.star", "dart")
+load(
+    "//lib/defaults.star",
+    "arm64",
+    "mac",
+    "no_android",
+    "pinned_xcode",
+    "slow_shards",
+    "windows",
+)
+load("//lib/paths.star", "paths")
+load("//lib/priority.star", "priority")
+
+_postponed_alt_console_entries = []
+
+dart.poller("dart-vm-gitiles-trigger", branches = ["main"], paths = paths.vm)
+luci.notifier(
+    name = "dart-vm-team",
+    on_new_failure = True,
+    notify_emails = ["dart-vm-team-breakages@google.com"],
+)
+
+def _builder(name, category = None, **kwargs):
+    dart.ci_sandbox_builder(name, category = category, **kwargs)
+    _postponed_alt_console_entry(name, category)
+
+def _extra_builder(name, on_cq = False, location_regexp = None, **kwargs):
+    """
+    Creates a Dart builder that is only triggered by VM commits.
+
+    Args:
+        name: The builder name.
+        on_cq: Whether the build is added to the default set of CQ tryjobs.
+        location_regexp: Locations that trigger this builder.
+        **kwargs: Extra arguments are passed on to dart_ci_sandbox_builder.
+    """
+    triggered_by = ["dart-vm-gitiles-trigger-%s"]
+    if on_cq and not location_regexp:
+        # Don't add extra builders to the default CQ, trigger only on VM paths.
+        location_regexp = paths.to_location_regexp(paths.vm)
+        on_cq = False
+    _builder(
+        name,
+        triggered_by = triggered_by,
+        on_cq = on_cq,
+        location_regexp = location_regexp,
+        **kwargs
+    )
+
+def _low_priority_builder(name, **kwargs):
+    _extra_builder(
+        name,
+        channels = ["try"],
+        priority = priority.low,
+        expiration_timeout = time.day,
+        **kwargs
+    )
+
+def _nightly_builder(name, category, **kwargs):
+    cron.nightly_builder(name, category = category, notifies = "dart-vm-team", **kwargs)
+    _postponed_alt_console_entry(name, category)
+
+def _postponed_alt_console_entry(name, category):
+    if category:
+        console_category, _, short_name = category.rpartition("|")
+        _postponed_alt_console_entries.append({
+            "builder": name,
+            "category": console_category,
+            "short_name": short_name,
+        })
+
+def add_postponed_alt_console_entries():
+    for entry in _postponed_alt_console_entries:
+        luci.console_view_entry(console_view = "alt", **entry)
+
+# vm|nnbd|jit
+_extra_builder(
+    "vm-kernel-nnbd-linux-debug-x64",
+    category = "vm|nnbd|jit|d",
+    on_cq = True,
+)
+_extra_builder(
+    "vm-kernel-nnbd-linux-release-x64",
+    category = "vm|nnbd|jit|r",
+    on_cq = True,
+)
+_nightly_builder(
+    "vm-kernel-nnbd-linux-debug-ia32",
+    category = "vm|nnbd|jit|d3",
+    channels = ["try"],
+    properties = slow_shards,
+)
+_nightly_builder(
+    "vm-kernel-nnbd-linux-release-ia32",
+    category = "vm|nnbd|jit|r3",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-kernel-nnbd-linux-release-simarm",
+    category = "vm|nnbd|jit|ra",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-kernel-nnbd-linux-release-simarm64",
+    category = "vm|nnbd|jit|ra6",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-kernel-nnbd-mac-debug-arm64",
+    category = "vm|nnbd|jit|m1d",
+    channels = ["try"],
+    dimensions = [mac, arm64],
+    properties = [no_android, pinned_xcode, slow_shards],
+)
+_nightly_builder(
+    "vm-kernel-nnbd-mac-debug-x64",
+    category = "vm|nnbd|jit|md",
+    channels = ["try"],
+    dimensions = mac,
+    properties = [pinned_xcode, slow_shards],
+)
+_extra_builder(
+    "vm-kernel-nnbd-mac-release-arm64",
+    category = "vm|nnbd|jit|m1r",
+    channels = ["try"],
+    dimensions = [mac, arm64],
+    properties = [no_android, pinned_xcode],
+)
+_nightly_builder(
+    "vm-kernel-nnbd-mac-release-x64",
+    category = "vm|nnbd|jit|mr",
+    channels = ["try"],
+    dimensions = mac,
+    properties = pinned_xcode,
+)
+_nightly_builder(
+    "vm-kernel-nnbd-win-release-ia32",
+    category = "vm|nnbd|jit|wr3",
+    channels = ["try"],
+    dimensions = windows,
+)
+_nightly_builder(
+    "vm-kernel-nnbd-win-debug-x64",
+    category = "vm|nnbd|jit|wd",
+    channels = ["try"],
+    properties = slow_shards,
+    dimensions = windows,
+)
+_nightly_builder(
+    "vm-kernel-nnbd-win-release-x64",
+    category = "vm|nnbd|jit|wr",
+    channels = ["try"],
+    dimensions = windows,
+)
+
+# vm|nnbd|aot
+_extra_builder(
+    "vm-kernel-precomp-nnbd-linux-release-x64",
+    category = "vm|nnbd|aot|r",
+)
+_nightly_builder(
+    "vm-kernel-precomp-nnbd-linux-debug-simarm_x64",
+    category = "vm|nnbd|aot|da",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-kernel-precomp-nnbd-linux-release-simarm_x64",
+    category = "vm|nnbd|aot|ra",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-kernel-precomp-nnbd-linux-debug-x64",
+    category = "vm|nnbd|aot|d",
+    channels = ["try"],
+    properties = slow_shards,
+)
+_nightly_builder(
+    "vm-kernel-precomp-nnbd-linux-release-simarm64",
+    category = "vm|nnbd|aot|ra6",
+    channels = ["try"],
+)
+_extra_builder(
+    "vm-kernel-precomp-nnbd-mac-release-arm64",
+    category = "vm|nnbd|aot|m1",
+    channels = ["try"],
+    dimensions = [mac, arm64],
+    properties = [no_android, pinned_xcode, slow_shards],
+)
+_nightly_builder(
+    "vm-kernel-precomp-nnbd-mac-release-simarm64",
+    category = "vm|nnbd|aot|ma6",
+    channels = ["try"],
+    dimensions = mac,
+    properties = [pinned_xcode, slow_shards],
+)
+_nightly_builder(
+    "vm-kernel-precomp-nnbd-win-release-x64",
+    category = "vm|nnbd|aot|wr",
+    channels = ["try"],
+    dimensions = windows,
+)
+
+# vm|app-kernel
+_extra_builder(
+    "app-kernel-linux-debug-x64",
+    category = "vm|app-kernel|d64",
+    properties = slow_shards,
+)
+_nightly_builder(
+    "app-kernel-linux-product-x64",
+    category = "vm|app-kernel|p64",
+    channels = ["try"],
+)
+_extra_builder(
+    "app-kernel-linux-release-x64",
+    category = "vm|app-kernel|r64",
+)
+
+#vm|kernel
+_extra_builder(
+    "vm-canary-linux-debug",
+    category = "vm|kernel|c",
+    on_cq = True,
+)
+_builder("vm-kernel-linux-debug-x64", category = "vm|kernel|d")
+_extra_builder(
+    "vm-kernel-linux-release-simarm",
+    category = "vm|kernel|a32",
+)
+_extra_builder(
+    "vm-kernel-linux-release-simarm64",
+    category = "vm|kernel|a64",
+)
+_nightly_builder(
+    "vm-kernel-linux-release-ia32",
+    category = "vm|kernel|r32",
+    channels = ["try"],
+)
+_builder(
+    "vm-kernel-linux-release-x64",
+    category = "vm|kernel|r",
+    on_cq = True,
+)
+_extra_builder(
+    "vm-kernel-checked-linux-release-x64",
+    category = "vm|kernel|rc",
+    experiments = {"dart.use_update_script": 100},
+)
+_nightly_builder(
+    "vm-kernel-linux-debug-ia32",
+    category = "vm|kernel|d32",
+    channels = ["try"],
+)
+_builder(
+    "vm-kernel-mac-debug-x64",
+    category = "vm|kernel|md",
+    dimensions = mac,
+    properties = pinned_xcode,
+)
+_builder(
+    "vm-kernel-mac-release-x64",
+    category = "vm|kernel|mr",
+    dimensions = mac,
+    on_cq = True,
+    experiment_percentage = 5,
+    properties = pinned_xcode,
+)
+_builder(
+    "vm-kernel-mac-release-arm64",
+    category = "vm|kernel|m1r",
+    channels = ["try", "dev"],
+    dimensions = [mac, arm64],
+    properties = [no_android, pinned_xcode],
+)
+_nightly_builder(
+    "vm-kernel-win-debug-ia32",
+    category = "vm|kernel|wd3",
+    channels = ["try"],
+    dimensions = windows,
+)
+_builder(
+    "vm-kernel-win-debug-x64",
+    category = "vm|kernel|wd",
+    dimensions = windows,
+)
+_nightly_builder(
+    "vm-kernel-win-release-ia32",
+    category = "vm|kernel|wr3",
+    channels = ["try"],
+    dimensions = windows,
+)
+_builder(
+    "vm-kernel-win-release-x64",
+    category = "vm|kernel|wr",
+    dimensions = windows,
+)
+_extra_builder(
+    "cross-vm-linux-release-arm64",
+    category = "vm|kernel|cra",
+    channels = [],
+    properties = {"shard_timeout": (120 * time.minute) // time.second},
+)
+
+# vm|kernel-precomp
+_extra_builder(
+    "vm-kernel-precomp-linux-debug-x64",
+    category = "vm|kernel-precomp|d",
+)
+_extra_builder(
+    "vm-kernel-precomp-linux-product-x64",
+    category = "vm|kernel-precomp|p",
+)
+_extra_builder(
+    "vm-kernel-precomp-linux-release-simarm",
+    category = "vm|kernel-precomp|a32",
+)
+_extra_builder(
+    "vm-kernel-precomp-linux-release-simarm64",
+    category = "vm|kernel-precomp|a64",
+)
+_extra_builder(
+    "vm-kernel-precomp-linux-release-x64",
+    category = "vm|kernel-precomp|r",
+)
+_extra_builder(
+    "vm-kernel-precomp-obfuscate-linux-release-x64",
+    category = "vm|kernel-precomp|o",
+)
+_extra_builder(
+    "vm-kernel-precomp-linux-debug-simarm_x64",
+    category = "vm|kernel-precomp|adx",
+    properties = slow_shards,
+)
+_extra_builder(
+    "vm-kernel-precomp-linux-release-simarm_x64",
+    category = "vm|kernel-precomp|arx",
+)
+_extra_builder(
+    "vm-kernel-precomp-mac-release-simarm64",
+    category = "vm|kernel-precomp|ma",
+    dimensions = mac,
+    properties = pinned_xcode,
+)
+_extra_builder(
+    "vm-kernel-precomp-win-release-x64",
+    category = "vm|kernel-precomp|wr",
+    dimensions = windows,
+)
+_nightly_builder(
+    "cross-vm-precomp-linux-release-arm64",
+    category = "vm|kernel-precomp|cra",
+    channels = [],
+    properties = slow_shards,
+)
+_nightly_builder(
+    "vm-kernel-precomp-dwarf-linux-product-x64",
+    category = "vm|kernel-precomp|dw",
+    channels = ["try"],
+)
+
+# vm|kernel-precomp|android
+_extra_builder(
+    "vm-kernel-precomp-android-release-arm_x64",
+    category = "vm|kernel-precomp|android|a32",
+    properties = slow_shards,
+)
+_extra_builder(
+    "vm-kernel-precomp-android-release-arm64c",
+    category = "vm|kernel-precomp|android|a64",
+    properties = slow_shards,
+)
+
+# vm|product
+_nightly_builder(
+    "vm-kernel-linux-product-x64",
+    category = "vm|product|l",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-kernel-mac-product-x64",
+    category = "vm|product|m",
+    channels = ["try"],
+    dimensions = mac,
+    properties = pinned_xcode,
+)
+_nightly_builder(
+    "vm-kernel-win-product-x64",
+    category = "vm|product|w",
+    channels = ["try"],
+    dimensions = windows,
+)
+
+# vm|misc
+_nightly_builder(
+    "vm-kernel-optcounter-threshold-linux-release-ia32",
+    category = "vm|misc|o32",
+    channels = ["try"],
+)
+_low_priority_builder(
+    "vm-kernel-optcounter-threshold-linux-release-x64",
+    category = "vm|misc|o64",
+)
+
+def dart_vm_sanitizer_builder(name, **kwargs):
+    _nightly_builder(
+        name,
+        channels = ["try"],
+        properties = {"bisection_enabled": True},
+        **kwargs
+    )
+
+dart_vm_sanitizer_builder(
+    "vm-kernel-asan-linux-release-x64",
+    category = "vm|misc|a",
+)
+dart_vm_sanitizer_builder(
+    "vm-kernel-msan-linux-release-x64",
+    category = "vm|misc|m",
+)
+dart_vm_sanitizer_builder(
+    "vm-kernel-tsan-linux-release-x64",
+    category = "vm|misc|t",
+)
+dart_vm_sanitizer_builder(
+    "vm-kernel-ubsan-linux-release-x64",
+    category = "vm|misc|u",
+    goma = False,
+)  # ubsan is not compatible with our sysroot.
+dart_vm_sanitizer_builder(
+    "vm-kernel-precomp-asan-linux-release-x64",
+    category = "vm|misc|aot|a",
+)
+dart_vm_sanitizer_builder(
+    "vm-kernel-precomp-msan-linux-release-x64",
+    category = "vm|misc|aot|m",
+)
+dart_vm_sanitizer_builder(
+    "vm-kernel-precomp-tsan-linux-release-x64",
+    category = "vm|misc|aot|t",
+)
+dart_vm_sanitizer_builder(
+    "vm-kernel-precomp-ubsan-linux-release-x64",
+    category = "vm|misc|aot|u",
+    goma = False,
+)  # ubsan is not compatible with our sysroot.
+_nightly_builder(
+    "vm-kernel-reload-linux-debug-x64",
+    category = "vm|misc|reload|d",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-kernel-reload-linux-release-x64",
+    category = "vm|misc|reload|r",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-kernel-reload-rollback-linux-debug-x64",
+    category = "vm|misc|reload|drb",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-kernel-reload-rollback-linux-release-x64",
+    category = "vm|misc|reload|rrb",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-kernel-linux-debug-x64c",
+    category = "vm|misc|compressed|jl",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-kernel-precomp-linux-debug-x64c",
+    category = "vm|misc|compressed|al",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-kernel-win-debug-x64c",
+    category = "vm|misc|compressed|jw",
+    channels = ["try"],
+    dimensions = windows,
+)
+_nightly_builder(
+    "vm-kernel-precomp-win-debug-x64c",
+    category = "vm|misc|compressed|aw",
+    channels = ["try"],
+    dimensions = windows,
+)
+_low_priority_builder("vm-fuchsia-release-x64", category = "vm|misc|f")
+
+# Our sysroot does not support gcc, we can't use goma on RBE for this builder
+_nightly_builder("vm-kernel-gcc-linux", category = "vm|misc|g", goma = False)
+
+_nightly_builder(
+    "vm-kernel-linux-debug-simriscv64",
+    category = "vm|misc|rv64",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-kernel-precomp-linux-debug-simriscv64",
+    category = "vm|misc|rv64",
+    channels = ["try"],
+)
+
+# vm|ffi
+_extra_builder("vm-ffi-android-debug-arm", category = "vm|ffi|d32")
+_extra_builder("vm-ffi-android-release-arm", category = "vm|ffi|r32")
+_extra_builder("vm-ffi-android-product-arm", category = "vm|ffi|p32")
+_extra_builder("vm-ffi-android-debug-arm64c", category = "vm|ffi|d64")
+_extra_builder("vm-ffi-android-release-arm64c", category = "vm|ffi|r64")
+_extra_builder("vm-ffi-android-product-arm64c", category = "vm|ffi|p64")
+_extra_builder(
+    "vm-precomp-ffi-qemu-linux-release-arm",
+    category = "vm|ffi|qa",
+)
+_extra_builder(
+    "vm-precomp-ffi-qemu-linux-release-riscv64",
+    category = "vm|ffi|qr",
+)
+
+# Isolate stress test builder
+_extra_builder(
+    "iso-stress-linux",
+    channels = [],
+    notifies = "dart-vm-team",
+)

From a26a6a31e7394ec42809848420702a1f0eda136d Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Wed, 9 Feb 2022 20:46:16 +0000
Subject: [PATCH 522/826] [infra] Add flutter-engine-ios builder that runs
 daily

It uses Flutter CI builders to build the profile configuration
for iOS devices, and reports back the status of those builds.

Bug: b/216278334
Change-Id: I00a48391d6941f0f99d61b1cbacee074b3c7db03
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/232083
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 44 ++++++++++++++++++++++++++++++++++++++++++++
 luci-milo.cfg      | 10 ++++++++++
 luci-scheduler.cfg | 22 ++++++++++++++++++++++
 main.star          | 18 ++++++++++++++++++
 4 files changed, 94 insertions(+)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index c651e31ed5de..832dddb97983 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1120,6 +1120,50 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "flutter-engine-ios"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/flutter/engine"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
     builders {
       name: "linearize-flutter"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/luci-milo.cfg b/luci-milo.cfg
index 056228fb15b2..f28a66e1dc47 100644
--- a/luci-milo.cfg
+++ b/luci-milo.cfg
@@ -450,6 +450,11 @@ consoles {
     category: "flutter"
     short_name: "web"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/flutter-engine-ios"
+    category: "flutter"
+    short_name: "i"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
     category: "vm|nnbd|jit"
@@ -1149,6 +1154,11 @@ consoles {
     category: "flutter"
     short_name: "web"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/flutter-engine-ios"
+    category: "flutter"
+    short_name: "i"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
index 497661e4da86..b24be7d9b613 100644
--- a/luci-scheduler.cfg
+++ b/luci-scheduler.cfg
@@ -1324,6 +1324,17 @@ job {
     builder: "flutter-analyze"
   }
 }
+job {
+  id: "flutter-engine-ios"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "flutter-engine-ios"
+  }
+}
 job {
   id: "flutter-engine-linux"
   realm: "ci.sandbox"
@@ -4088,6 +4099,17 @@ trigger {
     refs: "regexp:refs/heads/master"
   }
 }
+trigger {
+  id: "dart-gitiles-trigger-flutter-daily"
+  realm: "ci"
+  schedule: "0 8 * * *"
+  acl_sets: "ci"
+  triggers: "flutter-engine-ios"
+  gitiles {
+    repo: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
+    refs: "regexp:refs/heads/master"
+  }
+}
 trigger {
   id: "dart-gitiles-trigger-main"
   realm: "ci"
diff --git a/main.star b/main.star
index 3ba8f08bfa2d..72cfd75f016e 100755
--- a/main.star
+++ b/main.star
@@ -133,6 +133,14 @@ luci.gitiles_poller(
     refs = ["refs/heads/master"],
 )
 
+luci.gitiles_poller(
+    name = "dart-gitiles-trigger-flutter-daily",
+    bucket = "ci",
+    repo = "https://dart.googlesource.com/linear_sdk_flutter_engine/",
+    refs = ["refs/heads/master"],
+    schedule = "0 8 * * *",  # daily, at 08:00 UTC
+)
+
 luci.gitiles_poller(
     name = "dart-ci-test-data-trigger",
     bucket = "ci",
@@ -277,6 +285,16 @@ dart.ci_sandbox_builder(
     },
 )
 
+dart.ci_builder(
+    "flutter-engine-ios",
+    recipe = "dart/flutter/engine",
+    category = "flutter|i",
+    channels = [],
+    execution_timeout = 2 * time.hour,
+    triggered_by = ["dart-gitiles-trigger-flutter-daily"],
+    notifies = None,
+)
+
 vm = exec("//vm.star")
 
 # pkg

From fc60aeca1c554f48a71b12c2313c58f228bf669d Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Wed, 9 Feb 2022 23:53:58 +0000
Subject: [PATCH 523/826] [infra] Change flutter-engine-ios builder to use
 flutter/engine recipe

Change-Id: Id265044132cdd14f3bcfc7aab6e6ad30da17629b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/232261
Auto-Submit: William Hesse <whesse@google.com>
Reviewed-by: Vadim Shtayura <vadimsh@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 cr-buildbucket.cfg | 2 +-
 main.star          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 832dddb97983..d2434ed3ac0c 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -1145,7 +1145,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/flutter/engine"'
+        '  "recipe": "flutter/engine"'
         '}'
       priority: 50
       execution_timeout_secs: 7200
diff --git a/main.star b/main.star
index 72cfd75f016e..d33269e26f24 100755
--- a/main.star
+++ b/main.star
@@ -287,7 +287,7 @@ dart.ci_sandbox_builder(
 
 dart.ci_builder(
     "flutter-engine-ios",
-    recipe = "dart/flutter/engine",
+    recipe = "flutter/engine",
     category = "flutter|i",
     channels = [],
     execution_timeout = 2 * time.hour,

From 3987e9d0f3febd3012264261c4ffb4097e7fe6cd Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 10 Feb 2022 07:35:49 +0000
Subject: [PATCH 524/826] [infra] Move luci-config files to generated/

Change-Id: I6c47c289b86777eae2bacb1469cef8e9be095277
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/232098
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg                    |   781 +
 generated/cr-buildbucket.cfg                  | 22970 ++++++++++++++++
 generated/luci-logdog.cfg                     |     9 +
 generated/luci-milo.cfg                       |  3110 +++
 generated/luci-notify.cfg                     |  1705 ++
 .../email-templates/common.template           |    24 +
 .../email-templates/default.template          |    32 +
 generated/luci-scheduler.cfg                  |  4411 +++
 generated/project.cfg                         |    14 +
 generated/realms.cfg                          |   147 +
 project.star                                  |    12 +-
 11 files changed, 33204 insertions(+), 11 deletions(-)
 create mode 100644 generated/commit-queue.cfg
 create mode 100644 generated/cr-buildbucket.cfg
 create mode 100644 generated/luci-logdog.cfg
 create mode 100644 generated/luci-milo.cfg
 create mode 100644 generated/luci-notify.cfg
 create mode 100644 generated/luci-notify/email-templates/common.template
 create mode 100644 generated/luci-notify/email-templates/default.template
 create mode 100644 generated/luci-scheduler.cfg
 create mode 100644 generated/project.cfg
 create mode 100644 generated/realms.cfg

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
new file mode 100644
index 000000000000..2d40cb728cdd
--- /dev/null
+++ b/generated/commit-queue.cfg
@@ -0,0 +1,781 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see Config message:
+#   https://luci-config.appspot.com/schemas/projects:commit-queue.cfg
+
+cq_status_host: "chromium-cq-status.appspot.com"
+submit_options {
+  max_burst: 2
+  burst_delay {
+    seconds: 480
+  }
+}
+config_groups {
+  name: "dart_ci"
+  gerrit {
+    url: "https://dart-review.googlesource.com"
+    projects {
+      name: "dart_ci"
+      ref_regexp: "refs/heads/main"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "project-dart-committers"
+      dry_run_access_list: "project-dart-tryjob-access"
+      allow_submit_with_open_deps: true
+    }
+    tree_status {
+      url: "https://dart-status.appspot.com"
+    }
+  }
+}
+config_groups {
+  name: "recipes"
+  gerrit {
+    url: "https://dart-review.googlesource.com"
+    projects {
+      name: "recipes"
+      ref_regexp: "refs/heads/main"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "project-dart-committers"
+      dry_run_access_list: "project-dart-tryjob-access"
+      allow_submit_with_open_deps: true
+    }
+    tree_status {
+      url: "https://dart-status.appspot.com"
+    }
+    tryjob {
+      builders {
+        name: "dart/try.shared/presubmit-try"
+        disable_reuse: true
+      }
+      retry_config {}
+    }
+  }
+}
+config_groups {
+  name: "sdk"
+  gerrit {
+    url: "https://dart-review.googlesource.com"
+    projects {
+      name: "sdk"
+      ref_regexp: "refs/heads/main"
+      ref_regexp: "refs/heads/beta"
+      ref_regexp: "refs/heads/dev"
+      ref_regexp: "refs/heads/stable"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "project-dart-committers"
+      dry_run_access_list: "project-dart-tryjob-access"
+      allow_submit_with_open_deps: true
+    }
+    tree_status {
+      url: "https://dart-status.appspot.com"
+    }
+    tryjob {
+      builders {
+        name: "dart/try.shared/presubmit-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/analyzer-analysis-server-linux-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/.+"
+      }
+      builders {
+        name: "dart/try/analyzer-linux-release-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/.+"
+      }
+      builders {
+        name: "dart/try/analyzer-mac-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/analyzer-nnbd-linux-release-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(analyzer|analyzer_cli|_fe_analyzer_shared)/.+"
+      }
+      builders {
+        name: "dart/try/analyzer-nnbd-mac-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/analyzer-nnbd-win-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/analyzer-win-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/app-kernel-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/app-kernel-linux-product-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/app-kernel-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/benchmark-linux-try"
+      }
+      builders {
+        name: "dart/try/dart-sdk-linux-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-mac-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-mac-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-win-try"
+      }
+      builders {
+        name: "dart/try/dart2js-canary-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-csp-minified-linux-x64-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-minified-strong-linux-x64-d8-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
+        location_regexp: ".+/[+]/utils/compiler/.+"
+        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
+      }
+      builders {
+        name: "dart/try/dart2js-nnbd-linux-x64-chrome-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
+        location_regexp: ".+/[+]/utils/compiler/.+"
+        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
+      }
+      builders {
+        name: "dart/try/dart2js-strong-hostasserts-linux-ia32-d8-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
+        location_regexp: ".+/[+]/utils/compiler/.+"
+        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
+      }
+      builders {
+        name: "dart/try/dart2js-strong-linux-x64-chrome-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
+        location_regexp: ".+/[+]/utils/compiler/.+"
+        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
+      }
+      builders {
+        name: "dart/try/dart2js-strong-linux-x64-firefox-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-strong-mac-x64-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-strong-mac-x64-safari-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-strong-win-x64-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-unit-linux-x64-release-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
+        location_regexp: ".+/[+]/utils/compiler/.+"
+        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
+      }
+      builders {
+        name: "dart/try/ddc-linux-release-chrome-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/(build_integration|dev_compiler|meta)/.+"
+        location_regexp: ".+/[+]/utils/dartdevc/.+"
+        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
+      }
+      builders {
+        name: "dart/try/ddc-mac-release-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/ddc-nnbd-linux-release-chrome-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/(build_integration|dev_compiler|meta)/.+"
+        location_regexp: ".+/[+]/utils/dartdevc/.+"
+        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
+      }
+      builders {
+        name: "dart/try/ddc-win-release-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/ddk-linux-release-firefox-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/flutter-analyze-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/flutter-engine-linux-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/flutter-engine-linux-web_tests-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/flutter-frontend-try"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+      }
+      builders {
+        name: "dart/try/front-end-linux-release-x64-try"
+      }
+      builders {
+        name: "dart/try/front-end-mac-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/front-end-nnbd-linux-release-x64-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+      }
+      builders {
+        name: "dart/try/front-end-nnbd-mac-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/front-end-nnbd-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/front-end-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/gclient-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/pkg-linux-debug-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/pkg-linux-release-try"
+      }
+      builders {
+        name: "dart/try/pkg-mac-release-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/pkg-mac-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/pkg-win-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-canary-linux-debug-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/vm/.+"
+        location_regexp: ".+/[+]/runtime/.+"
+      }
+      builders {
+        name: "dart/try/vm-ffi-android-debug-arm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-android-debug-arm64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-android-product-arm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-android-product-arm64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-android-release-arm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-android-release-arm64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-fuchsia-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-asan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-checked-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-gcc-linux-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-linux-debug-ia32-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-linux-debug-simriscv64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-linux-debug-x64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-linux-product-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-linux-release-ia32-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-linux-release-simarm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-linux-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-linux-release-x64-try"
+      }
+      builders {
+        name: "dart/try/vm-kernel-mac-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-mac-product-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-mac-release-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-mac-release-x64-try"
+        experiment_percentage: 5
+      }
+      builders {
+        name: "dart/try/vm-kernel-msan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-debug-ia32-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-debug-x64-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/vm/.+"
+        location_regexp: ".+/[+]/runtime/.+"
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-release-ia32-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-release-simarm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-release-x64-try"
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/vm/.+"
+        location_regexp: ".+/[+]/runtime/.+"
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-mac-debug-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-mac-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-mac-release-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-mac-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-win-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-win-release-ia32-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-optcounter-threshold-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-android-release-arm64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-android-release-arm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-asan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-dwarf-linux-product-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-debug-simarm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-debug-simriscv64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-debug-x64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-product-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-mac-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-msan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-tsan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-ubsan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-win-debug-x64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-reload-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-reload-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-reload-rollback-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-reload-rollback-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-tsan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-ubsan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-win-debug-ia32-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-win-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-win-debug-x64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-win-product-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-win-release-ia32-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-precomp-ffi-qemu-linux-release-arm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
+        includable_only: true
+      }
+      retry_config {}
+    }
+  }
+}
+config_groups {
+  name: "sdk-infra-config"
+  gerrit {
+    url: "https://dart-review.googlesource.com"
+    projects {
+      name: "sdk"
+      ref_regexp: "refs/heads/infra/config"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "project-dart-committers"
+      dry_run_access_list: "project-dart-tryjob-access"
+      allow_submit_with_open_deps: true
+    }
+    tree_status {
+      url: "https://dart-status.appspot.com"
+    }
+    tryjob {
+      builders {
+        name: "dart/try.shared/presubmit-try"
+        disable_reuse: true
+      }
+      retry_config {}
+    }
+  }
+}
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
new file mode 100644
index 000000000000..d2434ed3ac0c
--- /dev/null
+++ b/generated/cr-buildbucket.cfg
@@ -0,0 +1,22970 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see BuildbucketCfg message:
+#   https://luci-config.appspot.com/schemas/projects:buildbucket.cfg
+
+buckets {
+  name: "ci"
+  acls {
+    group: "all"
+  }
+  acls {
+    role: SCHEDULER
+    identity: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+  }
+  acls {
+    role: SCHEDULER
+    group: "project-dart-admins"
+  }
+  swarming {
+    builders {
+      name: "base"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/forward_branch"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 900
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "cbuild"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/cbuild"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 600
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "chocolatey"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/chocolatey"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "co19-roller"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/package_co19"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-ci-scripts-linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/package_dart_ci"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-ci-scripts-mac"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/package_dart_ci"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-ci-scripts-mac-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/package_dart_ci"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-ci-scripts-win"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/package_dart_ci"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-sdk-linux-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true,'
+        '    "timeout": 6000'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-sdk-linux-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true,'
+        '    "timeout": 6000'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-sdk-linux-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true,'
+        '    "timeout": 6000'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-sdk-mac-arm64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-sdk-mac-arm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-sdk-mac-arm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-sdk-mac-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-sdk-mac-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-sdk-mac-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-sdk-win-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-sdk-win-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-sdk-win-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "debianpackage-linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "debianpackage-linux-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "debianpackage-linux-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "debianpackage-linux-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-engine-ios"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "flutter/engine"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "linearize-flutter"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/linearize",'
+        '  "repo": "https://dart.googlesource.com/linear_sdk_flutter_engine.git"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "recipe-bundler"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
+        cipd_version: "git_revision:21e1e6473db300eb5045e4483e8b53d1324cd0d8"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "package_name_internal_prefix": "dart_internal/recipe_bundles",'
+        '  "package_name_prefix": "dart/recipe_bundles",'
+        '  "recipe": "recipe_bundler",'
+        '  "recipe_bundler_vers": "git_revision:bc0c2fb9082bc82a2d972b5cca8fc17afa55d34e",'
+        '  "repo_specs": ['
+        '    "dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/main"'
+        '  ]'
+        '}'
+      priority: 50
+      execution_timeout_secs: 300
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "recipe-deps-roller"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
+        cipd_version: "git_revision:21e1e6473db300eb5045e4483e8b53d1324cd0d8"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "db_gcs_bucket": "dart-recipe-roller-db",'
+        '  "projects": ['
+        '    ['
+        '      "dart",'
+        '      "https://dart.googlesource.com/recipes"'
+        '    ]'
+        '  ],'
+        '  "recipe": "recipe_autoroller"'
+        '}'
+      priority: 70
+      execution_timeout_secs: 1200
+      expiration_secs: 86400
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+  }
+}
+buckets {
+  name: "ci.roll"
+  acls {
+    group: "all"
+  }
+  acls {
+    role: SCHEDULER
+    identity: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+  }
+  acls {
+    role: SCHEDULER
+    group: "project-dart-admins"
+  }
+  acls {
+    role: SCHEDULER
+    group: "project-dart-roller-owners"
+  }
+  swarming {
+    builders {
+      name: "roll-to-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "from_ref": "refs/heads/lkgr",'
+        '  "recipe": "roller/roll_to_dev"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 900
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+  }
+}
+buckets {
+  name: "ci.sandbox"
+  acls {
+    group: "all"
+  }
+  acls {
+    role: SCHEDULER
+    identity: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+  }
+  acls {
+    role: SCHEDULER
+    identity: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
+  acls {
+    role: SCHEDULER
+    group: "project-dart-admins"
+  }
+  swarming {
+    builders {
+      name: "analyzer-analysis-server-linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-analysis-server-linux-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-analysis-server-linux-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-analysis-server-linux-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-linux-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-linux-release-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-linux-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-linux-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-mac-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-mac-release-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-mac-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-mac-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-nnbd-linux-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-nnbd-linux-release-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-nnbd-linux-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-nnbd-linux-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-nnbd-mac-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-nnbd-win-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-win-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-win-release-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-win-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-win-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "app-kernel-linux-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "app-kernel-linux-debug-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "app-kernel-linux-debug-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "app-kernel-linux-debug-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "app-kernel-linux-product-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "app-kernel-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "app-kernel-linux-release-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "app-kernel-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "app-kernel-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "ci-test-data"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "cross-vm-linux-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 7200'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "cross-vm-precomp-linux-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-canary-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-canary-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-canary-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-canary-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-csp-minified-linux-x64-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-csp-minified-linux-x64-chrome-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-csp-minified-linux-x64-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-csp-minified-linux-x64-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-minified-strong-linux-x64-d8"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-minified-strong-linux-x64-d8-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-minified-strong-linux-x64-d8-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-minified-strong-linux-x64-d8-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-nnbd-linux-x64-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-nnbd-linux-x64-chrome-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-nnbd-linux-x64-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-nnbd-linux-x64-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-hostasserts-linux-ia32-d8"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-linux-x64-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-linux-x64-chrome-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-linux-x64-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-linux-x64-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-linux-x64-firefox"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-linux-x64-firefox-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-linux-x64-firefox-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-linux-x64-firefox-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-mac-x64-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-mac-x64-chrome-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-mac-x64-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-mac-x64-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-mac-x64-safari"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-mac-x64-safari-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-mac-x64-safari-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-mac-x64-safari-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-win-x64-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-win-x64-chrome-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-win-x64-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-win-x64-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-win-x64-firefox"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-unit-linux-x64-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-unit-linux-x64-release-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-unit-linux-x64-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-unit-linux-x64-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "ddc-linux-release-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "ddc-linux-release-chrome-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "ddc-linux-release-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "ddc-linux-release-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "ddc-mac-release-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "ddc-mac-release-chrome-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "ddc-mac-release-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "ddc-mac-release-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "ddc-nnbd-linux-release-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "ddc-win-release-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "ddc-win-release-chrome-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "ddc-win-release-chrome-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "ddc-win-release-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "ddk-linux-release-firefox"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "ddk-linux-release-firefox-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "ddk-linux-release-firefox-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "ddk-linux-release-firefox-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-analyze"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 2700
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-engine-linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "flutter_test_suites": ['
+        '    "add_to_app_life_cycle_tests",'
+        '    "flutter_plugins",'
+        '    "framework_coverage",'
+        '    "framework_tests",'
+        '    "tool_tests"'
+        '  ],'
+        '  "recipe": "dart/flutter_engine"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 28800
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-engine-linux-web_tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "flutter_test_suites": ['
+        '    "web_tests",'
+        '    "web_tool_tests"'
+        '  ],'
+        '  "recipe": "dart/flutter_engine"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 28800
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-frontend"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "front-end-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "front-end-linux-release-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "front-end-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "front-end-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "front-end-mac-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "front-end-mac-release-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "front-end-mac-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "front-end-mac-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "front-end-nnbd-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "front-end-nnbd-linux-release-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "front-end-nnbd-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "front-end-nnbd-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "front-end-nnbd-mac-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "front-end-nnbd-win-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "front-end-win-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "front-end-win-release-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "front-end-win-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "front-end-win-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "frontend-weekly"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "fuzz-linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "gclient"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/gclient"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "gclient-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/gclient"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "gclient-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/gclient"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "gclient-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/gclient"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "google"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/external"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 300
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "iso-stress-linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-linux-debug"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-linux-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-linux-release-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-linux-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-linux-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-mac-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-mac-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-mac-release-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-mac-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-mac-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-win-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-win-release-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-win-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-win-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-canary-linux-debug"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-canary-linux-debug-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-canary-linux-debug-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-canary-linux-debug-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-debug-arm"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-debug-arm-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-debug-arm-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-debug-arm-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-debug-arm64c"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-debug-arm64c-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-debug-arm64c-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-debug-arm64c-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-product-arm"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-product-arm-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-product-arm-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-product-arm-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-product-arm64c"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-product-arm64c-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-product-arm64c-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-product-arm64c-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-release-arm"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-release-arm-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-release-arm-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-release-arm-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-release-arm64c"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-release-arm64c-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-release-arm64c-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-release-arm64c-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-fuchsia-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      expiration_secs: 86400
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-asan-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-checked-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-checked-linux-release-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-checked-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-checked-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-gcc-linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-gcc-linux-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-gcc-linux-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-gcc-linux-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-debug-ia32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-debug-simriscv64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-debug-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-debug-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-debug-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-debug-x64c"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-product-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-release-ia32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-release-simarm"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-release-simarm-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-release-simarm-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-release-simarm-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-release-simarm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-release-simarm64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-release-simarm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-release-simarm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-release-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-mac-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-mac-debug-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-mac-debug-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-mac-debug-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-mac-product-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-mac-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-mac-release-arm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-mac-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-mac-release-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-mac-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-mac-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-msan-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-linux-debug-ia32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-linux-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-linux-debug-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-linux-debug-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-linux-debug-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-linux-release-ia32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-linux-release-simarm"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-linux-release-simarm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-linux-release-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-mac-debug-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-mac-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-mac-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-mac-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-win-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-win-release-ia32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-win-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-optcounter-threshold-linux-release-ia32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-optcounter-threshold-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      expiration_secs: 86400
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-android-release-arm64c"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-android-release-arm64c-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-android-release-arm64c-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-android-release-arm64c-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-android-release-arm_x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-android-release-arm_x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-android-release-arm_x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-android-release-arm_x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-asan-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-dwarf-linux-product-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-debug-simarm_x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-debug-simriscv64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-debug-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-debug-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-debug-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-debug-x64c"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-product-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-product-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-product-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-product-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-release-simarm"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-release-simarm-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-release-simarm-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-release-simarm-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-release-simarm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-release-simarm64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-release-simarm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-release-simarm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-release-simarm_x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-release-simarm_x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-release-simarm_x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-release-simarm_x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-release-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-mac-release-simarm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-mac-release-simarm64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-mac-release-simarm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-mac-release-simarm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-msan-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-nnbd-linux-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-nnbd-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-nnbd-mac-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-nnbd-mac-release-simarm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-nnbd-win-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-tsan-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-ubsan-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-win-debug-x64c"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-win-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-win-release-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-win-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-win-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-reload-linux-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-reload-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-reload-rollback-linux-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-reload-rollback-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-tsan-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-ubsan-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-win-debug-ia32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-win-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-win-debug-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-win-debug-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-win-debug-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-win-debug-x64c"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-win-product-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-win-release-ia32"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-win-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-win-release-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-win-release-x64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-win-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-precomp-ffi-qemu-linux-release-arm"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-precomp-ffi-qemu-linux-release-arm-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-precomp-ffi-qemu-linux-release-arm-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:experimental"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-precomp-ffi-qemu-linux-release-arm-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+  }
+}
+buckets {
+  name: "try"
+  acls {
+    group: "all"
+  }
+  acls {
+    role: SCHEDULER
+    group: "project-dart-admins"
+  }
+  acls {
+    role: SCHEDULER
+    group: "project-dart-tryjob-access"
+  }
+  acls {
+    role: SCHEDULER
+    group: "service-account-cq"
+  }
+  swarming {
+    builders {
+      name: "analyzer-analysis-server-linux-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-linux-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-mac-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-nnbd-linux-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-nnbd-mac-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-nnbd-win-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-win-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "app-kernel-linux-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "app-kernel-linux-product-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "app-kernel-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "benchmark-linux-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "checkout_javascript_engines": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-sdk-linux-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$dart/build": {'
+        '    "disable_goma": true,'
+        '    "timeout": 6000'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-sdk-mac-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-sdk-mac-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-sdk-win-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-canary-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-csp-minified-linux-x64-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-minified-strong-linux-x64-d8-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-nnbd-linux-x64-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-hostasserts-linux-ia32-d8-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-linux-x64-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-linux-x64-firefox-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-mac-x64-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-mac-x64-safari-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-strong-win-x64-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-unit-linux-x64-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "ddc-linux-release-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "ddc-mac-release-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "ddc-nnbd-linux-release-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "ddc-win-release-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "ddk-linux-release-firefox-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-analyze-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 2700
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-engine-linux-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "flutter_test_suites": ['
+        '    "add_to_app_life_cycle_tests",'
+        '    "flutter_plugins",'
+        '    "framework_coverage",'
+        '    "framework_tests",'
+        '    "tool_tests"'
+        '  ],'
+        '  "recipe": "dart/flutter_engine"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 28800
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-engine-linux-web_tests-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "flutter_test_suites": ['
+        '    "web_tests",'
+        '    "web_tool_tests"'
+        '  ],'
+        '  "recipe": "dart/flutter_engine"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 28800
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-frontend-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "front-end-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "front-end-mac-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "front-end-nnbd-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "front-end-nnbd-mac-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "front-end-nnbd-win-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "front-end-win-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "gclient-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/gclient"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-linux-debug-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-linux-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-mac-release-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-mac-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-win-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-canary-linux-debug-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-debug-arm-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-debug-arm64c-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-product-arm-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-product-arm64c-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-release-arm-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-android-release-arm64c-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-fuchsia-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-asan-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-checked-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-gcc-linux-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-debug-ia32-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-debug-simriscv64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-debug-x64c-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-product-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-release-ia32-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-release-simarm-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-release-simarm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-mac-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-mac-product-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-mac-release-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-mac-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-msan-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-linux-debug-ia32-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-linux-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-linux-release-ia32-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-linux-release-simarm-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-linux-release-simarm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-mac-debug-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-mac-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-mac-release-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-mac-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-win-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-win-release-ia32-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-nnbd-win-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-optcounter-threshold-linux-release-ia32-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-optcounter-threshold-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-android-release-arm64c-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-android-release-arm_x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-asan-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-dwarf-linux-product-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-debug-simarm_x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-debug-simriscv64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-debug-x64c-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-product-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-release-simarm-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-release-simarm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-release-simarm_x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-mac-release-simarm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-msan-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-nnbd-linux-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-nnbd-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-nnbd-mac-release-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-nnbd-mac-release-simarm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-nnbd-win-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-tsan-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-ubsan-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-win-debug-x64c-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-precomp-win-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-reload-linux-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-reload-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-reload-rollback-linux-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-reload-rollback-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-tsan-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-ubsan-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-win-debug-ia32-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-win-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-win-debug-x64c-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-win-product-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-win-release-ia32-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-win-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-precomp-ffi-qemu-linux-release-arm-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+  }
+}
+buckets {
+  name: "try.shared"
+  acls {
+    group: "all"
+  }
+  acls {
+    role: SCHEDULER
+    group: "project-dart-admins"
+  }
+  acls {
+    role: SCHEDULER
+    group: "project-dart-tryjob-access"
+  }
+  acls {
+    role: SCHEDULER
+    group: "service-account-cq"
+  }
+  swarming {
+    builders {
+      name: "presubmit-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "presubmit/presubmit"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.buildbucket.use_bbagent"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+    }
+  }
+}
diff --git a/generated/luci-logdog.cfg b/generated/luci-logdog.cfg
new file mode 100644
index 000000000000..adc75bef4980
--- /dev/null
+++ b/generated/luci-logdog.cfg
@@ -0,0 +1,9 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see ProjectConfig message:
+#   https://luci-config.appspot.com/schemas/projects:luci-logdog.cfg
+
+reader_auth_groups: "all"
+writer_auth_groups: "luci-logdog-chromium-writers"
+archive_gs_bucket: "chromium-luci-logdog"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
new file mode 100644
index 000000000000..f28a66e1dc47
--- /dev/null
+++ b/generated/luci-milo.cfg
@@ -0,0 +1,3110 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see Project message:
+#   https://luci-config.appspot.com/schemas/projects:luci-milo.cfg
+
+consoles {
+  id: "cq"
+  name: "SDK CQ Console"
+  builders {
+    name: "buildbucket/luci.dart.try/front-end-linux-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/front-end-mac-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/front-end-win-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/front-end-nnbd-linux-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/front-end-nnbd-mac-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/front-end-nnbd-win-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/flutter-frontend-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/flutter-engine-linux-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/flutter-engine-linux-web_tests-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-ia32-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-ia32-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-simarm-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-simarm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-debug-arm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-debug-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-release-arm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-release-ia32-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-debug-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-mac-release-arm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-win-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/app-kernel-linux-debug-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/app-kernel-linux-product-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/app-kernel-linux-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simarm-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simarm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-ia32-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-checked-linux-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-ia32-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-mac-debug-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-mac-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-mac-release-arm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-ia32-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-win-release-ia32-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-win-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-product-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-simarm_x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm_x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-mac-release-simarm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-dwarf-linux-product-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm_x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm64c-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-product-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-mac-product-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-win-product-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-asan-linux-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-msan-linux-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-tsan-linux-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-ubsan-linux-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-asan-linux-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-msan-linux-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-tsan-linux-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-ubsan-linux-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-reload-linux-debug-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-reload-linux-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-reload-rollback-linux-debug-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-reload-rollback-linux-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64c-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64c-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-x64c-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-debug-x64c-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-fuchsia-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-gcc-linux-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-simriscv64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-simriscv64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-ffi-android-release-arm-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-ffi-android-product-arm-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm64c-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-ffi-android-release-arm64c-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-ffi-android-product-arm64c-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-precomp-ffi-qemu-linux-release-arm-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/pkg-linux-release-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/pkg-mac-release-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/pkg-mac-release-arm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/pkg-win-release-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/pkg-linux-debug-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/dart2js-canary-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/dart2js-strong-hostasserts-linux-ia32-d8-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/dart2js-minified-strong-linux-x64-d8-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/dart2js-unit-linux-x64-release-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-chrome-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/dart2js-csp-minified-linux-x64-chrome-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/dart2js-strong-mac-x64-chrome-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/dart2js-strong-win-x64-chrome-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/dart2js-nnbd-linux-x64-chrome-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-firefox-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/dart2js-strong-mac-x64-safari-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/flutter-analyze-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/analyzer-analysis-server-linux-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/analyzer-linux-release-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/analyzer-mac-release-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/analyzer-win-release-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/analyzer-nnbd-linux-release-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/analyzer-nnbd-mac-release-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/analyzer-nnbd-win-release-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/dart-sdk-linux-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/dart-sdk-mac-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/dart-sdk-mac-arm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/dart-sdk-win-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/ddc-linux-release-chrome-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/ddc-nnbd-linux-release-chrome-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/ddc-mac-release-chrome-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/ddc-win-release-chrome-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/ddk-linux-release-firefox-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/gclient-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/benchmark-linux-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try.shared/presubmit-try"
+  }
+  builder_view_only: true
+}
+consoles {
+  id: "be"
+  name: "SDK Bleeding Edge Console"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/main"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
+    category: "cfe"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
+    category: "cfe"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
+    category: "cfe"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64"
+    category: "cfe|nnbd"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-mac-release-x64"
+    category: "cfe|nnbd"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-win-release-x64"
+    category: "cfe|nnbd"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
+    category: "cfe"
+    short_name: "fl"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
+    category: "flutter"
+    short_name: "3H"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-web_tests"
+    category: "flutter"
+    short_name: "web"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/flutter-engine-ios"
+    category: "flutter"
+    short_name: "i"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
+    category: "vm|nnbd|jit"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64"
+    category: "vm|nnbd|jit"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-ia32"
+    category: "vm|nnbd|jit"
+    short_name: "d3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-ia32"
+    category: "vm|nnbd|jit"
+    short_name: "r3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm"
+    category: "vm|nnbd|jit"
+    short_name: "ra"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm64"
+    category: "vm|nnbd|jit"
+    short_name: "ra6"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-arm64"
+    category: "vm|nnbd|jit"
+    short_name: "m1d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-x64"
+    category: "vm|nnbd|jit"
+    short_name: "md"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-arm64"
+    category: "vm|nnbd|jit"
+    short_name: "m1r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-x64"
+    category: "vm|nnbd|jit"
+    short_name: "mr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-ia32"
+    category: "vm|nnbd|jit"
+    short_name: "wr3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64"
+    category: "vm|nnbd|jit"
+    short_name: "wd"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-x64"
+    category: "vm|nnbd|jit"
+    short_name: "wr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64"
+    category: "vm|nnbd|aot"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+    category: "vm|nnbd|aot"
+    short_name: "da"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+    category: "vm|nnbd|aot"
+    short_name: "ra"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-x64"
+    category: "vm|nnbd|aot"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64"
+    category: "vm|nnbd|aot"
+    short_name: "ra6"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-arm64"
+    category: "vm|nnbd|aot"
+    short_name: "m1"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64"
+    category: "vm|nnbd|aot"
+    short_name: "ma6"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-release-x64"
+    category: "vm|nnbd|aot"
+    short_name: "wr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
+    category: "vm|app-kernel"
+    short_name: "d64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64"
+    category: "vm|app-kernel"
+    short_name: "p64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64"
+    category: "vm|app-kernel"
+    short_name: "r64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
+    category: "vm|kernel"
+    short_name: "c"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
+    category: "vm|kernel"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
+    category: "vm|kernel"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
+    category: "vm|kernel"
+    short_name: "a64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32"
+    category: "vm|kernel"
+    short_name: "r32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "rc"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32"
+    category: "vm|kernel"
+    short_name: "d32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
+    category: "vm|kernel"
+    short_name: "md"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
+    category: "vm|kernel"
+    short_name: "mr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-arm64"
+    category: "vm|kernel"
+    short_name: "m1r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
+    category: "vm|kernel"
+    short_name: "wd3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64"
+    category: "vm|kernel"
+    short_name: "wd"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32"
+    category: "vm|kernel"
+    short_name: "wr3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
+    category: "vm|kernel"
+    short_name: "wr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
+    category: "vm|kernel"
+    short_name: "cra"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
+    category: "vm|kernel-precomp"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
+    category: "vm|kernel-precomp"
+    short_name: "p"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
+    category: "vm|kernel-precomp"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "a64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
+    category: "vm|kernel-precomp"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
+    category: "vm|kernel-precomp"
+    short_name: "o"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64"
+    category: "vm|kernel-precomp"
+    short_name: "adx"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64"
+    category: "vm|kernel-precomp"
+    short_name: "arx"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "ma"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
+    category: "vm|kernel-precomp"
+    short_name: "wr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-precomp-linux-release-arm64"
+    category: "vm|kernel-precomp"
+    short_name: "cra"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-dwarf-linux-product-x64"
+    category: "vm|kernel-precomp"
+    short_name: "dw"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64"
+    category: "vm|kernel-precomp|android"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c"
+    category: "vm|kernel-precomp|android"
+    short_name: "a64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
+    category: "vm|product"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
+    category: "vm|product"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
+    category: "vm|product"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
+    category: "vm|misc"
+    short_name: "o32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
+    category: "vm|misc"
+    short_name: "o64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "a"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-tsan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "t"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ubsan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "u"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-asan-linux-release-x64"
+    category: "vm|misc|aot"
+    short_name: "a"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-msan-linux-release-x64"
+    category: "vm|misc|aot"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-tsan-linux-release-x64"
+    category: "vm|misc|aot"
+    short_name: "t"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ubsan-linux-release-x64"
+    category: "vm|misc|aot"
+    short_name: "u"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
+    category: "vm|misc|reload"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
+    category: "vm|misc|reload"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
+    category: "vm|misc|reload"
+    short_name: "drb"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64"
+    category: "vm|misc|reload"
+    short_name: "rrb"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "jl"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "al"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "jw"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "aw"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-fuchsia-release-x64"
+    category: "vm|misc"
+    short_name: "f"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux"
+    category: "vm|misc"
+    short_name: "g"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simriscv64"
+    category: "vm|misc"
+    short_name: "rv64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simriscv64"
+    category: "vm|misc"
+    short_name: "rv64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
+    category: "vm|ffi"
+    short_name: "d32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm"
+    category: "vm|ffi"
+    short_name: "r32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm"
+    category: "vm|ffi"
+    short_name: "p32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c"
+    category: "vm|ffi"
+    short_name: "d64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c"
+    category: "vm|ffi"
+    short_name: "r64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c"
+    category: "vm|ffi"
+    short_name: "p64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm"
+    category: "vm|ffi"
+    short_name: "qa"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64"
+    category: "vm|ffi"
+    short_name: "qr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
+    category: "pkg"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
+    category: "pkg"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-arm64"
+    category: "pkg"
+    short_name: "m1"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
+    category: "pkg"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
+    category: "pkg"
+    short_name: "ld"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64"
+    category: "dart2js"
+    short_name: "c"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
+    category: "dart2js|d8"
+    short_name: "ha"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
+    category: "dart2js|d8"
+    short_name: "mi"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
+    category: "dart2js|d8"
+    short_name: "u"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "csp"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "nn"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
+    category: "dart2js|safari"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
+    category: "analyzer"
+    short_name: "fa"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
+    category: "analyzer"
+    short_name: "as"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
+    category: "analyzer"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
+    category: "analyzer"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
+    category: "analyzer"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release"
+    category: "analyzer|nnbd"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-mac-release"
+    category: "analyzer|nnbd"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-win-release"
+    category: "analyzer|nnbd"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
+    category: "ddc"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-nnbd-linux-release-chrome"
+    category: "ddc"
+    short_name: "nn"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
+    category: "ddc"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
+    category: "ddc"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox"
+    category: "ddc"
+    short_name: "fl"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/gclient"
+    category: "misc"
+    short_name: "g"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/debianpackage-linux"
+    category: "misc"
+    short_name: "dp"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/google"
+    category: "flutter"
+    short_name: "g3"
+  }
+  header {
+    links {
+      name: "Consoles"
+      links {
+        text: "Bleeding Edge console"
+        url: "/p/dart/g/be/console"
+        alt: "SDK BE Console"
+      }
+      links {
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (alternative)"
+      }
+      links {
+        text: "FYI console"
+        url: "/p/dart/g/fyi/console"
+        alt: "SDK FYI Console"
+      }
+      links {
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      }
+      links {
+        text: "Results Feed"
+        url: "https://dart-ci.firebaseapp.com/"
+        alt: "Results Feed"
+      }
+      links {
+        text: "Current Test Results"
+        url: "https://dart-ci.firebaseapp.com/current_results/"
+        alt: "Current Test Results"
+      }
+      links {
+        text: "Dart Infrastructure chat"
+        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
+        alt: "Dart Infrastructure chat"
+      }
+    }
+    console_groups {
+      console_ids: "dart/dart-fuzz"
+      console_ids: "dart/flutter"
+      console_ids: "dart/flutter-hhh"
+      console_ids: "dart/iso-stress"
+    }
+    tree_status_host: "dart-status.appspot.com"
+  }
+}
+consoles {
+  id: "alt"
+  name: "SDK Bleeding Edge Console (alternative)"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/main"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
+    category: "cfe"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
+    category: "cfe"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
+    category: "cfe"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64"
+    category: "cfe|nnbd"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-mac-release-x64"
+    category: "cfe|nnbd"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-win-release-x64"
+    category: "cfe|nnbd"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
+    category: "cfe"
+    short_name: "fl"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
+    category: "flutter"
+    short_name: "3H"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-web_tests"
+    category: "flutter"
+    short_name: "web"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/flutter-engine-ios"
+    category: "flutter"
+    short_name: "i"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
+    category: "pkg"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
+    category: "pkg"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-arm64"
+    category: "pkg"
+    short_name: "m1"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
+    category: "pkg"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
+    category: "pkg"
+    short_name: "ld"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64"
+    category: "dart2js"
+    short_name: "c"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
+    category: "dart2js|d8"
+    short_name: "ha"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
+    category: "dart2js|d8"
+    short_name: "mi"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
+    category: "dart2js|d8"
+    short_name: "u"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "csp"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome"
+    category: "dart2js|chrome"
+    short_name: "nn"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
+    category: "dart2js|firefox"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
+    category: "dart2js|safari"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
+    category: "analyzer"
+    short_name: "fa"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
+    category: "analyzer"
+    short_name: "as"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
+    category: "analyzer"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
+    category: "analyzer"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
+    category: "analyzer"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release"
+    category: "analyzer|nnbd"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-mac-release"
+    category: "analyzer|nnbd"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-win-release"
+    category: "analyzer|nnbd"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
+    category: "ddc"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-nnbd-linux-release-chrome"
+    category: "ddc"
+    short_name: "nn"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
+    category: "ddc"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
+    category: "ddc"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox"
+    category: "ddc"
+    short_name: "fl"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/gclient"
+    category: "misc"
+    short_name: "g"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/debianpackage-linux"
+    category: "misc"
+    short_name: "dp"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/google"
+    category: "flutter"
+    short_name: "g3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
+    category: "vm|nnbd|jit"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64"
+    category: "vm|nnbd|jit"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-ia32"
+    category: "vm|nnbd|jit"
+    short_name: "d3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-ia32"
+    category: "vm|nnbd|jit"
+    short_name: "r3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm"
+    category: "vm|nnbd|jit"
+    short_name: "ra"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm64"
+    category: "vm|nnbd|jit"
+    short_name: "ra6"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-arm64"
+    category: "vm|nnbd|jit"
+    short_name: "m1d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-x64"
+    category: "vm|nnbd|jit"
+    short_name: "md"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-arm64"
+    category: "vm|nnbd|jit"
+    short_name: "m1r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-x64"
+    category: "vm|nnbd|jit"
+    short_name: "mr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-ia32"
+    category: "vm|nnbd|jit"
+    short_name: "wr3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64"
+    category: "vm|nnbd|jit"
+    short_name: "wd"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-x64"
+    category: "vm|nnbd|jit"
+    short_name: "wr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64"
+    category: "vm|nnbd|aot"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+    category: "vm|nnbd|aot"
+    short_name: "da"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+    category: "vm|nnbd|aot"
+    short_name: "ra"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-x64"
+    category: "vm|nnbd|aot"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64"
+    category: "vm|nnbd|aot"
+    short_name: "ra6"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-arm64"
+    category: "vm|nnbd|aot"
+    short_name: "m1"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64"
+    category: "vm|nnbd|aot"
+    short_name: "ma6"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-release-x64"
+    category: "vm|nnbd|aot"
+    short_name: "wr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
+    category: "vm|app-kernel"
+    short_name: "d64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64"
+    category: "vm|app-kernel"
+    short_name: "p64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64"
+    category: "vm|app-kernel"
+    short_name: "r64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
+    category: "vm|kernel"
+    short_name: "c"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
+    category: "vm|kernel"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
+    category: "vm|kernel"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
+    category: "vm|kernel"
+    short_name: "a64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32"
+    category: "vm|kernel"
+    short_name: "r32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
+    category: "vm|kernel"
+    short_name: "rc"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32"
+    category: "vm|kernel"
+    short_name: "d32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
+    category: "vm|kernel"
+    short_name: "md"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
+    category: "vm|kernel"
+    short_name: "mr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-arm64"
+    category: "vm|kernel"
+    short_name: "m1r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
+    category: "vm|kernel"
+    short_name: "wd3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64"
+    category: "vm|kernel"
+    short_name: "wd"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32"
+    category: "vm|kernel"
+    short_name: "wr3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
+    category: "vm|kernel"
+    short_name: "wr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
+    category: "vm|kernel"
+    short_name: "cra"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
+    category: "vm|kernel-precomp"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
+    category: "vm|kernel-precomp"
+    short_name: "p"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
+    category: "vm|kernel-precomp"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "a64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
+    category: "vm|kernel-precomp"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
+    category: "vm|kernel-precomp"
+    short_name: "o"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64"
+    category: "vm|kernel-precomp"
+    short_name: "adx"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64"
+    category: "vm|kernel-precomp"
+    short_name: "arx"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
+    category: "vm|kernel-precomp"
+    short_name: "ma"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
+    category: "vm|kernel-precomp"
+    short_name: "wr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-precomp-linux-release-arm64"
+    category: "vm|kernel-precomp"
+    short_name: "cra"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-dwarf-linux-product-x64"
+    category: "vm|kernel-precomp"
+    short_name: "dw"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64"
+    category: "vm|kernel-precomp|android"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c"
+    category: "vm|kernel-precomp|android"
+    short_name: "a64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
+    category: "vm|product"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
+    category: "vm|product"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
+    category: "vm|product"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
+    category: "vm|misc"
+    short_name: "o32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
+    category: "vm|misc"
+    short_name: "o64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "a"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-tsan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "t"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ubsan-linux-release-x64"
+    category: "vm|misc"
+    short_name: "u"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-asan-linux-release-x64"
+    category: "vm|misc|aot"
+    short_name: "a"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-msan-linux-release-x64"
+    category: "vm|misc|aot"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-tsan-linux-release-x64"
+    category: "vm|misc|aot"
+    short_name: "t"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ubsan-linux-release-x64"
+    category: "vm|misc|aot"
+    short_name: "u"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
+    category: "vm|misc|reload"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
+    category: "vm|misc|reload"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
+    category: "vm|misc|reload"
+    short_name: "drb"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64"
+    category: "vm|misc|reload"
+    short_name: "rrb"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "jl"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "al"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "jw"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-debug-x64c"
+    category: "vm|misc|compressed"
+    short_name: "aw"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-fuchsia-release-x64"
+    category: "vm|misc"
+    short_name: "f"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux"
+    category: "vm|misc"
+    short_name: "g"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simriscv64"
+    category: "vm|misc"
+    short_name: "rv64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simriscv64"
+    category: "vm|misc"
+    short_name: "rv64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
+    category: "vm|ffi"
+    short_name: "d32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm"
+    category: "vm|ffi"
+    short_name: "r32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm"
+    category: "vm|ffi"
+    short_name: "p32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c"
+    category: "vm|ffi"
+    short_name: "d64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c"
+    category: "vm|ffi"
+    short_name: "r64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c"
+    category: "vm|ffi"
+    short_name: "p64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm"
+    category: "vm|ffi"
+    short_name: "qa"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64"
+    category: "vm|ffi"
+    short_name: "qr"
+  }
+  header {
+    links {
+      name: "Consoles"
+      links {
+        text: "Bleeding Edge console"
+        url: "/p/dart/g/be/console"
+        alt: "SDK BE Console"
+      }
+      links {
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (alternative)"
+      }
+      links {
+        text: "FYI console"
+        url: "/p/dart/g/fyi/console"
+        alt: "SDK FYI Console"
+      }
+      links {
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      }
+      links {
+        text: "Results Feed"
+        url: "https://dart-ci.firebaseapp.com/"
+        alt: "Results Feed"
+      }
+      links {
+        text: "Current Test Results"
+        url: "https://dart-ci.firebaseapp.com/current_results/"
+        alt: "Current Test Results"
+      }
+      links {
+        text: "Dart Infrastructure chat"
+        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
+        alt: "Dart Infrastructure chat"
+      }
+    }
+    console_groups {
+      console_ids: "dart/dart-fuzz"
+      console_ids: "dart/flutter"
+      console_ids: "dart/flutter-hhh"
+      console_ids: "dart/iso-stress"
+    }
+    tree_status_host: "dart-status.appspot.com"
+  }
+}
+consoles {
+  id: "dev"
+  name: "SDK Dev Console"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/dev"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-dev"
+    category: "cfe"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-dev"
+    category: "cfe"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-dev"
+    category: "cfe"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-dev"
+    category: "cfe|nnbd"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-dev"
+    category: "vm|nnbd|jit"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-dev"
+    category: "vm|nnbd|jit"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-dev"
+    category: "vm|nnbd|aot"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-dev"
+    category: "vm|app-kernel"
+    short_name: "d64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-dev"
+    category: "vm|app-kernel"
+    short_name: "r64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-dev"
+    category: "vm|kernel"
+    short_name: "c"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-dev"
+    category: "vm|kernel"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-dev"
+    category: "vm|kernel"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-dev"
+    category: "vm|kernel"
+    short_name: "a64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-dev"
+    category: "vm|kernel"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-dev"
+    category: "vm|kernel"
+    short_name: "rc"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-dev"
+    category: "vm|kernel"
+    short_name: "md"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-dev"
+    category: "vm|kernel"
+    short_name: "mr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-arm64-dev"
+    category: "vm|kernel"
+    short_name: "m1r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-dev"
+    category: "vm|kernel"
+    short_name: "wd"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-dev"
+    category: "vm|kernel"
+    short_name: "wr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "p"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-dev"
+    category: "vm|kernel-precomp"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "a64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "o"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "adx"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "arx"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "ma"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-dev"
+    category: "vm|kernel-precomp"
+    short_name: "wr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-dev"
+    category: "vm|kernel-precomp|android"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-dev"
+    category: "vm|kernel-precomp|android"
+    short_name: "a64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-dev"
+    category: "vm|misc"
+    short_name: "g"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-dev"
+    category: "vm|ffi"
+    short_name: "d32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-dev"
+    category: "vm|ffi"
+    short_name: "r32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-dev"
+    category: "vm|ffi"
+    short_name: "p32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-dev"
+    category: "vm|ffi"
+    short_name: "d64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-dev"
+    category: "vm|ffi"
+    short_name: "r64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-dev"
+    category: "vm|ffi"
+    short_name: "p64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-dev"
+    category: "vm|ffi"
+    short_name: "qa"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-dev"
+    category: "vm|ffi"
+    short_name: "qr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
+    category: "pkg"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-dev"
+    category: "pkg"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-dev"
+    category: "pkg"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-dev"
+    category: "dart2js"
+    short_name: "c"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-dev"
+    category: "dart2js|d8"
+    short_name: "ha"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-dev"
+    category: "dart2js|d8"
+    short_name: "mi"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-dev"
+    category: "dart2js|d8"
+    short_name: "u"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-dev"
+    category: "dart2js|chrome"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-dev"
+    category: "dart2js|chrome"
+    short_name: "csp"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-dev"
+    category: "dart2js|chrome"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-dev"
+    category: "dart2js|chrome"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-dev"
+    category: "dart2js|chrome"
+    short_name: "nn"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-dev"
+    category: "dart2js|firefox"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-dev"
+    category: "dart2js|safari"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-dev"
+    category: "analyzer"
+    short_name: "as"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-dev"
+    category: "analyzer"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-dev"
+    category: "analyzer"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-dev"
+    category: "analyzer"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-dev"
+    category: "analyzer|nnbd"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart-sdk-linux-dev"
+    category: "sdk"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-dev"
+    category: "sdk"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-dev"
+    category: "sdk"
+    short_name: "m1"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart-sdk-win-dev"
+    category: "sdk"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-dev"
+    category: "ddc"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-dev"
+    category: "ddc"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-dev"
+    category: "ddc"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-dev"
+    category: "ddc"
+    short_name: "fl"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/gclient-dev"
+    category: "misc"
+    short_name: "g"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/debianpackage-linux-dev"
+    category: "misc"
+    short_name: "dp"
+  }
+  header {
+    links {
+      name: "Consoles"
+      links {
+        text: "Bleeding Edge console"
+        url: "/p/dart/g/be/console"
+        alt: "SDK BE Console"
+      }
+      links {
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (alternative)"
+      }
+      links {
+        text: "FYI console"
+        url: "/p/dart/g/fyi/console"
+        alt: "SDK FYI Console"
+      }
+      links {
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      }
+      links {
+        text: "Results Feed"
+        url: "https://dart-ci.firebaseapp.com/"
+        alt: "Results Feed"
+      }
+      links {
+        text: "Current Test Results"
+        url: "https://dart-ci.firebaseapp.com/current_results/"
+        alt: "Current Test Results"
+      }
+      links {
+        text: "Dart Infrastructure chat"
+        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
+        alt: "Dart Infrastructure chat"
+      }
+    }
+    console_groups {
+      console_ids: "dart/dart-fuzz"
+      console_ids: "dart/flutter"
+      console_ids: "dart/flutter-hhh"
+      console_ids: "dart/iso-stress"
+    }
+    tree_status_host: "dart-status.appspot.com"
+  }
+}
+consoles {
+  id: "beta"
+  name: "SDK Beta Console"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/beta"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-beta"
+    category: "cfe"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-beta"
+    category: "cfe"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-beta"
+    category: "cfe"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-beta"
+    category: "cfe|nnbd"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-beta"
+    category: "vm|nnbd|jit"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-beta"
+    category: "vm|nnbd|jit"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-beta"
+    category: "vm|nnbd|aot"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-beta"
+    category: "vm|app-kernel"
+    short_name: "d64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-beta"
+    category: "vm|app-kernel"
+    short_name: "r64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-beta"
+    category: "vm|kernel"
+    short_name: "c"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-beta"
+    category: "vm|kernel"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-beta"
+    category: "vm|kernel"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-beta"
+    category: "vm|kernel"
+    short_name: "a64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-beta"
+    category: "vm|kernel"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-beta"
+    category: "vm|kernel"
+    short_name: "rc"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-beta"
+    category: "vm|kernel"
+    short_name: "md"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-beta"
+    category: "vm|kernel"
+    short_name: "mr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-beta"
+    category: "vm|kernel"
+    short_name: "wd"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-beta"
+    category: "vm|kernel"
+    short_name: "wr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "p"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-beta"
+    category: "vm|kernel-precomp"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "a64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "o"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "adx"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "arx"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "ma"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-beta"
+    category: "vm|kernel-precomp"
+    short_name: "wr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-beta"
+    category: "vm|kernel-precomp|android"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-beta"
+    category: "vm|kernel-precomp|android"
+    short_name: "a64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-beta"
+    category: "vm|misc"
+    short_name: "g"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-beta"
+    category: "vm|ffi"
+    short_name: "d32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-beta"
+    category: "vm|ffi"
+    short_name: "r32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-beta"
+    category: "vm|ffi"
+    short_name: "p32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-beta"
+    category: "vm|ffi"
+    short_name: "d64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-beta"
+    category: "vm|ffi"
+    short_name: "r64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-beta"
+    category: "vm|ffi"
+    short_name: "p64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-beta"
+    category: "vm|ffi"
+    short_name: "qa"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-beta"
+    category: "vm|ffi"
+    short_name: "qr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-beta"
+    category: "pkg"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-beta"
+    category: "pkg"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-beta"
+    category: "pkg"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-beta"
+    category: "dart2js"
+    short_name: "c"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-beta"
+    category: "dart2js|d8"
+    short_name: "ha"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-beta"
+    category: "dart2js|d8"
+    short_name: "mi"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-beta"
+    category: "dart2js|d8"
+    short_name: "u"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-beta"
+    category: "dart2js|chrome"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-beta"
+    category: "dart2js|chrome"
+    short_name: "csp"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-beta"
+    category: "dart2js|chrome"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-beta"
+    category: "dart2js|chrome"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-beta"
+    category: "dart2js|chrome"
+    short_name: "nn"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-beta"
+    category: "dart2js|firefox"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-beta"
+    category: "dart2js|safari"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-beta"
+    category: "analyzer"
+    short_name: "as"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-beta"
+    category: "analyzer"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-beta"
+    category: "analyzer"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-beta"
+    category: "analyzer"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-beta"
+    category: "analyzer|nnbd"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart-sdk-linux-beta"
+    category: "sdk"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-beta"
+    category: "sdk"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-beta"
+    category: "sdk"
+    short_name: "m1"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart-sdk-win-beta"
+    category: "sdk"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-beta"
+    category: "ddc"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-beta"
+    category: "ddc"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-beta"
+    category: "ddc"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-beta"
+    category: "ddc"
+    short_name: "fl"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/gclient-beta"
+    category: "misc"
+    short_name: "g"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/debianpackage-linux-beta"
+    category: "misc"
+    short_name: "dp"
+  }
+  header {
+    links {
+      name: "Consoles"
+      links {
+        text: "Bleeding Edge console"
+        url: "/p/dart/g/be/console"
+        alt: "SDK BE Console"
+      }
+      links {
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (alternative)"
+      }
+      links {
+        text: "FYI console"
+        url: "/p/dart/g/fyi/console"
+        alt: "SDK FYI Console"
+      }
+      links {
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      }
+      links {
+        text: "Results Feed"
+        url: "https://dart-ci.firebaseapp.com/"
+        alt: "Results Feed"
+      }
+      links {
+        text: "Current Test Results"
+        url: "https://dart-ci.firebaseapp.com/current_results/"
+        alt: "Current Test Results"
+      }
+      links {
+        text: "Dart Infrastructure chat"
+        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
+        alt: "Dart Infrastructure chat"
+      }
+    }
+    console_groups {
+      console_ids: "dart/dart-fuzz"
+      console_ids: "dart/flutter"
+      console_ids: "dart/flutter-hhh"
+      console_ids: "dart/iso-stress"
+    }
+    tree_status_host: "dart-status.appspot.com"
+  }
+}
+consoles {
+  id: "stable"
+  name: "SDK Stable Console"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/stable"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-stable"
+    category: "cfe"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-stable"
+    category: "cfe"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-stable"
+    category: "cfe"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-stable"
+    category: "cfe|nnbd"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-stable"
+    category: "vm|nnbd|jit"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-stable"
+    category: "vm|nnbd|jit"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-stable"
+    category: "vm|nnbd|aot"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-stable"
+    category: "vm|app-kernel"
+    short_name: "d64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-stable"
+    category: "vm|app-kernel"
+    short_name: "r64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-stable"
+    category: "vm|kernel"
+    short_name: "c"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-stable"
+    category: "vm|kernel"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-stable"
+    category: "vm|kernel"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-stable"
+    category: "vm|kernel"
+    short_name: "a64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-stable"
+    category: "vm|kernel"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-stable"
+    category: "vm|kernel"
+    short_name: "rc"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-stable"
+    category: "vm|kernel"
+    short_name: "md"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-stable"
+    category: "vm|kernel"
+    short_name: "mr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-stable"
+    category: "vm|kernel"
+    short_name: "wd"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-stable"
+    category: "vm|kernel"
+    short_name: "wr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "p"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-stable"
+    category: "vm|kernel-precomp"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "a64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "o"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "adx"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "arx"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "ma"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-stable"
+    category: "vm|kernel-precomp"
+    short_name: "wr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-stable"
+    category: "vm|kernel-precomp|android"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-stable"
+    category: "vm|kernel-precomp|android"
+    short_name: "a64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-stable"
+    category: "vm|misc"
+    short_name: "g"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-stable"
+    category: "vm|ffi"
+    short_name: "d32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-stable"
+    category: "vm|ffi"
+    short_name: "r32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-stable"
+    category: "vm|ffi"
+    short_name: "p32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-stable"
+    category: "vm|ffi"
+    short_name: "d64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-stable"
+    category: "vm|ffi"
+    short_name: "r64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-stable"
+    category: "vm|ffi"
+    short_name: "p64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-stable"
+    category: "vm|ffi"
+    short_name: "qa"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-stable"
+    category: "vm|ffi"
+    short_name: "qr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
+    category: "pkg"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-stable"
+    category: "pkg"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-stable"
+    category: "pkg"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-stable"
+    category: "dart2js"
+    short_name: "c"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-stable"
+    category: "dart2js|d8"
+    short_name: "ha"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-stable"
+    category: "dart2js|d8"
+    short_name: "mi"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-stable"
+    category: "dart2js|d8"
+    short_name: "u"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "csp"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-stable"
+    category: "dart2js|chrome"
+    short_name: "nn"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-stable"
+    category: "dart2js|firefox"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-stable"
+    category: "dart2js|safari"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-stable"
+    category: "analyzer"
+    short_name: "as"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-stable"
+    category: "analyzer"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-stable"
+    category: "analyzer"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-stable"
+    category: "analyzer"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-stable"
+    category: "analyzer|nnbd"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart-sdk-linux-stable"
+    category: "sdk"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-stable"
+    category: "sdk"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-stable"
+    category: "sdk"
+    short_name: "m1"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart-sdk-win-stable"
+    category: "sdk"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-stable"
+    category: "ddc"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-stable"
+    category: "ddc"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-stable"
+    category: "ddc"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-stable"
+    category: "ddc"
+    short_name: "fl"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/gclient-stable"
+    category: "misc"
+    short_name: "g"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/debianpackage-linux-stable"
+    category: "misc"
+    short_name: "dp"
+  }
+  header {
+    links {
+      name: "Consoles"
+      links {
+        text: "Bleeding Edge console"
+        url: "/p/dart/g/be/console"
+        alt: "SDK BE Console"
+      }
+      links {
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (alternative)"
+      }
+      links {
+        text: "FYI console"
+        url: "/p/dart/g/fyi/console"
+        alt: "SDK FYI Console"
+      }
+      links {
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      }
+      links {
+        text: "Results Feed"
+        url: "https://dart-ci.firebaseapp.com/"
+        alt: "Results Feed"
+      }
+      links {
+        text: "Current Test Results"
+        url: "https://dart-ci.firebaseapp.com/current_results/"
+        alt: "Current Test Results"
+      }
+      links {
+        text: "Dart Infrastructure chat"
+        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
+        alt: "Dart Infrastructure chat"
+      }
+    }
+    console_groups {
+      console_ids: "dart/dart-fuzz"
+      console_ids: "dart/flutter"
+      console_ids: "dart/flutter-hhh"
+      console_ids: "dart/iso-stress"
+    }
+    tree_status_host: "dart-status.appspot.com"
+  }
+}
+consoles {
+  id: "dart-fuzz"
+  name: "Dart Fuzzer Console"
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/fuzz-linux"
+  }
+  builder_view_only: true
+}
+consoles {
+  id: "flutter"
+  name: "Dart/Flutter Console"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/main"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
+    category: "analyzer"
+    short_name: "fa"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
+    category: "fasta"
+    short_name: "fl"
+  }
+}
+consoles {
+  id: "flutter-hhh"
+  name: "Dart/Flutter Linear History Console"
+  repo_url: "https://dart.googlesource.com/linear_sdk_flutter_engine"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
+    category: "flutter"
+    short_name: "3H"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-web_tests"
+    category: "flutter"
+    short_name: "web"
+  }
+}
+consoles {
+  id: "iso-stress"
+  name: "VM Isolate Stress Test Console"
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/iso-stress-linux"
+  }
+  builder_view_only: true
+}
+consoles {
+  id: "fyi"
+  name: "SDK FYI Console"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/main"
+  manifest_name: "REVISION"
+}
+consoles {
+  id: "infra"
+  name: "Infra Console"
+  builders {
+    name: "buildbucket/luci.dart.ci/base"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/cbuild"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/chocolatey"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/co19-roller"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart-ci-scripts-linux"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart-ci-scripts-win"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart-ci-scripts-mac"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/dart-ci-scripts-mac-arm64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/linearize-flutter"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.roll/roll-to-dev"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/recipe-deps-roller"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci/recipe-bundler"
+  }
+  builder_view_only: true
+}
+logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
new file mode 100644
index 000000000000..727fa04f38a0
--- /dev/null
+++ b/generated/luci-notify.cfg
@@ -0,0 +1,1705 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see ProjectConfig message:
+#   https://luci-config.appspot.com/schemas/projects:luci-notify.cfg
+
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "cbuild"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "chocolatey"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "co19-roller"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "dart-ci-scripts-linux"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "dart-ci-scripts-mac"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "dart-ci-scripts-mac-arm64"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "dart-ci-scripts-win"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "debianpackage-linux"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "linearize-flutter"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "recipe-bundler"
+    repository: "https://dart.googlesource.com/recipes"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "recipe-deps-roller"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.roll"
+    name: "roll-to-dev"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "analyzer-analysis-server-linux"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "analyzer-linux-release"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "analyzer-mac-release"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "analyzer-nnbd-linux-release"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "analyzer-nnbd-mac-release"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "analyzer-nnbd-win-release"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "analyzer-win-release"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "app-kernel-linux-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "app-kernel-linux-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "app-kernel-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_success: true
+    on_failure: true
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "ci-test-data"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "cross-vm-linux-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "cross-vm-precomp-linux-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "dart2js-canary-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "dart2js-csp-minified-linux-x64-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "dart2js-minified-strong-linux-x64-d8"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "dart2js-nnbd-linux-x64-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "dart2js-strong-hostasserts-linux-ia32-d8"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "dart2js-strong-linux-x64-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "dart2js-strong-linux-x64-firefox"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "dart2js-strong-mac-x64-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "dart2js-strong-mac-x64-safari"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "dart2js-strong-win-x64-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "dart2js-unit-linux-x64-release"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "ddc-linux-release-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "ddc-mac-release-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "ddc-nnbd-linux-release-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "ddc-win-release-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "ddk-linux-release-firefox"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "flutter-engine-linux"
+    repository: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "flutter-engine-linux-web_tests"
+    repository: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
+  }
+}
+notifiers {
+  notifications {
+    on_failure: true
+    email {
+      recipients: "jensj@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "flutter-frontend"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "front-end-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "front-end-mac-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "front-end-nnbd-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "front-end-nnbd-mac-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "front-end-nnbd-win-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "front-end-win-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_failure: true
+    email {
+      recipients: "jensj@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "frontend-weekly"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_failure: true
+    email {
+      recipients: "bkonyi@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "fuzz-linux"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "gclient"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "iso-stress-linux"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "pkg-linux-debug"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "pkg-linux-release"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "pkg-mac-release"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "pkg-mac-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "pkg-win-release"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-canary-linux-debug"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-ffi-android-debug-arm"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-ffi-android-debug-arm64c"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-ffi-android-product-arm"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-ffi-android-product-arm64c"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-ffi-android-release-arm"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-ffi-android-release-arm64c"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-fuchsia-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-asan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-checked-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-gcc-linux"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-debug-ia32"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-debug-simriscv64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-debug-x64c"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-release-ia32"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-release-simarm"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-release-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-mac-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-mac-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-mac-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-mac-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-msan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-linux-debug-ia32"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-linux-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-linux-release-ia32"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-linux-release-simarm"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-linux-release-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-mac-debug-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-mac-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-mac-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-mac-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-win-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-win-release-ia32"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-win-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-optcounter-threshold-linux-release-ia32"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-optcounter-threshold-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-android-release-arm64c"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-android-release-arm_x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-asan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-dwarf-linux-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-linux-debug-simarm_x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-linux-debug-simriscv64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-linux-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-linux-debug-x64c"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-linux-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-linux-release-simarm"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-linux-release-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-linux-release-simarm_x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-mac-release-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-msan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-nnbd-linux-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-nnbd-linux-release-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-nnbd-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-nnbd-mac-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-nnbd-mac-release-simarm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-nnbd-win-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-obfuscate-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-tsan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-ubsan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-win-debug-x64c"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-win-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-reload-linux-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-reload-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-reload-rollback-linux-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-reload-rollback-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-tsan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-ubsan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-win-debug-ia32"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-win-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-win-debug-x64c"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-win-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-win-release-ia32"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-win-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-precomp-ffi-qemu-linux-release-arm"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-precomp-ffi-qemu-linux-release-riscv64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
diff --git a/generated/luci-notify/email-templates/common.template b/generated/luci-notify/email-templates/common.template
new file mode 100644
index 000000000000..eee1aa13042b
--- /dev/null
+++ b/generated/luci-notify/email-templates/common.template
@@ -0,0 +1,24 @@
+This file contains useful common templates for email notifications.
+
+{{- define "status_to_color" -}}
+{{- if eq . 12 }} {{/* SUCCESS */}}
+#049300
+{{- else if eq . 20 -}} {{/* FAILURE */}}
+#b50000
+{{- else if eq . 36 -}} {{/* INFRA FAILURE */}}
+#850093
+{{- else if eq . 68 -}} {{/* CANCELED */}}
+#c400aa
+{{- else -}}
+#000000
+{{- end -}}
+{{- end -}}
+{{ define "builder_link" -}}
+<a href="https://ci.chromium.org/b/{{ .Id }}">{{ .Builder.Builder }}#{{ .Number }}</a>
+{{- end -}}
+{{ define "summary" -}}
+{{- template "builder_link" . -}}:
+<span style="color: #ffffff; background-color: {{- template "status_to_color" .Status -}}; font-weight: bold">
+{{- .Status -}}
+</span>
+{{ end -}}
diff --git a/generated/luci-notify/email-templates/default.template b/generated/luci-notify/email-templates/default.template
new file mode 100644
index 000000000000..95915be91076
--- /dev/null
+++ b/generated/luci-notify/email-templates/default.template
@@ -0,0 +1,32 @@
+Dart build {{ .Build.Status }} on {{ .Build.Builder.Builder }}
+
+{{ template "summary" .Build }}
+{{/* If the build is a failure, show failed steps. */}}
+{{ if ne .Build.Status 12 -}}
+{{- if .Build.Input.GitilesCommit -}}
+<ul>
+<li>
+<a href="https://dart-ci.firebaseapp.com/#{{- .Build.Input.GitilesCommit.Id -}}">Test results</a>.
+</li>
+</ul>
+See the documentation at
+<a href="https://goto.google.com/dart-status-file-free-workflow">
+go/dart-status-file-free-workflow</a>.
+<br>
+<br>
+{{end -}}
+Failed Steps:
+<ul>
+{{ range $step := .Build.Steps -}}
+{{ if ne $step.Status 12 -}}
+<li>{{ $step.Name }}</li>
+<ul>
+  {{ range $log := .Logs -}}
+  <li><a href="{{ $log.ViewUrl }}">{{ $log.Name }}</a></li>
+  {{ end -}}
+</ul>
+{{ end -}}
+{{ end -}}
+</ul>
+Completed at: {{ .Build.EndTime | time }}
+{{ end -}}
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
new file mode 100644
index 000000000000..b24be7d9b613
--- /dev/null
+++ b/generated/luci-scheduler.cfg
@@ -0,0 +1,4411 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see ProjectConfig message:
+#   https://luci-config.appspot.com/schemas/projects:luci-scheduler.cfg
+
+job {
+  id: "analyzer-analysis-server-linux"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-analysis-server-linux"
+  }
+}
+job {
+  id: "analyzer-analysis-server-linux-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-analysis-server-linux-beta"
+  }
+}
+job {
+  id: "analyzer-analysis-server-linux-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-analysis-server-linux-dev"
+  }
+}
+job {
+  id: "analyzer-analysis-server-linux-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-analysis-server-linux-stable"
+  }
+}
+job {
+  id: "analyzer-linux-release"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-linux-release"
+  }
+}
+job {
+  id: "analyzer-linux-release-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-linux-release-beta"
+  }
+}
+job {
+  id: "analyzer-linux-release-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-linux-release-dev"
+  }
+}
+job {
+  id: "analyzer-linux-release-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-linux-release-stable"
+  }
+}
+job {
+  id: "analyzer-mac-release"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-mac-release"
+  }
+}
+job {
+  id: "analyzer-mac-release-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-mac-release-beta"
+  }
+}
+job {
+  id: "analyzer-mac-release-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-mac-release-dev"
+  }
+}
+job {
+  id: "analyzer-mac-release-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-mac-release-stable"
+  }
+}
+job {
+  id: "analyzer-nnbd-linux-release"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-nnbd-linux-release"
+  }
+}
+job {
+  id: "analyzer-nnbd-linux-release-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-nnbd-linux-release-beta"
+  }
+}
+job {
+  id: "analyzer-nnbd-linux-release-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-nnbd-linux-release-dev"
+  }
+}
+job {
+  id: "analyzer-nnbd-linux-release-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-nnbd-linux-release-stable"
+  }
+}
+job {
+  id: "analyzer-nnbd-mac-release"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-nnbd-mac-release"
+  }
+}
+job {
+  id: "analyzer-nnbd-win-release"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-nnbd-win-release"
+  }
+}
+job {
+  id: "analyzer-win-release"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-win-release"
+  }
+}
+job {
+  id: "analyzer-win-release-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-win-release-beta"
+  }
+}
+job {
+  id: "analyzer-win-release-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-win-release-dev"
+  }
+}
+job {
+  id: "analyzer-win-release-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "analyzer-win-release-stable"
+  }
+}
+job {
+  id: "app-kernel-linux-debug-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-debug-x64"
+  }
+}
+job {
+  id: "app-kernel-linux-debug-x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-debug-x64-beta"
+  }
+}
+job {
+  id: "app-kernel-linux-debug-x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-debug-x64-dev"
+  }
+}
+job {
+  id: "app-kernel-linux-debug-x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-debug-x64-stable"
+  }
+}
+job {
+  id: "app-kernel-linux-product-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-product-x64"
+  }
+}
+job {
+  id: "app-kernel-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-release-x64"
+  }
+}
+job {
+  id: "app-kernel-linux-release-x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-release-x64-beta"
+  }
+}
+job {
+  id: "app-kernel-linux-release-x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-release-x64-dev"
+  }
+}
+job {
+  id: "app-kernel-linux-release-x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "app-kernel-linux-release-x64-stable"
+  }
+}
+job {
+  id: "base"
+  realm: "ci"
+  schedule: "with 15m interval"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "base"
+  }
+}
+job {
+  id: "cbuild"
+  realm: "ci"
+  schedule: "with 15m interval"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "cbuild"
+  }
+}
+job {
+  id: "chocolatey"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "chocolatey"
+  }
+}
+job {
+  id: "ci-test-data"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ci-test-data"
+  }
+}
+job {
+  id: "co19-roller"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "co19-roller"
+  }
+}
+job {
+  id: "cross-vm-linux-release-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "cross-vm-linux-release-arm64"
+  }
+}
+job {
+  id: "cross-vm-precomp-linux-release-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "cross-vm-precomp-linux-release-arm64"
+  }
+}
+job {
+  id: "dart-ci-scripts-linux"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-ci-scripts-linux"
+  }
+}
+job {
+  id: "dart-ci-scripts-mac"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-ci-scripts-mac"
+  }
+}
+job {
+  id: "dart-ci-scripts-mac-arm64"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-ci-scripts-mac-arm64"
+  }
+}
+job {
+  id: "dart-ci-scripts-win"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-ci-scripts-win"
+  }
+}
+job {
+  id: "dart-sdk-linux-beta"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-linux-beta"
+  }
+}
+job {
+  id: "dart-sdk-linux-dev"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-linux-dev"
+  }
+}
+job {
+  id: "dart-sdk-linux-stable"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-linux-stable"
+  }
+}
+job {
+  id: "dart-sdk-mac-arm64-beta"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-mac-arm64-beta"
+  }
+}
+job {
+  id: "dart-sdk-mac-arm64-dev"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-mac-arm64-dev"
+  }
+}
+job {
+  id: "dart-sdk-mac-arm64-stable"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-mac-arm64-stable"
+  }
+}
+job {
+  id: "dart-sdk-mac-beta"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-mac-beta"
+  }
+}
+job {
+  id: "dart-sdk-mac-dev"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-mac-dev"
+  }
+}
+job {
+  id: "dart-sdk-mac-stable"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-mac-stable"
+  }
+}
+job {
+  id: "dart-sdk-win-beta"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-win-beta"
+  }
+}
+job {
+  id: "dart-sdk-win-dev"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-win-dev"
+  }
+}
+job {
+  id: "dart-sdk-win-stable"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "dart-sdk-win-stable"
+  }
+}
+job {
+  id: "dart2js-canary-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-canary-x64"
+  }
+}
+job {
+  id: "dart2js-canary-x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-canary-x64-beta"
+  }
+}
+job {
+  id: "dart2js-canary-x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-canary-x64-dev"
+  }
+}
+job {
+  id: "dart2js-canary-x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-canary-x64-stable"
+  }
+}
+job {
+  id: "dart2js-csp-minified-linux-x64-chrome"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-csp-minified-linux-x64-chrome"
+  }
+}
+job {
+  id: "dart2js-csp-minified-linux-x64-chrome-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-csp-minified-linux-x64-chrome-beta"
+  }
+}
+job {
+  id: "dart2js-csp-minified-linux-x64-chrome-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-csp-minified-linux-x64-chrome-dev"
+  }
+}
+job {
+  id: "dart2js-csp-minified-linux-x64-chrome-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-csp-minified-linux-x64-chrome-stable"
+  }
+}
+job {
+  id: "dart2js-minified-strong-linux-x64-d8"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-minified-strong-linux-x64-d8"
+  }
+}
+job {
+  id: "dart2js-minified-strong-linux-x64-d8-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-minified-strong-linux-x64-d8-beta"
+  }
+}
+job {
+  id: "dart2js-minified-strong-linux-x64-d8-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-minified-strong-linux-x64-d8-dev"
+  }
+}
+job {
+  id: "dart2js-minified-strong-linux-x64-d8-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-minified-strong-linux-x64-d8-stable"
+  }
+}
+job {
+  id: "dart2js-nnbd-linux-x64-chrome"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-nnbd-linux-x64-chrome"
+  }
+}
+job {
+  id: "dart2js-nnbd-linux-x64-chrome-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-nnbd-linux-x64-chrome-beta"
+  }
+}
+job {
+  id: "dart2js-nnbd-linux-x64-chrome-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-nnbd-linux-x64-chrome-dev"
+  }
+}
+job {
+  id: "dart2js-nnbd-linux-x64-chrome-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-nnbd-linux-x64-chrome-stable"
+  }
+}
+job {
+  id: "dart2js-strong-hostasserts-linux-ia32-d8"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-hostasserts-linux-ia32-d8"
+  }
+}
+job {
+  id: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
+  }
+}
+job {
+  id: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
+  }
+}
+job {
+  id: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
+  }
+}
+job {
+  id: "dart2js-strong-linux-x64-chrome"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-linux-x64-chrome"
+  }
+}
+job {
+  id: "dart2js-strong-linux-x64-chrome-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-linux-x64-chrome-beta"
+  }
+}
+job {
+  id: "dart2js-strong-linux-x64-chrome-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-linux-x64-chrome-dev"
+  }
+}
+job {
+  id: "dart2js-strong-linux-x64-chrome-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-linux-x64-chrome-stable"
+  }
+}
+job {
+  id: "dart2js-strong-linux-x64-firefox"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-linux-x64-firefox"
+  }
+}
+job {
+  id: "dart2js-strong-linux-x64-firefox-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-linux-x64-firefox-beta"
+  }
+}
+job {
+  id: "dart2js-strong-linux-x64-firefox-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-linux-x64-firefox-dev"
+  }
+}
+job {
+  id: "dart2js-strong-linux-x64-firefox-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-linux-x64-firefox-stable"
+  }
+}
+job {
+  id: "dart2js-strong-mac-x64-chrome"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-mac-x64-chrome"
+  }
+}
+job {
+  id: "dart2js-strong-mac-x64-chrome-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-mac-x64-chrome-beta"
+  }
+}
+job {
+  id: "dart2js-strong-mac-x64-chrome-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-mac-x64-chrome-dev"
+  }
+}
+job {
+  id: "dart2js-strong-mac-x64-chrome-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-mac-x64-chrome-stable"
+  }
+}
+job {
+  id: "dart2js-strong-mac-x64-safari"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-mac-x64-safari"
+  }
+}
+job {
+  id: "dart2js-strong-mac-x64-safari-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-mac-x64-safari-beta"
+  }
+}
+job {
+  id: "dart2js-strong-mac-x64-safari-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-mac-x64-safari-dev"
+  }
+}
+job {
+  id: "dart2js-strong-mac-x64-safari-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-mac-x64-safari-stable"
+  }
+}
+job {
+  id: "dart2js-strong-win-x64-chrome"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-win-x64-chrome"
+  }
+}
+job {
+  id: "dart2js-strong-win-x64-chrome-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-win-x64-chrome-beta"
+  }
+}
+job {
+  id: "dart2js-strong-win-x64-chrome-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-win-x64-chrome-dev"
+  }
+}
+job {
+  id: "dart2js-strong-win-x64-chrome-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-strong-win-x64-chrome-stable"
+  }
+}
+job {
+  id: "dart2js-unit-linux-x64-release"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-unit-linux-x64-release"
+  }
+}
+job {
+  id: "dart2js-unit-linux-x64-release-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-unit-linux-x64-release-beta"
+  }
+}
+job {
+  id: "dart2js-unit-linux-x64-release-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-unit-linux-x64-release-dev"
+  }
+}
+job {
+  id: "dart2js-unit-linux-x64-release-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "dart2js-unit-linux-x64-release-stable"
+  }
+}
+job {
+  id: "ddc-linux-release-chrome"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddc-linux-release-chrome"
+  }
+}
+job {
+  id: "ddc-linux-release-chrome-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddc-linux-release-chrome-beta"
+  }
+}
+job {
+  id: "ddc-linux-release-chrome-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddc-linux-release-chrome-dev"
+  }
+}
+job {
+  id: "ddc-linux-release-chrome-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddc-linux-release-chrome-stable"
+  }
+}
+job {
+  id: "ddc-mac-release-chrome"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddc-mac-release-chrome"
+  }
+}
+job {
+  id: "ddc-mac-release-chrome-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddc-mac-release-chrome-beta"
+  }
+}
+job {
+  id: "ddc-mac-release-chrome-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddc-mac-release-chrome-dev"
+  }
+}
+job {
+  id: "ddc-mac-release-chrome-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddc-mac-release-chrome-stable"
+  }
+}
+job {
+  id: "ddc-nnbd-linux-release-chrome"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddc-nnbd-linux-release-chrome"
+  }
+}
+job {
+  id: "ddc-win-release-chrome"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddc-win-release-chrome"
+  }
+}
+job {
+  id: "ddc-win-release-chrome-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddc-win-release-chrome-beta"
+  }
+}
+job {
+  id: "ddc-win-release-chrome-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddc-win-release-chrome-dev"
+  }
+}
+job {
+  id: "ddc-win-release-chrome-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddc-win-release-chrome-stable"
+  }
+}
+job {
+  id: "ddk-linux-release-firefox"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddk-linux-release-firefox"
+  }
+}
+job {
+  id: "ddk-linux-release-firefox-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddk-linux-release-firefox-beta"
+  }
+}
+job {
+  id: "ddk-linux-release-firefox-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddk-linux-release-firefox-dev"
+  }
+}
+job {
+  id: "ddk-linux-release-firefox-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "ddk-linux-release-firefox-stable"
+  }
+}
+job {
+  id: "debianpackage-linux"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "debianpackage-linux"
+  }
+}
+job {
+  id: "debianpackage-linux-beta"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "debianpackage-linux-beta"
+  }
+}
+job {
+  id: "debianpackage-linux-dev"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "debianpackage-linux-dev"
+  }
+}
+job {
+  id: "debianpackage-linux-stable"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "debianpackage-linux-stable"
+  }
+}
+job {
+  id: "flutter-analyze"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "flutter-analyze"
+  }
+}
+job {
+  id: "flutter-engine-ios"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "flutter-engine-ios"
+  }
+}
+job {
+  id: "flutter-engine-linux"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "flutter-engine-linux"
+  }
+}
+job {
+  id: "flutter-engine-linux-web_tests"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "flutter-engine-linux-web_tests"
+  }
+}
+job {
+  id: "flutter-frontend"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "flutter-frontend"
+  }
+}
+job {
+  id: "front-end-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-linux-release-x64"
+  }
+}
+job {
+  id: "front-end-linux-release-x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-linux-release-x64-beta"
+  }
+}
+job {
+  id: "front-end-linux-release-x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-linux-release-x64-dev"
+  }
+}
+job {
+  id: "front-end-linux-release-x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-linux-release-x64-stable"
+  }
+}
+job {
+  id: "front-end-mac-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-mac-release-x64"
+  }
+}
+job {
+  id: "front-end-mac-release-x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-mac-release-x64-beta"
+  }
+}
+job {
+  id: "front-end-mac-release-x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-mac-release-x64-dev"
+  }
+}
+job {
+  id: "front-end-mac-release-x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-mac-release-x64-stable"
+  }
+}
+job {
+  id: "front-end-nnbd-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-nnbd-linux-release-x64"
+  }
+}
+job {
+  id: "front-end-nnbd-linux-release-x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-nnbd-linux-release-x64-beta"
+  }
+}
+job {
+  id: "front-end-nnbd-linux-release-x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-nnbd-linux-release-x64-dev"
+  }
+}
+job {
+  id: "front-end-nnbd-linux-release-x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-nnbd-linux-release-x64-stable"
+  }
+}
+job {
+  id: "front-end-nnbd-mac-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-nnbd-mac-release-x64"
+  }
+}
+job {
+  id: "front-end-nnbd-win-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-nnbd-win-release-x64"
+  }
+}
+job {
+  id: "front-end-win-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-win-release-x64"
+  }
+}
+job {
+  id: "front-end-win-release-x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-win-release-x64-beta"
+  }
+}
+job {
+  id: "front-end-win-release-x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-win-release-x64-dev"
+  }
+}
+job {
+  id: "front-end-win-release-x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "front-end-win-release-x64-stable"
+  }
+}
+job {
+  id: "frontend-weekly"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "frontend-weekly"
+  }
+}
+job {
+  id: "fuzz-linux"
+  realm: "ci.sandbox"
+  schedule: "0 3,4 * * *"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "fuzz-linux"
+  }
+}
+job {
+  id: "gclient"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "gclient"
+  }
+}
+job {
+  id: "gclient-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "gclient-beta"
+  }
+}
+job {
+  id: "gclient-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "gclient-dev"
+  }
+}
+job {
+  id: "gclient-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "gclient-stable"
+  }
+}
+job {
+  id: "google"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "google"
+  }
+}
+job {
+  id: "iso-stress-linux"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "iso-stress-linux"
+  }
+}
+job {
+  id: "linearize-flutter"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  triggering_policy {
+    kind: GREEDY_BATCHING
+    max_batch_size: 1
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "linearize-flutter"
+  }
+}
+job {
+  id: "pkg-linux-debug"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-linux-debug"
+  }
+}
+job {
+  id: "pkg-linux-release"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-linux-release"
+  }
+}
+job {
+  id: "pkg-linux-release-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-linux-release-beta"
+  }
+}
+job {
+  id: "pkg-linux-release-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-linux-release-dev"
+  }
+}
+job {
+  id: "pkg-linux-release-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-linux-release-stable"
+  }
+}
+job {
+  id: "pkg-mac-release"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-mac-release"
+  }
+}
+job {
+  id: "pkg-mac-release-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-mac-release-arm64"
+  }
+}
+job {
+  id: "pkg-mac-release-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-mac-release-beta"
+  }
+}
+job {
+  id: "pkg-mac-release-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-mac-release-dev"
+  }
+}
+job {
+  id: "pkg-mac-release-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-mac-release-stable"
+  }
+}
+job {
+  id: "pkg-win-release"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-win-release"
+  }
+}
+job {
+  id: "pkg-win-release-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-win-release-beta"
+  }
+}
+job {
+  id: "pkg-win-release-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-win-release-dev"
+  }
+}
+job {
+  id: "pkg-win-release-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "pkg-win-release-stable"
+  }
+}
+job {
+  id: "recipe-bundler"
+  realm: "ci"
+  schedule: "*/30 * * * *"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "recipe-bundler"
+  }
+}
+job {
+  id: "recipe-deps-roller"
+  realm: "ci"
+  schedule: "with 4h interval"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci"
+    builder: "recipe-deps-roller"
+  }
+}
+job {
+  id: "roll-to-dev"
+  realm: "ci.roll"
+  schedule: "with 4h interval"
+  acl_sets: "ci.roll"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.roll"
+    builder: "roll-to-dev"
+  }
+}
+job {
+  id: "vm-canary-linux-debug"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-canary-linux-debug"
+  }
+}
+job {
+  id: "vm-canary-linux-debug-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-canary-linux-debug-beta"
+  }
+}
+job {
+  id: "vm-canary-linux-debug-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-canary-linux-debug-dev"
+  }
+}
+job {
+  id: "vm-canary-linux-debug-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-canary-linux-debug-stable"
+  }
+}
+job {
+  id: "vm-ffi-android-debug-arm"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-debug-arm"
+  }
+}
+job {
+  id: "vm-ffi-android-debug-arm-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-debug-arm-beta"
+  }
+}
+job {
+  id: "vm-ffi-android-debug-arm-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-debug-arm-dev"
+  }
+}
+job {
+  id: "vm-ffi-android-debug-arm-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-debug-arm-stable"
+  }
+}
+job {
+  id: "vm-ffi-android-debug-arm64c"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-debug-arm64c"
+  }
+}
+job {
+  id: "vm-ffi-android-debug-arm64c-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-debug-arm64c-beta"
+  }
+}
+job {
+  id: "vm-ffi-android-debug-arm64c-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-debug-arm64c-dev"
+  }
+}
+job {
+  id: "vm-ffi-android-debug-arm64c-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-debug-arm64c-stable"
+  }
+}
+job {
+  id: "vm-ffi-android-product-arm"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-product-arm"
+  }
+}
+job {
+  id: "vm-ffi-android-product-arm-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-product-arm-beta"
+  }
+}
+job {
+  id: "vm-ffi-android-product-arm-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-product-arm-dev"
+  }
+}
+job {
+  id: "vm-ffi-android-product-arm-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-product-arm-stable"
+  }
+}
+job {
+  id: "vm-ffi-android-product-arm64c"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-product-arm64c"
+  }
+}
+job {
+  id: "vm-ffi-android-product-arm64c-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-product-arm64c-beta"
+  }
+}
+job {
+  id: "vm-ffi-android-product-arm64c-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-product-arm64c-dev"
+  }
+}
+job {
+  id: "vm-ffi-android-product-arm64c-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-product-arm64c-stable"
+  }
+}
+job {
+  id: "vm-ffi-android-release-arm"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-release-arm"
+  }
+}
+job {
+  id: "vm-ffi-android-release-arm-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-release-arm-beta"
+  }
+}
+job {
+  id: "vm-ffi-android-release-arm-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-release-arm-dev"
+  }
+}
+job {
+  id: "vm-ffi-android-release-arm-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-release-arm-stable"
+  }
+}
+job {
+  id: "vm-ffi-android-release-arm64c"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-release-arm64c"
+  }
+}
+job {
+  id: "vm-ffi-android-release-arm64c-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-release-arm64c-beta"
+  }
+}
+job {
+  id: "vm-ffi-android-release-arm64c-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-release-arm64c-dev"
+  }
+}
+job {
+  id: "vm-ffi-android-release-arm64c-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-ffi-android-release-arm64c-stable"
+  }
+}
+job {
+  id: "vm-fuchsia-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-fuchsia-release-x64"
+  }
+}
+job {
+  id: "vm-kernel-asan-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-asan-linux-release-x64"
+  }
+}
+job {
+  id: "vm-kernel-checked-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-checked-linux-release-x64"
+  }
+}
+job {
+  id: "vm-kernel-checked-linux-release-x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-checked-linux-release-x64-beta"
+  }
+}
+job {
+  id: "vm-kernel-checked-linux-release-x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-checked-linux-release-x64-dev"
+  }
+}
+job {
+  id: "vm-kernel-checked-linux-release-x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-checked-linux-release-x64-stable"
+  }
+}
+job {
+  id: "vm-kernel-gcc-linux"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-gcc-linux"
+  }
+}
+job {
+  id: "vm-kernel-gcc-linux-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-gcc-linux-beta"
+  }
+}
+job {
+  id: "vm-kernel-gcc-linux-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-gcc-linux-dev"
+  }
+}
+job {
+  id: "vm-kernel-gcc-linux-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-gcc-linux-stable"
+  }
+}
+job {
+  id: "vm-kernel-linux-debug-ia32"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-ia32"
+  }
+}
+job {
+  id: "vm-kernel-linux-debug-simriscv64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-simriscv64"
+  }
+}
+job {
+  id: "vm-kernel-linux-debug-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-x64"
+  }
+}
+job {
+  id: "vm-kernel-linux-debug-x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-x64-beta"
+  }
+}
+job {
+  id: "vm-kernel-linux-debug-x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-x64-dev"
+  }
+}
+job {
+  id: "vm-kernel-linux-debug-x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-x64-stable"
+  }
+}
+job {
+  id: "vm-kernel-linux-debug-x64c"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-debug-x64c"
+  }
+}
+job {
+  id: "vm-kernel-linux-product-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-product-x64"
+  }
+}
+job {
+  id: "vm-kernel-linux-release-ia32"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-ia32"
+  }
+}
+job {
+  id: "vm-kernel-linux-release-simarm"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-simarm"
+  }
+}
+job {
+  id: "vm-kernel-linux-release-simarm-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-simarm-beta"
+  }
+}
+job {
+  id: "vm-kernel-linux-release-simarm-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-simarm-dev"
+  }
+}
+job {
+  id: "vm-kernel-linux-release-simarm-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-simarm-stable"
+  }
+}
+job {
+  id: "vm-kernel-linux-release-simarm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-simarm64"
+  }
+}
+job {
+  id: "vm-kernel-linux-release-simarm64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-simarm64-beta"
+  }
+}
+job {
+  id: "vm-kernel-linux-release-simarm64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-simarm64-dev"
+  }
+}
+job {
+  id: "vm-kernel-linux-release-simarm64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-simarm64-stable"
+  }
+}
+job {
+  id: "vm-kernel-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-x64"
+  }
+}
+job {
+  id: "vm-kernel-linux-release-x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-x64-beta"
+  }
+}
+job {
+  id: "vm-kernel-linux-release-x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-x64-dev"
+  }
+}
+job {
+  id: "vm-kernel-linux-release-x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-linux-release-x64-stable"
+  }
+}
+job {
+  id: "vm-kernel-mac-debug-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-debug-x64"
+  }
+}
+job {
+  id: "vm-kernel-mac-debug-x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-debug-x64-beta"
+  }
+}
+job {
+  id: "vm-kernel-mac-debug-x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-debug-x64-dev"
+  }
+}
+job {
+  id: "vm-kernel-mac-debug-x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-debug-x64-stable"
+  }
+}
+job {
+  id: "vm-kernel-mac-product-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-product-x64"
+  }
+}
+job {
+  id: "vm-kernel-mac-release-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-release-arm64"
+  }
+}
+job {
+  id: "vm-kernel-mac-release-arm64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-release-arm64-dev"
+  }
+}
+job {
+  id: "vm-kernel-mac-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-release-x64"
+  }
+}
+job {
+  id: "vm-kernel-mac-release-x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-release-x64-beta"
+  }
+}
+job {
+  id: "vm-kernel-mac-release-x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-release-x64-dev"
+  }
+}
+job {
+  id: "vm-kernel-mac-release-x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-mac-release-x64-stable"
+  }
+}
+job {
+  id: "vm-kernel-msan-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-msan-linux-release-x64"
+  }
+}
+job {
+  id: "vm-kernel-nnbd-linux-debug-ia32"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-linux-debug-ia32"
+  }
+}
+job {
+  id: "vm-kernel-nnbd-linux-debug-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-linux-debug-x64"
+  }
+}
+job {
+  id: "vm-kernel-nnbd-linux-debug-x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-linux-debug-x64-beta"
+  }
+}
+job {
+  id: "vm-kernel-nnbd-linux-debug-x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-linux-debug-x64-dev"
+  }
+}
+job {
+  id: "vm-kernel-nnbd-linux-debug-x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-linux-debug-x64-stable"
+  }
+}
+job {
+  id: "vm-kernel-nnbd-linux-release-ia32"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-linux-release-ia32"
+  }
+}
+job {
+  id: "vm-kernel-nnbd-linux-release-simarm"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-linux-release-simarm"
+  }
+}
+job {
+  id: "vm-kernel-nnbd-linux-release-simarm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-linux-release-simarm64"
+  }
+}
+job {
+  id: "vm-kernel-nnbd-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-linux-release-x64"
+  }
+}
+job {
+  id: "vm-kernel-nnbd-linux-release-x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-linux-release-x64-beta"
+  }
+}
+job {
+  id: "vm-kernel-nnbd-linux-release-x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-linux-release-x64-dev"
+  }
+}
+job {
+  id: "vm-kernel-nnbd-linux-release-x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-linux-release-x64-stable"
+  }
+}
+job {
+  id: "vm-kernel-nnbd-mac-debug-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-mac-debug-arm64"
+  }
+}
+job {
+  id: "vm-kernel-nnbd-mac-debug-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-mac-debug-x64"
+  }
+}
+job {
+  id: "vm-kernel-nnbd-mac-release-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-mac-release-arm64"
+  }
+}
+job {
+  id: "vm-kernel-nnbd-mac-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-mac-release-x64"
+  }
+}
+job {
+  id: "vm-kernel-nnbd-win-debug-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-win-debug-x64"
+  }
+}
+job {
+  id: "vm-kernel-nnbd-win-release-ia32"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-win-release-ia32"
+  }
+}
+job {
+  id: "vm-kernel-nnbd-win-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-nnbd-win-release-x64"
+  }
+}
+job {
+  id: "vm-kernel-optcounter-threshold-linux-release-ia32"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-optcounter-threshold-linux-release-ia32"
+  }
+}
+job {
+  id: "vm-kernel-optcounter-threshold-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-optcounter-threshold-linux-release-x64"
+  }
+}
+job {
+  id: "vm-kernel-precomp-android-release-arm64c"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-android-release-arm64c"
+  }
+}
+job {
+  id: "vm-kernel-precomp-android-release-arm64c-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-android-release-arm64c-beta"
+  }
+}
+job {
+  id: "vm-kernel-precomp-android-release-arm64c-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-android-release-arm64c-dev"
+  }
+}
+job {
+  id: "vm-kernel-precomp-android-release-arm64c-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-android-release-arm64c-stable"
+  }
+}
+job {
+  id: "vm-kernel-precomp-android-release-arm_x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-android-release-arm_x64"
+  }
+}
+job {
+  id: "vm-kernel-precomp-android-release-arm_x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-android-release-arm_x64-beta"
+  }
+}
+job {
+  id: "vm-kernel-precomp-android-release-arm_x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-android-release-arm_x64-dev"
+  }
+}
+job {
+  id: "vm-kernel-precomp-android-release-arm_x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-android-release-arm_x64-stable"
+  }
+}
+job {
+  id: "vm-kernel-precomp-asan-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-asan-linux-release-x64"
+  }
+}
+job {
+  id: "vm-kernel-precomp-dwarf-linux-product-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-dwarf-linux-product-x64"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-debug-simarm_x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-debug-simarm_x64"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-debug-simriscv64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-debug-simriscv64"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-debug-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-debug-x64"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-debug-x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-debug-x64-beta"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-debug-x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-debug-x64-dev"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-debug-x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-debug-x64-stable"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-debug-x64c"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-debug-x64c"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-product-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-product-x64"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-product-x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-product-x64-beta"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-product-x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-product-x64-dev"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-product-x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-product-x64-stable"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-release-simarm"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-simarm"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-release-simarm-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-simarm-beta"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-release-simarm-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-simarm-dev"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-release-simarm-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-simarm-stable"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-release-simarm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-simarm64"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-release-simarm64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-simarm64-beta"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-release-simarm64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-simarm64-dev"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-release-simarm64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-simarm64-stable"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-release-simarm_x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-simarm_x64"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-release-simarm_x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-simarm_x64-beta"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-release-simarm_x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-simarm_x64-dev"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-release-simarm_x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-simarm_x64-stable"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-x64"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-release-x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-x64-beta"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-release-x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-x64-dev"
+  }
+}
+job {
+  id: "vm-kernel-precomp-linux-release-x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-linux-release-x64-stable"
+  }
+}
+job {
+  id: "vm-kernel-precomp-mac-release-simarm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-mac-release-simarm64"
+  }
+}
+job {
+  id: "vm-kernel-precomp-mac-release-simarm64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-mac-release-simarm64-beta"
+  }
+}
+job {
+  id: "vm-kernel-precomp-mac-release-simarm64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-mac-release-simarm64-dev"
+  }
+}
+job {
+  id: "vm-kernel-precomp-mac-release-simarm64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-mac-release-simarm64-stable"
+  }
+}
+job {
+  id: "vm-kernel-precomp-msan-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-msan-linux-release-x64"
+  }
+}
+job {
+  id: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+  }
+}
+job {
+  id: "vm-kernel-precomp-nnbd-linux-debug-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-nnbd-linux-debug-x64"
+  }
+}
+job {
+  id: "vm-kernel-precomp-nnbd-linux-release-simarm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-nnbd-linux-release-simarm64"
+  }
+}
+job {
+  id: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+  }
+}
+job {
+  id: "vm-kernel-precomp-nnbd-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-nnbd-linux-release-x64"
+  }
+}
+job {
+  id: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
+  }
+}
+job {
+  id: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
+  }
+}
+job {
+  id: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
+  }
+}
+job {
+  id: "vm-kernel-precomp-nnbd-mac-release-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-nnbd-mac-release-arm64"
+  }
+}
+job {
+  id: "vm-kernel-precomp-nnbd-mac-release-simarm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-nnbd-mac-release-simarm64"
+  }
+}
+job {
+  id: "vm-kernel-precomp-nnbd-win-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-nnbd-win-release-x64"
+  }
+}
+job {
+  id: "vm-kernel-precomp-obfuscate-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-obfuscate-linux-release-x64"
+  }
+}
+job {
+  id: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+  }
+}
+job {
+  id: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+  }
+}
+job {
+  id: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+  }
+}
+job {
+  id: "vm-kernel-precomp-tsan-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-tsan-linux-release-x64"
+  }
+}
+job {
+  id: "vm-kernel-precomp-ubsan-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-ubsan-linux-release-x64"
+  }
+}
+job {
+  id: "vm-kernel-precomp-win-debug-x64c"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-win-debug-x64c"
+  }
+}
+job {
+  id: "vm-kernel-precomp-win-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-win-release-x64"
+  }
+}
+job {
+  id: "vm-kernel-precomp-win-release-x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-win-release-x64-beta"
+  }
+}
+job {
+  id: "vm-kernel-precomp-win-release-x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-win-release-x64-dev"
+  }
+}
+job {
+  id: "vm-kernel-precomp-win-release-x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-precomp-win-release-x64-stable"
+  }
+}
+job {
+  id: "vm-kernel-reload-linux-debug-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-linux-debug-x64"
+  }
+}
+job {
+  id: "vm-kernel-reload-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-linux-release-x64"
+  }
+}
+job {
+  id: "vm-kernel-reload-rollback-linux-debug-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-rollback-linux-debug-x64"
+  }
+}
+job {
+  id: "vm-kernel-reload-rollback-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-reload-rollback-linux-release-x64"
+  }
+}
+job {
+  id: "vm-kernel-tsan-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-tsan-linux-release-x64"
+  }
+}
+job {
+  id: "vm-kernel-ubsan-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-ubsan-linux-release-x64"
+  }
+}
+job {
+  id: "vm-kernel-win-debug-ia32"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-debug-ia32"
+  }
+}
+job {
+  id: "vm-kernel-win-debug-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-debug-x64"
+  }
+}
+job {
+  id: "vm-kernel-win-debug-x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-debug-x64-beta"
+  }
+}
+job {
+  id: "vm-kernel-win-debug-x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-debug-x64-dev"
+  }
+}
+job {
+  id: "vm-kernel-win-debug-x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-debug-x64-stable"
+  }
+}
+job {
+  id: "vm-kernel-win-debug-x64c"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-debug-x64c"
+  }
+}
+job {
+  id: "vm-kernel-win-product-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-product-x64"
+  }
+}
+job {
+  id: "vm-kernel-win-release-ia32"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-release-ia32"
+  }
+}
+job {
+  id: "vm-kernel-win-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-release-x64"
+  }
+}
+job {
+  id: "vm-kernel-win-release-x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-release-x64-beta"
+  }
+}
+job {
+  id: "vm-kernel-win-release-x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-release-x64-dev"
+  }
+}
+job {
+  id: "vm-kernel-win-release-x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-kernel-win-release-x64-stable"
+  }
+}
+job {
+  id: "vm-precomp-ffi-qemu-linux-release-arm"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-precomp-ffi-qemu-linux-release-arm"
+  }
+}
+job {
+  id: "vm-precomp-ffi-qemu-linux-release-arm-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-precomp-ffi-qemu-linux-release-arm-beta"
+  }
+}
+job {
+  id: "vm-precomp-ffi-qemu-linux-release-arm-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-precomp-ffi-qemu-linux-release-arm-dev"
+  }
+}
+job {
+  id: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
+  }
+}
+job {
+  id: "vm-precomp-ffi-qemu-linux-release-arm-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-precomp-ffi-qemu-linux-release-arm-stable"
+  }
+}
+job {
+  id: "vm-precomp-ffi-qemu-linux-release-riscv64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-precomp-ffi-qemu-linux-release-riscv64"
+  }
+}
+job {
+  id: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
+  }
+}
+job {
+  id: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
+  }
+}
+job {
+  id: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.dart.ci.sandbox"
+    builder: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
+  }
+}
+trigger {
+  id: "dart-ci-test-data-trigger"
+  realm: "ci"
+  acl_sets: "ci"
+  triggers: "ci-test-data"
+  gitiles {
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/ci-test-data"
+    path_regexps: "tools/bots/ci_test_data_trigger"
+  }
+}
+trigger {
+  id: "dart-flutter-engine-trigger"
+  realm: "ci"
+  acl_sets: "ci"
+  triggers: "linearize-flutter"
+  gitiles {
+    repo: "https://dart.googlesource.com/external/github.com/flutter/engine"
+    refs: "regexp:refs/heads/master"
+  }
+}
+trigger {
+  id: "dart-flutter-flutter-trigger"
+  realm: "ci"
+  acl_sets: "ci"
+  triggers: "linearize-flutter"
+  gitiles {
+    repo: "https://dart.googlesource.com/external/github.com/flutter/flutter"
+    refs: "regexp:refs/heads/master"
+  }
+}
+trigger {
+  id: "dart-gitiles-trigger-beta"
+  realm: "ci"
+  acl_sets: "ci"
+  triggers: "dart-sdk-linux-beta"
+  triggers: "dart-sdk-mac-arm64-beta"
+  triggers: "dart-sdk-mac-beta"
+  triggers: "dart-sdk-win-beta"
+  triggers: "debianpackage-linux-beta"
+  triggers: "analyzer-analysis-server-linux-beta"
+  triggers: "analyzer-linux-release-beta"
+  triggers: "analyzer-mac-release-beta"
+  triggers: "analyzer-nnbd-linux-release-beta"
+  triggers: "analyzer-win-release-beta"
+  triggers: "app-kernel-linux-debug-x64-beta"
+  triggers: "app-kernel-linux-release-x64-beta"
+  triggers: "dart2js-canary-x64-beta"
+  triggers: "dart2js-csp-minified-linux-x64-chrome-beta"
+  triggers: "dart2js-minified-strong-linux-x64-d8-beta"
+  triggers: "dart2js-nnbd-linux-x64-chrome-beta"
+  triggers: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
+  triggers: "dart2js-strong-linux-x64-chrome-beta"
+  triggers: "dart2js-strong-linux-x64-firefox-beta"
+  triggers: "dart2js-strong-mac-x64-chrome-beta"
+  triggers: "dart2js-strong-mac-x64-safari-beta"
+  triggers: "dart2js-strong-win-x64-chrome-beta"
+  triggers: "dart2js-unit-linux-x64-release-beta"
+  triggers: "ddc-linux-release-chrome-beta"
+  triggers: "ddc-mac-release-chrome-beta"
+  triggers: "ddc-win-release-chrome-beta"
+  triggers: "ddk-linux-release-firefox-beta"
+  triggers: "front-end-linux-release-x64-beta"
+  triggers: "front-end-mac-release-x64-beta"
+  triggers: "front-end-nnbd-linux-release-x64-beta"
+  triggers: "front-end-win-release-x64-beta"
+  triggers: "gclient-beta"
+  triggers: "pkg-linux-release-beta"
+  triggers: "pkg-mac-release-beta"
+  triggers: "pkg-win-release-beta"
+  triggers: "vm-canary-linux-debug-beta"
+  triggers: "vm-ffi-android-debug-arm-beta"
+  triggers: "vm-ffi-android-debug-arm64c-beta"
+  triggers: "vm-ffi-android-product-arm-beta"
+  triggers: "vm-ffi-android-product-arm64c-beta"
+  triggers: "vm-ffi-android-release-arm-beta"
+  triggers: "vm-ffi-android-release-arm64c-beta"
+  triggers: "vm-kernel-checked-linux-release-x64-beta"
+  triggers: "vm-kernel-linux-debug-x64-beta"
+  triggers: "vm-kernel-linux-release-simarm-beta"
+  triggers: "vm-kernel-linux-release-simarm64-beta"
+  triggers: "vm-kernel-linux-release-x64-beta"
+  triggers: "vm-kernel-mac-debug-x64-beta"
+  triggers: "vm-kernel-mac-release-x64-beta"
+  triggers: "vm-kernel-nnbd-linux-debug-x64-beta"
+  triggers: "vm-kernel-nnbd-linux-release-x64-beta"
+  triggers: "vm-kernel-precomp-android-release-arm64c-beta"
+  triggers: "vm-kernel-precomp-android-release-arm_x64-beta"
+  triggers: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
+  triggers: "vm-kernel-precomp-linux-debug-x64-beta"
+  triggers: "vm-kernel-precomp-linux-product-x64-beta"
+  triggers: "vm-kernel-precomp-linux-release-simarm-beta"
+  triggers: "vm-kernel-precomp-linux-release-simarm64-beta"
+  triggers: "vm-kernel-precomp-linux-release-simarm_x64-beta"
+  triggers: "vm-kernel-precomp-linux-release-x64-beta"
+  triggers: "vm-kernel-precomp-mac-release-simarm64-beta"
+  triggers: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
+  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+  triggers: "vm-kernel-precomp-win-release-x64-beta"
+  triggers: "vm-kernel-win-debug-x64-beta"
+  triggers: "vm-kernel-win-release-x64-beta"
+  triggers: "vm-precomp-ffi-qemu-linux-release-arm-beta"
+  triggers: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
+  gitiles {
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/beta"
+  }
+}
+trigger {
+  id: "dart-gitiles-trigger-dev"
+  realm: "ci"
+  acl_sets: "ci"
+  triggers: "dart-sdk-linux-dev"
+  triggers: "dart-sdk-mac-arm64-dev"
+  triggers: "dart-sdk-mac-dev"
+  triggers: "dart-sdk-win-dev"
+  triggers: "debianpackage-linux-dev"
+  triggers: "analyzer-analysis-server-linux-dev"
+  triggers: "analyzer-linux-release-dev"
+  triggers: "analyzer-mac-release-dev"
+  triggers: "analyzer-nnbd-linux-release-dev"
+  triggers: "analyzer-win-release-dev"
+  triggers: "app-kernel-linux-debug-x64-dev"
+  triggers: "app-kernel-linux-release-x64-dev"
+  triggers: "dart2js-canary-x64-dev"
+  triggers: "dart2js-csp-minified-linux-x64-chrome-dev"
+  triggers: "dart2js-minified-strong-linux-x64-d8-dev"
+  triggers: "dart2js-nnbd-linux-x64-chrome-dev"
+  triggers: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
+  triggers: "dart2js-strong-linux-x64-chrome-dev"
+  triggers: "dart2js-strong-linux-x64-firefox-dev"
+  triggers: "dart2js-strong-mac-x64-chrome-dev"
+  triggers: "dart2js-strong-mac-x64-safari-dev"
+  triggers: "dart2js-strong-win-x64-chrome-dev"
+  triggers: "dart2js-unit-linux-x64-release-dev"
+  triggers: "ddc-linux-release-chrome-dev"
+  triggers: "ddc-mac-release-chrome-dev"
+  triggers: "ddc-win-release-chrome-dev"
+  triggers: "ddk-linux-release-firefox-dev"
+  triggers: "front-end-linux-release-x64-dev"
+  triggers: "front-end-mac-release-x64-dev"
+  triggers: "front-end-nnbd-linux-release-x64-dev"
+  triggers: "front-end-win-release-x64-dev"
+  triggers: "gclient-dev"
+  triggers: "pkg-linux-release-dev"
+  triggers: "pkg-mac-release-dev"
+  triggers: "pkg-win-release-dev"
+  triggers: "vm-canary-linux-debug-dev"
+  triggers: "vm-ffi-android-debug-arm-dev"
+  triggers: "vm-ffi-android-debug-arm64c-dev"
+  triggers: "vm-ffi-android-product-arm-dev"
+  triggers: "vm-ffi-android-product-arm64c-dev"
+  triggers: "vm-ffi-android-release-arm-dev"
+  triggers: "vm-ffi-android-release-arm64c-dev"
+  triggers: "vm-kernel-checked-linux-release-x64-dev"
+  triggers: "vm-kernel-linux-debug-x64-dev"
+  triggers: "vm-kernel-linux-release-simarm-dev"
+  triggers: "vm-kernel-linux-release-simarm64-dev"
+  triggers: "vm-kernel-linux-release-x64-dev"
+  triggers: "vm-kernel-mac-debug-x64-dev"
+  triggers: "vm-kernel-mac-release-arm64-dev"
+  triggers: "vm-kernel-mac-release-x64-dev"
+  triggers: "vm-kernel-nnbd-linux-debug-x64-dev"
+  triggers: "vm-kernel-nnbd-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-android-release-arm64c-dev"
+  triggers: "vm-kernel-precomp-android-release-arm_x64-dev"
+  triggers: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
+  triggers: "vm-kernel-precomp-linux-debug-x64-dev"
+  triggers: "vm-kernel-precomp-linux-product-x64-dev"
+  triggers: "vm-kernel-precomp-linux-release-simarm-dev"
+  triggers: "vm-kernel-precomp-linux-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-linux-release-simarm_x64-dev"
+  triggers: "vm-kernel-precomp-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-mac-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-win-release-x64-dev"
+  triggers: "vm-kernel-win-debug-x64-dev"
+  triggers: "vm-kernel-win-release-x64-dev"
+  triggers: "vm-precomp-ffi-qemu-linux-release-arm-dev"
+  triggers: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
+  gitiles {
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/dev"
+  }
+}
+trigger {
+  id: "dart-gitiles-trigger-flutter"
+  realm: "ci"
+  acl_sets: "ci"
+  triggers: "flutter-engine-linux"
+  triggers: "flutter-engine-linux-web_tests"
+  gitiles {
+    repo: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
+    refs: "regexp:refs/heads/master"
+  }
+}
+trigger {
+  id: "dart-gitiles-trigger-flutter-daily"
+  realm: "ci"
+  schedule: "0 8 * * *"
+  acl_sets: "ci"
+  triggers: "flutter-engine-ios"
+  gitiles {
+    repo: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
+    refs: "regexp:refs/heads/master"
+  }
+}
+trigger {
+  id: "dart-gitiles-trigger-main"
+  realm: "ci"
+  acl_sets: "ci"
+  triggers: "debianpackage-linux"
+  triggers: "linearize-flutter"
+  triggers: "analyzer-analysis-server-linux"
+  triggers: "analyzer-linux-release"
+  triggers: "analyzer-mac-release"
+  triggers: "analyzer-nnbd-linux-release"
+  triggers: "analyzer-win-release"
+  triggers: "dart2js-canary-x64"
+  triggers: "dart2js-csp-minified-linux-x64-chrome"
+  triggers: "dart2js-minified-strong-linux-x64-d8"
+  triggers: "dart2js-nnbd-linux-x64-chrome"
+  triggers: "dart2js-strong-hostasserts-linux-ia32-d8"
+  triggers: "dart2js-strong-linux-x64-chrome"
+  triggers: "dart2js-strong-linux-x64-firefox"
+  triggers: "dart2js-strong-mac-x64-chrome"
+  triggers: "dart2js-strong-mac-x64-safari"
+  triggers: "dart2js-strong-win-x64-chrome"
+  triggers: "dart2js-unit-linux-x64-release"
+  triggers: "ddc-linux-release-chrome"
+  triggers: "ddc-mac-release-chrome"
+  triggers: "ddc-nnbd-linux-release-chrome"
+  triggers: "ddc-win-release-chrome"
+  triggers: "ddk-linux-release-firefox"
+  triggers: "flutter-analyze"
+  triggers: "flutter-frontend"
+  triggers: "front-end-linux-release-x64"
+  triggers: "front-end-mac-release-x64"
+  triggers: "front-end-nnbd-linux-release-x64"
+  triggers: "front-end-win-release-x64"
+  triggers: "gclient"
+  triggers: "pkg-linux-debug"
+  triggers: "pkg-linux-release"
+  triggers: "pkg-mac-release"
+  triggers: "pkg-mac-release-arm64"
+  triggers: "pkg-win-release"
+  triggers: "vm-kernel-linux-debug-x64"
+  triggers: "vm-kernel-linux-release-x64"
+  triggers: "vm-kernel-mac-debug-x64"
+  triggers: "vm-kernel-mac-release-arm64"
+  triggers: "vm-kernel-mac-release-x64"
+  triggers: "vm-kernel-win-debug-x64"
+  triggers: "vm-kernel-win-release-x64"
+  gitiles {
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/main"
+  }
+}
+trigger {
+  id: "dart-gitiles-trigger-stable"
+  realm: "ci"
+  acl_sets: "ci"
+  triggers: "dart-sdk-linux-stable"
+  triggers: "dart-sdk-mac-arm64-stable"
+  triggers: "dart-sdk-mac-stable"
+  triggers: "dart-sdk-win-stable"
+  triggers: "debianpackage-linux-stable"
+  triggers: "analyzer-analysis-server-linux-stable"
+  triggers: "analyzer-linux-release-stable"
+  triggers: "analyzer-mac-release-stable"
+  triggers: "analyzer-nnbd-linux-release-stable"
+  triggers: "analyzer-win-release-stable"
+  triggers: "app-kernel-linux-debug-x64-stable"
+  triggers: "app-kernel-linux-release-x64-stable"
+  triggers: "dart2js-canary-x64-stable"
+  triggers: "dart2js-csp-minified-linux-x64-chrome-stable"
+  triggers: "dart2js-minified-strong-linux-x64-d8-stable"
+  triggers: "dart2js-nnbd-linux-x64-chrome-stable"
+  triggers: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
+  triggers: "dart2js-strong-linux-x64-chrome-stable"
+  triggers: "dart2js-strong-linux-x64-firefox-stable"
+  triggers: "dart2js-strong-mac-x64-chrome-stable"
+  triggers: "dart2js-strong-mac-x64-safari-stable"
+  triggers: "dart2js-strong-win-x64-chrome-stable"
+  triggers: "dart2js-unit-linux-x64-release-stable"
+  triggers: "ddc-linux-release-chrome-stable"
+  triggers: "ddc-mac-release-chrome-stable"
+  triggers: "ddc-win-release-chrome-stable"
+  triggers: "ddk-linux-release-firefox-stable"
+  triggers: "front-end-linux-release-x64-stable"
+  triggers: "front-end-mac-release-x64-stable"
+  triggers: "front-end-nnbd-linux-release-x64-stable"
+  triggers: "front-end-win-release-x64-stable"
+  triggers: "gclient-stable"
+  triggers: "pkg-linux-release-stable"
+  triggers: "pkg-mac-release-stable"
+  triggers: "pkg-win-release-stable"
+  triggers: "vm-canary-linux-debug-stable"
+  triggers: "vm-ffi-android-debug-arm-stable"
+  triggers: "vm-ffi-android-debug-arm64c-stable"
+  triggers: "vm-ffi-android-product-arm-stable"
+  triggers: "vm-ffi-android-product-arm64c-stable"
+  triggers: "vm-ffi-android-release-arm-stable"
+  triggers: "vm-ffi-android-release-arm64c-stable"
+  triggers: "vm-kernel-checked-linux-release-x64-stable"
+  triggers: "vm-kernel-linux-debug-x64-stable"
+  triggers: "vm-kernel-linux-release-simarm-stable"
+  triggers: "vm-kernel-linux-release-simarm64-stable"
+  triggers: "vm-kernel-linux-release-x64-stable"
+  triggers: "vm-kernel-mac-debug-x64-stable"
+  triggers: "vm-kernel-mac-release-x64-stable"
+  triggers: "vm-kernel-nnbd-linux-debug-x64-stable"
+  triggers: "vm-kernel-nnbd-linux-release-x64-stable"
+  triggers: "vm-kernel-precomp-android-release-arm64c-stable"
+  triggers: "vm-kernel-precomp-android-release-arm_x64-stable"
+  triggers: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
+  triggers: "vm-kernel-precomp-linux-debug-x64-stable"
+  triggers: "vm-kernel-precomp-linux-product-x64-stable"
+  triggers: "vm-kernel-precomp-linux-release-simarm-stable"
+  triggers: "vm-kernel-precomp-linux-release-simarm64-stable"
+  triggers: "vm-kernel-precomp-linux-release-simarm_x64-stable"
+  triggers: "vm-kernel-precomp-linux-release-x64-stable"
+  triggers: "vm-kernel-precomp-mac-release-simarm64-stable"
+  triggers: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
+  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+  triggers: "vm-kernel-precomp-win-release-x64-stable"
+  triggers: "vm-kernel-win-debug-x64-stable"
+  triggers: "vm-kernel-win-release-x64-stable"
+  triggers: "vm-precomp-ffi-qemu-linux-release-arm-stable"
+  triggers: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
+  gitiles {
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/stable"
+  }
+}
+trigger {
+  id: "dart-nightly-trigger"
+  realm: "ci"
+  schedule: "0 5 * * *"
+  acl_sets: "ci"
+  triggers: "analyzer-nnbd-mac-release"
+  triggers: "analyzer-nnbd-win-release"
+  triggers: "app-kernel-linux-product-x64"
+  triggers: "cross-vm-precomp-linux-release-arm64"
+  triggers: "front-end-nnbd-mac-release-x64"
+  triggers: "front-end-nnbd-win-release-x64"
+  triggers: "vm-kernel-asan-linux-release-x64"
+  triggers: "vm-kernel-gcc-linux"
+  triggers: "vm-kernel-gcc-linux-beta"
+  triggers: "vm-kernel-gcc-linux-dev"
+  triggers: "vm-kernel-gcc-linux-stable"
+  triggers: "vm-kernel-linux-debug-ia32"
+  triggers: "vm-kernel-linux-debug-simriscv64"
+  triggers: "vm-kernel-linux-debug-x64c"
+  triggers: "vm-kernel-linux-product-x64"
+  triggers: "vm-kernel-linux-release-ia32"
+  triggers: "vm-kernel-mac-product-x64"
+  triggers: "vm-kernel-msan-linux-release-x64"
+  triggers: "vm-kernel-nnbd-linux-debug-ia32"
+  triggers: "vm-kernel-nnbd-linux-release-ia32"
+  triggers: "vm-kernel-nnbd-linux-release-simarm"
+  triggers: "vm-kernel-nnbd-linux-release-simarm64"
+  triggers: "vm-kernel-nnbd-mac-debug-arm64"
+  triggers: "vm-kernel-nnbd-mac-debug-x64"
+  triggers: "vm-kernel-nnbd-mac-release-x64"
+  triggers: "vm-kernel-nnbd-win-debug-x64"
+  triggers: "vm-kernel-nnbd-win-release-ia32"
+  triggers: "vm-kernel-nnbd-win-release-x64"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32"
+  triggers: "vm-kernel-precomp-asan-linux-release-x64"
+  triggers: "vm-kernel-precomp-dwarf-linux-product-x64"
+  triggers: "vm-kernel-precomp-linux-debug-simriscv64"
+  triggers: "vm-kernel-precomp-linux-debug-x64c"
+  triggers: "vm-kernel-precomp-msan-linux-release-x64"
+  triggers: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+  triggers: "vm-kernel-precomp-nnbd-linux-debug-x64"
+  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm64"
+  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+  triggers: "vm-kernel-precomp-nnbd-mac-release-simarm64"
+  triggers: "vm-kernel-precomp-nnbd-win-release-x64"
+  triggers: "vm-kernel-precomp-tsan-linux-release-x64"
+  triggers: "vm-kernel-precomp-ubsan-linux-release-x64"
+  triggers: "vm-kernel-precomp-win-debug-x64c"
+  triggers: "vm-kernel-reload-linux-debug-x64"
+  triggers: "vm-kernel-reload-linux-release-x64"
+  triggers: "vm-kernel-reload-rollback-linux-debug-x64"
+  triggers: "vm-kernel-reload-rollback-linux-release-x64"
+  triggers: "vm-kernel-tsan-linux-release-x64"
+  triggers: "vm-kernel-ubsan-linux-release-x64"
+  triggers: "vm-kernel-win-debug-ia32"
+  triggers: "vm-kernel-win-debug-x64c"
+  triggers: "vm-kernel-win-product-x64"
+  triggers: "vm-kernel-win-release-ia32"
+  triggers: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
+  gitiles {
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/main"
+  }
+}
+trigger {
+  id: "dart-vm-gitiles-trigger-main"
+  realm: "ci"
+  acl_sets: "ci"
+  triggers: "app-kernel-linux-debug-x64"
+  triggers: "app-kernel-linux-release-x64"
+  triggers: "cross-vm-linux-release-arm64"
+  triggers: "iso-stress-linux"
+  triggers: "vm-canary-linux-debug"
+  triggers: "vm-ffi-android-debug-arm"
+  triggers: "vm-ffi-android-debug-arm64c"
+  triggers: "vm-ffi-android-product-arm"
+  triggers: "vm-ffi-android-product-arm64c"
+  triggers: "vm-ffi-android-release-arm"
+  triggers: "vm-ffi-android-release-arm64c"
+  triggers: "vm-fuchsia-release-x64"
+  triggers: "vm-kernel-checked-linux-release-x64"
+  triggers: "vm-kernel-linux-release-simarm"
+  triggers: "vm-kernel-linux-release-simarm64"
+  triggers: "vm-kernel-nnbd-linux-debug-x64"
+  triggers: "vm-kernel-nnbd-linux-release-x64"
+  triggers: "vm-kernel-nnbd-mac-release-arm64"
+  triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
+  triggers: "vm-kernel-precomp-android-release-arm64c"
+  triggers: "vm-kernel-precomp-android-release-arm_x64"
+  triggers: "vm-kernel-precomp-linux-debug-simarm_x64"
+  triggers: "vm-kernel-precomp-linux-debug-x64"
+  triggers: "vm-kernel-precomp-linux-product-x64"
+  triggers: "vm-kernel-precomp-linux-release-simarm"
+  triggers: "vm-kernel-precomp-linux-release-simarm64"
+  triggers: "vm-kernel-precomp-linux-release-simarm_x64"
+  triggers: "vm-kernel-precomp-linux-release-x64"
+  triggers: "vm-kernel-precomp-mac-release-simarm64"
+  triggers: "vm-kernel-precomp-nnbd-linux-release-x64"
+  triggers: "vm-kernel-precomp-nnbd-mac-release-arm64"
+  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64"
+  triggers: "vm-kernel-precomp-win-release-x64"
+  triggers: "vm-precomp-ffi-qemu-linux-release-arm"
+  triggers: "vm-precomp-ffi-qemu-linux-release-riscv64"
+  gitiles {
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/main"
+    path_regexps: "DEPS"
+    path_regexps: "build/.+"
+    path_regexps: "BUILD.gn"
+    path_regexps: "sdk_args.gni"
+    path_regexps: ".dart_tool/package_config.json"
+    path_regexps: "sdk/.+"
+    path_regexps: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+    path_regexps: "tools/bots/test_matrix.json"
+    path_regexps: "tests/.+"
+    path_regexps: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+    path_regexps: "pkg/vm/.+"
+    path_regexps: "runtime/.+"
+  }
+}
+trigger {
+  id: "dart-weekly-trigger"
+  realm: "ci"
+  schedule: "0 0 * * SUN"
+  acl_sets: "ci"
+  triggers: "frontend-weekly"
+  gitiles {
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/main"
+  }
+}
+trigger {
+  id: "recipes-dart"
+  realm: "ci"
+  acl_sets: "ci"
+  triggers: "recipe-bundler"
+  gitiles {
+    repo: "https://dart.googlesource.com/recipes"
+    refs: "regexp:refs/heads/main"
+  }
+}
+acl_sets {
+  name: "ci"
+  acls {
+    role: OWNER
+    granted_to: "group:project-dart-admins"
+  }
+  acls {
+    granted_to: "group:all"
+  }
+}
+acl_sets {
+  name: "ci.roll"
+  acls {
+    role: OWNER
+    granted_to: "group:project-dart-admins"
+  }
+  acls {
+    granted_to: "group:all"
+  }
+}
+acl_sets {
+  name: "ci.sandbox"
+  acls {
+    role: OWNER
+    granted_to: "group:project-dart-admins"
+  }
+  acls {
+    granted_to: "group:all"
+  }
+}
diff --git a/generated/project.cfg b/generated/project.cfg
new file mode 100644
index 000000000000..654142bfda7b
--- /dev/null
+++ b/generated/project.cfg
@@ -0,0 +1,14 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see ProjectCfg message:
+#   https://luci-config.appspot.com/schemas/projects:project.cfg
+
+name: "dart"
+access: "group:all"
+lucicfg {
+  version: "1.30.9"
+  package_dir: ".."
+  config_dir: "generated"
+  entry_point: "main.star"
+}
diff --git a/generated/realms.cfg b/generated/realms.cfg
new file mode 100644
index 000000000000..e7954da62b3b
--- /dev/null
+++ b/generated/realms.cfg
@@ -0,0 +1,147 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see RealmsCfg message:
+#   https://luci-config.appspot.com/schemas/projects:realms.cfg
+
+realms {
+  name: "@root"
+  bindings {
+    role: "role/buildbucket.reader"
+    principals: "group:all"
+  }
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "group:project-dart-admins"
+  }
+  bindings {
+    role: "role/configs.reader"
+    principals: "group:all"
+  }
+  bindings {
+    role: "role/configs.validator"
+    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/cq.committer"
+    principals: "group:project-dart-committers"
+  }
+  bindings {
+    role: "role/cq.dryRunner"
+    principals: "group:project-dart-tryjob-access"
+  }
+  bindings {
+    role: "role/logdog.reader"
+    principals: "group:all"
+  }
+  bindings {
+    role: "role/logdog.writer"
+    principals: "group:luci-logdog-chromium-writers"
+  }
+  bindings {
+    role: "role/scheduler.owner"
+    principals: "group:project-dart-admins"
+  }
+  bindings {
+    role: "role/scheduler.reader"
+    principals: "group:all"
+  }
+  bindings {
+    role: "role/swarming.poolOwner"
+    principals: "group:project-dart-admins"
+  }
+  bindings {
+    role: "role/swarming.poolUser"
+    principals: "group:project-dart-admins"
+  }
+  bindings {
+    role: "role/swarming.poolViewer"
+    principals: "group:project-dart-committers"
+  }
+  bindings {
+    role: "role/swarming.taskTriggerer"
+    principals: "group:project-dart-admins"
+  }
+}
+realms {
+  name: "ci"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+  }
+}
+realms {
+  name: "ci.roll"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "group:project-dart-roller-owners"
+    principals: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+  }
+}
+realms {
+  name: "ci.sandbox"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
+}
+realms {
+  name: "pools/ci"
+}
+realms {
+  name: "pools/tests"
+  bindings {
+    role: "role/swarming.poolUser"
+    principals: "group:mdb/dart-build-access"
+    principals: "group:project-dart-ci-task-accounts"
+    principals: "group:project-dart-try-task-accounts"
+  }
+}
+realms {
+  name: "pools/try"
+  bindings {
+    role: "role/swarming.poolUser"
+    principals: "group:mdb/dart-build-access"
+  }
+}
+realms {
+  name: "try"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "group:project-dart-tryjob-access"
+    principals: "group:service-account-cq"
+  }
+  bindings {
+    role: "role/swarming.taskTriggerer"
+    principals: "group:mdb/dart-build-access"
+  }
+}
+realms {
+  name: "try.shared"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "group:project-dart-tryjob-access"
+    principals: "group:service-account-cq"
+  }
+}
diff --git a/project.star b/project.star
index 30533e8a9c83..277f80bde0e2 100644
--- a/project.star
+++ b/project.star
@@ -22,17 +22,7 @@ ROLL_TRIGGERERS = {
 CI_SANDBOX_TRIGGERERS = [accounts.ci_builder, accounts.try_builder]
 
 lucicfg.config(
-    config_dir = ".",
-    tracked_files = [
-        "commit-queue.cfg",
-        "cr-buildbucket.cfg",
-        "luci-logdog.cfg",
-        "luci-milo.cfg",
-        "luci-notify.cfg",
-        "luci-scheduler.cfg",
-        "project.cfg",
-        "realms.cfg",
-    ],
+    tracked_files = ["*"],
     lint_checks = ["all"],
 )
 

From 4acbd5cbb9cdc5c3a22ecc144458bdfc3c708655 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 10 Feb 2022 08:35:21 +0000
Subject: [PATCH 525/826] [infra] Update infra/config OWNERS

Bug: b/200915407
Change-Id: I809a2ebdaad86d3587ebc26dd6dd4420951d8a1d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/232262
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 OWNERS | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/OWNERS b/OWNERS
index 647d54fbc844..da84daa5949b 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,8 @@
-whesse@google.com
+# primary
 athom@google.com
+sortie@google.com
+whesse@google.com
+
+# secondary
 kustermann@google.com
-tandrii@google.com
+rmacnak@google.com

From 89c0ae412355eb5224bd3d6944671ad7d2ea240f Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 10 Feb 2022 08:52:41 +0000
Subject: [PATCH 526/826] [infra] Remove obsolete native-python-wrapper tag

This has long been obsolete and isn't used on dart-internal.

Change-Id: I6ac5493de9625ced82871b3a8e5ddaaaffd131c0
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/232264
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 485 -----------------------------------
 lib/dart.star                |   2 -
 2 files changed, 487 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index d2434ed3ac0c..1992bd1ad2bb 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -21,7 +21,6 @@ buckets {
     builders {
       name: "base"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -65,7 +64,6 @@ buckets {
     builders {
       name: "cbuild"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -109,7 +107,6 @@ buckets {
     builders {
       name: "chocolatey"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -152,7 +149,6 @@ buckets {
     builders {
       name: "co19-roller"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -195,7 +191,6 @@ buckets {
     builders {
       name: "dart-ci-scripts-linux"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -238,7 +233,6 @@ buckets {
     builders {
       name: "dart-ci-scripts-mac"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -288,7 +282,6 @@ buckets {
     builders {
       name: "dart-ci-scripts-mac-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -338,7 +331,6 @@ buckets {
     builders {
       name: "dart-ci-scripts-win"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -381,7 +373,6 @@ buckets {
     builders {
       name: "dart-sdk-linux-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -425,7 +416,6 @@ buckets {
     builders {
       name: "dart-sdk-linux-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -469,7 +459,6 @@ buckets {
     builders {
       name: "dart-sdk-linux-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -513,7 +502,6 @@ buckets {
     builders {
       name: "dart-sdk-mac-arm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -566,7 +554,6 @@ buckets {
     builders {
       name: "dart-sdk-mac-arm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -619,7 +606,6 @@ buckets {
     builders {
       name: "dart-sdk-mac-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -672,7 +658,6 @@ buckets {
     builders {
       name: "dart-sdk-mac-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -722,7 +707,6 @@ buckets {
     builders {
       name: "dart-sdk-mac-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -772,7 +756,6 @@ buckets {
     builders {
       name: "dart-sdk-mac-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -822,7 +805,6 @@ buckets {
     builders {
       name: "dart-sdk-win-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -865,7 +847,6 @@ buckets {
     builders {
       name: "dart-sdk-win-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -908,7 +889,6 @@ buckets {
     builders {
       name: "dart-sdk-win-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -951,7 +931,6 @@ buckets {
     builders {
       name: "debianpackage-linux"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -994,7 +973,6 @@ buckets {
     builders {
       name: "debianpackage-linux-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -1037,7 +1015,6 @@ buckets {
     builders {
       name: "debianpackage-linux-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -1080,7 +1057,6 @@ buckets {
     builders {
       name: "debianpackage-linux-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -1123,7 +1099,6 @@ buckets {
     builders {
       name: "flutter-engine-ios"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -1167,7 +1142,6 @@ buckets {
     builders {
       name: "linearize-flutter"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -1211,7 +1185,6 @@ buckets {
     builders {
       name: "recipe-bundler"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -1261,7 +1234,6 @@ buckets {
     builders {
       name: "recipe-deps-roller"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -1333,7 +1305,6 @@ buckets {
     builders {
       name: "roll-to-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -1398,7 +1369,6 @@ buckets {
     builders {
       name: "analyzer-analysis-server-linux"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -1443,7 +1413,6 @@ buckets {
     builders {
       name: "analyzer-analysis-server-linux-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -1488,7 +1457,6 @@ buckets {
     builders {
       name: "analyzer-analysis-server-linux-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -1533,7 +1501,6 @@ buckets {
     builders {
       name: "analyzer-analysis-server-linux-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -1578,7 +1545,6 @@ buckets {
     builders {
       name: "analyzer-linux-release"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -1623,7 +1589,6 @@ buckets {
     builders {
       name: "analyzer-linux-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -1668,7 +1633,6 @@ buckets {
     builders {
       name: "analyzer-linux-release-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -1713,7 +1677,6 @@ buckets {
     builders {
       name: "analyzer-linux-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -1758,7 +1721,6 @@ buckets {
     builders {
       name: "analyzer-mac-release"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -1810,7 +1772,6 @@ buckets {
     builders {
       name: "analyzer-mac-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -1862,7 +1823,6 @@ buckets {
     builders {
       name: "analyzer-mac-release-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -1914,7 +1874,6 @@ buckets {
     builders {
       name: "analyzer-mac-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -1966,7 +1925,6 @@ buckets {
     builders {
       name: "analyzer-nnbd-linux-release"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -2011,7 +1969,6 @@ buckets {
     builders {
       name: "analyzer-nnbd-linux-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -2056,7 +2013,6 @@ buckets {
     builders {
       name: "analyzer-nnbd-linux-release-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -2101,7 +2057,6 @@ buckets {
     builders {
       name: "analyzer-nnbd-linux-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -2146,7 +2101,6 @@ buckets {
     builders {
       name: "analyzer-nnbd-mac-release"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -2198,7 +2152,6 @@ buckets {
     builders {
       name: "analyzer-nnbd-win-release"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -2243,7 +2196,6 @@ buckets {
     builders {
       name: "analyzer-win-release"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -2292,7 +2244,6 @@ buckets {
     builders {
       name: "analyzer-win-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -2341,7 +2292,6 @@ buckets {
     builders {
       name: "analyzer-win-release-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -2390,7 +2340,6 @@ buckets {
     builders {
       name: "analyzer-win-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -2439,7 +2388,6 @@ buckets {
     builders {
       name: "app-kernel-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -2485,7 +2433,6 @@ buckets {
     builders {
       name: "app-kernel-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -2531,7 +2478,6 @@ buckets {
     builders {
       name: "app-kernel-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -2577,7 +2523,6 @@ buckets {
     builders {
       name: "app-kernel-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -2623,7 +2568,6 @@ buckets {
     builders {
       name: "app-kernel-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -2668,7 +2612,6 @@ buckets {
     builders {
       name: "app-kernel-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -2713,7 +2656,6 @@ buckets {
     builders {
       name: "app-kernel-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -2758,7 +2700,6 @@ buckets {
     builders {
       name: "app-kernel-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -2803,7 +2744,6 @@ buckets {
     builders {
       name: "app-kernel-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -2848,7 +2788,6 @@ buckets {
     builders {
       name: "ci-test-data"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -2894,7 +2833,6 @@ buckets {
     builders {
       name: "cross-vm-linux-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -2940,7 +2878,6 @@ buckets {
     builders {
       name: "cross-vm-precomp-linux-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -2986,7 +2923,6 @@ buckets {
     builders {
       name: "dart2js-canary-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -3035,7 +2971,6 @@ buckets {
     builders {
       name: "dart2js-canary-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -3084,7 +3019,6 @@ buckets {
     builders {
       name: "dart2js-canary-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -3133,7 +3067,6 @@ buckets {
     builders {
       name: "dart2js-canary-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -3182,7 +3115,6 @@ buckets {
     builders {
       name: "dart2js-csp-minified-linux-x64-chrome"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -3231,7 +3163,6 @@ buckets {
     builders {
       name: "dart2js-csp-minified-linux-x64-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -3280,7 +3211,6 @@ buckets {
     builders {
       name: "dart2js-csp-minified-linux-x64-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -3329,7 +3259,6 @@ buckets {
     builders {
       name: "dart2js-csp-minified-linux-x64-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -3378,7 +3307,6 @@ buckets {
     builders {
       name: "dart2js-minified-strong-linux-x64-d8"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -3426,7 +3354,6 @@ buckets {
     builders {
       name: "dart2js-minified-strong-linux-x64-d8-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -3474,7 +3401,6 @@ buckets {
     builders {
       name: "dart2js-minified-strong-linux-x64-d8-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -3522,7 +3448,6 @@ buckets {
     builders {
       name: "dart2js-minified-strong-linux-x64-d8-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -3570,7 +3495,6 @@ buckets {
     builders {
       name: "dart2js-nnbd-linux-x64-chrome"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -3619,7 +3543,6 @@ buckets {
     builders {
       name: "dart2js-nnbd-linux-x64-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -3668,7 +3591,6 @@ buckets {
     builders {
       name: "dart2js-nnbd-linux-x64-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -3717,7 +3639,6 @@ buckets {
     builders {
       name: "dart2js-nnbd-linux-x64-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -3766,7 +3687,6 @@ buckets {
     builders {
       name: "dart2js-strong-hostasserts-linux-ia32-d8"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -3814,7 +3734,6 @@ buckets {
     builders {
       name: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -3862,7 +3781,6 @@ buckets {
     builders {
       name: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -3910,7 +3828,6 @@ buckets {
     builders {
       name: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -3958,7 +3875,6 @@ buckets {
     builders {
       name: "dart2js-strong-linux-x64-chrome"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -4007,7 +3923,6 @@ buckets {
     builders {
       name: "dart2js-strong-linux-x64-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -4056,7 +3971,6 @@ buckets {
     builders {
       name: "dart2js-strong-linux-x64-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -4105,7 +4019,6 @@ buckets {
     builders {
       name: "dart2js-strong-linux-x64-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -4154,7 +4067,6 @@ buckets {
     builders {
       name: "dart2js-strong-linux-x64-firefox"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -4203,7 +4115,6 @@ buckets {
     builders {
       name: "dart2js-strong-linux-x64-firefox-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -4252,7 +4163,6 @@ buckets {
     builders {
       name: "dart2js-strong-linux-x64-firefox-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -4301,7 +4211,6 @@ buckets {
     builders {
       name: "dart2js-strong-linux-x64-firefox-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -4350,7 +4259,6 @@ buckets {
     builders {
       name: "dart2js-strong-mac-x64-chrome"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -4406,7 +4314,6 @@ buckets {
     builders {
       name: "dart2js-strong-mac-x64-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -4462,7 +4369,6 @@ buckets {
     builders {
       name: "dart2js-strong-mac-x64-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -4518,7 +4424,6 @@ buckets {
     builders {
       name: "dart2js-strong-mac-x64-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -4574,7 +4479,6 @@ buckets {
     builders {
       name: "dart2js-strong-mac-x64-safari"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -4629,7 +4533,6 @@ buckets {
     builders {
       name: "dart2js-strong-mac-x64-safari-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -4684,7 +4587,6 @@ buckets {
     builders {
       name: "dart2js-strong-mac-x64-safari-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -4739,7 +4641,6 @@ buckets {
     builders {
       name: "dart2js-strong-mac-x64-safari-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -4794,7 +4695,6 @@ buckets {
     builders {
       name: "dart2js-strong-win-x64-chrome"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -4843,7 +4743,6 @@ buckets {
     builders {
       name: "dart2js-strong-win-x64-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -4892,7 +4791,6 @@ buckets {
     builders {
       name: "dart2js-strong-win-x64-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -4941,7 +4839,6 @@ buckets {
     builders {
       name: "dart2js-strong-win-x64-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -4990,7 +4887,6 @@ buckets {
     builders {
       name: "dart2js-strong-win-x64-firefox"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -5039,7 +4935,6 @@ buckets {
     builders {
       name: "dart2js-unit-linux-x64-release"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -5087,7 +4982,6 @@ buckets {
     builders {
       name: "dart2js-unit-linux-x64-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -5135,7 +5029,6 @@ buckets {
     builders {
       name: "dart2js-unit-linux-x64-release-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -5183,7 +5076,6 @@ buckets {
     builders {
       name: "dart2js-unit-linux-x64-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -5231,7 +5123,6 @@ buckets {
     builders {
       name: "ddc-linux-release-chrome"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -5279,7 +5170,6 @@ buckets {
     builders {
       name: "ddc-linux-release-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -5327,7 +5217,6 @@ buckets {
     builders {
       name: "ddc-linux-release-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -5375,7 +5264,6 @@ buckets {
     builders {
       name: "ddc-linux-release-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -5423,7 +5311,6 @@ buckets {
     builders {
       name: "ddc-mac-release-chrome"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -5478,7 +5365,6 @@ buckets {
     builders {
       name: "ddc-mac-release-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -5533,7 +5419,6 @@ buckets {
     builders {
       name: "ddc-mac-release-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -5588,7 +5473,6 @@ buckets {
     builders {
       name: "ddc-mac-release-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -5643,7 +5527,6 @@ buckets {
     builders {
       name: "ddc-nnbd-linux-release-chrome"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -5691,7 +5574,6 @@ buckets {
     builders {
       name: "ddc-win-release-chrome"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -5739,7 +5621,6 @@ buckets {
     builders {
       name: "ddc-win-release-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -5787,7 +5668,6 @@ buckets {
     builders {
       name: "ddc-win-release-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -5835,7 +5715,6 @@ buckets {
     builders {
       name: "ddc-win-release-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -5883,7 +5762,6 @@ buckets {
     builders {
       name: "ddk-linux-release-firefox"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -5931,7 +5809,6 @@ buckets {
     builders {
       name: "ddk-linux-release-firefox-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -5979,7 +5856,6 @@ buckets {
     builders {
       name: "ddk-linux-release-firefox-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -6027,7 +5903,6 @@ buckets {
     builders {
       name: "ddk-linux-release-firefox-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -6075,7 +5950,6 @@ buckets {
     builders {
       name: "flutter-analyze"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -6121,7 +5995,6 @@ buckets {
     builders {
       name: "flutter-engine-linux"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -6175,7 +6048,6 @@ buckets {
     builders {
       name: "flutter-engine-linux-web_tests"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -6226,7 +6098,6 @@ buckets {
     builders {
       name: "flutter-frontend"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -6271,7 +6142,6 @@ buckets {
     builders {
       name: "front-end-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -6316,7 +6186,6 @@ buckets {
     builders {
       name: "front-end-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -6361,7 +6230,6 @@ buckets {
     builders {
       name: "front-end-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -6406,7 +6274,6 @@ buckets {
     builders {
       name: "front-end-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -6451,7 +6318,6 @@ buckets {
     builders {
       name: "front-end-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -6503,7 +6369,6 @@ buckets {
     builders {
       name: "front-end-mac-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -6555,7 +6420,6 @@ buckets {
     builders {
       name: "front-end-mac-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -6607,7 +6471,6 @@ buckets {
     builders {
       name: "front-end-mac-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -6659,7 +6522,6 @@ buckets {
     builders {
       name: "front-end-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -6704,7 +6566,6 @@ buckets {
     builders {
       name: "front-end-nnbd-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -6749,7 +6610,6 @@ buckets {
     builders {
       name: "front-end-nnbd-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -6794,7 +6654,6 @@ buckets {
     builders {
       name: "front-end-nnbd-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -6839,7 +6698,6 @@ buckets {
     builders {
       name: "front-end-nnbd-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -6891,7 +6749,6 @@ buckets {
     builders {
       name: "front-end-nnbd-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -6936,7 +6793,6 @@ buckets {
     builders {
       name: "front-end-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -6981,7 +6837,6 @@ buckets {
     builders {
       name: "front-end-win-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -7026,7 +6881,6 @@ buckets {
     builders {
       name: "front-end-win-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -7071,7 +6925,6 @@ buckets {
     builders {
       name: "front-end-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -7116,7 +6969,6 @@ buckets {
     builders {
       name: "frontend-weekly"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -7162,7 +7014,6 @@ buckets {
     builders {
       name: "fuzz-linux"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -7207,7 +7058,6 @@ buckets {
     builders {
       name: "gclient"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -7252,7 +7102,6 @@ buckets {
     builders {
       name: "gclient-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -7297,7 +7146,6 @@ buckets {
     builders {
       name: "gclient-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -7342,7 +7190,6 @@ buckets {
     builders {
       name: "gclient-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -7387,7 +7234,6 @@ buckets {
     builders {
       name: "google"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -7433,7 +7279,6 @@ buckets {
     builders {
       name: "iso-stress-linux"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -7478,7 +7323,6 @@ buckets {
     builders {
       name: "pkg-linux-debug"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -7526,7 +7370,6 @@ buckets {
     builders {
       name: "pkg-linux-release"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -7577,7 +7420,6 @@ buckets {
     builders {
       name: "pkg-linux-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -7628,7 +7470,6 @@ buckets {
     builders {
       name: "pkg-linux-release-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -7679,7 +7520,6 @@ buckets {
     builders {
       name: "pkg-linux-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -7730,7 +7570,6 @@ buckets {
     builders {
       name: "pkg-mac-release"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -7785,7 +7624,6 @@ buckets {
     builders {
       name: "pkg-mac-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -7845,7 +7683,6 @@ buckets {
     builders {
       name: "pkg-mac-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -7900,7 +7737,6 @@ buckets {
     builders {
       name: "pkg-mac-release-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -7955,7 +7791,6 @@ buckets {
     builders {
       name: "pkg-mac-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -8010,7 +7845,6 @@ buckets {
     builders {
       name: "pkg-win-release"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -8062,7 +7896,6 @@ buckets {
     builders {
       name: "pkg-win-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -8114,7 +7947,6 @@ buckets {
     builders {
       name: "pkg-win-release-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -8166,7 +7998,6 @@ buckets {
     builders {
       name: "pkg-win-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -8218,7 +8049,6 @@ buckets {
     builders {
       name: "vm-canary-linux-debug"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -8263,7 +8093,6 @@ buckets {
     builders {
       name: "vm-canary-linux-debug-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -8308,7 +8137,6 @@ buckets {
     builders {
       name: "vm-canary-linux-debug-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -8353,7 +8181,6 @@ buckets {
     builders {
       name: "vm-canary-linux-debug-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -8398,7 +8225,6 @@ buckets {
     builders {
       name: "vm-ffi-android-debug-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -8443,7 +8269,6 @@ buckets {
     builders {
       name: "vm-ffi-android-debug-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -8488,7 +8313,6 @@ buckets {
     builders {
       name: "vm-ffi-android-debug-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -8533,7 +8357,6 @@ buckets {
     builders {
       name: "vm-ffi-android-debug-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -8578,7 +8401,6 @@ buckets {
     builders {
       name: "vm-ffi-android-debug-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -8623,7 +8445,6 @@ buckets {
     builders {
       name: "vm-ffi-android-debug-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -8668,7 +8489,6 @@ buckets {
     builders {
       name: "vm-ffi-android-debug-arm64c-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -8713,7 +8533,6 @@ buckets {
     builders {
       name: "vm-ffi-android-debug-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -8758,7 +8577,6 @@ buckets {
     builders {
       name: "vm-ffi-android-product-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -8803,7 +8621,6 @@ buckets {
     builders {
       name: "vm-ffi-android-product-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -8848,7 +8665,6 @@ buckets {
     builders {
       name: "vm-ffi-android-product-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -8893,7 +8709,6 @@ buckets {
     builders {
       name: "vm-ffi-android-product-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -8938,7 +8753,6 @@ buckets {
     builders {
       name: "vm-ffi-android-product-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -8983,7 +8797,6 @@ buckets {
     builders {
       name: "vm-ffi-android-product-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -9028,7 +8841,6 @@ buckets {
     builders {
       name: "vm-ffi-android-product-arm64c-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -9073,7 +8885,6 @@ buckets {
     builders {
       name: "vm-ffi-android-product-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -9118,7 +8929,6 @@ buckets {
     builders {
       name: "vm-ffi-android-release-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -9163,7 +8973,6 @@ buckets {
     builders {
       name: "vm-ffi-android-release-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -9208,7 +9017,6 @@ buckets {
     builders {
       name: "vm-ffi-android-release-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -9253,7 +9061,6 @@ buckets {
     builders {
       name: "vm-ffi-android-release-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -9298,7 +9105,6 @@ buckets {
     builders {
       name: "vm-ffi-android-release-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -9343,7 +9149,6 @@ buckets {
     builders {
       name: "vm-ffi-android-release-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -9388,7 +9193,6 @@ buckets {
     builders {
       name: "vm-ffi-android-release-arm64c-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -9433,7 +9237,6 @@ buckets {
     builders {
       name: "vm-ffi-android-release-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -9478,7 +9281,6 @@ buckets {
     builders {
       name: "vm-fuchsia-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -9524,7 +9326,6 @@ buckets {
     builders {
       name: "vm-kernel-asan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -9570,7 +9371,6 @@ buckets {
     builders {
       name: "vm-kernel-checked-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -9619,7 +9419,6 @@ buckets {
     builders {
       name: "vm-kernel-checked-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -9668,7 +9467,6 @@ buckets {
     builders {
       name: "vm-kernel-checked-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -9717,7 +9515,6 @@ buckets {
     builders {
       name: "vm-kernel-checked-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -9766,7 +9563,6 @@ buckets {
     builders {
       name: "vm-kernel-gcc-linux"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -9809,7 +9605,6 @@ buckets {
     builders {
       name: "vm-kernel-gcc-linux-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -9852,7 +9647,6 @@ buckets {
     builders {
       name: "vm-kernel-gcc-linux-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -9895,7 +9689,6 @@ buckets {
     builders {
       name: "vm-kernel-gcc-linux-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -9938,7 +9731,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -9983,7 +9775,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-debug-simriscv64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -10028,7 +9819,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -10073,7 +9863,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -10118,7 +9907,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -10163,7 +9951,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -10208,7 +9995,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -10253,7 +10039,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -10298,7 +10083,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -10343,7 +10127,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -10388,7 +10171,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-release-simarm-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -10433,7 +10215,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-release-simarm-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -10478,7 +10259,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -10523,7 +10303,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -10568,7 +10347,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -10613,7 +10391,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -10658,7 +10435,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -10703,7 +10479,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -10748,7 +10523,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -10793,7 +10567,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -10838,7 +10611,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -10883,7 +10655,6 @@ buckets {
     builders {
       name: "vm-kernel-mac-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -10935,7 +10706,6 @@ buckets {
     builders {
       name: "vm-kernel-mac-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -10987,7 +10757,6 @@ buckets {
     builders {
       name: "vm-kernel-mac-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -11039,7 +10808,6 @@ buckets {
     builders {
       name: "vm-kernel-mac-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -11091,7 +10859,6 @@ buckets {
     builders {
       name: "vm-kernel-mac-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -11143,7 +10910,6 @@ buckets {
     builders {
       name: "vm-kernel-mac-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -11198,7 +10964,6 @@ buckets {
     builders {
       name: "vm-kernel-mac-release-arm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -11253,7 +11018,6 @@ buckets {
     builders {
       name: "vm-kernel-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -11305,7 +11069,6 @@ buckets {
     builders {
       name: "vm-kernel-mac-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -11357,7 +11120,6 @@ buckets {
     builders {
       name: "vm-kernel-mac-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -11409,7 +11171,6 @@ buckets {
     builders {
       name: "vm-kernel-mac-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -11461,7 +11222,6 @@ buckets {
     builders {
       name: "vm-kernel-msan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -11507,7 +11267,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-linux-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -11553,7 +11312,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -11598,7 +11356,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -11643,7 +11400,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -11688,7 +11444,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -11733,7 +11488,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -11778,7 +11532,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -11823,7 +11576,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -11868,7 +11620,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -11913,7 +11664,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -11958,7 +11708,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -12003,7 +11752,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -12048,7 +11796,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-mac-debug-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -12104,7 +11851,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-mac-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -12157,7 +11903,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-mac-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -12212,7 +11957,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -12264,7 +12008,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-win-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -12310,7 +12053,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-win-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -12355,7 +12097,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -12400,7 +12141,6 @@ buckets {
     builders {
       name: "vm-kernel-optcounter-threshold-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -12445,7 +12185,6 @@ buckets {
     builders {
       name: "vm-kernel-optcounter-threshold-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -12491,7 +12230,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-android-release-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -12537,7 +12275,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-android-release-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -12583,7 +12320,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-android-release-arm64c-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -12629,7 +12365,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-android-release-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -12675,7 +12410,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-android-release-arm_x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -12721,7 +12455,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-android-release-arm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -12767,7 +12500,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-android-release-arm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -12813,7 +12545,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-android-release-arm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -12859,7 +12590,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-asan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -12905,7 +12635,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-dwarf-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -12950,7 +12679,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-debug-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -12996,7 +12724,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -13042,7 +12769,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -13088,7 +12814,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -13134,7 +12859,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-debug-simriscv64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -13179,7 +12903,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -13224,7 +12947,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -13269,7 +12991,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -13314,7 +13035,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -13359,7 +13079,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -13404,7 +13123,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -13449,7 +13167,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-product-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -13494,7 +13211,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-product-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -13539,7 +13255,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-product-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -13584,7 +13299,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -13629,7 +13343,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-release-simarm-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -13674,7 +13387,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-release-simarm-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -13719,7 +13431,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -13764,7 +13475,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -13809,7 +13519,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -13854,7 +13563,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -13899,7 +13607,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -13944,7 +13651,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-release-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -13989,7 +13695,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-release-simarm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -14034,7 +13739,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-release-simarm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -14079,7 +13783,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-release-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -14124,7 +13827,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -14169,7 +13871,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -14214,7 +13915,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -14259,7 +13959,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -14304,7 +14003,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-mac-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -14356,7 +14054,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-mac-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -14408,7 +14105,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-mac-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -14460,7 +14156,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-mac-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -14512,7 +14207,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-msan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -14558,7 +14252,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -14603,7 +14296,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-nnbd-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -14649,7 +14341,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -14694,7 +14385,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -14739,7 +14429,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -14784,7 +14473,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -14829,7 +14517,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -14874,7 +14561,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -14919,7 +14605,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-nnbd-mac-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -14975,7 +14660,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-nnbd-mac-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -15028,7 +14712,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-nnbd-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -15073,7 +14756,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-obfuscate-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -15118,7 +14800,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -15163,7 +14844,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -15208,7 +14888,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -15253,7 +14932,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-tsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -15299,7 +14977,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-ubsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -15343,7 +15020,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-win-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -15388,7 +15064,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -15433,7 +15108,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-win-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -15478,7 +15152,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-win-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -15523,7 +15196,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -15568,7 +15240,6 @@ buckets {
     builders {
       name: "vm-kernel-reload-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -15613,7 +15284,6 @@ buckets {
     builders {
       name: "vm-kernel-reload-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -15658,7 +15328,6 @@ buckets {
     builders {
       name: "vm-kernel-reload-rollback-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -15703,7 +15372,6 @@ buckets {
     builders {
       name: "vm-kernel-reload-rollback-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -15748,7 +15416,6 @@ buckets {
     builders {
       name: "vm-kernel-tsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -15794,7 +15461,6 @@ buckets {
     builders {
       name: "vm-kernel-ubsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -15838,7 +15504,6 @@ buckets {
     builders {
       name: "vm-kernel-win-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -15883,7 +15548,6 @@ buckets {
     builders {
       name: "vm-kernel-win-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -15928,7 +15592,6 @@ buckets {
     builders {
       name: "vm-kernel-win-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -15973,7 +15636,6 @@ buckets {
     builders {
       name: "vm-kernel-win-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -16018,7 +15680,6 @@ buckets {
     builders {
       name: "vm-kernel-win-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -16063,7 +15724,6 @@ buckets {
     builders {
       name: "vm-kernel-win-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -16108,7 +15768,6 @@ buckets {
     builders {
       name: "vm-kernel-win-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -16153,7 +15812,6 @@ buckets {
     builders {
       name: "vm-kernel-win-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -16198,7 +15856,6 @@ buckets {
     builders {
       name: "vm-kernel-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -16243,7 +15900,6 @@ buckets {
     builders {
       name: "vm-kernel-win-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -16288,7 +15944,6 @@ buckets {
     builders {
       name: "vm-kernel-win-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -16333,7 +15988,6 @@ buckets {
     builders {
       name: "vm-kernel-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -16378,7 +16032,6 @@ buckets {
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -16423,7 +16076,6 @@ buckets {
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -16468,7 +16120,6 @@ buckets {
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -16513,7 +16164,6 @@ buckets {
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:experimental"
       dimensions: "os:Linux"
@@ -16558,7 +16208,6 @@ buckets {
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -16603,7 +16252,6 @@ buckets {
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-riscv64"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -16648,7 +16296,6 @@ buckets {
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -16693,7 +16340,6 @@ buckets {
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -16738,7 +16384,6 @@ buckets {
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -16803,7 +16448,6 @@ buckets {
     builders {
       name: "analyzer-analysis-server-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -16848,7 +16492,6 @@ buckets {
     builders {
       name: "analyzer-linux-release-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -16893,7 +16536,6 @@ buckets {
     builders {
       name: "analyzer-mac-release-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -16945,7 +16587,6 @@ buckets {
     builders {
       name: "analyzer-nnbd-linux-release-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -16990,7 +16631,6 @@ buckets {
     builders {
       name: "analyzer-nnbd-mac-release-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -17042,7 +16682,6 @@ buckets {
     builders {
       name: "analyzer-nnbd-win-release-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -17087,7 +16726,6 @@ buckets {
     builders {
       name: "analyzer-win-release-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -17136,7 +16774,6 @@ buckets {
     builders {
       name: "app-kernel-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -17182,7 +16819,6 @@ buckets {
     builders {
       name: "app-kernel-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -17227,7 +16863,6 @@ buckets {
     builders {
       name: "app-kernel-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -17272,7 +16907,6 @@ buckets {
     builders {
       name: "benchmark-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -17320,7 +16954,6 @@ buckets {
     builders {
       name: "dart-sdk-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -17369,7 +17002,6 @@ buckets {
     builders {
       name: "dart-sdk-mac-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -17424,7 +17056,6 @@ buckets {
     builders {
       name: "dart-sdk-mac-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -17476,7 +17107,6 @@ buckets {
     builders {
       name: "dart-sdk-win-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -17521,7 +17151,6 @@ buckets {
     builders {
       name: "dart2js-canary-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -17570,7 +17199,6 @@ buckets {
     builders {
       name: "dart2js-csp-minified-linux-x64-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -17619,7 +17247,6 @@ buckets {
     builders {
       name: "dart2js-minified-strong-linux-x64-d8-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -17667,7 +17294,6 @@ buckets {
     builders {
       name: "dart2js-nnbd-linux-x64-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -17716,7 +17342,6 @@ buckets {
     builders {
       name: "dart2js-strong-hostasserts-linux-ia32-d8-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -17764,7 +17389,6 @@ buckets {
     builders {
       name: "dart2js-strong-linux-x64-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -17813,7 +17437,6 @@ buckets {
     builders {
       name: "dart2js-strong-linux-x64-firefox-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -17862,7 +17485,6 @@ buckets {
     builders {
       name: "dart2js-strong-mac-x64-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -17918,7 +17540,6 @@ buckets {
     builders {
       name: "dart2js-strong-mac-x64-safari-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -17973,7 +17594,6 @@ buckets {
     builders {
       name: "dart2js-strong-win-x64-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -18022,7 +17642,6 @@ buckets {
     builders {
       name: "dart2js-unit-linux-x64-release-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -18070,7 +17689,6 @@ buckets {
     builders {
       name: "ddc-linux-release-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -18118,7 +17736,6 @@ buckets {
     builders {
       name: "ddc-mac-release-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -18173,7 +17790,6 @@ buckets {
     builders {
       name: "ddc-nnbd-linux-release-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -18221,7 +17837,6 @@ buckets {
     builders {
       name: "ddc-win-release-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -18269,7 +17884,6 @@ buckets {
     builders {
       name: "ddk-linux-release-firefox-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -18317,7 +17931,6 @@ buckets {
     builders {
       name: "flutter-analyze-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -18363,7 +17976,6 @@ buckets {
     builders {
       name: "flutter-engine-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -18417,7 +18029,6 @@ buckets {
     builders {
       name: "flutter-engine-linux-web_tests-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -18468,7 +18079,6 @@ buckets {
     builders {
       name: "flutter-frontend-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -18513,7 +18123,6 @@ buckets {
     builders {
       name: "front-end-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -18558,7 +18167,6 @@ buckets {
     builders {
       name: "front-end-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -18610,7 +18218,6 @@ buckets {
     builders {
       name: "front-end-nnbd-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -18655,7 +18262,6 @@ buckets {
     builders {
       name: "front-end-nnbd-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -18707,7 +18313,6 @@ buckets {
     builders {
       name: "front-end-nnbd-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -18752,7 +18357,6 @@ buckets {
     builders {
       name: "front-end-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -18797,7 +18401,6 @@ buckets {
     builders {
       name: "gclient-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -18842,7 +18445,6 @@ buckets {
     builders {
       name: "pkg-linux-debug-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -18890,7 +18492,6 @@ buckets {
     builders {
       name: "pkg-linux-release-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -18941,7 +18542,6 @@ buckets {
     builders {
       name: "pkg-mac-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -19001,7 +18601,6 @@ buckets {
     builders {
       name: "pkg-mac-release-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -19056,7 +18655,6 @@ buckets {
     builders {
       name: "pkg-win-release-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -19108,7 +18706,6 @@ buckets {
     builders {
       name: "vm-canary-linux-debug-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -19153,7 +18750,6 @@ buckets {
     builders {
       name: "vm-ffi-android-debug-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -19198,7 +18794,6 @@ buckets {
     builders {
       name: "vm-ffi-android-debug-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -19243,7 +18838,6 @@ buckets {
     builders {
       name: "vm-ffi-android-product-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -19288,7 +18882,6 @@ buckets {
     builders {
       name: "vm-ffi-android-product-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -19333,7 +18926,6 @@ buckets {
     builders {
       name: "vm-ffi-android-release-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -19378,7 +18970,6 @@ buckets {
     builders {
       name: "vm-ffi-android-release-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -19423,7 +19014,6 @@ buckets {
     builders {
       name: "vm-fuchsia-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -19468,7 +19058,6 @@ buckets {
     builders {
       name: "vm-kernel-asan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -19514,7 +19103,6 @@ buckets {
     builders {
       name: "vm-kernel-checked-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -19563,7 +19151,6 @@ buckets {
     builders {
       name: "vm-kernel-gcc-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -19606,7 +19193,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -19651,7 +19237,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-debug-simriscv64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -19696,7 +19281,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -19741,7 +19325,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -19786,7 +19369,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -19831,7 +19413,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -19876,7 +19457,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-release-simarm-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -19921,7 +19501,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -19966,7 +19545,6 @@ buckets {
     builders {
       name: "vm-kernel-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -20011,7 +19589,6 @@ buckets {
     builders {
       name: "vm-kernel-mac-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -20063,7 +19640,6 @@ buckets {
     builders {
       name: "vm-kernel-mac-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -20115,7 +19691,6 @@ buckets {
     builders {
       name: "vm-kernel-mac-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -20170,7 +19745,6 @@ buckets {
     builders {
       name: "vm-kernel-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -20222,7 +19796,6 @@ buckets {
     builders {
       name: "vm-kernel-msan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -20268,7 +19841,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-linux-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -20314,7 +19886,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -20359,7 +19930,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -20404,7 +19974,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-linux-release-simarm-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -20449,7 +20018,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -20494,7 +20062,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -20539,7 +20106,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-mac-debug-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -20595,7 +20161,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-mac-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -20648,7 +20213,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-mac-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -20703,7 +20267,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -20755,7 +20318,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-win-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -20801,7 +20363,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-win-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -20846,7 +20407,6 @@ buckets {
     builders {
       name: "vm-kernel-nnbd-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -20891,7 +20451,6 @@ buckets {
     builders {
       name: "vm-kernel-optcounter-threshold-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -20936,7 +20495,6 @@ buckets {
     builders {
       name: "vm-kernel-optcounter-threshold-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -20981,7 +20539,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-android-release-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -21027,7 +20584,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-android-release-arm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -21073,7 +20629,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-asan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -21119,7 +20674,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-dwarf-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -21164,7 +20718,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-debug-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -21210,7 +20763,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-debug-simriscv64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -21255,7 +20807,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -21300,7 +20851,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -21345,7 +20895,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -21390,7 +20939,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-release-simarm-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -21435,7 +20983,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -21480,7 +21027,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-release-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -21525,7 +21071,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -21570,7 +21115,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-mac-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -21622,7 +21166,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-msan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -21668,7 +21211,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -21713,7 +21255,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-nnbd-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -21759,7 +21300,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -21804,7 +21344,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -21849,7 +21388,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -21894,7 +21432,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-nnbd-mac-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -21950,7 +21487,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-nnbd-mac-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -22003,7 +21539,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-nnbd-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -22048,7 +21583,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-obfuscate-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -22093,7 +21627,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-tsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -22139,7 +21672,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-ubsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -22183,7 +21715,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-win-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -22228,7 +21759,6 @@ buckets {
     builders {
       name: "vm-kernel-precomp-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -22273,7 +21803,6 @@ buckets {
     builders {
       name: "vm-kernel-reload-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -22318,7 +21847,6 @@ buckets {
     builders {
       name: "vm-kernel-reload-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -22363,7 +21891,6 @@ buckets {
     builders {
       name: "vm-kernel-reload-rollback-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -22408,7 +21935,6 @@ buckets {
     builders {
       name: "vm-kernel-reload-rollback-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -22453,7 +21979,6 @@ buckets {
     builders {
       name: "vm-kernel-tsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -22499,7 +22024,6 @@ buckets {
     builders {
       name: "vm-kernel-ubsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -22543,7 +22067,6 @@ buckets {
     builders {
       name: "vm-kernel-win-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -22588,7 +22111,6 @@ buckets {
     builders {
       name: "vm-kernel-win-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -22633,7 +22155,6 @@ buckets {
     builders {
       name: "vm-kernel-win-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -22678,7 +22199,6 @@ buckets {
     builders {
       name: "vm-kernel-win-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -22723,7 +22243,6 @@ buckets {
     builders {
       name: "vm-kernel-win-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -22768,7 +22287,6 @@ buckets {
     builders {
       name: "vm-kernel-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Windows"
@@ -22813,7 +22331,6 @@ buckets {
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -22858,7 +22375,6 @@ buckets {
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-riscv64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
@@ -22923,7 +22439,6 @@ buckets {
     builders {
       name: "presubmit-try"
       swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Linux"
diff --git a/lib/dart.star b/lib/dart.star
index f8ae68005fd4..65bd7d5b2685 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -114,7 +114,6 @@ def _try_builder(
         priority = priority.high,
         properties = builder_properties,
         service_account = accounts.try_builder,
-        swarming_tags = ["vpython:native-python-wrapper"],
     )
     includable_only = (not on_cq and not experiment_percentage and
                        not location_regexp)
@@ -245,7 +244,6 @@ def _builder(
                 notifies = notifies if enabled else None,
                 schedule = schedule if enabled else None,
                 service_account = service_account,
-                swarming_tags = ["vpython:native-python-wrapper"],
                 triggered_by = triggered_by if enabled else None,
                 triggering_policy = triggering_policy,
             )

From 827520d14251db7257b72a21cb626813c62fbb26 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 10 Feb 2022 08:58:13 +0000
Subject: [PATCH 527/826] [infra] Remove old config files

Change-Id: If3897ad2d2111ce3b52f9971eb44242cfd065ebe
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/232263
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 commit-queue.cfg                             |   781 -
 cr-buildbucket.cfg                           | 22970 -----------------
 luci-logdog.cfg                              |     9 -
 luci-milo.cfg                                |  3110 ---
 luci-notify.cfg                              |  1705 --
 luci-notify/email-templates/common.template  |    24 -
 luci-notify/email-templates/default.template |    32 -
 luci-scheduler.cfg                           |  4411 ----
 project.cfg                                  |    14 -
 realms.cfg                                   |   147 -
 10 files changed, 33203 deletions(-)
 delete mode 100644 commit-queue.cfg
 delete mode 100644 cr-buildbucket.cfg
 delete mode 100644 luci-logdog.cfg
 delete mode 100644 luci-milo.cfg
 delete mode 100644 luci-notify.cfg
 delete mode 100644 luci-notify/email-templates/common.template
 delete mode 100644 luci-notify/email-templates/default.template
 delete mode 100644 luci-scheduler.cfg
 delete mode 100644 project.cfg
 delete mode 100644 realms.cfg

diff --git a/commit-queue.cfg b/commit-queue.cfg
deleted file mode 100644
index 2d40cb728cdd..000000000000
--- a/commit-queue.cfg
+++ /dev/null
@@ -1,781 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-#
-# For the schema of this file, see Config message:
-#   https://luci-config.appspot.com/schemas/projects:commit-queue.cfg
-
-cq_status_host: "chromium-cq-status.appspot.com"
-submit_options {
-  max_burst: 2
-  burst_delay {
-    seconds: 480
-  }
-}
-config_groups {
-  name: "dart_ci"
-  gerrit {
-    url: "https://dart-review.googlesource.com"
-    projects {
-      name: "dart_ci"
-      ref_regexp: "refs/heads/main"
-    }
-  }
-  verifiers {
-    gerrit_cq_ability {
-      committer_list: "project-dart-committers"
-      dry_run_access_list: "project-dart-tryjob-access"
-      allow_submit_with_open_deps: true
-    }
-    tree_status {
-      url: "https://dart-status.appspot.com"
-    }
-  }
-}
-config_groups {
-  name: "recipes"
-  gerrit {
-    url: "https://dart-review.googlesource.com"
-    projects {
-      name: "recipes"
-      ref_regexp: "refs/heads/main"
-    }
-  }
-  verifiers {
-    gerrit_cq_ability {
-      committer_list: "project-dart-committers"
-      dry_run_access_list: "project-dart-tryjob-access"
-      allow_submit_with_open_deps: true
-    }
-    tree_status {
-      url: "https://dart-status.appspot.com"
-    }
-    tryjob {
-      builders {
-        name: "dart/try.shared/presubmit-try"
-        disable_reuse: true
-      }
-      retry_config {}
-    }
-  }
-}
-config_groups {
-  name: "sdk"
-  gerrit {
-    url: "https://dart-review.googlesource.com"
-    projects {
-      name: "sdk"
-      ref_regexp: "refs/heads/main"
-      ref_regexp: "refs/heads/beta"
-      ref_regexp: "refs/heads/dev"
-      ref_regexp: "refs/heads/stable"
-    }
-  }
-  verifiers {
-    gerrit_cq_ability {
-      committer_list: "project-dart-committers"
-      dry_run_access_list: "project-dart-tryjob-access"
-      allow_submit_with_open_deps: true
-    }
-    tree_status {
-      url: "https://dart-status.appspot.com"
-    }
-    tryjob {
-      builders {
-        name: "dart/try.shared/presubmit-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/analyzer-analysis-server-linux-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/.+"
-      }
-      builders {
-        name: "dart/try/analyzer-linux-release-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/.+"
-      }
-      builders {
-        name: "dart/try/analyzer-mac-release-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/analyzer-nnbd-linux-release-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(analyzer|analyzer_cli|_fe_analyzer_shared)/.+"
-      }
-      builders {
-        name: "dart/try/analyzer-nnbd-mac-release-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/analyzer-nnbd-win-release-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/analyzer-win-release-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/app-kernel-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/app-kernel-linux-product-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/app-kernel-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/benchmark-linux-try"
-      }
-      builders {
-        name: "dart/try/dart-sdk-linux-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart-sdk-mac-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart-sdk-mac-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart-sdk-win-try"
-      }
-      builders {
-        name: "dart/try/dart2js-canary-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-csp-minified-linux-x64-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-minified-strong-linux-x64-d8-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
-        location_regexp: ".+/[+]/utils/compiler/.+"
-        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
-      }
-      builders {
-        name: "dart/try/dart2js-nnbd-linux-x64-chrome-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
-        location_regexp: ".+/[+]/utils/compiler/.+"
-        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
-      }
-      builders {
-        name: "dart/try/dart2js-strong-hostasserts-linux-ia32-d8-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
-        location_regexp: ".+/[+]/utils/compiler/.+"
-        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
-      }
-      builders {
-        name: "dart/try/dart2js-strong-linux-x64-chrome-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
-        location_regexp: ".+/[+]/utils/compiler/.+"
-        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
-      }
-      builders {
-        name: "dart/try/dart2js-strong-linux-x64-firefox-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-strong-mac-x64-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-strong-mac-x64-safari-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-strong-win-x64-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-unit-linux-x64-release-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
-        location_regexp: ".+/[+]/utils/compiler/.+"
-        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
-      }
-      builders {
-        name: "dart/try/ddc-linux-release-chrome-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        location_regexp: ".+/[+]/pkg/(build_integration|dev_compiler|meta)/.+"
-        location_regexp: ".+/[+]/utils/dartdevc/.+"
-        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
-      }
-      builders {
-        name: "dart/try/ddc-mac-release-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/ddc-nnbd-linux-release-chrome-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        location_regexp: ".+/[+]/pkg/(build_integration|dev_compiler|meta)/.+"
-        location_regexp: ".+/[+]/utils/dartdevc/.+"
-        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
-      }
-      builders {
-        name: "dart/try/ddc-win-release-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/ddk-linux-release-firefox-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/flutter-analyze-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/flutter-engine-linux-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/flutter-engine-linux-web_tests-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/flutter-frontend-try"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-      }
-      builders {
-        name: "dart/try/front-end-linux-release-x64-try"
-      }
-      builders {
-        name: "dart/try/front-end-mac-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/front-end-nnbd-linux-release-x64-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-      }
-      builders {
-        name: "dart/try/front-end-nnbd-mac-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/front-end-nnbd-win-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/front-end-win-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/gclient-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/pkg-linux-debug-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/pkg-linux-release-try"
-      }
-      builders {
-        name: "dart/try/pkg-mac-release-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/pkg-mac-release-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/pkg-win-release-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-canary-linux-debug-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        location_regexp: ".+/[+]/pkg/vm/.+"
-        location_regexp: ".+/[+]/runtime/.+"
-      }
-      builders {
-        name: "dart/try/vm-ffi-android-debug-arm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-ffi-android-debug-arm64c-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-ffi-android-product-arm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-ffi-android-product-arm64c-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-ffi-android-release-arm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-ffi-android-release-arm64c-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-fuchsia-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-asan-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-checked-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-gcc-linux-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-linux-debug-ia32-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-linux-debug-simriscv64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-linux-debug-x64c-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-linux-product-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-linux-release-ia32-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-linux-release-simarm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-linux-release-simarm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-linux-release-x64-try"
-      }
-      builders {
-        name: "dart/try/vm-kernel-mac-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-mac-product-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-mac-release-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-mac-release-x64-try"
-        experiment_percentage: 5
-      }
-      builders {
-        name: "dart/try/vm-kernel-msan-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-linux-debug-ia32-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-linux-debug-x64-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        location_regexp: ".+/[+]/pkg/vm/.+"
-        location_regexp: ".+/[+]/runtime/.+"
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-linux-release-ia32-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-linux-release-simarm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-linux-release-simarm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-linux-release-x64-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        location_regexp: ".+/[+]/pkg/vm/.+"
-        location_regexp: ".+/[+]/runtime/.+"
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-mac-debug-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-mac-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-mac-release-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-mac-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-win-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-win-release-ia32-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-win-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-optcounter-threshold-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-android-release-arm64c-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-android-release-arm_x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-asan-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-dwarf-linux-product-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-simarm_x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-simriscv64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-x64c-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-product-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm_x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-mac-release-simarm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-msan-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-tsan-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-ubsan-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-win-debug-x64c-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-win-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-reload-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-reload-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-reload-rollback-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-reload-rollback-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-tsan-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-ubsan-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-win-debug-ia32-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-win-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-win-debug-x64c-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-win-product-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-win-release-ia32-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-win-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-precomp-ffi-qemu-linux-release-arm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
-        includable_only: true
-      }
-      retry_config {}
-    }
-  }
-}
-config_groups {
-  name: "sdk-infra-config"
-  gerrit {
-    url: "https://dart-review.googlesource.com"
-    projects {
-      name: "sdk"
-      ref_regexp: "refs/heads/infra/config"
-    }
-  }
-  verifiers {
-    gerrit_cq_ability {
-      committer_list: "project-dart-committers"
-      dry_run_access_list: "project-dart-tryjob-access"
-      allow_submit_with_open_deps: true
-    }
-    tree_status {
-      url: "https://dart-status.appspot.com"
-    }
-    tryjob {
-      builders {
-        name: "dart/try.shared/presubmit-try"
-        disable_reuse: true
-      }
-      retry_config {}
-    }
-  }
-}
diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
deleted file mode 100644
index d2434ed3ac0c..000000000000
--- a/cr-buildbucket.cfg
+++ /dev/null
@@ -1,22970 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-#
-# For the schema of this file, see BuildbucketCfg message:
-#   https://luci-config.appspot.com/schemas/projects:buildbucket.cfg
-
-buckets {
-  name: "ci"
-  acls {
-    group: "all"
-  }
-  acls {
-    role: SCHEDULER
-    identity: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-  }
-  acls {
-    role: SCHEDULER
-    group: "project-dart-admins"
-  }
-  swarming {
-    builders {
-      name: "base"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/forward_branch"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 900
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "cbuild"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/cbuild"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 600
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "chocolatey"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/chocolatey"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "co19-roller"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/package_co19"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-ci-scripts-linux"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/package_dart_ci"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-ci-scripts-mac"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/package_dart_ci"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-ci-scripts-mac-arm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/package_dart_ci"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-ci-scripts-win"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/package_dart_ci"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-linux-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true,'
-        '    "timeout": 6000'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-linux-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true,'
-        '    "timeout": 6000'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-linux-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true,'
-        '    "timeout": 6000'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-mac-arm64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-mac-arm64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-mac-arm64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-mac-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-mac-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-mac-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-win-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-win-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-win-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "debianpackage-linux"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "debianpackage-linux-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "debianpackage-linux-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "debianpackage-linux-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "flutter-engine-ios"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "flutter/engine"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 7200
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "linearize-flutter"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/linearize",'
-        '  "repo": "https://dart.googlesource.com/linear_sdk_flutter_engine.git"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "recipe-bundler"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
-        cipd_version: "git_revision:21e1e6473db300eb5045e4483e8b53d1324cd0d8"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "package_name_internal_prefix": "dart_internal/recipe_bundles",'
-        '  "package_name_prefix": "dart/recipe_bundles",'
-        '  "recipe": "recipe_bundler",'
-        '  "recipe_bundler_vers": "git_revision:bc0c2fb9082bc82a2d972b5cca8fc17afa55d34e",'
-        '  "repo_specs": ['
-        '    "dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/main"'
-        '  ]'
-        '}'
-      priority: 50
-      execution_timeout_secs: 300
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "recipe-deps-roller"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
-        cipd_version: "git_revision:21e1e6473db300eb5045e4483e8b53d1324cd0d8"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "db_gcs_bucket": "dart-recipe-roller-db",'
-        '  "projects": ['
-        '    ['
-        '      "dart",'
-        '      "https://dart.googlesource.com/recipes"'
-        '    ]'
-        '  ],'
-        '  "recipe": "recipe_autoroller"'
-        '}'
-      priority: 70
-      execution_timeout_secs: 1200
-      expiration_secs: 86400
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-  }
-}
-buckets {
-  name: "ci.roll"
-  acls {
-    group: "all"
-  }
-  acls {
-    role: SCHEDULER
-    identity: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-  }
-  acls {
-    role: SCHEDULER
-    group: "project-dart-admins"
-  }
-  acls {
-    role: SCHEDULER
-    group: "project-dart-roller-owners"
-  }
-  swarming {
-    builders {
-      name: "roll-to-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "from_ref": "refs/heads/lkgr",'
-        '  "recipe": "roller/roll_to_dev"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 900
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-  }
-}
-buckets {
-  name: "ci.sandbox"
-  acls {
-    group: "all"
-  }
-  acls {
-    role: SCHEDULER
-    identity: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-  }
-  acls {
-    role: SCHEDULER
-    identity: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-  }
-  acls {
-    role: SCHEDULER
-    group: "project-dart-admins"
-  }
-  swarming {
-    builders {
-      name: "analyzer-analysis-server-linux"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-analysis-server-linux-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-analysis-server-linux-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-analysis-server-linux-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-linux-release"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-linux-release-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-linux-release-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-linux-release-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-mac-release"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-mac-release-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-mac-release-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-mac-release-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-nnbd-linux-release"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-nnbd-linux-release-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-nnbd-linux-release-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-nnbd-linux-release-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-nnbd-mac-release"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-nnbd-win-release"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-win-release"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-win-release-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-win-release-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-win-release-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "app-kernel-linux-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "app-kernel-linux-debug-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "app-kernel-linux-debug-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "app-kernel-linux-debug-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "app-kernel-linux-product-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "app-kernel-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "app-kernel-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "app-kernel-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "app-kernel-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "ci-test-data"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "cross-vm-linux-release-arm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 7200'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "cross-vm-precomp-linux-release-arm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-canary-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-canary-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-canary-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-canary-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-csp-minified-linux-x64-chrome"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-csp-minified-linux-x64-chrome-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-csp-minified-linux-x64-chrome-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-csp-minified-linux-x64-chrome-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-minified-strong-linux-x64-d8"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-minified-strong-linux-x64-d8-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-minified-strong-linux-x64-d8-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-minified-strong-linux-x64-d8-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-nnbd-linux-x64-chrome"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-nnbd-linux-x64-chrome-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-nnbd-linux-x64-chrome-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-nnbd-linux-x64-chrome-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-hostasserts-linux-ia32-d8"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-linux-x64-chrome"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-linux-x64-chrome-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-linux-x64-chrome-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-linux-x64-chrome-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-linux-x64-firefox"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_firefox": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-linux-x64-firefox-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_firefox": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-linux-x64-firefox-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_firefox": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-linux-x64-firefox-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_firefox": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-mac-x64-chrome"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-mac-x64-chrome-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-mac-x64-chrome-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-mac-x64-chrome-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-mac-x64-safari"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-mac-x64-safari-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-mac-x64-safari-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-mac-x64-safari-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-win-x64-chrome"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-win-x64-chrome-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-win-x64-chrome-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-win-x64-chrome-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-win-x64-firefox"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_firefox": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-unit-linux-x64-release"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-unit-linux-x64-release-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-unit-linux-x64-release-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-unit-linux-x64-release-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "ddc-linux-release-chrome"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "ddc-linux-release-chrome-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "ddc-linux-release-chrome-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "ddc-linux-release-chrome-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "ddc-mac-release-chrome"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "ddc-mac-release-chrome-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "ddc-mac-release-chrome-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "ddc-mac-release-chrome-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "ddc-nnbd-linux-release-chrome"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "ddc-win-release-chrome"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "ddc-win-release-chrome-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "ddc-win-release-chrome-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "ddc-win-release-chrome-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "ddk-linux-release-firefox"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_firefox": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "ddk-linux-release-firefox-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_firefox": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "ddk-linux-release-firefox-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_firefox": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "ddk-linux-release-firefox-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_firefox": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "flutter-analyze"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 2700
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "flutter-engine-linux"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "flutter_test_suites": ['
-        '    "add_to_app_life_cycle_tests",'
-        '    "flutter_plugins",'
-        '    "framework_coverage",'
-        '    "framework_tests",'
-        '    "tool_tests"'
-        '  ],'
-        '  "recipe": "dart/flutter_engine"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 28800
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "flutter-engine-linux-web_tests"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "flutter_test_suites": ['
-        '    "web_tests",'
-        '    "web_tool_tests"'
-        '  ],'
-        '  "recipe": "dart/flutter_engine"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 28800
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "flutter-frontend"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-mac-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-mac-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-mac-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-mac-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-nnbd-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-nnbd-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-nnbd-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-nnbd-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-nnbd-mac-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-nnbd-win-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-win-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-win-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-win-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-win-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "frontend-weekly"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      execution_timeout_secs: 43200
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "fuzz-linux"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "gclient"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/gclient"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "gclient-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/gclient"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "gclient-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/gclient"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "gclient-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/gclient"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "google"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/external"'
-        '}'
-      priority: 30
-      execution_timeout_secs: 300
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "iso-stress-linux"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-linux-debug"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-linux-release"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-linux-release-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-linux-release-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-linux-release-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-mac-release"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-mac-release-arm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-mac-release-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-mac-release-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-mac-release-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-win-release"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-win-release-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-win-release-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-win-release-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-canary-linux-debug"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-canary-linux-debug-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-canary-linux-debug-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-canary-linux-debug-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-debug-arm"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-debug-arm-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-debug-arm-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-debug-arm-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-debug-arm64c"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-debug-arm64c-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-debug-arm64c-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-debug-arm64c-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-product-arm"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-product-arm-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-product-arm-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-product-arm-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-product-arm64c"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-product-arm64c-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-product-arm64c-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-product-arm64c-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-release-arm"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-release-arm-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-release-arm-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-release-arm-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-release-arm64c"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-release-arm64c-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-release-arm64c-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-release-arm64c-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-fuchsia-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      expiration_secs: 86400
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-asan-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-checked-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-checked-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-checked-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-checked-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-gcc-linux"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-gcc-linux-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-gcc-linux-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-gcc-linux-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-debug-ia32"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-debug-simriscv64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-debug-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-debug-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-debug-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-debug-x64c"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-product-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-release-ia32"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-release-simarm"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-release-simarm-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-release-simarm-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-release-simarm-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-release-simarm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-release-simarm64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-release-simarm64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-release-simarm64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-mac-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-mac-debug-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-mac-debug-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-mac-debug-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-mac-product-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-mac-release-arm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-mac-release-arm64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-mac-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-mac-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-mac-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-mac-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-msan-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-linux-debug-ia32"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-linux-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-linux-debug-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-linux-debug-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-linux-debug-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-linux-release-ia32"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-linux-release-simarm"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-linux-release-simarm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-mac-debug-arm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-mac-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-mac-release-arm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-mac-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-win-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-win-release-ia32"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-win-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-optcounter-threshold-linux-release-ia32"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-optcounter-threshold-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      expiration_secs: 86400
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-android-release-arm64c"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-android-release-arm64c-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-android-release-arm64c-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-android-release-arm64c-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-android-release-arm_x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-android-release-arm_x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-android-release-arm_x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-android-release-arm_x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-asan-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-dwarf-linux-product-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-debug-simarm_x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-debug-simriscv64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-debug-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-debug-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-debug-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-debug-x64c"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-product-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-product-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-product-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-product-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-release-simarm"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-release-simarm-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-release-simarm-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-release-simarm-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-release-simarm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-release-simarm64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-release-simarm64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-release-simarm64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-release-simarm_x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-release-simarm_x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-release-simarm_x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-release-simarm_x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-mac-release-simarm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-mac-release-simarm64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-mac-release-simarm64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-mac-release-simarm64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-msan-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-nnbd-mac-release-arm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-nnbd-mac-release-simarm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-nnbd-win-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-tsan-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-ubsan-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-win-debug-x64c"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-win-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-win-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-win-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-win-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-reload-linux-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-reload-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-reload-rollback-linux-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-reload-rollback-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-tsan-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-ubsan-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-win-debug-ia32"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-win-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-win-debug-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-win-debug-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-win-debug-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-win-debug-x64c"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-win-product-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-win-release-ia32"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-win-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-win-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-win-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-win-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:experimental"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-  }
-}
-buckets {
-  name: "try"
-  acls {
-    group: "all"
-  }
-  acls {
-    role: SCHEDULER
-    group: "project-dart-admins"
-  }
-  acls {
-    role: SCHEDULER
-    group: "project-dart-tryjob-access"
-  }
-  acls {
-    role: SCHEDULER
-    group: "service-account-cq"
-  }
-  swarming {
-    builders {
-      name: "analyzer-analysis-server-linux-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-linux-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-mac-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-nnbd-linux-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-nnbd-mac-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-nnbd-win-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-win-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "app-kernel-linux-debug-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "app-kernel-linux-product-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "app-kernel-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "benchmark-linux-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "checkout_javascript_engines": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-linux-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$dart/build": {'
-        '    "disable_goma": true,'
-        '    "timeout": 6000'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-mac-arm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-mac-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-win-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-canary-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-csp-minified-linux-x64-chrome-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-minified-strong-linux-x64-d8-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-nnbd-linux-x64-chrome-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-hostasserts-linux-ia32-d8-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-linux-x64-chrome-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-linux-x64-firefox-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_firefox": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-mac-x64-chrome-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-mac-x64-safari-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-win-x64-chrome-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-unit-linux-x64-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "ddc-linux-release-chrome-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "ddc-mac-release-chrome-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "ddc-nnbd-linux-release-chrome-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "ddc-win-release-chrome-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "ddk-linux-release-firefox-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_firefox": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "flutter-analyze-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      execution_timeout_secs: 2700
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "flutter-engine-linux-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "flutter_test_suites": ['
-        '    "add_to_app_life_cycle_tests",'
-        '    "flutter_plugins",'
-        '    "framework_coverage",'
-        '    "framework_tests",'
-        '    "tool_tests"'
-        '  ],'
-        '  "recipe": "dart/flutter_engine"'
-        '}'
-      priority: 30
-      execution_timeout_secs: 28800
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "flutter-engine-linux-web_tests-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "flutter_test_suites": ['
-        '    "web_tests",'
-        '    "web_tool_tests"'
-        '  ],'
-        '  "recipe": "dart/flutter_engine"'
-        '}'
-      priority: 30
-      execution_timeout_secs: 28800
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "flutter-frontend-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-mac-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-nnbd-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-nnbd-mac-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-nnbd-win-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-win-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "gclient-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/gclient"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-linux-debug-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-linux-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-mac-release-arm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-mac-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-win-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-canary-linux-debug-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-debug-arm-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-debug-arm64c-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-product-arm-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-product-arm64c-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-release-arm-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ffi-android-release-arm64c-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-fuchsia-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-asan-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-checked-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-gcc-linux-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-debug-ia32-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-debug-simriscv64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-debug-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-debug-x64c-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-product-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-release-ia32-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-release-simarm-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-release-simarm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-mac-debug-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-mac-product-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-mac-release-arm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-mac-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-msan-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-linux-debug-ia32-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-linux-debug-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-linux-release-ia32-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-linux-release-simarm-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-linux-release-simarm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-mac-debug-arm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-mac-debug-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-mac-release-arm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-mac-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-win-debug-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-win-release-ia32-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-nnbd-win-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-optcounter-threshold-linux-release-ia32-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-optcounter-threshold-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-android-release-arm64c-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-android-release-arm_x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-asan-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-dwarf-linux-product-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-debug-simarm_x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-debug-simriscv64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-debug-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-debug-x64c-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-product-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-release-simarm-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-release-simarm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-release-simarm_x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-mac-release-simarm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-msan-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-nnbd-mac-release-arm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-nnbd-mac-release-simarm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-nnbd-win-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-tsan-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-ubsan-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-win-debug-x64c-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-win-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-reload-linux-debug-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-reload-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-reload-rollback-linux-debug-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-reload-rollback-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-tsan-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-ubsan-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-win-debug-ia32-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-win-debug-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-win-debug-x64c-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-win-product-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-win-release-ia32-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-win-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-  }
-}
-buckets {
-  name: "try.shared"
-  acls {
-    group: "all"
-  }
-  acls {
-    role: SCHEDULER
-    group: "project-dart-admins"
-  }
-  acls {
-    role: SCHEDULER
-    group: "project-dart-tryjob-access"
-  }
-  acls {
-    role: SCHEDULER
-    group: "service-account-cq"
-  }
-  swarming {
-    builders {
-      name: "presubmit-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "presubmit/presubmit"'
-        '}'
-      priority: 30
-      execution_timeout_secs: 600
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-    }
-  }
-}
diff --git a/luci-logdog.cfg b/luci-logdog.cfg
deleted file mode 100644
index adc75bef4980..000000000000
--- a/luci-logdog.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-#
-# For the schema of this file, see ProjectConfig message:
-#   https://luci-config.appspot.com/schemas/projects:luci-logdog.cfg
-
-reader_auth_groups: "all"
-writer_auth_groups: "luci-logdog-chromium-writers"
-archive_gs_bucket: "chromium-luci-logdog"
diff --git a/luci-milo.cfg b/luci-milo.cfg
deleted file mode 100644
index f28a66e1dc47..000000000000
--- a/luci-milo.cfg
+++ /dev/null
@@ -1,3110 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-#
-# For the schema of this file, see Project message:
-#   https://luci-config.appspot.com/schemas/projects:luci-milo.cfg
-
-consoles {
-  id: "cq"
-  name: "SDK CQ Console"
-  builders {
-    name: "buildbucket/luci.dart.try/front-end-linux-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/front-end-mac-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/front-end-win-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/front-end-nnbd-linux-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/front-end-nnbd-mac-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/front-end-nnbd-win-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/flutter-frontend-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/flutter-engine-linux-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/flutter-engine-linux-web_tests-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-ia32-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-ia32-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-simarm-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-simarm64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-debug-arm64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-debug-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-release-arm64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-release-ia32-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-debug-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-mac-release-arm64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-win-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/app-kernel-linux-debug-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/app-kernel-linux-product-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/app-kernel-linux-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simarm-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simarm64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-ia32-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-checked-linux-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-ia32-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-mac-debug-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-mac-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-mac-release-arm64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-ia32-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-release-ia32-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-product-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-simarm_x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm_x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-mac-release-simarm64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-dwarf-linux-product-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm_x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm64c-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-product-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-mac-product-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-product-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-asan-linux-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-msan-linux-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-tsan-linux-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-ubsan-linux-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-asan-linux-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-msan-linux-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-tsan-linux-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-ubsan-linux-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-reload-linux-debug-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-reload-linux-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-reload-rollback-linux-debug-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-reload-rollback-linux-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64c-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64c-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-x64c-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-debug-x64c-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-fuchsia-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-gcc-linux-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-simriscv64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-simriscv64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-ffi-android-release-arm-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-ffi-android-product-arm-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm64c-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-ffi-android-release-arm64c-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-ffi-android-product-arm64c-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-precomp-ffi-qemu-linux-release-arm-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/pkg-linux-release-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/pkg-mac-release-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/pkg-mac-release-arm64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/pkg-win-release-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/pkg-linux-debug-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/dart2js-canary-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-hostasserts-linux-ia32-d8-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/dart2js-minified-strong-linux-x64-d8-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/dart2js-unit-linux-x64-release-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-chrome-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/dart2js-csp-minified-linux-x64-chrome-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-mac-x64-chrome-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-win-x64-chrome-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/dart2js-nnbd-linux-x64-chrome-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-firefox-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-mac-x64-safari-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/flutter-analyze-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/analyzer-analysis-server-linux-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/analyzer-linux-release-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/analyzer-mac-release-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/analyzer-win-release-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/analyzer-nnbd-linux-release-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/analyzer-nnbd-mac-release-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/analyzer-nnbd-win-release-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/dart-sdk-linux-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/dart-sdk-mac-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/dart-sdk-mac-arm64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/dart-sdk-win-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/ddc-linux-release-chrome-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/ddc-nnbd-linux-release-chrome-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/ddc-mac-release-chrome-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/ddc-win-release-chrome-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/ddk-linux-release-firefox-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/gclient-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/benchmark-linux-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try.shared/presubmit-try"
-  }
-  builder_view_only: true
-}
-consoles {
-  id: "be"
-  name: "SDK Bleeding Edge Console"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/main"
-  manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
-    category: "cfe"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
-    category: "cfe"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
-    category: "cfe"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64"
-    category: "cfe|nnbd"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-mac-release-x64"
-    category: "cfe|nnbd"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-win-release-x64"
-    category: "cfe|nnbd"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
-    category: "cfe"
-    short_name: "fl"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
-    category: "flutter"
-    short_name: "3H"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-web_tests"
-    category: "flutter"
-    short_name: "web"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/flutter-engine-ios"
-    category: "flutter"
-    short_name: "i"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
-    category: "vm|nnbd|jit"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64"
-    category: "vm|nnbd|jit"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-ia32"
-    category: "vm|nnbd|jit"
-    short_name: "d3"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-ia32"
-    category: "vm|nnbd|jit"
-    short_name: "r3"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm"
-    category: "vm|nnbd|jit"
-    short_name: "ra"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm64"
-    category: "vm|nnbd|jit"
-    short_name: "ra6"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-arm64"
-    category: "vm|nnbd|jit"
-    short_name: "m1d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-x64"
-    category: "vm|nnbd|jit"
-    short_name: "md"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-arm64"
-    category: "vm|nnbd|jit"
-    short_name: "m1r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-x64"
-    category: "vm|nnbd|jit"
-    short_name: "mr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-ia32"
-    category: "vm|nnbd|jit"
-    short_name: "wr3"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64"
-    category: "vm|nnbd|jit"
-    short_name: "wd"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-x64"
-    category: "vm|nnbd|jit"
-    short_name: "wr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64"
-    category: "vm|nnbd|aot"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
-    category: "vm|nnbd|aot"
-    short_name: "da"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm_x64"
-    category: "vm|nnbd|aot"
-    short_name: "ra"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-x64"
-    category: "vm|nnbd|aot"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64"
-    category: "vm|nnbd|aot"
-    short_name: "ra6"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-arm64"
-    category: "vm|nnbd|aot"
-    short_name: "m1"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64"
-    category: "vm|nnbd|aot"
-    short_name: "ma6"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-release-x64"
-    category: "vm|nnbd|aot"
-    short_name: "wr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
-    category: "vm|app-kernel"
-    short_name: "d64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64"
-    category: "vm|app-kernel"
-    short_name: "p64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64"
-    category: "vm|app-kernel"
-    short_name: "r64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
-    category: "vm|kernel"
-    short_name: "c"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
-    category: "vm|kernel"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
-    category: "vm|kernel"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
-    category: "vm|kernel"
-    short_name: "a64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32"
-    category: "vm|kernel"
-    short_name: "r32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
-    category: "vm|kernel"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
-    category: "vm|kernel"
-    short_name: "rc"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32"
-    category: "vm|kernel"
-    short_name: "d32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
-    category: "vm|kernel"
-    short_name: "md"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
-    category: "vm|kernel"
-    short_name: "mr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-arm64"
-    category: "vm|kernel"
-    short_name: "m1r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
-    category: "vm|kernel"
-    short_name: "wd3"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64"
-    category: "vm|kernel"
-    short_name: "wd"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32"
-    category: "vm|kernel"
-    short_name: "wr3"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
-    category: "vm|kernel"
-    short_name: "wr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
-    category: "vm|kernel"
-    short_name: "cra"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
-    category: "vm|kernel-precomp"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
-    category: "vm|kernel-precomp"
-    short_name: "p"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
-    category: "vm|kernel-precomp"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "a64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "o"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64"
-    category: "vm|kernel-precomp"
-    short_name: "adx"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64"
-    category: "vm|kernel-precomp"
-    short_name: "arx"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "ma"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "wr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-precomp-linux-release-arm64"
-    category: "vm|kernel-precomp"
-    short_name: "cra"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-dwarf-linux-product-x64"
-    category: "vm|kernel-precomp"
-    short_name: "dw"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64"
-    category: "vm|kernel-precomp|android"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c"
-    category: "vm|kernel-precomp|android"
-    short_name: "a64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
-    category: "vm|product"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
-    category: "vm|product"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
-    category: "vm|product"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
-    category: "vm|misc"
-    short_name: "o32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
-    category: "vm|misc"
-    short_name: "o64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
-    category: "vm|misc"
-    short_name: "a"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msan-linux-release-x64"
-    category: "vm|misc"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-tsan-linux-release-x64"
-    category: "vm|misc"
-    short_name: "t"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ubsan-linux-release-x64"
-    category: "vm|misc"
-    short_name: "u"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-asan-linux-release-x64"
-    category: "vm|misc|aot"
-    short_name: "a"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-msan-linux-release-x64"
-    category: "vm|misc|aot"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-tsan-linux-release-x64"
-    category: "vm|misc|aot"
-    short_name: "t"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ubsan-linux-release-x64"
-    category: "vm|misc|aot"
-    short_name: "u"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
-    category: "vm|misc|reload"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
-    category: "vm|misc|reload"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
-    category: "vm|misc|reload"
-    short_name: "drb"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64"
-    category: "vm|misc|reload"
-    short_name: "rrb"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64c"
-    category: "vm|misc|compressed"
-    short_name: "jl"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64c"
-    category: "vm|misc|compressed"
-    short_name: "al"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64c"
-    category: "vm|misc|compressed"
-    short_name: "jw"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-debug-x64c"
-    category: "vm|misc|compressed"
-    short_name: "aw"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-fuchsia-release-x64"
-    category: "vm|misc"
-    short_name: "f"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux"
-    category: "vm|misc"
-    short_name: "g"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simriscv64"
-    category: "vm|misc"
-    short_name: "rv64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simriscv64"
-    category: "vm|misc"
-    short_name: "rv64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
-    category: "vm|ffi"
-    short_name: "d32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm"
-    category: "vm|ffi"
-    short_name: "r32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm"
-    category: "vm|ffi"
-    short_name: "p32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c"
-    category: "vm|ffi"
-    short_name: "d64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c"
-    category: "vm|ffi"
-    short_name: "r64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c"
-    category: "vm|ffi"
-    short_name: "p64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm"
-    category: "vm|ffi"
-    short_name: "qa"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64"
-    category: "vm|ffi"
-    short_name: "qr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
-    category: "pkg"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
-    category: "pkg"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-arm64"
-    category: "pkg"
-    short_name: "m1"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
-    category: "pkg"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
-    category: "pkg"
-    short_name: "ld"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64"
-    category: "dart2js"
-    short_name: "c"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
-    category: "dart2js|d8"
-    short_name: "ha"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
-    category: "dart2js|d8"
-    short_name: "mi"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
-    category: "dart2js|d8"
-    short_name: "u"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "nn"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
-    category: "dart2js|safari"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
-    category: "analyzer"
-    short_name: "fa"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
-    category: "analyzer"
-    short_name: "as"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
-    category: "analyzer"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
-    category: "analyzer"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
-    category: "analyzer"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release"
-    category: "analyzer|nnbd"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-mac-release"
-    category: "analyzer|nnbd"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-win-release"
-    category: "analyzer|nnbd"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
-    category: "ddc"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-nnbd-linux-release-chrome"
-    category: "ddc"
-    short_name: "nn"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
-    category: "ddc"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
-    category: "ddc"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox"
-    category: "ddc"
-    short_name: "fl"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/gclient"
-    category: "misc"
-    short_name: "g"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux"
-    category: "misc"
-    short_name: "dp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/google"
-    category: "flutter"
-    short_name: "g3"
-  }
-  header {
-    links {
-      name: "Consoles"
-      links {
-        text: "Bleeding Edge console"
-        url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
-      }
-      links {
-        text: "Alternative Bleeding Edge console"
-        url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
-      }
-      links {
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
-      }
-      links {
-        text: "SDK CQ Status"
-        url: "/p/dart/g/cq/builders"
-        alt: "SDK CQ Status"
-      }
-      links {
-        text: "Results Feed"
-        url: "https://dart-ci.firebaseapp.com/"
-        alt: "Results Feed"
-      }
-      links {
-        text: "Current Test Results"
-        url: "https://dart-ci.firebaseapp.com/current_results/"
-        alt: "Current Test Results"
-      }
-      links {
-        text: "Dart Infrastructure chat"
-        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
-        alt: "Dart Infrastructure chat"
-      }
-    }
-    console_groups {
-      console_ids: "dart/dart-fuzz"
-      console_ids: "dart/flutter"
-      console_ids: "dart/flutter-hhh"
-      console_ids: "dart/iso-stress"
-    }
-    tree_status_host: "dart-status.appspot.com"
-  }
-}
-consoles {
-  id: "alt"
-  name: "SDK Bleeding Edge Console (alternative)"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/main"
-  manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
-    category: "cfe"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
-    category: "cfe"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
-    category: "cfe"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64"
-    category: "cfe|nnbd"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-mac-release-x64"
-    category: "cfe|nnbd"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-win-release-x64"
-    category: "cfe|nnbd"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
-    category: "cfe"
-    short_name: "fl"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
-    category: "flutter"
-    short_name: "3H"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-web_tests"
-    category: "flutter"
-    short_name: "web"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/flutter-engine-ios"
-    category: "flutter"
-    short_name: "i"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
-    category: "pkg"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
-    category: "pkg"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-arm64"
-    category: "pkg"
-    short_name: "m1"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
-    category: "pkg"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
-    category: "pkg"
-    short_name: "ld"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64"
-    category: "dart2js"
-    short_name: "c"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
-    category: "dart2js|d8"
-    short_name: "ha"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
-    category: "dart2js|d8"
-    short_name: "mi"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release"
-    category: "dart2js|d8"
-    short_name: "u"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome"
-    category: "dart2js|chrome"
-    short_name: "nn"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
-    category: "dart2js|safari"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
-    category: "analyzer"
-    short_name: "fa"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux"
-    category: "analyzer"
-    short_name: "as"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release"
-    category: "analyzer"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release"
-    category: "analyzer"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release"
-    category: "analyzer"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release"
-    category: "analyzer|nnbd"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-mac-release"
-    category: "analyzer|nnbd"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-win-release"
-    category: "analyzer|nnbd"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
-    category: "ddc"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-nnbd-linux-release-chrome"
-    category: "ddc"
-    short_name: "nn"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
-    category: "ddc"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
-    category: "ddc"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox"
-    category: "ddc"
-    short_name: "fl"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/gclient"
-    category: "misc"
-    short_name: "g"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux"
-    category: "misc"
-    short_name: "dp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/google"
-    category: "flutter"
-    short_name: "g3"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
-    category: "vm|nnbd|jit"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64"
-    category: "vm|nnbd|jit"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-ia32"
-    category: "vm|nnbd|jit"
-    short_name: "d3"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-ia32"
-    category: "vm|nnbd|jit"
-    short_name: "r3"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm"
-    category: "vm|nnbd|jit"
-    short_name: "ra"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm64"
-    category: "vm|nnbd|jit"
-    short_name: "ra6"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-arm64"
-    category: "vm|nnbd|jit"
-    short_name: "m1d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-x64"
-    category: "vm|nnbd|jit"
-    short_name: "md"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-arm64"
-    category: "vm|nnbd|jit"
-    short_name: "m1r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-x64"
-    category: "vm|nnbd|jit"
-    short_name: "mr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-ia32"
-    category: "vm|nnbd|jit"
-    short_name: "wr3"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64"
-    category: "vm|nnbd|jit"
-    short_name: "wd"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-x64"
-    category: "vm|nnbd|jit"
-    short_name: "wr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64"
-    category: "vm|nnbd|aot"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
-    category: "vm|nnbd|aot"
-    short_name: "da"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm_x64"
-    category: "vm|nnbd|aot"
-    short_name: "ra"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-x64"
-    category: "vm|nnbd|aot"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64"
-    category: "vm|nnbd|aot"
-    short_name: "ra6"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-arm64"
-    category: "vm|nnbd|aot"
-    short_name: "m1"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64"
-    category: "vm|nnbd|aot"
-    short_name: "ma6"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-release-x64"
-    category: "vm|nnbd|aot"
-    short_name: "wr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
-    category: "vm|app-kernel"
-    short_name: "d64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64"
-    category: "vm|app-kernel"
-    short_name: "p64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64"
-    category: "vm|app-kernel"
-    short_name: "r64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
-    category: "vm|kernel"
-    short_name: "c"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
-    category: "vm|kernel"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
-    category: "vm|kernel"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
-    category: "vm|kernel"
-    short_name: "a64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32"
-    category: "vm|kernel"
-    short_name: "r32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
-    category: "vm|kernel"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
-    category: "vm|kernel"
-    short_name: "rc"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32"
-    category: "vm|kernel"
-    short_name: "d32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
-    category: "vm|kernel"
-    short_name: "md"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
-    category: "vm|kernel"
-    short_name: "mr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-arm64"
-    category: "vm|kernel"
-    short_name: "m1r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
-    category: "vm|kernel"
-    short_name: "wd3"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64"
-    category: "vm|kernel"
-    short_name: "wd"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32"
-    category: "vm|kernel"
-    short_name: "wr3"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
-    category: "vm|kernel"
-    short_name: "wr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
-    category: "vm|kernel"
-    short_name: "cra"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
-    category: "vm|kernel-precomp"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
-    category: "vm|kernel-precomp"
-    short_name: "p"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
-    category: "vm|kernel-precomp"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "a64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "o"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64"
-    category: "vm|kernel-precomp"
-    short_name: "adx"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64"
-    category: "vm|kernel-precomp"
-    short_name: "arx"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "ma"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "wr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-precomp-linux-release-arm64"
-    category: "vm|kernel-precomp"
-    short_name: "cra"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-dwarf-linux-product-x64"
-    category: "vm|kernel-precomp"
-    short_name: "dw"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64"
-    category: "vm|kernel-precomp|android"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c"
-    category: "vm|kernel-precomp|android"
-    short_name: "a64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
-    category: "vm|product"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
-    category: "vm|product"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
-    category: "vm|product"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
-    category: "vm|misc"
-    short_name: "o32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
-    category: "vm|misc"
-    short_name: "o64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
-    category: "vm|misc"
-    short_name: "a"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msan-linux-release-x64"
-    category: "vm|misc"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-tsan-linux-release-x64"
-    category: "vm|misc"
-    short_name: "t"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ubsan-linux-release-x64"
-    category: "vm|misc"
-    short_name: "u"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-asan-linux-release-x64"
-    category: "vm|misc|aot"
-    short_name: "a"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-msan-linux-release-x64"
-    category: "vm|misc|aot"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-tsan-linux-release-x64"
-    category: "vm|misc|aot"
-    short_name: "t"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ubsan-linux-release-x64"
-    category: "vm|misc|aot"
-    short_name: "u"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
-    category: "vm|misc|reload"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
-    category: "vm|misc|reload"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
-    category: "vm|misc|reload"
-    short_name: "drb"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64"
-    category: "vm|misc|reload"
-    short_name: "rrb"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64c"
-    category: "vm|misc|compressed"
-    short_name: "jl"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64c"
-    category: "vm|misc|compressed"
-    short_name: "al"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64c"
-    category: "vm|misc|compressed"
-    short_name: "jw"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-debug-x64c"
-    category: "vm|misc|compressed"
-    short_name: "aw"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-fuchsia-release-x64"
-    category: "vm|misc"
-    short_name: "f"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux"
-    category: "vm|misc"
-    short_name: "g"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simriscv64"
-    category: "vm|misc"
-    short_name: "rv64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simriscv64"
-    category: "vm|misc"
-    short_name: "rv64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
-    category: "vm|ffi"
-    short_name: "d32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm"
-    category: "vm|ffi"
-    short_name: "r32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm"
-    category: "vm|ffi"
-    short_name: "p32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c"
-    category: "vm|ffi"
-    short_name: "d64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c"
-    category: "vm|ffi"
-    short_name: "r64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c"
-    category: "vm|ffi"
-    short_name: "p64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm"
-    category: "vm|ffi"
-    short_name: "qa"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64"
-    category: "vm|ffi"
-    short_name: "qr"
-  }
-  header {
-    links {
-      name: "Consoles"
-      links {
-        text: "Bleeding Edge console"
-        url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
-      }
-      links {
-        text: "Alternative Bleeding Edge console"
-        url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
-      }
-      links {
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
-      }
-      links {
-        text: "SDK CQ Status"
-        url: "/p/dart/g/cq/builders"
-        alt: "SDK CQ Status"
-      }
-      links {
-        text: "Results Feed"
-        url: "https://dart-ci.firebaseapp.com/"
-        alt: "Results Feed"
-      }
-      links {
-        text: "Current Test Results"
-        url: "https://dart-ci.firebaseapp.com/current_results/"
-        alt: "Current Test Results"
-      }
-      links {
-        text: "Dart Infrastructure chat"
-        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
-        alt: "Dart Infrastructure chat"
-      }
-    }
-    console_groups {
-      console_ids: "dart/dart-fuzz"
-      console_ids: "dart/flutter"
-      console_ids: "dart/flutter-hhh"
-      console_ids: "dart/iso-stress"
-    }
-    tree_status_host: "dart-status.appspot.com"
-  }
-}
-consoles {
-  id: "dev"
-  name: "SDK Dev Console"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/dev"
-  manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-dev"
-    category: "cfe"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-dev"
-    category: "cfe"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-dev"
-    category: "cfe"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-dev"
-    category: "cfe|nnbd"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-dev"
-    category: "vm|nnbd|jit"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-dev"
-    category: "vm|nnbd|jit"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-dev"
-    category: "vm|nnbd|aot"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-dev"
-    category: "vm|app-kernel"
-    short_name: "d64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-dev"
-    category: "vm|app-kernel"
-    short_name: "r64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-dev"
-    category: "vm|kernel"
-    short_name: "c"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-dev"
-    category: "vm|kernel"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-dev"
-    category: "vm|kernel"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-dev"
-    category: "vm|kernel"
-    short_name: "a64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-dev"
-    category: "vm|kernel"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-dev"
-    category: "vm|kernel"
-    short_name: "rc"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-dev"
-    category: "vm|kernel"
-    short_name: "md"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-dev"
-    category: "vm|kernel"
-    short_name: "mr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-arm64-dev"
-    category: "vm|kernel"
-    short_name: "m1r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-dev"
-    category: "vm|kernel"
-    short_name: "wd"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-dev"
-    category: "vm|kernel"
-    short_name: "wr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "p"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-dev"
-    category: "vm|kernel-precomp"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "a64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "o"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "adx"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "arx"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "ma"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "wr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-dev"
-    category: "vm|kernel-precomp|android"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-dev"
-    category: "vm|kernel-precomp|android"
-    short_name: "a64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-dev"
-    category: "vm|misc"
-    short_name: "g"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-dev"
-    category: "vm|ffi"
-    short_name: "d32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-dev"
-    category: "vm|ffi"
-    short_name: "r32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-dev"
-    category: "vm|ffi"
-    short_name: "p32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-dev"
-    category: "vm|ffi"
-    short_name: "d64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-dev"
-    category: "vm|ffi"
-    short_name: "r64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-dev"
-    category: "vm|ffi"
-    short_name: "p64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-dev"
-    category: "vm|ffi"
-    short_name: "qa"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-dev"
-    category: "vm|ffi"
-    short_name: "qr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
-    category: "pkg"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-dev"
-    category: "pkg"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-dev"
-    category: "pkg"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-dev"
-    category: "dart2js"
-    short_name: "c"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-dev"
-    category: "dart2js|d8"
-    short_name: "ha"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-dev"
-    category: "dart2js|d8"
-    short_name: "mi"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-dev"
-    category: "dart2js|d8"
-    short_name: "u"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-dev"
-    category: "dart2js|chrome"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-dev"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-dev"
-    category: "dart2js|chrome"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-dev"
-    category: "dart2js|chrome"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-dev"
-    category: "dart2js|chrome"
-    short_name: "nn"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-dev"
-    category: "dart2js|firefox"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-dev"
-    category: "dart2js|safari"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-dev"
-    category: "analyzer"
-    short_name: "as"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-dev"
-    category: "analyzer"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-dev"
-    category: "analyzer"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-dev"
-    category: "analyzer"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-dev"
-    category: "analyzer|nnbd"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-linux-dev"
-    category: "sdk"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-dev"
-    category: "sdk"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-dev"
-    category: "sdk"
-    short_name: "m1"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-win-dev"
-    category: "sdk"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-dev"
-    category: "ddc"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-dev"
-    category: "ddc"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-dev"
-    category: "ddc"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-dev"
-    category: "ddc"
-    short_name: "fl"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/gclient-dev"
-    category: "misc"
-    short_name: "g"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux-dev"
-    category: "misc"
-    short_name: "dp"
-  }
-  header {
-    links {
-      name: "Consoles"
-      links {
-        text: "Bleeding Edge console"
-        url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
-      }
-      links {
-        text: "Alternative Bleeding Edge console"
-        url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
-      }
-      links {
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
-      }
-      links {
-        text: "SDK CQ Status"
-        url: "/p/dart/g/cq/builders"
-        alt: "SDK CQ Status"
-      }
-      links {
-        text: "Results Feed"
-        url: "https://dart-ci.firebaseapp.com/"
-        alt: "Results Feed"
-      }
-      links {
-        text: "Current Test Results"
-        url: "https://dart-ci.firebaseapp.com/current_results/"
-        alt: "Current Test Results"
-      }
-      links {
-        text: "Dart Infrastructure chat"
-        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
-        alt: "Dart Infrastructure chat"
-      }
-    }
-    console_groups {
-      console_ids: "dart/dart-fuzz"
-      console_ids: "dart/flutter"
-      console_ids: "dart/flutter-hhh"
-      console_ids: "dart/iso-stress"
-    }
-    tree_status_host: "dart-status.appspot.com"
-  }
-}
-consoles {
-  id: "beta"
-  name: "SDK Beta Console"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/beta"
-  manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-beta"
-    category: "cfe"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-beta"
-    category: "cfe"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-beta"
-    category: "cfe"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-beta"
-    category: "cfe|nnbd"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-beta"
-    category: "vm|nnbd|jit"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-beta"
-    category: "vm|nnbd|jit"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-beta"
-    category: "vm|nnbd|aot"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-beta"
-    category: "vm|app-kernel"
-    short_name: "d64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-beta"
-    category: "vm|app-kernel"
-    short_name: "r64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-beta"
-    category: "vm|kernel"
-    short_name: "c"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-beta"
-    category: "vm|kernel"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-beta"
-    category: "vm|kernel"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-beta"
-    category: "vm|kernel"
-    short_name: "a64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-beta"
-    category: "vm|kernel"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-beta"
-    category: "vm|kernel"
-    short_name: "rc"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-beta"
-    category: "vm|kernel"
-    short_name: "md"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-beta"
-    category: "vm|kernel"
-    short_name: "mr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-beta"
-    category: "vm|kernel"
-    short_name: "wd"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-beta"
-    category: "vm|kernel"
-    short_name: "wr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-beta"
-    category: "vm|kernel-precomp"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-beta"
-    category: "vm|kernel-precomp"
-    short_name: "p"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-beta"
-    category: "vm|kernel-precomp"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-beta"
-    category: "vm|kernel-precomp"
-    short_name: "a64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-beta"
-    category: "vm|kernel-precomp"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-beta"
-    category: "vm|kernel-precomp"
-    short_name: "o"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-beta"
-    category: "vm|kernel-precomp"
-    short_name: "adx"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-beta"
-    category: "vm|kernel-precomp"
-    short_name: "arx"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-beta"
-    category: "vm|kernel-precomp"
-    short_name: "ma"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-beta"
-    category: "vm|kernel-precomp"
-    short_name: "wr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-beta"
-    category: "vm|kernel-precomp|android"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-beta"
-    category: "vm|kernel-precomp|android"
-    short_name: "a64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-beta"
-    category: "vm|misc"
-    short_name: "g"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-beta"
-    category: "vm|ffi"
-    short_name: "d32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-beta"
-    category: "vm|ffi"
-    short_name: "r32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-beta"
-    category: "vm|ffi"
-    short_name: "p32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-beta"
-    category: "vm|ffi"
-    short_name: "d64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-beta"
-    category: "vm|ffi"
-    short_name: "r64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-beta"
-    category: "vm|ffi"
-    short_name: "p64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-beta"
-    category: "vm|ffi"
-    short_name: "qa"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-beta"
-    category: "vm|ffi"
-    short_name: "qr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-beta"
-    category: "pkg"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-beta"
-    category: "pkg"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-beta"
-    category: "pkg"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-beta"
-    category: "dart2js"
-    short_name: "c"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-beta"
-    category: "dart2js|d8"
-    short_name: "ha"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-beta"
-    category: "dart2js|d8"
-    short_name: "mi"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-beta"
-    category: "dart2js|d8"
-    short_name: "u"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-beta"
-    category: "dart2js|chrome"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-beta"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-beta"
-    category: "dart2js|chrome"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-beta"
-    category: "dart2js|chrome"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-beta"
-    category: "dart2js|chrome"
-    short_name: "nn"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-beta"
-    category: "dart2js|firefox"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-beta"
-    category: "dart2js|safari"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-beta"
-    category: "analyzer"
-    short_name: "as"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-beta"
-    category: "analyzer"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-beta"
-    category: "analyzer"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-beta"
-    category: "analyzer"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-beta"
-    category: "analyzer|nnbd"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-linux-beta"
-    category: "sdk"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-beta"
-    category: "sdk"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-beta"
-    category: "sdk"
-    short_name: "m1"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-win-beta"
-    category: "sdk"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-beta"
-    category: "ddc"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-beta"
-    category: "ddc"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-beta"
-    category: "ddc"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-beta"
-    category: "ddc"
-    short_name: "fl"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/gclient-beta"
-    category: "misc"
-    short_name: "g"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux-beta"
-    category: "misc"
-    short_name: "dp"
-  }
-  header {
-    links {
-      name: "Consoles"
-      links {
-        text: "Bleeding Edge console"
-        url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
-      }
-      links {
-        text: "Alternative Bleeding Edge console"
-        url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
-      }
-      links {
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
-      }
-      links {
-        text: "SDK CQ Status"
-        url: "/p/dart/g/cq/builders"
-        alt: "SDK CQ Status"
-      }
-      links {
-        text: "Results Feed"
-        url: "https://dart-ci.firebaseapp.com/"
-        alt: "Results Feed"
-      }
-      links {
-        text: "Current Test Results"
-        url: "https://dart-ci.firebaseapp.com/current_results/"
-        alt: "Current Test Results"
-      }
-      links {
-        text: "Dart Infrastructure chat"
-        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
-        alt: "Dart Infrastructure chat"
-      }
-    }
-    console_groups {
-      console_ids: "dart/dart-fuzz"
-      console_ids: "dart/flutter"
-      console_ids: "dart/flutter-hhh"
-      console_ids: "dart/iso-stress"
-    }
-    tree_status_host: "dart-status.appspot.com"
-  }
-}
-consoles {
-  id: "stable"
-  name: "SDK Stable Console"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/stable"
-  manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-stable"
-    category: "cfe"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-stable"
-    category: "cfe"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-stable"
-    category: "cfe"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-stable"
-    category: "cfe|nnbd"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-stable"
-    category: "vm|nnbd|jit"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-stable"
-    category: "vm|nnbd|jit"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-stable"
-    category: "vm|nnbd|aot"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-stable"
-    category: "vm|app-kernel"
-    short_name: "d64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-stable"
-    category: "vm|app-kernel"
-    short_name: "r64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-stable"
-    category: "vm|kernel"
-    short_name: "c"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-stable"
-    category: "vm|kernel"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-stable"
-    category: "vm|kernel"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-stable"
-    category: "vm|kernel"
-    short_name: "a64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-stable"
-    category: "vm|kernel"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-stable"
-    category: "vm|kernel"
-    short_name: "rc"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-stable"
-    category: "vm|kernel"
-    short_name: "md"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-stable"
-    category: "vm|kernel"
-    short_name: "mr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-stable"
-    category: "vm|kernel"
-    short_name: "wd"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-stable"
-    category: "vm|kernel"
-    short_name: "wr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "p"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-stable"
-    category: "vm|kernel-precomp"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "a64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "o"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "adx"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "arx"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "ma"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "wr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-stable"
-    category: "vm|kernel-precomp|android"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-stable"
-    category: "vm|kernel-precomp|android"
-    short_name: "a64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-stable"
-    category: "vm|misc"
-    short_name: "g"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-stable"
-    category: "vm|ffi"
-    short_name: "d32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-stable"
-    category: "vm|ffi"
-    short_name: "r32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-stable"
-    category: "vm|ffi"
-    short_name: "p32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-stable"
-    category: "vm|ffi"
-    short_name: "d64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-stable"
-    category: "vm|ffi"
-    short_name: "r64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-stable"
-    category: "vm|ffi"
-    short_name: "p64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-stable"
-    category: "vm|ffi"
-    short_name: "qa"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-stable"
-    category: "vm|ffi"
-    short_name: "qr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
-    category: "pkg"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-stable"
-    category: "pkg"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-stable"
-    category: "pkg"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-stable"
-    category: "dart2js"
-    short_name: "c"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-stable"
-    category: "dart2js|d8"
-    short_name: "ha"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-stable"
-    category: "dart2js|d8"
-    short_name: "mi"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-stable"
-    category: "dart2js|d8"
-    short_name: "u"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "nn"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-stable"
-    category: "dart2js|firefox"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-stable"
-    category: "dart2js|safari"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-stable"
-    category: "analyzer"
-    short_name: "as"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-stable"
-    category: "analyzer"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-stable"
-    category: "analyzer"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-stable"
-    category: "analyzer"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-stable"
-    category: "analyzer|nnbd"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-linux-stable"
-    category: "sdk"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-stable"
-    category: "sdk"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-stable"
-    category: "sdk"
-    short_name: "m1"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-win-stable"
-    category: "sdk"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-stable"
-    category: "ddc"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-stable"
-    category: "ddc"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-stable"
-    category: "ddc"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-stable"
-    category: "ddc"
-    short_name: "fl"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/gclient-stable"
-    category: "misc"
-    short_name: "g"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux-stable"
-    category: "misc"
-    short_name: "dp"
-  }
-  header {
-    links {
-      name: "Consoles"
-      links {
-        text: "Bleeding Edge console"
-        url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
-      }
-      links {
-        text: "Alternative Bleeding Edge console"
-        url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
-      }
-      links {
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
-      }
-      links {
-        text: "SDK CQ Status"
-        url: "/p/dart/g/cq/builders"
-        alt: "SDK CQ Status"
-      }
-      links {
-        text: "Results Feed"
-        url: "https://dart-ci.firebaseapp.com/"
-        alt: "Results Feed"
-      }
-      links {
-        text: "Current Test Results"
-        url: "https://dart-ci.firebaseapp.com/current_results/"
-        alt: "Current Test Results"
-      }
-      links {
-        text: "Dart Infrastructure chat"
-        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
-        alt: "Dart Infrastructure chat"
-      }
-    }
-    console_groups {
-      console_ids: "dart/dart-fuzz"
-      console_ids: "dart/flutter"
-      console_ids: "dart/flutter-hhh"
-      console_ids: "dart/iso-stress"
-    }
-    tree_status_host: "dart-status.appspot.com"
-  }
-}
-consoles {
-  id: "dart-fuzz"
-  name: "Dart Fuzzer Console"
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/fuzz-linux"
-  }
-  builder_view_only: true
-}
-consoles {
-  id: "flutter"
-  name: "Dart/Flutter Console"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/main"
-  manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
-    category: "analyzer"
-    short_name: "fa"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
-    category: "fasta"
-    short_name: "fl"
-  }
-}
-consoles {
-  id: "flutter-hhh"
-  name: "Dart/Flutter Linear History Console"
-  repo_url: "https://dart.googlesource.com/linear_sdk_flutter_engine"
-  refs: "regexp:refs/heads/master"
-  manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
-    category: "flutter"
-    short_name: "3H"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-web_tests"
-    category: "flutter"
-    short_name: "web"
-  }
-}
-consoles {
-  id: "iso-stress"
-  name: "VM Isolate Stress Test Console"
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/iso-stress-linux"
-  }
-  builder_view_only: true
-}
-consoles {
-  id: "fyi"
-  name: "SDK FYI Console"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/main"
-  manifest_name: "REVISION"
-}
-consoles {
-  id: "infra"
-  name: "Infra Console"
-  builders {
-    name: "buildbucket/luci.dart.ci/base"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/cbuild"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/chocolatey"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/co19-roller"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-ci-scripts-linux"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-ci-scripts-win"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-ci-scripts-mac"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-ci-scripts-mac-arm64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/linearize-flutter"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.roll/roll-to-dev"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/recipe-deps-roller"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/recipe-bundler"
-  }
-  builder_view_only: true
-}
-logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png"
diff --git a/luci-notify.cfg b/luci-notify.cfg
deleted file mode 100644
index 727fa04f38a0..000000000000
--- a/luci-notify.cfg
+++ /dev/null
@@ -1,1705 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-#
-# For the schema of this file, see ProjectConfig message:
-#   https://luci-config.appspot.com/schemas/projects:luci-notify.cfg
-
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "cbuild"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "chocolatey"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "co19-roller"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "dart-ci-scripts-linux"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "dart-ci-scripts-mac"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "dart-ci-scripts-mac-arm64"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "dart-ci-scripts-win"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "debianpackage-linux"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "linearize-flutter"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "recipe-bundler"
-    repository: "https://dart.googlesource.com/recipes"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "recipe-deps-roller"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.roll"
-    name: "roll-to-dev"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "analyzer-analysis-server-linux"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "analyzer-linux-release"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "analyzer-mac-release"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "analyzer-nnbd-linux-release"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "analyzer-nnbd-mac-release"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "analyzer-nnbd-win-release"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "analyzer-win-release"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "app-kernel-linux-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "app-kernel-linux-product-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "app-kernel-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_success: true
-    on_failure: true
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "ci-test-data"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "cross-vm-linux-release-arm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "cross-vm-precomp-linux-release-arm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "dart2js-canary-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "dart2js-csp-minified-linux-x64-chrome"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "dart2js-minified-strong-linux-x64-d8"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "dart2js-nnbd-linux-x64-chrome"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "dart2js-strong-hostasserts-linux-ia32-d8"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "dart2js-strong-linux-x64-chrome"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "dart2js-strong-linux-x64-firefox"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "dart2js-strong-mac-x64-chrome"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "dart2js-strong-mac-x64-safari"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "dart2js-strong-win-x64-chrome"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "dart2js-unit-linux-x64-release"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "ddc-linux-release-chrome"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "ddc-mac-release-chrome"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "ddc-nnbd-linux-release-chrome"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "ddc-win-release-chrome"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "ddk-linux-release-firefox"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "flutter-engine-linux"
-    repository: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "flutter-engine-linux-web_tests"
-    repository: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
-  }
-}
-notifiers {
-  notifications {
-    on_failure: true
-    email {
-      recipients: "jensj@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "flutter-frontend"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "front-end-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "front-end-mac-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "front-end-nnbd-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "front-end-nnbd-mac-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "front-end-nnbd-win-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "front-end-win-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_failure: true
-    email {
-      recipients: "jensj@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "frontend-weekly"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_failure: true
-    email {
-      recipients: "bkonyi@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "fuzz-linux"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "gclient"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "iso-stress-linux"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "pkg-linux-debug"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "pkg-linux-release"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "pkg-mac-release"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "pkg-mac-release-arm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "pkg-win-release"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-canary-linux-debug"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-ffi-android-debug-arm"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-ffi-android-debug-arm64c"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-ffi-android-product-arm"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-ffi-android-product-arm64c"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-ffi-android-release-arm"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-ffi-android-release-arm64c"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-fuchsia-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-asan-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-checked-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-gcc-linux"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-debug-ia32"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-debug-simriscv64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-debug-x64c"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-product-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-release-ia32"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-release-simarm"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-release-simarm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-mac-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-mac-product-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-mac-release-arm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-mac-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-msan-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-linux-debug-ia32"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-linux-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-linux-release-ia32"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-linux-release-simarm"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-linux-release-simarm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-mac-debug-arm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-mac-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-mac-release-arm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-mac-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-win-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-win-release-ia32"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-win-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-optcounter-threshold-linux-release-ia32"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-optcounter-threshold-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-android-release-arm64c"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-android-release-arm_x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-asan-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-dwarf-linux-product-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-debug-simarm_x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-debug-simriscv64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-debug-x64c"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-product-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-release-simarm"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-release-simarm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-release-simarm_x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-mac-release-simarm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-msan-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-linux-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-linux-release-simarm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-mac-release-arm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-mac-release-simarm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-win-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-obfuscate-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-tsan-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-ubsan-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-win-debug-x64c"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-win-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-reload-linux-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-reload-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-reload-rollback-linux-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-reload-rollback-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-tsan-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-ubsan-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-win-debug-ia32"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-win-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-win-debug-x64c"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-win-product-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-win-release-ia32"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-win-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-precomp-ffi-qemu-linux-release-arm"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-precomp-ffi-qemu-linux-release-riscv64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
diff --git a/luci-notify/email-templates/common.template b/luci-notify/email-templates/common.template
deleted file mode 100644
index eee1aa13042b..000000000000
--- a/luci-notify/email-templates/common.template
+++ /dev/null
@@ -1,24 +0,0 @@
-This file contains useful common templates for email notifications.
-
-{{- define "status_to_color" -}}
-{{- if eq . 12 }} {{/* SUCCESS */}}
-#049300
-{{- else if eq . 20 -}} {{/* FAILURE */}}
-#b50000
-{{- else if eq . 36 -}} {{/* INFRA FAILURE */}}
-#850093
-{{- else if eq . 68 -}} {{/* CANCELED */}}
-#c400aa
-{{- else -}}
-#000000
-{{- end -}}
-{{- end -}}
-{{ define "builder_link" -}}
-<a href="https://ci.chromium.org/b/{{ .Id }}">{{ .Builder.Builder }}#{{ .Number }}</a>
-{{- end -}}
-{{ define "summary" -}}
-{{- template "builder_link" . -}}:
-<span style="color: #ffffff; background-color: {{- template "status_to_color" .Status -}}; font-weight: bold">
-{{- .Status -}}
-</span>
-{{ end -}}
diff --git a/luci-notify/email-templates/default.template b/luci-notify/email-templates/default.template
deleted file mode 100644
index 95915be91076..000000000000
--- a/luci-notify/email-templates/default.template
+++ /dev/null
@@ -1,32 +0,0 @@
-Dart build {{ .Build.Status }} on {{ .Build.Builder.Builder }}
-
-{{ template "summary" .Build }}
-{{/* If the build is a failure, show failed steps. */}}
-{{ if ne .Build.Status 12 -}}
-{{- if .Build.Input.GitilesCommit -}}
-<ul>
-<li>
-<a href="https://dart-ci.firebaseapp.com/#{{- .Build.Input.GitilesCommit.Id -}}">Test results</a>.
-</li>
-</ul>
-See the documentation at
-<a href="https://goto.google.com/dart-status-file-free-workflow">
-go/dart-status-file-free-workflow</a>.
-<br>
-<br>
-{{end -}}
-Failed Steps:
-<ul>
-{{ range $step := .Build.Steps -}}
-{{ if ne $step.Status 12 -}}
-<li>{{ $step.Name }}</li>
-<ul>
-  {{ range $log := .Logs -}}
-  <li><a href="{{ $log.ViewUrl }}">{{ $log.Name }}</a></li>
-  {{ end -}}
-</ul>
-{{ end -}}
-{{ end -}}
-</ul>
-Completed at: {{ .Build.EndTime | time }}
-{{ end -}}
diff --git a/luci-scheduler.cfg b/luci-scheduler.cfg
deleted file mode 100644
index b24be7d9b613..000000000000
--- a/luci-scheduler.cfg
+++ /dev/null
@@ -1,4411 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-#
-# For the schema of this file, see ProjectConfig message:
-#   https://luci-config.appspot.com/schemas/projects:luci-scheduler.cfg
-
-job {
-  id: "analyzer-analysis-server-linux"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-analysis-server-linux"
-  }
-}
-job {
-  id: "analyzer-analysis-server-linux-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-analysis-server-linux-beta"
-  }
-}
-job {
-  id: "analyzer-analysis-server-linux-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-analysis-server-linux-dev"
-  }
-}
-job {
-  id: "analyzer-analysis-server-linux-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-analysis-server-linux-stable"
-  }
-}
-job {
-  id: "analyzer-linux-release"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-linux-release"
-  }
-}
-job {
-  id: "analyzer-linux-release-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-linux-release-beta"
-  }
-}
-job {
-  id: "analyzer-linux-release-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-linux-release-dev"
-  }
-}
-job {
-  id: "analyzer-linux-release-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-linux-release-stable"
-  }
-}
-job {
-  id: "analyzer-mac-release"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-mac-release"
-  }
-}
-job {
-  id: "analyzer-mac-release-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-mac-release-beta"
-  }
-}
-job {
-  id: "analyzer-mac-release-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-mac-release-dev"
-  }
-}
-job {
-  id: "analyzer-mac-release-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-mac-release-stable"
-  }
-}
-job {
-  id: "analyzer-nnbd-linux-release"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-nnbd-linux-release"
-  }
-}
-job {
-  id: "analyzer-nnbd-linux-release-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-nnbd-linux-release-beta"
-  }
-}
-job {
-  id: "analyzer-nnbd-linux-release-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-nnbd-linux-release-dev"
-  }
-}
-job {
-  id: "analyzer-nnbd-linux-release-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-nnbd-linux-release-stable"
-  }
-}
-job {
-  id: "analyzer-nnbd-mac-release"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-nnbd-mac-release"
-  }
-}
-job {
-  id: "analyzer-nnbd-win-release"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-nnbd-win-release"
-  }
-}
-job {
-  id: "analyzer-win-release"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-win-release"
-  }
-}
-job {
-  id: "analyzer-win-release-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-win-release-beta"
-  }
-}
-job {
-  id: "analyzer-win-release-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-win-release-dev"
-  }
-}
-job {
-  id: "analyzer-win-release-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "analyzer-win-release-stable"
-  }
-}
-job {
-  id: "app-kernel-linux-debug-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-debug-x64"
-  }
-}
-job {
-  id: "app-kernel-linux-debug-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-debug-x64-beta"
-  }
-}
-job {
-  id: "app-kernel-linux-debug-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-debug-x64-dev"
-  }
-}
-job {
-  id: "app-kernel-linux-debug-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-debug-x64-stable"
-  }
-}
-job {
-  id: "app-kernel-linux-product-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-product-x64"
-  }
-}
-job {
-  id: "app-kernel-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-release-x64"
-  }
-}
-job {
-  id: "app-kernel-linux-release-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-release-x64-beta"
-  }
-}
-job {
-  id: "app-kernel-linux-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-release-x64-dev"
-  }
-}
-job {
-  id: "app-kernel-linux-release-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "app-kernel-linux-release-x64-stable"
-  }
-}
-job {
-  id: "base"
-  realm: "ci"
-  schedule: "with 15m interval"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "base"
-  }
-}
-job {
-  id: "cbuild"
-  realm: "ci"
-  schedule: "with 15m interval"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "cbuild"
-  }
-}
-job {
-  id: "chocolatey"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "chocolatey"
-  }
-}
-job {
-  id: "ci-test-data"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "ci-test-data"
-  }
-}
-job {
-  id: "co19-roller"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "co19-roller"
-  }
-}
-job {
-  id: "cross-vm-linux-release-arm64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "cross-vm-linux-release-arm64"
-  }
-}
-job {
-  id: "cross-vm-precomp-linux-release-arm64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "cross-vm-precomp-linux-release-arm64"
-  }
-}
-job {
-  id: "dart-ci-scripts-linux"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-ci-scripts-linux"
-  }
-}
-job {
-  id: "dart-ci-scripts-mac"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-ci-scripts-mac"
-  }
-}
-job {
-  id: "dart-ci-scripts-mac-arm64"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-ci-scripts-mac-arm64"
-  }
-}
-job {
-  id: "dart-ci-scripts-win"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-ci-scripts-win"
-  }
-}
-job {
-  id: "dart-sdk-linux-beta"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-linux-beta"
-  }
-}
-job {
-  id: "dart-sdk-linux-dev"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-linux-dev"
-  }
-}
-job {
-  id: "dart-sdk-linux-stable"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-linux-stable"
-  }
-}
-job {
-  id: "dart-sdk-mac-arm64-beta"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-mac-arm64-beta"
-  }
-}
-job {
-  id: "dart-sdk-mac-arm64-dev"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-mac-arm64-dev"
-  }
-}
-job {
-  id: "dart-sdk-mac-arm64-stable"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-mac-arm64-stable"
-  }
-}
-job {
-  id: "dart-sdk-mac-beta"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-mac-beta"
-  }
-}
-job {
-  id: "dart-sdk-mac-dev"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-mac-dev"
-  }
-}
-job {
-  id: "dart-sdk-mac-stable"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-mac-stable"
-  }
-}
-job {
-  id: "dart-sdk-win-beta"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-win-beta"
-  }
-}
-job {
-  id: "dart-sdk-win-dev"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-win-dev"
-  }
-}
-job {
-  id: "dart-sdk-win-stable"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "dart-sdk-win-stable"
-  }
-}
-job {
-  id: "dart2js-canary-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-canary-x64"
-  }
-}
-job {
-  id: "dart2js-canary-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-canary-x64-beta"
-  }
-}
-job {
-  id: "dart2js-canary-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-canary-x64-dev"
-  }
-}
-job {
-  id: "dart2js-canary-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-canary-x64-stable"
-  }
-}
-job {
-  id: "dart2js-csp-minified-linux-x64-chrome"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-csp-minified-linux-x64-chrome"
-  }
-}
-job {
-  id: "dart2js-csp-minified-linux-x64-chrome-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-csp-minified-linux-x64-chrome-beta"
-  }
-}
-job {
-  id: "dart2js-csp-minified-linux-x64-chrome-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-csp-minified-linux-x64-chrome-dev"
-  }
-}
-job {
-  id: "dart2js-csp-minified-linux-x64-chrome-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-csp-minified-linux-x64-chrome-stable"
-  }
-}
-job {
-  id: "dart2js-minified-strong-linux-x64-d8"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-minified-strong-linux-x64-d8"
-  }
-}
-job {
-  id: "dart2js-minified-strong-linux-x64-d8-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-minified-strong-linux-x64-d8-beta"
-  }
-}
-job {
-  id: "dart2js-minified-strong-linux-x64-d8-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-minified-strong-linux-x64-d8-dev"
-  }
-}
-job {
-  id: "dart2js-minified-strong-linux-x64-d8-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-minified-strong-linux-x64-d8-stable"
-  }
-}
-job {
-  id: "dart2js-nnbd-linux-x64-chrome"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-nnbd-linux-x64-chrome"
-  }
-}
-job {
-  id: "dart2js-nnbd-linux-x64-chrome-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-nnbd-linux-x64-chrome-beta"
-  }
-}
-job {
-  id: "dart2js-nnbd-linux-x64-chrome-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-nnbd-linux-x64-chrome-dev"
-  }
-}
-job {
-  id: "dart2js-nnbd-linux-x64-chrome-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-nnbd-linux-x64-chrome-stable"
-  }
-}
-job {
-  id: "dart2js-strong-hostasserts-linux-ia32-d8"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-hostasserts-linux-ia32-d8"
-  }
-}
-job {
-  id: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
-  }
-}
-job {
-  id: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
-  }
-}
-job {
-  id: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
-  }
-}
-job {
-  id: "dart2js-strong-linux-x64-chrome"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-linux-x64-chrome"
-  }
-}
-job {
-  id: "dart2js-strong-linux-x64-chrome-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-linux-x64-chrome-beta"
-  }
-}
-job {
-  id: "dart2js-strong-linux-x64-chrome-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-linux-x64-chrome-dev"
-  }
-}
-job {
-  id: "dart2js-strong-linux-x64-chrome-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-linux-x64-chrome-stable"
-  }
-}
-job {
-  id: "dart2js-strong-linux-x64-firefox"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-linux-x64-firefox"
-  }
-}
-job {
-  id: "dart2js-strong-linux-x64-firefox-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-linux-x64-firefox-beta"
-  }
-}
-job {
-  id: "dart2js-strong-linux-x64-firefox-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-linux-x64-firefox-dev"
-  }
-}
-job {
-  id: "dart2js-strong-linux-x64-firefox-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-linux-x64-firefox-stable"
-  }
-}
-job {
-  id: "dart2js-strong-mac-x64-chrome"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-mac-x64-chrome"
-  }
-}
-job {
-  id: "dart2js-strong-mac-x64-chrome-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-mac-x64-chrome-beta"
-  }
-}
-job {
-  id: "dart2js-strong-mac-x64-chrome-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-mac-x64-chrome-dev"
-  }
-}
-job {
-  id: "dart2js-strong-mac-x64-chrome-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-mac-x64-chrome-stable"
-  }
-}
-job {
-  id: "dart2js-strong-mac-x64-safari"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-mac-x64-safari"
-  }
-}
-job {
-  id: "dart2js-strong-mac-x64-safari-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-mac-x64-safari-beta"
-  }
-}
-job {
-  id: "dart2js-strong-mac-x64-safari-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-mac-x64-safari-dev"
-  }
-}
-job {
-  id: "dart2js-strong-mac-x64-safari-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-mac-x64-safari-stable"
-  }
-}
-job {
-  id: "dart2js-strong-win-x64-chrome"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-chrome"
-  }
-}
-job {
-  id: "dart2js-strong-win-x64-chrome-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-chrome-beta"
-  }
-}
-job {
-  id: "dart2js-strong-win-x64-chrome-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-chrome-dev"
-  }
-}
-job {
-  id: "dart2js-strong-win-x64-chrome-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-strong-win-x64-chrome-stable"
-  }
-}
-job {
-  id: "dart2js-unit-linux-x64-release"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-unit-linux-x64-release"
-  }
-}
-job {
-  id: "dart2js-unit-linux-x64-release-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-unit-linux-x64-release-beta"
-  }
-}
-job {
-  id: "dart2js-unit-linux-x64-release-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-unit-linux-x64-release-dev"
-  }
-}
-job {
-  id: "dart2js-unit-linux-x64-release-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "dart2js-unit-linux-x64-release-stable"
-  }
-}
-job {
-  id: "ddc-linux-release-chrome"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-linux-release-chrome"
-  }
-}
-job {
-  id: "ddc-linux-release-chrome-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-linux-release-chrome-beta"
-  }
-}
-job {
-  id: "ddc-linux-release-chrome-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-linux-release-chrome-dev"
-  }
-}
-job {
-  id: "ddc-linux-release-chrome-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-linux-release-chrome-stable"
-  }
-}
-job {
-  id: "ddc-mac-release-chrome"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-mac-release-chrome"
-  }
-}
-job {
-  id: "ddc-mac-release-chrome-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-mac-release-chrome-beta"
-  }
-}
-job {
-  id: "ddc-mac-release-chrome-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-mac-release-chrome-dev"
-  }
-}
-job {
-  id: "ddc-mac-release-chrome-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-mac-release-chrome-stable"
-  }
-}
-job {
-  id: "ddc-nnbd-linux-release-chrome"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-nnbd-linux-release-chrome"
-  }
-}
-job {
-  id: "ddc-win-release-chrome"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-win-release-chrome"
-  }
-}
-job {
-  id: "ddc-win-release-chrome-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-win-release-chrome-beta"
-  }
-}
-job {
-  id: "ddc-win-release-chrome-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-win-release-chrome-dev"
-  }
-}
-job {
-  id: "ddc-win-release-chrome-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "ddc-win-release-chrome-stable"
-  }
-}
-job {
-  id: "ddk-linux-release-firefox"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "ddk-linux-release-firefox"
-  }
-}
-job {
-  id: "ddk-linux-release-firefox-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "ddk-linux-release-firefox-beta"
-  }
-}
-job {
-  id: "ddk-linux-release-firefox-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "ddk-linux-release-firefox-dev"
-  }
-}
-job {
-  id: "ddk-linux-release-firefox-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "ddk-linux-release-firefox-stable"
-  }
-}
-job {
-  id: "debianpackage-linux"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "debianpackage-linux"
-  }
-}
-job {
-  id: "debianpackage-linux-beta"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "debianpackage-linux-beta"
-  }
-}
-job {
-  id: "debianpackage-linux-dev"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "debianpackage-linux-dev"
-  }
-}
-job {
-  id: "debianpackage-linux-stable"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "debianpackage-linux-stable"
-  }
-}
-job {
-  id: "flutter-analyze"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "flutter-analyze"
-  }
-}
-job {
-  id: "flutter-engine-ios"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "flutter-engine-ios"
-  }
-}
-job {
-  id: "flutter-engine-linux"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "flutter-engine-linux"
-  }
-}
-job {
-  id: "flutter-engine-linux-web_tests"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "flutter-engine-linux-web_tests"
-  }
-}
-job {
-  id: "flutter-frontend"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "flutter-frontend"
-  }
-}
-job {
-  id: "front-end-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-linux-release-x64"
-  }
-}
-job {
-  id: "front-end-linux-release-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-linux-release-x64-beta"
-  }
-}
-job {
-  id: "front-end-linux-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-linux-release-x64-dev"
-  }
-}
-job {
-  id: "front-end-linux-release-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-linux-release-x64-stable"
-  }
-}
-job {
-  id: "front-end-mac-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-mac-release-x64"
-  }
-}
-job {
-  id: "front-end-mac-release-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-mac-release-x64-beta"
-  }
-}
-job {
-  id: "front-end-mac-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-mac-release-x64-dev"
-  }
-}
-job {
-  id: "front-end-mac-release-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-mac-release-x64-stable"
-  }
-}
-job {
-  id: "front-end-nnbd-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-nnbd-linux-release-x64"
-  }
-}
-job {
-  id: "front-end-nnbd-linux-release-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-nnbd-linux-release-x64-beta"
-  }
-}
-job {
-  id: "front-end-nnbd-linux-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-nnbd-linux-release-x64-dev"
-  }
-}
-job {
-  id: "front-end-nnbd-linux-release-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-nnbd-linux-release-x64-stable"
-  }
-}
-job {
-  id: "front-end-nnbd-mac-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-nnbd-mac-release-x64"
-  }
-}
-job {
-  id: "front-end-nnbd-win-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-nnbd-win-release-x64"
-  }
-}
-job {
-  id: "front-end-win-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-win-release-x64"
-  }
-}
-job {
-  id: "front-end-win-release-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-win-release-x64-beta"
-  }
-}
-job {
-  id: "front-end-win-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-win-release-x64-dev"
-  }
-}
-job {
-  id: "front-end-win-release-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "front-end-win-release-x64-stable"
-  }
-}
-job {
-  id: "frontend-weekly"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "frontend-weekly"
-  }
-}
-job {
-  id: "fuzz-linux"
-  realm: "ci.sandbox"
-  schedule: "0 3,4 * * *"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "fuzz-linux"
-  }
-}
-job {
-  id: "gclient"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "gclient"
-  }
-}
-job {
-  id: "gclient-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "gclient-beta"
-  }
-}
-job {
-  id: "gclient-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "gclient-dev"
-  }
-}
-job {
-  id: "gclient-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "gclient-stable"
-  }
-}
-job {
-  id: "google"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "google"
-  }
-}
-job {
-  id: "iso-stress-linux"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "iso-stress-linux"
-  }
-}
-job {
-  id: "linearize-flutter"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  triggering_policy {
-    kind: GREEDY_BATCHING
-    max_batch_size: 1
-  }
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "linearize-flutter"
-  }
-}
-job {
-  id: "pkg-linux-debug"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-linux-debug"
-  }
-}
-job {
-  id: "pkg-linux-release"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-linux-release"
-  }
-}
-job {
-  id: "pkg-linux-release-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-linux-release-beta"
-  }
-}
-job {
-  id: "pkg-linux-release-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-linux-release-dev"
-  }
-}
-job {
-  id: "pkg-linux-release-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-linux-release-stable"
-  }
-}
-job {
-  id: "pkg-mac-release"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-mac-release"
-  }
-}
-job {
-  id: "pkg-mac-release-arm64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-mac-release-arm64"
-  }
-}
-job {
-  id: "pkg-mac-release-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-mac-release-beta"
-  }
-}
-job {
-  id: "pkg-mac-release-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-mac-release-dev"
-  }
-}
-job {
-  id: "pkg-mac-release-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-mac-release-stable"
-  }
-}
-job {
-  id: "pkg-win-release"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-win-release"
-  }
-}
-job {
-  id: "pkg-win-release-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-win-release-beta"
-  }
-}
-job {
-  id: "pkg-win-release-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-win-release-dev"
-  }
-}
-job {
-  id: "pkg-win-release-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "pkg-win-release-stable"
-  }
-}
-job {
-  id: "recipe-bundler"
-  realm: "ci"
-  schedule: "*/30 * * * *"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "recipe-bundler"
-  }
-}
-job {
-  id: "recipe-deps-roller"
-  realm: "ci"
-  schedule: "with 4h interval"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
-    builder: "recipe-deps-roller"
-  }
-}
-job {
-  id: "roll-to-dev"
-  realm: "ci.roll"
-  schedule: "with 4h interval"
-  acl_sets: "ci.roll"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.roll"
-    builder: "roll-to-dev"
-  }
-}
-job {
-  id: "vm-canary-linux-debug"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-canary-linux-debug"
-  }
-}
-job {
-  id: "vm-canary-linux-debug-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-canary-linux-debug-beta"
-  }
-}
-job {
-  id: "vm-canary-linux-debug-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-canary-linux-debug-dev"
-  }
-}
-job {
-  id: "vm-canary-linux-debug-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-canary-linux-debug-stable"
-  }
-}
-job {
-  id: "vm-ffi-android-debug-arm"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-debug-arm"
-  }
-}
-job {
-  id: "vm-ffi-android-debug-arm-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-debug-arm-beta"
-  }
-}
-job {
-  id: "vm-ffi-android-debug-arm-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-debug-arm-dev"
-  }
-}
-job {
-  id: "vm-ffi-android-debug-arm-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-debug-arm-stable"
-  }
-}
-job {
-  id: "vm-ffi-android-debug-arm64c"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-debug-arm64c"
-  }
-}
-job {
-  id: "vm-ffi-android-debug-arm64c-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-debug-arm64c-beta"
-  }
-}
-job {
-  id: "vm-ffi-android-debug-arm64c-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-debug-arm64c-dev"
-  }
-}
-job {
-  id: "vm-ffi-android-debug-arm64c-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-debug-arm64c-stable"
-  }
-}
-job {
-  id: "vm-ffi-android-product-arm"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-product-arm"
-  }
-}
-job {
-  id: "vm-ffi-android-product-arm-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-product-arm-beta"
-  }
-}
-job {
-  id: "vm-ffi-android-product-arm-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-product-arm-dev"
-  }
-}
-job {
-  id: "vm-ffi-android-product-arm-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-product-arm-stable"
-  }
-}
-job {
-  id: "vm-ffi-android-product-arm64c"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-product-arm64c"
-  }
-}
-job {
-  id: "vm-ffi-android-product-arm64c-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-product-arm64c-beta"
-  }
-}
-job {
-  id: "vm-ffi-android-product-arm64c-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-product-arm64c-dev"
-  }
-}
-job {
-  id: "vm-ffi-android-product-arm64c-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-product-arm64c-stable"
-  }
-}
-job {
-  id: "vm-ffi-android-release-arm"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-release-arm"
-  }
-}
-job {
-  id: "vm-ffi-android-release-arm-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-release-arm-beta"
-  }
-}
-job {
-  id: "vm-ffi-android-release-arm-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-release-arm-dev"
-  }
-}
-job {
-  id: "vm-ffi-android-release-arm-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-release-arm-stable"
-  }
-}
-job {
-  id: "vm-ffi-android-release-arm64c"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-release-arm64c"
-  }
-}
-job {
-  id: "vm-ffi-android-release-arm64c-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-release-arm64c-beta"
-  }
-}
-job {
-  id: "vm-ffi-android-release-arm64c-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-release-arm64c-dev"
-  }
-}
-job {
-  id: "vm-ffi-android-release-arm64c-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-ffi-android-release-arm64c-stable"
-  }
-}
-job {
-  id: "vm-fuchsia-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-fuchsia-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-asan-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-asan-linux-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-checked-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-checked-linux-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-checked-linux-release-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-checked-linux-release-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-checked-linux-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-checked-linux-release-x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-checked-linux-release-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-checked-linux-release-x64-stable"
-  }
-}
-job {
-  id: "vm-kernel-gcc-linux"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-gcc-linux"
-  }
-}
-job {
-  id: "vm-kernel-gcc-linux-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-gcc-linux-beta"
-  }
-}
-job {
-  id: "vm-kernel-gcc-linux-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-gcc-linux-dev"
-  }
-}
-job {
-  id: "vm-kernel-gcc-linux-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-gcc-linux-stable"
-  }
-}
-job {
-  id: "vm-kernel-linux-debug-ia32"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-ia32"
-  }
-}
-job {
-  id: "vm-kernel-linux-debug-simriscv64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-simriscv64"
-  }
-}
-job {
-  id: "vm-kernel-linux-debug-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-x64"
-  }
-}
-job {
-  id: "vm-kernel-linux-debug-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-linux-debug-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-linux-debug-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-x64-stable"
-  }
-}
-job {
-  id: "vm-kernel-linux-debug-x64c"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-debug-x64c"
-  }
-}
-job {
-  id: "vm-kernel-linux-product-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-product-x64"
-  }
-}
-job {
-  id: "vm-kernel-linux-release-ia32"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-ia32"
-  }
-}
-job {
-  id: "vm-kernel-linux-release-simarm"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm"
-  }
-}
-job {
-  id: "vm-kernel-linux-release-simarm-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm-beta"
-  }
-}
-job {
-  id: "vm-kernel-linux-release-simarm-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm-dev"
-  }
-}
-job {
-  id: "vm-kernel-linux-release-simarm-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm-stable"
-  }
-}
-job {
-  id: "vm-kernel-linux-release-simarm64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm64"
-  }
-}
-job {
-  id: "vm-kernel-linux-release-simarm64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm64-beta"
-  }
-}
-job {
-  id: "vm-kernel-linux-release-simarm64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm64-dev"
-  }
-}
-job {
-  id: "vm-kernel-linux-release-simarm64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm64-stable"
-  }
-}
-job {
-  id: "vm-kernel-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-linux-release-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-linux-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-linux-release-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-linux-release-x64-stable"
-  }
-}
-job {
-  id: "vm-kernel-mac-debug-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-debug-x64"
-  }
-}
-job {
-  id: "vm-kernel-mac-debug-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-debug-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-mac-debug-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-debug-x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-mac-debug-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-debug-x64-stable"
-  }
-}
-job {
-  id: "vm-kernel-mac-product-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-product-x64"
-  }
-}
-job {
-  id: "vm-kernel-mac-release-arm64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-release-arm64"
-  }
-}
-job {
-  id: "vm-kernel-mac-release-arm64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-release-arm64-dev"
-  }
-}
-job {
-  id: "vm-kernel-mac-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-mac-release-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-release-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-mac-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-release-x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-mac-release-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-mac-release-x64-stable"
-  }
-}
-job {
-  id: "vm-kernel-msan-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-msan-linux-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-nnbd-linux-debug-ia32"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-debug-ia32"
-  }
-}
-job {
-  id: "vm-kernel-nnbd-linux-debug-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-debug-x64"
-  }
-}
-job {
-  id: "vm-kernel-nnbd-linux-debug-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-debug-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-nnbd-linux-debug-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-debug-x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-nnbd-linux-debug-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-debug-x64-stable"
-  }
-}
-job {
-  id: "vm-kernel-nnbd-linux-release-ia32"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-release-ia32"
-  }
-}
-job {
-  id: "vm-kernel-nnbd-linux-release-simarm"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-release-simarm"
-  }
-}
-job {
-  id: "vm-kernel-nnbd-linux-release-simarm64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-release-simarm64"
-  }
-}
-job {
-  id: "vm-kernel-nnbd-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-nnbd-linux-release-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-release-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-nnbd-linux-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-release-x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-nnbd-linux-release-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-release-x64-stable"
-  }
-}
-job {
-  id: "vm-kernel-nnbd-mac-debug-arm64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-nnbd-mac-debug-arm64"
-  }
-}
-job {
-  id: "vm-kernel-nnbd-mac-debug-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-nnbd-mac-debug-x64"
-  }
-}
-job {
-  id: "vm-kernel-nnbd-mac-release-arm64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-nnbd-mac-release-arm64"
-  }
-}
-job {
-  id: "vm-kernel-nnbd-mac-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-nnbd-mac-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-nnbd-win-debug-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-nnbd-win-debug-x64"
-  }
-}
-job {
-  id: "vm-kernel-nnbd-win-release-ia32"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-nnbd-win-release-ia32"
-  }
-}
-job {
-  id: "vm-kernel-nnbd-win-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-nnbd-win-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-optcounter-threshold-linux-release-ia32"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-optcounter-threshold-linux-release-ia32"
-  }
-}
-job {
-  id: "vm-kernel-optcounter-threshold-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-optcounter-threshold-linux-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-android-release-arm64c"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm64c"
-  }
-}
-job {
-  id: "vm-kernel-precomp-android-release-arm64c-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm64c-beta"
-  }
-}
-job {
-  id: "vm-kernel-precomp-android-release-arm64c-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm64c-dev"
-  }
-}
-job {
-  id: "vm-kernel-precomp-android-release-arm64c-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm64c-stable"
-  }
-}
-job {
-  id: "vm-kernel-precomp-android-release-arm_x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm_x64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-android-release-arm_x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm_x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-precomp-android-release-arm_x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm_x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-precomp-android-release-arm_x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm_x64-stable"
-  }
-}
-job {
-  id: "vm-kernel-precomp-asan-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-asan-linux-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-dwarf-linux-product-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-dwarf-linux-product-x64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-debug-simarm_x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-simarm_x64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-debug-simriscv64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-simriscv64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-debug-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-debug-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-debug-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-debug-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64-stable"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-debug-x64c"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64c"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-product-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-product-x64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-product-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-product-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-product-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-product-x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-product-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-product-x64-stable"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-simarm"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-simarm-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm-beta"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-simarm-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm-dev"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-simarm-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm-stable"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-simarm64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-simarm64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm64-beta"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-simarm64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm64-dev"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-simarm64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm64-stable"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-simarm_x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm_x64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-simarm_x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm_x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-simarm_x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm_x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-simarm_x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm_x64-stable"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-x64-stable"
-  }
-}
-job {
-  id: "vm-kernel-precomp-mac-release-simarm64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-mac-release-simarm64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-mac-release-simarm64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-mac-release-simarm64-beta"
-  }
-}
-job {
-  id: "vm-kernel-precomp-mac-release-simarm64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-mac-release-simarm64-dev"
-  }
-}
-job {
-  id: "vm-kernel-precomp-mac-release-simarm64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-mac-release-simarm64-stable"
-  }
-}
-job {
-  id: "vm-kernel-precomp-msan-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-msan-linux-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-nnbd-linux-debug-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-debug-x64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-nnbd-linux-release-simarm64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-simarm64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-nnbd-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
-  }
-}
-job {
-  id: "vm-kernel-precomp-nnbd-mac-release-arm64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-mac-release-arm64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-nnbd-mac-release-simarm64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-mac-release-simarm64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-nnbd-win-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-win-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-obfuscate-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-obfuscate-linux-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
-  }
-}
-job {
-  id: "vm-kernel-precomp-tsan-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-tsan-linux-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-ubsan-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-ubsan-linux-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-win-debug-x64c"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-win-debug-x64c"
-  }
-}
-job {
-  id: "vm-kernel-precomp-win-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-win-release-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-precomp-win-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-precomp-win-release-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-x64-stable"
-  }
-}
-job {
-  id: "vm-kernel-reload-linux-debug-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-linux-debug-x64"
-  }
-}
-job {
-  id: "vm-kernel-reload-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-linux-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-reload-rollback-linux-debug-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-debug-x64"
-  }
-}
-job {
-  id: "vm-kernel-reload-rollback-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-tsan-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-tsan-linux-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-ubsan-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-ubsan-linux-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-win-debug-ia32"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-debug-ia32"
-  }
-}
-job {
-  id: "vm-kernel-win-debug-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-debug-x64"
-  }
-}
-job {
-  id: "vm-kernel-win-debug-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-debug-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-win-debug-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-debug-x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-win-debug-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-debug-x64-stable"
-  }
-}
-job {
-  id: "vm-kernel-win-debug-x64c"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-debug-x64c"
-  }
-}
-job {
-  id: "vm-kernel-win-product-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-product-x64"
-  }
-}
-job {
-  id: "vm-kernel-win-release-ia32"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-release-ia32"
-  }
-}
-job {
-  id: "vm-kernel-win-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-win-release-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-release-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-win-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-release-x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-win-release-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-kernel-win-release-x64-stable"
-  }
-}
-job {
-  id: "vm-precomp-ffi-qemu-linux-release-arm"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-arm"
-  }
-}
-job {
-  id: "vm-precomp-ffi-qemu-linux-release-arm-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-arm-beta"
-  }
-}
-job {
-  id: "vm-precomp-ffi-qemu-linux-release-arm-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-arm-dev"
-  }
-}
-job {
-  id: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
-  }
-}
-job {
-  id: "vm-precomp-ffi-qemu-linux-release-arm-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-arm-stable"
-  }
-}
-job {
-  id: "vm-precomp-ffi-qemu-linux-release-riscv64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-riscv64"
-  }
-}
-job {
-  id: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
-  }
-}
-job {
-  id: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
-  }
-}
-job {
-  id: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
-  }
-}
-trigger {
-  id: "dart-ci-test-data-trigger"
-  realm: "ci"
-  acl_sets: "ci"
-  triggers: "ci-test-data"
-  gitiles {
-    repo: "https://dart.googlesource.com/sdk"
-    refs: "regexp:refs/heads/ci-test-data"
-    path_regexps: "tools/bots/ci_test_data_trigger"
-  }
-}
-trigger {
-  id: "dart-flutter-engine-trigger"
-  realm: "ci"
-  acl_sets: "ci"
-  triggers: "linearize-flutter"
-  gitiles {
-    repo: "https://dart.googlesource.com/external/github.com/flutter/engine"
-    refs: "regexp:refs/heads/master"
-  }
-}
-trigger {
-  id: "dart-flutter-flutter-trigger"
-  realm: "ci"
-  acl_sets: "ci"
-  triggers: "linearize-flutter"
-  gitiles {
-    repo: "https://dart.googlesource.com/external/github.com/flutter/flutter"
-    refs: "regexp:refs/heads/master"
-  }
-}
-trigger {
-  id: "dart-gitiles-trigger-beta"
-  realm: "ci"
-  acl_sets: "ci"
-  triggers: "dart-sdk-linux-beta"
-  triggers: "dart-sdk-mac-arm64-beta"
-  triggers: "dart-sdk-mac-beta"
-  triggers: "dart-sdk-win-beta"
-  triggers: "debianpackage-linux-beta"
-  triggers: "analyzer-analysis-server-linux-beta"
-  triggers: "analyzer-linux-release-beta"
-  triggers: "analyzer-mac-release-beta"
-  triggers: "analyzer-nnbd-linux-release-beta"
-  triggers: "analyzer-win-release-beta"
-  triggers: "app-kernel-linux-debug-x64-beta"
-  triggers: "app-kernel-linux-release-x64-beta"
-  triggers: "dart2js-canary-x64-beta"
-  triggers: "dart2js-csp-minified-linux-x64-chrome-beta"
-  triggers: "dart2js-minified-strong-linux-x64-d8-beta"
-  triggers: "dart2js-nnbd-linux-x64-chrome-beta"
-  triggers: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
-  triggers: "dart2js-strong-linux-x64-chrome-beta"
-  triggers: "dart2js-strong-linux-x64-firefox-beta"
-  triggers: "dart2js-strong-mac-x64-chrome-beta"
-  triggers: "dart2js-strong-mac-x64-safari-beta"
-  triggers: "dart2js-strong-win-x64-chrome-beta"
-  triggers: "dart2js-unit-linux-x64-release-beta"
-  triggers: "ddc-linux-release-chrome-beta"
-  triggers: "ddc-mac-release-chrome-beta"
-  triggers: "ddc-win-release-chrome-beta"
-  triggers: "ddk-linux-release-firefox-beta"
-  triggers: "front-end-linux-release-x64-beta"
-  triggers: "front-end-mac-release-x64-beta"
-  triggers: "front-end-nnbd-linux-release-x64-beta"
-  triggers: "front-end-win-release-x64-beta"
-  triggers: "gclient-beta"
-  triggers: "pkg-linux-release-beta"
-  triggers: "pkg-mac-release-beta"
-  triggers: "pkg-win-release-beta"
-  triggers: "vm-canary-linux-debug-beta"
-  triggers: "vm-ffi-android-debug-arm-beta"
-  triggers: "vm-ffi-android-debug-arm64c-beta"
-  triggers: "vm-ffi-android-product-arm-beta"
-  triggers: "vm-ffi-android-product-arm64c-beta"
-  triggers: "vm-ffi-android-release-arm-beta"
-  triggers: "vm-ffi-android-release-arm64c-beta"
-  triggers: "vm-kernel-checked-linux-release-x64-beta"
-  triggers: "vm-kernel-linux-debug-x64-beta"
-  triggers: "vm-kernel-linux-release-simarm-beta"
-  triggers: "vm-kernel-linux-release-simarm64-beta"
-  triggers: "vm-kernel-linux-release-x64-beta"
-  triggers: "vm-kernel-mac-debug-x64-beta"
-  triggers: "vm-kernel-mac-release-x64-beta"
-  triggers: "vm-kernel-nnbd-linux-debug-x64-beta"
-  triggers: "vm-kernel-nnbd-linux-release-x64-beta"
-  triggers: "vm-kernel-precomp-android-release-arm64c-beta"
-  triggers: "vm-kernel-precomp-android-release-arm_x64-beta"
-  triggers: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
-  triggers: "vm-kernel-precomp-linux-debug-x64-beta"
-  triggers: "vm-kernel-precomp-linux-product-x64-beta"
-  triggers: "vm-kernel-precomp-linux-release-simarm-beta"
-  triggers: "vm-kernel-precomp-linux-release-simarm64-beta"
-  triggers: "vm-kernel-precomp-linux-release-simarm_x64-beta"
-  triggers: "vm-kernel-precomp-linux-release-x64-beta"
-  triggers: "vm-kernel-precomp-mac-release-simarm64-beta"
-  triggers: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
-  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
-  triggers: "vm-kernel-precomp-win-release-x64-beta"
-  triggers: "vm-kernel-win-debug-x64-beta"
-  triggers: "vm-kernel-win-release-x64-beta"
-  triggers: "vm-precomp-ffi-qemu-linux-release-arm-beta"
-  triggers: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
-  gitiles {
-    repo: "https://dart.googlesource.com/sdk"
-    refs: "regexp:refs/heads/beta"
-  }
-}
-trigger {
-  id: "dart-gitiles-trigger-dev"
-  realm: "ci"
-  acl_sets: "ci"
-  triggers: "dart-sdk-linux-dev"
-  triggers: "dart-sdk-mac-arm64-dev"
-  triggers: "dart-sdk-mac-dev"
-  triggers: "dart-sdk-win-dev"
-  triggers: "debianpackage-linux-dev"
-  triggers: "analyzer-analysis-server-linux-dev"
-  triggers: "analyzer-linux-release-dev"
-  triggers: "analyzer-mac-release-dev"
-  triggers: "analyzer-nnbd-linux-release-dev"
-  triggers: "analyzer-win-release-dev"
-  triggers: "app-kernel-linux-debug-x64-dev"
-  triggers: "app-kernel-linux-release-x64-dev"
-  triggers: "dart2js-canary-x64-dev"
-  triggers: "dart2js-csp-minified-linux-x64-chrome-dev"
-  triggers: "dart2js-minified-strong-linux-x64-d8-dev"
-  triggers: "dart2js-nnbd-linux-x64-chrome-dev"
-  triggers: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
-  triggers: "dart2js-strong-linux-x64-chrome-dev"
-  triggers: "dart2js-strong-linux-x64-firefox-dev"
-  triggers: "dart2js-strong-mac-x64-chrome-dev"
-  triggers: "dart2js-strong-mac-x64-safari-dev"
-  triggers: "dart2js-strong-win-x64-chrome-dev"
-  triggers: "dart2js-unit-linux-x64-release-dev"
-  triggers: "ddc-linux-release-chrome-dev"
-  triggers: "ddc-mac-release-chrome-dev"
-  triggers: "ddc-win-release-chrome-dev"
-  triggers: "ddk-linux-release-firefox-dev"
-  triggers: "front-end-linux-release-x64-dev"
-  triggers: "front-end-mac-release-x64-dev"
-  triggers: "front-end-nnbd-linux-release-x64-dev"
-  triggers: "front-end-win-release-x64-dev"
-  triggers: "gclient-dev"
-  triggers: "pkg-linux-release-dev"
-  triggers: "pkg-mac-release-dev"
-  triggers: "pkg-win-release-dev"
-  triggers: "vm-canary-linux-debug-dev"
-  triggers: "vm-ffi-android-debug-arm-dev"
-  triggers: "vm-ffi-android-debug-arm64c-dev"
-  triggers: "vm-ffi-android-product-arm-dev"
-  triggers: "vm-ffi-android-product-arm64c-dev"
-  triggers: "vm-ffi-android-release-arm-dev"
-  triggers: "vm-ffi-android-release-arm64c-dev"
-  triggers: "vm-kernel-checked-linux-release-x64-dev"
-  triggers: "vm-kernel-linux-debug-x64-dev"
-  triggers: "vm-kernel-linux-release-simarm-dev"
-  triggers: "vm-kernel-linux-release-simarm64-dev"
-  triggers: "vm-kernel-linux-release-x64-dev"
-  triggers: "vm-kernel-mac-debug-x64-dev"
-  triggers: "vm-kernel-mac-release-arm64-dev"
-  triggers: "vm-kernel-mac-release-x64-dev"
-  triggers: "vm-kernel-nnbd-linux-debug-x64-dev"
-  triggers: "vm-kernel-nnbd-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-android-release-arm64c-dev"
-  triggers: "vm-kernel-precomp-android-release-arm_x64-dev"
-  triggers: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
-  triggers: "vm-kernel-precomp-linux-debug-x64-dev"
-  triggers: "vm-kernel-precomp-linux-product-x64-dev"
-  triggers: "vm-kernel-precomp-linux-release-simarm-dev"
-  triggers: "vm-kernel-precomp-linux-release-simarm64-dev"
-  triggers: "vm-kernel-precomp-linux-release-simarm_x64-dev"
-  triggers: "vm-kernel-precomp-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-mac-release-simarm64-dev"
-  triggers: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-win-release-x64-dev"
-  triggers: "vm-kernel-win-debug-x64-dev"
-  triggers: "vm-kernel-win-release-x64-dev"
-  triggers: "vm-precomp-ffi-qemu-linux-release-arm-dev"
-  triggers: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
-  gitiles {
-    repo: "https://dart.googlesource.com/sdk"
-    refs: "regexp:refs/heads/dev"
-  }
-}
-trigger {
-  id: "dart-gitiles-trigger-flutter"
-  realm: "ci"
-  acl_sets: "ci"
-  triggers: "flutter-engine-linux"
-  triggers: "flutter-engine-linux-web_tests"
-  gitiles {
-    repo: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
-    refs: "regexp:refs/heads/master"
-  }
-}
-trigger {
-  id: "dart-gitiles-trigger-flutter-daily"
-  realm: "ci"
-  schedule: "0 8 * * *"
-  acl_sets: "ci"
-  triggers: "flutter-engine-ios"
-  gitiles {
-    repo: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
-    refs: "regexp:refs/heads/master"
-  }
-}
-trigger {
-  id: "dart-gitiles-trigger-main"
-  realm: "ci"
-  acl_sets: "ci"
-  triggers: "debianpackage-linux"
-  triggers: "linearize-flutter"
-  triggers: "analyzer-analysis-server-linux"
-  triggers: "analyzer-linux-release"
-  triggers: "analyzer-mac-release"
-  triggers: "analyzer-nnbd-linux-release"
-  triggers: "analyzer-win-release"
-  triggers: "dart2js-canary-x64"
-  triggers: "dart2js-csp-minified-linux-x64-chrome"
-  triggers: "dart2js-minified-strong-linux-x64-d8"
-  triggers: "dart2js-nnbd-linux-x64-chrome"
-  triggers: "dart2js-strong-hostasserts-linux-ia32-d8"
-  triggers: "dart2js-strong-linux-x64-chrome"
-  triggers: "dart2js-strong-linux-x64-firefox"
-  triggers: "dart2js-strong-mac-x64-chrome"
-  triggers: "dart2js-strong-mac-x64-safari"
-  triggers: "dart2js-strong-win-x64-chrome"
-  triggers: "dart2js-unit-linux-x64-release"
-  triggers: "ddc-linux-release-chrome"
-  triggers: "ddc-mac-release-chrome"
-  triggers: "ddc-nnbd-linux-release-chrome"
-  triggers: "ddc-win-release-chrome"
-  triggers: "ddk-linux-release-firefox"
-  triggers: "flutter-analyze"
-  triggers: "flutter-frontend"
-  triggers: "front-end-linux-release-x64"
-  triggers: "front-end-mac-release-x64"
-  triggers: "front-end-nnbd-linux-release-x64"
-  triggers: "front-end-win-release-x64"
-  triggers: "gclient"
-  triggers: "pkg-linux-debug"
-  triggers: "pkg-linux-release"
-  triggers: "pkg-mac-release"
-  triggers: "pkg-mac-release-arm64"
-  triggers: "pkg-win-release"
-  triggers: "vm-kernel-linux-debug-x64"
-  triggers: "vm-kernel-linux-release-x64"
-  triggers: "vm-kernel-mac-debug-x64"
-  triggers: "vm-kernel-mac-release-arm64"
-  triggers: "vm-kernel-mac-release-x64"
-  triggers: "vm-kernel-win-debug-x64"
-  triggers: "vm-kernel-win-release-x64"
-  gitiles {
-    repo: "https://dart.googlesource.com/sdk"
-    refs: "regexp:refs/heads/main"
-  }
-}
-trigger {
-  id: "dart-gitiles-trigger-stable"
-  realm: "ci"
-  acl_sets: "ci"
-  triggers: "dart-sdk-linux-stable"
-  triggers: "dart-sdk-mac-arm64-stable"
-  triggers: "dart-sdk-mac-stable"
-  triggers: "dart-sdk-win-stable"
-  triggers: "debianpackage-linux-stable"
-  triggers: "analyzer-analysis-server-linux-stable"
-  triggers: "analyzer-linux-release-stable"
-  triggers: "analyzer-mac-release-stable"
-  triggers: "analyzer-nnbd-linux-release-stable"
-  triggers: "analyzer-win-release-stable"
-  triggers: "app-kernel-linux-debug-x64-stable"
-  triggers: "app-kernel-linux-release-x64-stable"
-  triggers: "dart2js-canary-x64-stable"
-  triggers: "dart2js-csp-minified-linux-x64-chrome-stable"
-  triggers: "dart2js-minified-strong-linux-x64-d8-stable"
-  triggers: "dart2js-nnbd-linux-x64-chrome-stable"
-  triggers: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
-  triggers: "dart2js-strong-linux-x64-chrome-stable"
-  triggers: "dart2js-strong-linux-x64-firefox-stable"
-  triggers: "dart2js-strong-mac-x64-chrome-stable"
-  triggers: "dart2js-strong-mac-x64-safari-stable"
-  triggers: "dart2js-strong-win-x64-chrome-stable"
-  triggers: "dart2js-unit-linux-x64-release-stable"
-  triggers: "ddc-linux-release-chrome-stable"
-  triggers: "ddc-mac-release-chrome-stable"
-  triggers: "ddc-win-release-chrome-stable"
-  triggers: "ddk-linux-release-firefox-stable"
-  triggers: "front-end-linux-release-x64-stable"
-  triggers: "front-end-mac-release-x64-stable"
-  triggers: "front-end-nnbd-linux-release-x64-stable"
-  triggers: "front-end-win-release-x64-stable"
-  triggers: "gclient-stable"
-  triggers: "pkg-linux-release-stable"
-  triggers: "pkg-mac-release-stable"
-  triggers: "pkg-win-release-stable"
-  triggers: "vm-canary-linux-debug-stable"
-  triggers: "vm-ffi-android-debug-arm-stable"
-  triggers: "vm-ffi-android-debug-arm64c-stable"
-  triggers: "vm-ffi-android-product-arm-stable"
-  triggers: "vm-ffi-android-product-arm64c-stable"
-  triggers: "vm-ffi-android-release-arm-stable"
-  triggers: "vm-ffi-android-release-arm64c-stable"
-  triggers: "vm-kernel-checked-linux-release-x64-stable"
-  triggers: "vm-kernel-linux-debug-x64-stable"
-  triggers: "vm-kernel-linux-release-simarm-stable"
-  triggers: "vm-kernel-linux-release-simarm64-stable"
-  triggers: "vm-kernel-linux-release-x64-stable"
-  triggers: "vm-kernel-mac-debug-x64-stable"
-  triggers: "vm-kernel-mac-release-x64-stable"
-  triggers: "vm-kernel-nnbd-linux-debug-x64-stable"
-  triggers: "vm-kernel-nnbd-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-android-release-arm64c-stable"
-  triggers: "vm-kernel-precomp-android-release-arm_x64-stable"
-  triggers: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
-  triggers: "vm-kernel-precomp-linux-debug-x64-stable"
-  triggers: "vm-kernel-precomp-linux-product-x64-stable"
-  triggers: "vm-kernel-precomp-linux-release-simarm-stable"
-  triggers: "vm-kernel-precomp-linux-release-simarm64-stable"
-  triggers: "vm-kernel-precomp-linux-release-simarm_x64-stable"
-  triggers: "vm-kernel-precomp-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-mac-release-simarm64-stable"
-  triggers: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-win-release-x64-stable"
-  triggers: "vm-kernel-win-debug-x64-stable"
-  triggers: "vm-kernel-win-release-x64-stable"
-  triggers: "vm-precomp-ffi-qemu-linux-release-arm-stable"
-  triggers: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
-  gitiles {
-    repo: "https://dart.googlesource.com/sdk"
-    refs: "regexp:refs/heads/stable"
-  }
-}
-trigger {
-  id: "dart-nightly-trigger"
-  realm: "ci"
-  schedule: "0 5 * * *"
-  acl_sets: "ci"
-  triggers: "analyzer-nnbd-mac-release"
-  triggers: "analyzer-nnbd-win-release"
-  triggers: "app-kernel-linux-product-x64"
-  triggers: "cross-vm-precomp-linux-release-arm64"
-  triggers: "front-end-nnbd-mac-release-x64"
-  triggers: "front-end-nnbd-win-release-x64"
-  triggers: "vm-kernel-asan-linux-release-x64"
-  triggers: "vm-kernel-gcc-linux"
-  triggers: "vm-kernel-gcc-linux-beta"
-  triggers: "vm-kernel-gcc-linux-dev"
-  triggers: "vm-kernel-gcc-linux-stable"
-  triggers: "vm-kernel-linux-debug-ia32"
-  triggers: "vm-kernel-linux-debug-simriscv64"
-  triggers: "vm-kernel-linux-debug-x64c"
-  triggers: "vm-kernel-linux-product-x64"
-  triggers: "vm-kernel-linux-release-ia32"
-  triggers: "vm-kernel-mac-product-x64"
-  triggers: "vm-kernel-msan-linux-release-x64"
-  triggers: "vm-kernel-nnbd-linux-debug-ia32"
-  triggers: "vm-kernel-nnbd-linux-release-ia32"
-  triggers: "vm-kernel-nnbd-linux-release-simarm"
-  triggers: "vm-kernel-nnbd-linux-release-simarm64"
-  triggers: "vm-kernel-nnbd-mac-debug-arm64"
-  triggers: "vm-kernel-nnbd-mac-debug-x64"
-  triggers: "vm-kernel-nnbd-mac-release-x64"
-  triggers: "vm-kernel-nnbd-win-debug-x64"
-  triggers: "vm-kernel-nnbd-win-release-ia32"
-  triggers: "vm-kernel-nnbd-win-release-x64"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32"
-  triggers: "vm-kernel-precomp-asan-linux-release-x64"
-  triggers: "vm-kernel-precomp-dwarf-linux-product-x64"
-  triggers: "vm-kernel-precomp-linux-debug-simriscv64"
-  triggers: "vm-kernel-precomp-linux-debug-x64c"
-  triggers: "vm-kernel-precomp-msan-linux-release-x64"
-  triggers: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
-  triggers: "vm-kernel-precomp-nnbd-linux-debug-x64"
-  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm64"
-  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
-  triggers: "vm-kernel-precomp-nnbd-mac-release-simarm64"
-  triggers: "vm-kernel-precomp-nnbd-win-release-x64"
-  triggers: "vm-kernel-precomp-tsan-linux-release-x64"
-  triggers: "vm-kernel-precomp-ubsan-linux-release-x64"
-  triggers: "vm-kernel-precomp-win-debug-x64c"
-  triggers: "vm-kernel-reload-linux-debug-x64"
-  triggers: "vm-kernel-reload-linux-release-x64"
-  triggers: "vm-kernel-reload-rollback-linux-debug-x64"
-  triggers: "vm-kernel-reload-rollback-linux-release-x64"
-  triggers: "vm-kernel-tsan-linux-release-x64"
-  triggers: "vm-kernel-ubsan-linux-release-x64"
-  triggers: "vm-kernel-win-debug-ia32"
-  triggers: "vm-kernel-win-debug-x64c"
-  triggers: "vm-kernel-win-product-x64"
-  triggers: "vm-kernel-win-release-ia32"
-  triggers: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
-  gitiles {
-    repo: "https://dart.googlesource.com/sdk"
-    refs: "regexp:refs/heads/main"
-  }
-}
-trigger {
-  id: "dart-vm-gitiles-trigger-main"
-  realm: "ci"
-  acl_sets: "ci"
-  triggers: "app-kernel-linux-debug-x64"
-  triggers: "app-kernel-linux-release-x64"
-  triggers: "cross-vm-linux-release-arm64"
-  triggers: "iso-stress-linux"
-  triggers: "vm-canary-linux-debug"
-  triggers: "vm-ffi-android-debug-arm"
-  triggers: "vm-ffi-android-debug-arm64c"
-  triggers: "vm-ffi-android-product-arm"
-  triggers: "vm-ffi-android-product-arm64c"
-  triggers: "vm-ffi-android-release-arm"
-  triggers: "vm-ffi-android-release-arm64c"
-  triggers: "vm-fuchsia-release-x64"
-  triggers: "vm-kernel-checked-linux-release-x64"
-  triggers: "vm-kernel-linux-release-simarm"
-  triggers: "vm-kernel-linux-release-simarm64"
-  triggers: "vm-kernel-nnbd-linux-debug-x64"
-  triggers: "vm-kernel-nnbd-linux-release-x64"
-  triggers: "vm-kernel-nnbd-mac-release-arm64"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
-  triggers: "vm-kernel-precomp-android-release-arm64c"
-  triggers: "vm-kernel-precomp-android-release-arm_x64"
-  triggers: "vm-kernel-precomp-linux-debug-simarm_x64"
-  triggers: "vm-kernel-precomp-linux-debug-x64"
-  triggers: "vm-kernel-precomp-linux-product-x64"
-  triggers: "vm-kernel-precomp-linux-release-simarm"
-  triggers: "vm-kernel-precomp-linux-release-simarm64"
-  triggers: "vm-kernel-precomp-linux-release-simarm_x64"
-  triggers: "vm-kernel-precomp-linux-release-x64"
-  triggers: "vm-kernel-precomp-mac-release-simarm64"
-  triggers: "vm-kernel-precomp-nnbd-linux-release-x64"
-  triggers: "vm-kernel-precomp-nnbd-mac-release-arm64"
-  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64"
-  triggers: "vm-kernel-precomp-win-release-x64"
-  triggers: "vm-precomp-ffi-qemu-linux-release-arm"
-  triggers: "vm-precomp-ffi-qemu-linux-release-riscv64"
-  gitiles {
-    repo: "https://dart.googlesource.com/sdk"
-    refs: "regexp:refs/heads/main"
-    path_regexps: "DEPS"
-    path_regexps: "build/.+"
-    path_regexps: "BUILD.gn"
-    path_regexps: "sdk_args.gni"
-    path_regexps: ".dart_tool/package_config.json"
-    path_regexps: "sdk/.+"
-    path_regexps: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-    path_regexps: "tools/bots/test_matrix.json"
-    path_regexps: "tests/.+"
-    path_regexps: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-    path_regexps: "pkg/vm/.+"
-    path_regexps: "runtime/.+"
-  }
-}
-trigger {
-  id: "dart-weekly-trigger"
-  realm: "ci"
-  schedule: "0 0 * * SUN"
-  acl_sets: "ci"
-  triggers: "frontend-weekly"
-  gitiles {
-    repo: "https://dart.googlesource.com/sdk"
-    refs: "regexp:refs/heads/main"
-  }
-}
-trigger {
-  id: "recipes-dart"
-  realm: "ci"
-  acl_sets: "ci"
-  triggers: "recipe-bundler"
-  gitiles {
-    repo: "https://dart.googlesource.com/recipes"
-    refs: "regexp:refs/heads/main"
-  }
-}
-acl_sets {
-  name: "ci"
-  acls {
-    role: OWNER
-    granted_to: "group:project-dart-admins"
-  }
-  acls {
-    granted_to: "group:all"
-  }
-}
-acl_sets {
-  name: "ci.roll"
-  acls {
-    role: OWNER
-    granted_to: "group:project-dart-admins"
-  }
-  acls {
-    granted_to: "group:all"
-  }
-}
-acl_sets {
-  name: "ci.sandbox"
-  acls {
-    role: OWNER
-    granted_to: "group:project-dart-admins"
-  }
-  acls {
-    granted_to: "group:all"
-  }
-}
diff --git a/project.cfg b/project.cfg
deleted file mode 100644
index 3b6a49f36003..000000000000
--- a/project.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-#
-# For the schema of this file, see ProjectCfg message:
-#   https://luci-config.appspot.com/schemas/projects:project.cfg
-
-name: "dart"
-access: "group:all"
-lucicfg {
-  version: "1.30.9"
-  package_dir: "."
-  config_dir: "."
-  entry_point: "main.star"
-}
diff --git a/realms.cfg b/realms.cfg
deleted file mode 100644
index e7954da62b3b..000000000000
--- a/realms.cfg
+++ /dev/null
@@ -1,147 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-#
-# For the schema of this file, see RealmsCfg message:
-#   https://luci-config.appspot.com/schemas/projects:realms.cfg
-
-realms {
-  name: "@root"
-  bindings {
-    role: "role/buildbucket.reader"
-    principals: "group:all"
-  }
-  bindings {
-    role: "role/buildbucket.triggerer"
-    principals: "group:project-dart-admins"
-  }
-  bindings {
-    role: "role/configs.reader"
-    principals: "group:all"
-  }
-  bindings {
-    role: "role/configs.validator"
-    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-  }
-  bindings {
-    role: "role/cq.committer"
-    principals: "group:project-dart-committers"
-  }
-  bindings {
-    role: "role/cq.dryRunner"
-    principals: "group:project-dart-tryjob-access"
-  }
-  bindings {
-    role: "role/logdog.reader"
-    principals: "group:all"
-  }
-  bindings {
-    role: "role/logdog.writer"
-    principals: "group:luci-logdog-chromium-writers"
-  }
-  bindings {
-    role: "role/scheduler.owner"
-    principals: "group:project-dart-admins"
-  }
-  bindings {
-    role: "role/scheduler.reader"
-    principals: "group:all"
-  }
-  bindings {
-    role: "role/swarming.poolOwner"
-    principals: "group:project-dart-admins"
-  }
-  bindings {
-    role: "role/swarming.poolUser"
-    principals: "group:project-dart-admins"
-  }
-  bindings {
-    role: "role/swarming.poolViewer"
-    principals: "group:project-dart-committers"
-  }
-  bindings {
-    role: "role/swarming.taskTriggerer"
-    principals: "group:project-dart-admins"
-  }
-}
-realms {
-  name: "ci"
-  bindings {
-    role: "role/buildbucket.builderServiceAccount"
-    principals: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-  }
-  bindings {
-    role: "role/buildbucket.triggerer"
-    principals: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-  }
-}
-realms {
-  name: "ci.roll"
-  bindings {
-    role: "role/buildbucket.builderServiceAccount"
-    principals: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-  }
-  bindings {
-    role: "role/buildbucket.triggerer"
-    principals: "group:project-dart-roller-owners"
-    principals: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-  }
-}
-realms {
-  name: "ci.sandbox"
-  bindings {
-    role: "role/buildbucket.builderServiceAccount"
-    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-  }
-  bindings {
-    role: "role/buildbucket.triggerer"
-    principals: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-  }
-}
-realms {
-  name: "pools/ci"
-}
-realms {
-  name: "pools/tests"
-  bindings {
-    role: "role/swarming.poolUser"
-    principals: "group:mdb/dart-build-access"
-    principals: "group:project-dart-ci-task-accounts"
-    principals: "group:project-dart-try-task-accounts"
-  }
-}
-realms {
-  name: "pools/try"
-  bindings {
-    role: "role/swarming.poolUser"
-    principals: "group:mdb/dart-build-access"
-  }
-}
-realms {
-  name: "try"
-  bindings {
-    role: "role/buildbucket.builderServiceAccount"
-    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-  }
-  bindings {
-    role: "role/buildbucket.triggerer"
-    principals: "group:project-dart-tryjob-access"
-    principals: "group:service-account-cq"
-  }
-  bindings {
-    role: "role/swarming.taskTriggerer"
-    principals: "group:mdb/dart-build-access"
-  }
-}
-realms {
-  name: "try.shared"
-  bindings {
-    role: "role/buildbucket.builderServiceAccount"
-    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-  }
-  bindings {
-    role: "role/buildbucket.triggerer"
-    principals: "group:project-dart-tryjob-access"
-    principals: "group:service-account-cq"
-  }
-}

From 232a0d4b1bc4b05b1500160ac939075f90042889 Mon Sep 17 00:00:00 2001
From: Vadim Shtayura <vadimsh@google.com>
Date: Fri, 11 Feb 2022 09:22:12 +0000
Subject: [PATCH 528/826] Update active lucicfg experiments.

Remove retired noop experiments and add the one needed for the
ongoing luci-scheduler.cfg format migration.

Change-Id: Iae60c15331b6197d1ad271b0da9f6d6f6e6bc506
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/232540
Auto-Submit: Vadim Shtayura <vadimsh@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 3896 +---------------------------------
 generated/luci-scheduler.cfg |  708 +++---
 generated/project.cfg        |    1 +
 main.star                    |    6 +-
 4 files changed, 366 insertions(+), 4245 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 1992bd1ad2bb..26009ca3e241 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -48,18 +48,10 @@ buckets {
       execution_timeout_secs: 900
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "cbuild"
@@ -91,18 +83,10 @@ buckets {
       execution_timeout_secs: 600
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "chocolatey"
@@ -133,18 +117,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "co19-roller"
@@ -175,18 +151,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart-ci-scripts-linux"
@@ -217,18 +185,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart-ci-scripts-mac"
@@ -266,18 +226,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart-ci-scripts-mac-arm64"
@@ -315,18 +267,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart-ci-scripts-win"
@@ -357,18 +301,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart-sdk-linux-beta"
@@ -400,18 +336,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart-sdk-linux-dev"
@@ -443,18 +371,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart-sdk-linux-stable"
@@ -486,18 +406,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart-sdk-mac-arm64-beta"
@@ -538,18 +450,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart-sdk-mac-arm64-dev"
@@ -590,18 +494,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart-sdk-mac-arm64-stable"
@@ -642,18 +538,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart-sdk-mac-beta"
@@ -691,18 +579,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart-sdk-mac-dev"
@@ -740,18 +620,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart-sdk-mac-stable"
@@ -789,18 +661,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart-sdk-win-beta"
@@ -831,18 +695,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart-sdk-win-dev"
@@ -873,18 +729,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart-sdk-win-stable"
@@ -915,18 +763,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "debianpackage-linux"
@@ -957,18 +797,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "debianpackage-linux-beta"
@@ -999,18 +831,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "debianpackage-linux-dev"
@@ -1041,18 +865,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "debianpackage-linux-stable"
@@ -1083,18 +899,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "flutter-engine-ios"
@@ -1126,18 +934,10 @@ buckets {
       execution_timeout_secs: 7200
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "linearize-flutter"
@@ -1169,18 +969,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "recipe-bundler"
@@ -1218,18 +1010,10 @@ buckets {
       execution_timeout_secs: 300
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "recipe-deps-roller"
@@ -1269,18 +1053,10 @@ buckets {
       expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
   }
 }
@@ -1333,18 +1109,10 @@ buckets {
       execution_timeout_secs: 900
       build_numbers: YES
       service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
   }
 }
@@ -1397,18 +1165,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "analyzer-analysis-server-linux-beta"
@@ -1441,18 +1201,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "analyzer-analysis-server-linux-dev"
@@ -1485,18 +1237,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "analyzer-analysis-server-linux-stable"
@@ -1529,18 +1273,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "analyzer-linux-release"
@@ -1573,18 +1309,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "analyzer-linux-release-beta"
@@ -1617,18 +1345,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "analyzer-linux-release-dev"
@@ -1661,18 +1381,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "analyzer-linux-release-stable"
@@ -1705,18 +1417,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "analyzer-mac-release"
@@ -1756,18 +1460,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "analyzer-mac-release-beta"
@@ -1807,18 +1503,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "analyzer-mac-release-dev"
@@ -1858,18 +1546,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "analyzer-mac-release-stable"
@@ -1909,18 +1589,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "analyzer-nnbd-linux-release"
@@ -1953,18 +1625,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "analyzer-nnbd-linux-release-beta"
@@ -1997,18 +1661,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "analyzer-nnbd-linux-release-dev"
@@ -2041,18 +1697,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "analyzer-nnbd-linux-release-stable"
@@ -2085,18 +1733,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "analyzer-nnbd-mac-release"
@@ -2136,18 +1776,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "analyzer-nnbd-win-release"
@@ -2180,18 +1812,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "analyzer-win-release"
@@ -2228,18 +1852,10 @@ buckets {
         key: "dart.use_update_script"
         value: 100
       }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "analyzer-win-release-beta"
@@ -2276,18 +1892,10 @@ buckets {
         key: "dart.use_update_script"
         value: 100
       }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "analyzer-win-release-dev"
@@ -2324,18 +1932,10 @@ buckets {
         key: "dart.use_update_script"
         value: 100
       }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "analyzer-win-release-stable"
@@ -2372,18 +1972,10 @@ buckets {
         key: "dart.use_update_script"
         value: 100
       }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "app-kernel-linux-debug-x64"
@@ -2417,18 +2009,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "app-kernel-linux-debug-x64-beta"
@@ -2462,18 +2046,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "app-kernel-linux-debug-x64-dev"
@@ -2507,18 +2083,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "app-kernel-linux-debug-x64-stable"
@@ -2552,18 +2120,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "app-kernel-linux-product-x64"
@@ -2596,18 +2156,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "app-kernel-linux-release-x64"
@@ -2640,18 +2192,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "app-kernel-linux-release-x64-beta"
@@ -2684,18 +2228,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "app-kernel-linux-release-x64-dev"
@@ -2728,18 +2264,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "app-kernel-linux-release-x64-stable"
@@ -2772,18 +2300,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "ci-test-data"
@@ -2817,18 +2337,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "cross-vm-linux-release-arm64"
@@ -2862,18 +2374,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "cross-vm-precomp-linux-release-arm64"
@@ -2907,18 +2411,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-canary-x64"
@@ -2955,18 +2451,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-canary-x64-beta"
@@ -3003,18 +2491,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-canary-x64-dev"
@@ -3051,18 +2531,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-canary-x64-stable"
@@ -3099,18 +2571,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-csp-minified-linux-x64-chrome"
@@ -3147,18 +2611,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-csp-minified-linux-x64-chrome-beta"
@@ -3195,18 +2651,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-csp-minified-linux-x64-chrome-dev"
@@ -3243,18 +2691,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-csp-minified-linux-x64-chrome-stable"
@@ -3291,18 +2731,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-minified-strong-linux-x64-d8"
@@ -3338,18 +2770,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-minified-strong-linux-x64-d8-beta"
@@ -3385,18 +2809,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-minified-strong-linux-x64-d8-dev"
@@ -3432,18 +2848,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-minified-strong-linux-x64-d8-stable"
@@ -3479,18 +2887,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-nnbd-linux-x64-chrome"
@@ -3527,18 +2927,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-nnbd-linux-x64-chrome-beta"
@@ -3575,18 +2967,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-nnbd-linux-x64-chrome-dev"
@@ -3623,18 +3007,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-nnbd-linux-x64-chrome-stable"
@@ -3671,18 +3047,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-hostasserts-linux-ia32-d8"
@@ -3718,18 +3086,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
@@ -3765,18 +3125,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
@@ -3812,18 +3164,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
@@ -3859,18 +3203,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-linux-x64-chrome"
@@ -3907,18 +3243,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-linux-x64-chrome-beta"
@@ -3955,18 +3283,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-linux-x64-chrome-dev"
@@ -4004,15 +3324,7 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
+        key: "luci.recipes.use_python3"
         value: 100
       }
     }
@@ -4051,18 +3363,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-linux-x64-firefox"
@@ -4099,18 +3403,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-linux-x64-firefox-beta"
@@ -4147,18 +3443,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-linux-x64-firefox-dev"
@@ -4195,18 +3483,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-linux-x64-firefox-stable"
@@ -4243,18 +3523,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-mac-x64-chrome"
@@ -4298,18 +3570,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-mac-x64-chrome-beta"
@@ -4353,18 +3617,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-mac-x64-chrome-dev"
@@ -4408,18 +3664,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-mac-x64-chrome-stable"
@@ -4463,18 +3711,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-mac-x64-safari"
@@ -4517,18 +3757,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-mac-x64-safari-beta"
@@ -4571,18 +3803,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-mac-x64-safari-dev"
@@ -4625,18 +3849,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-mac-x64-safari-stable"
@@ -4679,18 +3895,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-win-x64-chrome"
@@ -4727,18 +3935,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-win-x64-chrome-beta"
@@ -4775,18 +3975,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-win-x64-chrome-dev"
@@ -4823,18 +4015,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-win-x64-chrome-stable"
@@ -4871,18 +4055,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-win-x64-firefox"
@@ -4919,18 +4095,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-unit-linux-x64-release"
@@ -4966,18 +4134,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-unit-linux-x64-release-beta"
@@ -5013,18 +4173,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-unit-linux-x64-release-dev"
@@ -5060,18 +4212,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-unit-linux-x64-release-stable"
@@ -5107,18 +4251,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "ddc-linux-release-chrome"
@@ -5154,18 +4290,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "ddc-linux-release-chrome-beta"
@@ -5201,18 +4329,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "ddc-linux-release-chrome-dev"
@@ -5248,18 +4368,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "ddc-linux-release-chrome-stable"
@@ -5295,18 +4407,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "ddc-mac-release-chrome"
@@ -5349,18 +4453,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "ddc-mac-release-chrome-beta"
@@ -5403,18 +4499,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "ddc-mac-release-chrome-dev"
@@ -5457,18 +4545,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "ddc-mac-release-chrome-stable"
@@ -5511,18 +4591,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "ddc-nnbd-linux-release-chrome"
@@ -5558,18 +4630,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "ddc-win-release-chrome"
@@ -5605,18 +4669,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "ddc-win-release-chrome-beta"
@@ -5652,18 +4708,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "ddc-win-release-chrome-dev"
@@ -5699,18 +4747,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "ddc-win-release-chrome-stable"
@@ -5746,18 +4786,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "ddk-linux-release-firefox"
@@ -5793,18 +4825,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "ddk-linux-release-firefox-beta"
@@ -5840,18 +4864,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "ddk-linux-release-firefox-dev"
@@ -5887,18 +4903,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "ddk-linux-release-firefox-stable"
@@ -5934,18 +4942,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "flutter-analyze"
@@ -5979,18 +4979,10 @@ buckets {
       execution_timeout_secs: 2700
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "flutter-engine-linux"
@@ -6032,18 +5024,10 @@ buckets {
       execution_timeout_secs: 28800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "flutter-engine-linux-web_tests"
@@ -6082,18 +5066,10 @@ buckets {
       execution_timeout_secs: 28800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "flutter-frontend"
@@ -6126,18 +5102,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "front-end-linux-release-x64"
@@ -6170,18 +5138,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "front-end-linux-release-x64-beta"
@@ -6214,18 +5174,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "front-end-linux-release-x64-dev"
@@ -6258,18 +5210,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "front-end-linux-release-x64-stable"
@@ -6302,18 +5246,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "front-end-mac-release-x64"
@@ -6353,18 +5289,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "front-end-mac-release-x64-beta"
@@ -6404,18 +5332,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "front-end-mac-release-x64-dev"
@@ -6455,18 +5375,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "front-end-mac-release-x64-stable"
@@ -6506,18 +5418,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "front-end-nnbd-linux-release-x64"
@@ -6550,18 +5454,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "front-end-nnbd-linux-release-x64-beta"
@@ -6594,18 +5490,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "front-end-nnbd-linux-release-x64-dev"
@@ -6638,18 +5526,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "front-end-nnbd-linux-release-x64-stable"
@@ -6682,18 +5562,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "front-end-nnbd-mac-release-x64"
@@ -6733,18 +5605,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "front-end-nnbd-win-release-x64"
@@ -6777,18 +5641,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "front-end-win-release-x64"
@@ -6821,18 +5677,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "front-end-win-release-x64-beta"
@@ -6865,18 +5713,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "front-end-win-release-x64-dev"
@@ -6909,18 +5749,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "front-end-win-release-x64-stable"
@@ -6953,18 +5785,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "frontend-weekly"
@@ -6998,18 +5822,10 @@ buckets {
       execution_timeout_secs: 43200
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "fuzz-linux"
@@ -7042,18 +5858,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "gclient"
@@ -7086,18 +5894,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "gclient-beta"
@@ -7130,18 +5930,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "gclient-dev"
@@ -7174,18 +5966,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "gclient-stable"
@@ -7218,18 +6002,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "google"
@@ -7263,18 +6039,10 @@ buckets {
       execution_timeout_secs: 300
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "iso-stress-linux"
@@ -7307,18 +6075,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "pkg-linux-debug"
@@ -7354,18 +6114,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "pkg-linux-release"
@@ -7404,18 +6156,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "pkg-linux-release-beta"
@@ -7454,18 +6198,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "pkg-linux-release-dev"
@@ -7504,18 +6240,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "pkg-linux-release-stable"
@@ -7554,18 +6282,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "pkg-mac-release"
@@ -7608,18 +6328,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "pkg-mac-release-arm64"
@@ -7667,18 +6379,10 @@ buckets {
         key: "dart.use_update_script"
         value: 100
       }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "pkg-mac-release-beta"
@@ -7721,18 +6425,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "pkg-mac-release-dev"
@@ -7775,18 +6471,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "pkg-mac-release-stable"
@@ -7829,18 +6517,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "pkg-win-release"
@@ -7880,18 +6560,10 @@ buckets {
         key: "dart.use_update_script"
         value: 100
       }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "pkg-win-release-beta"
@@ -7931,18 +6603,10 @@ buckets {
         key: "dart.use_update_script"
         value: 100
       }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "pkg-win-release-dev"
@@ -7982,18 +6646,10 @@ buckets {
         key: "dart.use_update_script"
         value: 100
       }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "pkg-win-release-stable"
@@ -8033,18 +6689,10 @@ buckets {
         key: "dart.use_update_script"
         value: 100
       }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-canary-linux-debug"
@@ -8077,18 +6725,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-canary-linux-debug-beta"
@@ -8122,15 +6762,7 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
+        key: "luci.recipes.use_python3"
         value: 100
       }
     }
@@ -8165,18 +6797,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-canary-linux-debug-stable"
@@ -8209,18 +6833,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-debug-arm"
@@ -8253,18 +6869,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-debug-arm-beta"
@@ -8297,18 +6905,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-debug-arm-dev"
@@ -8341,18 +6941,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-debug-arm-stable"
@@ -8385,18 +6977,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-debug-arm64c"
@@ -8429,18 +7013,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-debug-arm64c-beta"
@@ -8473,18 +7049,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-debug-arm64c-dev"
@@ -8517,18 +7085,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-debug-arm64c-stable"
@@ -8561,18 +7121,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-product-arm"
@@ -8605,18 +7157,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-product-arm-beta"
@@ -8649,18 +7193,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-product-arm-dev"
@@ -8693,18 +7229,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-product-arm-stable"
@@ -8737,18 +7265,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-product-arm64c"
@@ -8781,18 +7301,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-product-arm64c-beta"
@@ -8825,18 +7337,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-product-arm64c-dev"
@@ -8869,18 +7373,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-product-arm64c-stable"
@@ -8913,18 +7409,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-release-arm"
@@ -8957,18 +7445,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-release-arm-beta"
@@ -9001,18 +7481,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-release-arm-dev"
@@ -9045,18 +7517,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-release-arm-stable"
@@ -9089,18 +7553,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-release-arm64c"
@@ -9133,18 +7589,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-release-arm64c-beta"
@@ -9177,18 +7625,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-release-arm64c-dev"
@@ -9221,18 +7661,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-release-arm64c-stable"
@@ -9265,18 +7697,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-fuchsia-release-x64"
@@ -9310,18 +7734,10 @@ buckets {
       expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-asan-linux-release-x64"
@@ -9355,18 +7771,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-checked-linux-release-x64"
@@ -9403,18 +7811,10 @@ buckets {
         key: "dart.use_update_script"
         value: 100
       }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-checked-linux-release-x64-beta"
@@ -9451,18 +7851,10 @@ buckets {
         key: "dart.use_update_script"
         value: 100
       }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-checked-linux-release-x64-dev"
@@ -9499,18 +7891,10 @@ buckets {
         key: "dart.use_update_script"
         value: 100
       }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-checked-linux-release-x64-stable"
@@ -9547,18 +7931,10 @@ buckets {
         key: "dart.use_update_script"
         value: 100
       }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-gcc-linux"
@@ -9589,18 +7965,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-gcc-linux-beta"
@@ -9631,18 +7999,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-gcc-linux-dev"
@@ -9673,18 +8033,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-gcc-linux-stable"
@@ -9715,18 +8067,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-debug-ia32"
@@ -9759,18 +8103,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-debug-simriscv64"
@@ -9803,18 +8139,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-debug-x64"
@@ -9847,18 +8175,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-debug-x64-beta"
@@ -9891,18 +8211,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-debug-x64-dev"
@@ -9935,18 +8247,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-debug-x64-stable"
@@ -9979,18 +8283,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-debug-x64c"
@@ -10023,18 +8319,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-product-x64"
@@ -10067,18 +8355,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-release-ia32"
@@ -10111,18 +8391,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-release-simarm"
@@ -10155,18 +8427,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-release-simarm-beta"
@@ -10199,18 +8463,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-release-simarm-dev"
@@ -10243,18 +8499,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-release-simarm-stable"
@@ -10287,18 +8535,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-release-simarm64"
@@ -10331,18 +8571,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-release-simarm64-beta"
@@ -10375,18 +8607,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-release-simarm64-dev"
@@ -10419,18 +8643,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-release-simarm64-stable"
@@ -10463,18 +8679,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-release-x64"
@@ -10507,18 +8715,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-release-x64-beta"
@@ -10551,18 +8751,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-release-x64-dev"
@@ -10595,18 +8787,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-release-x64-stable"
@@ -10639,18 +8823,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-mac-debug-x64"
@@ -10690,18 +8866,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-mac-debug-x64-beta"
@@ -10741,18 +8909,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-mac-debug-x64-dev"
@@ -10792,18 +8952,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-mac-debug-x64-stable"
@@ -10843,18 +8995,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-mac-product-x64"
@@ -10894,18 +9038,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-mac-release-arm64"
@@ -10948,18 +9084,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-mac-release-arm64-dev"
@@ -11002,18 +9130,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-mac-release-x64"
@@ -11053,18 +9173,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-mac-release-x64-beta"
@@ -11104,18 +9216,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-mac-release-x64-dev"
@@ -11155,18 +9259,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-mac-release-x64-stable"
@@ -11206,18 +9302,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-msan-linux-release-x64"
@@ -11251,18 +9339,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-debug-ia32"
@@ -11296,18 +9376,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-debug-x64"
@@ -11340,18 +9412,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-debug-x64-beta"
@@ -11384,18 +9448,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-debug-x64-dev"
@@ -11428,18 +9484,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-debug-x64-stable"
@@ -11472,18 +9520,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-release-ia32"
@@ -11516,18 +9556,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-release-simarm"
@@ -11560,18 +9592,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-release-simarm64"
@@ -11604,18 +9628,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-release-x64"
@@ -11648,18 +9664,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-release-x64-beta"
@@ -11692,18 +9700,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-release-x64-dev"
@@ -11736,18 +9736,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-release-x64-stable"
@@ -11780,18 +9772,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-mac-debug-arm64"
@@ -11835,18 +9819,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-mac-debug-x64"
@@ -11887,18 +9863,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-mac-release-arm64"
@@ -11941,18 +9909,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-mac-release-x64"
@@ -11992,18 +9952,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-win-debug-x64"
@@ -12037,18 +9989,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-win-release-ia32"
@@ -12081,18 +10025,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-win-release-x64"
@@ -12125,18 +10061,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-optcounter-threshold-linux-release-ia32"
@@ -12169,18 +10097,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-optcounter-threshold-linux-release-x64"
@@ -12214,18 +10134,10 @@ buckets {
       expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-android-release-arm64c"
@@ -12259,18 +10171,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-android-release-arm64c-beta"
@@ -12304,18 +10208,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-android-release-arm64c-dev"
@@ -12349,18 +10245,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-android-release-arm64c-stable"
@@ -12394,18 +10282,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-android-release-arm_x64"
@@ -12439,18 +10319,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-android-release-arm_x64-beta"
@@ -12484,18 +10356,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-android-release-arm_x64-dev"
@@ -12529,18 +10393,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-android-release-arm_x64-stable"
@@ -12574,18 +10430,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-asan-linux-release-x64"
@@ -12619,18 +10467,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-dwarf-linux-product-x64"
@@ -12663,18 +10503,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-simarm_x64"
@@ -12708,18 +10540,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
@@ -12753,18 +10577,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
@@ -12797,19 +10613,11 @@ buckets {
         '}'
       priority: 50
       build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
@@ -12843,18 +10651,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-simriscv64"
@@ -12887,18 +10687,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-x64"
@@ -12931,18 +10723,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-x64-beta"
@@ -12975,18 +10759,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-x64-dev"
@@ -13019,18 +10795,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-x64-stable"
@@ -13063,18 +10831,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-x64c"
@@ -13107,18 +10867,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-product-x64"
@@ -13151,18 +10903,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-product-x64-beta"
@@ -13195,18 +10939,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-product-x64-dev"
@@ -13239,18 +10975,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-product-x64-stable"
@@ -13283,18 +11011,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm"
@@ -13327,18 +11047,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm-beta"
@@ -13371,18 +11083,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm-dev"
@@ -13415,18 +11119,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm-stable"
@@ -13459,18 +11155,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm64"
@@ -13503,18 +11191,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm64-beta"
@@ -13547,18 +11227,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm64-dev"
@@ -13591,18 +11263,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm64-stable"
@@ -13635,18 +11299,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm_x64"
@@ -13679,18 +11335,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm_x64-beta"
@@ -13723,18 +11371,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm_x64-dev"
@@ -13767,18 +11407,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm_x64-stable"
@@ -13811,18 +11443,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-x64"
@@ -13855,18 +11479,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-x64-beta"
@@ -13899,18 +11515,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-x64-dev"
@@ -13943,18 +11551,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-x64-stable"
@@ -13987,18 +11587,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-mac-release-simarm64"
@@ -14038,18 +11630,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-mac-release-simarm64-beta"
@@ -14089,18 +11673,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-mac-release-simarm64-dev"
@@ -14140,18 +11716,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-mac-release-simarm64-stable"
@@ -14191,18 +11759,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-msan-linux-release-x64"
@@ -14236,18 +11796,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
@@ -14280,18 +11832,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-debug-x64"
@@ -14325,18 +11869,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-simarm64"
@@ -14369,18 +11905,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
@@ -14413,18 +11941,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-x64"
@@ -14457,18 +11977,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
@@ -14501,18 +12013,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
@@ -14545,18 +12049,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
@@ -14589,18 +12085,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-mac-release-arm64"
@@ -14644,18 +12132,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-mac-release-simarm64"
@@ -14696,18 +12176,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-win-release-x64"
@@ -14740,18 +12212,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-obfuscate-linux-release-x64"
@@ -14784,18 +12248,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
@@ -14828,18 +12284,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
@@ -14872,18 +12320,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
@@ -14916,18 +12356,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-tsan-linux-release-x64"
@@ -14961,18 +12393,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-ubsan-linux-release-x64"
@@ -15004,18 +12428,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-win-debug-x64c"
@@ -15048,18 +12464,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-win-release-x64"
@@ -15092,18 +12500,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-win-release-x64-beta"
@@ -15136,18 +12536,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-win-release-x64-dev"
@@ -15180,18 +12572,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-win-release-x64-stable"
@@ -15224,18 +12608,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-reload-linux-debug-x64"
@@ -15268,18 +12644,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-reload-linux-release-x64"
@@ -15312,18 +12680,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-reload-rollback-linux-debug-x64"
@@ -15356,18 +12716,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-reload-rollback-linux-release-x64"
@@ -15400,18 +12752,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-tsan-linux-release-x64"
@@ -15445,18 +12789,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-ubsan-linux-release-x64"
@@ -15488,18 +12824,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-win-debug-ia32"
@@ -15532,18 +12860,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-win-debug-x64"
@@ -15576,18 +12896,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-win-debug-x64-beta"
@@ -15620,18 +12932,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-win-debug-x64-dev"
@@ -15664,18 +12968,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-win-debug-x64-stable"
@@ -15708,18 +13004,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-win-debug-x64c"
@@ -15752,18 +13040,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-win-product-x64"
@@ -15796,18 +13076,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-win-release-ia32"
@@ -15840,18 +13112,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-win-release-x64"
@@ -15884,18 +13148,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-win-release-x64-beta"
@@ -15928,18 +13184,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-win-release-x64-dev"
@@ -15972,18 +13220,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-win-release-x64-stable"
@@ -16016,18 +13256,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm"
@@ -16060,18 +13292,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm-beta"
@@ -16104,18 +13328,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm-dev"
@@ -16148,18 +13364,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
@@ -16192,18 +13400,10 @@ buckets {
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm-stable"
@@ -16236,18 +13436,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-riscv64"
@@ -16280,18 +13472,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
@@ -16324,18 +13508,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
@@ -16368,18 +13544,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
@@ -16412,18 +13580,10 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
   }
 }
@@ -16476,18 +13636,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "analyzer-linux-release-try"
@@ -16520,18 +13672,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "analyzer-mac-release-try"
@@ -16567,20 +13711,12 @@ buckets {
       priority: 30
       caches {
         name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
+        path: "osx_sdk"
       }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
-        key: "luci.use_realms"
+        key: "luci.recipes.use_python3"
         value: 100
       }
     }
@@ -16615,18 +13751,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "analyzer-nnbd-mac-release-try"
@@ -16666,18 +13794,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "analyzer-nnbd-win-release-try"
@@ -16710,18 +13830,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "analyzer-win-release-try"
@@ -16758,18 +13870,10 @@ buckets {
         key: "dart.use_update_script"
         value: 100
       }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "app-kernel-linux-debug-x64-try"
@@ -16803,18 +13907,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "app-kernel-linux-product-x64-try"
@@ -16847,18 +13943,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "app-kernel-linux-release-x64-try"
@@ -16891,18 +13979,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "benchmark-linux-try"
@@ -16938,18 +14018,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart-sdk-linux-try"
@@ -16986,18 +14058,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart-sdk-mac-arm64-try"
@@ -17040,18 +14104,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart-sdk-mac-try"
@@ -17091,18 +14147,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart-sdk-win-try"
@@ -17135,18 +14183,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-canary-x64-try"
@@ -17183,18 +14223,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-csp-minified-linux-x64-chrome-try"
@@ -17231,18 +14263,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-minified-strong-linux-x64-d8-try"
@@ -17278,18 +14302,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-nnbd-linux-x64-chrome-try"
@@ -17326,18 +14342,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-hostasserts-linux-ia32-d8-try"
@@ -17373,18 +14381,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-linux-x64-chrome-try"
@@ -17421,18 +14421,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-linux-x64-firefox-try"
@@ -17469,18 +14461,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-mac-x64-chrome-try"
@@ -17524,18 +14508,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-mac-x64-safari-try"
@@ -17578,18 +14554,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-strong-win-x64-chrome-try"
@@ -17626,18 +14594,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "dart2js-unit-linux-x64-release-try"
@@ -17673,18 +14633,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "ddc-linux-release-chrome-try"
@@ -17720,18 +14672,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "ddc-mac-release-chrome-try"
@@ -17774,18 +14718,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "ddc-nnbd-linux-release-chrome-try"
@@ -17821,18 +14757,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "ddc-win-release-chrome-try"
@@ -17868,18 +14796,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "ddk-linux-release-firefox-try"
@@ -17915,18 +14835,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "flutter-analyze-try"
@@ -17960,18 +14872,10 @@ buckets {
       execution_timeout_secs: 2700
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "flutter-engine-linux-try"
@@ -18013,18 +14917,10 @@ buckets {
       execution_timeout_secs: 28800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "flutter-engine-linux-web_tests-try"
@@ -18063,18 +14959,10 @@ buckets {
       execution_timeout_secs: 28800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "flutter-frontend-try"
@@ -18107,18 +14995,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "front-end-linux-release-x64-try"
@@ -18151,18 +15031,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "front-end-mac-release-x64-try"
@@ -18202,18 +15074,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "front-end-nnbd-linux-release-x64-try"
@@ -18246,18 +15110,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "front-end-nnbd-mac-release-x64-try"
@@ -18297,18 +15153,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "front-end-nnbd-win-release-x64-try"
@@ -18341,18 +15189,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "front-end-win-release-x64-try"
@@ -18385,18 +15225,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "gclient-try"
@@ -18429,18 +15261,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "pkg-linux-debug-try"
@@ -18476,18 +15300,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "pkg-linux-release-try"
@@ -18526,18 +15342,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "pkg-mac-release-arm64-try"
@@ -18585,18 +15393,10 @@ buckets {
         key: "dart.use_update_script"
         value: 100
       }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "pkg-mac-release-try"
@@ -18639,18 +15439,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "pkg-win-release-try"
@@ -18690,18 +15482,10 @@ buckets {
         key: "dart.use_update_script"
         value: 100
       }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-canary-linux-debug-try"
@@ -18734,18 +15518,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-debug-arm-try"
@@ -18778,18 +15554,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-debug-arm64c-try"
@@ -18822,18 +15590,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-product-arm-try"
@@ -18866,18 +15626,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-product-arm64c-try"
@@ -18910,18 +15662,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-release-arm-try"
@@ -18954,18 +15698,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-ffi-android-release-arm64c-try"
@@ -18998,18 +15734,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-fuchsia-release-x64-try"
@@ -19042,18 +15770,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-asan-linux-release-x64-try"
@@ -19087,18 +15807,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-checked-linux-release-x64-try"
@@ -19135,18 +15847,10 @@ buckets {
         key: "dart.use_update_script"
         value: 100
       }
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-gcc-linux-try"
@@ -19177,18 +15881,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-debug-ia32-try"
@@ -19221,18 +15917,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-debug-simriscv64-try"
@@ -19265,18 +15953,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-debug-x64-try"
@@ -19309,18 +15989,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-debug-x64c-try"
@@ -19353,18 +16025,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-product-x64-try"
@@ -19397,18 +16061,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-release-ia32-try"
@@ -19441,18 +16097,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-release-simarm-try"
@@ -19485,18 +16133,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-release-simarm64-try"
@@ -19529,18 +16169,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-linux-release-x64-try"
@@ -19573,18 +16205,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-mac-debug-x64-try"
@@ -19624,18 +16248,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-mac-product-x64-try"
@@ -19675,18 +16291,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-mac-release-arm64-try"
@@ -19729,18 +16337,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-mac-release-x64-try"
@@ -19780,18 +16380,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-msan-linux-release-x64-try"
@@ -19825,18 +16417,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-debug-ia32-try"
@@ -19870,18 +16454,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-debug-x64-try"
@@ -19914,18 +16490,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-release-ia32-try"
@@ -19958,18 +16526,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-release-simarm-try"
@@ -20002,18 +16562,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-release-simarm64-try"
@@ -20046,18 +16598,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-linux-release-x64-try"
@@ -20090,18 +16634,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-mac-debug-arm64-try"
@@ -20145,18 +16681,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-mac-debug-x64-try"
@@ -20197,18 +16725,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-mac-release-arm64-try"
@@ -20251,18 +16771,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-mac-release-x64-try"
@@ -20302,18 +16814,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-win-debug-x64-try"
@@ -20347,18 +16851,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-win-release-ia32-try"
@@ -20391,18 +16887,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-nnbd-win-release-x64-try"
@@ -20435,18 +16923,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-optcounter-threshold-linux-release-ia32-try"
@@ -20479,18 +16959,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-optcounter-threshold-linux-release-x64-try"
@@ -20523,18 +16995,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-android-release-arm64c-try"
@@ -20567,19 +17031,11 @@ buckets {
         '}'
       priority: 30
       build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-android-release-arm_x64-try"
@@ -20613,18 +17069,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-asan-linux-release-x64-try"
@@ -20658,18 +17106,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-dwarf-linux-product-x64-try"
@@ -20702,18 +17142,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-simarm_x64-try"
@@ -20747,18 +17179,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-simriscv64-try"
@@ -20791,18 +17215,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-x64-try"
@@ -20835,18 +17251,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-debug-x64c-try"
@@ -20879,18 +17287,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-product-x64-try"
@@ -20923,18 +17323,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm-try"
@@ -20967,18 +17359,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm64-try"
@@ -21011,18 +17395,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm_x64-try"
@@ -21055,18 +17431,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-linux-release-x64-try"
@@ -21099,18 +17467,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-mac-release-simarm64-try"
@@ -21150,18 +17510,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-msan-linux-release-x64-try"
@@ -21195,18 +17547,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
@@ -21239,18 +17583,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-debug-x64-try"
@@ -21284,18 +17620,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-simarm64-try"
@@ -21328,18 +17656,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
@@ -21372,18 +17692,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-x64-try"
@@ -21416,18 +17728,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-mac-release-arm64-try"
@@ -21471,18 +17775,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-mac-release-simarm64-try"
@@ -21523,18 +17819,10 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-nnbd-win-release-x64-try"
@@ -21567,18 +17855,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-obfuscate-linux-release-x64-try"
@@ -21611,18 +17891,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-tsan-linux-release-x64-try"
@@ -21656,18 +17928,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-ubsan-linux-release-x64-try"
@@ -21699,18 +17963,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-win-debug-x64c-try"
@@ -21743,18 +17999,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-precomp-win-release-x64-try"
@@ -21787,18 +18035,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-reload-linux-debug-x64-try"
@@ -21831,18 +18071,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-reload-linux-release-x64-try"
@@ -21875,18 +18107,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-reload-rollback-linux-debug-x64-try"
@@ -21919,18 +18143,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-reload-rollback-linux-release-x64-try"
@@ -21963,18 +18179,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-tsan-linux-release-x64-try"
@@ -22008,18 +18216,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-ubsan-linux-release-x64-try"
@@ -22051,18 +18251,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-win-debug-ia32-try"
@@ -22095,18 +18287,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-win-debug-x64-try"
@@ -22139,18 +18323,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-win-debug-x64c-try"
@@ -22183,18 +18359,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-win-product-x64-try"
@@ -22227,18 +18395,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-win-release-ia32-try"
@@ -22271,18 +18431,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-kernel-win-release-x64-try"
@@ -22315,18 +18467,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm-try"
@@ -22359,18 +18503,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-riscv64-try"
@@ -22403,18 +18539,10 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
   }
 }
@@ -22468,18 +18596,10 @@ buckets {
       execution_timeout_secs: 600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.buildbucket.use_bbagent"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
     }
   }
 }
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index b24be7d9b613..a14abcdea0d3 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -11,7 +11,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "analyzer-analysis-server-linux"
   }
 }
@@ -22,7 +22,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "analyzer-analysis-server-linux-beta"
   }
 }
@@ -33,7 +33,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "analyzer-analysis-server-linux-dev"
   }
 }
@@ -44,7 +44,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "analyzer-analysis-server-linux-stable"
   }
 }
@@ -55,7 +55,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "analyzer-linux-release"
   }
 }
@@ -66,7 +66,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "analyzer-linux-release-beta"
   }
 }
@@ -77,7 +77,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "analyzer-linux-release-dev"
   }
 }
@@ -88,7 +88,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "analyzer-linux-release-stable"
   }
 }
@@ -99,7 +99,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "analyzer-mac-release"
   }
 }
@@ -110,7 +110,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "analyzer-mac-release-beta"
   }
 }
@@ -121,7 +121,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "analyzer-mac-release-dev"
   }
 }
@@ -132,7 +132,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "analyzer-mac-release-stable"
   }
 }
@@ -143,7 +143,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "analyzer-nnbd-linux-release"
   }
 }
@@ -154,7 +154,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "analyzer-nnbd-linux-release-beta"
   }
 }
@@ -165,7 +165,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "analyzer-nnbd-linux-release-dev"
   }
 }
@@ -176,7 +176,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "analyzer-nnbd-linux-release-stable"
   }
 }
@@ -187,7 +187,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "analyzer-nnbd-mac-release"
   }
 }
@@ -198,7 +198,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "analyzer-nnbd-win-release"
   }
 }
@@ -209,7 +209,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "analyzer-win-release"
   }
 }
@@ -220,7 +220,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "analyzer-win-release-beta"
   }
 }
@@ -231,7 +231,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "analyzer-win-release-dev"
   }
 }
@@ -242,7 +242,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "analyzer-win-release-stable"
   }
 }
@@ -253,7 +253,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "app-kernel-linux-debug-x64"
   }
 }
@@ -264,7 +264,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "app-kernel-linux-debug-x64-beta"
   }
 }
@@ -275,7 +275,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "app-kernel-linux-debug-x64-dev"
   }
 }
@@ -286,7 +286,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "app-kernel-linux-debug-x64-stable"
   }
 }
@@ -297,7 +297,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "app-kernel-linux-product-x64"
   }
 }
@@ -308,7 +308,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "app-kernel-linux-release-x64"
   }
 }
@@ -319,7 +319,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "app-kernel-linux-release-x64-beta"
   }
 }
@@ -330,7 +330,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "app-kernel-linux-release-x64-dev"
   }
 }
@@ -341,7 +341,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "app-kernel-linux-release-x64-stable"
   }
 }
@@ -352,7 +352,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "base"
   }
 }
@@ -363,7 +363,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "cbuild"
   }
 }
@@ -374,7 +374,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "chocolatey"
   }
 }
@@ -385,7 +385,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "ci-test-data"
   }
 }
@@ -396,7 +396,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "co19-roller"
   }
 }
@@ -407,7 +407,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "cross-vm-linux-release-arm64"
   }
 }
@@ -418,7 +418,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "cross-vm-precomp-linux-release-arm64"
   }
 }
@@ -429,7 +429,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "dart-ci-scripts-linux"
   }
 }
@@ -440,7 +440,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "dart-ci-scripts-mac"
   }
 }
@@ -451,7 +451,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "dart-ci-scripts-mac-arm64"
   }
 }
@@ -462,7 +462,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "dart-ci-scripts-win"
   }
 }
@@ -473,7 +473,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "dart-sdk-linux-beta"
   }
 }
@@ -484,7 +484,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "dart-sdk-linux-dev"
   }
 }
@@ -495,7 +495,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "dart-sdk-linux-stable"
   }
 }
@@ -506,7 +506,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "dart-sdk-mac-arm64-beta"
   }
 }
@@ -517,7 +517,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "dart-sdk-mac-arm64-dev"
   }
 }
@@ -528,7 +528,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "dart-sdk-mac-arm64-stable"
   }
 }
@@ -539,7 +539,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "dart-sdk-mac-beta"
   }
 }
@@ -550,7 +550,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "dart-sdk-mac-dev"
   }
 }
@@ -561,7 +561,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "dart-sdk-mac-stable"
   }
 }
@@ -572,7 +572,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "dart-sdk-win-beta"
   }
 }
@@ -583,7 +583,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "dart-sdk-win-dev"
   }
 }
@@ -594,7 +594,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "dart-sdk-win-stable"
   }
 }
@@ -605,7 +605,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-canary-x64"
   }
 }
@@ -616,7 +616,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-canary-x64-beta"
   }
 }
@@ -627,7 +627,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-canary-x64-dev"
   }
 }
@@ -638,7 +638,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-canary-x64-stable"
   }
 }
@@ -649,7 +649,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-csp-minified-linux-x64-chrome"
   }
 }
@@ -660,7 +660,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-csp-minified-linux-x64-chrome-beta"
   }
 }
@@ -671,7 +671,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-csp-minified-linux-x64-chrome-dev"
   }
 }
@@ -682,7 +682,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-csp-minified-linux-x64-chrome-stable"
   }
 }
@@ -693,7 +693,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-minified-strong-linux-x64-d8"
   }
 }
@@ -704,7 +704,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-minified-strong-linux-x64-d8-beta"
   }
 }
@@ -715,7 +715,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-minified-strong-linux-x64-d8-dev"
   }
 }
@@ -726,7 +726,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-minified-strong-linux-x64-d8-stable"
   }
 }
@@ -737,7 +737,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-nnbd-linux-x64-chrome"
   }
 }
@@ -748,7 +748,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-nnbd-linux-x64-chrome-beta"
   }
 }
@@ -759,7 +759,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-nnbd-linux-x64-chrome-dev"
   }
 }
@@ -770,7 +770,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-nnbd-linux-x64-chrome-stable"
   }
 }
@@ -781,7 +781,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-strong-hostasserts-linux-ia32-d8"
   }
 }
@@ -792,7 +792,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
   }
 }
@@ -803,7 +803,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
   }
 }
@@ -814,7 +814,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
   }
 }
@@ -825,7 +825,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-strong-linux-x64-chrome"
   }
 }
@@ -836,7 +836,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-strong-linux-x64-chrome-beta"
   }
 }
@@ -847,7 +847,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-strong-linux-x64-chrome-dev"
   }
 }
@@ -858,7 +858,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-strong-linux-x64-chrome-stable"
   }
 }
@@ -869,7 +869,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-strong-linux-x64-firefox"
   }
 }
@@ -880,7 +880,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-strong-linux-x64-firefox-beta"
   }
 }
@@ -891,7 +891,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-strong-linux-x64-firefox-dev"
   }
 }
@@ -902,7 +902,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-strong-linux-x64-firefox-stable"
   }
 }
@@ -913,7 +913,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-strong-mac-x64-chrome"
   }
 }
@@ -924,7 +924,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-strong-mac-x64-chrome-beta"
   }
 }
@@ -935,7 +935,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-strong-mac-x64-chrome-dev"
   }
 }
@@ -946,7 +946,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-strong-mac-x64-chrome-stable"
   }
 }
@@ -957,7 +957,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-strong-mac-x64-safari"
   }
 }
@@ -968,7 +968,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-strong-mac-x64-safari-beta"
   }
 }
@@ -979,7 +979,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-strong-mac-x64-safari-dev"
   }
 }
@@ -990,7 +990,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-strong-mac-x64-safari-stable"
   }
 }
@@ -1001,7 +1001,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-strong-win-x64-chrome"
   }
 }
@@ -1012,7 +1012,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-strong-win-x64-chrome-beta"
   }
 }
@@ -1023,7 +1023,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-strong-win-x64-chrome-dev"
   }
 }
@@ -1034,7 +1034,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-strong-win-x64-chrome-stable"
   }
 }
@@ -1045,7 +1045,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-unit-linux-x64-release"
   }
 }
@@ -1056,7 +1056,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-unit-linux-x64-release-beta"
   }
 }
@@ -1067,7 +1067,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-unit-linux-x64-release-dev"
   }
 }
@@ -1078,7 +1078,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "dart2js-unit-linux-x64-release-stable"
   }
 }
@@ -1089,7 +1089,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "ddc-linux-release-chrome"
   }
 }
@@ -1100,7 +1100,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "ddc-linux-release-chrome-beta"
   }
 }
@@ -1111,7 +1111,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "ddc-linux-release-chrome-dev"
   }
 }
@@ -1122,7 +1122,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "ddc-linux-release-chrome-stable"
   }
 }
@@ -1133,7 +1133,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "ddc-mac-release-chrome"
   }
 }
@@ -1144,7 +1144,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "ddc-mac-release-chrome-beta"
   }
 }
@@ -1155,7 +1155,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "ddc-mac-release-chrome-dev"
   }
 }
@@ -1166,7 +1166,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "ddc-mac-release-chrome-stable"
   }
 }
@@ -1177,7 +1177,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "ddc-nnbd-linux-release-chrome"
   }
 }
@@ -1188,7 +1188,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "ddc-win-release-chrome"
   }
 }
@@ -1199,7 +1199,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "ddc-win-release-chrome-beta"
   }
 }
@@ -1210,7 +1210,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "ddc-win-release-chrome-dev"
   }
 }
@@ -1221,7 +1221,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "ddc-win-release-chrome-stable"
   }
 }
@@ -1232,7 +1232,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "ddk-linux-release-firefox"
   }
 }
@@ -1243,7 +1243,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "ddk-linux-release-firefox-beta"
   }
 }
@@ -1254,7 +1254,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "ddk-linux-release-firefox-dev"
   }
 }
@@ -1265,7 +1265,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "ddk-linux-release-firefox-stable"
   }
 }
@@ -1276,7 +1276,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "debianpackage-linux"
   }
 }
@@ -1287,7 +1287,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "debianpackage-linux-beta"
   }
 }
@@ -1298,7 +1298,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "debianpackage-linux-dev"
   }
 }
@@ -1309,7 +1309,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "debianpackage-linux-stable"
   }
 }
@@ -1320,7 +1320,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "flutter-analyze"
   }
 }
@@ -1331,7 +1331,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "flutter-engine-ios"
   }
 }
@@ -1342,7 +1342,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "flutter-engine-linux"
   }
 }
@@ -1353,7 +1353,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "flutter-engine-linux-web_tests"
   }
 }
@@ -1364,7 +1364,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "flutter-frontend"
   }
 }
@@ -1375,7 +1375,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "front-end-linux-release-x64"
   }
 }
@@ -1386,7 +1386,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "front-end-linux-release-x64-beta"
   }
 }
@@ -1397,7 +1397,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "front-end-linux-release-x64-dev"
   }
 }
@@ -1408,7 +1408,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "front-end-linux-release-x64-stable"
   }
 }
@@ -1419,7 +1419,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "front-end-mac-release-x64"
   }
 }
@@ -1430,7 +1430,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "front-end-mac-release-x64-beta"
   }
 }
@@ -1441,7 +1441,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "front-end-mac-release-x64-dev"
   }
 }
@@ -1452,7 +1452,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "front-end-mac-release-x64-stable"
   }
 }
@@ -1463,7 +1463,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "front-end-nnbd-linux-release-x64"
   }
 }
@@ -1474,7 +1474,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "front-end-nnbd-linux-release-x64-beta"
   }
 }
@@ -1485,7 +1485,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "front-end-nnbd-linux-release-x64-dev"
   }
 }
@@ -1496,7 +1496,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "front-end-nnbd-linux-release-x64-stable"
   }
 }
@@ -1507,7 +1507,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "front-end-nnbd-mac-release-x64"
   }
 }
@@ -1518,7 +1518,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "front-end-nnbd-win-release-x64"
   }
 }
@@ -1529,7 +1529,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "front-end-win-release-x64"
   }
 }
@@ -1540,7 +1540,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "front-end-win-release-x64-beta"
   }
 }
@@ -1551,7 +1551,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "front-end-win-release-x64-dev"
   }
 }
@@ -1562,7 +1562,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "front-end-win-release-x64-stable"
   }
 }
@@ -1573,7 +1573,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "frontend-weekly"
   }
 }
@@ -1584,7 +1584,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "fuzz-linux"
   }
 }
@@ -1595,7 +1595,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "gclient"
   }
 }
@@ -1606,7 +1606,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "gclient-beta"
   }
 }
@@ -1617,7 +1617,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "gclient-dev"
   }
 }
@@ -1628,7 +1628,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "gclient-stable"
   }
 }
@@ -1639,7 +1639,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "google"
   }
 }
@@ -1650,7 +1650,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "iso-stress-linux"
   }
 }
@@ -1665,7 +1665,7 @@ job {
   }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "linearize-flutter"
   }
 }
@@ -1676,7 +1676,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "pkg-linux-debug"
   }
 }
@@ -1687,7 +1687,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "pkg-linux-release"
   }
 }
@@ -1698,7 +1698,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "pkg-linux-release-beta"
   }
 }
@@ -1709,7 +1709,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "pkg-linux-release-dev"
   }
 }
@@ -1720,7 +1720,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "pkg-linux-release-stable"
   }
 }
@@ -1731,7 +1731,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "pkg-mac-release"
   }
 }
@@ -1742,7 +1742,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "pkg-mac-release-arm64"
   }
 }
@@ -1753,7 +1753,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "pkg-mac-release-beta"
   }
 }
@@ -1764,7 +1764,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "pkg-mac-release-dev"
   }
 }
@@ -1775,7 +1775,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "pkg-mac-release-stable"
   }
 }
@@ -1786,7 +1786,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "pkg-win-release"
   }
 }
@@ -1797,7 +1797,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "pkg-win-release-beta"
   }
 }
@@ -1808,7 +1808,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "pkg-win-release-dev"
   }
 }
@@ -1819,7 +1819,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "pkg-win-release-stable"
   }
 }
@@ -1830,7 +1830,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "recipe-bundler"
   }
 }
@@ -1841,7 +1841,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci"
+    bucket: "ci"
     builder: "recipe-deps-roller"
   }
 }
@@ -1852,7 +1852,7 @@ job {
   acl_sets: "ci.roll"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.roll"
+    bucket: "ci.roll"
     builder: "roll-to-dev"
   }
 }
@@ -1863,7 +1863,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-canary-linux-debug"
   }
 }
@@ -1874,7 +1874,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-canary-linux-debug-beta"
   }
 }
@@ -1885,7 +1885,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-canary-linux-debug-dev"
   }
 }
@@ -1896,7 +1896,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-canary-linux-debug-stable"
   }
 }
@@ -1907,7 +1907,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-ffi-android-debug-arm"
   }
 }
@@ -1918,7 +1918,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-ffi-android-debug-arm-beta"
   }
 }
@@ -1929,7 +1929,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-ffi-android-debug-arm-dev"
   }
 }
@@ -1940,7 +1940,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-ffi-android-debug-arm-stable"
   }
 }
@@ -1951,7 +1951,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-ffi-android-debug-arm64c"
   }
 }
@@ -1962,7 +1962,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-ffi-android-debug-arm64c-beta"
   }
 }
@@ -1973,7 +1973,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-ffi-android-debug-arm64c-dev"
   }
 }
@@ -1984,7 +1984,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-ffi-android-debug-arm64c-stable"
   }
 }
@@ -1995,7 +1995,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-ffi-android-product-arm"
   }
 }
@@ -2006,7 +2006,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-ffi-android-product-arm-beta"
   }
 }
@@ -2017,7 +2017,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-ffi-android-product-arm-dev"
   }
 }
@@ -2028,7 +2028,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-ffi-android-product-arm-stable"
   }
 }
@@ -2039,7 +2039,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-ffi-android-product-arm64c"
   }
 }
@@ -2050,7 +2050,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-ffi-android-product-arm64c-beta"
   }
 }
@@ -2061,7 +2061,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-ffi-android-product-arm64c-dev"
   }
 }
@@ -2072,7 +2072,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-ffi-android-product-arm64c-stable"
   }
 }
@@ -2083,7 +2083,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-ffi-android-release-arm"
   }
 }
@@ -2094,7 +2094,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-ffi-android-release-arm-beta"
   }
 }
@@ -2105,7 +2105,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-ffi-android-release-arm-dev"
   }
 }
@@ -2116,7 +2116,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-ffi-android-release-arm-stable"
   }
 }
@@ -2127,7 +2127,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-ffi-android-release-arm64c"
   }
 }
@@ -2138,7 +2138,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-ffi-android-release-arm64c-beta"
   }
 }
@@ -2149,7 +2149,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-ffi-android-release-arm64c-dev"
   }
 }
@@ -2160,7 +2160,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-ffi-android-release-arm64c-stable"
   }
 }
@@ -2171,7 +2171,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-fuchsia-release-x64"
   }
 }
@@ -2182,7 +2182,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-asan-linux-release-x64"
   }
 }
@@ -2193,7 +2193,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-checked-linux-release-x64"
   }
 }
@@ -2204,7 +2204,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-checked-linux-release-x64-beta"
   }
 }
@@ -2215,7 +2215,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-checked-linux-release-x64-dev"
   }
 }
@@ -2226,7 +2226,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-checked-linux-release-x64-stable"
   }
 }
@@ -2237,7 +2237,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-gcc-linux"
   }
 }
@@ -2248,7 +2248,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-gcc-linux-beta"
   }
 }
@@ -2259,7 +2259,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-gcc-linux-dev"
   }
 }
@@ -2270,7 +2270,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-gcc-linux-stable"
   }
 }
@@ -2281,7 +2281,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-linux-debug-ia32"
   }
 }
@@ -2292,7 +2292,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-linux-debug-simriscv64"
   }
 }
@@ -2303,7 +2303,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-linux-debug-x64"
   }
 }
@@ -2314,7 +2314,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-linux-debug-x64-beta"
   }
 }
@@ -2325,7 +2325,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-linux-debug-x64-dev"
   }
 }
@@ -2336,7 +2336,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-linux-debug-x64-stable"
   }
 }
@@ -2347,7 +2347,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-linux-debug-x64c"
   }
 }
@@ -2358,7 +2358,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-linux-product-x64"
   }
 }
@@ -2369,7 +2369,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-linux-release-ia32"
   }
 }
@@ -2380,7 +2380,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-linux-release-simarm"
   }
 }
@@ -2391,7 +2391,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-linux-release-simarm-beta"
   }
 }
@@ -2402,7 +2402,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-linux-release-simarm-dev"
   }
 }
@@ -2413,7 +2413,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-linux-release-simarm-stable"
   }
 }
@@ -2424,7 +2424,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-linux-release-simarm64"
   }
 }
@@ -2435,7 +2435,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-linux-release-simarm64-beta"
   }
 }
@@ -2446,7 +2446,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-linux-release-simarm64-dev"
   }
 }
@@ -2457,7 +2457,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-linux-release-simarm64-stable"
   }
 }
@@ -2468,7 +2468,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-linux-release-x64"
   }
 }
@@ -2479,7 +2479,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-linux-release-x64-beta"
   }
 }
@@ -2490,7 +2490,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-linux-release-x64-dev"
   }
 }
@@ -2501,7 +2501,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-linux-release-x64-stable"
   }
 }
@@ -2512,7 +2512,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-mac-debug-x64"
   }
 }
@@ -2523,7 +2523,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-mac-debug-x64-beta"
   }
 }
@@ -2534,7 +2534,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-mac-debug-x64-dev"
   }
 }
@@ -2545,7 +2545,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-mac-debug-x64-stable"
   }
 }
@@ -2556,7 +2556,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-mac-product-x64"
   }
 }
@@ -2567,7 +2567,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-mac-release-arm64"
   }
 }
@@ -2578,7 +2578,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-mac-release-arm64-dev"
   }
 }
@@ -2589,7 +2589,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-mac-release-x64"
   }
 }
@@ -2600,7 +2600,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-mac-release-x64-beta"
   }
 }
@@ -2611,7 +2611,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-mac-release-x64-dev"
   }
 }
@@ -2622,7 +2622,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-mac-release-x64-stable"
   }
 }
@@ -2633,7 +2633,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-msan-linux-release-x64"
   }
 }
@@ -2644,7 +2644,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-nnbd-linux-debug-ia32"
   }
 }
@@ -2655,7 +2655,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-nnbd-linux-debug-x64"
   }
 }
@@ -2666,7 +2666,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-nnbd-linux-debug-x64-beta"
   }
 }
@@ -2677,7 +2677,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-nnbd-linux-debug-x64-dev"
   }
 }
@@ -2688,7 +2688,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-nnbd-linux-debug-x64-stable"
   }
 }
@@ -2699,7 +2699,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-nnbd-linux-release-ia32"
   }
 }
@@ -2710,7 +2710,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-nnbd-linux-release-simarm"
   }
 }
@@ -2721,7 +2721,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-nnbd-linux-release-simarm64"
   }
 }
@@ -2732,7 +2732,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-nnbd-linux-release-x64"
   }
 }
@@ -2743,7 +2743,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-nnbd-linux-release-x64-beta"
   }
 }
@@ -2754,7 +2754,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-nnbd-linux-release-x64-dev"
   }
 }
@@ -2765,7 +2765,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-nnbd-linux-release-x64-stable"
   }
 }
@@ -2776,7 +2776,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-nnbd-mac-debug-arm64"
   }
 }
@@ -2787,7 +2787,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-nnbd-mac-debug-x64"
   }
 }
@@ -2798,7 +2798,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-nnbd-mac-release-arm64"
   }
 }
@@ -2809,7 +2809,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-nnbd-mac-release-x64"
   }
 }
@@ -2820,7 +2820,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-nnbd-win-debug-x64"
   }
 }
@@ -2831,7 +2831,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-nnbd-win-release-ia32"
   }
 }
@@ -2842,7 +2842,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-nnbd-win-release-x64"
   }
 }
@@ -2853,7 +2853,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-optcounter-threshold-linux-release-ia32"
   }
 }
@@ -2864,7 +2864,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-optcounter-threshold-linux-release-x64"
   }
 }
@@ -2875,7 +2875,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-android-release-arm64c"
   }
 }
@@ -2886,7 +2886,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-android-release-arm64c-beta"
   }
 }
@@ -2897,7 +2897,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-android-release-arm64c-dev"
   }
 }
@@ -2908,7 +2908,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-android-release-arm64c-stable"
   }
 }
@@ -2919,7 +2919,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-android-release-arm_x64"
   }
 }
@@ -2930,7 +2930,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-android-release-arm_x64-beta"
   }
 }
@@ -2941,7 +2941,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-android-release-arm_x64-dev"
   }
 }
@@ -2952,7 +2952,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-android-release-arm_x64-stable"
   }
 }
@@ -2963,7 +2963,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-asan-linux-release-x64"
   }
 }
@@ -2974,7 +2974,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-dwarf-linux-product-x64"
   }
 }
@@ -2985,7 +2985,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-debug-simarm_x64"
   }
 }
@@ -2996,7 +2996,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
   }
 }
@@ -3007,7 +3007,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
   }
 }
@@ -3018,7 +3018,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
   }
 }
@@ -3029,7 +3029,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-debug-simriscv64"
   }
 }
@@ -3040,7 +3040,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-debug-x64"
   }
 }
@@ -3051,7 +3051,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-debug-x64-beta"
   }
 }
@@ -3062,7 +3062,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-debug-x64-dev"
   }
 }
@@ -3073,7 +3073,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-debug-x64-stable"
   }
 }
@@ -3084,7 +3084,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-debug-x64c"
   }
 }
@@ -3095,7 +3095,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-product-x64"
   }
 }
@@ -3106,7 +3106,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-product-x64-beta"
   }
 }
@@ -3117,7 +3117,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-product-x64-dev"
   }
 }
@@ -3128,7 +3128,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-product-x64-stable"
   }
 }
@@ -3139,7 +3139,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm"
   }
 }
@@ -3150,7 +3150,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm-beta"
   }
 }
@@ -3161,7 +3161,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm-dev"
   }
 }
@@ -3172,7 +3172,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm-stable"
   }
 }
@@ -3183,7 +3183,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm64"
   }
 }
@@ -3194,7 +3194,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm64-beta"
   }
 }
@@ -3205,7 +3205,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm64-dev"
   }
 }
@@ -3216,7 +3216,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm64-stable"
   }
 }
@@ -3227,7 +3227,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm_x64"
   }
 }
@@ -3238,7 +3238,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm_x64-beta"
   }
 }
@@ -3249,7 +3249,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm_x64-dev"
   }
 }
@@ -3260,7 +3260,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-simarm_x64-stable"
   }
 }
@@ -3271,7 +3271,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-x64"
   }
 }
@@ -3282,7 +3282,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-x64-beta"
   }
 }
@@ -3293,7 +3293,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-x64-dev"
   }
 }
@@ -3304,7 +3304,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-linux-release-x64-stable"
   }
 }
@@ -3315,7 +3315,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-mac-release-simarm64"
   }
 }
@@ -3326,7 +3326,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-mac-release-simarm64-beta"
   }
 }
@@ -3337,7 +3337,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-mac-release-simarm64-dev"
   }
 }
@@ -3348,7 +3348,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-mac-release-simarm64-stable"
   }
 }
@@ -3359,7 +3359,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-msan-linux-release-x64"
   }
 }
@@ -3370,7 +3370,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
   }
 }
@@ -3381,7 +3381,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-nnbd-linux-debug-x64"
   }
 }
@@ -3392,7 +3392,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-nnbd-linux-release-simarm64"
   }
 }
@@ -3403,7 +3403,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
   }
 }
@@ -3414,7 +3414,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-nnbd-linux-release-x64"
   }
 }
@@ -3425,7 +3425,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
   }
 }
@@ -3436,7 +3436,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
   }
 }
@@ -3447,7 +3447,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
   }
 }
@@ -3458,7 +3458,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-nnbd-mac-release-arm64"
   }
 }
@@ -3469,7 +3469,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-nnbd-mac-release-simarm64"
   }
 }
@@ -3480,7 +3480,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-nnbd-win-release-x64"
   }
 }
@@ -3491,7 +3491,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-obfuscate-linux-release-x64"
   }
 }
@@ -3502,7 +3502,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
   }
 }
@@ -3513,7 +3513,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
   }
 }
@@ -3524,7 +3524,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
   }
 }
@@ -3535,7 +3535,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-tsan-linux-release-x64"
   }
 }
@@ -3546,7 +3546,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-ubsan-linux-release-x64"
   }
 }
@@ -3557,7 +3557,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-win-debug-x64c"
   }
 }
@@ -3568,7 +3568,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-win-release-x64"
   }
 }
@@ -3579,7 +3579,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-win-release-x64-beta"
   }
 }
@@ -3590,7 +3590,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-win-release-x64-dev"
   }
 }
@@ -3601,7 +3601,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-precomp-win-release-x64-stable"
   }
 }
@@ -3612,7 +3612,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-reload-linux-debug-x64"
   }
 }
@@ -3623,7 +3623,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-reload-linux-release-x64"
   }
 }
@@ -3634,7 +3634,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-reload-rollback-linux-debug-x64"
   }
 }
@@ -3645,7 +3645,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-reload-rollback-linux-release-x64"
   }
 }
@@ -3656,7 +3656,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-tsan-linux-release-x64"
   }
 }
@@ -3667,7 +3667,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-ubsan-linux-release-x64"
   }
 }
@@ -3678,7 +3678,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-win-debug-ia32"
   }
 }
@@ -3689,7 +3689,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-win-debug-x64"
   }
 }
@@ -3700,7 +3700,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-win-debug-x64-beta"
   }
 }
@@ -3711,7 +3711,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-win-debug-x64-dev"
   }
 }
@@ -3722,7 +3722,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-win-debug-x64-stable"
   }
 }
@@ -3733,7 +3733,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-win-debug-x64c"
   }
 }
@@ -3744,7 +3744,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-win-product-x64"
   }
 }
@@ -3755,7 +3755,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-win-release-ia32"
   }
 }
@@ -3766,7 +3766,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-win-release-x64"
   }
 }
@@ -3777,7 +3777,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-win-release-x64-beta"
   }
 }
@@ -3788,7 +3788,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-win-release-x64-dev"
   }
 }
@@ -3799,7 +3799,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-kernel-win-release-x64-stable"
   }
 }
@@ -3810,7 +3810,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-precomp-ffi-qemu-linux-release-arm"
   }
 }
@@ -3821,7 +3821,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-precomp-ffi-qemu-linux-release-arm-beta"
   }
 }
@@ -3832,7 +3832,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-precomp-ffi-qemu-linux-release-arm-dev"
   }
 }
@@ -3843,7 +3843,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
   }
 }
@@ -3854,7 +3854,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-precomp-ffi-qemu-linux-release-arm-stable"
   }
 }
@@ -3865,7 +3865,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-precomp-ffi-qemu-linux-release-riscv64"
   }
 }
@@ -3876,7 +3876,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
   }
 }
@@ -3887,7 +3887,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
   }
 }
@@ -3898,7 +3898,7 @@ job {
   acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.dart.ci.sandbox"
+    bucket: "ci.sandbox"
     builder: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
   }
 }
diff --git a/generated/project.cfg b/generated/project.cfg
index 654142bfda7b..270f745c5e29 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -11,4 +11,5 @@ lucicfg {
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
+  experiments: "crbug.com/1182002"
 }
diff --git a/main.star b/main.star
index d33269e26f24..9a9650354729 100755
--- a/main.star
+++ b/main.star
@@ -30,13 +30,13 @@ load("//lib/priority.star", "priority")
 
 lucicfg.check_version("1.30.9")
 
+# Use LUCI Scheduler BBv2 names and add Scheduler realms configs.
+lucicfg.enable_experiment("crbug.com/1182002")
+
 # Global builder defaults
 # These need to be set at the top level to affect all uses of luci.builder.
 luci.builder.defaults.experiments.set({
-    "luci.buildbucket.use_bbagent": 100,
     "luci.recipes.use_python3": 100,
-    # Launch 100% of Swarming tasks in "realms-aware mode", crbug.com/1170330.
-    "luci.use_realms": 100,
 })
 luci.builder.defaults.properties.set({
     "$recipe_engine/isolated": {

From b1730e14045b9a59ec5c91b86c25189c251dbf97 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Fri, 11 Feb 2022 13:44:36 +0000
Subject: [PATCH 529/826] [infra] Add moved SDK and linux package builders to
 the LUCI consoles

The SDK and Debian linux package builders on the main channel have
moved to the dart-internal LUCI project. Add their new locations on
the LUCI consoles.

Remove the main channel linux package builder on the dart LUCI project
that was moved to dart-ci.

Bug: b/218295459
Change-Id: I2917435fbc24fe36f634ce918a80d67df6198a1b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/232602
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 console-header.textpb        |   5 ++
 generated/cr-buildbucket.cfg |  34 --------
 generated/luci-milo.cfg      | 145 ++++++++++++++++++++++++++++++++---
 generated/luci-notify.cfg    |  15 ----
 generated/luci-scheduler.cfg |  12 ---
 main.star                    |  41 ++++++++++
 6 files changed, 181 insertions(+), 71 deletions(-)

diff --git a/console-header.textpb b/console-header.textpb
index 3653f34e8d59..c932efbf9bfd 100644
--- a/console-header.textpb
+++ b/console-header.textpb
@@ -15,6 +15,11 @@ links: {
         url: "/p/dart/g/fyi/console"
         alt: "SDK FYI Console"
     }
+    links: {
+        text: "LKGR console"
+        url: "/p/dart-internal/g/lkgr/console"
+        alt: "SDK LKGR console"
+    }
     links: {
         text: "SDK CQ Status"
         url: "/p/dart/g/cq/builders"
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 26009ca3e241..ef1cbfe32b4d 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -768,40 +768,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "debianpackage-linux"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "debianpackage-linux-beta"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index f28a66e1dc47..0bdda54c5626 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -1045,16 +1045,36 @@ consoles {
     category: "misc"
     short_name: "g"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux"
-    category: "misc"
-    short_name: "dp"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/google"
     category: "flutter"
     short_name: "g3"
   }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-linux-main"
+    category: "sdk"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-main"
+    category: "sdk"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-arm64-main"
+    category: "sdk"
+    short_name: "m1"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-win-main"
+    category: "sdk"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/debianpackage-linux-main"
+    category: "misc"
+    short_name: "dp"
+  }
   header {
     links {
       name: "Consoles"
@@ -1073,6 +1093,11 @@ consoles {
         url: "/p/dart/g/fyi/console"
         alt: "SDK FYI Console"
       }
+      links {
+        text: "LKGR console"
+        url: "/p/dart-internal/g/lkgr/console"
+        alt: "SDK LKGR console"
+      }
       links {
         text: "SDK CQ Status"
         url: "/p/dart/g/cq/builders"
@@ -1314,11 +1339,6 @@ consoles {
     category: "misc"
     short_name: "g"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux"
-    category: "misc"
-    short_name: "dp"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/google"
     category: "flutter"
@@ -1759,6 +1779,31 @@ consoles {
     category: "vm|ffi"
     short_name: "qr"
   }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-linux-main"
+    category: "sdk"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-main"
+    category: "sdk"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-arm64-main"
+    category: "sdk"
+    short_name: "m1"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-win-main"
+    category: "sdk"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/debianpackage-linux-main"
+    category: "misc"
+    short_name: "dp"
+  }
   header {
     links {
       name: "Consoles"
@@ -1777,6 +1822,11 @@ consoles {
         url: "/p/dart/g/fyi/console"
         alt: "SDK FYI Console"
       }
+      links {
+        text: "LKGR console"
+        url: "/p/dart-internal/g/lkgr/console"
+        alt: "SDK LKGR console"
+      }
       links {
         text: "SDK CQ Status"
         url: "/p/dart/g/cq/builders"
@@ -2163,6 +2213,26 @@ consoles {
     category: "misc"
     short_name: "dp"
   }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-linux-dev"
+    category: "sdk"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-dev"
+    category: "sdk"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-arm64-dev"
+    category: "sdk"
+    short_name: "m1"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-win-dev"
+    category: "sdk"
+    short_name: "w"
+  }
   header {
     links {
       name: "Consoles"
@@ -2181,6 +2251,11 @@ consoles {
         url: "/p/dart/g/fyi/console"
         alt: "SDK FYI Console"
       }
+      links {
+        text: "LKGR console"
+        url: "/p/dart-internal/g/lkgr/console"
+        alt: "SDK LKGR console"
+      }
       links {
         text: "SDK CQ Status"
         url: "/p/dart/g/cq/builders"
@@ -2562,6 +2637,26 @@ consoles {
     category: "misc"
     short_name: "dp"
   }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-linux-beta"
+    category: "sdk"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-beta"
+    category: "sdk"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-arm64-beta"
+    category: "sdk"
+    short_name: "m1"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-win-beta"
+    category: "sdk"
+    short_name: "w"
+  }
   header {
     links {
       name: "Consoles"
@@ -2580,6 +2675,11 @@ consoles {
         url: "/p/dart/g/fyi/console"
         alt: "SDK FYI Console"
       }
+      links {
+        text: "LKGR console"
+        url: "/p/dart-internal/g/lkgr/console"
+        alt: "SDK LKGR console"
+      }
       links {
         text: "SDK CQ Status"
         url: "/p/dart/g/cq/builders"
@@ -2961,6 +3061,26 @@ consoles {
     category: "misc"
     short_name: "dp"
   }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-linux-stable"
+    category: "sdk"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-stable"
+    category: "sdk"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-arm64-stable"
+    category: "sdk"
+    short_name: "m1"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-win-stable"
+    category: "sdk"
+    short_name: "w"
+  }
   header {
     links {
       name: "Consoles"
@@ -2979,6 +3099,11 @@ consoles {
         url: "/p/dart/g/fyi/console"
         alt: "SDK FYI Console"
       }
+      links {
+        text: "LKGR console"
+        url: "/p/dart-internal/g/lkgr/console"
+        alt: "SDK LKGR console"
+      }
       links {
         text: "SDK CQ Status"
         url: "/p/dart/g/cq/builders"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 727fa04f38a0..e0dc911f9745 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -102,21 +102,6 @@ notifiers {
     name: "dart-ci-scripts-win"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "debianpackage-linux"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index a14abcdea0d3..631671833521 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1269,17 +1269,6 @@ job {
     builder: "ddk-linux-release-firefox-stable"
   }
 }
-job {
-  id: "debianpackage-linux"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "debianpackage-linux"
-  }
-}
 job {
   id: "debianpackage-linux-beta"
   realm: "ci"
@@ -4114,7 +4103,6 @@ trigger {
   id: "dart-gitiles-trigger-main"
   realm: "ci"
   acl_sets: "ci"
-  triggers: "debianpackage-linux"
   triggers: "linearize-flutter"
   triggers: "analyzer-analysis-server-linux"
   triggers: "analyzer-linux-release"
diff --git a/main.star b/main.star
index 9a9650354729..b171d41a0bba 100755
--- a/main.star
+++ b/main.star
@@ -536,6 +536,7 @@ dart.ci_builder(
     "debianpackage-linux",
     category = "misc|dp",
     channels = dart.release_channels,
+    main_channel = False,
     notifies = "infra",
     properties = {
         "clobber": False,
@@ -698,4 +699,44 @@ luci.list_view_entry(
     list_view = "iso-stress",
 )
 
+# SDK builders on consoles
+def sdk_builder_category():
+    for channel, console in [
+        ["main", "be"],
+        ["main", "alt"],
+        ["beta", "beta"],
+        ["dev", "dev"],
+        ["stable", "stable"],
+    ]:
+        for builder_type, short_name in [
+            ["linux", "l"],
+            ["mac", "m"],
+            ["mac-arm64", "m1"],
+            ["win", "w"],
+        ]:
+            luci.console_view_entry(
+                builder = "dart-internal:ci/dart-sdk-%s-%s" %
+                          (builder_type, channel),
+                short_name = short_name,
+                category = "sdk",
+                console_view = console,
+            )
+
+sdk_builder_category()
+
+# Debian builder on main consoles
+luci.console_view_entry(
+    builder = "dart-internal:ci/debianpackage-linux-main",
+    short_name = "dp",
+    category = "misc",
+    console_view = "be",
+)
+
+luci.console_view_entry(
+    builder = "dart-internal:ci/debianpackage-linux-main",
+    short_name = "dp",
+    category = "misc",
+    console_view = "alt",
+)
+
 exec("//recipes.star")

From 3baf73003d972d6bbae812ccdbaec2cfd1def59a Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Fri, 11 Feb 2022 14:43:07 +0000
Subject: [PATCH 530/826] [infra] Move the SDK category first on LUCI consoles,
 combine with misc

Bug: b/218295459
Change-Id: I2e52ee1e7ecf4b4268083b01223976032301d08a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/232620
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/luci-milo.cfg | 230 ++++++++++++++++++++--------------------
 main.star               |  84 +++++++--------
 2 files changed, 157 insertions(+), 157 deletions(-)

diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 0bdda54c5626..ecbb6a90da42 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -405,6 +405,31 @@ consoles {
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "regexp:refs/heads/main"
   manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-linux-main"
+    category: "sdk"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-main"
+    category: "sdk"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-arm64-main"
+    category: "sdk"
+    short_name: "m1"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-win-main"
+    category: "sdk"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/debianpackage-linux-main"
+    category: "sdk"
+    short_name: "dp"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
     category: "cfe"
@@ -1047,33 +1072,8 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/google"
-    category: "flutter"
-    short_name: "g3"
-  }
-  builders {
-    name: "buildbucket/luci.dart-internal.ci/dart-sdk-linux-main"
-    category: "sdk"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-main"
     category: "sdk"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-arm64-main"
-    category: "sdk"
-    short_name: "m1"
-  }
-  builders {
-    name: "buildbucket/luci.dart-internal.ci/dart-sdk-win-main"
-    category: "sdk"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart-internal.ci/debianpackage-linux-main"
-    category: "misc"
-    short_name: "dp"
+    short_name: "g3"
   }
   header {
     links {
@@ -1134,6 +1134,31 @@ consoles {
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "regexp:refs/heads/main"
   manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-linux-main"
+    category: "sdk"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-main"
+    category: "sdk"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-arm64-main"
+    category: "sdk"
+    short_name: "m1"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-win-main"
+    category: "sdk"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/debianpackage-linux-main"
+    category: "sdk"
+    short_name: "dp"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
     category: "cfe"
@@ -1341,7 +1366,7 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/google"
-    category: "flutter"
+    category: "sdk"
     short_name: "g3"
   }
   builders {
@@ -1779,31 +1804,6 @@ consoles {
     category: "vm|ffi"
     short_name: "qr"
   }
-  builders {
-    name: "buildbucket/luci.dart-internal.ci/dart-sdk-linux-main"
-    category: "sdk"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-main"
-    category: "sdk"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-arm64-main"
-    category: "sdk"
-    short_name: "m1"
-  }
-  builders {
-    name: "buildbucket/luci.dart-internal.ci/dart-sdk-win-main"
-    category: "sdk"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart-internal.ci/debianpackage-linux-main"
-    category: "misc"
-    short_name: "dp"
-  }
   header {
     links {
       name: "Consoles"
@@ -1863,6 +1863,26 @@ consoles {
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "regexp:refs/heads/dev"
   manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-linux-dev"
+    category: "sdk"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-dev"
+    category: "sdk"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-arm64-dev"
+    category: "sdk"
+    short_name: "m1"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-win-dev"
+    category: "sdk"
+    short_name: "w"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-dev"
     category: "cfe"
@@ -2210,28 +2230,8 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci/debianpackage-linux-dev"
-    category: "misc"
-    short_name: "dp"
-  }
-  builders {
-    name: "buildbucket/luci.dart-internal.ci/dart-sdk-linux-dev"
-    category: "sdk"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-dev"
-    category: "sdk"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-arm64-dev"
-    category: "sdk"
-    short_name: "m1"
-  }
-  builders {
-    name: "buildbucket/luci.dart-internal.ci/dart-sdk-win-dev"
     category: "sdk"
-    short_name: "w"
+    short_name: "dp"
   }
   header {
     links {
@@ -2292,6 +2292,26 @@ consoles {
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "regexp:refs/heads/beta"
   manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-linux-beta"
+    category: "sdk"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-beta"
+    category: "sdk"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-arm64-beta"
+    category: "sdk"
+    short_name: "m1"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-win-beta"
+    category: "sdk"
+    short_name: "w"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-beta"
     category: "cfe"
@@ -2634,28 +2654,8 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci/debianpackage-linux-beta"
-    category: "misc"
-    short_name: "dp"
-  }
-  builders {
-    name: "buildbucket/luci.dart-internal.ci/dart-sdk-linux-beta"
     category: "sdk"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-beta"
-    category: "sdk"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-arm64-beta"
-    category: "sdk"
-    short_name: "m1"
-  }
-  builders {
-    name: "buildbucket/luci.dart-internal.ci/dart-sdk-win-beta"
-    category: "sdk"
-    short_name: "w"
+    short_name: "dp"
   }
   header {
     links {
@@ -2716,6 +2716,26 @@ consoles {
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "regexp:refs/heads/stable"
   manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-linux-stable"
+    category: "sdk"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-stable"
+    category: "sdk"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-arm64-stable"
+    category: "sdk"
+    short_name: "m1"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-win-stable"
+    category: "sdk"
+    short_name: "w"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-stable"
     category: "cfe"
@@ -3058,28 +3078,8 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci/debianpackage-linux-stable"
-    category: "misc"
-    short_name: "dp"
-  }
-  builders {
-    name: "buildbucket/luci.dart-internal.ci/dart-sdk-linux-stable"
-    category: "sdk"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-stable"
-    category: "sdk"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-arm64-stable"
     category: "sdk"
-    short_name: "m1"
-  }
-  builders {
-    name: "buildbucket/luci.dart-internal.ci/dart-sdk-win-stable"
-    category: "sdk"
-    short_name: "w"
+    short_name: "dp"
   }
   header {
     links {
diff --git a/main.star b/main.star
index b171d41a0bba..f2d598d45249 100755
--- a/main.star
+++ b/main.star
@@ -126,6 +126,46 @@ luci.list_view(
     title = "Infra Console",
 )
 
+# Put the SDK category first on the consoles
+def sdk_builder_category():
+    for channel, console in [
+        ["main", "be"],
+        ["main", "alt"],
+        ["beta", "beta"],
+        ["dev", "dev"],
+        ["stable", "stable"],
+    ]:
+        for builder_type, short_name in [
+            ["linux", "l"],
+            ["mac", "m"],
+            ["mac-arm64", "m1"],
+            ["win", "w"],
+        ]:
+            luci.console_view_entry(
+                builder = "dart-internal:ci/dart-sdk-%s-%s" %
+                          (builder_type, channel),
+                short_name = short_name,
+                category = "sdk",
+                console_view = console,
+            )
+
+sdk_builder_category()
+
+# Debian builder on main consoles
+luci.console_view_entry(
+    builder = "dart-internal:ci/debianpackage-linux-main",
+    short_name = "dp",
+    category = "sdk",
+    console_view = "be",
+)
+
+luci.console_view_entry(
+    builder = "dart-internal:ci/debianpackage-linux-main",
+    short_name = "dp",
+    category = "sdk",
+    console_view = "alt",
+)
+
 luci.gitiles_poller(
     name = "dart-gitiles-trigger-flutter",
     bucket = "ci",
@@ -534,7 +574,7 @@ dart.ci_sandbox_builder(
 dart.ci_sandbox_builder("gclient", recipe = "dart/gclient", category = "misc|g")
 dart.ci_builder(
     "debianpackage-linux",
-    category = "misc|dp",
+    category = "sdk|dp",
     channels = dart.release_channels,
     main_channel = False,
     notifies = "infra",
@@ -547,7 +587,7 @@ dart.ci_builder(
 dart.ci_sandbox_builder(
     "google",
     recipe = "dart/external",
-    category = "flutter|g3",
+    category = "sdk|g3",
     channels = [],
     execution_timeout = 5 * time.minute,
     notifies = None,
@@ -699,44 +739,4 @@ luci.list_view_entry(
     list_view = "iso-stress",
 )
 
-# SDK builders on consoles
-def sdk_builder_category():
-    for channel, console in [
-        ["main", "be"],
-        ["main", "alt"],
-        ["beta", "beta"],
-        ["dev", "dev"],
-        ["stable", "stable"],
-    ]:
-        for builder_type, short_name in [
-            ["linux", "l"],
-            ["mac", "m"],
-            ["mac-arm64", "m1"],
-            ["win", "w"],
-        ]:
-            luci.console_view_entry(
-                builder = "dart-internal:ci/dart-sdk-%s-%s" %
-                          (builder_type, channel),
-                short_name = short_name,
-                category = "sdk",
-                console_view = console,
-            )
-
-sdk_builder_category()
-
-# Debian builder on main consoles
-luci.console_view_entry(
-    builder = "dart-internal:ci/debianpackage-linux-main",
-    short_name = "dp",
-    category = "misc",
-    console_view = "be",
-)
-
-luci.console_view_entry(
-    builder = "dart-internal:ci/debianpackage-linux-main",
-    short_name = "dp",
-    category = "misc",
-    console_view = "alt",
-)
-
 exec("//recipes.star")

From 3016abb23bb50aa072787a87b7039fab1c7454b8 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Mon, 14 Feb 2022 15:07:55 +0000
Subject: [PATCH 531/826] [infra] Removed migrated Dart SDK builders.

The Dart SDK is now securely built in the trusted dart-internal LUCI
project with enforced multi-party approval for infrastructure changes
and access.

The dart-sdk-*-try builders remains. The debian builder did not have a
try builder at this time as it wouldn't work.

Bug: b/216085661
Change-Id: If398ee9f0f7251f04d29ae15e712a774422793a6
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/232860
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 generated/cr-buildbucket.cfg | 565 -----------------------------------
 generated/luci-milo.cfg      |  90 +-----
 generated/luci-scheduler.cfg | 180 -----------
 main.star                    |  52 +---
 4 files changed, 26 insertions(+), 861 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index ef1cbfe32b4d..e828cf08fd7b 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -306,570 +306,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "dart-sdk-linux-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true,'
-        '    "timeout": 6000'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-linux-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true,'
-        '    "timeout": 6000'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-linux-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true,'
-        '    "timeout": 6000'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-mac-arm64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-mac-arm64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-mac-arm64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-mac-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-mac-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-mac-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-win-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-win-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-win-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "debianpackage-linux-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "debianpackage-linux-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "debianpackage-linux-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "flutter-engine-ios"
       swarming_host: "chromium-swarm.appspot.com"
@@ -14009,7 +13445,6 @@ buckets {
         '    "use_luci_auth": true'
         '  },'
         '  "$dart/build": {'
-        '    "disable_goma": true,'
         '    "timeout": 6000'
         '  },'
         '  "$recipe_engine/isolated": {'
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index ecbb6a90da42..79ad0e09581e 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -1883,6 +1883,11 @@ consoles {
     category: "sdk"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/debianpackage-linux-dev"
+    category: "sdk"
+    short_name: "dp"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-dev"
     category: "cfe"
@@ -2183,26 +2188,6 @@ consoles {
     category: "analyzer|nnbd"
     short_name: "l"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-linux-dev"
-    category: "sdk"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-dev"
-    category: "sdk"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-dev"
-    category: "sdk"
-    short_name: "m1"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-win-dev"
-    category: "sdk"
-    short_name: "w"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-dev"
     category: "ddc"
@@ -2228,11 +2213,6 @@ consoles {
     category: "misc"
     short_name: "g"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux-dev"
-    category: "sdk"
-    short_name: "dp"
-  }
   header {
     links {
       name: "Consoles"
@@ -2312,6 +2292,11 @@ consoles {
     category: "sdk"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/debianpackage-linux-beta"
+    category: "sdk"
+    short_name: "dp"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-beta"
     category: "cfe"
@@ -2607,26 +2592,6 @@ consoles {
     category: "analyzer|nnbd"
     short_name: "l"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-linux-beta"
-    category: "sdk"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-beta"
-    category: "sdk"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-beta"
-    category: "sdk"
-    short_name: "m1"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-win-beta"
-    category: "sdk"
-    short_name: "w"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-beta"
     category: "ddc"
@@ -2652,11 +2617,6 @@ consoles {
     category: "misc"
     short_name: "g"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux-beta"
-    category: "sdk"
-    short_name: "dp"
-  }
   header {
     links {
       name: "Consoles"
@@ -2736,6 +2696,11 @@ consoles {
     category: "sdk"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/debianpackage-linux-stable"
+    category: "sdk"
+    short_name: "dp"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-stable"
     category: "cfe"
@@ -3031,26 +2996,6 @@ consoles {
     category: "analyzer|nnbd"
     short_name: "l"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-linux-stable"
-    category: "sdk"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-stable"
-    category: "sdk"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-mac-arm64-stable"
-    category: "sdk"
-    short_name: "m1"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-sdk-win-stable"
-    category: "sdk"
-    short_name: "w"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-stable"
     category: "ddc"
@@ -3076,11 +3021,6 @@ consoles {
     category: "misc"
     short_name: "g"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/debianpackage-linux-stable"
-    category: "sdk"
-    short_name: "dp"
-  }
   header {
     links {
       name: "Consoles"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 631671833521..6024aa5aba77 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -466,138 +466,6 @@ job {
     builder: "dart-ci-scripts-win"
   }
 }
-job {
-  id: "dart-sdk-linux-beta"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "dart-sdk-linux-beta"
-  }
-}
-job {
-  id: "dart-sdk-linux-dev"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "dart-sdk-linux-dev"
-  }
-}
-job {
-  id: "dart-sdk-linux-stable"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "dart-sdk-linux-stable"
-  }
-}
-job {
-  id: "dart-sdk-mac-arm64-beta"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "dart-sdk-mac-arm64-beta"
-  }
-}
-job {
-  id: "dart-sdk-mac-arm64-dev"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "dart-sdk-mac-arm64-dev"
-  }
-}
-job {
-  id: "dart-sdk-mac-arm64-stable"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "dart-sdk-mac-arm64-stable"
-  }
-}
-job {
-  id: "dart-sdk-mac-beta"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "dart-sdk-mac-beta"
-  }
-}
-job {
-  id: "dart-sdk-mac-dev"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "dart-sdk-mac-dev"
-  }
-}
-job {
-  id: "dart-sdk-mac-stable"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "dart-sdk-mac-stable"
-  }
-}
-job {
-  id: "dart-sdk-win-beta"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "dart-sdk-win-beta"
-  }
-}
-job {
-  id: "dart-sdk-win-dev"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "dart-sdk-win-dev"
-  }
-}
-job {
-  id: "dart-sdk-win-stable"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "dart-sdk-win-stable"
-  }
-}
 job {
   id: "dart2js-canary-x64"
   realm: "ci.sandbox"
@@ -1269,39 +1137,6 @@ job {
     builder: "ddk-linux-release-firefox-stable"
   }
 }
-job {
-  id: "debianpackage-linux-beta"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "debianpackage-linux-beta"
-  }
-}
-job {
-  id: "debianpackage-linux-dev"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "debianpackage-linux-dev"
-  }
-}
-job {
-  id: "debianpackage-linux-stable"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "debianpackage-linux-stable"
-  }
-}
 job {
   id: "flutter-analyze"
   realm: "ci.sandbox"
@@ -3926,11 +3761,6 @@ trigger {
   id: "dart-gitiles-trigger-beta"
   realm: "ci"
   acl_sets: "ci"
-  triggers: "dart-sdk-linux-beta"
-  triggers: "dart-sdk-mac-arm64-beta"
-  triggers: "dart-sdk-mac-beta"
-  triggers: "dart-sdk-win-beta"
-  triggers: "debianpackage-linux-beta"
   triggers: "analyzer-analysis-server-linux-beta"
   triggers: "analyzer-linux-release-beta"
   triggers: "analyzer-mac-release-beta"
@@ -4003,11 +3833,6 @@ trigger {
   id: "dart-gitiles-trigger-dev"
   realm: "ci"
   acl_sets: "ci"
-  triggers: "dart-sdk-linux-dev"
-  triggers: "dart-sdk-mac-arm64-dev"
-  triggers: "dart-sdk-mac-dev"
-  triggers: "dart-sdk-win-dev"
-  triggers: "debianpackage-linux-dev"
   triggers: "analyzer-analysis-server-linux-dev"
   triggers: "analyzer-linux-release-dev"
   triggers: "analyzer-mac-release-dev"
@@ -4153,11 +3978,6 @@ trigger {
   id: "dart-gitiles-trigger-stable"
   realm: "ci"
   acl_sets: "ci"
-  triggers: "dart-sdk-linux-stable"
-  triggers: "dart-sdk-mac-arm64-stable"
-  triggers: "dart-sdk-mac-stable"
-  triggers: "dart-sdk-win-stable"
-  triggers: "debianpackage-linux-stable"
   triggers: "analyzer-analysis-server-linux-stable"
   triggers: "analyzer-linux-release-stable"
   triggers: "analyzer-mac-release-stable"
diff --git a/main.star b/main.star
index f2d598d45249..fa471663181c 100755
--- a/main.star
+++ b/main.star
@@ -148,24 +148,15 @@ def sdk_builder_category():
                 category = "sdk",
                 console_view = console,
             )
+        luci.console_view_entry(
+            builder = "dart-internal:ci/debianpackage-linux-%s" % channel,
+            short_name = "dp",
+            category = "sdk",
+            console_view = console,
+        )
 
 sdk_builder_category()
 
-# Debian builder on main consoles
-luci.console_view_entry(
-    builder = "dart-internal:ci/debianpackage-linux-main",
-    short_name = "dp",
-    category = "sdk",
-    console_view = "be",
-)
-
-luci.console_view_entry(
-    builder = "dart-internal:ci/debianpackage-linux-main",
-    short_name = "dp",
-    category = "sdk",
-    console_view = "alt",
-)
-
 luci.gitiles_poller(
     name = "dart-gitiles-trigger-flutter",
     bucket = "ci",
@@ -501,40 +492,29 @@ cron.nightly_builder(
 )
 
 # sdk
-dart.ci_builder(
+dart.try_builder(
     "dart-sdk-linux",
-    category = "sdk|l",
-    channels = dart.channels,
-    main_channel = False,
     properties = {
         "$dart/build": {
             "timeout": 100 * 60,  # 100 minutes,
         },
     },
 )
-dart.ci_builder(
+dart.try_builder(
     "dart-sdk-mac",
-    category = "sdk|m",
-    channels = dart.channels,
     dimensions = mac,
-    main_channel = False,
     properties = pinned_xcode,
 )
-dart.ci_builder(
+
+dart.try_builder(
     "dart-sdk-mac-arm64",
-    category = "sdk|m1",
-    channels = dart.channels,
     dimensions = [mac, arm64],
-    main_channel = False,
     properties = [no_android, pinned_xcode],
 )
 
-dart.ci_builder(
+dart.try_builder(
     "dart-sdk-win",
-    category = "sdk|w",
-    channels = dart.channels,
     dimensions = windows,
-    main_channel = False,
     on_cq = True,
 )
 
@@ -572,16 +552,6 @@ dart.ci_sandbox_builder(
 
 # misc
 dart.ci_sandbox_builder("gclient", recipe = "dart/gclient", category = "misc|g")
-dart.ci_builder(
-    "debianpackage-linux",
-    category = "sdk|dp",
-    channels = dart.release_channels,
-    main_channel = False,
-    notifies = "infra",
-    properties = {
-        "clobber": False,
-    },
-)
 
 # external
 dart.ci_sandbox_builder(

From e526d90e7fbd438598d5b7f19662840b6cfc1375 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Tue, 15 Feb 2022 16:56:20 +0000
Subject: [PATCH 532/826] [infra] Remove migrated base and dev rollers.

Bug: b/219703001
Change-Id: Ic1553e047afa1b70da558391412e370c33fe553a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/233102
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 generated/cr-buildbucket.cfg | 73 ------------------------------------
 generated/luci-milo.cfg      |  6 ---
 generated/luci-notify.cfg    | 14 -------
 generated/luci-scheduler.cfg | 32 ----------------
 generated/realms.cfg         |  4 --
 main.star                    | 16 --------
 6 files changed, 145 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index e828cf08fd7b..7f5f55255ece 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -18,41 +18,6 @@ buckets {
     group: "project-dart-admins"
   }
   swarming {
-    builders {
-      name: "base"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/forward_branch"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 900
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "cbuild"
       swarming_host: "chromium-swarm.appspot.com"
@@ -479,44 +444,6 @@ buckets {
     role: SCHEDULER
     group: "project-dart-roller-owners"
   }
-  swarming {
-    builders {
-      name: "roll-to-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "from_ref": "refs/heads/lkgr",'
-        '  "recipe": "roller/roll_to_dev"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 900
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-  }
 }
 buckets {
   name: "ci.sandbox"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 79ad0e09581e..d2a6b02cdc73 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -3134,9 +3134,6 @@ consoles {
 consoles {
   id: "infra"
   name: "Infra Console"
-  builders {
-    name: "buildbucket/luci.dart.ci/base"
-  }
   builders {
     name: "buildbucket/luci.dart.ci/cbuild"
   }
@@ -3161,9 +3158,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci/linearize-flutter"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.roll/roll-to-dev"
-  }
   builders {
     name: "buildbucket/luci.dart.ci/recipe-deps-roller"
   }
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index e0dc911f9745..569582142112 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -145,20 +145,6 @@ notifiers {
     name: "recipe-deps-roller"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.roll"
-    name: "roll-to-dev"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 6024aa5aba77..523452e111d5 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -345,17 +345,6 @@ job {
     builder: "app-kernel-linux-release-x64-stable"
   }
 }
-job {
-  id: "base"
-  realm: "ci"
-  schedule: "with 15m interval"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "base"
-  }
-}
 job {
   id: "cbuild"
   realm: "ci"
@@ -1669,17 +1658,6 @@ job {
     builder: "recipe-deps-roller"
   }
 }
-job {
-  id: "roll-to-dev"
-  realm: "ci.roll"
-  schedule: "with 4h interval"
-  acl_sets: "ci.roll"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.roll"
-    builder: "roll-to-dev"
-  }
-}
 job {
   id: "vm-canary-linux-debug"
   realm: "ci.sandbox"
@@ -4197,16 +4175,6 @@ acl_sets {
     granted_to: "group:all"
   }
 }
-acl_sets {
-  name: "ci.roll"
-  acls {
-    role: OWNER
-    granted_to: "group:project-dart-admins"
-  }
-  acls {
-    granted_to: "group:all"
-  }
-}
 acl_sets {
   name: "ci.sandbox"
   acls {
diff --git a/generated/realms.cfg b/generated/realms.cfg
index e7954da62b3b..8acd3439f107 100644
--- a/generated/realms.cfg
+++ b/generated/realms.cfg
@@ -76,10 +76,6 @@ realms {
 }
 realms {
   name: "ci.roll"
-  bindings {
-    role: "role/buildbucket.builderServiceAccount"
-    principals: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-  }
   bindings {
     role: "role/buildbucket.triggerer"
     principals: "group:project-dart-roller-owners"
diff --git a/main.star b/main.star
index fa471663181c..e1b002b4a0c2 100755
--- a/main.star
+++ b/main.star
@@ -566,13 +566,6 @@ dart.ci_sandbox_builder(
 )
 
 # infra
-dart.infra_builder(
-    "base",
-    execution_timeout = 15 * time.minute,
-    recipe = "dart/forward_branch",
-    schedule = "with 15m interval",
-    notifies = None,
-)
 dart.infra_builder(
     "cbuild",
     recipe = "dart/cbuild",
@@ -616,15 +609,6 @@ dart.infra_builder(
     ],
     triggering_policy = scheduler.greedy_batching(max_batch_size = 1),
 )
-dart.infra_builder(
-    "roll-to-dev",
-    bucket = "ci.roll",
-    execution_timeout = 15 * time.minute,
-    notifies = "infra",
-    properties = {"from_ref": "refs/heads/lkgr"},
-    recipe = "roller/roll_to_dev",
-    schedule = "with 4h interval",
-)
 
 # Builder that tests the dev Linux image. When the image autoroller detects
 # successful builds of this builder with the dev image, it the current dev image

From 26bcec9a2d7b93a1e8f393a638be3702deb0ab62 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 25 Feb 2022 13:51:04 +0000
Subject: [PATCH 533/826] Add weekly dart2wasm-linux-x64-d8 builder

Change-Id: I3dca2fae7449e8a851e2ab188de93d909aba0d61
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/234291
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 37 ++++++++++++++++++++++++++++++++++++
 generated/luci-scheduler.cfg | 12 ++++++++++++
 main.star                    |  5 +++++
 3 files changed, 54 insertions(+)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 7f5f55255ece..9ec66266fba2 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -3585,6 +3585,43 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "dart2wasm-linux-x64-d8"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "ddc-linux-release-chrome"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 523452e111d5..3e2016c6377e 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -939,6 +939,17 @@ job {
     builder: "dart2js-unit-linux-x64-release-stable"
   }
 }
+job {
+  id: "dart2wasm-linux-x64-d8"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "dart2wasm-linux-x64-d8"
+  }
+}
 job {
   id: "ddc-linux-release-chrome"
   realm: "ci.sandbox"
@@ -4149,6 +4160,7 @@ trigger {
   realm: "ci"
   schedule: "0 0 * * SUN"
   acl_sets: "ci"
+  triggers: "dart2wasm-linux-x64-d8"
   triggers: "frontend-weekly"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
diff --git a/main.star b/main.star
index e1b002b4a0c2..f2c0a5ed4f2a 100755
--- a/main.star
+++ b/main.star
@@ -279,6 +279,11 @@ cron.weekly_builder(
     channels = [],
     execution_timeout = 12 * time.hour,
 )
+cron.weekly_builder(
+    "dart2wasm-linux-x64-d8",
+    channels = [],
+    execution_timeout = 12 * time.hour,
+)
 
 # flutter
 dart.ci_sandbox_builder(

From b569524a09b779afacc1940edbc5b843f28b9750 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 25 Feb 2022 13:51:34 +0000
Subject: [PATCH 534/826] Update module docstring in dart.star

Change-Id: Idadfda3935cac805f4e060d55a1bd26dc138e84a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/234292
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 lib/dart.star | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dart.star b/lib/dart.star
index 65bd7d5b2685..874fec65b6d5 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 """
-Defines rules that can be used to define nightly and weekly builders.
+Defines rules that can be used to define dart builders.
 """
 
 load("//lib/accounts.star", "accounts")

From 90aa068e741989bb00d2ecb35399e04603e640f5 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 28 Feb 2022 14:29:09 +0000
Subject: [PATCH 535/826] [infra] Increase shard timeout for dart2wasm builder

The local shard took ~1.2 hours. If slow_shards is not good enough, we
should increase the number of shards rather than increasing this timeout
further.

Change-Id: Ia234da492312905063c39120a86b55fd6e75f9fb
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/234601
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 3 ++-
 main.star                    | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 9ec66266fba2..461d8c500e41 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -3611,7 +3611,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 70
       execution_timeout_secs: 43200
diff --git a/main.star b/main.star
index f2c0a5ed4f2a..f63d313fb7d6 100755
--- a/main.star
+++ b/main.star
@@ -23,6 +23,7 @@ load(
     "mac",
     "no_android",
     "pinned_xcode",
+    "slow_shards",
     "windows",
 )
 load("//lib/paths.star", "paths")
@@ -283,6 +284,7 @@ cron.weekly_builder(
     "dart2wasm-linux-x64-d8",
     channels = [],
     execution_timeout = 12 * time.hour,
+    properties = slow_shards,
 )
 
 # flutter

From faf2fd2e19bd46f95cc9773f34c35f1f4fd2d43a Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Wed, 2 Mar 2022 12:55:48 +0000
Subject: [PATCH 536/826] [infra] Add iOS Flutter builder to Flutter HHH
 console

Bug: b/216278334
Change-Id: Id6f0458ecf1d02ed3212b5f6126741383bd7243f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/234943
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/luci-milo.cfg | 5 +++++
 main.star               | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index d2a6b02cdc73..af494d0f953c 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -3110,6 +3110,11 @@ consoles {
     category: "flutter"
     short_name: "3H"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci/flutter-engine-ios"
+    category: "flutter"
+    short_name: "ios"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-web_tests"
     category: "flutter"
diff --git a/main.star b/main.star
index f63d313fb7d6..9bb6f16ce4ea 100755
--- a/main.star
+++ b/main.star
@@ -687,6 +687,13 @@ luci.console_view_entry(
     console_view = "flutter-hhh",
 )
 
+luci.console_view_entry(
+    builder = "flutter-engine-ios",
+    short_name = "ios",
+    category = "flutter",
+    console_view = "flutter-hhh",
+)
+
 luci.console_view_entry(
     builder = "flutter-engine-linux-web_tests",
     short_name = "web",

From 867261a0f29e49310c01d31381eab62609fd6f15 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Fri, 4 Mar 2022 14:31:01 +0000
Subject: [PATCH 537/826] [infra] Remove dart-ci-scripts builders

These have been moved to the internal project

Bug: b/207335363
Change-Id: Ic9183edbaf670cfe7de27f2e32a0af7f90c625b8
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/235223
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 150 -----------------------------------
 generated/luci-milo.cfg      |  12 ---
 generated/luci-notify.cfg    |  56 -------------
 generated/luci-scheduler.cfg |  44 ----------
 main.star                    |  21 -----
 5 files changed, 283 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 461d8c500e41..b1e598450d8c 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -121,156 +121,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "dart-ci-scripts-linux"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/package_dart_ci"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-ci-scripts-mac"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/package_dart_ci"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-ci-scripts-mac-arm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/package_dart_ci"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-ci-scripts-win"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/package_dart_ci"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "flutter-engine-ios"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index af494d0f953c..428710c29f85 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -3148,18 +3148,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci/co19-roller"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-ci-scripts-linux"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-ci-scripts-win"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-ci-scripts-mac"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/dart-ci-scripts-mac-arm64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci/linearize-flutter"
   }
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 569582142112..716f80350bd9 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -46,62 +46,6 @@ notifiers {
     name: "co19-roller"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "dart-ci-scripts-linux"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "dart-ci-scripts-mac"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "dart-ci-scripts-mac-arm64"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "dart-ci-scripts-win"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 3e2016c6377e..f96d2121be17 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -411,50 +411,6 @@ job {
     builder: "cross-vm-precomp-linux-release-arm64"
   }
 }
-job {
-  id: "dart-ci-scripts-linux"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "dart-ci-scripts-linux"
-  }
-}
-job {
-  id: "dart-ci-scripts-mac"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "dart-ci-scripts-mac"
-  }
-}
-job {
-  id: "dart-ci-scripts-mac-arm64"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "dart-ci-scripts-mac-arm64"
-  }
-}
-job {
-  id: "dart-ci-scripts-win"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "dart-ci-scripts-win"
-  }
-}
 job {
   id: "dart2js-canary-x64"
   realm: "ci.sandbox"
diff --git a/main.star b/main.star
index 9bb6f16ce4ea..7bad4054fbaa 100755
--- a/main.star
+++ b/main.star
@@ -581,27 +581,6 @@ dart.infra_builder(
 )
 dart.infra_builder("chocolatey", recipe = "dart/chocolatey", dimensions = windows)
 dart.infra_builder("co19-roller", recipe = "dart/package_co19")
-dart.infra_builder(
-    "dart-ci-scripts-linux",
-    recipe = "dart/package_dart_ci",
-)
-dart.infra_builder(
-    "dart-ci-scripts-win",
-    recipe = "dart/package_dart_ci",
-    dimensions = windows,
-)
-dart.infra_builder(
-    "dart-ci-scripts-mac",
-    recipe = "dart/package_dart_ci",
-    dimensions = mac,
-    properties = pinned_xcode,
-)
-dart.infra_builder(
-    "dart-ci-scripts-mac-arm64",
-    recipe = "dart/package_dart_ci",
-    dimensions = [mac, arm64],
-    properties = pinned_xcode,
-)
 dart.infra_builder(
     "linearize-flutter",
     recipe = "dart/linearize",

From 31334adfcb881441a906d9cb4c53a1e079df50f2 Mon Sep 17 00:00:00 2001
From: Daco Harkes <dacoharkes@google.com>
Date: Tue, 15 Mar 2022 12:45:21 +0000
Subject: [PATCH 538/826] [infra] Increase GCC timeout

Change-Id: Ie089859b052a18688ebc7809dff57caa2a2345d9
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/237361
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Daco Harkes <dacoharkes@google.com>
---
 generated/cr-buildbucket.cfg | 104 +----------------------------------
 generated/luci-milo.cfg      |  15 -----
 generated/luci-scheduler.cfg |  36 ------------
 generated/project.cfg        |   2 +-
 vm.star                      |   8 ++-
 5 files changed, 10 insertions(+), 155 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index b1e598450d8c..6bbdae7fbbae 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -7180,108 +7180,7 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-gcc-linux-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-gcc-linux-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-gcc-linux-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
+      execution_timeout_secs: 14400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -15095,6 +14994,7 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      execution_timeout_secs: 14400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 428710c29f85..3c1ae947f525 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -2048,11 +2048,6 @@ consoles {
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-dev"
-    category: "vm|misc"
-    short_name: "g"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-dev"
     category: "vm|ffi"
@@ -2452,11 +2447,6 @@ consoles {
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-beta"
-    category: "vm|misc"
-    short_name: "g"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-beta"
     category: "vm|ffi"
@@ -2856,11 +2846,6 @@ consoles {
     category: "vm|kernel-precomp|android"
     short_name: "a64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux-stable"
-    category: "vm|misc"
-    short_name: "g"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-stable"
     category: "vm|ffi"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index f96d2121be17..096cce4a8cb4 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -2010,39 +2010,6 @@ job {
     builder: "vm-kernel-gcc-linux"
   }
 }
-job {
-  id: "vm-kernel-gcc-linux-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-gcc-linux-beta"
-  }
-}
-job {
-  id: "vm-kernel-gcc-linux-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-gcc-linux-dev"
-  }
-}
-job {
-  id: "vm-kernel-gcc-linux-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-gcc-linux-stable"
-  }
-}
 job {
   id: "vm-kernel-linux-debug-ia32"
   realm: "ci.sandbox"
@@ -4004,9 +3971,6 @@ trigger {
   triggers: "front-end-nnbd-win-release-x64"
   triggers: "vm-kernel-asan-linux-release-x64"
   triggers: "vm-kernel-gcc-linux"
-  triggers: "vm-kernel-gcc-linux-beta"
-  triggers: "vm-kernel-gcc-linux-dev"
-  triggers: "vm-kernel-gcc-linux-stable"
   triggers: "vm-kernel-linux-debug-ia32"
   triggers: "vm-kernel-linux-debug-simriscv64"
   triggers: "vm-kernel-linux-debug-x64c"
diff --git a/generated/project.cfg b/generated/project.cfg
index 270f745c5e29..8f6e37fe8387 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.30.9"
+  version: "1.30.10"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/vm.star b/vm.star
index b2a032490ed4..ffbc93a4d381 100644
--- a/vm.star
+++ b/vm.star
@@ -496,7 +496,13 @@ _nightly_builder(
 _low_priority_builder("vm-fuchsia-release-x64", category = "vm|misc|f")
 
 # Our sysroot does not support gcc, we can't use goma on RBE for this builder
-_nightly_builder("vm-kernel-gcc-linux", category = "vm|misc|g", goma = False)
+_nightly_builder(
+    "vm-kernel-gcc-linux",
+    category = "vm|misc|g",
+    channels = ["try"],
+    execution_timeout = 4 * time.hour,
+    goma = False,
+)
 
 _nightly_builder(
     "vm-kernel-linux-debug-simriscv64",

From 85702be83af22d6615638fc1297a4570f1067b0b Mon Sep 17 00:00:00 2001
From: Daco Harkes <dacoharkes@google.com>
Date: Tue, 15 Mar 2022 12:45:21 +0000
Subject: [PATCH 539/826] [infra] Add MSVC builder

Test matrix change: https://dart-review.googlesource.com/c/sdk/+/237340

Bug: https://github.com/dart-lang/sdk/issues/48544

Change-Id: I793c228ade78ec91003fe6b7f70d5cdd989d7afe
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/237362
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Daco Harkes <dacoharkes@google.com>
---
 generated/commit-queue.cfg   |  4 +++
 generated/cr-buildbucket.cfg | 68 ++++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      | 13 +++++++
 generated/luci-notify.cfg    | 13 +++++++
 generated/luci-scheduler.cfg | 12 +++++++
 vm.star                      |  8 +++++
 6 files changed, 118 insertions(+)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 2d40cb728cdd..f3bd86aa9e47 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -498,6 +498,10 @@ config_groups {
         name: "dart/try/vm-kernel-msan-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-msvc-windows-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-debug-ia32-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 6bbdae7fbbae..d0bde68aeedc 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -8460,6 +8460,40 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-msvc-windows"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-nnbd-linux-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
@@ -15538,6 +15572,40 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-msvc-windows-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-nnbd-linux-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 3c1ae947f525..18ddbd2018aa 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -259,6 +259,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-gcc-linux-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-msvc-windows-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-simriscv64-try"
   }
@@ -865,6 +868,11 @@ consoles {
     category: "vm|misc"
     short_name: "g"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msvc-windows"
+    category: "vm|misc"
+    short_name: "m"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simriscv64"
     category: "vm|misc"
@@ -1754,6 +1762,11 @@ consoles {
     category: "vm|misc"
     short_name: "g"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msvc-windows"
+    category: "vm|misc"
+    short_name: "m"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simriscv64"
     category: "vm|misc"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 716f80350bd9..e98c375a7e13 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -906,6 +906,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-msvc-windows"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 096cce4a8cb4..c8a6a105d9e8 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -2373,6 +2373,17 @@ job {
     builder: "vm-kernel-msan-linux-release-x64"
   }
 }
+job {
+  id: "vm-kernel-msvc-windows"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-kernel-msvc-windows"
+  }
+}
 job {
   id: "vm-kernel-nnbd-linux-debug-ia32"
   realm: "ci.sandbox"
@@ -3978,6 +3989,7 @@ trigger {
   triggers: "vm-kernel-linux-release-ia32"
   triggers: "vm-kernel-mac-product-x64"
   triggers: "vm-kernel-msan-linux-release-x64"
+  triggers: "vm-kernel-msvc-windows"
   triggers: "vm-kernel-nnbd-linux-debug-ia32"
   triggers: "vm-kernel-nnbd-linux-release-ia32"
   triggers: "vm-kernel-nnbd-linux-release-simarm"
diff --git a/vm.star b/vm.star
index ffbc93a4d381..5167a54b1f1e 100644
--- a/vm.star
+++ b/vm.star
@@ -504,6 +504,14 @@ _nightly_builder(
     goma = False,
 )
 
+_nightly_builder(
+    "vm-kernel-msvc-windows",
+    category = "vm|misc|m",
+    channels = ["try"],
+    dimensions = windows,
+    goma = False,
+)
+
 _nightly_builder(
     "vm-kernel-linux-debug-simriscv64",
     category = "vm|misc|rv64",

From 390ccbd18c166401d57fb35eeae0250f2c512a3f Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Thu, 24 Mar 2022 16:13:58 +0000
Subject: [PATCH 540/826] [infra] Remove migrated chocolatey builder.

Bug: b/218295973
Change-Id: Icf2a0510f482511de54fe40035851b3b66946d7e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/238440
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 generated/cr-buildbucket.cfg | 34 ----------------------------------
 generated/luci-milo.cfg      |  3 ---
 generated/luci-notify.cfg    | 14 --------------
 generated/luci-scheduler.cfg | 11 -----------
 generated/project.cfg        |  2 +-
 main.star                    |  1 -
 6 files changed, 1 insertion(+), 64 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index d0bde68aeedc..4350b527547b 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -53,40 +53,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "chocolatey"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/chocolatey"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "co19-roller"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 18ddbd2018aa..0c7f95e86fd9 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -3140,9 +3140,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci/cbuild"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/chocolatey"
-  }
   builders {
     name: "buildbucket/luci.dart.ci/co19-roller"
   }
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index e98c375a7e13..316fb115d320 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -18,20 +18,6 @@ notifiers {
     name: "cbuild"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "chocolatey"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index c8a6a105d9e8..4aa735518574 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -356,17 +356,6 @@ job {
     builder: "cbuild"
   }
 }
-job {
-  id: "chocolatey"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "chocolatey"
-  }
-}
 job {
   id: "ci-test-data"
   realm: "ci.sandbox"
diff --git a/generated/project.cfg b/generated/project.cfg
index 8f6e37fe8387..93daa79bc129 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.30.10"
+  version: "1.30.11"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/main.star b/main.star
index 7bad4054fbaa..0882920e9279 100755
--- a/main.star
+++ b/main.star
@@ -579,7 +579,6 @@ dart.infra_builder(
     schedule = "with 15m interval",
     execution_timeout = 10 * time.minute,
 )
-dart.infra_builder("chocolatey", recipe = "dart/chocolatey", dimensions = windows)
 dart.infra_builder("co19-roller", recipe = "dart/package_co19")
 dart.infra_builder(
     "linearize-flutter",

From 17d14452fa05feb634a1bb26d78a55ed28bfb139 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Mon, 28 Mar 2022 12:19:39 +0000
Subject: [PATCH 541/826] [infra] Remove migrated linearize-flutter builder.

Bug: b/218297426
Change-Id: Ie6e5940831eee2ece37e7ae425b5260f7a590a67
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/238705
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 generated/cr-buildbucket.cfg | 35 -----------------------------------
 generated/luci-milo.cfg      |  3 ---
 generated/luci-notify.cfg    | 14 --------------
 generated/luci-scheduler.cfg | 36 ------------------------------------
 main.star                    | 28 ----------------------------
 5 files changed, 116 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 4350b527547b..671a90ee8d6b 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -122,41 +122,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "linearize-flutter"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/linearize",'
-        '  "repo": "https://dart.googlesource.com/linear_sdk_flutter_engine.git"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "recipe-bundler"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 0c7f95e86fd9..cbaa34bb5876 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -3143,9 +3143,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci/co19-roller"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci/linearize-flutter"
-  }
   builders {
     name: "buildbucket/luci.dart.ci/recipe-deps-roller"
   }
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 316fb115d320..2555505979eb 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -32,20 +32,6 @@ notifiers {
     name: "co19-roller"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "linearize-flutter"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 4aa735518574..8a690f382cdf 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1423,21 +1423,6 @@ job {
     builder: "iso-stress-linux"
   }
 }
-job {
-  id: "linearize-flutter"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  triggering_policy {
-    kind: GREEDY_BATCHING
-    max_batch_size: 1
-  }
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "linearize-flutter"
-  }
-}
 job {
   id: "pkg-linux-debug"
   realm: "ci.sandbox"
@@ -3649,26 +3634,6 @@ trigger {
     path_regexps: "tools/bots/ci_test_data_trigger"
   }
 }
-trigger {
-  id: "dart-flutter-engine-trigger"
-  realm: "ci"
-  acl_sets: "ci"
-  triggers: "linearize-flutter"
-  gitiles {
-    repo: "https://dart.googlesource.com/external/github.com/flutter/engine"
-    refs: "regexp:refs/heads/master"
-  }
-}
-trigger {
-  id: "dart-flutter-flutter-trigger"
-  realm: "ci"
-  acl_sets: "ci"
-  triggers: "linearize-flutter"
-  gitiles {
-    repo: "https://dart.googlesource.com/external/github.com/flutter/flutter"
-    refs: "regexp:refs/heads/master"
-  }
-}
 trigger {
   id: "dart-gitiles-trigger-beta"
   realm: "ci"
@@ -3840,7 +3805,6 @@ trigger {
   id: "dart-gitiles-trigger-main"
   realm: "ci"
   acl_sets: "ci"
-  triggers: "linearize-flutter"
   triggers: "analyzer-analysis-server-linux"
   triggers: "analyzer-linux-release"
   triggers: "analyzer-mac-release"
diff --git a/main.star b/main.star
index 0882920e9279..804d4e0d322f 100755
--- a/main.star
+++ b/main.star
@@ -181,20 +181,6 @@ luci.gitiles_poller(
     refs = ["refs/heads/ci-test-data"],
 )
 
-luci.gitiles_poller(
-    name = "dart-flutter-engine-trigger",
-    bucket = "ci",
-    repo = "https://dart.googlesource.com/external/github.com/flutter/engine",
-    refs = ["refs/heads/master"],
-)
-
-luci.gitiles_poller(
-    name = "dart-flutter-flutter-trigger",
-    bucket = "ci",
-    repo = "https://dart.googlesource.com/external/github.com/flutter/flutter",
-    refs = ["refs/heads/master"],
-)
-
 dart.poller("dart-gitiles-trigger", branches = dart.branches)
 
 luci.notifier(
@@ -580,20 +566,6 @@ dart.infra_builder(
     execution_timeout = 10 * time.minute,
 )
 dart.infra_builder("co19-roller", recipe = "dart/package_co19")
-dart.infra_builder(
-    "linearize-flutter",
-    recipe = "dart/linearize",
-    properties = {
-        "repo": "https://dart.googlesource.com/linear_sdk_flutter_engine.git",
-    },
-    notifies = "infra",
-    triggered_by = [
-        "dart-gitiles-trigger-main",
-        "dart-flutter-engine-trigger",
-        "dart-flutter-flutter-trigger",
-    ],
-    triggering_policy = scheduler.greedy_batching(max_batch_size = 1),
-)
 
 # Builder that tests the dev Linux image. When the image autoroller detects
 # successful builds of this builder with the dev image, it the current dev image

From 68851513d53abb51b130667ba9721396d8318113 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Mon, 28 Mar 2022 13:44:30 +0000
Subject: [PATCH 542/826] [infra] Remove migrated cbuild builder.

Allow the new cbuild builder to trigger the google builder.

Bug: b/218295733
Change-Id: I2b0456535a264fd9ba821349f28412c55fa7f1d5
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/239060
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 generated/cr-buildbucket.cfg | 39 ++++--------------------------------
 generated/luci-milo.cfg      |  3 ---
 generated/luci-notify.cfg    | 14 -------------
 generated/luci-scheduler.cfg | 11 ----------
 generated/realms.cfg         |  1 +
 main.star                    |  6 ------
 project.star                 |  6 +++++-
 7 files changed, 10 insertions(+), 70 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 671a90ee8d6b..6d5b8b04af66 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -18,41 +18,6 @@ buckets {
     group: "project-dart-admins"
   }
   swarming {
-    builders {
-      name: "cbuild"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/cbuild"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 600
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "co19-roller"
       swarming_host: "chromium-swarm.appspot.com"
@@ -231,6 +196,10 @@ buckets {
   acls {
     group: "all"
   }
+  acls {
+    role: SCHEDULER
+    identity: "user:dart-internal-cbuild@dart-ci-internal.iam.gserviceaccount.com"
+  }
   acls {
     role: SCHEDULER
     identity: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index cbaa34bb5876..cbb76e883862 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -3137,9 +3137,6 @@ consoles {
 consoles {
   id: "infra"
   name: "Infra Console"
-  builders {
-    name: "buildbucket/luci.dart.ci/cbuild"
-  }
   builders {
     name: "buildbucket/luci.dart.ci/co19-roller"
   }
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 2555505979eb..d35d9ae41fbe 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -4,20 +4,6 @@
 # For the schema of this file, see ProjectConfig message:
 #   https://luci-config.appspot.com/schemas/projects:luci-notify.cfg
 
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "cbuild"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 8a690f382cdf..aa8a42af3529 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -345,17 +345,6 @@ job {
     builder: "app-kernel-linux-release-x64-stable"
   }
 }
-job {
-  id: "cbuild"
-  realm: "ci"
-  schedule: "with 15m interval"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "cbuild"
-  }
-}
 job {
   id: "ci-test-data"
   realm: "ci.sandbox"
diff --git a/generated/realms.cfg b/generated/realms.cfg
index 8acd3439f107..c28954912221 100644
--- a/generated/realms.cfg
+++ b/generated/realms.cfg
@@ -90,6 +90,7 @@ realms {
   }
   bindings {
     role: "role/buildbucket.triggerer"
+    principals: "user:dart-internal-cbuild@dart-ci-internal.iam.gserviceaccount.com"
     principals: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
   }
diff --git a/main.star b/main.star
index 804d4e0d322f..57e98c32f100 100755
--- a/main.star
+++ b/main.star
@@ -559,12 +559,6 @@ dart.ci_sandbox_builder(
 )
 
 # infra
-dart.infra_builder(
-    "cbuild",
-    recipe = "dart/cbuild",
-    schedule = "with 15m interval",
-    execution_timeout = 10 * time.minute,
-)
 dart.infra_builder("co19-roller", recipe = "dart/package_co19")
 
 # Builder that tests the dev Linux image. When the image autoroller detects
diff --git a/project.star b/project.star
index 277f80bde0e2..08a454e35a1c 100644
--- a/project.star
+++ b/project.star
@@ -19,7 +19,11 @@ ROLL_TRIGGERERS = {
         accounts.ci_builder,
     ],
 }
-CI_SANDBOX_TRIGGERERS = [accounts.ci_builder, accounts.try_builder]
+CI_SANDBOX_TRIGGERERS = [
+    accounts.ci_builder,
+    accounts.try_builder,
+    "dart-internal-cbuild@dart-ci-internal.iam.gserviceaccount.com",
+]
 
 lucicfg.config(
     tracked_files = ["*"],

From ee0157f4e80e2ca96d86e4213206968f3d698e5c Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Mon, 28 Mar 2022 14:12:40 +0000
Subject: [PATCH 543/826] [infra] Remove migrated co19 roller.

Bug: b/218296230
Change-Id: I6914cc98a768fe1fe31ed6f02fda30ea586c15ab
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/239061
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 generated/cr-buildbucket.cfg | 34 ----------------------------------
 generated/luci-milo.cfg      |  3 ---
 generated/luci-notify.cfg    | 14 --------------
 generated/luci-scheduler.cfg | 11 -----------
 main.star                    |  3 ---
 5 files changed, 65 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 6d5b8b04af66..079f4aa1464b 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -18,40 +18,6 @@ buckets {
     group: "project-dart-admins"
   }
   swarming {
-    builders {
-      name: "co19-roller"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/package_co19"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "flutter-engine-ios"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index cbb76e883862..6d8de255a358 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -3137,9 +3137,6 @@ consoles {
 consoles {
   id: "infra"
   name: "Infra Console"
-  builders {
-    name: "buildbucket/luci.dart.ci/co19-roller"
-  }
   builders {
     name: "buildbucket/luci.dart.ci/recipe-deps-roller"
   }
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index d35d9ae41fbe..4272adb9874b 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -4,20 +4,6 @@
 # For the schema of this file, see ProjectConfig message:
 #   https://luci-config.appspot.com/schemas/projects:luci-notify.cfg
 
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "co19-roller"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index aa8a42af3529..c1595aed72fe 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -356,17 +356,6 @@ job {
     builder: "ci-test-data"
   }
 }
-job {
-  id: "co19-roller"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "co19-roller"
-  }
-}
 job {
   id: "cross-vm-linux-release-arm64"
   realm: "ci.sandbox"
diff --git a/main.star b/main.star
index 57e98c32f100..934b38def134 100755
--- a/main.star
+++ b/main.star
@@ -558,9 +558,6 @@ dart.ci_sandbox_builder(
     triggered_by = None,
 )
 
-# infra
-dart.infra_builder("co19-roller", recipe = "dart/package_co19")
-
 # Builder that tests the dev Linux image. When the image autoroller detects
 # successful builds of this builder with the dev image, it the current dev image
 # becomes the new prod image. Newly created bots will than use the updated

From 782f4ffbf816f6de6b4f873e6e72d73da994731c Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Mon, 28 Mar 2022 15:06:23 +0000
Subject: [PATCH 544/826] [infra] Remove migrated recipe-deps-roller and
 recipe-bundler.

Bug: b/224464411
Bug: b/224463955
Change-Id: I6e5a0c1ed6190083180dcfc7708f5e2a5a30e75e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/239080
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 generated/cr-buildbucket.cfg | 84 ------------------------------------
 generated/luci-milo.cfg      | 11 -----
 generated/luci-notify.cfg    | 29 -------------
 generated/luci-scheduler.cfg | 32 --------------
 lib/dart.star                | 10 -----
 main.star                    |  7 ---
 recipes.star                 | 65 ----------------------------
 7 files changed, 238 deletions(-)
 delete mode 100644 recipes.star

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 079f4aa1464b..4cfd9aab1561 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -53,90 +53,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "recipe-bundler"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
-        cipd_version: "git_revision:21e1e6473db300eb5045e4483e8b53d1324cd0d8"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "package_name_internal_prefix": "dart_internal/recipe_bundles",'
-        '  "package_name_prefix": "dart/recipe_bundles",'
-        '  "recipe": "recipe_bundler",'
-        '  "recipe_bundler_vers": "git_revision:bc0c2fb9082bc82a2d972b5cca8fc17afa55d34e",'
-        '  "repo_specs": ['
-        '    "dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/main"'
-        '  ]'
-        '}'
-      priority: 50
-      execution_timeout_secs: 300
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "recipe-deps-roller"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/infra/infra"
-        cipd_version: "git_revision:21e1e6473db300eb5045e4483e8b53d1324cd0d8"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "db_gcs_bucket": "dart-recipe-roller-db",'
-        '  "projects": ['
-        '    ['
-        '      "dart",'
-        '      "https://dart.googlesource.com/recipes"'
-        '    ]'
-        '  ],'
-        '  "recipe": "recipe_autoroller"'
-        '}'
-      priority: 70
-      execution_timeout_secs: 1200
-      expiration_secs: 86400
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
   }
 }
 buckets {
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 6d8de255a358..8f39bd797cb5 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -3134,15 +3134,4 @@ consoles {
   refs: "regexp:refs/heads/main"
   manifest_name: "REVISION"
 }
-consoles {
-  id: "infra"
-  name: "Infra Console"
-  builders {
-    name: "buildbucket/luci.dart.ci/recipe-deps-roller"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/recipe-bundler"
-  }
-  builder_view_only: true
-}
 logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 4272adb9874b..37215a97d424 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -4,35 +4,6 @@
 # For the schema of this file, see ProjectConfig message:
 #   https://luci-config.appspot.com/schemas/projects:luci-notify.cfg
 
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "recipe-bundler"
-    repository: "https://dart.googlesource.com/recipes"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "recipe-deps-roller"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index c1595aed72fe..49d60c6574fb 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1555,28 +1555,6 @@ job {
     builder: "pkg-win-release-stable"
   }
 }
-job {
-  id: "recipe-bundler"
-  realm: "ci"
-  schedule: "*/30 * * * *"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "recipe-bundler"
-  }
-}
-job {
-  id: "recipe-deps-roller"
-  realm: "ci"
-  schedule: "with 4h interval"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "recipe-deps-roller"
-  }
-}
 job {
   id: "vm-canary-linux-debug"
   realm: "ci.sandbox"
@@ -4030,16 +4008,6 @@ trigger {
     refs: "regexp:refs/heads/main"
   }
 }
-trigger {
-  id: "recipes-dart"
-  realm: "ci"
-  acl_sets: "ci"
-  triggers: "recipe-bundler"
-  gitiles {
-    repo: "https://dart.googlesource.com/recipes"
-    refs: "regexp:refs/heads/main"
-  }
-}
 acl_sets {
   name: "ci"
   acls {
diff --git a/lib/dart.star b/lib/dart.star
index 874fec65b6d5..64a90d713688 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -294,19 +294,9 @@ def _ci_sandbox_builder(name, channels = _CHANNELS, **kwargs):
         **kwargs
     )
 
-def _infra_builder(name, notifies = "infra", triggered_by = None, **kwargs):
-    _ci_builder(
-        name,
-        notifies = notifies,
-        triggered_by = triggered_by,
-        **kwargs
-    )
-    luci.list_view_entry(list_view = "infra", builder = name)
-
 dart = struct(
     ci_builder = _ci_builder,
     ci_sandbox_builder = _ci_sandbox_builder,
-    infra_builder = _infra_builder,
     try_builder = _try_builder,
     poller = _poller,
     channels = _CHANNELS,
diff --git a/main.star b/main.star
index 934b38def134..147f92eb99f1 100755
--- a/main.star
+++ b/main.star
@@ -122,11 +122,6 @@ luci.console_view(
     refs = ["refs/heads/main"],
 )
 
-luci.list_view(
-    name = "infra",
-    title = "Infra Console",
-)
-
 # Put the SDK category first on the consoles
 def sdk_builder_category():
     for channel, console in [
@@ -647,5 +642,3 @@ luci.list_view_entry(
     builder = "iso-stress-linux",
     list_view = "iso-stress",
 )
-
-exec("//recipes.star")
diff --git a/recipes.star b/recipes.star
deleted file mode 100644
index c58f8f5448c3..000000000000
--- a/recipes.star
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright (c) 2022 The Dart project authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-"""
-Luci recipe framework infrastructure.
-
-The recipe-deps-roller keeps recipe dependencies up-to-date and the recipe
-bundler uploads recipes as CIPD packages.
-"""
-
-load("//lib/dart.star", "dart")
-load("//lib/priority.star", "priority")
-
-def chromium_infra_recipe(name):
-    return luci.recipe(
-        name = name,
-        cipd_package =
-            "infra/recipe_bundles/chromium.googlesource.com/infra/infra",
-        cipd_version = "git_revision:21e1e6473db300eb5045e4483e8b53d1324cd0d8",
-        use_bbagent = True,
-    )
-
-# Rolls dart recipe dependencies.
-dart.infra_builder(
-    name = "recipe-deps-roller",
-    executable = chromium_infra_recipe("recipe_autoroller"),
-    execution_timeout = 20 * time.minute,
-    expiration_timeout = time.day,
-    priority = priority.low,
-    properties = {
-        "db_gcs_bucket": "dart-recipe-roller-db",
-        "projects": {
-            "dart": "https://dart.googlesource.com/recipes",
-        }.items(),  # recipe_autoroller expects a list of tuples.
-    },
-    schedule = "with 4h interval",
-)
-
-dart.infra_builder(
-    name = "recipe-bundler",
-    executable = chromium_infra_recipe("recipe_bundler"),
-    execution_timeout = 5 * time.minute,
-    properties = {
-        # These control the prefix of the CIPD package names that the tool
-        # will create.
-        "package_name_internal_prefix": "dart_internal/recipe_bundles",
-        "package_name_prefix": "dart/recipe_bundles",
-        # This property controls the version of the recipe_bundler go tool:
-        #   https://chromium.googlesource.com/infra/infra/+/main/go/src/infra/tools/recipe_bundler
-        "recipe_bundler_vers": "git_revision:bc0c2fb9082bc82a2d972b5cca8fc17afa55d34e",
-        # Where to grab the recipes to bundle.
-        "repo_specs": [
-            "dart.googlesource.com/recipes=FETCH_HEAD,refs/heads/main",
-        ],
-    },
-    schedule = "*/30 * * * *",
-    triggered_by = [
-        luci.gitiles_poller(
-            name = "recipes-dart",
-            bucket = "ci",
-            repo = "https://dart.googlesource.com/recipes",
-            refs = ["refs/heads/main"],
-        ),
-    ],
-)

From 1ec2697b73d2db11148e91e38a596295e593772f Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 31 Mar 2022 08:36:00 +0000
Subject: [PATCH 545/826] [infra] Increase shard timeout on iso-stress-linux

Change-Id: I13e8678ede7439b140469279532d17b43c5ef0b6
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/239431
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 3 ++-
 vm.star                      | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 4cfd9aab1561..f04ab194d24e 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5069,7 +5069,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
diff --git a/vm.star b/vm.star
index 5167a54b1f1e..6477289d01f3 100644
--- a/vm.star
+++ b/vm.star
@@ -544,4 +544,5 @@ _extra_builder(
     "iso-stress-linux",
     channels = [],
     notifies = "dart-vm-team",
+    properties = slow_shards,
 )

From d15068157912f7d7649ee755f1486726fbb26652 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 21 Apr 2022 07:58:49 +0000
Subject: [PATCH 546/826] [infra] Increase shard timeout for
 vm-kernel-win-debug-ia32

Change-Id: I42f3063405a5cc8fbd6334febe70fe96608201ba
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/241960
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 6 ++++--
 vm.star                      | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index f04ab194d24e..cf89f46a09b9 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -11788,7 +11788,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 70
       build_numbers: YES
@@ -17249,7 +17250,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
diff --git a/vm.star b/vm.star
index 6477289d01f3..8711131c6420 100644
--- a/vm.star
+++ b/vm.star
@@ -285,6 +285,7 @@ _nightly_builder(
     category = "vm|kernel|wd3",
     channels = ["try"],
     dimensions = windows,
+    properties = [slow_shards],
 )
 _builder(
     "vm-kernel-win-debug-x64",

From 1ac06b0a8752b173e190c549b591100d6ae188f2 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 21 Apr 2022 09:38:23 +0000
Subject: [PATCH 547/826] [infra] Hide builders that don't provide value on the
 main console

The Flutter 3xH builders currently aren't rendered correctly. These can
be re-added later when/if Milo supports blamelist pins for consoles.
They are still surfaced in the console header.

The dart2js Firefox/Windows and Safari/Mac builders have been broken for
a long time and likely need the webdriver support to land before they
can be revived. They still provide value for testing the webdriver
support.

Change-Id: I1bb49f14307e2f1860e8484a044a71682d1918c2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/241964
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/luci-milo.cfg | 38 --------------------------------------
 main.star               |  5 -----
 2 files changed, 43 deletions(-)

diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 8f39bd797cb5..ea617df5491b 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -998,16 +998,6 @@ consoles {
     category: "dart2js|firefox"
     short_name: "l"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
-    category: "dart2js|safari"
-    short_name: "m"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
     category: "analyzer"
@@ -1292,16 +1282,6 @@ consoles {
     category: "dart2js|firefox"
     short_name: "l"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-firefox"
-    category: "dart2js|firefox"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
-    category: "dart2js|safari"
-    short_name: "m"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
     category: "analyzer"
@@ -2166,11 +2146,6 @@ consoles {
     category: "dart2js|firefox"
     short_name: "l"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-dev"
-    category: "dart2js|safari"
-    short_name: "m"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-dev"
     category: "analyzer"
@@ -2565,11 +2540,6 @@ consoles {
     category: "dart2js|firefox"
     short_name: "l"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-beta"
-    category: "dart2js|safari"
-    short_name: "m"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-beta"
     category: "analyzer"
@@ -2964,11 +2934,6 @@ consoles {
     category: "dart2js|firefox"
     short_name: "l"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-stable"
-    category: "dart2js|safari"
-    short_name: "m"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-stable"
     category: "analyzer"
@@ -3105,17 +3070,14 @@ consoles {
   manifest_name: "REVISION"
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
-    category: "flutter"
     short_name: "3H"
   }
   builders {
     name: "buildbucket/luci.dart.ci/flutter-engine-ios"
-    category: "flutter"
     short_name: "ios"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-web_tests"
-    category: "flutter"
     short_name: "web"
   }
 }
diff --git a/main.star b/main.star
index 147f92eb99f1..e13e3986a18e 100755
--- a/main.star
+++ b/main.star
@@ -411,14 +411,12 @@ dart.ci_sandbox_builder(
 )
 dart.ci_sandbox_builder(
     "dart2js-strong-win-x64-firefox",
-    category = "dart2js|firefox|w",
     dimensions = windows,
     enabled = False,
     properties = [firefox, no_android],
 )
 dart.ci_sandbox_builder(
     "dart2js-strong-mac-x64-safari",
-    category = "dart2js|safari|m",
     dimensions = mac,
     properties = [pinned_xcode, no_android],
 )
@@ -619,21 +617,18 @@ luci.console_view_entry(
 luci.console_view_entry(
     builder = "flutter-engine-linux",
     short_name = "3H",
-    category = "flutter",
     console_view = "flutter-hhh",
 )
 
 luci.console_view_entry(
     builder = "flutter-engine-ios",
     short_name = "ios",
-    category = "flutter",
     console_view = "flutter-hhh",
 )
 
 luci.console_view_entry(
     builder = "flutter-engine-linux-web_tests",
     short_name = "web",
-    category = "flutter",
     console_view = "flutter-hhh",
 )
 

From 1f37cd265f97b2a359a4baca15627235bfd31c08 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Tue, 3 May 2022 07:44:26 +0000
Subject: [PATCH 548/826] [infra] Run hooks in presubmit try builder.

The .dart_tool/packages.json file is needed by some presubmits and is
now generated by a gclient hook.

Fixes: b/231115258
Change-Id: I99ab3c9d2e01720301fd2c306908a5f0e9f47e6f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/243280
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 generated/cr-buildbucket.cfg | 3 +++
 main.star                    | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index cf89f46a09b9..9826f72a02f9 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -17552,6 +17552,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/presubmit": {'
+        '    "runhooks": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
diff --git a/main.star b/main.star
index e13e3986a18e..e5b7a400030e 100755
--- a/main.star
+++ b/main.star
@@ -588,6 +588,11 @@ dart.try_builder(
     "presubmit",
     bucket = "try.shared",
     execution_timeout = 10 * time.minute,
+    properties = {
+        "$depot_tools/presubmit": {
+            "runhooks": True,
+        },
+    },
     recipe = "presubmit/presubmit",
 )
 

From 402c9527ab93622f83dfaf82bf4da00f64cdb35f Mon Sep 17 00:00:00 2001
From: Oleh Prypin <oprypin@google.com>
Date: Tue, 3 May 2022 10:52:23 +0000
Subject: [PATCH 549/826] Add an experimental-only builder for dry runs of dev
 rolls

Bug: b/231131625
Change-Id: I0a425c56508c5ff579f88d37290ce96701b5952f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/243326
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: Oleh Prypin <oprypin@google.com>
---
 generated/cr-buildbucket.cfg | 40 ++++++++++++++++++++++++++++++++++++
 generated/luci-scheduler.cfg | 11 ++++++++++
 main.star                    | 10 +++++++++
 3 files changed, 61 insertions(+)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 9826f72a02f9..b438390999e8 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -18,6 +18,46 @@ buckets {
     group: "project-dart-admins"
   }
   swarming {
+    builders {
+      name: "dev-experimental"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.ci"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "from_ref": "refs/heads/lkgr",'
+        '  "recipe": "roller/roll_to_dev"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 900
+      build_numbers: YES
+      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.non_production"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "flutter-engine-ios"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 49d60c6574fb..5e8f456f9a2a 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1060,6 +1060,17 @@ job {
     builder: "ddk-linux-release-firefox-stable"
   }
 }
+job {
+  id: "dev-experimental"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "dev-experimental"
+  }
+}
 job {
   id: "flutter-analyze"
   realm: "ci.sandbox"
diff --git a/main.star b/main.star
index e5b7a400030e..2bc3d4571ab1 100755
--- a/main.star
+++ b/main.star
@@ -642,3 +642,13 @@ luci.list_view_entry(
     builder = "iso-stress-linux",
     list_view = "iso-stress",
 )
+
+dart.ci_builder(
+    "dev-experimental",
+    experiments = {"luci.non_production": 100},
+    recipe = "roller/roll_to_dev",
+    execution_timeout = 15 * time.minute,
+    properties = {"from_ref": "refs/heads/lkgr"},
+    triggered_by = None,
+    notifies = None,
+)

From 99ac22a5766bcedfe776f8cb3f2803d2652598d2 Mon Sep 17 00:00:00 2001
From: Oleh Prypin <oprypin@google.com>
Date: Tue, 3 May 2022 14:01:43 +0000
Subject: [PATCH 550/826] Use "try" bucket for experimental-only builder for
 dev rolls

Bug: b/231131625
Change-Id: Ic47e44b52700c4360e2743b34ef45f974c7d7fd5
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/243460
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: Oleh Prypin <oprypin@google.com>
---
 generated/commit-queue.cfg   |  4 ++
 generated/cr-buildbucket.cfg | 82 ++++++++++++++++++------------------
 generated/luci-milo.cfg      |  3 ++
 generated/luci-scheduler.cfg | 11 -----
 main.star                    |  6 +--
 5 files changed, 51 insertions(+), 55 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index f3bd86aa9e47..e49c45124d20 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -317,6 +317,10 @@ config_groups {
         name: "dart/try/ddk-linux-release-firefox-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/dev-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/flutter-analyze-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index b438390999e8..f7db4963ffdc 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -18,46 +18,6 @@ buckets {
     group: "project-dart-admins"
   }
   swarming {
-    builders {
-      name: "dev-experimental"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "from_ref": "refs/heads/lkgr",'
-        '  "recipe": "roller/roll_to_dev"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 900
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.non_production"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "flutter-engine-ios"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13813,6 +13773,48 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "dev-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "from_ref": "refs/heads/lkgr",'
+        '  "recipe": "roller/roll_to_dev"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 900
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.non_production"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "flutter-analyze-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index ea617df5491b..7f8607e4c486 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -400,6 +400,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try.shared/presubmit-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/dev-try"
+  }
   builder_view_only: true
 }
 consoles {
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 5e8f456f9a2a..49d60c6574fb 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1060,17 +1060,6 @@ job {
     builder: "ddk-linux-release-firefox-stable"
   }
 }
-job {
-  id: "dev-experimental"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "dev-experimental"
-  }
-}
 job {
   id: "flutter-analyze"
   realm: "ci.sandbox"
diff --git a/main.star b/main.star
index 2bc3d4571ab1..99226bf11eed 100755
--- a/main.star
+++ b/main.star
@@ -643,12 +643,10 @@ luci.list_view_entry(
     list_view = "iso-stress",
 )
 
-dart.ci_builder(
-    "dev-experimental",
+dart.try_builder(
+    "dev",
     experiments = {"luci.non_production": 100},
     recipe = "roller/roll_to_dev",
     execution_timeout = 15 * time.minute,
     properties = {"from_ref": "refs/heads/lkgr"},
-    triggered_by = None,
-    notifies = None,
 )

From e9425bb77d618d7098d893d7aa93cb08f1ca09b5 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Thu, 5 May 2022 15:54:25 +0000
Subject: [PATCH 551/826] Add experimental monorepo-roller try builder

Bug: b/231292978
Change-Id: I1601c828512c89d3945c92fb32c0ead14edb4874
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/243780
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 generated/commit-queue.cfg   |  4 ++++
 generated/cr-buildbucket.cfg | 41 ++++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      |  3 +++
 main.star                    |  7 ++++++
 4 files changed, 55 insertions(+)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index e49c45124d20..fdd554b48b48 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -373,6 +373,10 @@ config_groups {
         name: "dart/try/gclient-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/monorepo-roller-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/pkg-linux-debug-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index f7db4963ffdc..100b32f53f06 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -14241,6 +14241,47 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "monorepo-roller-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "roller/monorepo"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 1800
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.non_production"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "pkg-linux-debug-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 7f8607e4c486..b5eb6e9a192a 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -403,6 +403,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/dev-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/monorepo-roller-try"
+  }
   builder_view_only: true
 }
 consoles {
diff --git a/main.star b/main.star
index 99226bf11eed..8744de286c4e 100755
--- a/main.star
+++ b/main.star
@@ -650,3 +650,10 @@ dart.try_builder(
     execution_timeout = 15 * time.minute,
     properties = {"from_ref": "refs/heads/lkgr"},
 )
+
+dart.try_builder(
+    "monorepo-roller",
+    experiments = {"luci.non_production": 100},
+    recipe = "roller/monorepo",
+    execution_timeout = 30 * time.minute,
+)

From 18965eba4c43853b2964eabf31e10bf16f608025 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 6 May 2022 06:23:56 +0000
Subject: [PATCH 552/826] [infra] Re-add safari builder to the consoles

Bug: b/208186791
Change-Id: Ib452b2b325a4a0fb3321996a7a452cbc4232ca30
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/242865
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 generated/luci-milo.cfg | 25 +++++++++++++++++++++++++
 main.star               |  1 +
 2 files changed, 26 insertions(+)

diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index b5eb6e9a192a..7d105304d8b5 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -1004,6 +1004,11 @@ consoles {
     category: "dart2js|firefox"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
+    category: "dart2js|safari"
+    short_name: "m"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
     category: "analyzer"
@@ -1288,6 +1293,11 @@ consoles {
     category: "dart2js|firefox"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
+    category: "dart2js|safari"
+    short_name: "m"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
     category: "analyzer"
@@ -2152,6 +2162,11 @@ consoles {
     category: "dart2js|firefox"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-dev"
+    category: "dart2js|safari"
+    short_name: "m"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-dev"
     category: "analyzer"
@@ -2546,6 +2561,11 @@ consoles {
     category: "dart2js|firefox"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-beta"
+    category: "dart2js|safari"
+    short_name: "m"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-beta"
     category: "analyzer"
@@ -2940,6 +2960,11 @@ consoles {
     category: "dart2js|firefox"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-stable"
+    category: "dart2js|safari"
+    short_name: "m"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-stable"
     category: "analyzer"
diff --git a/main.star b/main.star
index 8744de286c4e..ed5118ba2b29 100755
--- a/main.star
+++ b/main.star
@@ -417,6 +417,7 @@ dart.ci_sandbox_builder(
 )
 dart.ci_sandbox_builder(
     "dart2js-strong-mac-x64-safari",
+    category = "dart2js|safari|m",
     dimensions = mac,
     properties = [pinned_xcode, no_android],
 )

From 80a54b26ef0a02be038fe4568206aea852713fa9 Mon Sep 17 00:00:00 2001
From: Oleh Prypin <oprypin@google.com>
Date: Fri, 6 May 2022 12:13:49 +0000
Subject: [PATCH 553/826] Allow mdb/dart-eng-tool-proxy to trigger builds in
 try/ bucket.

Currently intended for triggering these builds: https://ci.chromium.org/p/dart/builders/try/dev-try

For more background, see https://dart-internal-review.googlesource.com/c/dart-internal/+/3160

Bug: b/231131625
Change-Id: I83c63ae84e5e6eeac8032969ccfe7aeb9b48370d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/243902
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Oleh Prypin <oprypin@google.com>
---
 generated/cr-buildbucket.cfg |  4 ++++
 generated/realms.cfg         |  1 +
 project.star                 | 18 ++++++++++++++++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 100b32f53f06..bbc2c0c3ee36 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -12526,6 +12526,10 @@ buckets {
   acls {
     group: "all"
   }
+  acls {
+    role: SCHEDULER
+    identity: "user:dart-eng-tool-proxy@system.gserviceaccount.com"
+  }
   acls {
     role: SCHEDULER
     group: "project-dart-admins"
diff --git a/generated/realms.cfg b/generated/realms.cfg
index c28954912221..4c79b8f4c2d4 100644
--- a/generated/realms.cfg
+++ b/generated/realms.cfg
@@ -124,6 +124,7 @@ realms {
     role: "role/buildbucket.triggerer"
     principals: "group:project-dart-tryjob-access"
     principals: "group:service-account-cq"
+    principals: "user:dart-eng-tool-proxy@system.gserviceaccount.com"
   }
   bindings {
     role: "role/swarming.taskTriggerer"
diff --git a/project.star b/project.star
index 08a454e35a1c..e9c4a230894f 100644
--- a/project.star
+++ b/project.star
@@ -98,8 +98,22 @@ TRY_ACLS = [
         groups = ["project-dart-tryjob-access", "service-account-cq"],
     ),
 ]
-luci.bucket(name = "try", acls = TRY_ACLS)  # Tryjobs specific to the Dart SDK repo.
-luci.bucket(name = "try.shared", acls = TRY_ACLS)  # Tryjobs for all repos.
+
+# Tryjobs specific to the Dart SDK repo.
+luci.bucket(
+    name = "try",
+    acls = TRY_ACLS + [
+        # For workflows that need to be authorized by Google-internal
+        # approval mechanisms, see b/231131625
+        acl.entry(
+            acl.BUILDBUCKET_TRIGGERER,
+            users = ["dart-eng-tool-proxy@system.gserviceaccount.com"],
+        ),
+    ],
+)
+
+# Tryjobs for all repos.
+luci.bucket(name = "try.shared", acls = TRY_ACLS)
 
 # Swarming permissions in realms.cfg.
 

From b9a09d2d67a84123b033176611c368fdb6b5e2cd Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Mon, 16 May 2022 17:26:48 +0000
Subject: [PATCH 554/826] [config] Remove the flutter-frontend builder from the
 default CQ

The builder is currently broken, and is being added to the CQ
for all CLs that change the front end or frontend server.

Bug: https://github.com/dart-lang/sdk/issues/49026
Change-Id: I495ca1cdaa7f12cbbfa5fc755a6c354192b2bf16
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/244927
Commit-Queue: Jonas Termansen <sortie@google.com>
Auto-Submit: William Hesse <whesse@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 generated/commit-queue.cfg | 2 +-
 main.star                  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index fdd554b48b48..645c1ef56aa9 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -335,7 +335,7 @@ config_groups {
       }
       builders {
         name: "dart/try/flutter-frontend-try"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        includable_only: true
       }
       builders {
         name: "dart/try/front-end-linux-release-x64-try"
diff --git a/main.star b/main.star
index ed5118ba2b29..676bad417d1b 100755
--- a/main.star
+++ b/main.star
@@ -253,7 +253,6 @@ dart.ci_sandbox_builder(
     category = "cfe|fl",
     channels = ["try"],
     notifies = "frontend-team",
-    location_regexp = paths.to_location_regexp(paths.cfe_only),
 )
 cron.weekly_builder(
     "frontend-weekly",

From 6b6d1ceaad28b2f3a1303c228858252752415c9c Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 17 May 2022 10:21:26 +0000
Subject: [PATCH 555/826] Revert "[config] Remove the flutter-frontend builder
 from the default CQ"

This reverts commit b9a09d2d67a84123b033176611c368fdb6b5e2cd.

Reason for revert: Fixed in https://dart-review.googlesource.com/c/sdk/+/245001

Original change's description:
> [config] Remove the flutter-frontend builder from the default CQ
>
> The builder is currently broken, and is being added to the CQ
> for all CLs that change the front end or frontend server.
>
> Bug: https://github.com/dart-lang/sdk/issues/49026
> Change-Id: I495ca1cdaa7f12cbbfa5fc755a6c354192b2bf16
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/244927
> Commit-Queue: Jonas Termansen <sortie@google.com>
> Auto-Submit: William Hesse <whesse@google.com>
> Reviewed-by: Jonas Termansen <sortie@google.com>

TBR=whesse@google.com,sortie@google.com,devoncarew@google.com

Change-Id: I1314f76f7f0a7c325ce907c7472c5d5148616374
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: https://github.com/dart-lang/sdk/issues/49026
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/245021
Reviewed-by: Alexander Thomas <athom@google.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg | 2 +-
 main.star                  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 645c1ef56aa9..fdd554b48b48 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -335,7 +335,7 @@ config_groups {
       }
       builders {
         name: "dart/try/flutter-frontend-try"
-        includable_only: true
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
       }
       builders {
         name: "dart/try/front-end-linux-release-x64-try"
diff --git a/main.star b/main.star
index 676bad417d1b..ed5118ba2b29 100755
--- a/main.star
+++ b/main.star
@@ -253,6 +253,7 @@ dart.ci_sandbox_builder(
     category = "cfe|fl",
     channels = ["try"],
     notifies = "frontend-team",
+    location_regexp = paths.to_location_regexp(paths.cfe_only),
 )
 cron.weekly_builder(
     "frontend-weekly",

From a1dd758925e6d655489a867b27136ac6fa8bb62b Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 18 May 2022 13:24:57 +0000
Subject: [PATCH 556/826] [infra] Enable CQ runs for dart2wasm

Change-Id: I19f583584929d796d224d2603da346efbe934c37
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/245165
Reviewed-by: Aske Simon Christensen <askesc@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   |  4 ++++
 generated/cr-buildbucket.cfg | 38 ++++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      |  3 +++
 main.star                    |  2 +-
 4 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index fdd554b48b48..495296e6ef5a 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -273,6 +273,10 @@ config_groups {
         location_regexp: ".+/[+]/utils/compiler/.+"
         location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
       }
+      builders {
+        name: "dart/try/dart2wasm-linux-x64-d8-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/ddc-linux-release-chrome-try"
         location_regexp: ".+/[+]/DEPS"
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index bbc2c0c3ee36..113794549b37 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -13575,6 +13575,44 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "dart2wasm-linux-x64-d8-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 30
+      execution_timeout_secs: 43200
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "ddc-linux-release-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 7d105304d8b5..9c4a1c71019b 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -28,6 +28,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/flutter-frontend-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/dart2wasm-linux-x64-d8-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/flutter-engine-linux-try"
   }
diff --git a/main.star b/main.star
index ed5118ba2b29..db3a85c8e8b3 100755
--- a/main.star
+++ b/main.star
@@ -263,7 +263,7 @@ cron.weekly_builder(
 )
 cron.weekly_builder(
     "dart2wasm-linux-x64-d8",
-    channels = [],
+    channels = ["try"],
     execution_timeout = 12 * time.hour,
     properties = slow_shards,
 )

From f87cbc29d6268c7793672b698f957188fb2d34e8 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 18 May 2022 15:44:49 +0000
Subject: [PATCH 557/826] [infra] Notify blamelist from flutter-analyze

Change-Id: I5e8045d5043a8ade2033cf776381c3ed17c100de
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/245170
Reviewed-by: Samuel Rawlins <srawlins@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/luci-notify.cfg | 11 +++++++++++
 main.star                 |  1 -
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 37215a97d424..80cbe11b5ade 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -325,6 +325,17 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "flutter-analyze"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/main.star b/main.star
index db3a85c8e8b3..fae3633b490f 100755
--- a/main.star
+++ b/main.star
@@ -428,7 +428,6 @@ dart.ci_sandbox_builder(
     category = "analyzer|fa",
     channels = ["try"],
     execution_timeout = 45 * time.minute,
-    notifies = None,
 )
 dart.ci_sandbox_builder(
     "analyzer-analysis-server-linux",

From 14a210d11bc9e01c9a7679b1f069882ba3c5df85 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 18 May 2022 15:46:59 +0000
Subject: [PATCH 558/826] [infra] Run dart2wasm builder nightly

The builder now finishes in <30 minutes.

Change-Id: I1df3a36e762b7fba5d83878e5e11327ac5c87296
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/245171
Reviewed-by: Aske Simon Christensen <askesc@google.com>
Auto-Submit: Alexander Thomas <athom@google.com>
Commit-Queue: Aske Simon Christensen <askesc@google.com>
---
 generated/cr-buildbucket.cfg |  8 ++------
 generated/luci-notify.cfg    | 10 ++++++++++
 generated/luci-scheduler.cfg |  2 +-
 main.star                    |  5 +----
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 113794549b37..077328eb0925 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -3243,11 +3243,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 70
-      execution_timeout_secs: 43200
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13601,11 +13599,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 43200
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 80cbe11b5ade..e81212e5a7ab 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -270,6 +270,16 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "dart2wasm-linux-x64-d8"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 49d60c6574fb..a9be5a220f7b 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -3887,6 +3887,7 @@ trigger {
   triggers: "analyzer-nnbd-win-release"
   triggers: "app-kernel-linux-product-x64"
   triggers: "cross-vm-precomp-linux-release-arm64"
+  triggers: "dart2wasm-linux-x64-d8"
   triggers: "front-end-nnbd-mac-release-x64"
   triggers: "front-end-nnbd-win-release-x64"
   triggers: "vm-kernel-asan-linux-release-x64"
@@ -4001,7 +4002,6 @@ trigger {
   realm: "ci"
   schedule: "0 0 * * SUN"
   acl_sets: "ci"
-  triggers: "dart2wasm-linux-x64-d8"
   triggers: "frontend-weekly"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
diff --git a/main.star b/main.star
index fae3633b490f..36a12c11207e 100755
--- a/main.star
+++ b/main.star
@@ -23,7 +23,6 @@ load(
     "mac",
     "no_android",
     "pinned_xcode",
-    "slow_shards",
     "windows",
 )
 load("//lib/paths.star", "paths")
@@ -261,11 +260,9 @@ cron.weekly_builder(
     channels = [],
     execution_timeout = 12 * time.hour,
 )
-cron.weekly_builder(
+cron.nightly_builder(
     "dart2wasm-linux-x64-d8",
     channels = ["try"],
-    execution_timeout = 12 * time.hour,
-    properties = slow_shards,
 )
 
 # flutter

From d126adf3c5eb7c8f4952d2544692ecfd03a5c95f Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Fri, 20 May 2022 11:23:11 +0000
Subject: [PATCH 559/826] [infra] Convert product builders from JIT to AOT.

PRODUCT mode is almost exclusively used via Flutter AOT.

Change-Id: Ic121cabda297a3a9870c359d5533cf5ff5c0537c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/244321
Reviewed-by: Siva Annamalai <asiva@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   |  20 +-
 generated/cr-buildbucket.cfg | 434 ++++++++++-------------------------
 generated/luci-milo.cfg      |  46 +---
 generated/luci-notify.cfg    |  69 +++---
 generated/luci-scheduler.cfg |  98 ++------
 vm.star                      |  10 +-
 6 files changed, 201 insertions(+), 476 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 495296e6ef5a..48d363c50e37 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -471,10 +471,6 @@ config_groups {
         name: "dart/try/vm-kernel-linux-debug-x64c-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-linux-product-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-linux-release-ia32-try"
         includable_only: true
@@ -494,10 +490,6 @@ config_groups {
         name: "dart/try/vm-kernel-mac-debug-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-mac-product-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-mac-release-arm64-try"
         includable_only: true
@@ -648,6 +640,10 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-precomp-mac-product-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-precomp-mac-release-simarm64-try"
         includable_only: true
@@ -704,6 +700,10 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-win-debug-x64c-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-precomp-win-product-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-precomp-win-release-x64-try"
         includable_only: true
@@ -744,10 +744,6 @@ config_groups {
         name: "dart/try/vm-kernel-win-debug-x64c-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-win-product-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-win-release-ia32-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 077328eb0925..1a4bbe19a06a 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -7221,42 +7221,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-linux-product-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
@@ -7897,49 +7861,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-mac-product-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-mac-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -9831,7 +9752,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9840,7 +9761,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-product-x64-beta"
+      name: "vm-kernel-precomp-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9876,7 +9797,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-product-x64-dev"
+      name: "vm-kernel-precomp-linux-release-simarm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9912,7 +9833,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-product-x64-stable"
+      name: "vm-kernel-precomp-linux-release-simarm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9948,7 +9869,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm"
+      name: "vm-kernel-precomp-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9984,7 +9905,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-beta"
+      name: "vm-kernel-precomp-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10020,7 +9941,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-dev"
+      name: "vm-kernel-precomp-linux-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10056,7 +9977,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-stable"
+      name: "vm-kernel-precomp-linux-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10092,7 +10013,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm64"
+      name: "vm-kernel-precomp-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10128,7 +10049,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm64-beta"
+      name: "vm-kernel-precomp-linux-release-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10164,7 +10085,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm64-dev"
+      name: "vm-kernel-precomp-linux-release-simarm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10200,7 +10121,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm64-stable"
+      name: "vm-kernel-precomp-linux-release-simarm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10236,7 +10157,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm_x64"
+      name: "vm-kernel-precomp-linux-release-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10272,7 +10193,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm_x64-beta"
+      name: "vm-kernel-precomp-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10308,7 +10229,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm_x64-dev"
+      name: "vm-kernel-precomp-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10344,7 +10265,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm_x64-stable"
+      name: "vm-kernel-precomp-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10380,7 +10301,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64"
+      name: "vm-kernel-precomp-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10416,11 +10337,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64-beta"
+      name: "vm-kernel-precomp-mac-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10430,45 +10351,12 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -10479,43 +10367,11 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11401,7 +11257,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-release-x64"
+      name: "vm-kernel-precomp-win-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11428,7 +11284,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11437,7 +11293,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-release-x64-beta"
+      name: "vm-kernel-precomp-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11473,7 +11329,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-release-x64-dev"
+      name: "vm-kernel-precomp-win-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11509,7 +11365,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-release-x64-stable"
+      name: "vm-kernel-precomp-win-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11545,11 +11401,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-reload-linux-debug-x64"
+      name: "vm-kernel-precomp-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11559,7 +11415,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11572,7 +11428,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11581,7 +11437,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-reload-linux-release-x64"
+      name: "vm-kernel-reload-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11617,7 +11473,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-reload-rollback-linux-debug-x64"
+      name: "vm-kernel-reload-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11653,7 +11509,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-reload-rollback-linux-release-x64"
+      name: "vm-kernel-reload-rollback-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11689,7 +11545,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-tsan-linux-release-x64"
+      name: "vm-kernel-reload-rollback-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11713,7 +11569,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -11726,7 +11581,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-ubsan-linux-release-x64"
+      name: "vm-kernel-tsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11739,8 +11594,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -11761,11 +11618,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-ia32"
+      name: "vm-kernel-ubsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11774,10 +11631,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -11785,9 +11640,9 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 70
       build_numbers: YES
@@ -11798,7 +11653,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-x64"
+      name: "vm-kernel-win-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11823,9 +11678,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11834,7 +11690,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-x64-beta"
+      name: "vm-kernel-win-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11870,7 +11726,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-x64-dev"
+      name: "vm-kernel-win-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11906,7 +11762,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-x64-stable"
+      name: "vm-kernel-win-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11942,7 +11798,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-x64c"
+      name: "vm-kernel-win-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11969,7 +11825,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11978,7 +11834,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-product-x64"
+      name: "vm-kernel-win-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15085,42 +14941,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-linux-product-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -15308,49 +15128,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-mac-product-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-mac-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -16561,6 +16338,49 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-precomp-mac-product-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-precomp-mac-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -17094,7 +16914,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-release-x64-try"
+      name: "vm-kernel-precomp-win-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17130,11 +16950,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-reload-linux-debug-x64-try"
+      name: "vm-kernel-precomp-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -17144,7 +16964,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -17166,7 +16986,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-reload-linux-release-x64-try"
+      name: "vm-kernel-reload-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17202,7 +17022,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-reload-rollback-linux-debug-x64-try"
+      name: "vm-kernel-reload-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17238,7 +17058,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-reload-rollback-linux-release-x64-try"
+      name: "vm-kernel-reload-rollback-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17274,7 +17094,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-tsan-linux-release-x64-try"
+      name: "vm-kernel-reload-rollback-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17298,7 +17118,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -17311,7 +17130,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-ubsan-linux-release-x64-try"
+      name: "vm-kernel-tsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17324,8 +17143,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -17346,11 +17167,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-ia32-try"
+      name: "vm-kernel-ubsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -17359,10 +17180,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -17370,9 +17189,9 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -17383,7 +17202,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-x64-try"
+      name: "vm-kernel-win-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17408,7 +17227,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -17419,7 +17239,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-x64c-try"
+      name: "vm-kernel-win-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17455,7 +17275,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-product-x64-try"
+      name: "vm-kernel-win-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 9c4a1c71019b..e155a783b6ad 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -157,9 +157,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-product-x64-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm-try"
   }
@@ -194,13 +191,13 @@ consoles {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-product-x64-try"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-mac-product-x64-try"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-mac-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-product-x64-try"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-product-x64-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
@@ -697,11 +694,6 @@ consoles {
     category: "vm|kernel-precomp"
     short_name: "d"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
-    category: "vm|kernel-precomp"
-    short_name: "p"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
     category: "vm|kernel-precomp"
@@ -763,17 +755,17 @@ consoles {
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
     category: "vm|product"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-product-x64"
     category: "vm|product"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-product-x64"
     category: "vm|product"
     short_name: "w"
   }
@@ -1581,11 +1573,6 @@ consoles {
     category: "vm|kernel-precomp"
     short_name: "d"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
-    category: "vm|kernel-precomp"
-    short_name: "p"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
     category: "vm|kernel-precomp"
@@ -1647,17 +1634,17 @@ consoles {
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
     category: "vm|product"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-product-x64"
     category: "vm|product"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-product-x64"
     category: "vm|product"
     short_name: "w"
   }
@@ -2005,11 +1992,6 @@ consoles {
     category: "vm|kernel-precomp"
     short_name: "d"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "p"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-dev"
     category: "vm|kernel-precomp"
@@ -2404,11 +2386,6 @@ consoles {
     category: "vm|kernel-precomp"
     short_name: "d"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-beta"
-    category: "vm|kernel-precomp"
-    short_name: "p"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-beta"
     category: "vm|kernel-precomp"
@@ -2803,11 +2780,6 @@ consoles {
     category: "vm|kernel-precomp"
     short_name: "d"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "p"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-stable"
     category: "vm|kernel-precomp"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index e81212e5a7ab..41c40734129b 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -724,19 +724,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-product-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -794,19 +781,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-mac-product-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1141,7 +1115,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
@@ -1193,6 +1169,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-mac-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1367,6 +1356,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-win-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1493,19 +1495,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-win-product-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index a9be5a220f7b..90495615cd45 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -2017,17 +2017,6 @@ job {
     builder: "vm-kernel-linux-debug-x64c"
   }
 }
-job {
-  id: "vm-kernel-linux-product-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-product-x64"
-  }
-}
 job {
   id: "vm-kernel-linux-release-ia32"
   realm: "ci.sandbox"
@@ -2215,17 +2204,6 @@ job {
     builder: "vm-kernel-mac-debug-x64-stable"
   }
 }
-job {
-  id: "vm-kernel-mac-product-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-mac-product-x64"
-  }
-}
 job {
   id: "vm-kernel-mac-release-arm64"
   realm: "ci.sandbox"
@@ -2776,39 +2754,6 @@ job {
     builder: "vm-kernel-precomp-linux-product-x64"
   }
 }
-job {
-  id: "vm-kernel-precomp-linux-product-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-product-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-product-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-product-x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-product-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-product-x64-stable"
-  }
-}
 job {
   id: "vm-kernel-precomp-linux-release-simarm"
   realm: "ci.sandbox"
@@ -2985,6 +2930,17 @@ job {
     builder: "vm-kernel-precomp-linux-release-x64-stable"
   }
 }
+job {
+  id: "vm-kernel-precomp-mac-product-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-kernel-precomp-mac-product-x64"
+  }
+}
 job {
   id: "vm-kernel-precomp-mac-release-simarm64"
   realm: "ci.sandbox"
@@ -3238,6 +3194,17 @@ job {
     builder: "vm-kernel-precomp-win-debug-x64c"
   }
 }
+job {
+  id: "vm-kernel-precomp-win-product-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-kernel-precomp-win-product-x64"
+  }
+}
 job {
   id: "vm-kernel-precomp-win-release-x64"
   realm: "ci.sandbox"
@@ -3414,17 +3381,6 @@ job {
     builder: "vm-kernel-win-debug-x64c"
   }
 }
-job {
-  id: "vm-kernel-win-product-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-win-product-x64"
-  }
-}
 job {
   id: "vm-kernel-win-release-ia32"
   realm: "ci.sandbox"
@@ -3644,7 +3600,6 @@ trigger {
   triggers: "vm-kernel-precomp-android-release-arm_x64-beta"
   triggers: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
   triggers: "vm-kernel-precomp-linux-debug-x64-beta"
-  triggers: "vm-kernel-precomp-linux-product-x64-beta"
   triggers: "vm-kernel-precomp-linux-release-simarm-beta"
   triggers: "vm-kernel-precomp-linux-release-simarm64-beta"
   triggers: "vm-kernel-precomp-linux-release-simarm_x64-beta"
@@ -3717,7 +3672,6 @@ trigger {
   triggers: "vm-kernel-precomp-android-release-arm_x64-dev"
   triggers: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
   triggers: "vm-kernel-precomp-linux-debug-x64-dev"
-  triggers: "vm-kernel-precomp-linux-product-x64-dev"
   triggers: "vm-kernel-precomp-linux-release-simarm-dev"
   triggers: "vm-kernel-precomp-linux-release-simarm64-dev"
   triggers: "vm-kernel-precomp-linux-release-simarm_x64-dev"
@@ -3860,7 +3814,6 @@ trigger {
   triggers: "vm-kernel-precomp-android-release-arm_x64-stable"
   triggers: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
   triggers: "vm-kernel-precomp-linux-debug-x64-stable"
-  triggers: "vm-kernel-precomp-linux-product-x64-stable"
   triggers: "vm-kernel-precomp-linux-release-simarm-stable"
   triggers: "vm-kernel-precomp-linux-release-simarm64-stable"
   triggers: "vm-kernel-precomp-linux-release-simarm_x64-stable"
@@ -3895,9 +3848,7 @@ trigger {
   triggers: "vm-kernel-linux-debug-ia32"
   triggers: "vm-kernel-linux-debug-simriscv64"
   triggers: "vm-kernel-linux-debug-x64c"
-  triggers: "vm-kernel-linux-product-x64"
   triggers: "vm-kernel-linux-release-ia32"
-  triggers: "vm-kernel-mac-product-x64"
   triggers: "vm-kernel-msan-linux-release-x64"
   triggers: "vm-kernel-msvc-windows"
   triggers: "vm-kernel-nnbd-linux-debug-ia32"
@@ -3915,6 +3866,8 @@ trigger {
   triggers: "vm-kernel-precomp-dwarf-linux-product-x64"
   triggers: "vm-kernel-precomp-linux-debug-simriscv64"
   triggers: "vm-kernel-precomp-linux-debug-x64c"
+  triggers: "vm-kernel-precomp-linux-product-x64"
+  triggers: "vm-kernel-precomp-mac-product-x64"
   triggers: "vm-kernel-precomp-msan-linux-release-x64"
   triggers: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
   triggers: "vm-kernel-precomp-nnbd-linux-debug-x64"
@@ -3925,6 +3878,7 @@ trigger {
   triggers: "vm-kernel-precomp-tsan-linux-release-x64"
   triggers: "vm-kernel-precomp-ubsan-linux-release-x64"
   triggers: "vm-kernel-precomp-win-debug-x64c"
+  triggers: "vm-kernel-precomp-win-product-x64"
   triggers: "vm-kernel-reload-linux-debug-x64"
   triggers: "vm-kernel-reload-linux-release-x64"
   triggers: "vm-kernel-reload-rollback-linux-debug-x64"
@@ -3933,7 +3887,6 @@ trigger {
   triggers: "vm-kernel-ubsan-linux-release-x64"
   triggers: "vm-kernel-win-debug-ia32"
   triggers: "vm-kernel-win-debug-x64c"
-  triggers: "vm-kernel-win-product-x64"
   triggers: "vm-kernel-win-release-ia32"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
   gitiles {
@@ -3968,7 +3921,6 @@ trigger {
   triggers: "vm-kernel-precomp-android-release-arm_x64"
   triggers: "vm-kernel-precomp-linux-debug-simarm_x64"
   triggers: "vm-kernel-precomp-linux-debug-x64"
-  triggers: "vm-kernel-precomp-linux-product-x64"
   triggers: "vm-kernel-precomp-linux-release-simarm"
   triggers: "vm-kernel-precomp-linux-release-simarm64"
   triggers: "vm-kernel-precomp-linux-release-simarm_x64"
diff --git a/vm.star b/vm.star
index 8711131c6420..8fb187bc855d 100644
--- a/vm.star
+++ b/vm.star
@@ -315,10 +315,6 @@ _extra_builder(
     "vm-kernel-precomp-linux-debug-x64",
     category = "vm|kernel-precomp|d",
 )
-_extra_builder(
-    "vm-kernel-precomp-linux-product-x64",
-    category = "vm|kernel-precomp|p",
-)
 _extra_builder(
     "vm-kernel-precomp-linux-release-simarm",
     category = "vm|kernel-precomp|a32",
@@ -381,19 +377,19 @@ _extra_builder(
 
 # vm|product
 _nightly_builder(
-    "vm-kernel-linux-product-x64",
+    "vm-kernel-precomp-linux-product-x64",
     category = "vm|product|l",
     channels = ["try"],
 )
 _nightly_builder(
-    "vm-kernel-mac-product-x64",
+    "vm-kernel-precomp-mac-product-x64",
     category = "vm|product|m",
     channels = ["try"],
     dimensions = mac,
     properties = pinned_xcode,
 )
 _nightly_builder(
-    "vm-kernel-win-product-x64",
+    "vm-kernel-precomp-win-product-x64",
     category = "vm|product|w",
     channels = ["try"],
     dimensions = windows,

From d750bb53f0339d20f53f706e6fe86613e37c4d40 Mon Sep 17 00:00:00 2001
From: Martin Kustermann <kustermann@google.com>
Date: Sat, 18 Jun 2022 12:22:05 +0000
Subject: [PATCH 560/826] Separate flutter-hhh-web builder out into its own
 list view

The Flutter HHH Web builder is maintained by Web team. This CL splits it
out into it's own group, to make it not show up with rest of flutter-hhh
builders which are maintained by VM team.

Change-Id: I145bf8b3771af300ebc1ce3d586b5e1141046e48
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/248982
Reviewed-by: William Hesse <whesse@google.com>
---
 console-header.textpb   |  1 +
 generated/luci-milo.cfg | 12 ++++++++++++
 main.star               |  9 ++++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/console-header.textpb b/console-header.textpb
index c932efbf9bfd..b7492ee42ba7 100644
--- a/console-header.textpb
+++ b/console-header.textpb
@@ -45,6 +45,7 @@ console_groups: {
     console_ids: "dart/dart-fuzz"
     console_ids: "dart/flutter"
     console_ids: "dart/flutter-hhh"
+    console_ids: "dart/flutter-hhh-web"
     console_ids: "dart/iso-stress"
 }
 tree_status_host: "dart-status.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index e155a783b6ad..c00aaca9d601 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -1127,6 +1127,7 @@ consoles {
       console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
+      console_ids: "dart/flutter-hhh-web"
       console_ids: "dart/iso-stress"
     }
     tree_status_host: "dart-status.appspot.com"
@@ -1851,6 +1852,7 @@ consoles {
       console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
+      console_ids: "dart/flutter-hhh-web"
       console_ids: "dart/iso-stress"
     }
     tree_status_host: "dart-status.appspot.com"
@@ -2250,6 +2252,7 @@ consoles {
       console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
+      console_ids: "dart/flutter-hhh-web"
       console_ids: "dart/iso-stress"
     }
     tree_status_host: "dart-status.appspot.com"
@@ -2644,6 +2647,7 @@ consoles {
       console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
+      console_ids: "dart/flutter-hhh-web"
       console_ids: "dart/iso-stress"
     }
     tree_status_host: "dart-status.appspot.com"
@@ -3038,6 +3042,7 @@ consoles {
       console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
+      console_ids: "dart/flutter-hhh-web"
       console_ids: "dart/iso-stress"
     }
     tree_status_host: "dart-status.appspot.com"
@@ -3082,6 +3087,13 @@ consoles {
     name: "buildbucket/luci.dart.ci/flutter-engine-ios"
     short_name: "ios"
   }
+}
+consoles {
+  id: "flutter-hhh-web"
+  name: "Dart/Flutter Web Linear History Console"
+  repo_url: "https://dart.googlesource.com/linear_sdk_flutter_engine"
+  refs: "regexp:refs/heads/master"
+  manifest_name: "REVISION"
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-web_tests"
     short_name: "web"
diff --git a/main.star b/main.star
index 36a12c11207e..073a4ac299dc 100755
--- a/main.star
+++ b/main.star
@@ -109,6 +109,13 @@ luci.console_view(
     refs = ["refs/heads/master"],
 )
 
+luci.console_view(
+    name = "flutter-hhh-web",
+    repo = "https://dart.googlesource.com/linear_sdk_flutter_engine",
+    title = "Dart/Flutter Web Linear History Console",
+    refs = ["refs/heads/master"],
+)
+
 luci.list_view(
     name = "iso-stress",
     title = "VM Isolate Stress Test Console",
@@ -631,7 +638,7 @@ luci.console_view_entry(
 luci.console_view_entry(
     builder = "flutter-engine-linux-web_tests",
     short_name = "web",
-    console_view = "flutter-hhh",
+    console_view = "flutter-hhh-web",
 )
 
 # VM isolate stress test console

From 9452e62511d034d88b3e00ebaf00424643a67780 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 1 Jul 2022 12:57:41 +0000
Subject: [PATCH 561/826] [infra] Remove obsolete analyzer builders

Bug: b/237755665
Change-Id: Id20ede9e72a2262cf58810ec37a09c1a7aa5043c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/250382
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   |  21 ---
 generated/cr-buildbucket.cfg | 338 -----------------------------------
 generated/luci-milo.cfg      |  54 ------
 generated/luci-notify.cfg    |  31 ----
 generated/luci-scheduler.cfg |  72 --------
 main.star                    |  21 ---
 6 files changed, 537 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 48d363c50e37..60bb1696f187 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -114,27 +114,6 @@ config_groups {
         name: "dart/try/analyzer-mac-release-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/analyzer-nnbd-linux-release-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(analyzer|analyzer_cli|_fe_analyzer_shared)/.+"
-      }
-      builders {
-        name: "dart/try/analyzer-nnbd-mac-release-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/analyzer-nnbd-win-release-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/analyzer-win-release-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 1a4bbe19a06a..6c674d47e77b 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -555,229 +555,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "analyzer-nnbd-linux-release"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-nnbd-linux-release-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-nnbd-linux-release-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-nnbd-linux-release-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-nnbd-mac-release"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-nnbd-win-release"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "analyzer-win-release"
       swarming_host: "chromium-swarm.appspot.com"
@@ -12512,121 +12289,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "analyzer-nnbd-linux-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-nnbd-mac-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-nnbd-win-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "analyzer-win-release-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index c00aaca9d601..e9e6cdd133f4 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -355,15 +355,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/analyzer-win-release-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/analyzer-nnbd-linux-release-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/analyzer-nnbd-mac-release-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/analyzer-nnbd-win-release-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/dart-sdk-linux-try"
   }
@@ -1029,21 +1020,6 @@ consoles {
     category: "analyzer"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release"
-    category: "analyzer|nnbd"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-mac-release"
-    category: "analyzer|nnbd"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-win-release"
-    category: "analyzer|nnbd"
-    short_name: "w"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
     category: "ddc"
@@ -1319,21 +1295,6 @@ consoles {
     category: "analyzer"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release"
-    category: "analyzer|nnbd"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-mac-release"
-    category: "analyzer|nnbd"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-win-release"
-    category: "analyzer|nnbd"
-    short_name: "w"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
     category: "ddc"
@@ -2174,11 +2135,6 @@ consoles {
     category: "analyzer"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-dev"
-    category: "analyzer|nnbd"
-    short_name: "l"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-dev"
     category: "ddc"
@@ -2569,11 +2525,6 @@ consoles {
     category: "analyzer"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-beta"
-    category: "analyzer|nnbd"
-    short_name: "l"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-beta"
     category: "ddc"
@@ -2964,11 +2915,6 @@ consoles {
     category: "analyzer"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-nnbd-linux-release-stable"
-    category: "analyzer|nnbd"
-    short_name: "l"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-stable"
     category: "ddc"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 41c40734129b..e4c2ce76661f 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -37,37 +37,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "analyzer-nnbd-linux-release"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "analyzer-nnbd-mac-release"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "analyzer-nnbd-win-release"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 90495615cd45..180556e60a9f 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -136,72 +136,6 @@ job {
     builder: "analyzer-mac-release-stable"
   }
 }
-job {
-  id: "analyzer-nnbd-linux-release"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "analyzer-nnbd-linux-release"
-  }
-}
-job {
-  id: "analyzer-nnbd-linux-release-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "analyzer-nnbd-linux-release-beta"
-  }
-}
-job {
-  id: "analyzer-nnbd-linux-release-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "analyzer-nnbd-linux-release-dev"
-  }
-}
-job {
-  id: "analyzer-nnbd-linux-release-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "analyzer-nnbd-linux-release-stable"
-  }
-}
-job {
-  id: "analyzer-nnbd-mac-release"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "analyzer-nnbd-mac-release"
-  }
-}
-job {
-  id: "analyzer-nnbd-win-release"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "analyzer-nnbd-win-release"
-  }
-}
 job {
   id: "analyzer-win-release"
   realm: "ci.sandbox"
@@ -3553,7 +3487,6 @@ trigger {
   triggers: "analyzer-analysis-server-linux-beta"
   triggers: "analyzer-linux-release-beta"
   triggers: "analyzer-mac-release-beta"
-  triggers: "analyzer-nnbd-linux-release-beta"
   triggers: "analyzer-win-release-beta"
   triggers: "app-kernel-linux-debug-x64-beta"
   triggers: "app-kernel-linux-release-x64-beta"
@@ -3624,7 +3557,6 @@ trigger {
   triggers: "analyzer-analysis-server-linux-dev"
   triggers: "analyzer-linux-release-dev"
   triggers: "analyzer-mac-release-dev"
-  triggers: "analyzer-nnbd-linux-release-dev"
   triggers: "analyzer-win-release-dev"
   triggers: "app-kernel-linux-debug-x64-dev"
   triggers: "app-kernel-linux-release-x64-dev"
@@ -3718,7 +3650,6 @@ trigger {
   triggers: "analyzer-analysis-server-linux"
   triggers: "analyzer-linux-release"
   triggers: "analyzer-mac-release"
-  triggers: "analyzer-nnbd-linux-release"
   triggers: "analyzer-win-release"
   triggers: "dart2js-canary-x64"
   triggers: "dart2js-csp-minified-linux-x64-chrome"
@@ -3767,7 +3698,6 @@ trigger {
   triggers: "analyzer-analysis-server-linux-stable"
   triggers: "analyzer-linux-release-stable"
   triggers: "analyzer-mac-release-stable"
-  triggers: "analyzer-nnbd-linux-release-stable"
   triggers: "analyzer-win-release-stable"
   triggers: "app-kernel-linux-debug-x64-stable"
   triggers: "app-kernel-linux-release-x64-stable"
@@ -3836,8 +3766,6 @@ trigger {
   realm: "ci"
   schedule: "0 5 * * *"
   acl_sets: "ci"
-  triggers: "analyzer-nnbd-mac-release"
-  triggers: "analyzer-nnbd-win-release"
   triggers: "app-kernel-linux-product-x64"
   triggers: "cross-vm-precomp-linux-release-arm64"
   triggers: "dart2wasm-linux-x64-d8"
diff --git a/main.star b/main.star
index 073a4ac299dc..4d4f90d7bae2 100755
--- a/main.star
+++ b/main.star
@@ -460,27 +460,6 @@ dart.ci_sandbox_builder(
     experiments = {"dart.use_update_script": 100},
 )
 
-# analyzer|nnbd
-dart.ci_sandbox_builder(
-    "analyzer-nnbd-linux-release",
-    category = "analyzer|nnbd|l",
-    location_regexp = paths.to_location_regexp(paths.analyzer_nnbd),
-    channels = dart.channels,
-)
-cron.nightly_builder(
-    "analyzer-nnbd-mac-release",
-    category = "analyzer|nnbd|m",
-    channels = ["try"],
-    dimensions = mac,
-    properties = pinned_xcode,
-)
-cron.nightly_builder(
-    "analyzer-nnbd-win-release",
-    category = "analyzer|nnbd|w",
-    channels = ["try"],
-    dimensions = windows,
-)
-
 # sdk
 dart.try_builder(
     "dart-sdk-linux",

From cd70f73ed54dba7b54ae0aa0f530f1634b2d7e45 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 9 Aug 2022 15:01:30 +0000
Subject: [PATCH 562/826] [infra] Switch builders to use Ubuntu-18 as the Linux
 OS dimension

We will soon have Ubuntu-20 bots as well so we want builders to select
specific bots instead of just any Linux.

Bug: b/241910018
Change-Id: I6061bd7fb48e787e8a2ce22f99d8c4da45d977aa
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/254204
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 628 +++++++++++++++++------------------
 generated/project.cfg        |   2 +-
 lib/dart.star                |  18 +-
 lib/defaults.star            |   4 +-
 4 files changed, 327 insertions(+), 325 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 6c674d47e77b..0f6b3552839f 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -23,7 +23,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -100,7 +100,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -136,7 +136,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -172,7 +172,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -208,7 +208,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -244,7 +244,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -280,7 +280,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -316,7 +316,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -352,7 +352,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -720,7 +720,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -757,7 +757,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -794,7 +794,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -831,7 +831,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -868,7 +868,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -904,7 +904,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -940,7 +940,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -976,7 +976,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1012,7 +1012,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1048,7 +1048,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1085,7 +1085,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1122,7 +1122,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1159,7 +1159,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1199,7 +1199,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1239,7 +1239,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1279,7 +1279,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1319,7 +1319,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1359,7 +1359,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1399,7 +1399,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1439,7 +1439,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1479,7 +1479,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1518,7 +1518,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1557,7 +1557,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1596,7 +1596,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1635,7 +1635,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1675,7 +1675,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1715,7 +1715,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1755,7 +1755,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1795,7 +1795,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1834,7 +1834,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1873,7 +1873,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1912,7 +1912,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1951,7 +1951,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1991,7 +1991,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2031,7 +2031,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2071,7 +2071,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2111,7 +2111,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2151,7 +2151,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2191,7 +2191,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2231,7 +2231,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2843,7 +2843,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2882,7 +2882,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2921,7 +2921,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2960,7 +2960,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2999,7 +2999,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3035,7 +3035,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3074,7 +3074,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3113,7 +3113,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3152,7 +3152,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3375,7 +3375,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3570,7 +3570,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3609,7 +3609,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3648,7 +3648,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3687,7 +3687,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3726,7 +3726,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3763,7 +3763,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3808,7 +3808,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3850,7 +3850,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3886,7 +3886,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3922,7 +3922,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3958,7 +3958,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3994,7 +3994,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4202,7 +4202,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4238,7 +4238,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4274,7 +4274,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4310,7 +4310,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4569,7 +4569,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4606,7 +4606,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4642,7 +4642,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4678,7 +4678,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4714,7 +4714,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4750,7 +4750,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4786,7 +4786,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4823,7 +4823,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4860,7 +4860,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4899,7 +4899,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4941,7 +4941,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4983,7 +4983,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5025,7 +5025,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5474,7 +5474,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5510,7 +5510,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5546,7 +5546,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5582,7 +5582,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5618,7 +5618,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5654,7 +5654,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5690,7 +5690,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5726,7 +5726,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5762,7 +5762,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5798,7 +5798,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5834,7 +5834,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5870,7 +5870,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5906,7 +5906,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5942,7 +5942,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5978,7 +5978,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6014,7 +6014,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6050,7 +6050,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6086,7 +6086,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6122,7 +6122,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6158,7 +6158,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6194,7 +6194,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6230,7 +6230,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6266,7 +6266,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6302,7 +6302,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6338,7 +6338,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6374,7 +6374,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6410,7 +6410,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6446,7 +6446,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6482,7 +6482,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6519,7 +6519,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6556,7 +6556,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6596,7 +6596,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6636,7 +6636,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6676,7 +6676,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6716,7 +6716,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6751,7 +6751,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6787,7 +6787,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6823,7 +6823,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6859,7 +6859,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6895,7 +6895,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6931,7 +6931,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6967,7 +6967,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7003,7 +7003,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7039,7 +7039,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7075,7 +7075,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7111,7 +7111,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7147,7 +7147,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7183,7 +7183,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7219,7 +7219,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7255,7 +7255,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7291,7 +7291,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7327,7 +7327,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7363,7 +7363,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7399,7 +7399,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7435,7 +7435,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7907,7 +7907,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7978,7 +7978,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8015,7 +8015,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8051,7 +8051,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8087,7 +8087,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8123,7 +8123,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8159,7 +8159,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8195,7 +8195,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8231,7 +8231,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8267,7 +8267,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8303,7 +8303,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8339,7 +8339,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8375,7 +8375,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8700,7 +8700,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8736,7 +8736,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8773,7 +8773,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8810,7 +8810,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8847,7 +8847,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8884,7 +8884,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8921,7 +8921,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8958,7 +8958,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8995,7 +8995,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9032,7 +9032,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9069,7 +9069,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9106,7 +9106,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9142,7 +9142,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9179,7 +9179,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9216,7 +9216,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9253,7 +9253,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9290,7 +9290,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9326,7 +9326,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9362,7 +9362,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9398,7 +9398,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9434,7 +9434,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9470,7 +9470,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9506,7 +9506,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9542,7 +9542,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9578,7 +9578,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9614,7 +9614,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9650,7 +9650,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9686,7 +9686,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9722,7 +9722,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9758,7 +9758,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9794,7 +9794,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9830,7 +9830,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9866,7 +9866,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9902,7 +9902,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9938,7 +9938,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9974,7 +9974,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10010,7 +10010,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10046,7 +10046,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10082,7 +10082,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10333,7 +10333,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10370,7 +10370,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10406,7 +10406,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10443,7 +10443,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10479,7 +10479,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10515,7 +10515,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10551,7 +10551,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10587,7 +10587,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10623,7 +10623,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10786,7 +10786,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10822,7 +10822,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10858,7 +10858,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10894,7 +10894,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10930,7 +10930,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10967,7 +10967,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11218,7 +11218,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11254,7 +11254,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11290,7 +11290,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11326,7 +11326,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11362,7 +11362,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11399,7 +11399,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11831,7 +11831,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11867,7 +11867,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11903,7 +11903,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11939,7 +11939,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:experimental"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11975,7 +11975,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12011,7 +12011,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12047,7 +12047,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12083,7 +12083,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12119,7 +12119,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12179,7 +12179,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12215,7 +12215,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12334,7 +12334,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12371,7 +12371,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12407,7 +12407,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12443,7 +12443,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12482,7 +12482,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12646,7 +12646,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12686,7 +12686,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12726,7 +12726,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12765,7 +12765,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12805,7 +12805,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12844,7 +12844,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12884,7 +12884,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13057,7 +13057,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13096,7 +13096,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13132,7 +13132,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13217,7 +13217,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13295,7 +13295,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13334,7 +13334,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13376,7 +13376,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13413,7 +13413,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13458,7 +13458,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13500,7 +13500,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13536,7 +13536,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13615,7 +13615,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13766,7 +13766,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13802,7 +13802,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13843,7 +13843,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13882,7 +13882,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14064,7 +14064,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14100,7 +14100,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14136,7 +14136,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14172,7 +14172,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14208,7 +14208,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14244,7 +14244,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14280,7 +14280,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14316,7 +14316,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14352,7 +14352,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14389,7 +14389,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14429,7 +14429,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14464,7 +14464,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14500,7 +14500,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14536,7 +14536,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14572,7 +14572,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14608,7 +14608,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14644,7 +14644,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14680,7 +14680,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14716,7 +14716,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14884,7 +14884,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14955,7 +14955,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14992,7 +14992,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15028,7 +15028,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15064,7 +15064,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15100,7 +15100,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15136,7 +15136,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15461,7 +15461,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15497,7 +15497,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15533,7 +15533,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15570,7 +15570,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15607,7 +15607,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15644,7 +15644,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15680,7 +15680,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15717,7 +15717,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15753,7 +15753,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15789,7 +15789,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15825,7 +15825,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15861,7 +15861,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15897,7 +15897,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15933,7 +15933,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15969,7 +15969,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16091,7 +16091,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16128,7 +16128,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16164,7 +16164,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16201,7 +16201,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16237,7 +16237,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16273,7 +16273,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16436,7 +16436,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16472,7 +16472,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16509,7 +16509,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16652,7 +16652,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16688,7 +16688,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16724,7 +16724,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16760,7 +16760,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16796,7 +16796,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16833,7 +16833,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -17049,7 +17049,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -17085,7 +17085,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -17141,7 +17141,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
diff --git a/generated/project.cfg b/generated/project.cfg
index 93daa79bc129..44de5371cc96 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.30.11"
+  version: "1.32.1"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/lib/dart.star b/lib/dart.star
index 64a90d713688..f6cc9cd1af98 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -6,7 +6,7 @@ Defines rules that can be used to define dart builders.
 """
 
 load("//lib/accounts.star", "accounts")
-load("//lib/defaults.star", "defaults")
+load("//lib/defaults.star", "defaults", "linux", "mac", "windows")
 load("//lib/paths.star", "paths")
 load("//lib/priority.star", "priority")
 
@@ -58,7 +58,7 @@ def _with_goma(goma, dimensions, properties):
         goma_properties = {}
         goma_properties.update(_GOMA_RBE)
 
-        enable_ats = dimensions["os"] == "Linux"
+        enable_ats = dimensions["os"] == linux["os"]
 
         goma_properties["enable_ats"] = enable_ats
         updated_properties.setdefault("$build/goma", goma_properties)
@@ -186,12 +186,14 @@ def _builder(
     properties = defaults.properties(properties)
 
     os = dimensions["os"]
-    if "win" in name and os != "Windows":
-        fail("builder %s should be a Windows builder" % name)
-    if "mac" in name and os != "Mac":
-        fail("builder %s should be a macOS builder" % name)
-    if "linux" in name and os != "Linux":
-        fail("builder %s should be a Linux builder" % name)
+
+    def expect_os(os_pattern, expected_os):
+        if os_pattern in name and os != expected_os:
+            fail("builder %s should be a %s builder but was %s" % (name, expected_os, os))
+
+    expect_os("-win", windows["os"])
+    expect_os("-linux", linux["os"])
+    expect_os("-mac", mac["os"])
 
     def builder(channel, notifies, triggered_by):
         if channel == "try":
diff --git a/lib/defaults.star b/lib/defaults.star
index dc8fadc7da85..2945edd95583 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -9,7 +9,7 @@ _PROPERTIES = {"clobber": True}
 _DIMENSIONS = {
     "cpu": "x86-64",
     "host_class": "default",
-    "os": "Linux",
+    "os": "Ubuntu-18",
     "pool": "luci.dart.try",
 }
 _CACHES = {
@@ -24,7 +24,7 @@ _PINNED_XCODE = {"$depot_tools/osx_sdk": {"sdk_version": "12d4e"}}
 
 _ARM64 = {"cpu": "arm64"}
 _MAC = {"os": "Mac"}
-_LINUX = {"os": "Linux"}
+_LINUX = {"os": "Ubuntu-18"}
 _WINDOWS = {"os": "Windows"}
 
 def _union(x, overrides):

From 6ec093a903e5a7eb7cff008af5823e663c3c8780 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 9 Aug 2022 16:26:33 +0000
Subject: [PATCH 563/826] [infra] Add experimental vm-canary builder

Add a new vm-canary builder on bionic and move the qemu experimental
builder to Focal because qemu is flaky on Bionic.

Bug: b/241910018
Change-Id: Iad8a9ada968468aed28ab957625ddcb5bc691973
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/254220
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 38 +++++++++++++++++++++++++++++++++++-
 generated/luci-notify.cfg    | 15 ++++++++++++++
 generated/luci-scheduler.cfg | 12 ++++++++++++
 lib/dart.star                |  8 ++++----
 lib/defaults.star            |  9 +++++++--
 main.star                    | 22 ++++++++++++++-------
 6 files changed, 90 insertions(+), 14 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 0f6b3552839f..9fa98dfe4f9c 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5577,6 +5577,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-canary-linux-debug-experimental"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:experimental"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-canary-linux-debug-stable"
       swarming_host: "chromium-swarm.appspot.com"
@@ -11939,7 +11975,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:experimental"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index e4c2ce76661f..25fad88d0595 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -529,6 +529,21 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-canary-linux-debug-experimental"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 180556e60a9f..c57cb096a64a 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1522,6 +1522,17 @@ job {
     builder: "vm-canary-linux-debug-dev"
   }
 }
+job {
+  id: "vm-canary-linux-debug-experimental"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-canary-linux-debug-experimental"
+  }
+}
 job {
   id: "vm-canary-linux-debug-stable"
   realm: "ci.sandbox"
@@ -3771,6 +3782,7 @@ trigger {
   triggers: "dart2wasm-linux-x64-d8"
   triggers: "front-end-nnbd-mac-release-x64"
   triggers: "front-end-nnbd-win-release-x64"
+  triggers: "vm-canary-linux-debug-experimental"
   triggers: "vm-kernel-asan-linux-release-x64"
   triggers: "vm-kernel-gcc-linux"
   triggers: "vm-kernel-linux-debug-ia32"
diff --git a/lib/dart.star b/lib/dart.star
index f6cc9cd1af98..d9c2fa651799 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -6,7 +6,7 @@ Defines rules that can be used to define dart builders.
 """
 
 load("//lib/accounts.star", "accounts")
-load("//lib/defaults.star", "defaults", "linux", "mac", "windows")
+load("//lib/defaults.star", "defaults", "focal", "linux", "mac", "windows")
 load("//lib/paths.star", "paths")
 load("//lib/priority.star", "priority")
 
@@ -58,7 +58,7 @@ def _with_goma(goma, dimensions, properties):
         goma_properties = {}
         goma_properties.update(_GOMA_RBE)
 
-        enable_ats = dimensions["os"] == linux["os"]
+        enable_ats = dimensions["os"] in (linux["os"], focal["os"])
 
         goma_properties["enable_ats"] = enable_ats
         updated_properties.setdefault("$build/goma", goma_properties)
@@ -188,11 +188,11 @@ def _builder(
     os = dimensions["os"]
 
     def expect_os(os_pattern, expected_os):
-        if os_pattern in name and os != expected_os:
+        if os_pattern in name and os not in expected_os:
             fail("builder %s should be a %s builder but was %s" % (name, expected_os, os))
 
     expect_os("-win", windows["os"])
-    expect_os("-linux", linux["os"])
+    expect_os("-linux", [linux["os"], focal["os"]])
     expect_os("-mac", mac["os"])
 
     def builder(channel, notifies, triggered_by):
diff --git a/lib/defaults.star b/lib/defaults.star
index 2945edd95583..289ea22f6ba2 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -24,9 +24,12 @@ _PINNED_XCODE = {"$depot_tools/osx_sdk": {"sdk_version": "12d4e"}}
 
 _ARM64 = {"cpu": "arm64"}
 _MAC = {"os": "Mac"}
-_LINUX = {"os": "Ubuntu-18"}
+_BIONIC = {"os": "Ubuntu-18"}
+_FOCAL = {"os": "Ubuntu-20"}
 _WINDOWS = {"os": "Windows"}
 
+_EXPERIMENTAL = {"host_class": "experimental"}
+
 def _union(x, overrides):
     """ Creates a new dict with the values from all passed dictionaries
 
@@ -64,7 +67,9 @@ defaults = struct(
 # Dimensions
 
 arm64 = _ARM64
-linux = _LINUX
+experimental = _EXPERIMENTAL
+focal = _FOCAL
+linux = _BIONIC
 mac = _MAC
 windows = _WINDOWS
 
diff --git a/main.star b/main.star
index 4d4f90d7bae2..21297f4be48d 100755
--- a/main.star
+++ b/main.star
@@ -18,7 +18,9 @@ load(
     "//lib/defaults.star",
     "arm64",
     "chrome",
+    "experimental",
     "firefox",
+    "focal",
     "js_engines",
     "mac",
     "no_android",
@@ -534,16 +536,22 @@ dart.ci_sandbox_builder(
     triggered_by = None,
 )
 
-# Builder that tests the dev Linux image. When the image autoroller detects
-# successful builds of this builder with the dev image, it the current dev image
-# becomes the new prod image. Newly created bots will than use the updated
-# image. The `vm-precomp-ffi-qemu-linux-release-arm` is  used because qemu is
-# the primary difference, it passes all tests, triggers no shards and runs a few
-# different builds. See also https://crbug.com/1207358.
+# Builders that test the dev Linux images. When the image autoroller detects
+# successful builds of these builders with a dev images, that dev image becomes
+# the new prod image. Newly created bots will than use the updated image. The
+# `vm-precomp-ffi-qemu-linux-release-arm` and the `vm-canary-linux-debug`
+# are used because qemu is the main difference on focal, they don't trigger
+# shards and run a few different builds. See also https://crbug.com/1207358.
 cron.nightly_builder(
     "vm-precomp-ffi-qemu-linux-release-arm-experimental",
     channels = [],
-    dimensions = {"host_class": "experimental"},
+    dimensions = [experimental, focal],
+    notifies = "infra",
+)
+cron.nightly_builder(
+    "vm-canary-linux-debug-experimental",
+    channels = [],
+    dimensions = experimental,
     notifies = "infra",
 )
 

From e4e6c8fbf5ccef744586947111752de6d436fbc2 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 9 Aug 2022 16:40:55 +0000
Subject: [PATCH 564/826] [infra] Switch infra/config presubmit to python3

Change-Id: I47523f61ff4b4c78645176a45515ed592931064d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/254222
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 PRESUBMIT.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 9861fb0d818d..5054240f249d 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -2,6 +2,7 @@
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
+USE_PYTHON3 = True
 
 def CheckChangeOnUpload(input_api, output_api):
     return _CommonChecks(input_api, output_api)

From 2398121bbd0de613579873e4ed52f520196d96ad Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 11 Aug 2022 14:12:33 +0000
Subject: [PATCH 565/826] [infra] Add ddc-canary builder to the Luci
 configuration

Change-Id: Ib359bef58a0c3f2b910312b9e76864fb60b0120b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/254400
Reviewed-by: Nicholas Shahan <nshahan@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 generated/commit-queue.cfg   |  4 ++
 generated/cr-buildbucket.cfg | 78 ++++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      | 13 ++++++
 generated/luci-notify.cfg    | 10 +++++
 generated/luci-scheduler.cfg | 12 ++++++
 main.star                    |  6 +++
 6 files changed, 123 insertions(+)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 60bb1696f187..901ab13a48fd 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -256,6 +256,10 @@ config_groups {
         name: "dart/try/dart2wasm-linux-x64-d8-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/ddc-canary-linux-release-chrome-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/ddc-linux-release-chrome-try"
         location_regexp: ".+/[+]/DEPS"
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 9fa98dfe4f9c..5bfb4247c077 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -3030,6 +3030,45 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "ddc-canary-linux-release-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "ddc-linux-release-chrome"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13163,6 +13202,45 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "ddc-canary-linux-release-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "ddc-linux-release-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index e9e6cdd133f4..3578706c6c57 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -367,6 +367,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/dart-sdk-win-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/ddc-canary-linux-release-chrome-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/ddc-linux-release-chrome-try"
   }
@@ -1020,6 +1023,11 @@ consoles {
     category: "analyzer"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-canary-linux-release-chrome"
+    category: "ddc"
+    short_name: "c"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
     category: "ddc"
@@ -1295,6 +1303,11 @@ consoles {
     category: "analyzer"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-canary-linux-release-chrome"
+    category: "ddc"
+    short_name: "c"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
     category: "ddc"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 25fad88d0595..d48710f22d93 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -249,6 +249,16 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "ddc-canary-linux-release-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index c57cb096a64a..99570cf2c3a2 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -807,6 +807,17 @@ job {
     builder: "dart2wasm-linux-x64-d8"
   }
 }
+job {
+  id: "ddc-canary-linux-release-chrome"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "ddc-canary-linux-release-chrome"
+  }
+}
 job {
   id: "ddc-linux-release-chrome"
   realm: "ci.sandbox"
@@ -3780,6 +3791,7 @@ trigger {
   triggers: "app-kernel-linux-product-x64"
   triggers: "cross-vm-precomp-linux-release-arm64"
   triggers: "dart2wasm-linux-x64-d8"
+  triggers: "ddc-canary-linux-release-chrome"
   triggers: "front-end-nnbd-mac-release-x64"
   triggers: "front-end-nnbd-win-release-x64"
   triggers: "vm-canary-linux-debug-experimental"
diff --git a/main.star b/main.star
index 21297f4be48d..a88092b2fe49 100755
--- a/main.star
+++ b/main.star
@@ -490,6 +490,12 @@ dart.try_builder(
 )
 
 # ddc
+cron.nightly_builder(
+    "ddc-canary-linux-release-chrome",
+    category = "ddc|c",
+    channels = ["try"],
+    properties = chrome,
+)
 dart.ci_sandbox_builder(
     "ddc-linux-release-chrome",
     category = "ddc|l",

From b53f9fb2d2ff2e3dc52f08a62e3d6fbe6662be17 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 22 Aug 2022 16:05:47 +0000
Subject: [PATCH 566/826] [infra] Switch QEMU builders to Ubuntu focal

Bug: b/241910018
Fixes: https://github.com/dart-lang/sdk/issues/46775
Change-Id: I19305f424291690879b16bd1135aa6c4287fa627
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/255998
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 20 ++++++++++----------
 vm.star                      |  3 +++
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 5bfb4247c077..25c156717f73 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -11906,7 +11906,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11942,7 +11942,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11978,7 +11978,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12050,7 +12050,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12086,7 +12086,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12122,7 +12122,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12158,7 +12158,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12194,7 +12194,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -17163,7 +17163,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -17199,7 +17199,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
diff --git a/vm.star b/vm.star
index 8fb187bc855d..65cc6d35bdf7 100644
--- a/vm.star
+++ b/vm.star
@@ -10,6 +10,7 @@ load("//lib/dart.star", "dart")
 load(
     "//lib/defaults.star",
     "arm64",
+    "focal",
     "mac",
     "no_android",
     "pinned_xcode",
@@ -530,10 +531,12 @@ _extra_builder("vm-ffi-android-product-arm64c", category = "vm|ffi|p64")
 _extra_builder(
     "vm-precomp-ffi-qemu-linux-release-arm",
     category = "vm|ffi|qa",
+    dimensions = focal,
 )
 _extra_builder(
     "vm-precomp-ffi-qemu-linux-release-riscv64",
     category = "vm|ffi|qr",
+    dimensions = focal,
 )
 
 # Isolate stress test builder

From d2dae326226faddb860e79f09f2f137ffcd636df Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Wed, 24 Aug 2022 08:10:30 +0000
Subject: [PATCH 567/826] Add experimental monorepo builders

Add experimental builders that will build monorepo using the
flutter/engine_v2 recipes from the flutter recipe bundle.
These will be triggered manually for testing during development
of the monorepo CI builders.

Bug: b/241223733
Change-Id: I6c89d830c46e9bb9e033841b28cd55dba3c0cde6
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/256140
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 68 ++++++++++++++++++++++++++++++++++++
 lib/dart.star                |  9 +++++
 main.star                    |  2 ++
 monorepo.star                | 33 +++++++++++++++++
 4 files changed, 112 insertions(+)
 create mode 100644 monorepo.star

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 25c156717f73..ff02dc3bc6df 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -13911,6 +13911,74 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "monorepo-builder-v2"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "recipe": "engine_v2/builder_v2"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 3600
+      build_numbers: NO
+      experiments {
+        key: "luci.non_production"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "monorepo-engine-v2"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "recipe": "engine_v2/engine_v2"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 3600
+      build_numbers: NO
+      experiments {
+        key: "luci.non_production"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "monorepo-roller-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/lib/dart.star b/lib/dart.star
index d9c2fa651799..bfe6bbe9be13 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -39,6 +39,14 @@ def _recipe(name):
         use_bbagent = True,
     )
 
+def _flutter_recipe(name):
+    return luci.recipe(
+        name = name,
+        cipd_package = "flutter/recipe_bundles/flutter.googlesource.com/recipes",
+        cipd_version = "refs/heads/main",
+        use_bbagent = True,
+    )
+
 def _with_goma(goma, dimensions, properties):
     """Decorates the properties to setup goma.
 
@@ -300,6 +308,7 @@ dart = struct(
     ci_builder = _ci_builder,
     ci_sandbox_builder = _ci_sandbox_builder,
     try_builder = _try_builder,
+    flutter_recipe = _flutter_recipe,
     poller = _poller,
     channels = _CHANNELS,
     release_channels = _RELEASE_CHANNELS,
diff --git a/main.star b/main.star
index a88092b2fe49..1532221f202e 100755
--- a/main.star
+++ b/main.star
@@ -654,3 +654,5 @@ dart.try_builder(
     recipe = "roller/monorepo",
     execution_timeout = 30 * time.minute,
 )
+
+exec("//monorepo.star")
diff --git a/monorepo.star b/monorepo.star
new file mode 100644
index 000000000000..52f8e49303e6
--- /dev/null
+++ b/monorepo.star
@@ -0,0 +1,33 @@
+# Copyright (c) 2022 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Defines the monorepo builders.
+Currently only triggered manually, while prototyping.
+"""
+
+load("//lib/dart.star", "dart")
+load("//lib/defaults.star", "defaults", "linux")
+load("//lib/priority.star", "priority")
+
+luci.builder(
+    name = "monorepo-engine-v2",
+    build_numbers = False,
+    bucket = "try",
+    dimensions = defaults.dimensions(linux),
+    executable = dart.flutter_recipe("engine_v2/engine_v2"),
+    execution_timeout = 60 * time.minute,
+    experiments = {"luci.non_production": 100},
+    priority = priority.high,
+)
+
+luci.builder(
+    name = "monorepo-builder-v2",
+    build_numbers = False,
+    bucket = "try",
+    dimensions = defaults.dimensions([linux, {"pool": "dart.tests"}]),
+    executable = dart.flutter_recipe("engine_v2/builder_v2"),
+    execution_timeout = 60 * time.minute,
+    experiments = {"luci.non_production": 100},
+    priority = priority.high,
+)

From 3bb4300ea147fe748906cddd0ae5e71626675926 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Wed, 24 Aug 2022 10:30:18 +0000
Subject: [PATCH 568/826] Move monorepo builders to the ci.sandbox bucket.

Bug: b/241223733
Change-Id: I02da91fcdf4fb3801319906d13233c310b434660
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/256207
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 150 +++++++++++++++++++----------------
 generated/luci-scheduler.cfg |  24 ++++++
 monorepo.star                |  18 ++---
 3 files changed, 115 insertions(+), 77 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index ff02dc3bc6df..ee8c6c5293d9 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -4894,6 +4894,88 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "monorepo-builder-v2"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder_v2"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.non_production"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "monorepo-engine-v2"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/engine_v2"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.non_production"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "pkg-linux-debug"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13911,74 +13993,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "monorepo-builder-v2"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "recipe": "engine_v2/builder_v2"'
-        '}'
-      priority: 30
-      execution_timeout_secs: 3600
-      build_numbers: NO
-      experiments {
-        key: "luci.non_production"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "monorepo-engine-v2"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "recipe": "engine_v2/engine_v2"'
-        '}'
-      priority: 30
-      execution_timeout_secs: 3600
-      build_numbers: NO
-      experiments {
-        key: "luci.non_production"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "monorepo-roller-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 99570cf2c3a2..ad9bd7fb05d3 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1346,6 +1346,28 @@ job {
     builder: "iso-stress-linux"
   }
 }
+job {
+  id: "monorepo-builder-v2"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "monorepo-builder-v2"
+  }
+}
+job {
+  id: "monorepo-engine-v2"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "monorepo-engine-v2"
+  }
+}
 job {
   id: "pkg-linux-debug"
   realm: "ci.sandbox"
@@ -3696,6 +3718,8 @@ trigger {
   triggers: "front-end-nnbd-linux-release-x64"
   triggers: "front-end-win-release-x64"
   triggers: "gclient"
+  triggers: "monorepo-builder-v2"
+  triggers: "monorepo-engine-v2"
   triggers: "pkg-linux-debug"
   triggers: "pkg-linux-release"
   triggers: "pkg-mac-release"
diff --git a/monorepo.star b/monorepo.star
index 52f8e49303e6..90ce05831c87 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -7,27 +7,27 @@ Currently only triggered manually, while prototyping.
 """
 
 load("//lib/dart.star", "dart")
-load("//lib/defaults.star", "defaults", "linux")
 load("//lib/priority.star", "priority")
 
-luci.builder(
+dart.ci_sandbox_builder(
     name = "monorepo-engine-v2",
-    build_numbers = False,
-    bucket = "try",
-    dimensions = defaults.dimensions(linux),
+    channels = [],
     executable = dart.flutter_recipe("engine_v2/engine_v2"),
     execution_timeout = 60 * time.minute,
     experiments = {"luci.non_production": 100},
+    notifies = None,
     priority = priority.high,
+    schedule = "triggered",
 )
 
-luci.builder(
+dart.ci_sandbox_builder(
     name = "monorepo-builder-v2",
-    build_numbers = False,
-    bucket = "try",
-    dimensions = defaults.dimensions([linux, {"pool": "dart.tests"}]),
+    channels = [],
+    dimensions = {"pool": "dart.tests"},
     executable = dart.flutter_recipe("engine_v2/builder_v2"),
     execution_timeout = 60 * time.minute,
     experiments = {"luci.non_production": 100},
+    notifies = None,
     priority = priority.high,
+    schedule = "triggered",
 )

From 330866957c1b02da202e336540476d047f316a21 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Wed, 24 Aug 2022 12:26:38 +0000
Subject: [PATCH 569/826] Remove non-production experiment from monorepo
 builders

Bug: b/241223733
Change-Id: Iba0f9e48aa5062c72f2dac2e015ec655e9526be0
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/256209
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 8 --------
 monorepo.star                | 2 --
 2 files changed, 10 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index ee8c6c5293d9..631042742260 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -4926,10 +4926,6 @@ buckets {
       execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.non_production"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
@@ -4967,10 +4963,6 @@ buckets {
       execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.non_production"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
diff --git a/monorepo.star b/monorepo.star
index 90ce05831c87..57ee046f55af 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -14,7 +14,6 @@ dart.ci_sandbox_builder(
     channels = [],
     executable = dart.flutter_recipe("engine_v2/engine_v2"),
     execution_timeout = 60 * time.minute,
-    experiments = {"luci.non_production": 100},
     notifies = None,
     priority = priority.high,
     schedule = "triggered",
@@ -26,7 +25,6 @@ dart.ci_sandbox_builder(
     dimensions = {"pool": "dart.tests"},
     executable = dart.flutter_recipe("engine_v2/builder_v2"),
     execution_timeout = 60 * time.minute,
-    experiments = {"luci.non_production": 100},
     notifies = None,
     priority = priority.high,
     schedule = "triggered",

From c6c41eeaa3a6196e94d318d89636224e2b8bca4a Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Mon, 29 Aug 2022 09:10:03 +0000
Subject: [PATCH 570/826] Trigger monorepo builders from commits to the
 monorepo repository

Bug: b/241223733
Change-Id: If4a10a035a740a12a16b1f664ec9f2e7eb067b3d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/256661
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg |  2 +-
 generated/luci-scheduler.cfg | 23 ++++++++++-------------
 main.star                    |  7 +++++++
 monorepo.star                |  7 ++++---
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 631042742260..2c363ea2946f 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -4920,7 +4920,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder_v2"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
       execution_timeout_secs: 3600
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index ad9bd7fb05d3..cee44c586f73 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1346,17 +1346,6 @@ job {
     builder: "iso-stress-linux"
   }
 }
-job {
-  id: "monorepo-builder-v2"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "monorepo-builder-v2"
-  }
-}
 job {
   id: "monorepo-engine-v2"
   realm: "ci.sandbox"
@@ -3718,8 +3707,6 @@ trigger {
   triggers: "front-end-nnbd-linux-release-x64"
   triggers: "front-end-win-release-x64"
   triggers: "gclient"
-  triggers: "monorepo-builder-v2"
-  triggers: "monorepo-engine-v2"
   triggers: "pkg-linux-debug"
   triggers: "pkg-linux-release"
   triggers: "pkg-mac-release"
@@ -3737,6 +3724,16 @@ trigger {
     refs: "regexp:refs/heads/main"
   }
 }
+trigger {
+  id: "dart-gitiles-trigger-monorepo"
+  realm: "ci"
+  acl_sets: "ci"
+  triggers: "monorepo-engine-v2"
+  gitiles {
+    repo: "https://dart.googlesource.com/monorepo/"
+    refs: "regexp:refs/heads/main"
+  }
+}
 trigger {
   id: "dart-gitiles-trigger-stable"
   realm: "ci"
diff --git a/main.star b/main.star
index 1532221f202e..c2b26e9d729e 100755
--- a/main.star
+++ b/main.star
@@ -176,6 +176,13 @@ luci.gitiles_poller(
     schedule = "0 8 * * *",  # daily, at 08:00 UTC
 )
 
+luci.gitiles_poller(
+    name = "dart-gitiles-trigger-monorepo",
+    bucket = "ci",
+    repo = "https://dart.googlesource.com/monorepo/",
+    refs = ["refs/heads/main"],
+)
+
 luci.gitiles_poller(
     name = "dart-ci-test-data-trigger",
     bucket = "ci",
diff --git a/monorepo.star b/monorepo.star
index 57ee046f55af..4a0304d735c1 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 """
 Defines the monorepo builders.
-Currently only triggered manually, while prototyping.
 """
 
 load("//lib/dart.star", "dart")
@@ -16,6 +15,7 @@ dart.ci_sandbox_builder(
     execution_timeout = 60 * time.minute,
     notifies = None,
     priority = priority.high,
+    triggered_by = ["dart-gitiles-trigger-monorepo"],
     schedule = "triggered",
 )
 
@@ -23,9 +23,10 @@ dart.ci_sandbox_builder(
     name = "monorepo-builder-v2",
     channels = [],
     dimensions = {"pool": "dart.tests"},
-    executable = dart.flutter_recipe("engine_v2/builder_v2"),
+    executable = dart.flutter_recipe("engine_v2/builder"),
     execution_timeout = 60 * time.minute,
     notifies = None,
     priority = priority.high,
-    schedule = "triggered",
+    triggered_by = [],
+    schedule = None,
 )

From 4ae13b837e79cb37b6ea8956ca2a3109cde86377 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Thu, 1 Sep 2022 08:30:09 +0000
Subject: [PATCH 571/826] Trigger builds from monorepo-engine-v2 builder

The engine-v2 builder reads the list of builds
it should start from a JSON file in ci/builders in
the monorepo repository. Specify this file, and some
other builder properties the recipe requires.

Bug: b/244165558
Change-Id: I6dfcfb0912390afd51243ad6322f758d65d98080
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/257101
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 6 ++++++
 monorepo.star                | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 2c363ea2946f..6c43e5d414a9 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -4950,6 +4950,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$fuchsia/goma": {'
+        '    "server": "goma.chromium.org"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4957,6 +4960,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "config_name": "host_linux",'
+        '  "environment": "unused",'
+        '  "goma_jobs": "200",'
         '  "recipe": "engine_v2/engine_v2"'
         '}'
       priority: 30
diff --git a/monorepo.star b/monorepo.star
index 4a0304d735c1..06c98836de86 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -15,6 +15,12 @@ dart.ci_sandbox_builder(
     execution_timeout = 60 * time.minute,
     notifies = None,
     priority = priority.high,
+    properties = {
+        "$fuchsia/goma": {"server": "goma.chromium.org"},
+        "config_name": "host_linux",
+        "environment": "unused",
+        "goma_jobs": "200",
+    },
     triggered_by = ["dart-gitiles-trigger-monorepo"],
     schedule = "triggered",
 )

From cdf627cfc272f09535a09a01c07fb4754add70a3 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Tue, 13 Sep 2022 11:20:08 +0000
Subject: [PATCH 572/826] [infra] Add new merge try builders.

Bug: b/245731018
Change-Id: If943f7c58f06d6a80dbb6dcd0a523ff2e2cc7fb7
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/258803
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 generated/commit-queue.cfg   |  8 ++++
 generated/cr-buildbucket.cfg | 89 +++++++++++++++++++++++++++++++++++-
 generated/luci-milo.cfg      |  6 +++
 main.star                    | 20 +++++++-
 4 files changed, 120 insertions(+), 3 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 901ab13a48fd..c20f2c3a71ad 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -133,6 +133,10 @@ config_groups {
       builders {
         name: "dart/try/benchmark-linux-try"
       }
+      builders {
+        name: "dart/try/beta-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/dart-sdk-linux-try"
         includable_only: true
@@ -383,6 +387,10 @@ config_groups {
         name: "dart/try/pkg-win-release-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/stable-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-canary-linux-debug-try"
         location_regexp: ".+/[+]/DEPS"
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 6c43e5d414a9..0d35842c5c7e 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -12632,6 +12632,49 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "beta-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "from_ref": "refs/heads/dev",'
+        '  "recipe": "release/merge",'
+        '  "to_ref": "refs/heads/beta"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 900
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.non_production"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "dart-sdk-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13550,7 +13593,8 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "from_ref": "refs/heads/lkgr",'
-        '  "recipe": "roller/roll_to_dev"'
+        '  "recipe": "release/merge",'
+        '  "to_ref": "refs/heads/dev"'
         '}'
       priority: 30
       execution_timeout_secs: 900
@@ -14253,6 +14297,49 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "stable-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "from_ref": "refs/heads/beta",'
+        '  "recipe": "release/merge",'
+        '  "to_ref": "refs/heads/stable"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 900
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.non_production"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-canary-linux-debug-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 3578706c6c57..83b9ee3db556 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -397,6 +397,12 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/dev-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/beta-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/stable-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/monorepo-roller-try"
   }
diff --git a/main.star b/main.star
index c2b26e9d729e..b62888353db3 100755
--- a/main.star
+++ b/main.star
@@ -650,9 +650,25 @@ luci.list_view_entry(
 dart.try_builder(
     "dev",
     experiments = {"luci.non_production": 100},
-    recipe = "roller/roll_to_dev",
+    recipe = "release/merge",
     execution_timeout = 15 * time.minute,
-    properties = {"from_ref": "refs/heads/lkgr"},
+    properties = {"from_ref": "refs/heads/lkgr", "to_ref": "refs/heads/dev"},
+)
+
+dart.try_builder(
+    "beta",
+    experiments = {"luci.non_production": 100},
+    recipe = "release/merge",
+    execution_timeout = 15 * time.minute,
+    properties = {"from_ref": "refs/heads/dev", "to_ref": "refs/heads/beta"},
+)
+
+dart.try_builder(
+    "stable",
+    experiments = {"luci.non_production": 100},
+    recipe = "release/merge",
+    execution_timeout = 15 * time.minute,
+    properties = {"from_ref": "refs/heads/beta", "to_ref": "refs/heads/stable"},
 )
 
 dart.try_builder(

From a741f89884de3fa5f971dceead2a2dbbf86f24b2 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Thu, 15 Sep 2022 16:29:15 +0000
Subject: [PATCH 573/826] Switch mac sdk try builders to new recipe.

Bug: b/236109661
Change-Id: I0bad44fe95f0dac89d6fe9dd9f2a720d07627063
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/259422
Commit-Queue: Jonas Termansen <sortie@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 10 ++++++++--
 main.star                    |  6 ++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 0d35842c5c7e..8547a7635868 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -12742,11 +12742,14 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "archs": ['
+        '    "arm64"'
+        '  ],'
         '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "release/sdk"'
         '}'
       priority: 30
       caches {
@@ -12788,8 +12791,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "archs": ['
+        '    "x64"'
+        '  ],'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "release/sdk"'
         '}'
       priority: 30
       caches {
diff --git a/main.star b/main.star
index b62888353db3..5c55ff0cceb2 100755
--- a/main.star
+++ b/main.star
@@ -481,13 +481,15 @@ dart.try_builder(
 dart.try_builder(
     "dart-sdk-mac",
     dimensions = mac,
-    properties = pinned_xcode,
+    properties = [pinned_xcode, {"archs": ["x64"]}],
+    recipe = "release/sdk",
 )
 
 dart.try_builder(
     "dart-sdk-mac-arm64",
     dimensions = [mac, arm64],
-    properties = [no_android, pinned_xcode],
+    properties = [no_android, pinned_xcode, {"archs": ["arm64"]}],
+    recipe = "release/sdk",
 )
 
 dart.try_builder(

From f302e040ce089078111806d6acc780b698b11b27 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Mon, 19 Sep 2022 12:28:21 +0000
Subject: [PATCH 574/826] [infra] Disable BCID provenance in dart-sdk-mac
 builder.

Bug: b/247498714
Change-Id: Id66130945b24dab623b9d8d4d4528129b309f1c5
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/259840
Commit-Queue: Jonas Termansen <sortie@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 2 ++
 main.star                    | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 8547a7635868..1b419047b7ed 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -12749,6 +12749,7 @@ buckets {
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
+        '  "disable_bcid": true,'
         '  "recipe": "release/sdk"'
         '}'
       priority: 30
@@ -12795,6 +12796,7 @@ buckets {
         '    "x64"'
         '  ],'
         '  "clobber": true,'
+        '  "disable_bcid": true,'
         '  "recipe": "release/sdk"'
         '}'
       priority: 30
diff --git a/main.star b/main.star
index 5c55ff0cceb2..e4c4540cd3c8 100755
--- a/main.star
+++ b/main.star
@@ -481,14 +481,18 @@ dart.try_builder(
 dart.try_builder(
     "dart-sdk-mac",
     dimensions = mac,
-    properties = [pinned_xcode, {"archs": ["x64"]}],
+    properties = [pinned_xcode, {"archs": ["x64"], "disable_bcid": True}],
     recipe = "release/sdk",
 )
 
 dart.try_builder(
     "dart-sdk-mac-arm64",
     dimensions = [mac, arm64],
-    properties = [no_android, pinned_xcode, {"archs": ["arm64"]}],
+    properties = [
+        no_android,
+        pinned_xcode,
+        {"archs": ["arm64"], "disable_bcid": True},
+    ],
     recipe = "release/sdk",
 )
 

From bbe2f5981b45f71c27891807c03a9444a0d7b55c Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Mon, 19 Sep 2022 12:39:10 +0000
Subject: [PATCH 575/826] Add monorepo console

Separate monorepo builders into separate builders for each configuration

Bug: b/245481078
Change-Id: I72e49c82fc69b8a5dd2e6d67657412d355dd3a4c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/259801
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 263 ++++++++++++++++++++++++++++++++++-
 generated/luci-milo.cfg      | 105 ++++++++++++++
 monorepo.star                |  74 ++++++++--
 3 files changed, 428 insertions(+), 14 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 1b419047b7ed..e0f5e8443dd5 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -4894,6 +4894,80 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "monorepo-android-debug"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "monorepo-android-profile"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "monorepo-builder-v2"
       swarming_host: "chromium-swarm.appspot.com"
@@ -4922,7 +4996,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
-      priority: 30
+      priority: 50
       execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4965,7 +5039,192 @@ buckets {
         '  "goma_jobs": "200",'
         '  "recipe": "engine_v2/engine_v2"'
         '}'
-      priority: 30
+      priority: 50
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "monorepo-host-debug"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "monorepo-host-debug-unopt"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "monorepo-host-profile"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "monorepo-host-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "monorepo-tester"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/tester"'
+        '}'
+      priority: 50
       execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 83b9ee3db556..392e63e44152 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -3079,4 +3079,109 @@ consoles {
   refs: "regexp:refs/heads/main"
   manifest_name: "REVISION"
 }
+consoles {
+  id: "monorepo"
+  name: "Monorepo Console"
+  repo_url: "https://dart.googlesource.com/monorepo"
+  refs: "regexp:refs/heads/main"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/monorepo-engine-v2"
+    category: "coordinator"
+    short_name: "engine"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/monorepo-android-debug"
+    category: "build"
+    short_name: "android-debug"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/monorepo-android-profile"
+    category: "build"
+    short_name: "android-profile"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/monorepo-builder-v2"
+    category: "build"
+    short_name: "builder"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/monorepo-host-debug"
+    category: "build"
+    short_name: "debug"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/monorepo-host-debug-unopt"
+    category: "build"
+    short_name: "debug-unopt"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/monorepo-host-profile"
+    category: "build"
+    short_name: "profile"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/monorepo-host-release"
+    category: "build"
+    short_name: "release"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/monorepo-tester"
+    category: "test"
+    short_name: "tester"
+  }
+  header {
+    links {
+      name: "Consoles"
+      links {
+        text: "Bleeding Edge console"
+        url: "/p/dart/g/be/console"
+        alt: "SDK BE Console"
+      }
+      links {
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (alternative)"
+      }
+      links {
+        text: "FYI console"
+        url: "/p/dart/g/fyi/console"
+        alt: "SDK FYI Console"
+      }
+      links {
+        text: "LKGR console"
+        url: "/p/dart-internal/g/lkgr/console"
+        alt: "SDK LKGR console"
+      }
+      links {
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      }
+      links {
+        text: "Results Feed"
+        url: "https://dart-ci.firebaseapp.com/"
+        alt: "Results Feed"
+      }
+      links {
+        text: "Current Test Results"
+        url: "https://dart-ci.firebaseapp.com/current_results/"
+        alt: "Current Test Results"
+      }
+      links {
+        text: "Dart Infrastructure chat"
+        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
+        alt: "Dart Infrastructure chat"
+      }
+    }
+    console_groups {
+      console_ids: "dart/dart-fuzz"
+      console_ids: "dart/flutter"
+      console_ids: "dart/flutter-hhh"
+      console_ids: "dart/flutter-hhh-web"
+      console_ids: "dart/iso-stress"
+    }
+    tree_status_host: "dart-status.appspot.com"
+  }
+}
 logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png"
diff --git a/monorepo.star b/monorepo.star
index 06c98836de86..5590460f62cf 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -8,13 +8,21 @@ Defines the monorepo builders.
 load("//lib/dart.star", "dart")
 load("//lib/priority.star", "priority")
 
+luci.console_view(
+    name = "monorepo",
+    repo = "https://dart.googlesource.com/monorepo",
+    title = "Monorepo Console",
+    refs = ["refs/heads/main"],
+    header = "console-header.textpb",
+)
+
 dart.ci_sandbox_builder(
     name = "monorepo-engine-v2",
     channels = [],
     executable = dart.flutter_recipe("engine_v2/engine_v2"),
     execution_timeout = 60 * time.minute,
     notifies = None,
-    priority = priority.high,
+    priority = priority.normal,
     properties = {
         "$fuchsia/goma": {"server": "goma.chromium.org"},
         "config_name": "host_linux",
@@ -24,15 +32,57 @@ dart.ci_sandbox_builder(
     triggered_by = ["dart-gitiles-trigger-monorepo"],
     schedule = "triggered",
 )
-
-dart.ci_sandbox_builder(
-    name = "monorepo-builder-v2",
-    channels = [],
-    dimensions = {"pool": "dart.tests"},
-    executable = dart.flutter_recipe("engine_v2/builder"),
-    execution_timeout = 60 * time.minute,
-    notifies = None,
-    priority = priority.high,
-    triggered_by = [],
-    schedule = None,
+luci.console_view_entry(
+    builder = "monorepo-engine-v2",
+    short_name = "engine",
+    category = "coordinator",
+    console_view = "monorepo",
 )
+
+def monorepo_builder(name, short_name, category):
+    dart.ci_sandbox_builder(
+        name = name,
+        channels = [],
+        dimensions = {"pool": "dart.tests"},
+        executable = dart.flutter_recipe("engine_v2/builder"),
+        execution_timeout = 60 * time.minute,
+        notifies = None,
+        priority = priority.normal,
+        triggered_by = [],
+        schedule = None,
+    )
+    luci.console_view_entry(
+        builder = name,
+        short_name = short_name,
+        category = category,
+        console_view = "monorepo",
+    )
+
+monorepo_builder("monorepo-android-debug", "android-debug", "build")
+monorepo_builder("monorepo-android-profile", "android-profile", "build")
+monorepo_builder("monorepo-builder-v2", "builder", "build")
+monorepo_builder("monorepo-host-debug", "debug", "build")
+monorepo_builder("monorepo-host-debug-unopt", "debug-unopt", "build")
+monorepo_builder("monorepo-host-profile", "profile", "build")
+monorepo_builder("monorepo-host-release", "release", "build")
+
+def monorepo_tester(name, short_name, category):
+    dart.ci_sandbox_builder(
+        name = name,
+        channels = [],
+        dimensions = {"pool": "dart.tests"},
+        executable = dart.flutter_recipe("engine_v2/tester"),
+        execution_timeout = 60 * time.minute,
+        notifies = None,
+        priority = priority.normal,
+        triggered_by = [],
+        schedule = None,
+    )
+    luci.console_view_entry(
+        builder = name,
+        short_name = short_name,
+        category = category,
+        console_view = "monorepo",
+    )
+
+monorepo_tester("monorepo-tester", "tester", "test")

From d026f45babdd6f3f13d4b212136d7c7581f42e2b Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Mon, 19 Sep 2022 14:29:50 +0000
Subject: [PATCH 576/826] [infra] Switch dart-sdk-win-try builder to the sdk
 recipe.

Bug: b/247507699
Change-Id: I56bf9ef0fdc189de47bd3a1de5ab1ed4a1ca2d98
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/259841
Commit-Queue: Jonas Termansen <sortie@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 8 +++++++-
 main.star                    | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index e0f5e8443dd5..e257146a8bd1 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -13095,8 +13095,14 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "archs": ['
+        '    "ia32",'
+        '    "x64",'
+        '    "arm64"'
+        '  ],'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "disable_bcid": true,'
+        '  "recipe": "release/sdk"'
         '}'
       priority: 30
       build_numbers: YES
diff --git a/main.star b/main.star
index e4c4540cd3c8..d1937688e122 100755
--- a/main.star
+++ b/main.star
@@ -499,6 +499,8 @@ dart.try_builder(
 dart.try_builder(
     "dart-sdk-win",
     dimensions = windows,
+    properties = {"archs": ["ia32", "x64", "arm64"], "disable_bcid": True},
+    recipe = "release/sdk",
     on_cq = True,
 )
 

From ff340bed79bf84b9768f1f638d142e23ac481d4e Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 20 Sep 2022 09:45:11 +0000
Subject: [PATCH 577/826] [infra] Add emscripten to dart2wasm builders

Bug: b/247449715
Change-Id: I84c17642b0ee6bfe81b3a56e494fbd9014b09e36
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/260102
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 6 ++++++
 lib/defaults.star            | 6 ++++--
 main.star                    | 2 ++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index e257146a8bd1..ca10215b25ee 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -3020,6 +3020,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_emscripten": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -13588,6 +13591,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_emscripten": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
diff --git a/lib/defaults.star b/lib/defaults.star
index 289ea22f6ba2..bff7b9d5dc77 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -17,10 +17,11 @@ _CACHES = {
 }
 _NO_ANDROID = {"custom_vars": {"download_android_deps": False}}
 _CHROME = {"custom_vars": {"download_chrome": True}}
+_EMSCRIPTEN = {"custom_vars": {"download_emscripten": True}}
 _FIREFOX = {"custom_vars": {"download_firefox": True}}
 _JS_ENGINES = {"custom_vars": {"checkout_javascript_engines": True}}
-_SLOW_SHARDS = {"shard_timeout": (90 * time.minute) // time.second}
 _PINNED_XCODE = {"$depot_tools/osx_sdk": {"sdk_version": "12d4e"}}
+_SLOW_SHARDS = {"shard_timeout": (90 * time.minute) // time.second}
 
 _ARM64 = {"cpu": "arm64"}
 _MAC = {"os": "Mac"}
@@ -76,8 +77,9 @@ windows = _WINDOWS
 # Properties
 
 chrome = _CHROME
+emscripten = _EMSCRIPTEN
 firefox = _FIREFOX
 js_engines = _JS_ENGINES
 no_android = _NO_ANDROID
-slow_shards = _SLOW_SHARDS
 pinned_xcode = _PINNED_XCODE
+slow_shards = _SLOW_SHARDS
diff --git a/main.star b/main.star
index d1937688e122..e3e7575448ce 100755
--- a/main.star
+++ b/main.star
@@ -18,6 +18,7 @@ load(
     "//lib/defaults.star",
     "arm64",
     "chrome",
+    "emscripten",
     "experimental",
     "firefox",
     "focal",
@@ -279,6 +280,7 @@ cron.weekly_builder(
 cron.nightly_builder(
     "dart2wasm-linux-x64-d8",
     channels = ["try"],
+    properties = emscripten,
 )
 
 # flutter

From c34a0533c6f3774bea8b69682454828e6a8a63e5 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Tue, 27 Sep 2022 08:01:16 +0000
Subject: [PATCH 578/826] [monorepo] Remove generic monorepo-builder-v2 builder

All monorepo builds are now done on a builder for each configuration.
Remove the previous generic engine-v2/builder builder.

Bug: b/245481078
Change-Id: I6b2fdd8b79ce8e133bc81486a26051eab6599a05
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/261082
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 37 ------------------------------------
 generated/luci-milo.cfg      |  5 -----
 monorepo.star                |  1 -
 3 files changed, 43 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index ca10215b25ee..a7b4ae025793 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -4971,43 +4971,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "monorepo-builder-v2"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 3600
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "monorepo-engine-v2"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 392e63e44152..813266c7522c 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -3100,11 +3100,6 @@ consoles {
     category: "build"
     short_name: "android-profile"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/monorepo-builder-v2"
-    category: "build"
-    short_name: "builder"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/monorepo-host-debug"
     category: "build"
diff --git a/monorepo.star b/monorepo.star
index 5590460f62cf..3dddb8f189e6 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -60,7 +60,6 @@ def monorepo_builder(name, short_name, category):
 
 monorepo_builder("monorepo-android-debug", "android-debug", "build")
 monorepo_builder("monorepo-android-profile", "android-profile", "build")
-monorepo_builder("monorepo-builder-v2", "builder", "build")
 monorepo_builder("monorepo-host-debug", "debug", "build")
 monorepo_builder("monorepo-host-debug-unopt", "debug-unopt", "build")
 monorepo_builder("monorepo-host-profile", "profile", "build")

From 3d2763fb9cf87698613448dcead33b9230664cfc Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Wed, 5 Oct 2022 09:10:38 +0000
Subject: [PATCH 579/826] [infra] Switch RISC-V bots to NNBD.

Change-Id: I36d4ff4870466b7157d3ca68c3e996ddea863878
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/259921
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   |  16 +--
 generated/cr-buildbucket.cfg | 266 +++++++++++++++++------------------
 generated/luci-milo.cfg      |  12 +-
 generated/luci-notify.cfg    |  52 +++----
 generated/luci-scheduler.cfg |  48 +++----
 vm.star                      |   4 +-
 6 files changed, 199 insertions(+), 199 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index c20f2c3a71ad..b9a7cb6b7b7f 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -450,10 +450,6 @@ config_groups {
         name: "dart/try/vm-kernel-linux-debug-ia32-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-linux-debug-simriscv64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-linux-debug-x64-try"
         includable_only: true
@@ -501,6 +497,10 @@ config_groups {
         name: "dart/try/vm-kernel-nnbd-linux-debug-ia32-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-debug-simriscv64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-debug-x64-try"
         location_regexp: ".+/[+]/DEPS"
@@ -559,6 +559,10 @@ config_groups {
         name: "dart/try/vm-kernel-nnbd-mac-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-precomp-linux-debug-simriscv64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-nnbd-win-debug-x64-try"
         includable_only: true
@@ -599,10 +603,6 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-linux-debug-simarm_x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-simriscv64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index a7b4ae025793..4ab282f7c17e 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -7162,42 +7162,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-linux-debug-simriscv64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8390,6 +8354,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-nnbd-linux-debug-simriscv64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-nnbd-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8966,6 +8966,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-nnbd-precomp-linux-debug-simriscv64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-nnbd-win-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -9665,42 +9701,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-precomp-linux-debug-simriscv64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-precomp-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -15018,42 +15018,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-linux-debug-simriscv64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -15510,6 +15474,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-nnbd-linux-debug-simriscv64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-nnbd-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -15871,11 +15871,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-debug-x64-try"
+      name: "vm-kernel-nnbd-precomp-linux-debug-simriscv64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15885,7 +15885,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -15896,8 +15896,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -15908,7 +15907,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-ia32-try"
+      name: "vm-kernel-nnbd-win-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15933,7 +15932,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -15944,7 +15944,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-x64-try"
+      name: "vm-kernel-nnbd-win-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15980,11 +15980,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-optcounter-threshold-linux-release-ia32-try"
+      name: "vm-kernel-nnbd-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15994,7 +15994,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -16016,7 +16016,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-optcounter-threshold-linux-release-x64-try"
+      name: "vm-kernel-optcounter-threshold-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16052,7 +16052,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64c-try"
+      name: "vm-kernel-optcounter-threshold-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16077,8 +16077,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -16089,7 +16088,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm_x64-try"
+      name: "vm-kernel-precomp-android-release-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16126,7 +16125,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-asan-linux-release-x64-try"
+      name: "vm-kernel-precomp-android-release-arm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16150,9 +16149,9 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -16163,7 +16162,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-dwarf-linux-product-x64-try"
+      name: "vm-kernel-precomp-asan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16187,6 +16186,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -16199,7 +16199,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-simarm_x64-try"
+      name: "vm-kernel-precomp-dwarf-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16224,8 +16224,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -16236,7 +16235,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-simriscv64-try"
+      name: "vm-kernel-precomp-linux-debug-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16261,7 +16260,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 813266c7522c..45aa723cc8d1 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -263,10 +263,10 @@ consoles {
     name: "buildbucket/luci.dart.try/vm-kernel-msvc-windows-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-simriscv64-try"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-simriscv64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-simriscv64-try"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-precomp-linux-debug-simriscv64-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm-try"
@@ -875,12 +875,12 @@ consoles {
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simriscv64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-simriscv64"
     category: "vm|misc"
     short_name: "rv64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simriscv64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-precomp-linux-debug-simriscv64"
     category: "vm|misc"
     short_name: "rv64"
   }
@@ -1735,12 +1735,12 @@ consoles {
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-simriscv64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-simriscv64"
     category: "vm|misc"
     short_name: "rv64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simriscv64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-precomp-linux-debug-simriscv64"
     category: "vm|misc"
     short_name: "rv64"
   }
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index d48710f22d93..b2d652b21342 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -681,19 +681,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-debug-simriscv64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -836,6 +823,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-linux-debug-simriscv64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -947,6 +947,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-nnbd-precomp-linux-debug-simriscv64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1069,19 +1082,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-debug-simriscv64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index cee44c586f73..93bcfdeb4a57 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1918,17 +1918,6 @@ job {
     builder: "vm-kernel-linux-debug-ia32"
   }
 }
-job {
-  id: "vm-kernel-linux-debug-simriscv64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-debug-simriscv64"
-  }
-}
 job {
   id: "vm-kernel-linux-debug-x64"
   realm: "ci.sandbox"
@@ -2270,6 +2259,17 @@ job {
     builder: "vm-kernel-nnbd-linux-debug-ia32"
   }
 }
+job {
+  id: "vm-kernel-nnbd-linux-debug-simriscv64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-kernel-nnbd-linux-debug-simriscv64"
+  }
+}
 job {
   id: "vm-kernel-nnbd-linux-debug-x64"
   realm: "ci.sandbox"
@@ -2435,6 +2435,17 @@ job {
     builder: "vm-kernel-nnbd-mac-release-x64"
   }
 }
+job {
+  id: "vm-kernel-nnbd-precomp-linux-debug-simriscv64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-kernel-nnbd-precomp-linux-debug-simriscv64"
+  }
+}
 job {
   id: "vm-kernel-nnbd-win-debug-x64"
   realm: "ci.sandbox"
@@ -2644,17 +2655,6 @@ job {
     builder: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
   }
 }
-job {
-  id: "vm-kernel-precomp-linux-debug-simriscv64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-simriscv64"
-  }
-}
 job {
   id: "vm-kernel-precomp-linux-debug-x64"
   realm: "ci.sandbox"
@@ -3819,25 +3819,25 @@ trigger {
   triggers: "vm-kernel-asan-linux-release-x64"
   triggers: "vm-kernel-gcc-linux"
   triggers: "vm-kernel-linux-debug-ia32"
-  triggers: "vm-kernel-linux-debug-simriscv64"
   triggers: "vm-kernel-linux-debug-x64c"
   triggers: "vm-kernel-linux-release-ia32"
   triggers: "vm-kernel-msan-linux-release-x64"
   triggers: "vm-kernel-msvc-windows"
   triggers: "vm-kernel-nnbd-linux-debug-ia32"
+  triggers: "vm-kernel-nnbd-linux-debug-simriscv64"
   triggers: "vm-kernel-nnbd-linux-release-ia32"
   triggers: "vm-kernel-nnbd-linux-release-simarm"
   triggers: "vm-kernel-nnbd-linux-release-simarm64"
   triggers: "vm-kernel-nnbd-mac-debug-arm64"
   triggers: "vm-kernel-nnbd-mac-debug-x64"
   triggers: "vm-kernel-nnbd-mac-release-x64"
+  triggers: "vm-kernel-nnbd-precomp-linux-debug-simriscv64"
   triggers: "vm-kernel-nnbd-win-debug-x64"
   triggers: "vm-kernel-nnbd-win-release-ia32"
   triggers: "vm-kernel-nnbd-win-release-x64"
   triggers: "vm-kernel-optcounter-threshold-linux-release-ia32"
   triggers: "vm-kernel-precomp-asan-linux-release-x64"
   triggers: "vm-kernel-precomp-dwarf-linux-product-x64"
-  triggers: "vm-kernel-precomp-linux-debug-simriscv64"
   triggers: "vm-kernel-precomp-linux-debug-x64c"
   triggers: "vm-kernel-precomp-linux-product-x64"
   triggers: "vm-kernel-precomp-mac-product-x64"
diff --git a/vm.star b/vm.star
index 65cc6d35bdf7..7168d75c8a9f 100644
--- a/vm.star
+++ b/vm.star
@@ -511,12 +511,12 @@ _nightly_builder(
 )
 
 _nightly_builder(
-    "vm-kernel-linux-debug-simriscv64",
+    "vm-kernel-nnbd-linux-debug-simriscv64",
     category = "vm|misc|rv64",
     channels = ["try"],
 )
 _nightly_builder(
-    "vm-kernel-precomp-linux-debug-simriscv64",
+    "vm-kernel-nnbd-precomp-linux-debug-simriscv64",
     category = "vm|misc|rv64",
     channels = ["try"],
 )

From 2b1ca71684b703b866f3746e3272baa20b858a74 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 7 Oct 2022 12:11:39 +0000
Subject: [PATCH 580/826] [infra] Raise execution timeout on
 cross-vm-linux-release-arm64 to 4h

Change-Id: I700a38d2b3ce44c99f80e096bdedcb233be7d5a2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/263125
Reviewed-by: William Hesse <whesse@google.com>
Auto-Submit: Alexander Thomas <athom@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 1 +
 vm.star                      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 4ab282f7c17e..7a64e53648f7 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -1110,6 +1110,7 @@ buckets {
         '  "shard_timeout": 7200'
         '}'
       priority: 50
+      execution_timeout_secs: 14400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
diff --git a/vm.star b/vm.star
index 7168d75c8a9f..cda4864ac94c 100644
--- a/vm.star
+++ b/vm.star
@@ -308,6 +308,7 @@ _extra_builder(
     "cross-vm-linux-release-arm64",
     category = "vm|kernel|cra",
     channels = [],
+    execution_timeout = 4 * time.hour,
     properties = {"shard_timeout": (120 * time.minute) // time.second},
 )
 

From c3bf4ff8921e405d59620d524b6287bff957cc6a Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Sat, 8 Oct 2022 08:49:21 +0000
Subject: [PATCH 581/826] [infra] Fix spelling of
 vm-kernel-precomp-nnbd-linux-debug-simriscv64.

Change-Id: Ib8f725e29f0cf0cbe2d037c1acd08f6dfce9b5c8
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/263181
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   |   8 +-
 generated/cr-buildbucket.cfg | 144 +++++++++++++++++------------------
 generated/luci-milo.cfg      |   6 +-
 generated/luci-notify.cfg    |  26 +++----
 generated/luci-scheduler.cfg |  24 +++---
 generated/project.cfg        |   2 +-
 vm.star                      |   2 +-
 7 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index b9a7cb6b7b7f..085834cb2eaa 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -559,10 +559,6 @@ config_groups {
         name: "dart/try/vm-kernel-nnbd-mac-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-precomp-linux-debug-simriscv64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-nnbd-win-debug-x64-try"
         includable_only: true
@@ -647,6 +643,10 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simriscv64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-x64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 7a64e53648f7..f42e3c79ad20 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -8967,42 +8967,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-nnbd-precomp-linux-debug-simriscv64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-nnbd-win-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10782,6 +10746,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -15871,42 +15871,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-nnbd-precomp-linux-debug-simriscv64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-nnbd-win-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -16683,6 +16647,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-precomp-nnbd-linux-debug-simriscv64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 45aa723cc8d1..d4e78c25093d 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -266,7 +266,7 @@ consoles {
     name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-simriscv64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-precomp-linux-debug-simriscv64-try"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-simriscv64-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm-try"
@@ -880,7 +880,7 @@ consoles {
     short_name: "rv64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-precomp-linux-debug-simriscv64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simriscv64"
     category: "vm|misc"
     short_name: "rv64"
   }
@@ -1740,7 +1740,7 @@ consoles {
     short_name: "rv64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-precomp-linux-debug-simriscv64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simriscv64"
     category: "vm|misc"
     short_name: "rv64"
   }
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index b2d652b21342..30eb7b800bd9 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -947,19 +947,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-precomp-linux-debug-simriscv64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1213,6 +1200,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 93bcfdeb4a57..12a59410f446 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -2435,17 +2435,6 @@ job {
     builder: "vm-kernel-nnbd-mac-release-x64"
   }
 }
-job {
-  id: "vm-kernel-nnbd-precomp-linux-debug-simriscv64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  acl_sets: "ci.sandbox"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-precomp-linux-debug-simriscv64"
-  }
-}
 job {
   id: "vm-kernel-nnbd-win-debug-x64"
   realm: "ci.sandbox"
@@ -2974,6 +2963,17 @@ job {
     builder: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
   }
 }
+job {
+  id: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  acl_sets: "ci.sandbox"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
+  }
+}
 job {
   id: "vm-kernel-precomp-nnbd-linux-debug-x64"
   realm: "ci.sandbox"
@@ -3831,7 +3831,6 @@ trigger {
   triggers: "vm-kernel-nnbd-mac-debug-arm64"
   triggers: "vm-kernel-nnbd-mac-debug-x64"
   triggers: "vm-kernel-nnbd-mac-release-x64"
-  triggers: "vm-kernel-nnbd-precomp-linux-debug-simriscv64"
   triggers: "vm-kernel-nnbd-win-debug-x64"
   triggers: "vm-kernel-nnbd-win-release-ia32"
   triggers: "vm-kernel-nnbd-win-release-x64"
@@ -3843,6 +3842,7 @@ trigger {
   triggers: "vm-kernel-precomp-mac-product-x64"
   triggers: "vm-kernel-precomp-msan-linux-release-x64"
   triggers: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+  triggers: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
   triggers: "vm-kernel-precomp-nnbd-linux-debug-x64"
   triggers: "vm-kernel-precomp-nnbd-linux-release-simarm64"
   triggers: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
diff --git a/generated/project.cfg b/generated/project.cfg
index 44de5371cc96..5b5c25de60f0 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.32.1"
+  version: "1.33.2"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/vm.star b/vm.star
index cda4864ac94c..430951b7bd39 100644
--- a/vm.star
+++ b/vm.star
@@ -517,7 +517,7 @@ _nightly_builder(
     channels = ["try"],
 )
 _nightly_builder(
-    "vm-kernel-nnbd-precomp-linux-debug-simriscv64",
+    "vm-kernel-precomp-nnbd-linux-debug-simriscv64",
     category = "vm|misc|rv64",
     channels = ["try"],
 )

From 708aa8c34c49dacc09ef530acca595537bdc91ac Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 12 Oct 2022 02:04:43 +0000
Subject: [PATCH 582/826] [infra] Allow presubmits to trigger led runs in the
 try pool

Bug: b/251431656
Change-Id: Ieed8ab4d2319f5abffff951dab5a7010d503ec94
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/262350
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/project.cfg |  2 +-
 generated/realms.cfg  |  2 ++
 project.star          | 16 +++++++++++++---
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/generated/project.cfg b/generated/project.cfg
index 5b5c25de60f0..44de5371cc96 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.33.2"
+  version: "1.32.1"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/generated/realms.cfg b/generated/realms.cfg
index 4c79b8f4c2d4..1cb745e4f1a2 100644
--- a/generated/realms.cfg
+++ b/generated/realms.cfg
@@ -112,6 +112,7 @@ realms {
   bindings {
     role: "role/swarming.poolUser"
     principals: "group:mdb/dart-build-access"
+    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
   }
 }
 realms {
@@ -129,6 +130,7 @@ realms {
   bindings {
     role: "role/swarming.taskTriggerer"
     principals: "group:mdb/dart-build-access"
+    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
   }
 }
 realms {
diff --git a/project.star b/project.star
index e9c4a230894f..15a665a55670 100644
--- a/project.star
+++ b/project.star
@@ -129,17 +129,17 @@ luci.realm(
     ],
 )
 
-def led_users(*, pool_realms, builder_realm, groups):
+def led_users(*, pool_realms, builder_realm, **kwargs):
     for realm in pool_realms:
         luci.binding(
             realm = realm,
             roles = "role/swarming.poolUser",
-            groups = groups,
+            **kwargs
         )
     luci.binding(
         realm = builder_realm,
         roles = "role/swarming.taskTriggerer",
-        groups = groups,
+        **kwargs
     )
 
 # Allow admins to use LED and "Debug" button on every Dart builder and bot.
@@ -157,6 +157,16 @@ led_users(
     groups = ["mdb/dart-build-access"],
 )
 
+# Allow dart-luci-try-builder@dart-ci.iam.gserviceaccount.com to trigger led
+# runs in the try pool.
+led_users(
+    pool_realms = ["pools/try"],
+    builder_realm = "try",
+    users = [
+        "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com",
+    ],
+)
+
 luci.milo(
     logo = "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png",
 )

From d503e087f31b2d8a19086725564db8f548d64261 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 20 Oct 2022 09:46:17 +0000
Subject: [PATCH 583/826] [infra] Add dart2wasm to the console and the CQ

Change-Id: Ie206b05bd16ea12b448893a052a86afefa1c1978
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/263122
Reviewed-by: William Hesse <whesse@google.com>
Reviewed-by: Aske Simon Christensen <askesc@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg | 12 +++++++++++-
 generated/luci-milo.cfg    | 10 ++++++++++
 generated/project.cfg      |  2 +-
 lib/paths.star             |  5 +++++
 main.star                  |  2 ++
 5 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 085834cb2eaa..c9df590db9e4 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -258,7 +258,17 @@ config_groups {
       }
       builders {
         name: "dart/try/dart2wasm-linux-x64-d8-try"
-        includable_only: true
+        location_regexp: ".+/[+]/DEPS"
+        location_regexp: ".+/[+]/build/.+"
+        location_regexp: ".+/[+]/BUILD.gn"
+        location_regexp: ".+/[+]/sdk_args.gni"
+        location_regexp: ".+/[+]/.dart_tool/package_config.json"
+        location_regexp: ".+/[+]/sdk/.+"
+        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
+        location_regexp: ".+/[+]/tests/.+"
+        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        location_regexp: ".+/[+]/pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
       }
       builders {
         name: "dart/try/ddc-canary-linux-release-chrome-try"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index d4e78c25093d..5c21a1657ace 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -474,6 +474,11 @@ consoles {
     category: "cfe"
     short_name: "fl"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-x64-d8"
+    category: "d2w"
+    short_name: "d"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
     category: "flutter"
@@ -1189,6 +1194,11 @@ consoles {
     category: "cfe"
     short_name: "fl"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-x64-d8"
+    category: "d2w"
+    short_name: "d"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
     category: "flutter"
diff --git a/generated/project.cfg b/generated/project.cfg
index 44de5371cc96..5b5c25de60f0 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.32.1"
+  version: "1.33.2"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/lib/paths.star b/lib/paths.star
index d80756d735b3..4eac2d6efed8 100644
--- a/lib/paths.star
+++ b/lib/paths.star
@@ -61,6 +61,10 @@ _ANALYZER_PATHS = _STANDARD_PATHS + [
     "pkg/.+",
 ]
 
+_DART2WASM_PATHS = _CFE_PATHS + [
+    "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+",
+]
+
 def _to_location_regexp(paths):
     return [".+/[+]/%s" % path for path in paths]
 
@@ -70,6 +74,7 @@ paths = struct(
     cfe = _CFE_PATHS,
     cfe_only = _CFE_PATHS_ONLY,
     dart2js = _DART2JS_PATHS,
+    dart2wasm = _DART2WASM_PATHS,
     ddc = _DDC_PATHS,
     standard = _STANDARD_PATHS,
     test_py = _TEST_PY_PATHS,
diff --git a/main.star b/main.star
index e3e7575448ce..9805608dc1d4 100755
--- a/main.star
+++ b/main.star
@@ -279,8 +279,10 @@ cron.weekly_builder(
 )
 cron.nightly_builder(
     "dart2wasm-linux-x64-d8",
+    category = "d2w|d",
     channels = ["try"],
     properties = emscripten,
+    location_regexp = paths.to_location_regexp(paths.dart2wasm),
 )
 
 # flutter

From 2f16cc6a7d7be8c0847037e352d501b6e64316cd Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Thu, 27 Oct 2022 09:34:18 +0000
Subject: [PATCH 584/826] [infra] Switch linux-sdk-try builder to the sdk
 recipe.

Split the SDK builders per architecture families.

Fixes: b/253079985
Fixes: b/233174001
Change-Id: I73eee28268c670a0e6b159c0675617c1b2ec889a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/265342
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 generated/commit-queue.cfg   |  12 +++
 generated/cr-buildbucket.cfg | 139 ++++++++++++++++++++++++++++++++++-
 generated/luci-milo.cfg      |   9 +++
 generated/project.cfg        |   2 +-
 main.star                    |  39 +++++++++-
 5 files changed, 196 insertions(+), 5 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index c9df590db9e4..a3062e7a4108 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -137,6 +137,14 @@ config_groups {
         name: "dart/try/beta-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/dart-sdk-linux-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-linux-riscv64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/dart-sdk-linux-try"
         includable_only: true
@@ -149,6 +157,10 @@ config_groups {
         name: "dart/try/dart-sdk-mac-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/dart-sdk-win-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/dart-sdk-win-try"
       }
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index f42e3c79ad20..d441569be86a 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -12901,6 +12901,93 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "dart-sdk-linux-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$dart/build": {'
+        '    "timeout": 6000'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "archs": ['
+        '    "arm",'
+        '    "arm64"'
+        '  ],'
+        '  "clobber": true,'
+        '  "disable_bcid": true,'
+        '  "recipe": "release/sdk"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-sdk-linux-riscv64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$dart/build": {'
+        '    "timeout": 6000'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "archs": ['
+        '    "riscv64"'
+        '  ],'
+        '  "clobber": true,'
+        '  "disable_bcid": true,'
+        '  "recipe": "release/sdk"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "dart-sdk-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -12929,8 +13016,15 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "archs": ['
+        '    "ia32",'
+        '    "x64"'
+        '  ],'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "dartdoc_arch": "x64",'
+        '  "disable_bcid": true,'
+        '  "recipe": "release/sdk",'
+        '  "upload_version": true'
         '}'
       priority: 30
       build_numbers: YES
@@ -13037,6 +13131,46 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "dart-sdk-win-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "archs": ['
+        '    "arm64"'
+        '  ],'
+        '  "clobber": true,'
+        '  "disable_bcid": true,'
+        '  "recipe": "release/sdk"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "dart-sdk-win-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13064,8 +13198,7 @@ buckets {
         '  },'
         '  "archs": ['
         '    "ia32",'
-        '    "x64",'
-        '    "arm64"'
+        '    "x64"'
         '  ],'
         '  "clobber": true,'
         '  "disable_bcid": true,'
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 5c21a1657ace..03947e69c136 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -358,6 +358,12 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/dart-sdk-linux-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/dart-sdk-linux-arm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/dart-sdk-linux-riscv64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/dart-sdk-mac-try"
   }
@@ -367,6 +373,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/dart-sdk-win-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/dart-sdk-win-arm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/ddc-canary-linux-release-chrome-try"
   }
diff --git a/generated/project.cfg b/generated/project.cfg
index 5b5c25de60f0..581050cbd191 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.33.2"
+  version: "1.33.4"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/main.star b/main.star
index 9805608dc1d4..a9e455347934 100755
--- a/main.star
+++ b/main.star
@@ -480,8 +480,38 @@ dart.try_builder(
         "$dart/build": {
             "timeout": 100 * 60,  # 100 minutes,
         },
+        "archs": ["ia32", "x64"],
+        "dartdoc_arch": "x64",
+        "disable_bcid": True,
+        "upload_version": True,
     },
+    recipe = "release/sdk",
 )
+
+dart.try_builder(
+    "dart-sdk-linux-arm64",
+    properties = {
+        "$dart/build": {
+            "timeout": 100 * 60,  # 100 minutes,
+        },
+        "archs": ["arm", "arm64"],
+        "disable_bcid": True,
+    },
+    recipe = "release/sdk",
+)
+
+dart.try_builder(
+    "dart-sdk-linux-riscv64",
+    properties = {
+        "$dart/build": {
+            "timeout": 100 * 60,  # 100 minutes,
+        },
+        "archs": ["riscv64"],
+        "disable_bcid": True,
+    },
+    recipe = "release/sdk",
+)
+
 dart.try_builder(
     "dart-sdk-mac",
     dimensions = mac,
@@ -503,11 +533,18 @@ dart.try_builder(
 dart.try_builder(
     "dart-sdk-win",
     dimensions = windows,
-    properties = {"archs": ["ia32", "x64", "arm64"], "disable_bcid": True},
+    properties = {"archs": ["ia32", "x64"], "disable_bcid": True},
     recipe = "release/sdk",
     on_cq = True,
 )
 
+dart.try_builder(
+    "dart-sdk-win-arm64",
+    dimensions = windows,
+    properties = {"archs": ["arm64"], "disable_bcid": True},
+    recipe = "release/sdk",
+)
+
 # ddc
 cron.nightly_builder(
     "ddc-canary-linux-release-chrome",

From 02ba00bc71b64eaa3307366a704720646049b140 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Fri, 28 Oct 2022 13:46:21 +0000
Subject: [PATCH 585/826] [infra] Increase timeouts on gcc and simriscv64
 builders

The build steps on the gcc builder sometimes take more than 50
minutes, since it is not using goma. Increased their timeout to
100 minutes.

Some vm test shards on vm-kernel-precomp-nnbd-linux-debug-simriscv64
take more than an hour. Added the slow_shards property to that builder.

Change-Id: I7a24dd0467188fda9580dccf2e6a77481367d3a3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/266385
Reviewed-by: Daco Harkes <dacoharkes@google.com>
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 generated/cr-buildbucket.cfg | 16 ++++++++++------
 vm.star                      |  8 +++++++-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index d441569be86a..86cf756f2054 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -7107,7 +7107,8 @@ buckets {
       properties:
         '{'
         '  "$dart/build": {'
-        '    "disable_goma": true'
+        '    "disable_goma": true,'
+        '    "timeout": 4500'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -7119,7 +7120,7 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
-      execution_timeout_secs: 14400
+      execution_timeout_secs: 18000
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10772,7 +10773,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 70
       build_numbers: YES
@@ -15096,7 +15098,8 @@ buckets {
       properties:
         '{'
         '  "$dart/build": {'
-        '    "disable_goma": true'
+        '    "disable_goma": true,'
+        '    "timeout": 4500'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -15108,7 +15111,7 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 14400
+      execution_timeout_secs: 18000
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -16806,7 +16809,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
diff --git a/vm.star b/vm.star
index 430951b7bd39..fb027b98fefb 100644
--- a/vm.star
+++ b/vm.star
@@ -499,8 +499,13 @@ _nightly_builder(
     "vm-kernel-gcc-linux",
     category = "vm|misc|g",
     channels = ["try"],
-    execution_timeout = 4 * time.hour,
+    execution_timeout = 5 * time.hour,
     goma = False,
+    properties = {
+        "$dart/build": {
+            "timeout": 75 * 60,  # 100 minutes,
+        },
+    },
 )
 
 _nightly_builder(
@@ -520,6 +525,7 @@ _nightly_builder(
     "vm-kernel-precomp-nnbd-linux-debug-simriscv64",
     category = "vm|misc|rv64",
     channels = ["try"],
+    properties = [slow_shards],
 )
 
 # vm|ffi

From 914afce70491c9035fecf170d1a1ac20f12de81a Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Tue, 8 Nov 2022 12:50:15 +0000
Subject: [PATCH 586/826] Split external sdk builders on the consoles.

Bug: b/233174001
Change-Id: I5cac7822a4b6a993cdf77c689cc581aaaddd9b4c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/268261
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 generated/luci-milo.cfg | 55 +++++++++++++++++++++++++++++++++++++++++
 generated/project.cfg   |  2 +-
 main.star               | 21 ++++++++++------
 3 files changed, 69 insertions(+), 9 deletions(-)

diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 03947e69c136..cffed55fc5bb 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -428,6 +428,16 @@ consoles {
     category: "sdk"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-linux-arm64-main"
+    category: "sdk"
+    short_name: "la"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-linux-riscv64-main"
+    category: "sdk"
+    short_name: "lv"
+  }
   builders {
     name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-main"
     category: "sdk"
@@ -443,6 +453,11 @@ consoles {
     category: "sdk"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-win-arm64-main"
+    category: "sdk"
+    short_name: "wa"
+  }
   builders {
     name: "buildbucket/luci.dart-internal.ci/debianpackage-linux-main"
     category: "sdk"
@@ -1148,6 +1163,16 @@ consoles {
     category: "sdk"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-linux-arm64-main"
+    category: "sdk"
+    short_name: "la"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-linux-riscv64-main"
+    category: "sdk"
+    short_name: "lv"
+  }
   builders {
     name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-main"
     category: "sdk"
@@ -1163,6 +1188,11 @@ consoles {
     category: "sdk"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-win-arm64-main"
+    category: "sdk"
+    short_name: "wa"
+  }
   builders {
     name: "buildbucket/luci.dart-internal.ci/debianpackage-linux-main"
     category: "sdk"
@@ -1868,6 +1898,16 @@ consoles {
     category: "sdk"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-linux-arm64-dev"
+    category: "sdk"
+    short_name: "la"
+  }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-linux-riscv64-dev"
+    category: "sdk"
+    short_name: "lv"
+  }
   builders {
     name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-dev"
     category: "sdk"
@@ -1883,6 +1923,11 @@ consoles {
     category: "sdk"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-win-arm64-dev"
+    category: "sdk"
+    short_name: "wa"
+  }
   builders {
     name: "buildbucket/luci.dart-internal.ci/debianpackage-linux-dev"
     category: "sdk"
@@ -2263,6 +2308,11 @@ consoles {
     category: "sdk"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-linux-arm64-beta"
+    category: "sdk"
+    short_name: "la"
+  }
   builders {
     name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-beta"
     category: "sdk"
@@ -2653,6 +2703,11 @@ consoles {
     category: "sdk"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-linux-arm64-stable"
+    category: "sdk"
+    short_name: "la"
+  }
   builders {
     name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-stable"
     category: "sdk"
diff --git a/generated/project.cfg b/generated/project.cfg
index 581050cbd191..2b612d61cfe1 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.33.4"
+  version: "1.33.6"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/main.star b/main.star
index a9e455347934..715bd8715bc4 100755
--- a/main.star
+++ b/main.star
@@ -131,8 +131,8 @@ luci.console_view(
     refs = ["refs/heads/main"],
 )
 
-# Put the SDK category first on the consoles
 def sdk_builder_category():
+    """Put the SDK category first on the consoles"""
     for channel, console in [
         ["main", "be"],
         ["main", "alt"],
@@ -142,17 +142,22 @@ def sdk_builder_category():
     ]:
         for builder_type, short_name in [
             ["linux", "l"],
+            ["linux-arm64", "la"],
+            ["linux-riscv64", "lv"],
             ["mac", "m"],
             ["mac-arm64", "m1"],
             ["win", "w"],
+            ["win-arm64", "wa"],
         ]:
-            luci.console_view_entry(
-                builder = "dart-internal:ci/dart-sdk-%s-%s" %
-                          (builder_type, channel),
-                short_name = short_name,
-                category = "sdk",
-                console_view = console,
-            )
+            if channel not in ["beta", "stable"] or \
+               builder_type not in ["linux-riscv64", "win-arm64"]:
+                luci.console_view_entry(
+                    builder = "dart-internal:ci/dart-sdk-%s-%s" %
+                              (builder_type, channel),
+                    short_name = short_name,
+                    category = "sdk",
+                    console_view = console,
+                )
         luci.console_view_entry(
             builder = "dart-internal:ci/debianpackage-linux-%s" % channel,
             short_name = "dp",

From bbf5aef5250494bc742e312440be2b85fdf89996 Mon Sep 17 00:00:00 2001
From: Quinten Yearsley <qyearsley@google.com>
Date: Mon, 14 Nov 2022 15:33:21 +0000
Subject: [PATCH 587/826] dart: Switch to use the new field location_filters

location_regexp is deprecated, to be replaced by location_filters.
This CL updates the config to use the new equivalent field.

Bug: 1380570
Change-Id: Id00b92e6276bc057728187e2570cd757f7d90ae5
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/269560
Auto-Submit: Quinten Yearsley <qyearsley@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
Commit-Queue: Quinten Yearsley <qyearsley@google.com>
---
 generated/commit-queue.cfg   | 1014 ++++++++++++++++++++++++++++------
 generated/cr-buildbucket.cfg |   79 ---
 generated/luci-scheduler.cfg |  349 ------------
 generated/project.cfg        |    4 +-
 lib/dart.star                |   16 +-
 lib/paths.star               |    6 +-
 main.star                    |   26 +-
 vm.star                      |   10 +-
 8 files changed, 877 insertions(+), 627 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index a3062e7a4108..518087195890 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -86,29 +86,109 @@ config_groups {
       }
       builders {
         name: "dart/try/analyzer-analysis-server-linux-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/.+"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/.+"
+        }
       }
       builders {
         name: "dart/try/analyzer-linux-release-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/.+"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/.+"
+        }
       }
       builders {
         name: "dart/try/analyzer-mac-release-try"
@@ -174,67 +254,275 @@ config_groups {
       }
       builders {
         name: "dart/try/dart2js-minified-strong-linux-x64-d8-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
-        location_regexp: ".+/[+]/utils/compiler/.+"
-        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/compiler/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
       }
       builders {
         name: "dart/try/dart2js-nnbd-linux-x64-chrome-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
-        location_regexp: ".+/[+]/utils/compiler/.+"
-        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/compiler/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
       }
       builders {
         name: "dart/try/dart2js-strong-hostasserts-linux-ia32-d8-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
-        location_regexp: ".+/[+]/utils/compiler/.+"
-        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/compiler/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
       }
       builders {
         name: "dart/try/dart2js-strong-linux-x64-chrome-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
-        location_regexp: ".+/[+]/utils/compiler/.+"
-        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/compiler/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
       }
       builders {
         name: "dart/try/dart2js-strong-linux-x64-firefox-try"
@@ -254,33 +542,129 @@ config_groups {
       }
       builders {
         name: "dart/try/dart2js-unit-linux-x64-release-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        location_regexp: ".+/[+]/pkg/(compiler|dart2js_tools|js_ast)/.+"
-        location_regexp: ".+/[+]/utils/compiler/.+"
-        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/compiler/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
       }
       builders {
         name: "dart/try/dart2wasm-linux-x64-d8-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        location_regexp: ".+/[+]/pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
+        }
       }
       builders {
         name: "dart/try/ddc-canary-linux-release-chrome-try"
@@ -288,19 +672,71 @@ config_groups {
       }
       builders {
         name: "dart/try/ddc-linux-release-chrome-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        location_regexp: ".+/[+]/pkg/(build_integration|dev_compiler|meta)/.+"
-        location_regexp: ".+/[+]/utils/dartdevc/.+"
-        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(build_integration|dev_compiler|meta)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/dartdevc/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
       }
       builders {
         name: "dart/try/ddc-mac-release-chrome-try"
@@ -308,19 +744,71 @@ config_groups {
       }
       builders {
         name: "dart/try/ddc-nnbd-linux-release-chrome-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        location_regexp: ".+/[+]/pkg/(build_integration|dev_compiler|meta)/.+"
-        location_regexp: ".+/[+]/utils/dartdevc/.+"
-        location_regexp: ".+/[+]/pkg/(js|modular_test|sourcemap_testing)/.+"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(build_integration|dev_compiler|meta)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/dartdevc/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
       }
       builders {
         name: "dart/try/ddc-win-release-chrome-try"
@@ -348,7 +836,11 @@ config_groups {
       }
       builders {
         name: "dart/try/flutter-frontend-try"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
       }
       builders {
         name: "dart/try/front-end-linux-release-x64-try"
@@ -359,16 +851,56 @@ config_groups {
       }
       builders {
         name: "dart/try/front-end-nnbd-linux-release-x64-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
       }
       builders {
         name: "dart/try/front-end-nnbd-mac-release-x64-try"
@@ -415,18 +947,66 @@ config_groups {
       }
       builders {
         name: "dart/try/vm-canary-linux-debug-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        location_regexp: ".+/[+]/pkg/vm/.+"
-        location_regexp: ".+/[+]/runtime/.+"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "runtime/.+"
+        }
       }
       builders {
         name: "dart/try/vm-ffi-android-debug-arm-try"
@@ -525,18 +1105,66 @@ config_groups {
       }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-debug-x64-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        location_regexp: ".+/[+]/pkg/vm/.+"
-        location_regexp: ".+/[+]/runtime/.+"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "runtime/.+"
+        }
       }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-release-ia32-try"
@@ -552,18 +1180,66 @@ config_groups {
       }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-release-x64-try"
-        location_regexp: ".+/[+]/DEPS"
-        location_regexp: ".+/[+]/build/.+"
-        location_regexp: ".+/[+]/BUILD.gn"
-        location_regexp: ".+/[+]/sdk_args.gni"
-        location_regexp: ".+/[+]/.dart_tool/package_config.json"
-        location_regexp: ".+/[+]/sdk/.+"
-        location_regexp: ".+/[+]/pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        location_regexp: ".+/[+]/tools/bots/test_matrix.json"
-        location_regexp: ".+/[+]/tests/.+"
-        location_regexp: ".+/[+]/pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        location_regexp: ".+/[+]/pkg/vm/.+"
-        location_regexp: ".+/[+]/runtime/.+"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "runtime/.+"
+        }
       }
       builders {
         name: "dart/try/vm-kernel-nnbd-mac-debug-arm64-try"
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 86cf756f2054..72df25f9f407 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -6,17 +6,6 @@
 
 buckets {
   name: "ci"
-  acls {
-    group: "all"
-  }
-  acls {
-    role: SCHEDULER
-    identity: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-  }
-  acls {
-    role: SCHEDULER
-    group: "project-dart-admins"
-  }
   swarming {
     builders {
       name: "flutter-engine-ios"
@@ -57,43 +46,9 @@ buckets {
 }
 buckets {
   name: "ci.roll"
-  acls {
-    group: "all"
-  }
-  acls {
-    role: SCHEDULER
-    identity: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-  }
-  acls {
-    role: SCHEDULER
-    group: "project-dart-admins"
-  }
-  acls {
-    role: SCHEDULER
-    group: "project-dart-roller-owners"
-  }
 }
 buckets {
   name: "ci.sandbox"
-  acls {
-    group: "all"
-  }
-  acls {
-    role: SCHEDULER
-    identity: "user:dart-internal-cbuild@dart-ci-internal.iam.gserviceaccount.com"
-  }
-  acls {
-    role: SCHEDULER
-    identity: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-  }
-  acls {
-    role: SCHEDULER
-    identity: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-  }
-  acls {
-    role: SCHEDULER
-    group: "project-dart-admins"
-  }
   swarming {
     builders {
       name: "analyzer-analysis-server-linux"
@@ -12537,25 +12492,6 @@ buckets {
 }
 buckets {
   name: "try"
-  acls {
-    group: "all"
-  }
-  acls {
-    role: SCHEDULER
-    identity: "user:dart-eng-tool-proxy@system.gserviceaccount.com"
-  }
-  acls {
-    role: SCHEDULER
-    group: "project-dart-admins"
-  }
-  acls {
-    role: SCHEDULER
-    group: "project-dart-tryjob-access"
-  }
-  acls {
-    role: SCHEDULER
-    group: "service-account-cq"
-  }
   swarming {
     builders {
       name: "analyzer-analysis-server-linux-try"
@@ -17781,21 +17717,6 @@ buckets {
 }
 buckets {
   name: "try.shared"
-  acls {
-    group: "all"
-  }
-  acls {
-    role: SCHEDULER
-    group: "project-dart-admins"
-  }
-  acls {
-    role: SCHEDULER
-    group: "project-dart-tryjob-access"
-  }
-  acls {
-    role: SCHEDULER
-    group: "service-account-cq"
-  }
   swarming {
     builders {
       name: "presubmit-try"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 12a59410f446..22db2de783c5 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -8,7 +8,6 @@ job {
   id: "analyzer-analysis-server-linux"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -19,7 +18,6 @@ job {
   id: "analyzer-analysis-server-linux-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -30,7 +28,6 @@ job {
   id: "analyzer-analysis-server-linux-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -41,7 +38,6 @@ job {
   id: "analyzer-analysis-server-linux-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -52,7 +48,6 @@ job {
   id: "analyzer-linux-release"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -63,7 +58,6 @@ job {
   id: "analyzer-linux-release-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -74,7 +68,6 @@ job {
   id: "analyzer-linux-release-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -85,7 +78,6 @@ job {
   id: "analyzer-linux-release-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -96,7 +88,6 @@ job {
   id: "analyzer-mac-release"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -107,7 +98,6 @@ job {
   id: "analyzer-mac-release-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -118,7 +108,6 @@ job {
   id: "analyzer-mac-release-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -129,7 +118,6 @@ job {
   id: "analyzer-mac-release-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -140,7 +128,6 @@ job {
   id: "analyzer-win-release"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -151,7 +138,6 @@ job {
   id: "analyzer-win-release-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -162,7 +148,6 @@ job {
   id: "analyzer-win-release-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -173,7 +158,6 @@ job {
   id: "analyzer-win-release-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -184,7 +168,6 @@ job {
   id: "app-kernel-linux-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -195,7 +178,6 @@ job {
   id: "app-kernel-linux-debug-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -206,7 +188,6 @@ job {
   id: "app-kernel-linux-debug-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -217,7 +198,6 @@ job {
   id: "app-kernel-linux-debug-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -228,7 +208,6 @@ job {
   id: "app-kernel-linux-product-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -239,7 +218,6 @@ job {
   id: "app-kernel-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -250,7 +228,6 @@ job {
   id: "app-kernel-linux-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -261,7 +238,6 @@ job {
   id: "app-kernel-linux-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -272,7 +248,6 @@ job {
   id: "app-kernel-linux-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -283,7 +258,6 @@ job {
   id: "ci-test-data"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -294,7 +268,6 @@ job {
   id: "cross-vm-linux-release-arm64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -305,7 +278,6 @@ job {
   id: "cross-vm-precomp-linux-release-arm64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -316,7 +288,6 @@ job {
   id: "dart2js-canary-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -327,7 +298,6 @@ job {
   id: "dart2js-canary-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -338,7 +308,6 @@ job {
   id: "dart2js-canary-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -349,7 +318,6 @@ job {
   id: "dart2js-canary-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -360,7 +328,6 @@ job {
   id: "dart2js-csp-minified-linux-x64-chrome"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -371,7 +338,6 @@ job {
   id: "dart2js-csp-minified-linux-x64-chrome-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -382,7 +348,6 @@ job {
   id: "dart2js-csp-minified-linux-x64-chrome-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -393,7 +358,6 @@ job {
   id: "dart2js-csp-minified-linux-x64-chrome-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -404,7 +368,6 @@ job {
   id: "dart2js-minified-strong-linux-x64-d8"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -415,7 +378,6 @@ job {
   id: "dart2js-minified-strong-linux-x64-d8-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -426,7 +388,6 @@ job {
   id: "dart2js-minified-strong-linux-x64-d8-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -437,7 +398,6 @@ job {
   id: "dart2js-minified-strong-linux-x64-d8-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -448,7 +408,6 @@ job {
   id: "dart2js-nnbd-linux-x64-chrome"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -459,7 +418,6 @@ job {
   id: "dart2js-nnbd-linux-x64-chrome-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -470,7 +428,6 @@ job {
   id: "dart2js-nnbd-linux-x64-chrome-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -481,7 +438,6 @@ job {
   id: "dart2js-nnbd-linux-x64-chrome-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -492,7 +448,6 @@ job {
   id: "dart2js-strong-hostasserts-linux-ia32-d8"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -503,7 +458,6 @@ job {
   id: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -514,7 +468,6 @@ job {
   id: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -525,7 +478,6 @@ job {
   id: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -536,7 +488,6 @@ job {
   id: "dart2js-strong-linux-x64-chrome"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -547,7 +498,6 @@ job {
   id: "dart2js-strong-linux-x64-chrome-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -558,7 +508,6 @@ job {
   id: "dart2js-strong-linux-x64-chrome-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -569,7 +518,6 @@ job {
   id: "dart2js-strong-linux-x64-chrome-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -580,7 +528,6 @@ job {
   id: "dart2js-strong-linux-x64-firefox"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -591,7 +538,6 @@ job {
   id: "dart2js-strong-linux-x64-firefox-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -602,7 +548,6 @@ job {
   id: "dart2js-strong-linux-x64-firefox-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -613,7 +558,6 @@ job {
   id: "dart2js-strong-linux-x64-firefox-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -624,7 +568,6 @@ job {
   id: "dart2js-strong-mac-x64-chrome"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -635,7 +578,6 @@ job {
   id: "dart2js-strong-mac-x64-chrome-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -646,7 +588,6 @@ job {
   id: "dart2js-strong-mac-x64-chrome-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -657,7 +598,6 @@ job {
   id: "dart2js-strong-mac-x64-chrome-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -668,7 +608,6 @@ job {
   id: "dart2js-strong-mac-x64-safari"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -679,7 +618,6 @@ job {
   id: "dart2js-strong-mac-x64-safari-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -690,7 +628,6 @@ job {
   id: "dart2js-strong-mac-x64-safari-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -701,7 +638,6 @@ job {
   id: "dart2js-strong-mac-x64-safari-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -712,7 +648,6 @@ job {
   id: "dart2js-strong-win-x64-chrome"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -723,7 +658,6 @@ job {
   id: "dart2js-strong-win-x64-chrome-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -734,7 +668,6 @@ job {
   id: "dart2js-strong-win-x64-chrome-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -745,7 +678,6 @@ job {
   id: "dart2js-strong-win-x64-chrome-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -756,7 +688,6 @@ job {
   id: "dart2js-unit-linux-x64-release"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -767,7 +698,6 @@ job {
   id: "dart2js-unit-linux-x64-release-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -778,7 +708,6 @@ job {
   id: "dart2js-unit-linux-x64-release-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -789,7 +718,6 @@ job {
   id: "dart2js-unit-linux-x64-release-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -800,7 +728,6 @@ job {
   id: "dart2wasm-linux-x64-d8"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -811,7 +738,6 @@ job {
   id: "ddc-canary-linux-release-chrome"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -822,7 +748,6 @@ job {
   id: "ddc-linux-release-chrome"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -833,7 +758,6 @@ job {
   id: "ddc-linux-release-chrome-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -844,7 +768,6 @@ job {
   id: "ddc-linux-release-chrome-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -855,7 +778,6 @@ job {
   id: "ddc-linux-release-chrome-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -866,7 +788,6 @@ job {
   id: "ddc-mac-release-chrome"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -877,7 +798,6 @@ job {
   id: "ddc-mac-release-chrome-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -888,7 +808,6 @@ job {
   id: "ddc-mac-release-chrome-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -899,7 +818,6 @@ job {
   id: "ddc-mac-release-chrome-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -910,7 +828,6 @@ job {
   id: "ddc-nnbd-linux-release-chrome"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -921,7 +838,6 @@ job {
   id: "ddc-win-release-chrome"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -932,7 +848,6 @@ job {
   id: "ddc-win-release-chrome-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -943,7 +858,6 @@ job {
   id: "ddc-win-release-chrome-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -954,7 +868,6 @@ job {
   id: "ddc-win-release-chrome-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -965,7 +878,6 @@ job {
   id: "ddk-linux-release-firefox"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -976,7 +888,6 @@ job {
   id: "ddk-linux-release-firefox-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -987,7 +898,6 @@ job {
   id: "ddk-linux-release-firefox-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -998,7 +908,6 @@ job {
   id: "ddk-linux-release-firefox-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1009,7 +918,6 @@ job {
   id: "flutter-analyze"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1020,7 +928,6 @@ job {
   id: "flutter-engine-ios"
   realm: "ci"
   schedule: "triggered"
-  acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci"
@@ -1031,7 +938,6 @@ job {
   id: "flutter-engine-linux"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1042,7 +948,6 @@ job {
   id: "flutter-engine-linux-web_tests"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1053,7 +958,6 @@ job {
   id: "flutter-frontend"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1064,7 +968,6 @@ job {
   id: "front-end-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1075,7 +978,6 @@ job {
   id: "front-end-linux-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1086,7 +988,6 @@ job {
   id: "front-end-linux-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1097,7 +998,6 @@ job {
   id: "front-end-linux-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1108,7 +1008,6 @@ job {
   id: "front-end-mac-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1119,7 +1018,6 @@ job {
   id: "front-end-mac-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1130,7 +1028,6 @@ job {
   id: "front-end-mac-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1141,7 +1038,6 @@ job {
   id: "front-end-mac-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1152,7 +1048,6 @@ job {
   id: "front-end-nnbd-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1163,7 +1058,6 @@ job {
   id: "front-end-nnbd-linux-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1174,7 +1068,6 @@ job {
   id: "front-end-nnbd-linux-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1185,7 +1078,6 @@ job {
   id: "front-end-nnbd-linux-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1196,7 +1088,6 @@ job {
   id: "front-end-nnbd-mac-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1207,7 +1098,6 @@ job {
   id: "front-end-nnbd-win-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1218,7 +1108,6 @@ job {
   id: "front-end-win-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1229,7 +1118,6 @@ job {
   id: "front-end-win-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1240,7 +1128,6 @@ job {
   id: "front-end-win-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1251,7 +1138,6 @@ job {
   id: "front-end-win-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1262,7 +1148,6 @@ job {
   id: "frontend-weekly"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1273,7 +1158,6 @@ job {
   id: "fuzz-linux"
   realm: "ci.sandbox"
   schedule: "0 3,4 * * *"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1284,7 +1168,6 @@ job {
   id: "gclient"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1295,7 +1178,6 @@ job {
   id: "gclient-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1306,7 +1188,6 @@ job {
   id: "gclient-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1317,7 +1198,6 @@ job {
   id: "gclient-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1328,7 +1208,6 @@ job {
   id: "google"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1339,7 +1218,6 @@ job {
   id: "iso-stress-linux"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1350,7 +1228,6 @@ job {
   id: "monorepo-engine-v2"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1361,7 +1238,6 @@ job {
   id: "pkg-linux-debug"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1372,7 +1248,6 @@ job {
   id: "pkg-linux-release"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1383,7 +1258,6 @@ job {
   id: "pkg-linux-release-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1394,7 +1268,6 @@ job {
   id: "pkg-linux-release-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1405,7 +1278,6 @@ job {
   id: "pkg-linux-release-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1416,7 +1288,6 @@ job {
   id: "pkg-mac-release"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1427,7 +1298,6 @@ job {
   id: "pkg-mac-release-arm64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1438,7 +1308,6 @@ job {
   id: "pkg-mac-release-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1449,7 +1318,6 @@ job {
   id: "pkg-mac-release-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1460,7 +1328,6 @@ job {
   id: "pkg-mac-release-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1471,7 +1338,6 @@ job {
   id: "pkg-win-release"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1482,7 +1348,6 @@ job {
   id: "pkg-win-release-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1493,7 +1358,6 @@ job {
   id: "pkg-win-release-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1504,7 +1368,6 @@ job {
   id: "pkg-win-release-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1515,7 +1378,6 @@ job {
   id: "vm-canary-linux-debug"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1526,7 +1388,6 @@ job {
   id: "vm-canary-linux-debug-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1537,7 +1398,6 @@ job {
   id: "vm-canary-linux-debug-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1548,7 +1408,6 @@ job {
   id: "vm-canary-linux-debug-experimental"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1559,7 +1418,6 @@ job {
   id: "vm-canary-linux-debug-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1570,7 +1428,6 @@ job {
   id: "vm-ffi-android-debug-arm"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1581,7 +1438,6 @@ job {
   id: "vm-ffi-android-debug-arm-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1592,7 +1448,6 @@ job {
   id: "vm-ffi-android-debug-arm-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1603,7 +1458,6 @@ job {
   id: "vm-ffi-android-debug-arm-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1614,7 +1468,6 @@ job {
   id: "vm-ffi-android-debug-arm64c"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1625,7 +1478,6 @@ job {
   id: "vm-ffi-android-debug-arm64c-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1636,7 +1488,6 @@ job {
   id: "vm-ffi-android-debug-arm64c-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1647,7 +1498,6 @@ job {
   id: "vm-ffi-android-debug-arm64c-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1658,7 +1508,6 @@ job {
   id: "vm-ffi-android-product-arm"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1669,7 +1518,6 @@ job {
   id: "vm-ffi-android-product-arm-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1680,7 +1528,6 @@ job {
   id: "vm-ffi-android-product-arm-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1691,7 +1538,6 @@ job {
   id: "vm-ffi-android-product-arm-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1702,7 +1548,6 @@ job {
   id: "vm-ffi-android-product-arm64c"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1713,7 +1558,6 @@ job {
   id: "vm-ffi-android-product-arm64c-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1724,7 +1568,6 @@ job {
   id: "vm-ffi-android-product-arm64c-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1735,7 +1578,6 @@ job {
   id: "vm-ffi-android-product-arm64c-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1746,7 +1588,6 @@ job {
   id: "vm-ffi-android-release-arm"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1757,7 +1598,6 @@ job {
   id: "vm-ffi-android-release-arm-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1768,7 +1608,6 @@ job {
   id: "vm-ffi-android-release-arm-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1779,7 +1618,6 @@ job {
   id: "vm-ffi-android-release-arm-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1790,7 +1628,6 @@ job {
   id: "vm-ffi-android-release-arm64c"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1801,7 +1638,6 @@ job {
   id: "vm-ffi-android-release-arm64c-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1812,7 +1648,6 @@ job {
   id: "vm-ffi-android-release-arm64c-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1823,7 +1658,6 @@ job {
   id: "vm-ffi-android-release-arm64c-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1834,7 +1668,6 @@ job {
   id: "vm-fuchsia-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1845,7 +1678,6 @@ job {
   id: "vm-kernel-asan-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1856,7 +1688,6 @@ job {
   id: "vm-kernel-checked-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1867,7 +1698,6 @@ job {
   id: "vm-kernel-checked-linux-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1878,7 +1708,6 @@ job {
   id: "vm-kernel-checked-linux-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1889,7 +1718,6 @@ job {
   id: "vm-kernel-checked-linux-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1900,7 +1728,6 @@ job {
   id: "vm-kernel-gcc-linux"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1911,7 +1738,6 @@ job {
   id: "vm-kernel-linux-debug-ia32"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1922,7 +1748,6 @@ job {
   id: "vm-kernel-linux-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1933,7 +1758,6 @@ job {
   id: "vm-kernel-linux-debug-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1944,7 +1768,6 @@ job {
   id: "vm-kernel-linux-debug-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1955,7 +1778,6 @@ job {
   id: "vm-kernel-linux-debug-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1966,7 +1788,6 @@ job {
   id: "vm-kernel-linux-debug-x64c"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1977,7 +1798,6 @@ job {
   id: "vm-kernel-linux-release-ia32"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1988,7 +1808,6 @@ job {
   id: "vm-kernel-linux-release-simarm"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -1999,7 +1818,6 @@ job {
   id: "vm-kernel-linux-release-simarm-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2010,7 +1828,6 @@ job {
   id: "vm-kernel-linux-release-simarm-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2021,7 +1838,6 @@ job {
   id: "vm-kernel-linux-release-simarm-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2032,7 +1848,6 @@ job {
   id: "vm-kernel-linux-release-simarm64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2043,7 +1858,6 @@ job {
   id: "vm-kernel-linux-release-simarm64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2054,7 +1868,6 @@ job {
   id: "vm-kernel-linux-release-simarm64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2065,7 +1878,6 @@ job {
   id: "vm-kernel-linux-release-simarm64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2076,7 +1888,6 @@ job {
   id: "vm-kernel-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2087,7 +1898,6 @@ job {
   id: "vm-kernel-linux-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2098,7 +1908,6 @@ job {
   id: "vm-kernel-linux-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2109,7 +1918,6 @@ job {
   id: "vm-kernel-linux-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2120,7 +1928,6 @@ job {
   id: "vm-kernel-mac-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2131,7 +1938,6 @@ job {
   id: "vm-kernel-mac-debug-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2142,7 +1948,6 @@ job {
   id: "vm-kernel-mac-debug-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2153,7 +1958,6 @@ job {
   id: "vm-kernel-mac-debug-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2164,7 +1968,6 @@ job {
   id: "vm-kernel-mac-release-arm64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2175,7 +1978,6 @@ job {
   id: "vm-kernel-mac-release-arm64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2186,7 +1988,6 @@ job {
   id: "vm-kernel-mac-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2197,7 +1998,6 @@ job {
   id: "vm-kernel-mac-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2208,7 +2008,6 @@ job {
   id: "vm-kernel-mac-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2219,7 +2018,6 @@ job {
   id: "vm-kernel-mac-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2230,7 +2028,6 @@ job {
   id: "vm-kernel-msan-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2241,7 +2038,6 @@ job {
   id: "vm-kernel-msvc-windows"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2252,7 +2048,6 @@ job {
   id: "vm-kernel-nnbd-linux-debug-ia32"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2263,7 +2058,6 @@ job {
   id: "vm-kernel-nnbd-linux-debug-simriscv64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2274,7 +2068,6 @@ job {
   id: "vm-kernel-nnbd-linux-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2285,7 +2078,6 @@ job {
   id: "vm-kernel-nnbd-linux-debug-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2296,7 +2088,6 @@ job {
   id: "vm-kernel-nnbd-linux-debug-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2307,7 +2098,6 @@ job {
   id: "vm-kernel-nnbd-linux-debug-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2318,7 +2108,6 @@ job {
   id: "vm-kernel-nnbd-linux-release-ia32"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2329,7 +2118,6 @@ job {
   id: "vm-kernel-nnbd-linux-release-simarm"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2340,7 +2128,6 @@ job {
   id: "vm-kernel-nnbd-linux-release-simarm64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2351,7 +2138,6 @@ job {
   id: "vm-kernel-nnbd-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2362,7 +2148,6 @@ job {
   id: "vm-kernel-nnbd-linux-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2373,7 +2158,6 @@ job {
   id: "vm-kernel-nnbd-linux-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2384,7 +2168,6 @@ job {
   id: "vm-kernel-nnbd-linux-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2395,7 +2178,6 @@ job {
   id: "vm-kernel-nnbd-mac-debug-arm64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2406,7 +2188,6 @@ job {
   id: "vm-kernel-nnbd-mac-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2417,7 +2198,6 @@ job {
   id: "vm-kernel-nnbd-mac-release-arm64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2428,7 +2208,6 @@ job {
   id: "vm-kernel-nnbd-mac-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2439,7 +2218,6 @@ job {
   id: "vm-kernel-nnbd-win-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2450,7 +2228,6 @@ job {
   id: "vm-kernel-nnbd-win-release-ia32"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2461,7 +2238,6 @@ job {
   id: "vm-kernel-nnbd-win-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2472,7 +2248,6 @@ job {
   id: "vm-kernel-optcounter-threshold-linux-release-ia32"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2483,7 +2258,6 @@ job {
   id: "vm-kernel-optcounter-threshold-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2494,7 +2268,6 @@ job {
   id: "vm-kernel-precomp-android-release-arm64c"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2505,7 +2278,6 @@ job {
   id: "vm-kernel-precomp-android-release-arm64c-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2516,7 +2288,6 @@ job {
   id: "vm-kernel-precomp-android-release-arm64c-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2527,7 +2298,6 @@ job {
   id: "vm-kernel-precomp-android-release-arm64c-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2538,7 +2308,6 @@ job {
   id: "vm-kernel-precomp-android-release-arm_x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2549,7 +2318,6 @@ job {
   id: "vm-kernel-precomp-android-release-arm_x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2560,7 +2328,6 @@ job {
   id: "vm-kernel-precomp-android-release-arm_x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2571,7 +2338,6 @@ job {
   id: "vm-kernel-precomp-android-release-arm_x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2582,7 +2348,6 @@ job {
   id: "vm-kernel-precomp-asan-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2593,7 +2358,6 @@ job {
   id: "vm-kernel-precomp-dwarf-linux-product-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2604,7 +2368,6 @@ job {
   id: "vm-kernel-precomp-linux-debug-simarm_x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2615,7 +2378,6 @@ job {
   id: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2626,7 +2388,6 @@ job {
   id: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2637,7 +2398,6 @@ job {
   id: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2648,7 +2408,6 @@ job {
   id: "vm-kernel-precomp-linux-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2659,7 +2418,6 @@ job {
   id: "vm-kernel-precomp-linux-debug-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2670,7 +2428,6 @@ job {
   id: "vm-kernel-precomp-linux-debug-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2681,7 +2438,6 @@ job {
   id: "vm-kernel-precomp-linux-debug-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2692,7 +2448,6 @@ job {
   id: "vm-kernel-precomp-linux-debug-x64c"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2703,7 +2458,6 @@ job {
   id: "vm-kernel-precomp-linux-product-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2714,7 +2468,6 @@ job {
   id: "vm-kernel-precomp-linux-release-simarm"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2725,7 +2478,6 @@ job {
   id: "vm-kernel-precomp-linux-release-simarm-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2736,7 +2488,6 @@ job {
   id: "vm-kernel-precomp-linux-release-simarm-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2747,7 +2498,6 @@ job {
   id: "vm-kernel-precomp-linux-release-simarm-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2758,7 +2508,6 @@ job {
   id: "vm-kernel-precomp-linux-release-simarm64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2769,7 +2518,6 @@ job {
   id: "vm-kernel-precomp-linux-release-simarm64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2780,7 +2528,6 @@ job {
   id: "vm-kernel-precomp-linux-release-simarm64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2791,7 +2538,6 @@ job {
   id: "vm-kernel-precomp-linux-release-simarm64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2802,7 +2548,6 @@ job {
   id: "vm-kernel-precomp-linux-release-simarm_x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2813,7 +2558,6 @@ job {
   id: "vm-kernel-precomp-linux-release-simarm_x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2824,7 +2568,6 @@ job {
   id: "vm-kernel-precomp-linux-release-simarm_x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2835,7 +2578,6 @@ job {
   id: "vm-kernel-precomp-linux-release-simarm_x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2846,7 +2588,6 @@ job {
   id: "vm-kernel-precomp-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2857,7 +2598,6 @@ job {
   id: "vm-kernel-precomp-linux-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2868,7 +2608,6 @@ job {
   id: "vm-kernel-precomp-linux-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2879,7 +2618,6 @@ job {
   id: "vm-kernel-precomp-linux-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2890,7 +2628,6 @@ job {
   id: "vm-kernel-precomp-mac-product-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2901,7 +2638,6 @@ job {
   id: "vm-kernel-precomp-mac-release-simarm64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2912,7 +2648,6 @@ job {
   id: "vm-kernel-precomp-mac-release-simarm64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2923,7 +2658,6 @@ job {
   id: "vm-kernel-precomp-mac-release-simarm64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2934,7 +2668,6 @@ job {
   id: "vm-kernel-precomp-mac-release-simarm64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2945,7 +2678,6 @@ job {
   id: "vm-kernel-precomp-msan-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2956,7 +2688,6 @@ job {
   id: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2967,7 +2698,6 @@ job {
   id: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2978,7 +2708,6 @@ job {
   id: "vm-kernel-precomp-nnbd-linux-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -2989,7 +2718,6 @@ job {
   id: "vm-kernel-precomp-nnbd-linux-release-simarm64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3000,7 +2728,6 @@ job {
   id: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3011,7 +2738,6 @@ job {
   id: "vm-kernel-precomp-nnbd-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3022,7 +2748,6 @@ job {
   id: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3033,7 +2758,6 @@ job {
   id: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3044,7 +2768,6 @@ job {
   id: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3055,7 +2778,6 @@ job {
   id: "vm-kernel-precomp-nnbd-mac-release-arm64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3066,7 +2788,6 @@ job {
   id: "vm-kernel-precomp-nnbd-mac-release-simarm64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3077,7 +2798,6 @@ job {
   id: "vm-kernel-precomp-nnbd-win-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3088,7 +2808,6 @@ job {
   id: "vm-kernel-precomp-obfuscate-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3099,7 +2818,6 @@ job {
   id: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3110,7 +2828,6 @@ job {
   id: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3121,7 +2838,6 @@ job {
   id: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3132,7 +2848,6 @@ job {
   id: "vm-kernel-precomp-tsan-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3143,7 +2858,6 @@ job {
   id: "vm-kernel-precomp-ubsan-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3154,7 +2868,6 @@ job {
   id: "vm-kernel-precomp-win-debug-x64c"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3165,7 +2878,6 @@ job {
   id: "vm-kernel-precomp-win-product-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3176,7 +2888,6 @@ job {
   id: "vm-kernel-precomp-win-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3187,7 +2898,6 @@ job {
   id: "vm-kernel-precomp-win-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3198,7 +2908,6 @@ job {
   id: "vm-kernel-precomp-win-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3209,7 +2918,6 @@ job {
   id: "vm-kernel-precomp-win-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3220,7 +2928,6 @@ job {
   id: "vm-kernel-reload-linux-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3231,7 +2938,6 @@ job {
   id: "vm-kernel-reload-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3242,7 +2948,6 @@ job {
   id: "vm-kernel-reload-rollback-linux-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3253,7 +2958,6 @@ job {
   id: "vm-kernel-reload-rollback-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3264,7 +2968,6 @@ job {
   id: "vm-kernel-tsan-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3275,7 +2978,6 @@ job {
   id: "vm-kernel-ubsan-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3286,7 +2988,6 @@ job {
   id: "vm-kernel-win-debug-ia32"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3297,7 +2998,6 @@ job {
   id: "vm-kernel-win-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3308,7 +3008,6 @@ job {
   id: "vm-kernel-win-debug-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3319,7 +3018,6 @@ job {
   id: "vm-kernel-win-debug-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3330,7 +3028,6 @@ job {
   id: "vm-kernel-win-debug-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3341,7 +3038,6 @@ job {
   id: "vm-kernel-win-debug-x64c"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3352,7 +3048,6 @@ job {
   id: "vm-kernel-win-release-ia32"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3363,7 +3058,6 @@ job {
   id: "vm-kernel-win-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3374,7 +3068,6 @@ job {
   id: "vm-kernel-win-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3385,7 +3078,6 @@ job {
   id: "vm-kernel-win-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3396,7 +3088,6 @@ job {
   id: "vm-kernel-win-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3407,7 +3098,6 @@ job {
   id: "vm-precomp-ffi-qemu-linux-release-arm"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3418,7 +3108,6 @@ job {
   id: "vm-precomp-ffi-qemu-linux-release-arm-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3429,7 +3118,6 @@ job {
   id: "vm-precomp-ffi-qemu-linux-release-arm-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3440,7 +3128,6 @@ job {
   id: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3451,7 +3138,6 @@ job {
   id: "vm-precomp-ffi-qemu-linux-release-arm-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3462,7 +3148,6 @@ job {
   id: "vm-precomp-ffi-qemu-linux-release-riscv64"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3473,7 +3158,6 @@ job {
   id: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3484,7 +3168,6 @@ job {
   id: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3495,7 +3178,6 @@ job {
   id: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
-  acl_sets: "ci.sandbox"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
@@ -3505,7 +3187,6 @@ job {
 trigger {
   id: "dart-ci-test-data-trigger"
   realm: "ci"
-  acl_sets: "ci"
   triggers: "ci-test-data"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
@@ -3516,7 +3197,6 @@ trigger {
 trigger {
   id: "dart-gitiles-trigger-beta"
   realm: "ci"
-  acl_sets: "ci"
   triggers: "analyzer-analysis-server-linux-beta"
   triggers: "analyzer-linux-release-beta"
   triggers: "analyzer-mac-release-beta"
@@ -3586,7 +3266,6 @@ trigger {
 trigger {
   id: "dart-gitiles-trigger-dev"
   realm: "ci"
-  acl_sets: "ci"
   triggers: "analyzer-analysis-server-linux-dev"
   triggers: "analyzer-linux-release-dev"
   triggers: "analyzer-mac-release-dev"
@@ -3657,7 +3336,6 @@ trigger {
 trigger {
   id: "dart-gitiles-trigger-flutter"
   realm: "ci"
-  acl_sets: "ci"
   triggers: "flutter-engine-linux"
   triggers: "flutter-engine-linux-web_tests"
   gitiles {
@@ -3669,7 +3347,6 @@ trigger {
   id: "dart-gitiles-trigger-flutter-daily"
   realm: "ci"
   schedule: "0 8 * * *"
-  acl_sets: "ci"
   triggers: "flutter-engine-ios"
   gitiles {
     repo: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
@@ -3679,7 +3356,6 @@ trigger {
 trigger {
   id: "dart-gitiles-trigger-main"
   realm: "ci"
-  acl_sets: "ci"
   triggers: "analyzer-analysis-server-linux"
   triggers: "analyzer-linux-release"
   triggers: "analyzer-mac-release"
@@ -3727,7 +3403,6 @@ trigger {
 trigger {
   id: "dart-gitiles-trigger-monorepo"
   realm: "ci"
-  acl_sets: "ci"
   triggers: "monorepo-engine-v2"
   gitiles {
     repo: "https://dart.googlesource.com/monorepo/"
@@ -3737,7 +3412,6 @@ trigger {
 trigger {
   id: "dart-gitiles-trigger-stable"
   realm: "ci"
-  acl_sets: "ci"
   triggers: "analyzer-analysis-server-linux-stable"
   triggers: "analyzer-linux-release-stable"
   triggers: "analyzer-mac-release-stable"
@@ -3808,7 +3482,6 @@ trigger {
   id: "dart-nightly-trigger"
   realm: "ci"
   schedule: "0 5 * * *"
-  acl_sets: "ci"
   triggers: "app-kernel-linux-product-x64"
   triggers: "cross-vm-precomp-linux-release-arm64"
   triggers: "dart2wasm-linux-x64-d8"
@@ -3870,7 +3543,6 @@ trigger {
 trigger {
   id: "dart-vm-gitiles-trigger-main"
   realm: "ci"
-  acl_sets: "ci"
   triggers: "app-kernel-linux-debug-x64"
   triggers: "app-kernel-linux-release-x64"
   triggers: "cross-vm-linux-release-arm64"
@@ -3926,30 +3598,9 @@ trigger {
   id: "dart-weekly-trigger"
   realm: "ci"
   schedule: "0 0 * * SUN"
-  acl_sets: "ci"
   triggers: "frontend-weekly"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/main"
   }
 }
-acl_sets {
-  name: "ci"
-  acls {
-    role: OWNER
-    granted_to: "group:project-dart-admins"
-  }
-  acls {
-    granted_to: "group:all"
-  }
-}
-acl_sets {
-  name: "ci.sandbox"
-  acls {
-    role: OWNER
-    granted_to: "group:project-dart-admins"
-  }
-  acls {
-    granted_to: "group:all"
-  }
-}
diff --git a/generated/project.cfg b/generated/project.cfg
index 2b612d61cfe1..3790482f563e 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,9 +7,11 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.33.6"
+  version: "1.33.7"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
+  experiments: "crbug.com/1171945"
   experiments: "crbug.com/1182002"
+  experiments: "crbug.com/1347252"
 }
diff --git a/lib/dart.star b/lib/dart.star
index bfe6bbe9be13..bc6d29d7ad6c 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -85,7 +85,7 @@ def _try_builder(
         experiment_percentage = None,
         experiments = None,
         goma = None,
-        location_regexp = None,
+        location_filters = None,
         properties = None,
         on_cq = False):
     """Creates a Dart tryjob.
@@ -99,11 +99,11 @@ def _try_builder(
         experiment_percentage: What experiment percentage to use.
         experiments: Experiments to run on this builder, with percentages.
         goma: Whether to use goma or not.
-        location_regexp: Locations that trigger this tryjob.
+        location_filters: Locations that trigger this tryjob.
         properties: Extra properties to set for builds.
         on_cq: Whether the build is added to the default set of CQ tryjobs.
     """
-    if on_cq and location_regexp:
+    if on_cq and location_filters:
         fail("Can't be on the default CQ and conditionally on the CQ")
     dimensions = defaults.dimensions(dimensions)
     dimensions["pool"] = "luci.dart.try"
@@ -124,12 +124,12 @@ def _try_builder(
         service_account = accounts.try_builder,
     )
     includable_only = (not on_cq and not experiment_percentage and
-                       not location_regexp)
+                       not location_filters)
     luci.cq_tryjob_verifier(
         builder = builder,
         cq_group = "sdk",
         experiment_percentage = experiment_percentage,
-        location_regexp = location_regexp,
+        location_filters = location_filters,
         includable_only = includable_only,
     )
     luci.list_view_entry(list_view = "cq", builder = builder)
@@ -159,7 +159,7 @@ def _builder(
         triggering_policy = None,
         on_cq = False,
         experiment_percentage = None,
-        location_regexp = None):
+        location_filters = None):
     """
     Creates a Dart builder on all the specified channels.
 
@@ -188,7 +188,7 @@ def _builder(
         triggering_policy: The triggering policy used by this builder.
         on_cq: Whether the build is added to the default set of CQ tryjobs.
         experiment_percentage: What experiment percentage to use.
-        location_regexp: Locations that trigger this builder.
+        location_filters: Locations that trigger this builder.
     """
     dimensions = defaults.dimensions(dimensions)
     properties = defaults.properties(properties)
@@ -215,7 +215,7 @@ def _builder(
                 experiment_percentage = experiment_percentage,
                 experiments = experiments,
                 goma = goma,
-                location_regexp = location_regexp,
+                location_filters = location_filters,
             )
         else:
             builder_properties = _with_goma(
diff --git a/lib/paths.star b/lib/paths.star
index 4eac2d6efed8..d5c2c1d592e2 100644
--- a/lib/paths.star
+++ b/lib/paths.star
@@ -65,8 +65,8 @@ _DART2WASM_PATHS = _CFE_PATHS + [
     "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+",
 ]
 
-def _to_location_regexp(paths):
-    return [".+/[+]/%s" % path for path in paths]
+def _to_location_filters(paths):
+    return [cq.location_filter(path_regexp = path) for path in paths]
 
 paths = struct(
     analyzer = _ANALYZER_PATHS,
@@ -81,5 +81,5 @@ paths = struct(
     vm = _VM_PATHS,
 
     # Utility functions
-    to_location_regexp = _to_location_regexp,
+    to_location_filters = _to_location_filters,
 )
diff --git a/main.star b/main.star
index 715bd8715bc4..ec42c10c2fc4 100755
--- a/main.star
+++ b/main.star
@@ -31,7 +31,7 @@ load(
 load("//lib/paths.star", "paths")
 load("//lib/priority.star", "priority")
 
-lucicfg.check_version("1.30.9")
+lucicfg.check_version("1.33.7")
 
 # Use LUCI Scheduler BBv2 names and add Scheduler realms configs.
 lucicfg.enable_experiment("crbug.com/1182002")
@@ -254,7 +254,7 @@ dart.ci_sandbox_builder(
 dart.ci_sandbox_builder(
     "front-end-nnbd-linux-release-x64",
     category = "cfe|nnbd|l",
-    location_regexp = paths.to_location_regexp(paths.cfe),
+    location_filters = paths.to_location_filters(paths.cfe),
 )
 cron.nightly_builder(
     "front-end-nnbd-mac-release-x64",
@@ -274,7 +274,7 @@ dart.ci_sandbox_builder(
     category = "cfe|fl",
     channels = ["try"],
     notifies = "frontend-team",
-    location_regexp = paths.to_location_regexp(paths.cfe_only),
+    location_filters = paths.to_location_filters(paths.cfe_only),
 )
 cron.weekly_builder(
     "frontend-weekly",
@@ -287,7 +287,7 @@ cron.nightly_builder(
     category = "d2w|d",
     channels = ["try"],
     properties = emscripten,
-    location_regexp = paths.to_location_regexp(paths.dart2wasm),
+    location_filters = paths.to_location_filters(paths.dart2wasm),
 )
 
 # flutter
@@ -382,25 +382,25 @@ dart.ci_sandbox_builder(
 dart.ci_sandbox_builder(
     "dart2js-strong-hostasserts-linux-ia32-d8",
     category = "dart2js|d8|ha",
-    location_regexp = paths.to_location_regexp(paths.dart2js),
+    location_filters = paths.to_location_filters(paths.dart2js),
     properties = no_android,
 )
 dart.ci_sandbox_builder(
     "dart2js-minified-strong-linux-x64-d8",
     category = "dart2js|d8|mi",
-    location_regexp = paths.to_location_regexp(paths.dart2js),
+    location_filters = paths.to_location_filters(paths.dart2js),
     properties = no_android,
 )
 dart.ci_sandbox_builder(
     "dart2js-unit-linux-x64-release",
     category = "dart2js|d8|u",
-    location_regexp = paths.to_location_regexp(paths.dart2js),
+    location_filters = paths.to_location_filters(paths.dart2js),
     properties = no_android,
 )
 dart.ci_sandbox_builder(
     "dart2js-strong-linux-x64-chrome",
     category = "dart2js|chrome|l",
-    location_regexp = paths.to_location_regexp(paths.dart2js),
+    location_filters = paths.to_location_filters(paths.dart2js),
     properties = [chrome, no_android],
 )
 dart.ci_sandbox_builder(
@@ -423,7 +423,7 @@ dart.ci_sandbox_builder(
 dart.ci_sandbox_builder(
     "dart2js-nnbd-linux-x64-chrome",
     category = "dart2js|chrome|nn",
-    location_regexp = paths.to_location_regexp(paths.dart2js),
+    location_filters = paths.to_location_filters(paths.dart2js),
     properties = [chrome, no_android],
 )
 dart.ci_sandbox_builder(
@@ -455,13 +455,13 @@ dart.ci_sandbox_builder(
     "analyzer-analysis-server-linux",
     category = "analyzer|as",
     channels = dart.channels,
-    location_regexp = paths.to_location_regexp(paths.analyzer),
+    location_filters = paths.to_location_filters(paths.analyzer),
 )
 dart.ci_sandbox_builder(
     "analyzer-linux-release",
     category = "analyzer|l",
     channels = dart.channels,
-    location_regexp = paths.to_location_regexp(paths.analyzer),
+    location_filters = paths.to_location_filters(paths.analyzer),
 )
 dart.ci_sandbox_builder(
     "analyzer-mac-release",
@@ -560,14 +560,14 @@ cron.nightly_builder(
 dart.ci_sandbox_builder(
     "ddc-linux-release-chrome",
     category = "ddc|l",
-    location_regexp = paths.to_location_regexp(paths.ddc),
+    location_filters = paths.to_location_filters(paths.ddc),
     properties = chrome,
 )
 dart.ci_sandbox_builder(
     "ddc-nnbd-linux-release-chrome",
     category = "ddc|nn",
     channels = ["try"],
-    location_regexp = paths.to_location_regexp(paths.ddc),
+    location_filters = paths.to_location_filters(paths.ddc),
     properties = chrome,
 )
 dart.ci_sandbox_builder(
diff --git a/vm.star b/vm.star
index fb027b98fefb..36f6aa1bcdfa 100644
--- a/vm.star
+++ b/vm.star
@@ -33,26 +33,26 @@ def _builder(name, category = None, **kwargs):
     dart.ci_sandbox_builder(name, category = category, **kwargs)
     _postponed_alt_console_entry(name, category)
 
-def _extra_builder(name, on_cq = False, location_regexp = None, **kwargs):
+def _extra_builder(name, on_cq = False, location_filters = None, **kwargs):
     """
     Creates a Dart builder that is only triggered by VM commits.
 
     Args:
         name: The builder name.
         on_cq: Whether the build is added to the default set of CQ tryjobs.
-        location_regexp: Locations that trigger this builder.
+        location_filters: Locations that trigger this builder.
         **kwargs: Extra arguments are passed on to dart_ci_sandbox_builder.
     """
     triggered_by = ["dart-vm-gitiles-trigger-%s"]
-    if on_cq and not location_regexp:
+    if on_cq and not location_filters:
         # Don't add extra builders to the default CQ, trigger only on VM paths.
-        location_regexp = paths.to_location_regexp(paths.vm)
+        location_filters = paths.to_location_filters(paths.vm)
         on_cq = False
     _builder(
         name,
         triggered_by = triggered_by,
         on_cq = on_cq,
-        location_regexp = location_regexp,
+        location_filters = location_filters,
         **kwargs
     )
 

From 25091e5af91d70990f9c3cf30db544364ae9c666 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Wed, 16 Nov 2022 14:23:07 +0000
Subject: [PATCH 588/826] [infra] Don't run nightly try builders on release
 channels.

The dart2wasm-linux-x64-d8 builder is nightly (and thus only runs on the
main branch) but has a try builder that runs on all the release
channels, which fails because there are no baseline results on those
branches.

This change fixes that problem by adding a new commit queue group for
the nightly try builders, so they only trigger on the main branch. If
the try builder is important enough block releases, the nightly builder
should be promoted to a regular builder that runs throughout the day and
on all release branches.

Fixes: b/258216745
Change-Id: I8d5984ef9363feae7a55255231619aef7d97906e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/269941
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 cq.star                    |  15 ++
 generated/commit-queue.cfg | 421 +++++++++++++++++++------------------
 lib/cron.star              |   6 +-
 lib/dart.star              |   7 +-
 4 files changed, 247 insertions(+), 202 deletions(-)

diff --git a/cq.star b/cq.star
index 67a835fe7a57..d452100ebd2e 100644
--- a/cq.star
+++ b/cq.star
@@ -35,6 +35,21 @@ luci.cq_group(
     verifiers = None,
 )
 
+# Commit queue group for try builders only on the main branch. E.g. nightly
+# builders only run on the main branch and their try builders can't compare with
+# non-existent results on the release branches.
+luci.cq_group(
+    name = "sdk-main",
+    watch = cq.refset(
+        DART_GERRIT + "sdk",
+        refs = ["refs/heads/main"],
+    ),
+    allow_submit_with_open_deps = True,
+    tree_status_host = "dart-status.appspot.com",
+    retry_config = cq.RETRY_NONE,
+    verifiers = None,
+)
+
 luci.cq_group(
     name = "sdk-infra-config",
     watch = cq.refset(DART_GERRIT + "sdk", refs = ["refs/heads/infra/config"]),
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 518087195890..623b61b15255 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -202,10 +202,6 @@ config_groups {
         name: "dart/try/app-kernel-linux-debug-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/app-kernel-linux-product-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/app-kernel-linux-release-x64-try"
         includable_only: true
@@ -608,68 +604,6 @@ config_groups {
           path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
-      builders {
-        name: "dart/try/dart2wasm-linux-x64-d8-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
-        }
-      }
-      builders {
-        name: "dart/try/ddc-canary-linux-release-chrome-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/ddc-linux-release-chrome-try"
         location_filters {
@@ -902,14 +836,6 @@ config_groups {
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
       }
-      builders {
-        name: "dart/try/front-end-nnbd-mac-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/front-end-nnbd-win-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/front-end-win-release-x64-try"
         includable_only: true
@@ -1036,34 +962,14 @@ config_groups {
         name: "dart/try/vm-fuchsia-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-asan-linux-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-checked-linux-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-gcc-linux-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-linux-debug-ia32-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-linux-debug-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-linux-debug-x64c-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-linux-release-ia32-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-linux-release-simarm-try"
         includable_only: true
@@ -1087,22 +993,6 @@ config_groups {
         name: "dart/try/vm-kernel-mac-release-x64-try"
         experiment_percentage: 5
       }
-      builders {
-        name: "dart/try/vm-kernel-msan-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-msvc-windows-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-linux-debug-ia32-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-linux-debug-simriscv64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-debug-x64-try"
         location_filters {
@@ -1166,18 +1056,6 @@ config_groups {
           path_regexp: "runtime/.+"
         }
       }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-linux-release-ia32-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-linux-release-simarm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-linux-release-simarm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-release-x64-try"
         location_filters {
@@ -1242,239 +1120,384 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-mac-debug-arm64-try"
+        name: "dart/try/vm-kernel-nnbd-mac-release-arm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-mac-debug-x64-try"
+        name: "dart/try/vm-kernel-optcounter-threshold-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-mac-release-arm64-try"
+        name: "dart/try/vm-kernel-precomp-android-release-arm64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-mac-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-android-release-arm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-win-debug-x64-try"
+        name: "dart/try/vm-kernel-precomp-linux-debug-simarm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-win-release-ia32-try"
+        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-win-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-optcounter-threshold-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-android-release-arm64c-try"
+        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-android-release-arm_x64-try"
+        name: "dart/try/vm-kernel-precomp-mac-release-simarm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-asan-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-dwarf-linux-product-x64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-arm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-simarm_x64-try"
+        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
+        name: "dart/try/vm-kernel-precomp-win-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-x64c-try"
+        name: "dart/try/vm-kernel-win-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-product-x64-try"
+        name: "dart/try/vm-kernel-win-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
+        name: "dart/try/vm-precomp-ffi-qemu-linux-release-arm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm64-try"
+        name: "dart/try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
         includable_only: true
       }
+      retry_config {}
+    }
+  }
+}
+config_groups {
+  name: "sdk-infra-config"
+  gerrit {
+    url: "https://dart-review.googlesource.com"
+    projects {
+      name: "sdk"
+      ref_regexp: "refs/heads/infra/config"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "project-dart-committers"
+      dry_run_access_list: "project-dart-tryjob-access"
+      allow_submit_with_open_deps: true
+    }
+    tree_status {
+      url: "https://dart-status.appspot.com"
+    }
+    tryjob {
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm_x64-try"
+        name: "dart/try.shared/presubmit-try"
+        disable_reuse: true
+      }
+      retry_config {}
+    }
+  }
+}
+config_groups {
+  name: "sdk-main"
+  gerrit {
+    url: "https://dart-review.googlesource.com"
+    projects {
+      name: "sdk"
+      ref_regexp: "refs/heads/main"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "project-dart-committers"
+      dry_run_access_list: "project-dart-tryjob-access"
+      allow_submit_with_open_deps: true
+    }
+    tree_status {
+      url: "https://dart-status.appspot.com"
+    }
+    tryjob {
+      builders {
+        name: "dart/try/app-kernel-linux-product-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
+        name: "dart/try/dart2wasm-linux-x64-d8-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/ddc-canary-linux-release-chrome-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-mac-product-x64-try"
+        name: "dart/try/front-end-nnbd-mac-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-mac-release-simarm64-try"
+        name: "dart/try/front-end-nnbd-win-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-msan-linux-release-x64-try"
+        name: "dart/try/vm-kernel-asan-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
+        name: "dart/try/vm-kernel-gcc-linux-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simriscv64-try"
+        name: "dart/try/vm-kernel-linux-debug-ia32-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-x64-try"
+        name: "dart/try/vm-kernel-linux-debug-x64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
+        name: "dart/try/vm-kernel-linux-release-ia32-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
+        name: "dart/try/vm-kernel-msan-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
+        name: "dart/try/vm-kernel-msvc-windows-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-arm64-try"
+        name: "dart/try/vm-kernel-nnbd-linux-debug-ia32-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
+        name: "dart/try/vm-kernel-nnbd-linux-debug-simriscv64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
+        name: "dart/try/vm-kernel-nnbd-linux-release-ia32-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
+        name: "dart/try/vm-kernel-nnbd-linux-release-simarm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-tsan-linux-release-x64-try"
+        name: "dart/try/vm-kernel-nnbd-linux-release-simarm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-ubsan-linux-release-x64-try"
+        name: "dart/try/vm-kernel-nnbd-mac-debug-arm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-win-debug-x64c-try"
+        name: "dart/try/vm-kernel-nnbd-mac-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-win-product-x64-try"
+        name: "dart/try/vm-kernel-nnbd-mac-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-win-release-x64-try"
+        name: "dart/try/vm-kernel-nnbd-win-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-reload-linux-debug-x64-try"
+        name: "dart/try/vm-kernel-nnbd-win-release-ia32-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-reload-linux-release-x64-try"
+        name: "dart/try/vm-kernel-nnbd-win-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-reload-rollback-linux-debug-x64-try"
+        name: "dart/try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-reload-rollback-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-asan-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-tsan-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-dwarf-linux-product-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-ubsan-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-linux-debug-x64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-win-debug-ia32-try"
+        name: "dart/try/vm-kernel-precomp-linux-product-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-win-debug-x64-try"
+        name: "dart/try/vm-kernel-precomp-mac-product-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-win-debug-x64c-try"
+        name: "dart/try/vm-kernel-precomp-msan-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-win-release-ia32-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-win-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simriscv64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-precomp-ffi-qemu-linux-release-arm-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
         includable_only: true
       }
-      retry_config {}
-    }
-  }
-}
-config_groups {
-  name: "sdk-infra-config"
-  gerrit {
-    url: "https://dart-review.googlesource.com"
-    projects {
-      name: "sdk"
-      ref_regexp: "refs/heads/infra/config"
-    }
-  }
-  verifiers {
-    gerrit_cq_ability {
-      committer_list: "project-dart-committers"
-      dry_run_access_list: "project-dart-tryjob-access"
-      allow_submit_with_open_deps: true
-    }
-    tree_status {
-      url: "https://dart-status.appspot.com"
-    }
-    tryjob {
       builders {
-        name: "dart/try.shared/presubmit-try"
-        disable_reuse: true
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-tsan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-ubsan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-win-debug-x64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-win-product-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-reload-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-reload-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-reload-rollback-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-reload-rollback-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-tsan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-ubsan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-win-debug-ia32-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-win-debug-x64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-win-release-ia32-try"
+        includable_only: true
       }
       retry_config {}
     }
diff --git a/lib/cron.star b/lib/cron.star
index 370562f3e943..f7317688e77e 100644
--- a/lib/cron.star
+++ b/lib/cron.star
@@ -8,9 +8,10 @@ Defines rules that can be used to define nightly and weekly builders.
 load("//lib/dart.star", "dart")
 load("//lib/priority.star", "priority")
 
-def _nightly_builder(name, notifies = None, **kwargs):
+def _nightly_builder(name, cq_group = "sdk-main", notifies = None, **kwargs):
     dart.ci_sandbox_builder(
         name,
+        cq_group = cq_group,
         notifies = notifies or [luci.notifier(
             name = "nightly",
             on_new_failure = True,
@@ -27,9 +28,10 @@ def _nightly_builder(name, notifies = None, **kwargs):
         **kwargs
     )
 
-def _weekly_builder(name, notifies = None, **kwargs):
+def _weekly_builder(name, cq_group = "sdk-main", notifies = None, **kwargs):
     dart.ci_sandbox_builder(
         name,
+        cq_group = cq_group,
         notifies = notifies,
         on_cq = False,
         priority = priority.low,
diff --git a/lib/dart.star b/lib/dart.star
index bc6d29d7ad6c..fe764306cdf7 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -80,6 +80,7 @@ def _try_builder(
         name,
         recipe = "dart/neo",
         bucket = "try",
+        cq_group = "sdk",
         dimensions = None,
         execution_timeout = None,
         experiment_percentage = None,
@@ -94,6 +95,7 @@ def _try_builder(
         name: The builder name.
         recipe: The recipe to use (defaults to "dart/neo").
         bucket: The bucket to use (defaults to "try").
+        cq_group: The commit queue group to use (defaults to "sdk").
         dimensions: Extra swarming dimensions required by this builder.
         execution_timeout: Time to allow for the build to run.
         experiment_percentage: What experiment percentage to use.
@@ -127,7 +129,7 @@ def _try_builder(
                        not location_filters)
     luci.cq_tryjob_verifier(
         builder = builder,
-        cq_group = "sdk",
+        cq_group = cq_group,
         experiment_percentage = experiment_percentage,
         location_filters = location_filters,
         includable_only = includable_only,
@@ -141,6 +143,7 @@ def _builder(
         enabled = True,
         category = None,
         channels = [],
+        cq_group = "sdk",
         dimensions = None,
         executable = None,
         execution_timeout = None,
@@ -170,6 +173,7 @@ def _builder(
         enabled: Whether this builder is currently running or not.
         category: Where to show the builder on the console.
         channels: Which other channels the builder should be added to.
+        cq_group: The commit queue group to use (defaults to "sdk").
         dimensions: Extra swarming dimensions required by this builder.
         executable: The Luci executable to use.
         execution_timeout: Time to allow for the build to run.
@@ -208,6 +212,7 @@ def _builder(
             _try_builder(
                 name,
                 recipe = recipe,
+                cq_group = cq_group,
                 dimensions = dimensions,
                 properties = properties,
                 on_cq = on_cq,

From 38057c097bc20245cd412e48bb1671e306be79c8 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Wed, 16 Nov 2022 15:27:37 +0000
Subject: [PATCH 589/826] Revert "[infra] Don't run nightly try builders on
 release channels."

This reverts commit 25091e5af91d70990f9c3cf30db544364ae9c666.

Reason for revert: The CQ cannot watch builders from two groups

Original change's description:
> [infra] Don't run nightly try builders on release channels.
>
> The dart2wasm-linux-x64-d8 builder is nightly (and thus only runs on the
> main branch) but has a try builder that runs on all the release
> channels, which fails because there are no baseline results on those
> branches.
>
> This change fixes that problem by adding a new commit queue group for
> the nightly try builders, so they only trigger on the main branch. If
> the try builder is important enough block releases, the nightly builder
> should be promoted to a regular builder that runs throughout the day and
> on all release branches.
>
> Fixes: b/258216745
> Change-Id: I8d5984ef9363feae7a55255231619aef7d97906e
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/269941
> Reviewed-by: Alexander Thomas <athom@google.com>
> Commit-Queue: Jonas Termansen <sortie@google.com>

TBR=whesse@google.com,sortie@google.com,athom@google.com,dart-scoped@luci-project-accounts.iam.gserviceaccount.com

Change-Id: Ib1408f9d0f2e32e7f646077ebc32fc1326923d36
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/270200
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cq.star                    |  15 --
 generated/commit-queue.cfg | 421 ++++++++++++++++++-------------------
 lib/cron.star              |   6 +-
 lib/dart.star              |   7 +-
 4 files changed, 202 insertions(+), 247 deletions(-)

diff --git a/cq.star b/cq.star
index d452100ebd2e..67a835fe7a57 100644
--- a/cq.star
+++ b/cq.star
@@ -35,21 +35,6 @@ luci.cq_group(
     verifiers = None,
 )
 
-# Commit queue group for try builders only on the main branch. E.g. nightly
-# builders only run on the main branch and their try builders can't compare with
-# non-existent results on the release branches.
-luci.cq_group(
-    name = "sdk-main",
-    watch = cq.refset(
-        DART_GERRIT + "sdk",
-        refs = ["refs/heads/main"],
-    ),
-    allow_submit_with_open_deps = True,
-    tree_status_host = "dart-status.appspot.com",
-    retry_config = cq.RETRY_NONE,
-    verifiers = None,
-)
-
 luci.cq_group(
     name = "sdk-infra-config",
     watch = cq.refset(DART_GERRIT + "sdk", refs = ["refs/heads/infra/config"]),
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 623b61b15255..518087195890 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -202,6 +202,10 @@ config_groups {
         name: "dart/try/app-kernel-linux-debug-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/app-kernel-linux-product-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/app-kernel-linux-release-x64-try"
         includable_only: true
@@ -604,6 +608,68 @@ config_groups {
           path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
+      builders {
+        name: "dart/try/dart2wasm-linux-x64-d8-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/ddc-canary-linux-release-chrome-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/ddc-linux-release-chrome-try"
         location_filters {
@@ -836,6 +902,14 @@ config_groups {
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
       }
+      builders {
+        name: "dart/try/front-end-nnbd-mac-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/front-end-nnbd-win-release-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/front-end-win-release-x64-try"
         includable_only: true
@@ -962,14 +1036,34 @@ config_groups {
         name: "dart/try/vm-fuchsia-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-asan-linux-release-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-checked-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-gcc-linux-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-linux-debug-ia32-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-linux-debug-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-linux-debug-x64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-linux-release-ia32-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-linux-release-simarm-try"
         includable_only: true
@@ -993,6 +1087,22 @@ config_groups {
         name: "dart/try/vm-kernel-mac-release-x64-try"
         experiment_percentage: 5
       }
+      builders {
+        name: "dart/try/vm-kernel-msan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-msvc-windows-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-debug-ia32-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-debug-simriscv64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-debug-x64-try"
         location_filters {
@@ -1056,6 +1166,18 @@ config_groups {
           path_regexp: "runtime/.+"
         }
       }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-release-ia32-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-release-simarm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-release-simarm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-release-x64-try"
         location_filters {
@@ -1120,384 +1242,239 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-mac-release-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-optcounter-threshold-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-android-release-arm64c-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-android-release-arm_x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-simarm_x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm_x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-mac-release-simarm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-win-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-win-debug-x64-try"
+        name: "dart/try/vm-kernel-nnbd-mac-debug-arm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-win-release-x64-try"
+        name: "dart/try/vm-kernel-nnbd-mac-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-precomp-ffi-qemu-linux-release-arm-try"
+        name: "dart/try/vm-kernel-nnbd-mac-release-arm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
+        name: "dart/try/vm-kernel-nnbd-mac-release-x64-try"
         includable_only: true
       }
-      retry_config {}
-    }
-  }
-}
-config_groups {
-  name: "sdk-infra-config"
-  gerrit {
-    url: "https://dart-review.googlesource.com"
-    projects {
-      name: "sdk"
-      ref_regexp: "refs/heads/infra/config"
-    }
-  }
-  verifiers {
-    gerrit_cq_ability {
-      committer_list: "project-dart-committers"
-      dry_run_access_list: "project-dart-tryjob-access"
-      allow_submit_with_open_deps: true
-    }
-    tree_status {
-      url: "https://dart-status.appspot.com"
-    }
-    tryjob {
-      builders {
-        name: "dart/try.shared/presubmit-try"
-        disable_reuse: true
-      }
-      retry_config {}
-    }
-  }
-}
-config_groups {
-  name: "sdk-main"
-  gerrit {
-    url: "https://dart-review.googlesource.com"
-    projects {
-      name: "sdk"
-      ref_regexp: "refs/heads/main"
-    }
-  }
-  verifiers {
-    gerrit_cq_ability {
-      committer_list: "project-dart-committers"
-      dry_run_access_list: "project-dart-tryjob-access"
-      allow_submit_with_open_deps: true
-    }
-    tree_status {
-      url: "https://dart-status.appspot.com"
-    }
-    tryjob {
       builders {
-        name: "dart/try/app-kernel-linux-product-x64-try"
+        name: "dart/try/vm-kernel-nnbd-win-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/dart2wasm-linux-x64-d8-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
-        }
-      }
-      builders {
-        name: "dart/try/ddc-canary-linux-release-chrome-try"
+        name: "dart/try/vm-kernel-nnbd-win-release-ia32-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/front-end-nnbd-mac-release-x64-try"
+        name: "dart/try/vm-kernel-nnbd-win-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/front-end-nnbd-win-release-x64-try"
+        name: "dart/try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-asan-linux-release-x64-try"
+        name: "dart/try/vm-kernel-optcounter-threshold-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-gcc-linux-try"
+        name: "dart/try/vm-kernel-precomp-android-release-arm64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-linux-debug-ia32-try"
+        name: "dart/try/vm-kernel-precomp-android-release-arm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-linux-debug-x64c-try"
+        name: "dart/try/vm-kernel-precomp-asan-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-linux-release-ia32-try"
+        name: "dart/try/vm-kernel-precomp-dwarf-linux-product-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-msan-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-linux-debug-simarm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-msvc-windows-try"
+        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-linux-debug-ia32-try"
+        name: "dart/try/vm-kernel-precomp-linux-debug-x64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-linux-debug-simriscv64-try"
+        name: "dart/try/vm-kernel-precomp-linux-product-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-linux-release-ia32-try"
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-linux-release-simarm-try"
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-linux-release-simarm64-try"
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-mac-debug-arm64-try"
+        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-mac-debug-x64-try"
+        name: "dart/try/vm-kernel-precomp-mac-product-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-mac-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-mac-release-simarm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-win-debug-x64-try"
+        name: "dart/try/vm-kernel-precomp-msan-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-win-release-ia32-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-win-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simriscv64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-asan-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-dwarf-linux-product-x64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-x64c-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-product-x64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-arm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-mac-product-x64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-msan-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
+        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simriscv64-try"
+        name: "dart/try/vm-kernel-precomp-tsan-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-x64-try"
+        name: "dart/try/vm-kernel-precomp-ubsan-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
+        name: "dart/try/vm-kernel-precomp-win-debug-x64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
+        name: "dart/try/vm-kernel-precomp-win-product-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
+        name: "dart/try/vm-kernel-precomp-win-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
+        name: "dart/try/vm-kernel-reload-linux-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-tsan-linux-release-x64-try"
+        name: "dart/try/vm-kernel-reload-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-ubsan-linux-release-x64-try"
+        name: "dart/try/vm-kernel-reload-rollback-linux-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-win-debug-x64c-try"
+        name: "dart/try/vm-kernel-reload-rollback-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-win-product-x64-try"
+        name: "dart/try/vm-kernel-tsan-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-reload-linux-debug-x64-try"
+        name: "dart/try/vm-kernel-ubsan-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-reload-linux-release-x64-try"
+        name: "dart/try/vm-kernel-win-debug-ia32-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-reload-rollback-linux-debug-x64-try"
+        name: "dart/try/vm-kernel-win-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-reload-rollback-linux-release-x64-try"
+        name: "dart/try/vm-kernel-win-debug-x64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-tsan-linux-release-x64-try"
+        name: "dart/try/vm-kernel-win-release-ia32-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-ubsan-linux-release-x64-try"
+        name: "dart/try/vm-kernel-win-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-win-debug-ia32-try"
+        name: "dart/try/vm-precomp-ffi-qemu-linux-release-arm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-win-debug-x64c-try"
+        name: "dart/try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
         includable_only: true
       }
+      retry_config {}
+    }
+  }
+}
+config_groups {
+  name: "sdk-infra-config"
+  gerrit {
+    url: "https://dart-review.googlesource.com"
+    projects {
+      name: "sdk"
+      ref_regexp: "refs/heads/infra/config"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "project-dart-committers"
+      dry_run_access_list: "project-dart-tryjob-access"
+      allow_submit_with_open_deps: true
+    }
+    tree_status {
+      url: "https://dart-status.appspot.com"
+    }
+    tryjob {
       builders {
-        name: "dart/try/vm-kernel-win-release-ia32-try"
-        includable_only: true
+        name: "dart/try.shared/presubmit-try"
+        disable_reuse: true
       }
       retry_config {}
     }
diff --git a/lib/cron.star b/lib/cron.star
index f7317688e77e..370562f3e943 100644
--- a/lib/cron.star
+++ b/lib/cron.star
@@ -8,10 +8,9 @@ Defines rules that can be used to define nightly and weekly builders.
 load("//lib/dart.star", "dart")
 load("//lib/priority.star", "priority")
 
-def _nightly_builder(name, cq_group = "sdk-main", notifies = None, **kwargs):
+def _nightly_builder(name, notifies = None, **kwargs):
     dart.ci_sandbox_builder(
         name,
-        cq_group = cq_group,
         notifies = notifies or [luci.notifier(
             name = "nightly",
             on_new_failure = True,
@@ -28,10 +27,9 @@ def _nightly_builder(name, cq_group = "sdk-main", notifies = None, **kwargs):
         **kwargs
     )
 
-def _weekly_builder(name, cq_group = "sdk-main", notifies = None, **kwargs):
+def _weekly_builder(name, notifies = None, **kwargs):
     dart.ci_sandbox_builder(
         name,
-        cq_group = cq_group,
         notifies = notifies,
         on_cq = False,
         priority = priority.low,
diff --git a/lib/dart.star b/lib/dart.star
index fe764306cdf7..bc6d29d7ad6c 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -80,7 +80,6 @@ def _try_builder(
         name,
         recipe = "dart/neo",
         bucket = "try",
-        cq_group = "sdk",
         dimensions = None,
         execution_timeout = None,
         experiment_percentage = None,
@@ -95,7 +94,6 @@ def _try_builder(
         name: The builder name.
         recipe: The recipe to use (defaults to "dart/neo").
         bucket: The bucket to use (defaults to "try").
-        cq_group: The commit queue group to use (defaults to "sdk").
         dimensions: Extra swarming dimensions required by this builder.
         execution_timeout: Time to allow for the build to run.
         experiment_percentage: What experiment percentage to use.
@@ -129,7 +127,7 @@ def _try_builder(
                        not location_filters)
     luci.cq_tryjob_verifier(
         builder = builder,
-        cq_group = cq_group,
+        cq_group = "sdk",
         experiment_percentage = experiment_percentage,
         location_filters = location_filters,
         includable_only = includable_only,
@@ -143,7 +141,6 @@ def _builder(
         enabled = True,
         category = None,
         channels = [],
-        cq_group = "sdk",
         dimensions = None,
         executable = None,
         execution_timeout = None,
@@ -173,7 +170,6 @@ def _builder(
         enabled: Whether this builder is currently running or not.
         category: Where to show the builder on the console.
         channels: Which other channels the builder should be added to.
-        cq_group: The commit queue group to use (defaults to "sdk").
         dimensions: Extra swarming dimensions required by this builder.
         executable: The Luci executable to use.
         execution_timeout: Time to allow for the build to run.
@@ -212,7 +208,6 @@ def _builder(
             _try_builder(
                 name,
                 recipe = recipe,
-                cq_group = cq_group,
                 dimensions = dimensions,
                 properties = properties,
                 on_cq = on_cq,

From ee35f3ae496315b4591b17bb53a932f6c04be6de Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Mon, 21 Nov 2022 11:43:09 +0000
Subject: [PATCH 590/826] [infra] Run try builders only on their channel
 branches.

This change only provide try builders on a release branch if it has a
corresponding standard builder on the same branch. The commit queue
group configuration is split per branch to support this feature.

For example, the dart2wasm-linux-x64-d8 builder is nightly (and thus
only runs on the main branch) but had a try builder that runs on all the
release channels, which failed because there are no baseline results on
those branches.

Fixes: b/258216745
Change-Id: Ic5f19516c1115ff1dd01ea5a819dda34d9c5ea31
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/270722
Commit-Queue: Jonas Termansen <sortie@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cq.star                    |   26 +-
 generated/commit-queue.cfg | 3697 +++++++++++++++++++++++++++++++++---
 lib/dart.star              |   22 +-
 3 files changed, 3412 insertions(+), 333 deletions(-)

diff --git a/cq.star b/cq.star
index 67a835fe7a57..1f25eef407a0 100644
--- a/cq.star
+++ b/cq.star
@@ -23,17 +23,21 @@ def default_verifiers():
 
 DART_GERRIT = "https://dart-review.googlesource.com/"
 
-luci.cq_group(
-    name = "sdk",
-    watch = cq.refset(
-        DART_GERRIT + "sdk",
-        refs = ["refs/heads/%s" % branch for branch in dart.branches],
-    ),
-    allow_submit_with_open_deps = True,
-    tree_status_host = "dart-status.appspot.com",
-    retry_config = cq.RETRY_NONE,
-    verifiers = None,
-)
+def sdk_cq_groups():
+    for branch in dart.branches:
+        luci.cq_group(
+            name = "sdk-%s" % branch,
+            watch = cq.refset(
+                DART_GERRIT + "sdk",
+                refs = ["refs/heads/%s" % branch],
+            ),
+            allow_submit_with_open_deps = True,
+            tree_status_host = "dart-status.appspot.com",
+            retry_config = cq.RETRY_NONE,
+            verifiers = None,
+        )
+
+sdk_cq_groups()
 
 luci.cq_group(
     name = "sdk-infra-config",
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 518087195890..7b8a8d46eb1c 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -59,15 +59,12 @@ config_groups {
   }
 }
 config_groups {
-  name: "sdk"
+  name: "sdk-beta"
   gerrit {
     url: "https://dart-review.googlesource.com"
     projects {
       name: "sdk"
-      ref_regexp: "refs/heads/main"
       ref_regexp: "refs/heads/beta"
-      ref_regexp: "refs/heads/dev"
-      ref_regexp: "refs/heads/stable"
     }
   }
   verifiers {
@@ -202,10 +199,6 @@ config_groups {
         name: "dart/try/app-kernel-linux-debug-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/app-kernel-linux-product-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/app-kernel-linux-release-x64-try"
         includable_only: true
@@ -608,68 +601,6 @@ config_groups {
           path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
-      builders {
-        name: "dart/try/dart2wasm-linux-x64-d8-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
-        }
-      }
-      builders {
-        name: "dart/try/ddc-canary-linux-release-chrome-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/ddc-linux-release-chrome-try"
         location_filters {
@@ -742,74 +673,6 @@ config_groups {
         name: "dart/try/ddc-mac-release-chrome-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/ddc-nnbd-linux-release-chrome-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(build_integration|dev_compiler|meta)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "utils/dartdevc/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
-        }
-      }
       builders {
         name: "dart/try/ddc-win-release-chrome-try"
         includable_only: true
@@ -822,26 +685,6 @@ config_groups {
         name: "dart/try/dev-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/flutter-analyze-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/flutter-engine-linux-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/flutter-engine-linux-web_tests-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/flutter-frontend-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-      }
       builders {
         name: "dart/try/front-end-linux-release-x64-try"
       }
@@ -902,14 +745,6 @@ config_groups {
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
       }
-      builders {
-        name: "dart/try/front-end-nnbd-mac-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/front-end-nnbd-win-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/front-end-win-release-x64-try"
         includable_only: true
@@ -922,17 +757,9 @@ config_groups {
         name: "dart/try/monorepo-roller-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/pkg-linux-debug-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/pkg-linux-release-try"
       }
-      builders {
-        name: "dart/try/pkg-mac-release-arm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/pkg-mac-release-try"
         includable_only: true
@@ -1032,38 +859,14 @@ config_groups {
         name: "dart/try/vm-ffi-android-release-arm64c-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-fuchsia-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-asan-linux-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-checked-linux-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-gcc-linux-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-linux-debug-ia32-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-linux-debug-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-linux-debug-x64c-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-linux-release-ia32-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-linux-release-simarm-try"
         includable_only: true
@@ -1079,30 +882,10 @@ config_groups {
         name: "dart/try/vm-kernel-mac-debug-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-mac-release-arm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-mac-release-x64-try"
         experiment_percentage: 5
       }
-      builders {
-        name: "dart/try/vm-kernel-msan-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-msvc-windows-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-linux-debug-ia32-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-linux-debug-simriscv64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-debug-x64-try"
         location_filters {
@@ -1166,18 +949,6 @@ config_groups {
           path_regexp: "runtime/.+"
         }
       }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-linux-release-ia32-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-linux-release-simarm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-linux-release-simarm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-release-x64-try"
         location_filters {
@@ -1242,201 +1013,3524 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-mac-debug-arm64-try"
+        name: "dart/try/vm-kernel-precomp-android-release-arm64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-mac-debug-x64-try"
+        name: "dart/try/vm-kernel-precomp-android-release-arm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-mac-release-arm64-try"
+        name: "dart/try/vm-kernel-precomp-linux-debug-simarm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-mac-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-win-debug-x64-try"
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-win-release-ia32-try"
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-win-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
+        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-optcounter-threshold-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-mac-release-simarm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-android-release-arm64c-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-android-release-arm_x64-try"
+        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-asan-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-win-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-dwarf-linux-product-x64-try"
+        name: "dart/try/vm-kernel-win-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-simarm_x64-try"
+        name: "dart/try/vm-kernel-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-precomp-ffi-qemu-linux-release-arm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
+        includable_only: true
+      }
+      retry_config {}
+    }
+  }
+}
+config_groups {
+  name: "sdk-dev"
+  gerrit {
+    url: "https://dart-review.googlesource.com"
+    projects {
+      name: "sdk"
+      ref_regexp: "refs/heads/dev"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "project-dart-committers"
+      dry_run_access_list: "project-dart-tryjob-access"
+      allow_submit_with_open_deps: true
+    }
+    tree_status {
+      url: "https://dart-status.appspot.com"
+    }
+    tryjob {
+      builders {
+        name: "dart/try.shared/presubmit-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/analyzer-analysis-server-linux-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/.+"
+        }
+      }
+      builders {
+        name: "dart/try/analyzer-linux-release-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/.+"
+        }
+      }
+      builders {
+        name: "dart/try/analyzer-mac-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/analyzer-win-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/app-kernel-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/app-kernel-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/benchmark-linux-try"
+      }
+      builders {
+        name: "dart/try/beta-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-linux-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-linux-riscv64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-linux-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-mac-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-mac-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-win-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-win-try"
+      }
+      builders {
+        name: "dart/try/dart2js-canary-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-csp-minified-linux-x64-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-minified-strong-linux-x64-d8-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/compiler/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/dart2js-nnbd-linux-x64-chrome-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/compiler/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/dart2js-strong-hostasserts-linux-ia32-d8-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/compiler/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/dart2js-strong-linux-x64-chrome-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/compiler/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/dart2js-strong-linux-x64-firefox-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-strong-mac-x64-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-strong-mac-x64-safari-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-strong-win-x64-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-unit-linux-x64-release-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/compiler/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/ddc-linux-release-chrome-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(build_integration|dev_compiler|meta)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/dartdevc/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/ddc-mac-release-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/ddc-win-release-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/ddk-linux-release-firefox-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dev-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/front-end-linux-release-x64-try"
+      }
+      builders {
+        name: "dart/try/front-end-mac-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/front-end-nnbd-linux-release-x64-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/front-end-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/gclient-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/monorepo-roller-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/pkg-linux-release-try"
+      }
+      builders {
+        name: "dart/try/pkg-mac-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/pkg-win-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/stable-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-canary-linux-debug-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "runtime/.+"
+        }
+      }
+      builders {
+        name: "dart/try/vm-ffi-android-debug-arm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-android-debug-arm64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-android-product-arm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-android-product-arm64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-android-release-arm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-android-release-arm64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-checked-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-linux-release-simarm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-linux-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-linux-release-x64-try"
+      }
+      builders {
+        name: "dart/try/vm-kernel-mac-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-mac-release-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-mac-release-x64-try"
+        experiment_percentage: 5
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-debug-x64-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "runtime/.+"
+        }
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-release-x64-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "runtime/.+"
+        }
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-android-release-arm64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-android-release-arm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-debug-simarm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-mac-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-win-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-precomp-ffi-qemu-linux-release-arm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
+        includable_only: true
+      }
+      retry_config {}
+    }
+  }
+}
+config_groups {
+  name: "sdk-infra-config"
+  gerrit {
+    url: "https://dart-review.googlesource.com"
+    projects {
+      name: "sdk"
+      ref_regexp: "refs/heads/infra/config"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "project-dart-committers"
+      dry_run_access_list: "project-dart-tryjob-access"
+      allow_submit_with_open_deps: true
+    }
+    tree_status {
+      url: "https://dart-status.appspot.com"
+    }
+    tryjob {
+      builders {
+        name: "dart/try.shared/presubmit-try"
+        disable_reuse: true
+      }
+      retry_config {}
+    }
+  }
+}
+config_groups {
+  name: "sdk-main"
+  gerrit {
+    url: "https://dart-review.googlesource.com"
+    projects {
+      name: "sdk"
+      ref_regexp: "refs/heads/main"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "project-dart-committers"
+      dry_run_access_list: "project-dart-tryjob-access"
+      allow_submit_with_open_deps: true
+    }
+    tree_status {
+      url: "https://dart-status.appspot.com"
+    }
+    tryjob {
+      builders {
+        name: "dart/try.shared/presubmit-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/analyzer-analysis-server-linux-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/.+"
+        }
+      }
+      builders {
+        name: "dart/try/analyzer-linux-release-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/.+"
+        }
+      }
+      builders {
+        name: "dart/try/analyzer-mac-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/analyzer-win-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/app-kernel-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/app-kernel-linux-product-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/app-kernel-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/benchmark-linux-try"
+      }
+      builders {
+        name: "dart/try/beta-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-linux-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-linux-riscv64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-linux-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-mac-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-mac-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-win-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-win-try"
+      }
+      builders {
+        name: "dart/try/dart2js-canary-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-csp-minified-linux-x64-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-minified-strong-linux-x64-d8-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/compiler/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/dart2js-nnbd-linux-x64-chrome-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/compiler/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/dart2js-strong-hostasserts-linux-ia32-d8-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/compiler/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/dart2js-strong-linux-x64-chrome-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/compiler/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/dart2js-strong-linux-x64-firefox-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-strong-mac-x64-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-strong-mac-x64-safari-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-strong-win-x64-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-unit-linux-x64-release-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/compiler/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/dart2wasm-linux-x64-d8-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/ddc-canary-linux-release-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/ddc-linux-release-chrome-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(build_integration|dev_compiler|meta)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/dartdevc/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/ddc-mac-release-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/ddc-nnbd-linux-release-chrome-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(build_integration|dev_compiler|meta)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/dartdevc/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/ddc-win-release-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/ddk-linux-release-firefox-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dev-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/flutter-analyze-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/flutter-engine-linux-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/flutter-engine-linux-web_tests-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/flutter-frontend-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/front-end-linux-release-x64-try"
+      }
+      builders {
+        name: "dart/try/front-end-mac-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/front-end-nnbd-linux-release-x64-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/front-end-nnbd-mac-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/front-end-nnbd-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/front-end-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/gclient-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/monorepo-roller-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/pkg-linux-debug-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/pkg-linux-release-try"
+      }
+      builders {
+        name: "dart/try/pkg-mac-release-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/pkg-mac-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/pkg-win-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/stable-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-canary-linux-debug-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "runtime/.+"
+        }
+      }
+      builders {
+        name: "dart/try/vm-ffi-android-debug-arm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-android-debug-arm64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-android-product-arm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-android-product-arm64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-android-release-arm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-android-release-arm64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-fuchsia-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-asan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-checked-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-gcc-linux-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-linux-debug-ia32-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-linux-debug-x64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-linux-release-ia32-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-linux-release-simarm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-linux-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-linux-release-x64-try"
+      }
+      builders {
+        name: "dart/try/vm-kernel-mac-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-mac-release-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-mac-release-x64-try"
+        experiment_percentage: 5
+      }
+      builders {
+        name: "dart/try/vm-kernel-msan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-msvc-windows-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-debug-ia32-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-debug-simriscv64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-debug-x64-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "runtime/.+"
+        }
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-release-ia32-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-release-simarm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-release-x64-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "runtime/.+"
+        }
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-mac-debug-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-mac-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-mac-release-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-mac-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-win-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-win-release-ia32-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-optcounter-threshold-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-android-release-arm64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-android-release-arm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-asan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-dwarf-linux-product-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-debug-simarm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-debug-x64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-product-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-mac-product-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-mac-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-msan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simriscv64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-tsan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-ubsan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-win-debug-x64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-win-product-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-reload-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-reload-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-reload-rollback-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-reload-rollback-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-tsan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-ubsan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-win-debug-ia32-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-win-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-win-debug-x64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-win-release-ia32-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-precomp-ffi-qemu-linux-release-arm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
+        includable_only: true
+      }
+      retry_config {}
+    }
+  }
+}
+config_groups {
+  name: "sdk-stable"
+  gerrit {
+    url: "https://dart-review.googlesource.com"
+    projects {
+      name: "sdk"
+      ref_regexp: "refs/heads/stable"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "project-dart-committers"
+      dry_run_access_list: "project-dart-tryjob-access"
+      allow_submit_with_open_deps: true
+    }
+    tree_status {
+      url: "https://dart-status.appspot.com"
+    }
+    tryjob {
+      builders {
+        name: "dart/try.shared/presubmit-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/analyzer-analysis-server-linux-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/.+"
+        }
+      }
+      builders {
+        name: "dart/try/analyzer-linux-release-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/.+"
+        }
+      }
+      builders {
+        name: "dart/try/analyzer-mac-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/analyzer-win-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/app-kernel-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/app-kernel-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/benchmark-linux-try"
+      }
+      builders {
+        name: "dart/try/beta-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-linux-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-linux-riscv64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-linux-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-mac-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-mac-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-win-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-win-try"
+      }
+      builders {
+        name: "dart/try/dart2js-canary-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-csp-minified-linux-x64-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-minified-strong-linux-x64-d8-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/compiler/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/dart2js-nnbd-linux-x64-chrome-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/compiler/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/dart2js-strong-hostasserts-linux-ia32-d8-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/compiler/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/dart2js-strong-linux-x64-chrome-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/compiler/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/dart2js-strong-linux-x64-firefox-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-strong-mac-x64-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-strong-mac-x64-safari-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
+        name: "dart/try/dart2js-strong-win-x64-chrome-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-x64c-try"
+        name: "dart/try/dart2js-unit-linux-x64-release-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/compiler/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/ddc-linux-release-chrome-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(build_integration|dev_compiler|meta)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/dartdevc/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/ddc-mac-release-chrome-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-product-x64-try"
+        name: "dart/try/ddc-win-release-chrome-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
+        name: "dart/try/ddk-linux-release-firefox-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm64-try"
+        name: "dart/try/dev-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/front-end-linux-release-x64-try"
+      }
+      builders {
+        name: "dart/try/front-end-mac-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/front-end-nnbd-linux-release-x64-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/front-end-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/gclient-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/monorepo-roller-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/pkg-linux-release-try"
+      }
+      builders {
+        name: "dart/try/pkg-mac-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/pkg-win-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/stable-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm_x64-try"
+        name: "dart/try/vm-canary-linux-debug-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "runtime/.+"
+        }
+      }
+      builders {
+        name: "dart/try/vm-ffi-android-debug-arm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
+        name: "dart/try/vm-ffi-android-debug-arm64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-mac-product-x64-try"
+        name: "dart/try/vm-ffi-android-product-arm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-mac-release-simarm64-try"
+        name: "dart/try/vm-ffi-android-product-arm64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-msan-linux-release-x64-try"
+        name: "dart/try/vm-ffi-android-release-arm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
+        name: "dart/try/vm-ffi-android-release-arm64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simriscv64-try"
+        name: "dart/try/vm-kernel-checked-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-x64-try"
+        name: "dart/try/vm-kernel-linux-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
+        name: "dart/try/vm-kernel-linux-release-simarm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
+        name: "dart/try/vm-kernel-linux-release-simarm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
-        includable_only: true
+        name: "dart/try/vm-kernel-linux-release-x64-try"
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-arm64-try"
+        name: "dart/try/vm-kernel-mac-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
-        includable_only: true
+        name: "dart/try/vm-kernel-mac-release-x64-try"
+        experiment_percentage: 5
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
-        includable_only: true
+        name: "dart/try/vm-kernel-nnbd-linux-debug-x64-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "runtime/.+"
+        }
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
-        includable_only: true
+        name: "dart/try/vm-kernel-nnbd-linux-release-x64-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "runtime/.+"
+        }
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-tsan-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-android-release-arm64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-ubsan-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-android-release-arm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-win-debug-x64c-try"
+        name: "dart/try/vm-kernel-precomp-linux-debug-simarm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-win-product-x64-try"
+        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-win-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-reload-linux-debug-x64-try"
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-reload-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-reload-rollback-linux-debug-x64-try"
+        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-reload-rollback-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-mac-release-simarm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-tsan-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-ubsan-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-win-debug-ia32-try"
+        name: "dart/try/vm-kernel-precomp-win-release-x64-try"
         includable_only: true
       }
       builders {
         name: "dart/try/vm-kernel-win-debug-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-win-debug-x64c-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-win-release-ia32-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-win-release-x64-try"
         includable_only: true
@@ -1453,30 +4547,3 @@ config_groups {
     }
   }
 }
-config_groups {
-  name: "sdk-infra-config"
-  gerrit {
-    url: "https://dart-review.googlesource.com"
-    projects {
-      name: "sdk"
-      ref_regexp: "refs/heads/infra/config"
-    }
-  }
-  verifiers {
-    gerrit_cq_ability {
-      committer_list: "project-dart-committers"
-      dry_run_access_list: "project-dart-tryjob-access"
-      allow_submit_with_open_deps: true
-    }
-    tree_status {
-      url: "https://dart-status.appspot.com"
-    }
-    tryjob {
-      builders {
-        name: "dart/try.shared/presubmit-try"
-        disable_reuse: true
-      }
-      retry_config {}
-    }
-  }
-}
diff --git a/lib/dart.star b/lib/dart.star
index bc6d29d7ad6c..c5d90a737aa3 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -80,6 +80,7 @@ def _try_builder(
         name,
         recipe = "dart/neo",
         bucket = "try",
+        cq_branches = _BRANCHES,
         dimensions = None,
         execution_timeout = None,
         experiment_percentage = None,
@@ -94,6 +95,7 @@ def _try_builder(
         name: The builder name.
         recipe: The recipe to use (defaults to "dart/neo").
         bucket: The bucket to use (defaults to "try").
+        cq_branches: Make try builder on these branches (defaults to _BRANCHES).
         dimensions: Extra swarming dimensions required by this builder.
         execution_timeout: Time to allow for the build to run.
         experiment_percentage: What experiment percentage to use.
@@ -125,13 +127,14 @@ def _try_builder(
     )
     includable_only = (not on_cq and not experiment_percentage and
                        not location_filters)
-    luci.cq_tryjob_verifier(
-        builder = builder,
-        cq_group = "sdk",
-        experiment_percentage = experiment_percentage,
-        location_filters = location_filters,
-        includable_only = includable_only,
-    )
+    for branch in cq_branches:
+        luci.cq_tryjob_verifier(
+            builder = builder,
+            cq_group = "sdk-%s" % branch,
+            experiment_percentage = experiment_percentage,
+            location_filters = location_filters,
+            includable_only = includable_only,
+        )
     luci.list_view_entry(list_view = "cq", builder = builder)
 
 def _builder(
@@ -141,6 +144,7 @@ def _builder(
         enabled = True,
         category = None,
         channels = [],
+        cq_branches = _BRANCHES,
         dimensions = None,
         executable = None,
         execution_timeout = None,
@@ -170,6 +174,7 @@ def _builder(
         enabled: Whether this builder is currently running or not.
         category: Where to show the builder on the console.
         channels: Which other channels the builder should be added to.
+        cq_branches: Make try builder on these branches (defaults to _BRANCHES).
         dimensions: Extra swarming dimensions required by this builder.
         executable: The Luci executable to use.
         execution_timeout: Time to allow for the build to run.
@@ -203,11 +208,14 @@ def _builder(
     expect_os("-linux", [linux["os"], focal["os"]])
     expect_os("-mac", mac["os"])
 
+    cq_branches = ["main"] + [branch for branch in channels if branch != "try"]
+
     def builder(channel, notifies, triggered_by):
         if channel == "try":
             _try_builder(
                 name,
                 recipe = recipe,
+                cq_branches = cq_branches,
                 dimensions = dimensions,
                 properties = properties,
                 on_cq = on_cq,

From a4bfa9f85caf9526dc7eb414f38cbe858a00922d Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Tue, 22 Nov 2022 14:55:55 +0000
Subject: [PATCH 591/826] Expand commit queue coverage of sdk builders on
 release branches.

Fixes: b/260075576
Change-Id: Idc1f18eb03f142cbfe82206b091c1bb042abb9b3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/271368
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 generated/commit-queue.cfg | 12 ------------
 lib/dart.star              | 20 +++++++++++++-------
 main.star                  | 10 +++++++++-
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 7b8a8d46eb1c..6ae5b5954839 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -212,7 +212,6 @@ config_groups {
       }
       builders {
         name: "dart/try/dart-sdk-linux-arm64-try"
-        includable_only: true
       }
       builders {
         name: "dart/try/dart-sdk-linux-riscv64-try"
@@ -220,15 +219,12 @@ config_groups {
       }
       builders {
         name: "dart/try/dart-sdk-linux-try"
-        includable_only: true
       }
       builders {
         name: "dart/try/dart-sdk-mac-arm64-try"
-        includable_only: true
       }
       builders {
         name: "dart/try/dart-sdk-mac-try"
-        includable_only: true
       }
       builders {
         name: "dart/try/dart-sdk-win-arm64-try"
@@ -1234,7 +1230,6 @@ config_groups {
       }
       builders {
         name: "dart/try/dart-sdk-linux-arm64-try"
-        includable_only: true
       }
       builders {
         name: "dart/try/dart-sdk-linux-riscv64-try"
@@ -1242,15 +1237,12 @@ config_groups {
       }
       builders {
         name: "dart/try/dart-sdk-linux-try"
-        includable_only: true
       }
       builders {
         name: "dart/try/dart-sdk-mac-arm64-try"
-        includable_only: true
       }
       builders {
         name: "dart/try/dart-sdk-mac-try"
-        includable_only: true
       }
       builders {
         name: "dart/try/dart-sdk-win-arm64-try"
@@ -3679,7 +3671,6 @@ config_groups {
       }
       builders {
         name: "dart/try/dart-sdk-linux-arm64-try"
-        includable_only: true
       }
       builders {
         name: "dart/try/dart-sdk-linux-riscv64-try"
@@ -3687,15 +3678,12 @@ config_groups {
       }
       builders {
         name: "dart/try/dart-sdk-linux-try"
-        includable_only: true
       }
       builders {
         name: "dart/try/dart-sdk-mac-arm64-try"
-        includable_only: true
       }
       builders {
         name: "dart/try/dart-sdk-mac-try"
-        includable_only: true
       }
       builders {
         name: "dart/try/dart-sdk-win-arm64-try"
diff --git a/lib/dart.star b/lib/dart.star
index c5d90a737aa3..809773aab372 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -88,6 +88,7 @@ def _try_builder(
         goma = None,
         location_filters = None,
         properties = None,
+        try_branches = _BRANCHES,
         on_cq = False):
     """Creates a Dart tryjob.
 
@@ -95,7 +96,7 @@ def _try_builder(
         name: The builder name.
         recipe: The recipe to use (defaults to "dart/neo").
         bucket: The bucket to use (defaults to "try").
-        cq_branches: Make try builder on these branches (defaults to _BRANCHES).
+        cq_branches: Branches to be on the commit queue (defaults: _BRANCHES).
         dimensions: Extra swarming dimensions required by this builder.
         execution_timeout: Time to allow for the build to run.
         experiment_percentage: What experiment percentage to use.
@@ -103,6 +104,7 @@ def _try_builder(
         goma: Whether to use goma or not.
         location_filters: Locations that trigger this tryjob.
         properties: Extra properties to set for builds.
+        try_branches: Branches to be a try builder for (defaults: _BRANCHES).
         on_cq: Whether the build is added to the default set of CQ tryjobs.
     """
     if on_cq and location_filters:
@@ -125,15 +127,14 @@ def _try_builder(
         properties = builder_properties,
         service_account = accounts.try_builder,
     )
-    includable_only = (not on_cq and not experiment_percentage and
-                       not location_filters)
-    for branch in cq_branches:
+    on_cq = on_cq or location_filters or experiment_percentage
+    for branch in try_branches:
         luci.cq_tryjob_verifier(
             builder = builder,
             cq_group = "sdk-%s" % branch,
             experiment_percentage = experiment_percentage,
             location_filters = location_filters,
-            includable_only = includable_only,
+            includable_only = not (on_cq and branch in cq_branches),
         )
     luci.list_view_entry(list_view = "cq", builder = builder)
 
@@ -161,6 +162,7 @@ def _builder(
         service_account = accounts.try_builder,
         triggered_by = ["dart-gitiles-trigger-%s"],
         triggering_policy = None,
+        try_branches = _BRANCHES,
         on_cq = False,
         experiment_percentage = None,
         location_filters = None):
@@ -174,7 +176,7 @@ def _builder(
         enabled: Whether this builder is currently running or not.
         category: Where to show the builder on the console.
         channels: Which other channels the builder should be added to.
-        cq_branches: Make try builder on these branches (defaults to _BRANCHES).
+        cq_branches: Branches to be on the commit queue (defaults: _BRANCHES).
         dimensions: Extra swarming dimensions required by this builder.
         executable: The Luci executable to use.
         execution_timeout: Time to allow for the build to run.
@@ -191,6 +193,7 @@ def _builder(
         service_account: The task service account to use (default: accounts.try_builder).
         triggered_by: What triggers this builder (defaults to standard trigger).
         triggering_policy: The triggering policy used by this builder.
+        try_branches: Branches to be a try builder for (defaults: _BRANCHES).
         on_cq: Whether the build is added to the default set of CQ tryjobs.
         experiment_percentage: What experiment percentage to use.
         location_filters: Locations that trigger this builder.
@@ -208,7 +211,9 @@ def _builder(
     expect_os("-linux", [linux["os"], focal["os"]])
     expect_os("-mac", mac["os"])
 
-    cq_branches = ["main"] + [branch for branch in channels if branch != "try"]
+    branches = ["main"] + channels
+    cq_branches = [branch for branch in cq_branches if branch in branches]
+    try_branches = [branch for branch in try_branches if branch in branches]
 
     def builder(channel, notifies, triggered_by):
         if channel == "try":
@@ -224,6 +229,7 @@ def _builder(
                 experiments = experiments,
                 goma = goma,
                 location_filters = location_filters,
+                try_branches = try_branches,
             )
         else:
             builder_properties = _with_goma(
diff --git a/main.star b/main.star
index ec42c10c2fc4..6447a6ef59a8 100755
--- a/main.star
+++ b/main.star
@@ -481,6 +481,7 @@ dart.ci_sandbox_builder(
 # sdk
 dart.try_builder(
     "dart-sdk-linux",
+    cq_branches = dart.release_channels,
     properties = {
         "$dart/build": {
             "timeout": 100 * 60,  # 100 minutes,
@@ -490,11 +491,13 @@ dart.try_builder(
         "disable_bcid": True,
         "upload_version": True,
     },
+    on_cq = True,
     recipe = "release/sdk",
 )
 
 dart.try_builder(
     "dart-sdk-linux-arm64",
+    cq_branches = dart.release_channels,
     properties = {
         "$dart/build": {
             "timeout": 100 * 60,  # 100 minutes,
@@ -502,6 +505,7 @@ dart.try_builder(
         "archs": ["arm", "arm64"],
         "disable_bcid": True,
     },
+    on_cq = True,
     recipe = "release/sdk",
 )
 
@@ -519,19 +523,23 @@ dart.try_builder(
 
 dart.try_builder(
     "dart-sdk-mac",
+    cq_branches = dart.release_channels,
     dimensions = mac,
     properties = [pinned_xcode, {"archs": ["x64"], "disable_bcid": True}],
+    on_cq = True,
     recipe = "release/sdk",
 )
 
 dart.try_builder(
     "dart-sdk-mac-arm64",
+    cq_branches = dart.release_channels,
     dimensions = [mac, arm64],
     properties = [
         no_android,
         pinned_xcode,
         {"archs": ["arm64"], "disable_bcid": True},
     ],
+    on_cq = True,
     recipe = "release/sdk",
 )
 
@@ -539,8 +547,8 @@ dart.try_builder(
     "dart-sdk-win",
     dimensions = windows,
     properties = {"archs": ["ia32", "x64"], "disable_bcid": True},
-    recipe = "release/sdk",
     on_cq = True,
+    recipe = "release/sdk",
 )
 
 dart.try_builder(

From 8f464da32e4c1abdc157a93f414e0ffbea7ceb8b Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 1 Dec 2022 09:40:31 +0000
Subject: [PATCH 592/826] [infra] Move dart2wasm from cron to path triggered

Fixes: b/260964415
Change-Id: I24bdfe8a53c0c643eba5e4b543308c0fcab3698a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/273141
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
Auto-Submit: Alexander Thomas <athom@google.com>
---
 dart2wasm.star               | 21 +++++++++++++++++++++
 generated/cr-buildbucket.cfg |  2 +-
 generated/luci-milo.cfg      | 26 +++++++++++++-------------
 generated/luci-notify.cfg    |  1 +
 generated/luci-scheduler.cfg | 21 ++++++++++++++++++++-
 main.star                    | 10 ++--------
 6 files changed, 58 insertions(+), 23 deletions(-)
 create mode 100644 dart2wasm.star

diff --git a/dart2wasm.star b/dart2wasm.star
new file mode 100644
index 000000000000..1791ae2bcf41
--- /dev/null
+++ b/dart2wasm.star
@@ -0,0 +1,21 @@
+# Copyright (c) 2022 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Defines the dart2wasm builders.
+"""
+
+load("//lib/dart.star", "dart")
+load("//lib/defaults.star", "emscripten")
+load("//lib/paths.star", "paths")
+
+dart.poller("dart2wasm-gitiles-trigger", branches = ["main"], paths = paths.dart2wasm)
+
+dart.ci_sandbox_builder(
+    "dart2wasm-linux-x64-d8",
+    category = "d2w|d",
+    channels = ["try"],
+    properties = emscripten,
+    location_filters = paths.to_location_filters(paths.dart2wasm),
+    triggered_by = ["dart2wasm-gitiles-trigger-%s"],
+)
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 72df25f9f407..534c34b22dad 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -2981,7 +2981,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index cffed55fc5bb..3dad30a8098a 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -28,15 +28,15 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/flutter-frontend-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/dart2wasm-linux-x64-d8-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/flutter-engine-linux-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/flutter-engine-linux-web_tests-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/dart2wasm-linux-x64-d8-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-x64-try"
   }
@@ -498,11 +498,6 @@ consoles {
     category: "cfe"
     short_name: "fl"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-x64-d8"
-    category: "d2w"
-    short_name: "d"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
     category: "flutter"
@@ -518,6 +513,11 @@ consoles {
     category: "flutter"
     short_name: "i"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-x64-d8"
+    category: "d2w"
+    short_name: "d"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
     category: "vm|nnbd|jit"
@@ -1233,11 +1233,6 @@ consoles {
     category: "cfe"
     short_name: "fl"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-x64-d8"
-    category: "d2w"
-    short_name: "d"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
     category: "flutter"
@@ -1253,6 +1248,11 @@ consoles {
     category: "flutter"
     short_name: "i"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-x64-d8"
+    category: "d2w"
+    short_name: "d"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 30eb7b800bd9..7506a5409330 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -242,6 +242,7 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 22db2de783c5..a9a09608583b 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -3484,7 +3484,6 @@ trigger {
   schedule: "0 5 * * *"
   triggers: "app-kernel-linux-product-x64"
   triggers: "cross-vm-precomp-linux-release-arm64"
-  triggers: "dart2wasm-linux-x64-d8"
   triggers: "ddc-canary-linux-release-chrome"
   triggers: "front-end-nnbd-mac-release-x64"
   triggers: "front-end-nnbd-win-release-x64"
@@ -3604,3 +3603,23 @@ trigger {
     refs: "regexp:refs/heads/main"
   }
 }
+trigger {
+  id: "dart2wasm-gitiles-trigger-main"
+  realm: "ci"
+  triggers: "dart2wasm-linux-x64-d8"
+  gitiles {
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/main"
+    path_regexps: "DEPS"
+    path_regexps: "build/.+"
+    path_regexps: "BUILD.gn"
+    path_regexps: "sdk_args.gni"
+    path_regexps: ".dart_tool/package_config.json"
+    path_regexps: "sdk/.+"
+    path_regexps: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+    path_regexps: "tools/bots/test_matrix.json"
+    path_regexps: "tests/.+"
+    path_regexps: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+    path_regexps: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
+  }
+}
diff --git a/main.star b/main.star
index 6447a6ef59a8..53d5236d5c30 100755
--- a/main.star
+++ b/main.star
@@ -18,7 +18,6 @@ load(
     "//lib/defaults.star",
     "arm64",
     "chrome",
-    "emscripten",
     "experimental",
     "firefox",
     "focal",
@@ -282,13 +281,6 @@ cron.weekly_builder(
     channels = [],
     execution_timeout = 12 * time.hour,
 )
-cron.nightly_builder(
-    "dart2wasm-linux-x64-d8",
-    category = "d2w|d",
-    channels = ["try"],
-    properties = emscripten,
-    location_filters = paths.to_location_filters(paths.dart2wasm),
-)
 
 # flutter
 dart.ci_sandbox_builder(
@@ -336,6 +328,8 @@ dart.ci_builder(
     notifies = None,
 )
 
+exec("//dart2wasm.star")
+
 vm = exec("//vm.star")
 
 # pkg

From d7817708e7da68d29773290948a8dc296e138a8f Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 7 Dec 2022 04:02:10 +0000
Subject: [PATCH 593/826] Revert "Expand commit queue coverage of sdk builders
 on release branches."

This reverts commit a4bfa9f85caf9526dc7eb414f38cbe858a00922d.

Change-Id: I34f702c3461c37e6284cf1ff71a1aaca05ea0d45
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/272060
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 generated/commit-queue.cfg | 12 ++++++++++++
 lib/dart.star              | 20 +++++++-------------
 main.star                  | 10 +---------
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 6ae5b5954839..7b8a8d46eb1c 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -212,6 +212,7 @@ config_groups {
       }
       builders {
         name: "dart/try/dart-sdk-linux-arm64-try"
+        includable_only: true
       }
       builders {
         name: "dart/try/dart-sdk-linux-riscv64-try"
@@ -219,12 +220,15 @@ config_groups {
       }
       builders {
         name: "dart/try/dart-sdk-linux-try"
+        includable_only: true
       }
       builders {
         name: "dart/try/dart-sdk-mac-arm64-try"
+        includable_only: true
       }
       builders {
         name: "dart/try/dart-sdk-mac-try"
+        includable_only: true
       }
       builders {
         name: "dart/try/dart-sdk-win-arm64-try"
@@ -1230,6 +1234,7 @@ config_groups {
       }
       builders {
         name: "dart/try/dart-sdk-linux-arm64-try"
+        includable_only: true
       }
       builders {
         name: "dart/try/dart-sdk-linux-riscv64-try"
@@ -1237,12 +1242,15 @@ config_groups {
       }
       builders {
         name: "dart/try/dart-sdk-linux-try"
+        includable_only: true
       }
       builders {
         name: "dart/try/dart-sdk-mac-arm64-try"
+        includable_only: true
       }
       builders {
         name: "dart/try/dart-sdk-mac-try"
+        includable_only: true
       }
       builders {
         name: "dart/try/dart-sdk-win-arm64-try"
@@ -3671,6 +3679,7 @@ config_groups {
       }
       builders {
         name: "dart/try/dart-sdk-linux-arm64-try"
+        includable_only: true
       }
       builders {
         name: "dart/try/dart-sdk-linux-riscv64-try"
@@ -3678,12 +3687,15 @@ config_groups {
       }
       builders {
         name: "dart/try/dart-sdk-linux-try"
+        includable_only: true
       }
       builders {
         name: "dart/try/dart-sdk-mac-arm64-try"
+        includable_only: true
       }
       builders {
         name: "dart/try/dart-sdk-mac-try"
+        includable_only: true
       }
       builders {
         name: "dart/try/dart-sdk-win-arm64-try"
diff --git a/lib/dart.star b/lib/dart.star
index 809773aab372..c5d90a737aa3 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -88,7 +88,6 @@ def _try_builder(
         goma = None,
         location_filters = None,
         properties = None,
-        try_branches = _BRANCHES,
         on_cq = False):
     """Creates a Dart tryjob.
 
@@ -96,7 +95,7 @@ def _try_builder(
         name: The builder name.
         recipe: The recipe to use (defaults to "dart/neo").
         bucket: The bucket to use (defaults to "try").
-        cq_branches: Branches to be on the commit queue (defaults: _BRANCHES).
+        cq_branches: Make try builder on these branches (defaults to _BRANCHES).
         dimensions: Extra swarming dimensions required by this builder.
         execution_timeout: Time to allow for the build to run.
         experiment_percentage: What experiment percentage to use.
@@ -104,7 +103,6 @@ def _try_builder(
         goma: Whether to use goma or not.
         location_filters: Locations that trigger this tryjob.
         properties: Extra properties to set for builds.
-        try_branches: Branches to be a try builder for (defaults: _BRANCHES).
         on_cq: Whether the build is added to the default set of CQ tryjobs.
     """
     if on_cq and location_filters:
@@ -127,14 +125,15 @@ def _try_builder(
         properties = builder_properties,
         service_account = accounts.try_builder,
     )
-    on_cq = on_cq or location_filters or experiment_percentage
-    for branch in try_branches:
+    includable_only = (not on_cq and not experiment_percentage and
+                       not location_filters)
+    for branch in cq_branches:
         luci.cq_tryjob_verifier(
             builder = builder,
             cq_group = "sdk-%s" % branch,
             experiment_percentage = experiment_percentage,
             location_filters = location_filters,
-            includable_only = not (on_cq and branch in cq_branches),
+            includable_only = includable_only,
         )
     luci.list_view_entry(list_view = "cq", builder = builder)
 
@@ -162,7 +161,6 @@ def _builder(
         service_account = accounts.try_builder,
         triggered_by = ["dart-gitiles-trigger-%s"],
         triggering_policy = None,
-        try_branches = _BRANCHES,
         on_cq = False,
         experiment_percentage = None,
         location_filters = None):
@@ -176,7 +174,7 @@ def _builder(
         enabled: Whether this builder is currently running or not.
         category: Where to show the builder on the console.
         channels: Which other channels the builder should be added to.
-        cq_branches: Branches to be on the commit queue (defaults: _BRANCHES).
+        cq_branches: Make try builder on these branches (defaults to _BRANCHES).
         dimensions: Extra swarming dimensions required by this builder.
         executable: The Luci executable to use.
         execution_timeout: Time to allow for the build to run.
@@ -193,7 +191,6 @@ def _builder(
         service_account: The task service account to use (default: accounts.try_builder).
         triggered_by: What triggers this builder (defaults to standard trigger).
         triggering_policy: The triggering policy used by this builder.
-        try_branches: Branches to be a try builder for (defaults: _BRANCHES).
         on_cq: Whether the build is added to the default set of CQ tryjobs.
         experiment_percentage: What experiment percentage to use.
         location_filters: Locations that trigger this builder.
@@ -211,9 +208,7 @@ def _builder(
     expect_os("-linux", [linux["os"], focal["os"]])
     expect_os("-mac", mac["os"])
 
-    branches = ["main"] + channels
-    cq_branches = [branch for branch in cq_branches if branch in branches]
-    try_branches = [branch for branch in try_branches if branch in branches]
+    cq_branches = ["main"] + [branch for branch in channels if branch != "try"]
 
     def builder(channel, notifies, triggered_by):
         if channel == "try":
@@ -229,7 +224,6 @@ def _builder(
                 experiments = experiments,
                 goma = goma,
                 location_filters = location_filters,
-                try_branches = try_branches,
             )
         else:
             builder_properties = _with_goma(
diff --git a/main.star b/main.star
index 53d5236d5c30..12e998489786 100755
--- a/main.star
+++ b/main.star
@@ -475,7 +475,6 @@ dart.ci_sandbox_builder(
 # sdk
 dart.try_builder(
     "dart-sdk-linux",
-    cq_branches = dart.release_channels,
     properties = {
         "$dart/build": {
             "timeout": 100 * 60,  # 100 minutes,
@@ -485,13 +484,11 @@ dart.try_builder(
         "disable_bcid": True,
         "upload_version": True,
     },
-    on_cq = True,
     recipe = "release/sdk",
 )
 
 dart.try_builder(
     "dart-sdk-linux-arm64",
-    cq_branches = dart.release_channels,
     properties = {
         "$dart/build": {
             "timeout": 100 * 60,  # 100 minutes,
@@ -499,7 +496,6 @@ dart.try_builder(
         "archs": ["arm", "arm64"],
         "disable_bcid": True,
     },
-    on_cq = True,
     recipe = "release/sdk",
 )
 
@@ -517,23 +513,19 @@ dart.try_builder(
 
 dart.try_builder(
     "dart-sdk-mac",
-    cq_branches = dart.release_channels,
     dimensions = mac,
     properties = [pinned_xcode, {"archs": ["x64"], "disable_bcid": True}],
-    on_cq = True,
     recipe = "release/sdk",
 )
 
 dart.try_builder(
     "dart-sdk-mac-arm64",
-    cq_branches = dart.release_channels,
     dimensions = [mac, arm64],
     properties = [
         no_android,
         pinned_xcode,
         {"archs": ["arm64"], "disable_bcid": True},
     ],
-    on_cq = True,
     recipe = "release/sdk",
 )
 
@@ -541,8 +533,8 @@ dart.try_builder(
     "dart-sdk-win",
     dimensions = windows,
     properties = {"archs": ["ia32", "x64"], "disable_bcid": True},
-    on_cq = True,
     recipe = "release/sdk",
+    on_cq = True,
 )
 
 dart.try_builder(

From c4dd30a21222b12b2a099ebdec98646bb740e489 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 7 Dec 2022 04:02:10 +0000
Subject: [PATCH 594/826] Use location filters to trigger SDK builders

Change-Id: I24da9078d35bf0a714d2872e556aeb32cc6d2474
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/272061
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 generated/commit-queue.cfg | 120 ++++++++++++++++++++++++++++++-------
 lib/paths.star             |   6 ++
 main.star                  |   5 ++
 3 files changed, 111 insertions(+), 20 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 7b8a8d46eb1c..54d39c7be86f 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -212,7 +212,11 @@ config_groups {
       }
       builders {
         name: "dart/try/dart-sdk-linux-arm64-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/VERSION"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-linux-riscv64-try"
@@ -220,19 +224,35 @@ config_groups {
       }
       builders {
         name: "dart/try/dart-sdk-linux-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/VERSION"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-mac-arm64-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/VERSION"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-mac-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/VERSION"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-win-arm64-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/VERSION"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-win-try"
@@ -1234,7 +1254,11 @@ config_groups {
       }
       builders {
         name: "dart/try/dart-sdk-linux-arm64-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/VERSION"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-linux-riscv64-try"
@@ -1242,19 +1266,35 @@ config_groups {
       }
       builders {
         name: "dart/try/dart-sdk-linux-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/VERSION"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-mac-arm64-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/VERSION"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-mac-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/VERSION"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-win-arm64-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/VERSION"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-win-try"
@@ -2291,7 +2331,11 @@ config_groups {
       }
       builders {
         name: "dart/try/dart-sdk-linux-arm64-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/VERSION"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-linux-riscv64-try"
@@ -2299,19 +2343,35 @@ config_groups {
       }
       builders {
         name: "dart/try/dart-sdk-linux-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/VERSION"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-mac-arm64-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/VERSION"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-mac-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/VERSION"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-win-arm64-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/VERSION"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-win-try"
@@ -3679,7 +3739,11 @@ config_groups {
       }
       builders {
         name: "dart/try/dart-sdk-linux-arm64-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/VERSION"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-linux-riscv64-try"
@@ -3687,19 +3751,35 @@ config_groups {
       }
       builders {
         name: "dart/try/dart-sdk-linux-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/VERSION"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-mac-arm64-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/VERSION"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-mac-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/VERSION"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-win-arm64-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/VERSION"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-win-try"
diff --git a/lib/paths.star b/lib/paths.star
index d5c2c1d592e2..87da5c45b697 100644
--- a/lib/paths.star
+++ b/lib/paths.star
@@ -65,6 +65,11 @@ _DART2WASM_PATHS = _CFE_PATHS + [
     "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+",
 ]
 
+_RELEASE_PATHS = [
+    # Paths that trigger release tryjobs
+    "tools/VERSION",
+]
+
 def _to_location_filters(paths):
     return [cq.location_filter(path_regexp = path) for path in paths]
 
@@ -76,6 +81,7 @@ paths = struct(
     dart2js = _DART2JS_PATHS,
     dart2wasm = _DART2WASM_PATHS,
     ddc = _DDC_PATHS,
+    release = _RELEASE_PATHS,
     standard = _STANDARD_PATHS,
     test_py = _TEST_PY_PATHS,
     vm = _VM_PATHS,
diff --git a/main.star b/main.star
index 12e998489786..398a0bec3169 100755
--- a/main.star
+++ b/main.star
@@ -484,6 +484,7 @@ dart.try_builder(
         "disable_bcid": True,
         "upload_version": True,
     },
+    location_filters = paths.to_location_filters(paths.release),
     recipe = "release/sdk",
 )
 
@@ -496,6 +497,7 @@ dart.try_builder(
         "archs": ["arm", "arm64"],
         "disable_bcid": True,
     },
+    location_filters = paths.to_location_filters(paths.release),
     recipe = "release/sdk",
 )
 
@@ -515,6 +517,7 @@ dart.try_builder(
     "dart-sdk-mac",
     dimensions = mac,
     properties = [pinned_xcode, {"archs": ["x64"], "disable_bcid": True}],
+    location_filters = paths.to_location_filters(paths.release),
     recipe = "release/sdk",
 )
 
@@ -526,6 +529,7 @@ dart.try_builder(
         pinned_xcode,
         {"archs": ["arm64"], "disable_bcid": True},
     ],
+    location_filters = paths.to_location_filters(paths.release),
     recipe = "release/sdk",
 )
 
@@ -541,6 +545,7 @@ dart.try_builder(
     "dart-sdk-win-arm64",
     dimensions = windows,
     properties = {"archs": ["arm64"], "disable_bcid": True},
+    location_filters = paths.to_location_filters(paths.release),
     recipe = "release/sdk",
 )
 

From 8bac47bb4fcea4d41bcb8c902c1c34852a335526 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Thu, 8 Dec 2022 08:53:33 +0000
Subject: [PATCH 595/826] [monorepo] Add monorepo try builder on main channel

Add a try builder for the monorepo builder, on the main channel only.
The builder is not on the CQ by default.

Bug: b/251733652
Change-Id: I47da8e13cdb50a3f22dcaf45200c297354228f1e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/273940
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/commit-queue.cfg   |   4 +
 generated/cr-buildbucket.cfg | 638 +++++++++++++++++++++++++----------
 generated/luci-milo.cfg      |  37 +-
 generated/luci-scheduler.cfg |  22 +-
 generated/project.cfg        |   3 +-
 lib/dart.star                |  14 +-
 lib/defaults.star            |   8 +-
 monorepo.star                |  40 ++-
 8 files changed, 541 insertions(+), 225 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 54d39c7be86f..a5429dd98d6b 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -2974,6 +2974,10 @@ config_groups {
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
       }
+      builders {
+        name: "dart/try/flutter-linux-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/front-end-linux-release-x64-try"
       }
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 534c34b22dad..8ea079098a03 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -3757,14 +3757,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-engine-linux"
+      name: "flutter-android-debug"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -3781,19 +3781,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "flutter_test_suites": ['
-        '    "add_to_app_life_cycle_tests",'
-        '    "flutter_plugins",'
-        '    "framework_coverage",'
-        '    "framework_tests",'
-        '    "tool_tests"'
-        '  ],'
-        '  "recipe": "dart/flutter_engine"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
-      execution_timeout_secs: 28800
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3802,14 +3794,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-engine-linux-web_tests"
+      name: "flutter-android-profile"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -3826,16 +3818,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "flutter_test_suites": ['
-        '    "web_tests",'
-        '    "web_tool_tests"'
-        '  ],'
-        '  "recipe": "dart/flutter_engine"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
-      execution_timeout_secs: 28800
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3844,7 +3831,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-frontend"
+      name: "flutter-engine-linux"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -3868,10 +3855,19 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "flutter_test_suites": ['
+        '    "add_to_app_life_cycle_tests",'
+        '    "flutter_plugins",'
+        '    "framework_coverage",'
+        '    "framework_tests",'
+        '    "tool_tests"'
+        '  ],'
+        '  "recipe": "dart/flutter_engine"'
         '}'
       priority: 50
+      execution_timeout_secs: 28800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3880,7 +3876,7 @@ buckets {
       }
     }
     builders {
-      name: "front-end-linux-release-x64"
+      name: "flutter-engine-linux-web_tests"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -3904,10 +3900,16 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "flutter_test_suites": ['
+        '    "web_tests",'
+        '    "web_tool_tests"'
+        '  ],'
+        '  "recipe": "dart/flutter_engine"'
         '}'
       priority: 50
+      execution_timeout_secs: 28800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3916,7 +3918,7 @@ buckets {
       }
     }
     builders {
-      name: "front-end-linux-release-x64-beta"
+      name: "flutter-frontend"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -3952,14 +3954,14 @@ buckets {
       }
     }
     builders {
-      name: "front-end-linux-release-x64-dev"
+      name: "flutter-linux"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -3970,6 +3972,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$fuchsia/goma": {'
+        '    "server": "goma.chromium.org"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3977,9 +3982,13 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "config_name": "host_linux",'
+        '  "environment": "unused",'
+        '  "goma_jobs": "200",'
+        '  "recipe": "engine_v2/engine_v2"'
         '}'
       priority: 50
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3988,14 +3997,14 @@ buckets {
       }
     }
     builders {
-      name: "front-end-linux-release-x64-stable"
+      name: "flutter-linux-debug"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -4013,9 +4022,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4024,27 +4034,24 @@ buckets {
       }
     }
     builders {
-      name: "front-end-mac-release-x64"
+      name: "flutter-linux-debug-unopt"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4052,13 +4059,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4067,27 +4071,24 @@ buckets {
       }
     }
     builders {
-      name: "front-end-mac-release-x64-beta"
+      name: "flutter-linux-profile"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4095,13 +4096,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4110,27 +4108,24 @@ buckets {
       }
     }
     builders {
-      name: "front-end-mac-release-x64-dev"
+      name: "flutter-linux-release"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4138,13 +4133,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4153,27 +4145,24 @@ buckets {
       }
     }
     builders {
-      name: "front-end-mac-release-x64-stable"
+      name: "flutter-tester"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4181,13 +4170,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4196,7 +4182,7 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-linux-release-x64"
+      name: "front-end-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4232,7 +4218,7 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-linux-release-x64-beta"
+      name: "front-end-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4268,7 +4254,7 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-linux-release-x64-dev"
+      name: "front-end-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4304,7 +4290,7 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-linux-release-x64-stable"
+      name: "front-end-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4340,7 +4326,7 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-mac-release-x64"
+      name: "front-end-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4370,7 +4356,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
@@ -4383,11 +4369,11 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-win-release-x64"
+      name: "front-end-mac-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4401,6 +4387,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4410,7 +4399,11 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4419,11 +4412,11 @@ buckets {
       }
     }
     builders {
-      name: "front-end-win-release-x64"
+      name: "front-end-mac-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4437,6 +4430,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4447,6 +4443,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4455,11 +4455,11 @@ buckets {
       }
     }
     builders {
-      name: "front-end-win-release-x64-beta"
+      name: "front-end-mac-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4473,6 +4473,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4483,6 +4486,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4491,11 +4498,11 @@ buckets {
       }
     }
     builders {
-      name: "front-end-win-release-x64-dev"
+      name: "front-end-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4505,7 +4512,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -4527,11 +4534,11 @@ buckets {
       }
     }
     builders {
-      name: "front-end-win-release-x64-stable"
+      name: "front-end-nnbd-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4541,7 +4548,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -4563,7 +4570,7 @@ buckets {
       }
     }
     builders {
-      name: "frontend-weekly"
+      name: "front-end-nnbd-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4590,8 +4597,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      execution_timeout_secs: 43200
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4600,7 +4606,7 @@ buckets {
       }
     }
     builders {
-      name: "fuzz-linux"
+      name: "front-end-nnbd-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4636,11 +4642,11 @@ buckets {
       }
     }
     builders {
-      name: "gclient"
+      name: "front-end-nnbd-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4650,10 +4656,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4661,9 +4670,13 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/gclient"'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4672,11 +4685,11 @@ buckets {
       }
     }
     builders {
-      name: "gclient-beta"
+      name: "front-end-nnbd-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4686,7 +4699,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -4697,9 +4710,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/gclient"'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4708,11 +4721,11 @@ buckets {
       }
     }
     builders {
-      name: "gclient-dev"
+      name: "front-end-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4722,7 +4735,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -4733,7 +4746,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/gclient"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -4744,11 +4757,11 @@ buckets {
       }
     }
     builders {
-      name: "gclient-stable"
+      name: "front-end-win-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4758,7 +4771,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -4769,7 +4782,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/gclient"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -4780,11 +4793,11 @@ buckets {
       }
     }
     builders {
-      name: "google"
+      name: "front-end-win-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4794,7 +4807,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -4805,10 +4818,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/external"'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 30
-      execution_timeout_secs: 300
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4817,11 +4829,11 @@ buckets {
       }
     }
     builders {
-      name: "iso-stress-linux"
+      name: "front-end-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4831,7 +4843,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -4842,8 +4854,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -4854,14 +4865,14 @@ buckets {
       }
     }
     builders {
-      name: "monorepo-android-debug"
+      name: "frontend-weekly"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -4879,10 +4890,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 50
-      execution_timeout_secs: 3600
+      priority: 70
+      execution_timeout_secs: 43200
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4891,14 +4902,14 @@ buckets {
       }
     }
     builders {
-      name: "monorepo-android-profile"
+      name: "fuzz-linux"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -4916,10 +4927,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4928,14 +4938,14 @@ buckets {
       }
     }
     builders {
-      name: "monorepo-engine-v2"
+      name: "gclient"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -4946,9 +4956,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$fuchsia/goma": {'
-        '    "server": "goma.chromium.org"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4956,13 +4963,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "config_name": "host_linux",'
-        '  "environment": "unused",'
-        '  "goma_jobs": "200",'
-        '  "recipe": "engine_v2/engine_v2"'
+        '  "recipe": "dart/gclient"'
         '}'
       priority: 50
-      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4971,14 +4974,14 @@ buckets {
       }
     }
     builders {
-      name: "monorepo-host-debug"
+      name: "gclient-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -4996,10 +4999,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "dart/gclient"'
         '}'
       priority: 50
-      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5008,14 +5010,14 @@ buckets {
       }
     }
     builders {
-      name: "monorepo-host-debug-unopt"
+      name: "gclient-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -5033,10 +5035,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "dart/gclient"'
         '}'
       priority: 50
-      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5045,14 +5046,14 @@ buckets {
       }
     }
     builders {
-      name: "monorepo-host-profile"
+      name: "gclient-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -5070,10 +5071,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "dart/gclient"'
         '}'
       priority: 50
-      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5082,14 +5082,14 @@ buckets {
       }
     }
     builders {
-      name: "monorepo-host-release"
+      name: "google"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -5107,10 +5107,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "dart/external"'
         '}'
-      priority: 50
-      execution_timeout_secs: 3600
+      priority: 30
+      execution_timeout_secs: 300
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5119,14 +5119,14 @@ buckets {
       }
     }
     builders {
-      name: "monorepo-tester"
+      name: "iso-stress-linux"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -5144,10 +5144,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
-      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13960,6 +13960,80 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "flutter-android-debug-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-android-profile-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "flutter-engine-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -14083,6 +14157,198 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "flutter-linux-debug-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-linux-debug-unopt-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-linux-profile-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-linux-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-linux-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$fuchsia/goma": {'
+        '    "server": "goma.chromium.org"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "builder_name_suffix": "-try",'
+        '  "clobber": true,'
+        '  "config_name": "host_linux",'
+        '  "environment": "unused",'
+        '  "goma_jobs": "200",'
+        '  "recipe": "engine_v2/engine_v2"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "front-end-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 3dad30a8098a..a47d9c70814d 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -415,6 +415,27 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/monorepo-roller-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/flutter-linux-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/flutter-android-debug-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/flutter-android-profile-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/flutter-linux-debug-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/flutter-linux-debug-unopt-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/flutter-linux-profile-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/flutter-linux-release-try"
+  }
   builder_view_only: true
 }
 consoles {
@@ -3160,42 +3181,42 @@ consoles {
   refs: "regexp:refs/heads/main"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/monorepo-engine-v2"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux"
     category: "coordinator"
     short_name: "engine"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/monorepo-android-debug"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-android-debug"
     category: "build"
     short_name: "android-debug"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/monorepo-android-profile"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-android-profile"
     category: "build"
     short_name: "android-profile"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/monorepo-host-debug"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-debug"
     category: "build"
     short_name: "debug"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/monorepo-host-debug-unopt"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-debug-unopt"
     category: "build"
     short_name: "debug-unopt"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/monorepo-host-profile"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-profile"
     category: "build"
     short_name: "profile"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/monorepo-host-release"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-release"
     category: "build"
     short_name: "release"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/monorepo-tester"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-tester"
     category: "test"
     short_name: "tester"
   }
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index a9a09608583b..bbe2c9428c7c 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -964,6 +964,16 @@ job {
     builder: "flutter-frontend"
   }
 }
+job {
+  id: "flutter-linux"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "flutter-linux"
+  }
+}
 job {
   id: "front-end-linux-release-x64"
   realm: "ci.sandbox"
@@ -1224,16 +1234,6 @@ job {
     builder: "iso-stress-linux"
   }
 }
-job {
-  id: "monorepo-engine-v2"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "monorepo-engine-v2"
-  }
-}
 job {
   id: "pkg-linux-debug"
   realm: "ci.sandbox"
@@ -3403,7 +3403,7 @@ trigger {
 trigger {
   id: "dart-gitiles-trigger-monorepo"
   realm: "ci"
-  triggers: "monorepo-engine-v2"
+  triggers: "flutter-linux"
   gitiles {
     repo: "https://dart.googlesource.com/monorepo/"
     refs: "regexp:refs/heads/main"
diff --git a/generated/project.cfg b/generated/project.cfg
index 3790482f563e..a58509da9248 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,11 +7,10 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.33.7"
+  version: "1.35.2"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
-  experiments: "crbug.com/1171945"
   experiments: "crbug.com/1182002"
   experiments: "crbug.com/1347252"
 }
diff --git a/lib/dart.star b/lib/dart.star
index c5d90a737aa3..44a866824b43 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -82,11 +82,13 @@ def _try_builder(
         bucket = "try",
         cq_branches = _BRANCHES,
         dimensions = None,
+        executable = None,
         execution_timeout = None,
         experiment_percentage = None,
         experiments = None,
         goma = None,
         location_filters = None,
+        pool = "luci.dart.try",
         properties = None,
         on_cq = False):
     """Creates a Dart tryjob.
@@ -97,18 +99,20 @@ def _try_builder(
         bucket: The bucket to use (defaults to "try").
         cq_branches: Make try builder on these branches (defaults to _BRANCHES).
         dimensions: Extra swarming dimensions required by this builder.
+        executable: The Luci executable to use.
         execution_timeout: Time to allow for the build to run.
         experiment_percentage: What experiment percentage to use.
         experiments: Experiments to run on this builder, with percentages.
         goma: Whether to use goma or not.
         location_filters: Locations that trigger this tryjob.
+        pool: The pool to set in dimensions (defaults to "luci.dart.try").
         properties: Extra properties to set for builds.
         on_cq: Whether the build is added to the default set of CQ tryjobs.
     """
     if on_cq and location_filters:
         fail("Can't be on the default CQ and conditionally on the CQ")
     dimensions = defaults.dimensions(dimensions)
-    dimensions["pool"] = "luci.dart.try"
+    dimensions["pool"] = pool
     properties = defaults.properties(properties)
     builder_properties = _with_goma(goma, dimensions, properties)
     builder = name + "-try"
@@ -118,7 +122,7 @@ def _try_builder(
         bucket = bucket,
         caches = defaults.caches(dimensions["os"]),
         dimensions = dimensions,
-        executable = _recipe(recipe),
+        executable = executable or _recipe(recipe),
         execution_timeout = execution_timeout,
         experiments = experiments,
         priority = priority.high,
@@ -153,7 +157,6 @@ def _builder(
         expiration_timeout = None,
         goma = None,
         fyi = False,
-        main_channel = True,
         notifies = "dart",
         priority = priority.normal,
         properties = None,
@@ -183,7 +186,6 @@ def _builder(
         expiration_timeout: How long builds should wait for a bot to run on.
         goma: Whether to use goma or not.
         fyi: Whether this is an FYI builder or not.
-        main_channel: Whether to add to the main channel (default: True).
         notifies: Which luci notifier group to notify (default: "dart").
         priority: What swarming priority this builder gets (default: NORMAL).
         properties: Extra properties to set for builds.
@@ -219,6 +221,7 @@ def _builder(
                 dimensions = dimensions,
                 properties = properties,
                 on_cq = on_cq,
+                executable = executable,
                 execution_timeout = execution_timeout,
                 experiment_percentage = experiment_percentage,
                 experiments = experiments,
@@ -284,8 +287,7 @@ def _builder(
                             console_view = "alt",
                         )
 
-    if main_channel:
-        builder(None, notifies = notifies, triggered_by = triggered_by)
+    builder(None, notifies = notifies, triggered_by = triggered_by)
     for _channel in channels:
         if enabled:
             builder(_channel, notifies = None, triggered_by = triggered_by)
diff --git a/lib/defaults.star b/lib/defaults.star
index bff7b9d5dc77..4ab7a4d79e78 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -34,9 +34,11 @@ _EXPERIMENTAL = {"host_class": "experimental"}
 def _union(x, overrides):
     """ Creates a new dict with the values from all passed dictionaries
 
-    If dicts contain the same keys, their values are assumed to be dicts
-    and merged. Values in dicts later in overrides' sub-dicts will overwrite
-    values in earlier sub-dicts.
+    If dicts contain the same keys, their values are merged if the values are
+    dicts. This merging only happens at the top level, not recursively into
+    dicts containing dicts.
+    Otherwise, the earlier value is overwritten by the value from the
+    later override.
 
     Args:
         x (dict): A dict.
diff --git a/monorepo.star b/monorepo.star
index 3dddb8f189e6..23ac97f2c39e 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -17,7 +17,7 @@ luci.console_view(
 )
 
 dart.ci_sandbox_builder(
-    name = "monorepo-engine-v2",
+    name = "flutter-linux",
     channels = [],
     executable = dart.flutter_recipe("engine_v2/engine_v2"),
     execution_timeout = 60 * time.minute,
@@ -33,11 +33,25 @@ dart.ci_sandbox_builder(
     schedule = "triggered",
 )
 luci.console_view_entry(
-    builder = "monorepo-engine-v2",
+    builder = "flutter-linux",
     short_name = "engine",
     category = "coordinator",
     console_view = "monorepo",
 )
+dart.try_builder(
+    "flutter-linux",
+    executable = dart.flutter_recipe("engine_v2/engine_v2"),
+    execution_timeout = 60 * time.minute,
+    properties = {
+        "$fuchsia/goma": {"server": "goma.chromium.org"},
+        "builder_name_suffix": "-try",
+        "config_name": "host_linux",
+        "environment": "unused",
+        "goma_jobs": "200",
+    },
+    on_cq = False,
+    cq_branches = ["main"],
+)
 
 def monorepo_builder(name, short_name, category):
     dart.ci_sandbox_builder(
@@ -57,13 +71,21 @@ def monorepo_builder(name, short_name, category):
         category = category,
         console_view = "monorepo",
     )
+    dart.try_builder(
+        name,
+        executable = dart.flutter_recipe("engine_v2/builder"),
+        execution_timeout = 60 * time.minute,
+        pool = "dart.tests",
+        on_cq = False,
+        cq_branches = [],
+    )
 
-monorepo_builder("monorepo-android-debug", "android-debug", "build")
-monorepo_builder("monorepo-android-profile", "android-profile", "build")
-monorepo_builder("monorepo-host-debug", "debug", "build")
-monorepo_builder("monorepo-host-debug-unopt", "debug-unopt", "build")
-monorepo_builder("monorepo-host-profile", "profile", "build")
-monorepo_builder("monorepo-host-release", "release", "build")
+monorepo_builder("flutter-android-debug", "android-debug", "build")
+monorepo_builder("flutter-android-profile", "android-profile", "build")
+monorepo_builder("flutter-linux-debug", "debug", "build")
+monorepo_builder("flutter-linux-debug-unopt", "debug-unopt", "build")
+monorepo_builder("flutter-linux-profile", "profile", "build")
+monorepo_builder("flutter-linux-release", "release", "build")
 
 def monorepo_tester(name, short_name, category):
     dart.ci_sandbox_builder(
@@ -84,4 +106,4 @@ def monorepo_tester(name, short_name, category):
         console_view = "monorepo",
     )
 
-monorepo_tester("monorepo-tester", "tester", "test")
+monorepo_tester("flutter-tester", "tester", "test")

From 3b3a0558d7910f4ea93ff79e8d98c432a6a89c56 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Thu, 8 Dec 2022 13:57:48 +0000
Subject: [PATCH 596/826] Give try service account access to trigger builds in
 try bucket

The monorepo try builds have a coordinator running with the service account
dart-luci-try-builder@dart-ci.iam.gserviceaccount.com
that needs to start the individual builds on the try builders,
which are in the try bucket.

The CI monorepo jobs work because they run with the same try service account,
and that account already has buildbucket.add permission for the
ci.sandbox bucket. Since the try bucket doesn't need to be more secure
than the ci.sandbox bucket, adding the permission seems fine.

Bug: b/251733652
Change-Id: I558871f0e4833aab9466488dcfe95da9122e7c51
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/274380
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/realms.cfg |  1 +
 project.star         | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/generated/realms.cfg b/generated/realms.cfg
index 1cb745e4f1a2..f7e9121e3352 100644
--- a/generated/realms.cfg
+++ b/generated/realms.cfg
@@ -126,6 +126,7 @@ realms {
     principals: "group:project-dart-tryjob-access"
     principals: "group:service-account-cq"
     principals: "user:dart-eng-tool-proxy@system.gserviceaccount.com"
+    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
   }
   bindings {
     role: "role/swarming.taskTriggerer"
diff --git a/project.star b/project.star
index 15a665a55670..b155dfccf6bd 100644
--- a/project.star
+++ b/project.star
@@ -21,6 +21,7 @@ ROLL_TRIGGERERS = {
 }
 CI_SANDBOX_TRIGGERERS = [
     accounts.ci_builder,
+    # Build bisection and monorepo ci both trigger builds from other builds.
     accounts.try_builder,
     "dart-internal-cbuild@dart-ci-internal.iam.gserviceaccount.com",
 ]
@@ -103,11 +104,15 @@ TRY_ACLS = [
 luci.bucket(
     name = "try",
     acls = TRY_ACLS + [
-        # For workflows that need to be authorized by Google-internal
-        # approval mechanisms, see b/231131625
         acl.entry(
             acl.BUILDBUCKET_TRIGGERER,
-            users = ["dart-eng-tool-proxy@system.gserviceaccount.com"],
+            users = [
+                # For workflows that need to be authorized by Google-internal
+                # approval mechanisms, see b/231131625
+                "dart-eng-tool-proxy@system.gserviceaccount.com",
+                # Monorepo builds use a coordinator build to add try builds.
+                accounts.try_builder,
+            ],
         ),
     ],
 )

From b733f6390abb0c6bd50d1b1be7037972ab6f28a9 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Wed, 14 Dec 2022 12:23:06 +0000
Subject: [PATCH 597/826] [monorepo] Add flutter web test builders to monorepo

Bug: b/231927187
Change-Id: I9872ecf923740ea1def77a003f77f11623a26624
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/275620
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 3137 ++++++++++++++++++++--------------
 generated/luci-milo.cfg      |   73 +-
 monorepo.star                |   20 +-
 3 files changed, 1971 insertions(+), 1259 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 8ea079098a03..b4ac0e223461 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -4145,7 +4145,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-tester"
+      name: "flutter-linux-web-tests-0"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4173,7 +4173,7 @@ buckets {
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
-      execution_timeout_secs: 3600
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4182,14 +4182,14 @@ buckets {
       }
     }
     builders {
-      name: "front-end-linux-release-x64"
+      name: "flutter-linux-web-tests-1"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -4207,9 +4207,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4218,14 +4219,14 @@ buckets {
       }
     }
     builders {
-      name: "front-end-linux-release-x64-beta"
+      name: "flutter-linux-web-tests-2"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -4243,9 +4244,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4254,14 +4256,14 @@ buckets {
       }
     }
     builders {
-      name: "front-end-linux-release-x64-dev"
+      name: "flutter-linux-web-tests-3"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -4279,9 +4281,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4290,14 +4293,14 @@ buckets {
       }
     }
     builders {
-      name: "front-end-linux-release-x64-stable"
+      name: "flutter-linux-web-tests-4"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -4315,9 +4318,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4326,27 +4330,24 @@ buckets {
       }
     }
     builders {
-      name: "front-end-mac-release-x64"
+      name: "flutter-linux-web-tests-5"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4354,13 +4355,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4369,27 +4367,24 @@ buckets {
       }
     }
     builders {
-      name: "front-end-mac-release-x64-beta"
+      name: "flutter-linux-web-tests-6"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4397,13 +4392,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4412,27 +4404,24 @@ buckets {
       }
     }
     builders {
-      name: "front-end-mac-release-x64-dev"
+      name: "flutter-linux-web-tests-7-last"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4440,13 +4429,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4455,27 +4441,24 @@ buckets {
       }
     }
     builders {
-      name: "front-end-mac-release-x64-stable"
+      name: "flutter-linux-web-tool-tests"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4483,13 +4466,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4498,7 +4478,7 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-linux-release-x64"
+      name: "front-end-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4534,7 +4514,7 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-linux-release-x64-beta"
+      name: "front-end-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4570,7 +4550,7 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-linux-release-x64-dev"
+      name: "front-end-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4606,7 +4586,7 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-linux-release-x64-stable"
+      name: "front-end-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4642,7 +4622,7 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-mac-release-x64"
+      name: "front-end-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4672,7 +4652,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
@@ -4685,11 +4665,11 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-win-release-x64"
+      name: "front-end-mac-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4703,6 +4683,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4712,7 +4695,11 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4721,11 +4708,11 @@ buckets {
       }
     }
     builders {
-      name: "front-end-win-release-x64"
+      name: "front-end-mac-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4739,6 +4726,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4749,6 +4739,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4757,11 +4751,11 @@ buckets {
       }
     }
     builders {
-      name: "front-end-win-release-x64-beta"
+      name: "front-end-mac-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4775,6 +4769,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4785,6 +4782,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4793,11 +4794,11 @@ buckets {
       }
     }
     builders {
-      name: "front-end-win-release-x64-dev"
+      name: "front-end-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4807,7 +4808,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -4829,11 +4830,11 @@ buckets {
       }
     }
     builders {
-      name: "front-end-win-release-x64-stable"
+      name: "front-end-nnbd-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4843,7 +4844,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -4865,7 +4866,7 @@ buckets {
       }
     }
     builders {
-      name: "frontend-weekly"
+      name: "front-end-nnbd-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4892,8 +4893,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      execution_timeout_secs: 43200
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4902,7 +4902,7 @@ buckets {
       }
     }
     builders {
-      name: "fuzz-linux"
+      name: "front-end-nnbd-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4938,11 +4938,11 @@ buckets {
       }
     }
     builders {
-      name: "gclient"
+      name: "front-end-nnbd-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4952,10 +4952,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4963,9 +4966,13 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/gclient"'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4974,11 +4981,11 @@ buckets {
       }
     }
     builders {
-      name: "gclient-beta"
+      name: "front-end-nnbd-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4988,7 +4995,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -4999,9 +5006,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/gclient"'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5010,11 +5017,11 @@ buckets {
       }
     }
     builders {
-      name: "gclient-dev"
+      name: "front-end-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5024,7 +5031,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5035,7 +5042,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/gclient"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -5046,11 +5053,11 @@ buckets {
       }
     }
     builders {
-      name: "gclient-stable"
+      name: "front-end-win-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5060,7 +5067,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5071,7 +5078,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/gclient"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -5082,11 +5089,11 @@ buckets {
       }
     }
     builders {
-      name: "google"
+      name: "front-end-win-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5096,7 +5103,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5107,10 +5114,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/external"'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 30
-      execution_timeout_secs: 300
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5119,11 +5125,11 @@ buckets {
       }
     }
     builders {
-      name: "iso-stress-linux"
+      name: "front-end-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5133,7 +5139,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5144,8 +5150,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -5156,7 +5161,7 @@ buckets {
       }
     }
     builders {
-      name: "pkg-linux-debug"
+      name: "frontend-weekly"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5181,12 +5186,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      execution_timeout_secs: 43200
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5195,7 +5198,7 @@ buckets {
       }
     }
     builders {
-      name: "pkg-linux-release"
+      name: "fuzz-linux"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5213,9 +5216,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5223,9 +5223,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5237,7 +5234,7 @@ buckets {
       }
     }
     builders {
-      name: "pkg-linux-release-beta"
+      name: "gclient"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5255,9 +5252,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5265,10 +5259,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/gclient"'
         '}'
       priority: 50
       build_numbers: YES
@@ -5279,7 +5270,228 @@ buckets {
       }
     }
     builders {
-      name: "pkg-linux-release-dev"
+      name: "gclient-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/gclient"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "gclient-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/gclient"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "gclient-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/gclient"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "google"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/external"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 300
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "iso-stress-linux"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-linux-debug"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-linux-release"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5321,7 +5533,7 @@ buckets {
       }
     }
     builders {
-      name: "pkg-linux-release-stable"
+      name: "pkg-linux-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5363,11 +5575,11 @@ buckets {
       }
     }
     builders {
-      name: "pkg-mac-release"
+      name: "pkg-linux-release-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5377,7 +5589,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5397,10 +5609,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5409,11 +5617,11 @@ buckets {
       }
     }
     builders {
-      name: "pkg-mac-release-arm64"
+      name: "pkg-linux-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5423,7 +5631,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5438,33 +5646,575 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
       }
+    }
+    builders {
+      name: "pkg-mac-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-mac-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-mac-release-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-mac-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-mac-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-win-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-win-release-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-win-release-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-win-release-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-canary-linux-debug"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-canary-linux-debug-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-canary-linux-debug-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-canary-linux-debug-experimental"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:experimental"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "pkg-mac-release-beta"
+      name: "vm-canary-linux-debug-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5474,13 +6224,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5488,16 +6235,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5506,11 +6246,11 @@ buckets {
       }
     }
     builders {
-      name: "pkg-mac-release-dev"
+      name: "vm-ffi-android-debug-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5520,13 +6260,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5534,16 +6271,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5552,11 +6282,11 @@ buckets {
       }
     }
     builders {
-      name: "pkg-mac-release-stable"
+      name: "vm-ffi-android-debug-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5566,13 +6296,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5580,16 +6307,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5598,11 +6318,11 @@ buckets {
       }
     }
     builders {
-      name: "pkg-win-release"
+      name: "vm-ffi-android-debug-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5612,7 +6332,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5623,29 +6343,22 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "pkg-win-release-beta"
+      name: "vm-ffi-android-debug-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5655,7 +6368,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5666,29 +6379,22 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "pkg-win-release-dev"
+      name: "vm-ffi-android-debug-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5698,7 +6404,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5709,29 +6415,22 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "pkg-win-release-stable"
+      name: "vm-ffi-android-debug-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5741,7 +6440,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5752,25 +6451,18 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-canary-linux-debug"
+      name: "vm-ffi-android-debug-arm64c-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5806,7 +6498,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-canary-linux-debug-beta"
+      name: "vm-ffi-android-debug-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5842,7 +6534,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-canary-linux-debug-dev"
+      name: "vm-ffi-android-product-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5878,10 +6570,10 @@ buckets {
       }
     }
     builders {
-      name: "vm-canary-linux-debug-experimental"
+      name: "vm-ffi-android-product-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "host_class:experimental"
+      dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
@@ -5905,7 +6597,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5914,7 +6606,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-canary-linux-debug-stable"
+      name: "vm-ffi-android-product-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5950,7 +6642,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm"
+      name: "vm-ffi-android-product-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5986,7 +6678,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm-beta"
+      name: "vm-ffi-android-product-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6022,7 +6714,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm-dev"
+      name: "vm-ffi-android-product-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6058,7 +6750,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm-stable"
+      name: "vm-ffi-android-product-arm64c-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6094,7 +6786,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c"
+      name: "vm-ffi-android-product-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6130,7 +6822,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c-beta"
+      name: "vm-ffi-android-release-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6166,7 +6858,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c-dev"
+      name: "vm-ffi-android-release-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6202,7 +6894,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c-stable"
+      name: "vm-ffi-android-release-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6238,7 +6930,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm"
+      name: "vm-ffi-android-release-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6274,7 +6966,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm-beta"
+      name: "vm-ffi-android-release-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6310,7 +7002,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm-dev"
+      name: "vm-ffi-android-release-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6346,7 +7038,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm-stable"
+      name: "vm-ffi-android-release-arm64c-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6382,7 +7074,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c"
+      name: "vm-ffi-android-release-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6418,7 +7110,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c-beta"
+      name: "vm-fuchsia-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6445,7 +7137,8 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6454,7 +7147,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c-dev"
+      name: "vm-kernel-asan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6478,10 +7171,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6490,7 +7184,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c-stable"
+      name: "vm-kernel-checked-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6520,13 +7214,17 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm"
+      name: "vm-kernel-checked-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6556,13 +7254,17 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm-beta"
+      name: "vm-kernel-checked-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6592,13 +7294,17 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm-dev"
+      name: "vm-kernel-checked-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6628,13 +7334,17 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm-stable"
+      name: "vm-kernel-gcc-linux"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6647,10 +7357,9 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true,'
+        '    "timeout": 4500'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -6661,7 +7370,8 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      execution_timeout_secs: 18000
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6670,7 +7380,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c"
+      name: "vm-kernel-linux-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6697,7 +7407,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6706,7 +7416,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c-beta"
+      name: "vm-kernel-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6742,7 +7452,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c-dev"
+      name: "vm-kernel-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6778,7 +7488,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c-stable"
+      name: "vm-kernel-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6814,7 +7524,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-fuchsia-release-x64"
+      name: "vm-kernel-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6841,8 +7551,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      expiration_secs: 86400
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6851,7 +7560,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-asan-linux-release-x64"
+      name: "vm-kernel-linux-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6875,7 +7584,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -6888,7 +7596,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64"
+      name: "vm-kernel-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6915,20 +7623,16 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-beta"
+      name: "vm-kernel-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6958,17 +7662,13 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-dev"
+      name: "vm-kernel-linux-release-simarm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6998,17 +7698,13 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-stable"
+      name: "vm-kernel-linux-release-simarm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7038,17 +7734,13 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-gcc-linux"
+      name: "vm-kernel-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7061,9 +7753,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true,'
-        '    "timeout": 4500'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -7074,8 +7767,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      execution_timeout_secs: 18000
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7084,7 +7776,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-ia32"
+      name: "vm-kernel-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7111,7 +7803,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7120,7 +7812,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64"
+      name: "vm-kernel-linux-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7156,7 +7848,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64-beta"
+      name: "vm-kernel-linux-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7192,7 +7884,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64-dev"
+      name: "vm-kernel-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7228,7 +7920,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64-stable"
+      name: "vm-kernel-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7264,7 +7956,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64c"
+      name: "vm-kernel-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7291,7 +7983,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7300,7 +7992,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-ia32"
+      name: "vm-kernel-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7327,7 +8019,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7336,7 +8028,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-simarm"
+      name: "vm-kernel-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7372,11 +8064,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-simarm-beta"
+      name: "vm-kernel-mac-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7386,10 +8078,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7400,6 +8095,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7408,11 +8107,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-simarm-dev"
+      name: "vm-kernel-mac-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7422,10 +8121,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7436,6 +8138,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7444,11 +8150,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-simarm-stable"
+      name: "vm-kernel-mac-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7458,10 +8164,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7472,6 +8181,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7480,11 +8193,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-simarm64"
+      name: "vm-kernel-mac-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7494,10 +8207,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7508,6 +8224,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7516,11 +8236,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-simarm64-beta"
+      name: "vm-kernel-mac-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7530,10 +8250,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7541,9 +8264,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7552,11 +8282,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-simarm64-dev"
+      name: "vm-kernel-mac-release-arm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7566,10 +8296,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7577,9 +8310,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7588,11 +8328,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-simarm64-stable"
+      name: "vm-kernel-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7602,10 +8342,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7616,6 +8359,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7624,11 +8371,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-x64"
+      name: "vm-kernel-mac-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7638,10 +8385,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7652,6 +8402,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7660,11 +8414,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-x64-beta"
+      name: "vm-kernel-mac-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7674,10 +8428,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7688,6 +8445,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7696,11 +8457,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-x64-dev"
+      name: "vm-kernel-mac-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7710,10 +8471,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7724,6 +8488,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7732,7 +8500,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-x64-stable"
+      name: "vm-kernel-msan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7756,10 +8524,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7768,11 +8537,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-mac-debug-x64"
+      name: "vm-kernel-msvc-windows"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7781,13 +8550,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -7798,11 +8562,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7811,11 +8571,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-mac-debug-x64-beta"
+      name: "vm-kernel-nnbd-linux-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7825,13 +8585,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7839,13 +8596,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7854,11 +8608,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-mac-debug-x64-dev"
+      name: "vm-kernel-nnbd-linux-debug-simriscv64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7868,13 +8622,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7884,11 +8635,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7897,11 +8644,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-mac-debug-x64-stable"
+      name: "vm-kernel-nnbd-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7911,13 +8658,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7928,10 +8672,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7940,11 +8680,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-mac-release-arm64"
+      name: "vm-kernel-nnbd-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7954,13 +8694,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7968,16 +8705,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7986,11 +8716,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-mac-release-arm64-dev"
+      name: "vm-kernel-nnbd-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8000,30 +8730,20 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8032,11 +8752,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-mac-release-x64"
+      name: "vm-kernel-nnbd-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8046,13 +8766,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8063,10 +8780,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8075,11 +8788,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-mac-release-x64-beta"
+      name: "vm-kernel-nnbd-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8089,13 +8802,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8105,11 +8815,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8118,11 +8824,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-mac-release-x64-dev"
+      name: "vm-kernel-nnbd-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8132,13 +8838,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8148,11 +8851,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8161,11 +8860,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-mac-release-x64-stable"
+      name: "vm-kernel-nnbd-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8175,13 +8874,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8191,11 +8887,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8204,7 +8896,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-msan-linux-release-x64"
+      name: "vm-kernel-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8228,11 +8920,10 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8241,11 +8932,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-msvc-windows"
+      name: "vm-kernel-nnbd-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8254,8 +8945,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -8266,7 +8959,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8275,7 +8968,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-ia32"
+      name: "vm-kernel-nnbd-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8300,10 +8993,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8312,7 +9004,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-simriscv64"
+      name: "vm-kernel-nnbd-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8339,7 +9031,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8348,11 +9040,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64"
+      name: "vm-kernel-nnbd-mac-debug-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8362,10 +9054,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8373,9 +9068,17 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8384,11 +9087,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64-beta"
+      name: "vm-kernel-nnbd-mac-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8398,10 +9101,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8409,9 +9115,14 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8420,11 +9131,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64-dev"
+      name: "vm-kernel-nnbd-mac-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8434,10 +9145,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8445,9 +9159,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8456,11 +9177,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64-stable"
+      name: "vm-kernel-nnbd-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8470,10 +9191,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8483,7 +9207,11 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8492,11 +9220,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-ia32"
+      name: "vm-kernel-nnbd-win-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8506,7 +9234,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8517,7 +9245,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 70
       build_numbers: YES
@@ -8528,11 +9257,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-simarm"
+      name: "vm-kernel-nnbd-win-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8542,7 +9271,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8564,11 +9293,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-simarm64"
+      name: "vm-kernel-nnbd-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8578,7 +9307,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8600,7 +9329,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-x64"
+      name: "vm-kernel-optcounter-threshold-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8627,7 +9356,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8636,7 +9365,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-x64-beta"
+      name: "vm-kernel-optcounter-threshold-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8663,7 +9392,8 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8672,7 +9402,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-x64-dev"
+      name: "vm-kernel-precomp-android-release-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8697,7 +9427,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -8708,7 +9439,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-x64-stable"
+      name: "vm-kernel-precomp-android-release-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8733,7 +9464,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -8744,11 +9476,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-debug-arm64"
+      name: "vm-kernel-precomp-android-release-arm64c-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8758,13 +9490,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8772,17 +9501,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
-      priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8791,11 +9513,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-debug-x64"
+      name: "vm-kernel-precomp-android-release-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8805,13 +9527,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8822,11 +9541,7 @@ buckets {
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
-      priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8835,11 +9550,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-release-arm64"
+      name: "vm-kernel-precomp-android-release-arm_x64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8849,30 +9564,21 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8881,11 +9587,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-release-x64"
+      name: "vm-kernel-precomp-android-release-arm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8895,13 +9601,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8909,13 +9612,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8924,11 +9624,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-debug-x64"
+      name: "vm-kernel-precomp-android-release-arm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8938,7 +9638,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8952,7 +9652,7 @@ buckets {
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8961,11 +9661,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-ia32"
+      name: "vm-kernel-precomp-android-release-arm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8975,7 +9675,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8986,9 +9686,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8997,11 +9698,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-x64"
+      name: "vm-kernel-precomp-asan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9011,7 +9712,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9021,6 +9722,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -9033,7 +9735,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-optcounter-threshold-linux-release-ia32"
+      name: "vm-kernel-precomp-dwarf-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9069,7 +9771,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-optcounter-threshold-linux-release-x64"
+      name: "vm-kernel-precomp-linux-debug-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9094,10 +9796,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
-      expiration_secs: 86400
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9106,7 +9808,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64c"
+      name: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9143,7 +9845,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64c-beta"
+      name: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9180,7 +9882,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64c-dev"
+      name: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9217,7 +9919,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64c-stable"
+      name: "vm-kernel-precomp-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9242,8 +9944,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -9254,7 +9955,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm_x64"
+      name: "vm-kernel-precomp-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9279,8 +9980,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -9291,7 +9991,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm_x64-beta"
+      name: "vm-kernel-precomp-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9316,8 +10016,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -9328,7 +10027,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm_x64-dev"
+      name: "vm-kernel-precomp-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9353,8 +10052,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -9365,7 +10063,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm_x64-stable"
+      name: "vm-kernel-precomp-linux-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9390,10 +10088,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9402,7 +10099,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-asan-linux-release-x64"
+      name: "vm-kernel-precomp-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9426,7 +10123,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -9439,7 +10135,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-dwarf-linux-product-x64"
+      name: "vm-kernel-precomp-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9466,7 +10162,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9475,7 +10171,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-simarm_x64"
+      name: "vm-kernel-precomp-linux-release-simarm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9500,8 +10196,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -9512,7 +10207,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
+      name: "vm-kernel-precomp-linux-release-simarm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9537,8 +10232,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -9549,7 +10243,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
+      name: "vm-kernel-precomp-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9574,8 +10268,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -9586,7 +10279,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
+      name: "vm-kernel-precomp-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9611,8 +10304,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -9623,7 +10315,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64"
+      name: "vm-kernel-precomp-linux-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9659,7 +10351,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-beta"
+      name: "vm-kernel-precomp-linux-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9695,7 +10387,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-dev"
+      name: "vm-kernel-precomp-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9731,7 +10423,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-stable"
+      name: "vm-kernel-precomp-linux-release-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9767,7 +10459,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64c"
+      name: "vm-kernel-precomp-linux-release-simarm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9794,7 +10486,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9803,7 +10495,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-product-x64"
+      name: "vm-kernel-precomp-linux-release-simarm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9830,7 +10522,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9839,7 +10531,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm"
+      name: "vm-kernel-precomp-linux-release-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9875,7 +10567,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-beta"
+      name: "vm-kernel-precomp-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9911,7 +10603,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-dev"
+      name: "vm-kernel-precomp-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9947,7 +10639,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-stable"
+      name: "vm-kernel-precomp-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9983,7 +10675,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm64"
+      name: "vm-kernel-precomp-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10019,11 +10711,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm64-beta"
+      name: "vm-kernel-precomp-mac-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10033,10 +10725,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10046,7 +10741,11 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10055,11 +10754,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm64-dev"
+      name: "vm-kernel-precomp-mac-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10069,10 +10768,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10083,6 +10785,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10091,11 +10797,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm64-stable"
+      name: "vm-kernel-precomp-mac-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10105,10 +10811,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10119,6 +10828,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10127,11 +10840,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm_x64"
+      name: "vm-kernel-precomp-mac-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10141,10 +10854,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10155,6 +10871,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10163,11 +10883,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm_x64-beta"
+      name: "vm-kernel-precomp-mac-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10177,10 +10897,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10191,6 +10914,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10199,7 +10926,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm_x64-dev"
+      name: "vm-kernel-precomp-msan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10223,10 +10950,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10235,7 +10963,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm_x64-stable"
+      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10262,7 +10990,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10271,7 +10999,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64"
+      name: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10296,9 +11024,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10307,7 +11036,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64-beta"
+      name: "vm-kernel-precomp-nnbd-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10332,9 +11061,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10343,7 +11073,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64-dev"
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10370,7 +11100,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10379,7 +11109,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64-stable"
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10406,7 +11136,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10415,11 +11145,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-mac-product-x64"
+      name: "vm-kernel-precomp-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10429,12 +11159,9 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -10445,11 +11172,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10458,11 +11181,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-mac-release-simarm64"
+      name: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10472,13 +11195,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10489,10 +11209,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10501,11 +11217,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-mac-release-simarm64-beta"
+      name: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10515,13 +11231,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10532,10 +11245,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10544,11 +11253,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-mac-release-simarm64-dev"
+      name: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10558,13 +11267,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10575,10 +11281,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10587,9 +11289,9 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-mac-release-simarm64-stable"
+      name: "vm-kernel-precomp-nnbd-mac-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
@@ -10615,7 +11317,11 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       caches {
@@ -10630,11 +11336,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-msan-linux-release-x64"
+      name: "vm-kernel-precomp-nnbd-mac-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10644,21 +11350,28 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10667,11 +11380,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+      name: "vm-kernel-precomp-nnbd-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10681,7 +11394,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10703,7 +11416,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10728,10 +11441,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10740,7 +11452,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-x64"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10765,10 +11477,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10777,7 +11488,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm64"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10804,7 +11515,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10813,7 +11524,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10840,7 +11551,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10849,7 +11560,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64"
+      name: "vm-kernel-precomp-tsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10873,10 +11584,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10885,7 +11597,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
+      name: "vm-kernel-precomp-ubsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10898,10 +11610,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -10909,10 +11619,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10921,11 +11632,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
+      name: "vm-kernel-precomp-win-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10935,7 +11646,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10948,7 +11659,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10957,11 +11668,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
+      name: "vm-kernel-precomp-win-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10971,7 +11682,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10984,7 +11695,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10993,11 +11704,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-mac-release-arm64"
+      name: "vm-kernel-precomp-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11011,9 +11722,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11021,17 +11729,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11040,11 +11740,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-mac-release-simarm64"
+      name: "vm-kernel-precomp-win-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11058,9 +11758,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11068,14 +11765,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11084,7 +11776,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-win-release-x64"
+      name: "vm-kernel-precomp-win-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11111,7 +11803,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11120,11 +11812,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64"
+      name: "vm-kernel-precomp-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11134,7 +11826,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11156,7 +11848,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+      name: "vm-kernel-reload-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11183,7 +11875,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11192,7 +11884,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+      name: "vm-kernel-reload-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11219,7 +11911,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11228,7 +11920,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+      name: "vm-kernel-reload-rollback-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11255,7 +11947,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11264,7 +11956,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-tsan-linux-release-x64"
+      name: "vm-kernel-reload-rollback-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11288,7 +11980,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -11301,7 +11992,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-ubsan-linux-release-x64"
+      name: "vm-kernel-tsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11314,8 +12005,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -11336,11 +12029,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-debug-x64c"
+      name: "vm-kernel-ubsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11349,10 +12042,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -11360,6 +12051,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -11372,7 +12064,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-product-x64"
+      name: "vm-kernel-win-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11397,7 +12089,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 70
       build_numbers: YES
@@ -11408,7 +12101,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-release-x64"
+      name: "vm-kernel-win-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11444,7 +12137,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-release-x64-beta"
+      name: "vm-kernel-win-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11480,7 +12173,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-release-x64-dev"
+      name: "vm-kernel-win-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11516,7 +12209,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-release-x64-stable"
+      name: "vm-kernel-win-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11552,11 +12245,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-reload-linux-debug-x64"
+      name: "vm-kernel-win-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11566,7 +12259,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11588,11 +12281,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-reload-linux-release-x64"
+      name: "vm-kernel-win-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11602,7 +12295,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11624,11 +12317,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-reload-rollback-linux-debug-x64"
+      name: "vm-kernel-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11638,7 +12331,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11651,7 +12344,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11660,11 +12353,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-reload-rollback-linux-release-x64"
+      name: "vm-kernel-win-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11674,7 +12367,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11687,7 +12380,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11696,11 +12389,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-tsan-linux-release-x64"
+      name: "vm-kernel-win-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11710,7 +12403,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11720,11 +12413,10 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11733,11 +12425,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-ubsan-linux-release-x64"
+      name: "vm-kernel-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11746,8 +12438,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -11755,11 +12449,10 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11768,11 +12461,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-ia32"
+      name: "vm-precomp-ffi-qemu-linux-release-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11782,7 +12475,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11793,10 +12486,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11805,11 +12497,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-x64"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11819,7 +12511,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11841,11 +12533,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-x64-beta"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11855,7 +12547,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11877,11 +12569,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-x64-dev"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "host_class:experimental"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11891,7 +12583,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11904,7 +12596,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11913,11 +12605,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-x64-stable"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11927,7 +12619,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11949,11 +12641,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-x64c"
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11963,7 +12655,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11976,7 +12668,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11985,11 +12677,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-release-ia32"
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11999,7 +12691,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12012,7 +12704,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12021,11 +12713,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-release-x64"
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12035,7 +12727,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12057,11 +12749,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-release-x64-beta"
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12071,7 +12763,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12092,12 +12784,17 @@ buckets {
         value: 100
       }
     }
+  }
+}
+buckets {
+  name: "try"
+  swarming {
     builders {
-      name: "vm-kernel-win-release-x64-dev"
+      name: "analyzer-analysis-server-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12107,7 +12804,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12120,7 +12817,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12129,11 +12826,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-release-x64-stable"
+      name: "analyzer-linux-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12143,7 +12840,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12156,7 +12853,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12165,11 +12862,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm"
+      name: "analyzer-mac-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12179,10 +12876,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12192,7 +12892,11 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12201,11 +12905,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-beta"
+      name: "analyzer-win-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12215,7 +12919,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12228,20 +12932,24 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-dev"
+      name: "app-kernel-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12262,9 +12970,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12273,11 +12982,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
+      name: "app-kernel-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "host_class:experimental"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12300,7 +13009,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12309,11 +13018,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-stable"
+      name: "app-kernel-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12336,7 +13045,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12345,11 +13054,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64"
+      name: "benchmark-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12370,9 +13079,12 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "checkout_javascript_engines": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12381,11 +13093,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
+      name: "beta-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12406,22 +13118,29 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "from_ref": "refs/heads/dev",'
+        '  "recipe": "release/merge",'
+        '  "to_ref": "refs/heads/beta"'
         '}'
-      priority: 50
+      priority: 30
+      execution_timeout_secs: 900
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.non_production"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
+      name: "dart-sdk-linux-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12435,16 +13154,24 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$dart/build": {'
+        '    "timeout": 6000'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "archs": ['
+        '    "arm",'
+        '    "arm64"'
+        '  ],'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "disable_bcid": true,'
+        '  "recipe": "release/sdk"'
         '}'
-      priority: 50
+      priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12453,11 +13180,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
+      name: "dart-sdk-linux-riscv64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12471,16 +13198,23 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$dart/build": {'
+        '    "timeout": 6000'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "archs": ['
+        '    "riscv64"'
+        '  ],'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "disable_bcid": true,'
+        '  "recipe": "release/sdk"'
         '}'
-      priority: 50
+      priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12488,13 +13222,8 @@ buckets {
         value: 100
       }
     }
-  }
-}
-buckets {
-  name: "try"
-  swarming {
     builders {
-      name: "analyzer-analysis-server-linux-try"
+      name: "dart-sdk-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12512,14 +13241,24 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$dart/build": {'
+        '    "timeout": 6000'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "archs": ['
+        '    "ia32",'
+        '    "x64"'
+        '  ],'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "dartdoc_arch": "x64",'
+        '  "disable_bcid": true,'
+        '  "recipe": "release/sdk",'
+        '  "upload_version": true'
         '}'
       priority: 30
       build_numbers: YES
@@ -12530,11 +13269,11 @@ buckets {
       }
     }
     builders {
-      name: "analyzer-linux-release-try"
+      name: "dart-sdk-mac-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12544,20 +13283,34 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "archs": ['
+        '    "arm64"'
+        '  ],'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "disable_bcid": true,'
+        '  "recipe": "release/sdk"'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12566,7 +13319,7 @@ buckets {
       }
     }
     builders {
-      name: "analyzer-mac-release-try"
+      name: "dart-sdk-mac-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12593,8 +13346,12 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "archs": ['
+        '    "x64"'
+        '  ],'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "disable_bcid": true,'
+        '  "recipe": "release/sdk"'
         '}'
       priority: 30
       caches {
@@ -12609,7 +13366,7 @@ buckets {
       }
     }
     builders {
-      name: "analyzer-win-release-try"
+      name: "dart-sdk-win-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12633,27 +13390,27 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "archs": ['
+        '    "arm64"'
+        '  ],'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "disable_bcid": true,'
+        '  "recipe": "release/sdk"'
         '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "app-kernel-linux-debug-x64-try"
+      name: "dart-sdk-win-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12663,7 +13420,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12673,9 +13430,13 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "archs": ['
+        '    "ia32",'
+        '    "x64"'
+        '  ],'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "disable_bcid": true,'
+        '  "recipe": "release/sdk"'
         '}'
       priority: 30
       build_numbers: YES
@@ -12686,7 +13447,7 @@ buckets {
       }
     }
     builders {
-      name: "app-kernel-linux-product-x64-try"
+      name: "dart2js-canary-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12711,6 +13472,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12722,7 +13487,7 @@ buckets {
       }
     }
     builders {
-      name: "app-kernel-linux-release-x64-try"
+      name: "dart2js-csp-minified-linux-x64-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12747,6 +13512,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12758,7 +13527,7 @@ buckets {
       }
     }
     builders {
-      name: "benchmark-linux-try"
+      name: "dart2js-minified-strong-linux-x64-d8-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12784,7 +13553,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "checkout_javascript_engines": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -12797,7 +13566,7 @@ buckets {
       }
     }
     builders {
-      name: "beta-try"
+      name: "dart2js-nnbd-linux-x64-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12822,25 +13591,22 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "from_ref": "refs/heads/dev",'
-        '  "recipe": "release/merge",'
-        '  "to_ref": "refs/heads/beta"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 900
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.non_production"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "dart-sdk-linux-arm64-try"
+      name: "dart2js-strong-hostasserts-linux-ia32-d8-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12858,22 +13624,17 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$dart/build": {'
-        '    "timeout": 6000'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "archs": ['
-        '    "arm",'
-        '    "arm64"'
-        '  ],'
         '  "clobber": true,'
-        '  "disable_bcid": true,'
-        '  "recipe": "release/sdk"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -12884,7 +13645,7 @@ buckets {
       }
     }
     builders {
-      name: "dart-sdk-linux-riscv64-try"
+      name: "dart2js-strong-linux-x64-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12902,21 +13663,18 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$dart/build": {'
-        '    "timeout": 6000'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "archs": ['
-        '    "riscv64"'
-        '  ],'
         '  "clobber": true,'
-        '  "disable_bcid": true,'
-        '  "recipe": "release/sdk"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -12927,7 +13685,7 @@ buckets {
       }
     }
     builders {
-      name: "dart-sdk-linux-try"
+      name: "dart2js-strong-linux-x64-firefox-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12945,24 +13703,18 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$dart/build": {'
-        '    "timeout": 6000'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "archs": ['
-        '    "ia32",'
-        '    "x64"'
-        '  ],'
         '  "clobber": true,'
-        '  "dartdoc_arch": "x64",'
-        '  "disable_bcid": true,'
-        '  "recipe": "release/sdk",'
-        '  "upload_version": true'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -12973,9 +13725,9 @@ buckets {
       }
     }
     builders {
-      name: "dart-sdk-mac-arm64-try"
+      name: "dart2js-strong-mac-x64-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
@@ -13000,15 +13752,12 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "archs": ['
-        '    "arm64"'
-        '  ],'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
         '  },'
-        '  "disable_bcid": true,'
-        '  "recipe": "release/sdk"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       caches {
@@ -13023,7 +13772,7 @@ buckets {
       }
     }
     builders {
-      name: "dart-sdk-mac-try"
+      name: "dart2js-strong-mac-x64-safari-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13050,12 +13799,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "archs": ['
-        '    "x64"'
-        '  ],'
         '  "clobber": true,'
-        '  "disable_bcid": true,'
-        '  "recipe": "release/sdk"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       caches {
@@ -13070,47 +13818,7 @@ buckets {
       }
     }
     builders {
-      name: "dart-sdk-win-arm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "archs": ['
-        '    "arm64"'
-        '  ],'
-        '  "clobber": true,'
-        '  "disable_bcid": true,'
-        '  "recipe": "release/sdk"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-win-try"
+      name: "dart2js-strong-win-x64-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13134,47 +13842,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "archs": ['
-        '    "ia32",'
-        '    "x64"'
-        '  ],'
-        '  "clobber": true,'
-        '  "disable_bcid": true,'
-        '  "recipe": "release/sdk"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-canary-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
@@ -13191,7 +13858,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-csp-minified-linux-x64-chrome-try"
+      name: "dart2js-unit-linux-x64-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13217,8 +13884,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -13231,7 +13897,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-minified-strong-linux-x64-d8-try"
+      name: "dart2wasm-linux-x64-d8-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13257,7 +13923,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_emscripten": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -13270,7 +13936,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-nnbd-linux-x64-chrome-try"
+      name: "ddc-canary-linux-release-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13296,7 +13962,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -13310,7 +13975,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-hostasserts-linux-ia32-d8-try"
+      name: "ddc-linux-release-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13336,7 +14001,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -13349,11 +14014,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-linux-x64-chrome-try"
+      name: "ddc-mac-release-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13363,10 +14028,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13375,12 +14043,15 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13389,7 +14060,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-linux-x64-firefox-try"
+      name: "ddc-nnbd-linux-release-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13415,8 +14086,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_firefox": true'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -13429,11 +14099,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-mac-x64-chrome-try"
+      name: "ddc-win-release-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13447,9 +14117,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13458,16 +14125,11 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13476,11 +14138,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-mac-x64-safari-try"
+      name: "ddk-linux-release-firefox-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13490,13 +14152,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13505,15 +14164,11 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13522,11 +14177,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-win-x64-chrome-try"
+      name: "dev-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13536,7 +14191,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -13547,22 +14202,25 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "from_ref": "refs/heads/lkgr",'
+        '  "recipe": "release/merge",'
+        '  "to_ref": "refs/heads/dev"'
         '}'
       priority: 30
+      execution_timeout_secs: 900
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.non_production"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "dart2js-unit-linux-x64-release-try"
+      name: "flutter-analyze-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13587,12 +14245,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      execution_timeout_secs: 2700
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13601,14 +14257,14 @@ buckets {
       }
     }
     builders {
-      name: "dart2wasm-linux-x64-d8-try"
+      name: "flutter-android-debug-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -13626,12 +14282,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_emscripten": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13640,14 +14294,14 @@ buckets {
       }
     }
     builders {
-      name: "ddc-canary-linux-release-chrome-try"
+      name: "flutter-android-profile-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -13665,12 +14319,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13679,7 +14331,7 @@ buckets {
       }
     }
     builders {
-      name: "ddc-linux-release-chrome-try"
+      name: "flutter-engine-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13703,13 +14355,19 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "flutter_test_suites": ['
+        '    "add_to_app_life_cycle_tests",'
+        '    "flutter_plugins",'
+        '    "framework_coverage",'
+        '    "framework_tests",'
+        '    "tool_tests"'
+        '  ],'
+        '  "recipe": "dart/flutter_engine"'
         '}'
       priority: 30
+      execution_timeout_secs: 28800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13718,11 +14376,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-mac-release-chrome-try"
+      name: "flutter-engine-linux-web_tests-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13732,30 +14390,26 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "flutter_test_suites": ['
+        '    "web_tests",'
+        '    "web_tool_tests"'
+        '  ],'
+        '  "recipe": "dart/flutter_engine"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      execution_timeout_secs: 28800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13764,7 +14418,7 @@ buckets {
       }
     }
     builders {
-      name: "ddc-nnbd-linux-release-chrome-try"
+      name: "flutter-frontend-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13789,9 +14443,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13803,21 +14454,21 @@ buckets {
       }
     }
     builders {
-      name: "ddc-win-release-chrome-try"
+      name: "flutter-linux-debug-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -13828,12 +14479,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13842,14 +14491,14 @@ buckets {
       }
     }
     builders {
-      name: "ddk-linux-release-firefox-try"
+      name: "flutter-linux-debug-unopt-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -13867,12 +14516,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_firefox": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13881,14 +14528,14 @@ buckets {
       }
     }
     builders {
-      name: "dev-try"
+      name: "flutter-linux-profile-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -13906,32 +14553,26 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "from_ref": "refs/heads/lkgr",'
-        '  "recipe": "release/merge",'
-        '  "to_ref": "refs/heads/dev"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
-      execution_timeout_secs: 900
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.non_production"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "flutter-analyze-try"
+      name: "flutter-linux-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -13949,10 +14590,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
-      execution_timeout_secs: 2700
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13961,12 +14602,12 @@ buckets {
       }
     }
     builders {
-      name: "flutter-android-debug-try"
+      name: "flutter-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
@@ -13979,14 +14620,21 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$fuchsia/goma": {'
+        '    "server": "goma.chromium.org"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "builder_name_suffix": "-try",'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "config_name": "host_linux",'
+        '  "environment": "unused",'
+        '  "goma_jobs": "200",'
+        '  "recipe": "engine_v2/engine_v2"'
         '}'
       priority: 30
       execution_timeout_secs: 3600
@@ -13998,7 +14646,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-android-profile-try"
+      name: "flutter-linux-web-tests-0-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14023,10 +14671,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
-      execution_timeout_secs: 3600
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14035,14 +14683,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-engine-linux-try"
+      name: "flutter-linux-web-tests-1-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -14059,19 +14707,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "flutter_test_suites": ['
-        '    "add_to_app_life_cycle_tests",'
-        '    "flutter_plugins",'
-        '    "framework_coverage",'
-        '    "framework_tests",'
-        '    "tool_tests"'
-        '  ],'
-        '  "recipe": "dart/flutter_engine"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
-      execution_timeout_secs: 28800
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14080,14 +14720,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-engine-linux-web_tests-try"
+      name: "flutter-linux-web-tests-2-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -14104,16 +14744,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "flutter_test_suites": ['
-        '    "web_tests",'
-        '    "web_tool_tests"'
-        '  ],'
-        '  "recipe": "dart/flutter_engine"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
-      execution_timeout_secs: 28800
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14122,14 +14757,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-frontend-try"
+      name: "flutter-linux-web-tests-3-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -14147,9 +14782,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14158,7 +14794,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-debug-try"
+      name: "flutter-linux-web-tests-4-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14183,10 +14819,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
-      execution_timeout_secs: 3600
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14195,7 +14831,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-debug-unopt-try"
+      name: "flutter-linux-web-tests-5-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14220,10 +14856,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
-      execution_timeout_secs: 3600
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14232,7 +14868,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-profile-try"
+      name: "flutter-linux-web-tests-6-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14257,10 +14893,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
-      execution_timeout_secs: 3600
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14269,7 +14905,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-release-try"
+      name: "flutter-linux-web-tests-7-last-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14294,10 +14930,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
-      execution_timeout_secs: 3600
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14306,12 +14942,12 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-try"
+      name: "flutter-linux-web-tool-tests-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
@@ -14324,24 +14960,17 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$fuchsia/goma": {'
-        '    "server": "goma.chromium.org"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "builder_name_suffix": "-try",'
         '  "clobber": true,'
-        '  "config_name": "host_linux",'
-        '  "environment": "unused",'
-        '  "goma_jobs": "200",'
-        '  "recipe": "engine_v2/engine_v2"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
-      execution_timeout_secs: 3600
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index a47d9c70814d..63ae71cd02b5 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -436,6 +436,33 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/flutter-linux-release-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/flutter-linux-web-tests-0-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/flutter-linux-web-tests-1-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/flutter-linux-web-tests-2-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/flutter-linux-web-tests-3-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/flutter-linux-web-tests-4-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/flutter-linux-web-tests-5-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/flutter-linux-web-tests-6-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/flutter-linux-web-tests-7-last-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/flutter-linux-web-tool-tests-try"
+  }
   builder_view_only: true
 }
 consoles {
@@ -3216,9 +3243,49 @@ consoles {
     short_name: "release"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-tester"
-    category: "test"
-    short_name: "tester"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-0"
+    category: "web_test"
+    short_name: "wt0"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-1"
+    category: "web_test"
+    short_name: "wt1"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-2"
+    category: "web_test"
+    short_name: "wt2"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-3"
+    category: "web_test"
+    short_name: "wt3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-4"
+    category: "web_test"
+    short_name: "wt4"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-5"
+    category: "web_test"
+    short_name: "wt5"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-6"
+    category: "web_test"
+    short_name: "wt6"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-7-last"
+    category: "web_test"
+    short_name: "wt7"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tool-tests"
+    category: "web_test"
+    short_name: "wtool"
   }
   header {
     links {
diff --git a/monorepo.star b/monorepo.star
index 23ac97f2c39e..748ee628d874 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -93,7 +93,7 @@ def monorepo_tester(name, short_name, category):
         channels = [],
         dimensions = {"pool": "dart.tests"},
         executable = dart.flutter_recipe("engine_v2/tester"),
-        execution_timeout = 60 * time.minute,
+        execution_timeout = 90 * time.minute,
         notifies = None,
         priority = priority.normal,
         triggered_by = [],
@@ -105,5 +105,21 @@ def monorepo_tester(name, short_name, category):
         category = category,
         console_view = "monorepo",
     )
+    dart.try_builder(
+        name,
+        executable = dart.flutter_recipe("engine_v2/tester"),
+        execution_timeout = 90 * time.minute,
+        pool = "dart.tests",
+        on_cq = False,
+        cq_branches = [],
+    )
 
-monorepo_tester("flutter-tester", "tester", "test")
+monorepo_tester("flutter-linux-web-tests-0", "wt0", "web_test")
+monorepo_tester("flutter-linux-web-tests-1", "wt1", "web_test")
+monorepo_tester("flutter-linux-web-tests-2", "wt2", "web_test")
+monorepo_tester("flutter-linux-web-tests-3", "wt3", "web_test")
+monorepo_tester("flutter-linux-web-tests-4", "wt4", "web_test")
+monorepo_tester("flutter-linux-web-tests-5", "wt5", "web_test")
+monorepo_tester("flutter-linux-web-tests-6", "wt6", "web_test")
+monorepo_tester("flutter-linux-web-tests-7-last", "wt7", "web_test")
+monorepo_tester("flutter-linux-web-tool-tests", "wtool", "web_test")

From a83a24cee305bbf0935f8b59cd41e940e8cc7c7d Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Wed, 14 Dec 2022 17:01:42 +0000
Subject: [PATCH 598/826] [monorepo] Increase timeout on monorepo coordinator
 to 120 minutes

After adding a test phase after the build phase, the total time
exceeds 60 minutes.

Bug: b/231927187
Change-Id: Ia709bd3c894377428a37babc358787feeef105c8
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/275720
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 4 ++--
 monorepo.star                | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index b4ac0e223461..76482c4c254e 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -3988,7 +3988,7 @@ buckets {
         '  "recipe": "engine_v2/engine_v2"'
         '}'
       priority: 50
-      execution_timeout_secs: 3600
+      execution_timeout_secs: 7200
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14637,7 +14637,7 @@ buckets {
         '  "recipe": "engine_v2/engine_v2"'
         '}'
       priority: 30
-      execution_timeout_secs: 3600
+      execution_timeout_secs: 7200
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
diff --git a/monorepo.star b/monorepo.star
index 748ee628d874..4d617739e3cf 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -20,7 +20,7 @@ dart.ci_sandbox_builder(
     name = "flutter-linux",
     channels = [],
     executable = dart.flutter_recipe("engine_v2/engine_v2"),
-    execution_timeout = 60 * time.minute,
+    execution_timeout = 120 * time.minute,
     notifies = None,
     priority = priority.normal,
     properties = {
@@ -41,7 +41,7 @@ luci.console_view_entry(
 dart.try_builder(
     "flutter-linux",
     executable = dart.flutter_recipe("engine_v2/engine_v2"),
-    execution_timeout = 60 * time.minute,
+    execution_timeout = 120 * time.minute,
     properties = {
         "$fuchsia/goma": {"server": "goma.chromium.org"},
         "builder_name_suffix": "-try",

From b3e3e9a55686346fb8fdc4c3b7745efa9af519c9 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Fri, 16 Dec 2022 10:46:48 +0000
Subject: [PATCH 599/826] Increase timeout for msan nightly builder

The runtime of the vm tests increased, and letting the builder
run longer will help diagnose the problem.

Change-Id: I73bc580aa120cd04dd7125456ac67f975e6a1816
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/276082
Reviewed-by: Daco Harkes <dacoharkes@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 2 ++
 generated/project.cfg        | 2 +-
 vm.star                      | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 76482c4c254e..d88e2f28fb61 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -8529,6 +8529,7 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
+      execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -16364,6 +16365,7 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
diff --git a/generated/project.cfg b/generated/project.cfg
index a58509da9248..6a665c5aae08 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.35.2"
+  version: "1.35.3"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/vm.star b/vm.star
index 36f6aa1bcdfa..bfff1a0d5937 100644
--- a/vm.star
+++ b/vm.star
@@ -423,6 +423,7 @@ dart_vm_sanitizer_builder(
 dart_vm_sanitizer_builder(
     "vm-kernel-msan-linux-release-x64",
     category = "vm|misc|m",
+    execution_timeout = 3 * time.hour,
 )
 dart_vm_sanitizer_builder(
     "vm-kernel-tsan-linux-release-x64",

From a1b9be72ff1fe6a3b4aabd31223678a4ae17d922 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Mon, 19 Dec 2022 11:44:10 +0000
Subject: [PATCH 600/826] Remove flutter-engine-linux-web_tests builder,
 replace with flutter-web builders.

The Flutter web tests builder based on linear_sdk_flutter_engine
is disabled, and replaced by the monorepo-based sharded Flutter
web testers on the console.

The old flutter-engine-linux-web_tests-try builder remains, and can
be triggered on a Dart SDK CL, since try jobs are not implemented
on the new monorepo test builders yet.

Bug: b/231927187
Change-Id: I58dcbb8f69171dd28e81de3a52ca87cecc638ebc
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/276440
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 43 ------------------------
 generated/luci-milo.cfg      | 64 ++++++++++++++++++++++++------------
 generated/luci-notify.cfg    | 11 -------
 generated/luci-scheduler.cfg | 11 -------
 lib/dart.star                |  2 --
 main.star                    | 20 ++---------
 monorepo.star                | 12 +++++++
 7 files changed, 57 insertions(+), 106 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index d88e2f28fb61..308965fb47ba 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -3875,48 +3875,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "flutter-engine-linux-web_tests"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "flutter_test_suites": ['
-        '    "web_tests",'
-        '    "web_tool_tests"'
-        '  ],'
-        '  "recipe": "dart/flutter_engine"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 28800
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "flutter-frontend"
       swarming_host: "chromium-swarm.appspot.com"
@@ -14401,7 +14359,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "flutter_test_suites": ['
         '    "web_tests",'
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 63ae71cd02b5..d5b640a820f1 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -551,11 +551,6 @@ consoles {
     category: "flutter"
     short_name: "3H"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-web_tests"
-    category: "flutter"
-    short_name: "web"
-  }
   builders {
     name: "buildbucket/luci.dart.ci/flutter-engine-ios"
     category: "flutter"
@@ -1286,11 +1281,6 @@ consoles {
     category: "flutter"
     short_name: "3H"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-web_tests"
-    category: "flutter"
-    short_name: "web"
-  }
   builders {
     name: "buildbucket/luci.dart.ci/flutter-engine-ios"
     category: "flutter"
@@ -3175,17 +3165,6 @@ consoles {
     short_name: "ios"
   }
 }
-consoles {
-  id: "flutter-hhh-web"
-  name: "Dart/Flutter Web Linear History Console"
-  repo_url: "https://dart.googlesource.com/linear_sdk_flutter_engine"
-  refs: "regexp:refs/heads/master"
-  manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux-web_tests"
-    short_name: "web"
-  }
-}
 consoles {
   id: "iso-stress"
   name: "VM Isolate Stress Test Console"
@@ -3341,4 +3320,47 @@ consoles {
     tree_status_host: "dart-status.appspot.com"
   }
 }
+consoles {
+  id: "flutter-web"
+  name: "Dart/Flutter Web Console"
+  repo_url: "https://dart.googlesource.com/monorepo"
+  refs: "regexp:refs/heads/main"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-0"
+    short_name: "wt0"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-1"
+    short_name: "wt1"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-2"
+    short_name: "wt2"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-3"
+    short_name: "wt3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-4"
+    short_name: "wt4"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-5"
+    short_name: "wt5"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-6"
+    short_name: "wt6"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-7-last"
+    short_name: "wt7"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tool-tests"
+    short_name: "wtool"
+  }
+}
 logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 7506a5409330..2564a548873b 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -337,17 +337,6 @@ notifiers {
     repository: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "flutter-engine-linux-web_tests"
-    repository: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
-  }
-}
 notifiers {
   notifications {
     on_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index bbe2c9428c7c..c6175c32c103 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -944,16 +944,6 @@ job {
     builder: "flutter-engine-linux"
   }
 }
-job {
-  id: "flutter-engine-linux-web_tests"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "flutter-engine-linux-web_tests"
-  }
-}
 job {
   id: "flutter-frontend"
   realm: "ci.sandbox"
@@ -3337,7 +3327,6 @@ trigger {
   id: "dart-gitiles-trigger-flutter"
   realm: "ci"
   triggers: "flutter-engine-linux"
-  triggers: "flutter-engine-linux-web_tests"
   gitiles {
     repo: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
     refs: "regexp:refs/heads/master"
diff --git a/lib/dart.star b/lib/dart.star
index 44a866824b43..7570fc042068 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -148,7 +148,6 @@ def _builder(
         enabled = True,
         category = None,
         channels = [],
-        cq_branches = _BRANCHES,
         dimensions = None,
         executable = None,
         execution_timeout = None,
@@ -177,7 +176,6 @@ def _builder(
         enabled: Whether this builder is currently running or not.
         category: Where to show the builder on the console.
         channels: Which other channels the builder should be added to.
-        cq_branches: Make try builder on these branches (defaults to _BRANCHES).
         dimensions: Extra swarming dimensions required by this builder.
         executable: The Luci executable to use.
         execution_timeout: Time to allow for the build to run.
diff --git a/main.star b/main.star
index 398a0bec3169..9b3f98e78b37 100755
--- a/main.star
+++ b/main.star
@@ -111,13 +111,6 @@ luci.console_view(
     refs = ["refs/heads/master"],
 )
 
-luci.console_view(
-    name = "flutter-hhh-web",
-    repo = "https://dart.googlesource.com/linear_sdk_flutter_engine",
-    title = "Dart/Flutter Web Linear History Console",
-    refs = ["refs/heads/master"],
-)
-
 luci.list_view(
     name = "iso-stress",
     title = "VM Isolate Stress Test Console",
@@ -302,15 +295,12 @@ dart.ci_sandbox_builder(
     }],
 )
 
-dart.ci_sandbox_builder(
+dart.try_builder(
     "flutter-engine-linux-web_tests",
     recipe = "dart/flutter_engine",
-    category = "flutter|web",
-    channels = ["try"],
+    cq_branches = ["main"],
     execution_timeout = 8 * time.hour,
-    triggered_by = ["dart-gitiles-trigger-flutter"],
     properties = {
-        "bisection_enabled": True,
         "flutter_test_suites": [
             "web_tests",
             "web_tool_tests",
@@ -688,12 +678,6 @@ luci.console_view_entry(
     console_view = "flutter-hhh",
 )
 
-luci.console_view_entry(
-    builder = "flutter-engine-linux-web_tests",
-    short_name = "web",
-    console_view = "flutter-hhh-web",
-)
-
 # VM isolate stress test console
 luci.list_view_entry(
     builder = "iso-stress-linux",
diff --git a/monorepo.star b/monorepo.star
index 4d617739e3cf..009646f144f3 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -16,6 +16,13 @@ luci.console_view(
     header = "console-header.textpb",
 )
 
+luci.console_view(
+    name = "flutter-web",
+    repo = "https://dart.googlesource.com/monorepo",
+    title = "Dart/Flutter Web Console",
+    refs = ["refs/heads/main"],
+)
+
 dart.ci_sandbox_builder(
     name = "flutter-linux",
     channels = [],
@@ -105,6 +112,11 @@ def monorepo_tester(name, short_name, category):
         category = category,
         console_view = "monorepo",
     )
+    luci.console_view_entry(
+        builder = name,
+        short_name = short_name,
+        console_view = "flutter-web",
+    )
     dart.try_builder(
         name,
         executable = dart.flutter_recipe("engine_v2/tester"),

From 1a39ccfc0c5b27fa1119e3cb5641c3a687a85043 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Mon, 19 Dec 2022 13:11:58 +0000
Subject: [PATCH 601/826] Update flutter-web console name in console headers
 configuration.

Change-Id: I1ca30b463296e9fca0c47eefe0a9c3cba7140715
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/276421
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 console-header.textpb   |  2 +-
 generated/luci-milo.cfg | 65 +++++++++++++++++++++++++++++++++++++----
 monorepo.star           |  1 +
 3 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/console-header.textpb b/console-header.textpb
index b7492ee42ba7..82d3301cf9a1 100644
--- a/console-header.textpb
+++ b/console-header.textpb
@@ -45,7 +45,7 @@ console_groups: {
     console_ids: "dart/dart-fuzz"
     console_ids: "dart/flutter"
     console_ids: "dart/flutter-hhh"
-    console_ids: "dart/flutter-hhh-web"
+    console_ids: "dart/flutter-web"
     console_ids: "dart/iso-stress"
 }
 tree_status_host: "dart-status.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index d5b640a820f1..dec0c31503ce 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -1189,7 +1189,7 @@ consoles {
       console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
-      console_ids: "dart/flutter-hhh-web"
+      console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
     }
     tree_status_host: "dart-status.appspot.com"
@@ -1919,7 +1919,7 @@ consoles {
       console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
-      console_ids: "dart/flutter-hhh-web"
+      console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
     }
     tree_status_host: "dart-status.appspot.com"
@@ -2329,7 +2329,7 @@ consoles {
       console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
-      console_ids: "dart/flutter-hhh-web"
+      console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
     }
     tree_status_host: "dart-status.appspot.com"
@@ -2724,7 +2724,7 @@ consoles {
       console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
-      console_ids: "dart/flutter-hhh-web"
+      console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
     }
     tree_status_host: "dart-status.appspot.com"
@@ -3119,7 +3119,7 @@ consoles {
       console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
-      console_ids: "dart/flutter-hhh-web"
+      console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
     }
     tree_status_host: "dart-status.appspot.com"
@@ -3314,7 +3314,7 @@ consoles {
       console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
-      console_ids: "dart/flutter-hhh-web"
+      console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
     }
     tree_status_host: "dart-status.appspot.com"
@@ -3362,5 +3362,58 @@ consoles {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tool-tests"
     short_name: "wtool"
   }
+  header {
+    links {
+      name: "Consoles"
+      links {
+        text: "Bleeding Edge console"
+        url: "/p/dart/g/be/console"
+        alt: "SDK BE Console"
+      }
+      links {
+        text: "Alternative Bleeding Edge console"
+        url: "/p/dart/g/alt/console"
+        alt: "SDK BE Console (alternative)"
+      }
+      links {
+        text: "FYI console"
+        url: "/p/dart/g/fyi/console"
+        alt: "SDK FYI Console"
+      }
+      links {
+        text: "LKGR console"
+        url: "/p/dart-internal/g/lkgr/console"
+        alt: "SDK LKGR console"
+      }
+      links {
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      }
+      links {
+        text: "Results Feed"
+        url: "https://dart-ci.firebaseapp.com/"
+        alt: "Results Feed"
+      }
+      links {
+        text: "Current Test Results"
+        url: "https://dart-ci.firebaseapp.com/current_results/"
+        alt: "Current Test Results"
+      }
+      links {
+        text: "Dart Infrastructure chat"
+        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
+        alt: "Dart Infrastructure chat"
+      }
+    }
+    console_groups {
+      console_ids: "dart/dart-fuzz"
+      console_ids: "dart/flutter"
+      console_ids: "dart/flutter-hhh"
+      console_ids: "dart/flutter-web"
+      console_ids: "dart/iso-stress"
+    }
+    tree_status_host: "dart-status.appspot.com"
+  }
 }
 logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png"
diff --git a/monorepo.star b/monorepo.star
index 009646f144f3..12b1de3fd08e 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -21,6 +21,7 @@ luci.console_view(
     repo = "https://dart.googlesource.com/monorepo",
     title = "Dart/Flutter Web Console",
     refs = ["refs/heads/main"],
+    header = "console-header.textpb",
 )
 
 dart.ci_sandbox_builder(

From 14f89c50c4065fd999b3c543ec422cac3b0065b1 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Mon, 19 Dec 2022 14:18:57 +0000
Subject: [PATCH 602/826] Add flutter-engine console, remove fyi console

No builders were using the fyi console, and builder status is
now handled with results approvals, so removed it.

Added the flutter-engine console to show the monorepo engine builders
in the console header, and provide a link to them.

Rename bleeding-edge consoles to main consoles.

Bug: b\231927187
Change-Id: I52a3fec8aa2c78daaffec0bdef8d1c5d64c5a908
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/276520
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 console-header.textpb   |  22 ++--
 generated/luci-milo.cfg | 241 ++++++++++++++++++++++++----------------
 lib/dart.star           |   4 +-
 main.star               |  11 +-
 monorepo.star           |  13 +++
 5 files changed, 168 insertions(+), 123 deletions(-)

diff --git a/console-header.textpb b/console-header.textpb
index 82d3301cf9a1..12dadfef86de 100644
--- a/console-header.textpb
+++ b/console-header.textpb
@@ -1,24 +1,19 @@
 links: {
     name: "Consoles"
     links: {
-        text: "Bleeding Edge console"
+        text: "Main Console"
         url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
+        alt: "Main SDK Console"
     }
     links: {
-        text: "Alternative Bleeding Edge console"
+        text: "Main Console (VM last)"
         url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
+        alt: "Main SDK Console (VM last)"
     }
     links: {
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
-    }
-    links: {
-        text: "LKGR console"
+        text: "LKGR Console"
         url: "/p/dart-internal/g/lkgr/console"
-        alt: "SDK LKGR console"
+        alt: "SDK LKGR Console"
     }
     links: {
         text: "SDK CQ Status"
@@ -36,15 +31,16 @@ links: {
         alt: "Current Test Results"
     }
     links: {
-        text: "Dart Infrastructure chat"
+        text: "Dart Infrastructure Chat"
         url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
-        alt: "Dart Infrastructure chat"
+        alt: "Dart Infrastructure Chat"
     }
 }
 console_groups: {
     console_ids: "dart/dart-fuzz"
     console_ids: "dart/flutter"
     console_ids: "dart/flutter-hhh"
+    console_ids: "dart/flutter-engine"
     console_ids: "dart/flutter-web"
     console_ids: "dart/iso-stress"
 }
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index dec0c31503ce..d23f1c7042c9 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -467,7 +467,7 @@ consoles {
 }
 consoles {
   id: "be"
-  name: "SDK Bleeding Edge Console"
+  name: "Main Console"
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "regexp:refs/heads/main"
   manifest_name: "REVISION"
@@ -1145,24 +1145,19 @@ consoles {
     links {
       name: "Consoles"
       links {
-        text: "Bleeding Edge console"
+        text: "Main Console"
         url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
+        alt: "Main SDK Console"
       }
       links {
-        text: "Alternative Bleeding Edge console"
+        text: "Main Console (VM last)"
         url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
+        alt: "Main SDK Console (VM last)"
       }
       links {
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
-      }
-      links {
-        text: "LKGR console"
+        text: "LKGR Console"
         url: "/p/dart-internal/g/lkgr/console"
-        alt: "SDK LKGR console"
+        alt: "SDK LKGR Console"
       }
       links {
         text: "SDK CQ Status"
@@ -1180,15 +1175,16 @@ consoles {
         alt: "Current Test Results"
       }
       links {
-        text: "Dart Infrastructure chat"
+        text: "Dart Infrastructure Chat"
         url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
-        alt: "Dart Infrastructure chat"
+        alt: "Dart Infrastructure Chat"
       }
     }
     console_groups {
       console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
+      console_ids: "dart/flutter-engine"
       console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
     }
@@ -1197,7 +1193,7 @@ consoles {
 }
 consoles {
   id: "alt"
-  name: "SDK Bleeding Edge Console (alternative)"
+  name: "Main Console (VM last)"
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "regexp:refs/heads/main"
   manifest_name: "REVISION"
@@ -1875,24 +1871,19 @@ consoles {
     links {
       name: "Consoles"
       links {
-        text: "Bleeding Edge console"
+        text: "Main Console"
         url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
+        alt: "Main SDK Console"
       }
       links {
-        text: "Alternative Bleeding Edge console"
+        text: "Main Console (VM last)"
         url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
-      }
-      links {
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
+        alt: "Main SDK Console (VM last)"
       }
       links {
-        text: "LKGR console"
+        text: "LKGR Console"
         url: "/p/dart-internal/g/lkgr/console"
-        alt: "SDK LKGR console"
+        alt: "SDK LKGR Console"
       }
       links {
         text: "SDK CQ Status"
@@ -1910,15 +1901,16 @@ consoles {
         alt: "Current Test Results"
       }
       links {
-        text: "Dart Infrastructure chat"
+        text: "Dart Infrastructure Chat"
         url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
-        alt: "Dart Infrastructure chat"
+        alt: "Dart Infrastructure Chat"
       }
     }
     console_groups {
       console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
+      console_ids: "dart/flutter-engine"
       console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
     }
@@ -2285,24 +2277,19 @@ consoles {
     links {
       name: "Consoles"
       links {
-        text: "Bleeding Edge console"
+        text: "Main Console"
         url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
+        alt: "Main SDK Console"
       }
       links {
-        text: "Alternative Bleeding Edge console"
+        text: "Main Console (VM last)"
         url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
-      }
-      links {
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
+        alt: "Main SDK Console (VM last)"
       }
       links {
-        text: "LKGR console"
+        text: "LKGR Console"
         url: "/p/dart-internal/g/lkgr/console"
-        alt: "SDK LKGR console"
+        alt: "SDK LKGR Console"
       }
       links {
         text: "SDK CQ Status"
@@ -2320,15 +2307,16 @@ consoles {
         alt: "Current Test Results"
       }
       links {
-        text: "Dart Infrastructure chat"
+        text: "Dart Infrastructure Chat"
         url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
-        alt: "Dart Infrastructure chat"
+        alt: "Dart Infrastructure Chat"
       }
     }
     console_groups {
       console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
+      console_ids: "dart/flutter-engine"
       console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
     }
@@ -2680,24 +2668,19 @@ consoles {
     links {
       name: "Consoles"
       links {
-        text: "Bleeding Edge console"
+        text: "Main Console"
         url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
+        alt: "Main SDK Console"
       }
       links {
-        text: "Alternative Bleeding Edge console"
+        text: "Main Console (VM last)"
         url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
+        alt: "Main SDK Console (VM last)"
       }
       links {
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
-      }
-      links {
-        text: "LKGR console"
+        text: "LKGR Console"
         url: "/p/dart-internal/g/lkgr/console"
-        alt: "SDK LKGR console"
+        alt: "SDK LKGR Console"
       }
       links {
         text: "SDK CQ Status"
@@ -2715,15 +2698,16 @@ consoles {
         alt: "Current Test Results"
       }
       links {
-        text: "Dart Infrastructure chat"
+        text: "Dart Infrastructure Chat"
         url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
-        alt: "Dart Infrastructure chat"
+        alt: "Dart Infrastructure Chat"
       }
     }
     console_groups {
       console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
+      console_ids: "dart/flutter-engine"
       console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
     }
@@ -3075,24 +3059,19 @@ consoles {
     links {
       name: "Consoles"
       links {
-        text: "Bleeding Edge console"
+        text: "Main Console"
         url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
+        alt: "Main SDK Console"
       }
       links {
-        text: "Alternative Bleeding Edge console"
+        text: "Main Console (VM last)"
         url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
+        alt: "Main SDK Console (VM last)"
       }
       links {
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
-      }
-      links {
-        text: "LKGR console"
+        text: "LKGR Console"
         url: "/p/dart-internal/g/lkgr/console"
-        alt: "SDK LKGR console"
+        alt: "SDK LKGR Console"
       }
       links {
         text: "SDK CQ Status"
@@ -3110,15 +3089,16 @@ consoles {
         alt: "Current Test Results"
       }
       links {
-        text: "Dart Infrastructure chat"
+        text: "Dart Infrastructure Chat"
         url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
-        alt: "Dart Infrastructure chat"
+        alt: "Dart Infrastructure Chat"
       }
     }
     console_groups {
       console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
+      console_ids: "dart/flutter-engine"
       console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
     }
@@ -3173,13 +3153,6 @@ consoles {
   }
   builder_view_only: true
 }
-consoles {
-  id: "fyi"
-  name: "SDK FYI Console"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/main"
-  manifest_name: "REVISION"
-}
 consoles {
   id: "monorepo"
   name: "Monorepo Console"
@@ -3270,24 +3243,99 @@ consoles {
     links {
       name: "Consoles"
       links {
-        text: "Bleeding Edge console"
+        text: "Main Console"
         url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
+        alt: "Main SDK Console"
       }
       links {
-        text: "Alternative Bleeding Edge console"
+        text: "Main Console (VM last)"
         url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
+        alt: "Main SDK Console (VM last)"
+      }
+      links {
+        text: "LKGR Console"
+        url: "/p/dart-internal/g/lkgr/console"
+        alt: "SDK LKGR Console"
+      }
+      links {
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      }
+      links {
+        text: "Results Feed"
+        url: "https://dart-ci.firebaseapp.com/"
+        alt: "Results Feed"
+      }
+      links {
+        text: "Current Test Results"
+        url: "https://dart-ci.firebaseapp.com/current_results/"
+        alt: "Current Test Results"
+      }
+      links {
+        text: "Dart Infrastructure Chat"
+        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
+        alt: "Dart Infrastructure Chat"
+      }
+    }
+    console_groups {
+      console_ids: "dart/dart-fuzz"
+      console_ids: "dart/flutter"
+      console_ids: "dart/flutter-hhh"
+      console_ids: "dart/flutter-engine"
+      console_ids: "dart/flutter-web"
+      console_ids: "dart/iso-stress"
+    }
+    tree_status_host: "dart-status.appspot.com"
+  }
+}
+consoles {
+  id: "flutter-engine"
+  name: "Dart/Flutter Engine Console"
+  repo_url: "https://dart.googlesource.com/monorepo"
+  refs: "regexp:refs/heads/main"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-android-debug"
+    short_name: "android-debug"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-android-profile"
+    short_name: "android-profile"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-debug"
+    short_name: "debug"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-debug-unopt"
+    short_name: "debug-unopt"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-profile"
+    short_name: "profile"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-release"
+    short_name: "release"
+  }
+  header {
+    links {
+      name: "Consoles"
+      links {
+        text: "Main Console"
+        url: "/p/dart/g/be/console"
+        alt: "Main SDK Console"
       }
       links {
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
+        text: "Main Console (VM last)"
+        url: "/p/dart/g/alt/console"
+        alt: "Main SDK Console (VM last)"
       }
       links {
-        text: "LKGR console"
+        text: "LKGR Console"
         url: "/p/dart-internal/g/lkgr/console"
-        alt: "SDK LKGR console"
+        alt: "SDK LKGR Console"
       }
       links {
         text: "SDK CQ Status"
@@ -3305,15 +3353,16 @@ consoles {
         alt: "Current Test Results"
       }
       links {
-        text: "Dart Infrastructure chat"
+        text: "Dart Infrastructure Chat"
         url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
-        alt: "Dart Infrastructure chat"
+        alt: "Dart Infrastructure Chat"
       }
     }
     console_groups {
       console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
+      console_ids: "dart/flutter-engine"
       console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
     }
@@ -3366,24 +3415,19 @@ consoles {
     links {
       name: "Consoles"
       links {
-        text: "Bleeding Edge console"
+        text: "Main Console"
         url: "/p/dart/g/be/console"
-        alt: "SDK BE Console"
+        alt: "Main SDK Console"
       }
       links {
-        text: "Alternative Bleeding Edge console"
+        text: "Main Console (VM last)"
         url: "/p/dart/g/alt/console"
-        alt: "SDK BE Console (alternative)"
-      }
-      links {
-        text: "FYI console"
-        url: "/p/dart/g/fyi/console"
-        alt: "SDK FYI Console"
+        alt: "Main SDK Console (VM last)"
       }
       links {
-        text: "LKGR console"
+        text: "LKGR Console"
         url: "/p/dart-internal/g/lkgr/console"
-        alt: "SDK LKGR console"
+        alt: "SDK LKGR Console"
       }
       links {
         text: "SDK CQ Status"
@@ -3401,15 +3445,16 @@ consoles {
         alt: "Current Test Results"
       }
       links {
-        text: "Dart Infrastructure chat"
+        text: "Dart Infrastructure Chat"
         url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
-        alt: "Dart Infrastructure chat"
+        alt: "Dart Infrastructure Chat"
       }
     }
     console_groups {
       console_ids: "dart/dart-fuzz"
       console_ids: "dart/flutter"
       console_ids: "dart/flutter-hhh"
+      console_ids: "dart/flutter-engine"
       console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
     }
diff --git a/lib/dart.star b/lib/dart.star
index 7570fc042068..d49d8a0c51d8 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -155,7 +155,6 @@ def _builder(
         experiments = None,
         expiration_timeout = None,
         goma = None,
-        fyi = False,
         notifies = "dart",
         priority = priority.normal,
         properties = None,
@@ -183,7 +182,6 @@ def _builder(
         experiments: Experiments to run on this builder, with percentages.
         expiration_timeout: How long builds should wait for a bot to run on.
         goma: Whether to use goma or not.
-        fyi: Whether this is an FYI builder or not.
         notifies: Which luci notifier group to notify (default: "dart").
         priority: What swarming priority this builder gets (default: NORMAL).
         properties: Extra properties to set for builds.
@@ -269,7 +267,7 @@ def _builder(
             if category:
                 console_category, _, short_name = category.rpartition("|")
                 toplevel_category, _, _ = console_category.partition("|")
-                console = channel or "be" if not fyi else "fyi"
+                console = channel or "be"
                 luci.console_view_entry(
                     builder = builder,
                     short_name = short_name,
diff --git a/main.star b/main.star
index 9b3f98e78b37..a990c16a90e6 100755
--- a/main.star
+++ b/main.star
@@ -55,7 +55,7 @@ exec("//cq.star")
 luci.console_view(
     name = "be",
     repo = "https://dart.googlesource.com/sdk",
-    title = "SDK Bleeding Edge Console",
+    title = "Main Console",
     refs = ["refs/heads/main"],
     header = "console-header.textpb",
 )
@@ -63,7 +63,7 @@ luci.console_view(
 luci.console_view(
     name = "alt",
     repo = "https://dart.googlesource.com/sdk",
-    title = "SDK Bleeding Edge Console (alternative)",
+    title = "Main Console (VM last)",
     refs = ["refs/heads/main"],
     header = "console-header.textpb",
 )
@@ -116,13 +116,6 @@ luci.list_view(
     title = "VM Isolate Stress Test Console",
 )
 
-luci.console_view(
-    name = "fyi",
-    repo = dart.git,
-    title = "SDK FYI Console",
-    refs = ["refs/heads/main"],
-)
-
 def sdk_builder_category():
     """Put the SDK category first on the consoles"""
     for channel, console in [
diff --git a/monorepo.star b/monorepo.star
index 12b1de3fd08e..a3433b209f99 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -16,6 +16,14 @@ luci.console_view(
     header = "console-header.textpb",
 )
 
+luci.console_view(
+    name = "flutter-engine",
+    repo = "https://dart.googlesource.com/monorepo",
+    title = "Dart/Flutter Engine Console",
+    refs = ["refs/heads/main"],
+    header = "console-header.textpb",
+)
+
 luci.console_view(
     name = "flutter-web",
     repo = "https://dart.googlesource.com/monorepo",
@@ -79,6 +87,11 @@ def monorepo_builder(name, short_name, category):
         category = category,
         console_view = "monorepo",
     )
+    luci.console_view_entry(
+        builder = name,
+        short_name = short_name,
+        console_view = "flutter-engine",
+    )
     dart.try_builder(
         name,
         executable = dart.flutter_recipe("engine_v2/builder"),

From bb8f48c63e1919a8d0036d192e58b076c10ea4af Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Wed, 21 Dec 2022 13:34:16 +0000
Subject: [PATCH 603/826] Revert "Increase timeout for msan nightly builder"

This reverts commit b3e3e9a55686346fb8fdc4c3b7745efa9af519c9.

Reason for revert: The default timeout for builders is already 3 hours. This CL did not change the timeout.
Original change's description:
> Increase timeout for msan nightly builder
>
> The runtime of the vm tests increased, and letting the builder
> run longer will help diagnose the problem.
>
> Change-Id: I73bc580aa120cd04dd7125456ac67f975e6a1816
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/276082
> Reviewed-by: Daco Harkes <dacoharkes@google.com>
> Commit-Queue: William Hesse <whesse@google.com>

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: Ifad941005bc7dc74385ecb58c2a7bda99b42db6f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/276920
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 generated/cr-buildbucket.cfg | 2 --
 generated/project.cfg        | 2 +-
 vm.star                      | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 308965fb47ba..c9711b34ee2b 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -8487,7 +8487,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
-      execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -16322,7 +16321,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
diff --git a/generated/project.cfg b/generated/project.cfg
index 6a665c5aae08..a58509da9248 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.35.3"
+  version: "1.35.2"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/vm.star b/vm.star
index bfff1a0d5937..36f6aa1bcdfa 100644
--- a/vm.star
+++ b/vm.star
@@ -423,7 +423,6 @@ dart_vm_sanitizer_builder(
 dart_vm_sanitizer_builder(
     "vm-kernel-msan-linux-release-x64",
     category = "vm|misc|m",
-    execution_timeout = 3 * time.hour,
 )
 dart_vm_sanitizer_builder(
     "vm-kernel-tsan-linux-release-x64",

From cf59005709b3d1d7b4aa45afcd27e512b819b75d Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Wed, 11 Jan 2023 15:34:30 +0000
Subject: [PATCH 604/826] [infra] Fix riscv64 sdk builds using clang.

Fixes: b/265143946
Change-Id: I201355ad0d542e9b5ce8334b869ca2ba9c2b9257
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/278902
Commit-Queue: Alexander Thomas <athom@google.com>
Auto-Submit: Jonas Termansen <sortie@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 3 +++
 generated/project.cfg        | 2 +-
 main.star                    | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index c9711b34ee2b..f5cbc3119b89 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -13168,6 +13168,9 @@ buckets {
         '  "archs": ['
         '    "riscv64"'
         '  ],'
+        '  "args": ['
+        '    "--no-clang"'
+        '  ],'
         '  "clobber": true,'
         '  "disable_bcid": true,'
         '  "recipe": "release/sdk"'
diff --git a/generated/project.cfg b/generated/project.cfg
index a58509da9248..0bfd7dea5da2 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.35.2"
+  version: "1.37.0"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/main.star b/main.star
index a990c16a90e6..045c2f07ba31 100755
--- a/main.star
+++ b/main.star
@@ -491,6 +491,7 @@ dart.try_builder(
             "timeout": 100 * 60,  # 100 minutes,
         },
         "archs": ["riscv64"],
+        "args": ["--no-clang"],
         "disable_bcid": True,
     },
     recipe = "release/sdk",

From dfe2da1df29d222910ae7492b9c65191f07242d4 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 31 Jan 2023 08:51:53 +0000
Subject: [PATCH 605/826] [infra] Move "misc" builders to NNBD.

Change-Id: I35c2cc6f875e1a5bc5559c6cf1c327e094c68325
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/276021
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   |  102 ++--
 generated/cr-buildbucket.cfg | 1070 +++++++++++++++++-----------------
 generated/luci-milo.cfg      |  140 ++---
 generated/luci-notify.cfg    |  252 ++++----
 generated/luci-scheduler.cfg |  336 +++++------
 vm.star                      |   52 +-
 6 files changed, 976 insertions(+), 976 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index a5429dd98d6b..6f9a1a2f007c 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -3081,6 +3081,26 @@ config_groups {
         name: "dart/try/stable-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-asan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-msan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-tsan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-ubsan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-asan-linux-release-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-canary-linux-debug-try"
         location_filters {
@@ -3172,10 +3192,6 @@ config_groups {
         name: "dart/try/vm-fuchsia-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-asan-linux-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-checked-linux-release-x64-try"
         includable_only: true
@@ -3192,10 +3208,6 @@ config_groups {
         name: "dart/try/vm-kernel-linux-debug-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-linux-debug-x64c-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-linux-release-ia32-try"
         includable_only: true
@@ -3223,10 +3235,6 @@ config_groups {
         name: "dart/try/vm-kernel-mac-release-x64-try"
         experiment_percentage: 5
       }
-      builders {
-        name: "dart/try/vm-kernel-msan-linux-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-msvc-windows-try"
         includable_only: true
@@ -3302,6 +3310,10 @@ config_groups {
           path_regexp: "runtime/.+"
         }
       }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-debug-x64c-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-release-ia32-try"
         includable_only: true
@@ -3398,19 +3410,15 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-win-release-ia32-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-win-release-x64-try"
+        name: "dart/try/vm-kernel-nnbd-win-debug-x64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
+        name: "dart/try/vm-kernel-nnbd-win-release-ia32-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-optcounter-threshold-linux-release-x64-try"
+        name: "dart/try/vm-kernel-nnbd-win-release-x64-try"
         includable_only: true
       }
       builders {
@@ -3421,10 +3429,6 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-android-release-arm_x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-precomp-asan-linux-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-precomp-dwarf-linux-product-x64-try"
         includable_only: true
@@ -3437,10 +3441,6 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-x64c-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-precomp-linux-product-x64-try"
         includable_only: true
@@ -3469,10 +3469,6 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-mac-release-simarm64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-precomp-msan-linux-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
         includable_only: true
@@ -3485,6 +3481,10 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-x64c-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
         includable_only: true
@@ -3506,83 +3506,83 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-win-debug-x64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-tsan-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-ubsan-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-win-product-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-win-debug-x64c-try"
+        name: "dart/try/vm-kernel-precomp-win-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-win-product-x64-try"
+        name: "dart/try/vm-kernel-win-debug-ia32-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-win-release-x64-try"
+        name: "dart/try/vm-kernel-win-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-reload-linux-debug-x64-try"
+        name: "dart/try/vm-kernel-win-release-ia32-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-reload-linux-release-x64-try"
+        name: "dart/try/vm-kernel-win-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-reload-rollback-linux-debug-x64-try"
+        name: "dart/try/vm-msan-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-reload-rollback-linux-release-x64-try"
+        name: "dart/try/vm-nnbd-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-tsan-linux-release-x64-try"
+        name: "dart/try/vm-optcounter-threshold-linux-release-ia32-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-ubsan-linux-release-x64-try"
+        name: "dart/try/vm-optcounter-threshold-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-win-debug-ia32-try"
+        name: "dart/try/vm-precomp-ffi-qemu-linux-release-arm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-win-debug-x64-try"
+        name: "dart/try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-win-debug-x64c-try"
+        name: "dart/try/vm-reload-linux-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-win-release-ia32-try"
+        name: "dart/try/vm-reload-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-win-release-x64-try"
+        name: "dart/try/vm-reload-rollback-linux-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-precomp-ffi-qemu-linux-release-arm-try"
+        name: "dart/try/vm-reload-rollback-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
+        name: "dart/try/vm-ubsan-linux-release-x64-try"
         includable_only: true
       }
       retry_config {}
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index f5cbc3119b89..3bb6b7f52da6 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -6024,7 +6024,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-canary-linux-debug"
+      name: "vm-aot-asan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6048,10 +6048,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6060,7 +6061,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-canary-linux-debug-beta"
+      name: "vm-aot-msan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6084,10 +6085,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6096,7 +6098,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-canary-linux-debug-dev"
+      name: "vm-aot-tsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6120,10 +6122,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6132,10 +6135,45 @@ buckets {
       }
     }
     builders {
-      name: "vm-canary-linux-debug-experimental"
+      name: "vm-aot-ubsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "host_class:experimental"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-asan-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
@@ -6156,6 +6194,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -6168,7 +6207,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-canary-linux-debug-stable"
+      name: "vm-canary-linux-debug"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6204,7 +6243,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm"
+      name: "vm-canary-linux-debug-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6240,7 +6279,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm-beta"
+      name: "vm-canary-linux-debug-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6276,7 +6315,43 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm-dev"
+      name: "vm-canary-linux-debug-experimental"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:experimental"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-canary-linux-debug-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6312,7 +6387,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm-stable"
+      name: "vm-ffi-android-debug-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6348,7 +6423,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c"
+      name: "vm-ffi-android-debug-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6384,7 +6459,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c-beta"
+      name: "vm-ffi-android-debug-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6420,7 +6495,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c-dev"
+      name: "vm-ffi-android-debug-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6456,7 +6531,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c-stable"
+      name: "vm-ffi-android-debug-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6492,7 +6567,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm"
+      name: "vm-ffi-android-debug-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6528,7 +6603,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm-beta"
+      name: "vm-ffi-android-debug-arm64c-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6564,7 +6639,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm-dev"
+      name: "vm-ffi-android-debug-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6600,7 +6675,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm-stable"
+      name: "vm-ffi-android-product-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6636,7 +6711,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c"
+      name: "vm-ffi-android-product-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6672,7 +6747,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c-beta"
+      name: "vm-ffi-android-product-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6708,7 +6783,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c-dev"
+      name: "vm-ffi-android-product-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6744,7 +6819,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c-stable"
+      name: "vm-ffi-android-product-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6780,7 +6855,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm"
+      name: "vm-ffi-android-product-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6816,7 +6891,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm-beta"
+      name: "vm-ffi-android-product-arm64c-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6852,7 +6927,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm-dev"
+      name: "vm-ffi-android-product-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6888,7 +6963,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm-stable"
+      name: "vm-ffi-android-release-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6924,7 +6999,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c"
+      name: "vm-ffi-android-release-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6960,7 +7035,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c-beta"
+      name: "vm-ffi-android-release-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6996,7 +7071,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c-dev"
+      name: "vm-ffi-android-release-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7032,7 +7107,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c-stable"
+      name: "vm-ffi-android-release-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7068,7 +7143,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-fuchsia-release-x64"
+      name: "vm-ffi-android-release-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7095,8 +7170,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      expiration_secs: 86400
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7105,7 +7179,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-asan-linux-release-x64"
+      name: "vm-ffi-android-release-arm64c-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7129,11 +7203,10 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7142,7 +7215,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64"
+      name: "vm-ffi-android-release-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7173,16 +7246,49 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
-        key: "dart.use_update_script"
+        key: "luci.recipes.use_python3"
         value: 100
       }
+    }
+    builders {
+      name: "vm-fuchsia-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      expiration_secs: 86400
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-beta"
+      name: "vm-kernel-checked-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7222,7 +7328,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-dev"
+      name: "vm-kernel-checked-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7262,7 +7368,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-stable"
+      name: "vm-kernel-checked-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7302,7 +7408,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-gcc-linux"
+      name: "vm-kernel-checked-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7315,9 +7421,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true,'
-        '    "timeout": 4500'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -7328,17 +7435,20 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      execution_timeout_secs: 18000
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-ia32"
+      name: "vm-kernel-gcc-linux"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7351,10 +7461,9 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true,'
+        '    "timeout": 4500'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -7366,6 +7475,7 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
+      execution_timeout_secs: 18000
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7374,7 +7484,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64"
+      name: "vm-kernel-linux-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7401,7 +7511,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7410,7 +7520,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64-beta"
+      name: "vm-kernel-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7446,7 +7556,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64-dev"
+      name: "vm-kernel-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7482,7 +7592,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64-stable"
+      name: "vm-kernel-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7518,7 +7628,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64c"
+      name: "vm-kernel-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7545,7 +7655,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8458,11 +8568,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-msan-linux-release-x64"
+      name: "vm-kernel-msvc-windows"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8471,10 +8581,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -8482,7 +8590,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -8495,11 +8602,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-msvc-windows"
+      name: "vm-kernel-nnbd-linux-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8508,8 +8615,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -8518,7 +8627,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 70
       build_numbers: YES
@@ -8529,7 +8639,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-ia32"
+      name: "vm-kernel-nnbd-linux-debug-simriscv64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8554,8 +8664,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 70
       build_numbers: YES
@@ -8566,7 +8675,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-simriscv64"
+      name: "vm-kernel-nnbd-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8593,7 +8702,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8602,7 +8711,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64"
+      name: "vm-kernel-nnbd-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8638,7 +8747,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64-beta"
+      name: "vm-kernel-nnbd-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8674,7 +8783,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64-dev"
+      name: "vm-kernel-nnbd-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8710,7 +8819,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64-stable"
+      name: "vm-kernel-nnbd-linux-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8737,7 +8846,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9215,7 +9324,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-ia32"
+      name: "vm-kernel-nnbd-win-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9251,7 +9360,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-x64"
+      name: "vm-kernel-nnbd-win-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9287,47 +9396,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-optcounter-threshold-linux-release-ia32"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-optcounter-threshold-linux-release-x64"
+      name: "vm-kernel-nnbd-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9337,7 +9410,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9351,7 +9424,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
-      expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9655,43 +9727,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-precomp-asan-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-precomp-dwarf-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10020,42 +10055,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-precomp-linux-debug-x64c"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-precomp-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10884,7 +10883,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-msan-linux-release-x64"
+      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10908,7 +10907,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -10921,7 +10919,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+      name: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10946,7 +10944,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 70
       build_numbers: YES
@@ -10957,7 +10956,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
+      name: "vm-kernel-precomp-nnbd-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10994,7 +10993,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-x64"
+      name: "vm-kernel-precomp-nnbd-linux-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11019,8 +11018,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 70
       build_numbers: YES
@@ -11338,7 +11336,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-win-release-x64"
+      name: "vm-kernel-precomp-nnbd-win-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11374,11 +11372,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64"
+      name: "vm-kernel-precomp-nnbd-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11388,7 +11386,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11401,7 +11399,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11410,7 +11408,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11446,7 +11444,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11482,7 +11480,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11518,7 +11516,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-tsan-linux-release-x64"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11542,11 +11540,10 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11555,11 +11552,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-ubsan-linux-release-x64"
+      name: "vm-kernel-precomp-win-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11568,8 +11565,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -11577,7 +11576,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -11590,7 +11588,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-debug-x64c"
+      name: "vm-kernel-precomp-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11617,7 +11615,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11626,7 +11624,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-product-x64"
+      name: "vm-kernel-precomp-win-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11653,7 +11651,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11662,7 +11660,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-release-x64"
+      name: "vm-kernel-precomp-win-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11698,7 +11696,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-release-x64-beta"
+      name: "vm-kernel-precomp-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11734,7 +11732,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-release-x64-dev"
+      name: "vm-kernel-win-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11759,9 +11757,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11770,7 +11769,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-release-x64-stable"
+      name: "vm-kernel-win-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11806,11 +11805,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-reload-linux-debug-x64"
+      name: "vm-kernel-win-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11820,7 +11819,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11833,7 +11832,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11842,11 +11841,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-reload-linux-release-x64"
+      name: "vm-kernel-win-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11856,7 +11855,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11869,7 +11868,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11878,11 +11877,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-reload-rollback-linux-debug-x64"
+      name: "vm-kernel-win-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11892,7 +11891,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11905,7 +11904,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11914,11 +11913,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-reload-rollback-linux-release-x64"
+      name: "vm-kernel-win-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11928,7 +11927,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11950,11 +11949,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-tsan-linux-release-x64"
+      name: "vm-kernel-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11964,7 +11963,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11974,11 +11973,10 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11987,11 +11985,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-ubsan-linux-release-x64"
+      name: "vm-kernel-win-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12000,8 +11998,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -12009,11 +12009,10 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12022,7 +12021,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-ia32"
+      name: "vm-kernel-win-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12047,10 +12046,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12059,7 +12057,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-x64"
+      name: "vm-kernel-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12095,11 +12093,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-x64-beta"
+      name: "vm-msan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12109,7 +12107,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12119,10 +12117,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12131,11 +12130,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-x64-dev"
+      name: "vm-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12145,7 +12144,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12155,10 +12154,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12167,11 +12167,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-x64-stable"
+      name: "vm-optcounter-threshold-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12181,7 +12181,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12194,7 +12194,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12203,11 +12203,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-x64c"
+      name: "vm-optcounter-threshold-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12217,7 +12217,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12231,6 +12231,7 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
+      expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12239,11 +12240,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-release-ia32"
+      name: "vm-precomp-ffi-qemu-linux-release-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12253,7 +12254,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12266,7 +12267,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12275,11 +12276,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-release-x64"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12289,7 +12290,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12311,11 +12312,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-release-x64-beta"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12325,7 +12326,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12347,11 +12348,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-release-x64-dev"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "host_class:experimental"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12361,7 +12362,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12374,7 +12375,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12383,11 +12384,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-release-x64-stable"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12397,7 +12398,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12419,7 +12420,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm"
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12455,7 +12456,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-beta"
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12491,7 +12492,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-dev"
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12527,10 +12528,10 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "host_class:experimental"
+      dimensions: "host_class:default"
       dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
@@ -12554,7 +12555,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12563,11 +12564,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-stable"
+      name: "vm-reload-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12590,7 +12591,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12599,11 +12600,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64"
+      name: "vm-reload-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12626,7 +12627,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12635,11 +12636,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
+      name: "vm-reload-rollback-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12662,7 +12663,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12671,11 +12672,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
+      name: "vm-reload-rollback-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12698,7 +12699,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12707,11 +12708,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
+      name: "vm-ubsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12720,10 +12721,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -12731,10 +12730,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -15510,7 +15510,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-canary-linux-debug-try"
+      name: "vm-aot-asan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15534,6 +15534,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -15546,7 +15547,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm-try"
+      name: "vm-aot-msan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15570,6 +15571,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -15582,7 +15584,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c-try"
+      name: "vm-aot-tsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15606,6 +15608,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -15618,7 +15621,42 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm-try"
+      name: "vm-aot-ubsan-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-asan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15642,6 +15680,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -15654,7 +15693,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c-try"
+      name: "vm-canary-linux-debug-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15690,7 +15729,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm-try"
+      name: "vm-ffi-android-debug-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15726,7 +15765,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c-try"
+      name: "vm-ffi-android-debug-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15762,7 +15801,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-fuchsia-release-x64-try"
+      name: "vm-ffi-android-product-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15798,7 +15837,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-asan-linux-release-x64-try"
+      name: "vm-ffi-android-product-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15822,7 +15861,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -15835,7 +15873,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-try"
+      name: "vm-ffi-android-release-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15866,16 +15904,48 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
-        key: "dart.use_update_script"
+        key: "luci.recipes.use_python3"
         value: 100
       }
+    }
+    builders {
+      name: "vm-ffi-android-release-arm64c-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-gcc-linux-try"
+      name: "vm-fuchsia-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15888,9 +15958,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true,'
-        '    "timeout": 4500'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -15902,7 +15973,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 18000
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -15911,7 +15981,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-ia32-try"
+      name: "vm-kernel-checked-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15941,13 +16011,53 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64-try"
+      name: "vm-kernel-gcc-linux-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true,'
+        '    "timeout": 4500'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 18000
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-kernel-linux-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15983,7 +16093,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64c-try"
+      name: "vm-kernel-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16295,11 +16405,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-msan-linux-release-x64-try"
+      name: "vm-kernel-msvc-windows-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16308,10 +16418,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -16319,7 +16427,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -16332,11 +16439,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-msvc-windows-try"
+      name: "vm-kernel-nnbd-linux-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16345,8 +16452,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -16355,7 +16464,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -16366,7 +16476,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-ia32-try"
+      name: "vm-kernel-nnbd-linux-debug-simriscv64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16391,8 +16501,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -16403,7 +16512,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-simriscv64-try"
+      name: "vm-kernel-nnbd-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16439,7 +16548,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64-try"
+      name: "vm-kernel-nnbd-linux-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16836,7 +16945,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-ia32-try"
+      name: "vm-kernel-nnbd-win-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16872,7 +16981,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-x64-try"
+      name: "vm-kernel-nnbd-win-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16908,47 +17017,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-optcounter-threshold-linux-release-ia32-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-optcounter-threshold-linux-release-x64-try"
+      name: "vm-kernel-nnbd-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16958,7 +17031,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -17053,43 +17126,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-precomp-asan-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-precomp-dwarf-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -17199,42 +17235,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-precomp-linux-debug-x64c-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-precomp-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -17502,7 +17502,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-msan-linux-release-x64-try"
+      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17526,7 +17526,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -17539,7 +17538,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
+      name: "vm-kernel-precomp-nnbd-linux-debug-simriscv64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17564,7 +17563,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -17575,7 +17575,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-simriscv64-try"
+      name: "vm-kernel-precomp-nnbd-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17612,7 +17612,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-x64-try"
+      name: "vm-kernel-precomp-nnbd-linux-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17637,8 +17637,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -17848,7 +17847,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-win-release-x64-try"
+      name: "vm-kernel-precomp-nnbd-win-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17884,11 +17883,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-try"
+      name: "vm-kernel-precomp-nnbd-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -17898,7 +17897,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -17920,7 +17919,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-tsan-linux-release-x64-try"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17944,7 +17943,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -17957,11 +17955,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-ubsan-linux-release-x64-try"
+      name: "vm-kernel-precomp-win-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -17970,8 +17968,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -17979,7 +17979,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -17992,7 +17991,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-debug-x64c-try"
+      name: "vm-kernel-precomp-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -18028,7 +18027,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-product-x64-try"
+      name: "vm-kernel-win-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -18053,7 +18052,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -18064,7 +18064,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-release-x64-try"
+      name: "vm-kernel-win-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -18100,11 +18100,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-reload-linux-debug-x64-try"
+      name: "vm-kernel-win-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -18114,7 +18114,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -18136,11 +18136,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-reload-linux-release-x64-try"
+      name: "vm-kernel-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -18150,7 +18150,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -18172,7 +18172,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-reload-rollback-linux-debug-x64-try"
+      name: "vm-msan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -18196,6 +18196,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -18208,7 +18209,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-reload-rollback-linux-release-x64-try"
+      name: "vm-nnbd-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -18232,6 +18233,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -18244,7 +18246,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-tsan-linux-release-x64-try"
+      name: "vm-optcounter-threshold-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -18268,7 +18270,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -18281,7 +18282,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-ubsan-linux-release-x64-try"
+      name: "vm-optcounter-threshold-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -18294,8 +18295,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -18303,7 +18306,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -18316,11 +18318,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-ia32-try"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -18330,7 +18332,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -18341,8 +18343,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -18353,11 +18354,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-x64-try"
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -18367,7 +18368,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -18389,11 +18390,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-x64c-try"
+      name: "vm-reload-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -18403,7 +18404,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -18425,11 +18426,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-release-ia32-try"
+      name: "vm-reload-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -18439,7 +18440,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -18461,11 +18462,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-release-x64-try"
+      name: "vm-reload-rollback-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -18475,7 +18476,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -18497,11 +18498,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-try"
+      name: "vm-reload-rollback-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -18533,11 +18534,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64-try"
+      name: "vm-ubsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -18546,10 +18547,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -18557,6 +18556,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index d23f1c7042c9..743cec3e4c2f 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -200,58 +200,58 @@ consoles {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-ia32-try"
+    name: "buildbucket/luci.dart.try/vm-optcounter-threshold-linux-release-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-optcounter-threshold-linux-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-optcounter-threshold-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-asan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-asan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-msan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-msan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-tsan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-nnbd-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-ubsan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-ubsan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-asan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-aot-asan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-msan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-aot-msan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-tsan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-aot-tsan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-ubsan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-aot-ubsan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-reload-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.try/vm-reload-linux-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-reload-linux-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-reload-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-reload-rollback-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.try/vm-reload-rollback-linux-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-reload-rollback-linux-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-reload-rollback-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64c-try"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-x64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64c-try"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-x64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-x64c-try"
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-debug-x64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-debug-x64c-try"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-win-debug-x64c-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-fuchsia-release-x64-try"
@@ -842,92 +842,92 @@ consoles {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-ia32"
     category: "vm|misc"
     short_name: "o32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-x64"
     category: "vm|misc"
     short_name: "o64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
-    category: "vm|misc"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-linux-release-x64"
+    category: "vm|misc|sanitizer"
     short_name: "a"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msan-linux-release-x64"
-    category: "vm|misc"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-msan-linux-release-x64"
+    category: "vm|misc|sanitizer"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-tsan-linux-release-x64"
-    category: "vm|misc"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-nnbd-linux-release-x64"
+    category: "vm|misc|sanitizer"
     short_name: "t"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ubsan-linux-release-x64"
-    category: "vm|misc"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ubsan-linux-release-x64"
+    category: "vm|misc|sanitizer"
     short_name: "u"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-asan-linux-release-x64"
-    category: "vm|misc|aot"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-asan-linux-release-x64"
+    category: "vm|misc|sanitizer"
     short_name: "a"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-msan-linux-release-x64"
-    category: "vm|misc|aot"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-msan-linux-release-x64"
+    category: "vm|misc|sanitizer"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-tsan-linux-release-x64"
-    category: "vm|misc|aot"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-tsan-linux-release-x64"
+    category: "vm|misc|sanitizer"
     short_name: "t"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ubsan-linux-release-x64"
-    category: "vm|misc|aot"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-ubsan-linux-release-x64"
+    category: "vm|misc|sanitizer"
     short_name: "u"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-debug-x64"
     category: "vm|misc|reload"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-release-x64"
     category: "vm|misc|reload"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-debug-x64"
     category: "vm|misc|reload"
     short_name: "drb"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-release-x64"
     category: "vm|misc|reload"
     short_name: "rrb"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64c"
     category: "vm|misc|compressed"
     short_name: "jl"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-x64c"
     category: "vm|misc|compressed"
     short_name: "al"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64c"
     category: "vm|misc|compressed"
     short_name: "jw"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-debug-x64c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-debug-x64c"
     category: "vm|misc|compressed"
     short_name: "aw"
   }
@@ -1713,92 +1713,92 @@ consoles {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-ia32"
     category: "vm|misc"
     short_name: "o32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-x64"
     category: "vm|misc"
     short_name: "o64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-asan-linux-release-x64"
-    category: "vm|misc"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-linux-release-x64"
+    category: "vm|misc|sanitizer"
     short_name: "a"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msan-linux-release-x64"
-    category: "vm|misc"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-msan-linux-release-x64"
+    category: "vm|misc|sanitizer"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-tsan-linux-release-x64"
-    category: "vm|misc"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-nnbd-linux-release-x64"
+    category: "vm|misc|sanitizer"
     short_name: "t"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-ubsan-linux-release-x64"
-    category: "vm|misc"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ubsan-linux-release-x64"
+    category: "vm|misc|sanitizer"
     short_name: "u"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-asan-linux-release-x64"
-    category: "vm|misc|aot"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-asan-linux-release-x64"
+    category: "vm|misc|sanitizer"
     short_name: "a"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-msan-linux-release-x64"
-    category: "vm|misc|aot"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-msan-linux-release-x64"
+    category: "vm|misc|sanitizer"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-tsan-linux-release-x64"
-    category: "vm|misc|aot"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-tsan-linux-release-x64"
+    category: "vm|misc|sanitizer"
     short_name: "t"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-ubsan-linux-release-x64"
-    category: "vm|misc|aot"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-ubsan-linux-release-x64"
+    category: "vm|misc|sanitizer"
     short_name: "u"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-debug-x64"
     category: "vm|misc|reload"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-release-x64"
     category: "vm|misc|reload"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-debug-x64"
     category: "vm|misc|reload"
     short_name: "drb"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-reload-rollback-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-release-x64"
     category: "vm|misc|reload"
     short_name: "rrb"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64c"
     category: "vm|misc|compressed"
     short_name: "jl"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-x64c"
     category: "vm|misc|compressed"
     short_name: "al"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64c"
     category: "vm|misc|compressed"
     short_name: "jw"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-debug-x64c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-debug-x64c"
     category: "vm|misc|compressed"
     short_name: "aw"
   }
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 2564a548873b..d03fed7a6a66 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -518,6 +518,71 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-asan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-msan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-tsan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-ubsan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-asan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -621,19 +686,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-asan-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -682,19 +734,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-debug-x64c"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -783,7 +822,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-msan-linux-release-x64"
+    name: "vm-kernel-msvc-windows"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -796,7 +835,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-msvc-windows"
+    name: "vm-kernel-nnbd-linux-debug-ia32"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -809,31 +848,31 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-linux-debug-ia32"
+    name: "vm-kernel-nnbd-linux-debug-simriscv64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-linux-debug-simriscv64"
+    name: "vm-kernel-nnbd-linux-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-linux-debug-x64"
+    name: "vm-kernel-nnbd-linux-debug-x64c"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -959,7 +998,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-win-release-ia32"
+    name: "vm-kernel-nnbd-win-debug-x64c"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -972,7 +1011,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-win-release-x64"
+    name: "vm-kernel-nnbd-win-release-ia32"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -985,18 +1024,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-optcounter-threshold-linux-release-ia32"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-optcounter-threshold-linux-release-x64"
+    name: "vm-kernel-nnbd-win-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1022,19 +1050,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-asan-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1070,19 +1085,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-debug-x64c"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1173,7 +1175,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-msan-linux-release-x64"
+    name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1186,7 +1188,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+    name: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1199,7 +1201,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
+    name: "vm-kernel-precomp-nnbd-linux-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1212,7 +1214,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-linux-debug-x64"
+    name: "vm-kernel-precomp-nnbd-linux-debug-x64c"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1286,31 +1288,31 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-win-release-x64"
+    name: "vm-kernel-precomp-nnbd-win-debug-x64c"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-obfuscate-linux-release-x64"
+    name: "vm-kernel-precomp-nnbd-win-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-tsan-linux-release-x64"
+    name: "vm-kernel-precomp-obfuscate-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1323,20 +1325,18 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-ubsan-linux-release-x64"
+    name: "vm-kernel-precomp-win-product-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-win-debug-x64c"
+    name: "vm-kernel-precomp-win-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1349,7 +1349,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-win-product-x64"
+    name: "vm-kernel-win-debug-ia32"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1360,7 +1360,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-win-release-x64"
+    name: "vm-kernel-win-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1373,20 +1373,18 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-reload-linux-debug-x64"
+    name: "vm-kernel-win-release-ia32"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-reload-linux-release-x64"
+    name: "vm-kernel-win-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1399,7 +1397,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-reload-rollback-linux-debug-x64"
+    name: "vm-msan-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1412,7 +1410,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-reload-rollback-linux-release-x64"
+    name: "vm-nnbd-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1425,57 +1423,55 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-tsan-linux-release-x64"
+    name: "vm-optcounter-threshold-linux-release-ia32"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-ubsan-linux-release-x64"
+    name: "vm-optcounter-threshold-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-win-debug-ia32"
+    name: "vm-precomp-ffi-qemu-linux-release-arm"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-win-debug-x64"
+    name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-win-debug-x64c"
+    name: "vm-precomp-ffi-qemu-linux-release-riscv64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1488,29 +1484,33 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-win-release-ia32"
+    name: "vm-reload-linux-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-win-release-x64"
+    name: "vm-reload-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-precomp-ffi-qemu-linux-release-arm"
+    name: "vm-reload-rollback-linux-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1518,25 +1518,25 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
+    name: "vm-reload-rollback-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-precomp-ffi-qemu-linux-release-riscv64"
+    name: "vm-ubsan-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index c6175c32c103..be406d22abea 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1364,6 +1364,56 @@ job {
     builder: "pkg-win-release-stable"
   }
 }
+job {
+  id: "vm-aot-asan-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-asan-linux-release-x64"
+  }
+}
+job {
+  id: "vm-aot-msan-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-msan-linux-release-x64"
+  }
+}
+job {
+  id: "vm-aot-tsan-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-tsan-linux-release-x64"
+  }
+}
+job {
+  id: "vm-aot-ubsan-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-ubsan-linux-release-x64"
+  }
+}
+job {
+  id: "vm-asan-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-asan-linux-release-x64"
+  }
+}
 job {
   id: "vm-canary-linux-debug"
   realm: "ci.sandbox"
@@ -1664,16 +1714,6 @@ job {
     builder: "vm-fuchsia-release-x64"
   }
 }
-job {
-  id: "vm-kernel-asan-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-asan-linux-release-x64"
-  }
-}
 job {
   id: "vm-kernel-checked-linux-release-x64"
   realm: "ci.sandbox"
@@ -1774,16 +1814,6 @@ job {
     builder: "vm-kernel-linux-debug-x64-stable"
   }
 }
-job {
-  id: "vm-kernel-linux-debug-x64c"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-debug-x64c"
-  }
-}
 job {
   id: "vm-kernel-linux-release-ia32"
   realm: "ci.sandbox"
@@ -2014,16 +2044,6 @@ job {
     builder: "vm-kernel-mac-release-x64-stable"
   }
 }
-job {
-  id: "vm-kernel-msan-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-msan-linux-release-x64"
-  }
-}
 job {
   id: "vm-kernel-msvc-windows"
   realm: "ci.sandbox"
@@ -2094,6 +2114,16 @@ job {
     builder: "vm-kernel-nnbd-linux-debug-x64-stable"
   }
 }
+job {
+  id: "vm-kernel-nnbd-linux-debug-x64c"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-kernel-nnbd-linux-debug-x64c"
+  }
+}
 job {
   id: "vm-kernel-nnbd-linux-release-ia32"
   realm: "ci.sandbox"
@@ -2215,43 +2245,33 @@ job {
   }
 }
 job {
-  id: "vm-kernel-nnbd-win-release-ia32"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-win-release-ia32"
-  }
-}
-job {
-  id: "vm-kernel-nnbd-win-release-x64"
+  id: "vm-kernel-nnbd-win-debug-x64c"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-win-release-x64"
+    builder: "vm-kernel-nnbd-win-debug-x64c"
   }
 }
 job {
-  id: "vm-kernel-optcounter-threshold-linux-release-ia32"
+  id: "vm-kernel-nnbd-win-release-ia32"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-optcounter-threshold-linux-release-ia32"
+    builder: "vm-kernel-nnbd-win-release-ia32"
   }
 }
 job {
-  id: "vm-kernel-optcounter-threshold-linux-release-x64"
+  id: "vm-kernel-nnbd-win-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-optcounter-threshold-linux-release-x64"
+    builder: "vm-kernel-nnbd-win-release-x64"
   }
 }
 job {
@@ -2334,16 +2354,6 @@ job {
     builder: "vm-kernel-precomp-android-release-arm_x64-stable"
   }
 }
-job {
-  id: "vm-kernel-precomp-asan-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-asan-linux-release-x64"
-  }
-}
 job {
   id: "vm-kernel-precomp-dwarf-linux-product-x64"
   realm: "ci.sandbox"
@@ -2434,16 +2444,6 @@ job {
     builder: "vm-kernel-precomp-linux-debug-x64-stable"
   }
 }
-job {
-  id: "vm-kernel-precomp-linux-debug-x64c"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64c"
-  }
-}
 job {
   id: "vm-kernel-precomp-linux-product-x64"
   realm: "ci.sandbox"
@@ -2665,43 +2665,43 @@ job {
   }
 }
 job {
-  id: "vm-kernel-precomp-msan-linux-release-x64"
+  id: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-msan-linux-release-x64"
+    builder: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+  id: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+    builder: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
+  id: "vm-kernel-precomp-nnbd-linux-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
+    builder: "vm-kernel-precomp-nnbd-linux-debug-x64"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-debug-x64"
+  id: "vm-kernel-precomp-nnbd-linux-debug-x64c"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-debug-x64"
+    builder: "vm-kernel-precomp-nnbd-linux-debug-x64c"
   }
 }
 job {
@@ -2784,6 +2784,16 @@ job {
     builder: "vm-kernel-precomp-nnbd-mac-release-simarm64"
   }
 }
+job {
+  id: "vm-kernel-precomp-nnbd-win-debug-x64c"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-kernel-precomp-nnbd-win-debug-x64c"
+  }
+}
 job {
   id: "vm-kernel-precomp-nnbd-win-release-x64"
   realm: "ci.sandbox"
@@ -2835,343 +2845,333 @@ job {
   }
 }
 job {
-  id: "vm-kernel-precomp-tsan-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-tsan-linux-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-ubsan-linux-release-x64"
+  id: "vm-kernel-precomp-win-product-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-ubsan-linux-release-x64"
+    builder: "vm-kernel-precomp-win-product-x64"
   }
 }
 job {
-  id: "vm-kernel-precomp-win-debug-x64c"
+  id: "vm-kernel-precomp-win-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-win-debug-x64c"
+    builder: "vm-kernel-precomp-win-release-x64"
   }
 }
 job {
-  id: "vm-kernel-precomp-win-product-x64"
+  id: "vm-kernel-precomp-win-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-win-product-x64"
+    builder: "vm-kernel-precomp-win-release-x64-beta"
   }
 }
 job {
-  id: "vm-kernel-precomp-win-release-x64"
+  id: "vm-kernel-precomp-win-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-x64"
+    builder: "vm-kernel-precomp-win-release-x64-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-win-release-x64-beta"
+  id: "vm-kernel-precomp-win-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-x64-beta"
+    builder: "vm-kernel-precomp-win-release-x64-stable"
   }
 }
 job {
-  id: "vm-kernel-precomp-win-release-x64-dev"
+  id: "vm-kernel-win-debug-ia32"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-x64-dev"
+    builder: "vm-kernel-win-debug-ia32"
   }
 }
 job {
-  id: "vm-kernel-precomp-win-release-x64-stable"
+  id: "vm-kernel-win-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-x64-stable"
+    builder: "vm-kernel-win-debug-x64"
   }
 }
 job {
-  id: "vm-kernel-reload-linux-debug-x64"
+  id: "vm-kernel-win-debug-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-reload-linux-debug-x64"
+    builder: "vm-kernel-win-debug-x64-beta"
   }
 }
 job {
-  id: "vm-kernel-reload-linux-release-x64"
+  id: "vm-kernel-win-debug-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-reload-linux-release-x64"
+    builder: "vm-kernel-win-debug-x64-dev"
   }
 }
 job {
-  id: "vm-kernel-reload-rollback-linux-debug-x64"
+  id: "vm-kernel-win-debug-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-debug-x64"
+    builder: "vm-kernel-win-debug-x64-stable"
   }
 }
 job {
-  id: "vm-kernel-reload-rollback-linux-release-x64"
+  id: "vm-kernel-win-release-ia32"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-reload-rollback-linux-release-x64"
+    builder: "vm-kernel-win-release-ia32"
   }
 }
 job {
-  id: "vm-kernel-tsan-linux-release-x64"
+  id: "vm-kernel-win-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-tsan-linux-release-x64"
+    builder: "vm-kernel-win-release-x64"
   }
 }
 job {
-  id: "vm-kernel-ubsan-linux-release-x64"
+  id: "vm-kernel-win-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-ubsan-linux-release-x64"
+    builder: "vm-kernel-win-release-x64-beta"
   }
 }
 job {
-  id: "vm-kernel-win-debug-ia32"
+  id: "vm-kernel-win-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-win-debug-ia32"
+    builder: "vm-kernel-win-release-x64-dev"
   }
 }
 job {
-  id: "vm-kernel-win-debug-x64"
+  id: "vm-kernel-win-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-win-debug-x64"
+    builder: "vm-kernel-win-release-x64-stable"
   }
 }
 job {
-  id: "vm-kernel-win-debug-x64-beta"
+  id: "vm-msan-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-win-debug-x64-beta"
+    builder: "vm-msan-linux-release-x64"
   }
 }
 job {
-  id: "vm-kernel-win-debug-x64-dev"
+  id: "vm-nnbd-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-win-debug-x64-dev"
+    builder: "vm-nnbd-linux-release-x64"
   }
 }
 job {
-  id: "vm-kernel-win-debug-x64-stable"
+  id: "vm-optcounter-threshold-linux-release-ia32"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-win-debug-x64-stable"
+    builder: "vm-optcounter-threshold-linux-release-ia32"
   }
 }
 job {
-  id: "vm-kernel-win-debug-x64c"
+  id: "vm-optcounter-threshold-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-win-debug-x64c"
+    builder: "vm-optcounter-threshold-linux-release-x64"
   }
 }
 job {
-  id: "vm-kernel-win-release-ia32"
+  id: "vm-precomp-ffi-qemu-linux-release-arm"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-win-release-ia32"
+    builder: "vm-precomp-ffi-qemu-linux-release-arm"
   }
 }
 job {
-  id: "vm-kernel-win-release-x64"
+  id: "vm-precomp-ffi-qemu-linux-release-arm-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-win-release-x64"
+    builder: "vm-precomp-ffi-qemu-linux-release-arm-beta"
   }
 }
 job {
-  id: "vm-kernel-win-release-x64-beta"
+  id: "vm-precomp-ffi-qemu-linux-release-arm-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-win-release-x64-beta"
+    builder: "vm-precomp-ffi-qemu-linux-release-arm-dev"
   }
 }
 job {
-  id: "vm-kernel-win-release-x64-dev"
+  id: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-win-release-x64-dev"
+    builder: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
   }
 }
 job {
-  id: "vm-kernel-win-release-x64-stable"
+  id: "vm-precomp-ffi-qemu-linux-release-arm-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-win-release-x64-stable"
+    builder: "vm-precomp-ffi-qemu-linux-release-arm-stable"
   }
 }
 job {
-  id: "vm-precomp-ffi-qemu-linux-release-arm"
+  id: "vm-precomp-ffi-qemu-linux-release-riscv64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-arm"
+    builder: "vm-precomp-ffi-qemu-linux-release-riscv64"
   }
 }
 job {
-  id: "vm-precomp-ffi-qemu-linux-release-arm-beta"
+  id: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-arm-beta"
+    builder: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
   }
 }
 job {
-  id: "vm-precomp-ffi-qemu-linux-release-arm-dev"
+  id: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-arm-dev"
+    builder: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
   }
 }
 job {
-  id: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
+  id: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
+    builder: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
   }
 }
 job {
-  id: "vm-precomp-ffi-qemu-linux-release-arm-stable"
+  id: "vm-reload-linux-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-arm-stable"
+    builder: "vm-reload-linux-debug-x64"
   }
 }
 job {
-  id: "vm-precomp-ffi-qemu-linux-release-riscv64"
+  id: "vm-reload-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-riscv64"
+    builder: "vm-reload-linux-release-x64"
   }
 }
 job {
-  id: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
+  id: "vm-reload-rollback-linux-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
+    builder: "vm-reload-rollback-linux-debug-x64"
   }
 }
 job {
-  id: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
+  id: "vm-reload-rollback-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
+    builder: "vm-reload-rollback-linux-release-x64"
   }
 }
 job {
-  id: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
+  id: "vm-ubsan-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
+    builder: "vm-ubsan-linux-release-x64"
   }
 }
 trigger {
@@ -3476,16 +3476,19 @@ trigger {
   triggers: "ddc-canary-linux-release-chrome"
   triggers: "front-end-nnbd-mac-release-x64"
   triggers: "front-end-nnbd-win-release-x64"
+  triggers: "vm-aot-asan-linux-release-x64"
+  triggers: "vm-aot-msan-linux-release-x64"
+  triggers: "vm-aot-tsan-linux-release-x64"
+  triggers: "vm-aot-ubsan-linux-release-x64"
+  triggers: "vm-asan-linux-release-x64"
   triggers: "vm-canary-linux-debug-experimental"
-  triggers: "vm-kernel-asan-linux-release-x64"
   triggers: "vm-kernel-gcc-linux"
   triggers: "vm-kernel-linux-debug-ia32"
-  triggers: "vm-kernel-linux-debug-x64c"
   triggers: "vm-kernel-linux-release-ia32"
-  triggers: "vm-kernel-msan-linux-release-x64"
   triggers: "vm-kernel-msvc-windows"
   triggers: "vm-kernel-nnbd-linux-debug-ia32"
   triggers: "vm-kernel-nnbd-linux-debug-simriscv64"
+  triggers: "vm-kernel-nnbd-linux-debug-x64c"
   triggers: "vm-kernel-nnbd-linux-release-ia32"
   triggers: "vm-kernel-nnbd-linux-release-simarm"
   triggers: "vm-kernel-nnbd-linux-release-simarm64"
@@ -3493,36 +3496,33 @@ trigger {
   triggers: "vm-kernel-nnbd-mac-debug-x64"
   triggers: "vm-kernel-nnbd-mac-release-x64"
   triggers: "vm-kernel-nnbd-win-debug-x64"
+  triggers: "vm-kernel-nnbd-win-debug-x64c"
   triggers: "vm-kernel-nnbd-win-release-ia32"
   triggers: "vm-kernel-nnbd-win-release-x64"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-ia32"
-  triggers: "vm-kernel-precomp-asan-linux-release-x64"
   triggers: "vm-kernel-precomp-dwarf-linux-product-x64"
-  triggers: "vm-kernel-precomp-linux-debug-x64c"
   triggers: "vm-kernel-precomp-linux-product-x64"
   triggers: "vm-kernel-precomp-mac-product-x64"
-  triggers: "vm-kernel-precomp-msan-linux-release-x64"
   triggers: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
   triggers: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
   triggers: "vm-kernel-precomp-nnbd-linux-debug-x64"
+  triggers: "vm-kernel-precomp-nnbd-linux-debug-x64c"
   triggers: "vm-kernel-precomp-nnbd-linux-release-simarm64"
   triggers: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
   triggers: "vm-kernel-precomp-nnbd-mac-release-simarm64"
+  triggers: "vm-kernel-precomp-nnbd-win-debug-x64c"
   triggers: "vm-kernel-precomp-nnbd-win-release-x64"
-  triggers: "vm-kernel-precomp-tsan-linux-release-x64"
-  triggers: "vm-kernel-precomp-ubsan-linux-release-x64"
-  triggers: "vm-kernel-precomp-win-debug-x64c"
   triggers: "vm-kernel-precomp-win-product-x64"
-  triggers: "vm-kernel-reload-linux-debug-x64"
-  triggers: "vm-kernel-reload-linux-release-x64"
-  triggers: "vm-kernel-reload-rollback-linux-debug-x64"
-  triggers: "vm-kernel-reload-rollback-linux-release-x64"
-  triggers: "vm-kernel-tsan-linux-release-x64"
-  triggers: "vm-kernel-ubsan-linux-release-x64"
   triggers: "vm-kernel-win-debug-ia32"
-  triggers: "vm-kernel-win-debug-x64c"
   triggers: "vm-kernel-win-release-ia32"
+  triggers: "vm-msan-linux-release-x64"
+  triggers: "vm-nnbd-linux-release-x64"
+  triggers: "vm-optcounter-threshold-linux-release-ia32"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
+  triggers: "vm-reload-linux-debug-x64"
+  triggers: "vm-reload-linux-release-x64"
+  triggers: "vm-reload-rollback-linux-debug-x64"
+  triggers: "vm-reload-rollback-linux-release-x64"
+  triggers: "vm-ubsan-linux-release-x64"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/main"
@@ -3549,7 +3549,6 @@ trigger {
   triggers: "vm-kernel-nnbd-linux-debug-x64"
   triggers: "vm-kernel-nnbd-linux-release-x64"
   triggers: "vm-kernel-nnbd-mac-release-arm64"
-  triggers: "vm-kernel-optcounter-threshold-linux-release-x64"
   triggers: "vm-kernel-precomp-android-release-arm64c"
   triggers: "vm-kernel-precomp-android-release-arm_x64"
   triggers: "vm-kernel-precomp-linux-debug-simarm_x64"
@@ -3563,6 +3562,7 @@ trigger {
   triggers: "vm-kernel-precomp-nnbd-mac-release-arm64"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64"
   triggers: "vm-kernel-precomp-win-release-x64"
+  triggers: "vm-optcounter-threshold-linux-release-x64"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm"
   triggers: "vm-precomp-ffi-qemu-linux-release-riscv64"
   gitiles {
diff --git a/vm.star b/vm.star
index 36f6aa1bcdfa..281a6b905e56 100644
--- a/vm.star
+++ b/vm.star
@@ -399,12 +399,12 @@ _nightly_builder(
 
 # vm|misc
 _nightly_builder(
-    "vm-kernel-optcounter-threshold-linux-release-ia32",
+    "vm-optcounter-threshold-linux-release-ia32",
     category = "vm|misc|o32",
     channels = ["try"],
 )
 _low_priority_builder(
-    "vm-kernel-optcounter-threshold-linux-release-x64",
+    "vm-optcounter-threshold-linux-release-x64",
     category = "vm|misc|o64",
 )
 
@@ -417,77 +417,77 @@ def dart_vm_sanitizer_builder(name, **kwargs):
     )
 
 dart_vm_sanitizer_builder(
-    "vm-kernel-asan-linux-release-x64",
-    category = "vm|misc|a",
+    "vm-asan-linux-release-x64",
+    category = "vm|misc|sanitizer|a",
 )
 dart_vm_sanitizer_builder(
-    "vm-kernel-msan-linux-release-x64",
-    category = "vm|misc|m",
+    "vm-msan-linux-release-x64",
+    category = "vm|misc|sanitizer|m",
 )
 dart_vm_sanitizer_builder(
-    "vm-kernel-tsan-linux-release-x64",
-    category = "vm|misc|t",
+    "vm-nnbd-linux-release-x64",
+    category = "vm|misc|sanitizer|t",
 )
 dart_vm_sanitizer_builder(
-    "vm-kernel-ubsan-linux-release-x64",
-    category = "vm|misc|u",
+    "vm-ubsan-linux-release-x64",
+    category = "vm|misc|sanitizer|u",
     goma = False,
 )  # ubsan is not compatible with our sysroot.
 dart_vm_sanitizer_builder(
-    "vm-kernel-precomp-asan-linux-release-x64",
-    category = "vm|misc|aot|a",
+    "vm-aot-asan-linux-release-x64",
+    category = "vm|misc|sanitizer|a",
 )
 dart_vm_sanitizer_builder(
-    "vm-kernel-precomp-msan-linux-release-x64",
-    category = "vm|misc|aot|m",
+    "vm-aot-msan-linux-release-x64",
+    category = "vm|misc|sanitizer|m",
 )
 dart_vm_sanitizer_builder(
-    "vm-kernel-precomp-tsan-linux-release-x64",
-    category = "vm|misc|aot|t",
+    "vm-aot-tsan-linux-release-x64",
+    category = "vm|misc|sanitizer|t",
 )
 dart_vm_sanitizer_builder(
-    "vm-kernel-precomp-ubsan-linux-release-x64",
-    category = "vm|misc|aot|u",
+    "vm-aot-ubsan-linux-release-x64",
+    category = "vm|misc|sanitizer|u",
     goma = False,
 )  # ubsan is not compatible with our sysroot.
 _nightly_builder(
-    "vm-kernel-reload-linux-debug-x64",
+    "vm-reload-linux-debug-x64",
     category = "vm|misc|reload|d",
     channels = ["try"],
 )
 _nightly_builder(
-    "vm-kernel-reload-linux-release-x64",
+    "vm-reload-linux-release-x64",
     category = "vm|misc|reload|r",
     channels = ["try"],
 )
 _nightly_builder(
-    "vm-kernel-reload-rollback-linux-debug-x64",
+    "vm-reload-rollback-linux-debug-x64",
     category = "vm|misc|reload|drb",
     channels = ["try"],
 )
 _nightly_builder(
-    "vm-kernel-reload-rollback-linux-release-x64",
+    "vm-reload-rollback-linux-release-x64",
     category = "vm|misc|reload|rrb",
     channels = ["try"],
 )
 _nightly_builder(
-    "vm-kernel-linux-debug-x64c",
+    "vm-kernel-nnbd-linux-debug-x64c",
     category = "vm|misc|compressed|jl",
     channels = ["try"],
 )
 _nightly_builder(
-    "vm-kernel-precomp-linux-debug-x64c",
+    "vm-kernel-precomp-nnbd-linux-debug-x64c",
     category = "vm|misc|compressed|al",
     channels = ["try"],
 )
 _nightly_builder(
-    "vm-kernel-win-debug-x64c",
+    "vm-kernel-nnbd-win-debug-x64c",
     category = "vm|misc|compressed|jw",
     channels = ["try"],
     dimensions = windows,
 )
 _nightly_builder(
-    "vm-kernel-precomp-win-debug-x64c",
+    "vm-kernel-precomp-nnbd-win-debug-x64c",
     category = "vm|misc|compressed|aw",
     channels = ["try"],
     dimensions = windows,

From f7614eb2362f2a2cb0ac84151202eb3981ffb710 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 31 Jan 2023 08:51:53 +0000
Subject: [PATCH 606/826] [infra] Rename new optcounter builders to
 eager-optimization

Bug: b/201271877
Change-Id: Ib3063bc482f3e32cbbb329a83b44e39d47717eee
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/280087
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   |  16 +-
 generated/cr-buildbucket.cfg | 290 +++++++++++++++++------------------
 generated/luci-milo.cfg      |  12 +-
 generated/luci-notify.cfg    |  48 +++---
 generated/luci-scheduler.cfg |  44 +++---
 vm.star                      |   4 +-
 6 files changed, 207 insertions(+), 207 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 6f9a1a2f007c..125662b7579c 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -3164,6 +3164,14 @@ config_groups {
           path_regexp: "runtime/.+"
         }
       }
+      builders {
+        name: "dart/try/vm-eager-optimization-linux-release-ia32-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-eager-optimization-linux-release-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-ffi-android-debug-arm-try"
         includable_only: true
@@ -3549,14 +3557,6 @@ config_groups {
         name: "dart/try/vm-nnbd-linux-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-optcounter-threshold-linux-release-ia32-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-optcounter-threshold-linux-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-precomp-ffi-qemu-linux-release-arm-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 3bb6b7f52da6..21d28295dc9f 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -6386,6 +6386,79 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-eager-optimization-linux-release-ia32"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-eager-optimization-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      expiration_secs: 86400
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-ffi-android-debug-arm"
       swarming_host: "chromium-swarm.appspot.com"
@@ -12166,79 +12239,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-optcounter-threshold-linux-release-ia32"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-optcounter-threshold-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      expiration_secs: 86400
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm"
       swarming_host: "chromium-swarm.appspot.com"
@@ -15728,6 +15728,78 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-eager-optimization-linux-release-ia32-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-eager-optimization-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-ffi-android-debug-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -18245,78 +18317,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-optcounter-threshold-linux-release-ia32-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-optcounter-threshold-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 743cec3e4c2f..aa92d599f025 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -200,10 +200,10 @@ consoles {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-optcounter-threshold-linux-release-ia32-try"
+    name: "buildbucket/luci.dart.try/vm-eager-optimization-linux-release-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-optcounter-threshold-linux-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-eager-optimization-linux-release-x64-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-asan-linux-release-x64-try"
@@ -842,12 +842,12 @@ consoles {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-eager-optimization-linux-release-ia32"
     category: "vm|misc"
     short_name: "o32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-eager-optimization-linux-release-x64"
     category: "vm|misc"
     short_name: "o64"
   }
@@ -1713,12 +1713,12 @@ consoles {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-eager-optimization-linux-release-ia32"
     category: "vm|misc"
     short_name: "o32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-optcounter-threshold-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-eager-optimization-linux-release-x64"
     category: "vm|misc"
     short_name: "o64"
   }
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index d03fed7a6a66..1c70db3d8ee4 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -609,6 +609,30 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-eager-optimization-linux-release-ia32"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-eager-optimization-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1414,30 +1438,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-optcounter-threshold-linux-release-ia32"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-optcounter-threshold-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index be406d22abea..bb7e2a5fac8e 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1464,6 +1464,26 @@ job {
     builder: "vm-canary-linux-debug-stable"
   }
 }
+job {
+  id: "vm-eager-optimization-linux-release-ia32"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-eager-optimization-linux-release-ia32"
+  }
+}
+job {
+  id: "vm-eager-optimization-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-eager-optimization-linux-release-x64"
+  }
+}
 job {
   id: "vm-ffi-android-debug-arm"
   realm: "ci.sandbox"
@@ -3014,26 +3034,6 @@ job {
     builder: "vm-nnbd-linux-release-x64"
   }
 }
-job {
-  id: "vm-optcounter-threshold-linux-release-ia32"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-optcounter-threshold-linux-release-ia32"
-  }
-}
-job {
-  id: "vm-optcounter-threshold-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-optcounter-threshold-linux-release-x64"
-  }
-}
 job {
   id: "vm-precomp-ffi-qemu-linux-release-arm"
   realm: "ci.sandbox"
@@ -3482,6 +3482,7 @@ trigger {
   triggers: "vm-aot-ubsan-linux-release-x64"
   triggers: "vm-asan-linux-release-x64"
   triggers: "vm-canary-linux-debug-experimental"
+  triggers: "vm-eager-optimization-linux-release-ia32"
   triggers: "vm-kernel-gcc-linux"
   triggers: "vm-kernel-linux-debug-ia32"
   triggers: "vm-kernel-linux-release-ia32"
@@ -3516,7 +3517,6 @@ trigger {
   triggers: "vm-kernel-win-release-ia32"
   triggers: "vm-msan-linux-release-x64"
   triggers: "vm-nnbd-linux-release-x64"
-  triggers: "vm-optcounter-threshold-linux-release-ia32"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
   triggers: "vm-reload-linux-debug-x64"
   triggers: "vm-reload-linux-release-x64"
@@ -3536,6 +3536,7 @@ trigger {
   triggers: "cross-vm-linux-release-arm64"
   triggers: "iso-stress-linux"
   triggers: "vm-canary-linux-debug"
+  triggers: "vm-eager-optimization-linux-release-x64"
   triggers: "vm-ffi-android-debug-arm"
   triggers: "vm-ffi-android-debug-arm64c"
   triggers: "vm-ffi-android-product-arm"
@@ -3562,7 +3563,6 @@ trigger {
   triggers: "vm-kernel-precomp-nnbd-mac-release-arm64"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64"
   triggers: "vm-kernel-precomp-win-release-x64"
-  triggers: "vm-optcounter-threshold-linux-release-x64"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm"
   triggers: "vm-precomp-ffi-qemu-linux-release-riscv64"
   gitiles {
diff --git a/vm.star b/vm.star
index 281a6b905e56..e70003065a8b 100644
--- a/vm.star
+++ b/vm.star
@@ -399,12 +399,12 @@ _nightly_builder(
 
 # vm|misc
 _nightly_builder(
-    "vm-optcounter-threshold-linux-release-ia32",
+    "vm-eager-optimization-linux-release-ia32",
     category = "vm|misc|o32",
     channels = ["try"],
 )
 _low_priority_builder(
-    "vm-optcounter-threshold-linux-release-x64",
+    "vm-eager-optimization-linux-release-x64",
     category = "vm|misc|o64",
 )
 

From 4b2ab7caec738559f944590fb96fe45f6ec13a16 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 31 Jan 2023 09:47:36 +0000
Subject: [PATCH 607/826] [infra] Revert migration of compressed builders

These aren't baselined, yet.

Bug: b/201271877
Change-Id: Ic9129cbb5e6869980980138abcfd41146d126c03
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/280104
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
Auto-Submit: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   |  30 +--
 generated/cr-buildbucket.cfg | 412 +++++++++++++++++------------------
 generated/luci-milo.cfg      |  24 +-
 generated/luci-notify.cfg    |  92 ++++----
 generated/luci-scheduler.cfg |  88 ++++----
 generated/project.cfg        |   2 +-
 vm.star                      |   8 +-
 7 files changed, 328 insertions(+), 328 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 125662b7579c..a5b0eb7962f9 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -3216,6 +3216,10 @@ config_groups {
         name: "dart/try/vm-kernel-linux-debug-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-linux-debug-x64c-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-linux-release-ia32-try"
         includable_only: true
@@ -3318,10 +3322,6 @@ config_groups {
           path_regexp: "runtime/.+"
         }
       }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-linux-debug-x64c-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-release-ia32-try"
         includable_only: true
@@ -3417,10 +3417,6 @@ config_groups {
         name: "dart/try/vm-kernel-nnbd-win-debug-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-win-debug-x64c-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-nnbd-win-release-ia32-try"
         includable_only: true
@@ -3449,6 +3445,10 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-debug-x64c-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-precomp-linux-product-x64-try"
         includable_only: true
@@ -3489,10 +3489,6 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-x64c-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
         includable_only: true
@@ -3514,15 +3510,15 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-win-debug-x64c-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-win-debug-x64c-try"
         includable_only: true
       }
       builders {
@@ -3541,6 +3537,10 @@ config_groups {
         name: "dart/try/vm-kernel-win-debug-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-kernel-win-debug-x64c-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-win-release-ia32-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 21d28295dc9f..205c7d5b30f9 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -7736,6 +7736,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-linux-debug-x64c"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8891,42 +8927,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-nnbd-linux-debug-x64c"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-nnbd-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
@@ -9397,7 +9397,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-debug-x64c"
+      name: "vm-kernel-nnbd-win-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9433,7 +9433,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-ia32"
+      name: "vm-kernel-nnbd-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9469,11 +9469,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-x64"
+      name: "vm-kernel-precomp-android-release-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9483,7 +9483,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9494,9 +9494,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9505,7 +9506,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64c"
+      name: "vm-kernel-precomp-android-release-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9542,7 +9543,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64c-beta"
+      name: "vm-kernel-precomp-android-release-arm64c-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9579,7 +9580,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64c-dev"
+      name: "vm-kernel-precomp-android-release-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9616,7 +9617,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64c-stable"
+      name: "vm-kernel-precomp-android-release-arm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9653,7 +9654,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm_x64"
+      name: "vm-kernel-precomp-android-release-arm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9690,7 +9691,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm_x64-beta"
+      name: "vm-kernel-precomp-android-release-arm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9727,7 +9728,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm_x64-dev"
+      name: "vm-kernel-precomp-android-release-arm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9764,7 +9765,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm_x64-stable"
+      name: "vm-kernel-precomp-dwarf-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9789,10 +9790,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9801,7 +9801,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-dwarf-linux-product-x64"
+      name: "vm-kernel-precomp-linux-debug-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9826,9 +9826,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9837,7 +9838,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-simarm_x64"
+      name: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9874,7 +9875,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
+      name: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9911,7 +9912,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
+      name: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9948,7 +9949,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
+      name: "vm-kernel-precomp-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9973,8 +9974,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -9985,7 +9985,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64"
+      name: "vm-kernel-precomp-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10021,7 +10021,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-beta"
+      name: "vm-kernel-precomp-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10057,7 +10057,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-dev"
+      name: "vm-kernel-precomp-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10093,7 +10093,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-stable"
+      name: "vm-kernel-precomp-linux-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10120,7 +10120,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11065,42 +11065,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-x64c"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -11409,7 +11373,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-win-debug-x64c"
+      name: "vm-kernel-precomp-nnbd-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11445,11 +11409,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-win-release-x64"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11459,7 +11423,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11472,7 +11436,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11481,7 +11445,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11517,7 +11481,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11553,7 +11517,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11589,11 +11553,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+      name: "vm-kernel-precomp-win-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11603,7 +11567,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11616,7 +11580,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11985,6 +11949,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-win-debug-x64c"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-win-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
@@ -16200,6 +16200,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-kernel-linux-debug-x64c-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-kernel-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -16619,42 +16655,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-nnbd-linux-debug-x64c-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-nnbd-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -17017,7 +17017,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-debug-x64c-try"
+      name: "vm-kernel-nnbd-win-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17053,7 +17053,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-ia32-try"
+      name: "vm-kernel-nnbd-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17089,11 +17089,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-x64-try"
+      name: "vm-kernel-precomp-android-release-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -17103,7 +17103,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -17114,7 +17114,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -17125,7 +17126,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64c-try"
+      name: "vm-kernel-precomp-android-release-arm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17162,7 +17163,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm_x64-try"
+      name: "vm-kernel-precomp-dwarf-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17187,8 +17188,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -17199,7 +17199,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-dwarf-linux-product-x64-try"
+      name: "vm-kernel-precomp-linux-debug-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17224,7 +17224,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -17235,7 +17236,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-simarm_x64-try"
+      name: "vm-kernel-precomp-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17260,8 +17261,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -17272,7 +17272,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-try"
+      name: "vm-kernel-precomp-linux-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17684,7 +17684,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-x64c-try"
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17720,7 +17720,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-try"
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17756,7 +17756,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
+      name: "vm-kernel-precomp-nnbd-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17792,11 +17792,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64-try"
+      name: "vm-kernel-precomp-nnbd-mac-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -17806,10 +17806,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -17817,9 +17820,17 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -17828,9 +17839,9 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-mac-release-arm64-try"
+      name: "vm-kernel-precomp-nnbd-mac-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
@@ -17856,9 +17867,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -17875,11 +17883,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-mac-release-simarm64-try"
+      name: "vm-kernel-precomp-nnbd-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -17893,9 +17901,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -17903,14 +17908,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -17919,11 +17919,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-win-debug-x64c-try"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -17933,7 +17933,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -17955,7 +17955,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-win-release-x64-try"
+      name: "vm-kernel-precomp-win-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17991,11 +17991,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-try"
+      name: "vm-kernel-precomp-win-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -18005,7 +18005,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -18027,7 +18027,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-product-x64-try"
+      name: "vm-kernel-precomp-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -18063,7 +18063,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-release-x64-try"
+      name: "vm-kernel-win-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -18088,7 +18088,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -18099,7 +18100,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-ia32-try"
+      name: "vm-kernel-win-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -18124,8 +18125,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -18136,7 +18136,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-x64-try"
+      name: "vm-kernel-win-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index aa92d599f025..6a72e2a92bd3 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -242,16 +242,16 @@ consoles {
     name: "buildbucket/luci.dart.try/vm-reload-rollback-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-x64c-try"
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-x64c-try"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-debug-x64c-try"
+    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-x64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-win-debug-x64c-try"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-debug-x64c-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-fuchsia-release-x64-try"
@@ -912,22 +912,22 @@ consoles {
     short_name: "rrb"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64c"
     category: "vm|misc|compressed"
     short_name: "jl"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-x64c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64c"
     category: "vm|misc|compressed"
     short_name: "al"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64c"
     category: "vm|misc|compressed"
     short_name: "jw"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-debug-x64c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-debug-x64c"
     category: "vm|misc|compressed"
     short_name: "aw"
   }
@@ -1783,22 +1783,22 @@ consoles {
     short_name: "rrb"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64c"
     category: "vm|misc|compressed"
     short_name: "jl"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-x64c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64c"
     category: "vm|misc|compressed"
     short_name: "al"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64c"
     category: "vm|misc|compressed"
     short_name: "jw"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-debug-x64c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-debug-x64c"
     category: "vm|misc|compressed"
     short_name: "aw"
   }
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 1c70db3d8ee4..1c7bf5ab0364 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -758,6 +758,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-linux-debug-x64c"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -887,19 +900,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-linux-debug-x64c"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1013,19 +1013,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-win-debug-x64c"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1109,6 +1096,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-precomp-linux-debug-x64c"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1229,19 +1229,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-linux-debug-x64c"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1312,31 +1299,31 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-win-debug-x64c"
+    name: "vm-kernel-precomp-nnbd-win-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-win-release-x64"
+    name: "vm-kernel-precomp-obfuscate-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-obfuscate-linux-release-x64"
+    name: "vm-kernel-precomp-win-debug-x64c"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1388,6 +1375,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-kernel-win-debug-x64c"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index bb7e2a5fac8e..2abd343d5321 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1834,6 +1834,16 @@ job {
     builder: "vm-kernel-linux-debug-x64-stable"
   }
 }
+job {
+  id: "vm-kernel-linux-debug-x64c"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-kernel-linux-debug-x64c"
+  }
+}
 job {
   id: "vm-kernel-linux-release-ia32"
   realm: "ci.sandbox"
@@ -2134,16 +2144,6 @@ job {
     builder: "vm-kernel-nnbd-linux-debug-x64-stable"
   }
 }
-job {
-  id: "vm-kernel-nnbd-linux-debug-x64c"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-debug-x64c"
-  }
-}
 job {
   id: "vm-kernel-nnbd-linux-release-ia32"
   realm: "ci.sandbox"
@@ -2264,16 +2264,6 @@ job {
     builder: "vm-kernel-nnbd-win-debug-x64"
   }
 }
-job {
-  id: "vm-kernel-nnbd-win-debug-x64c"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-win-debug-x64c"
-  }
-}
 job {
   id: "vm-kernel-nnbd-win-release-ia32"
   realm: "ci.sandbox"
@@ -2464,6 +2454,16 @@ job {
     builder: "vm-kernel-precomp-linux-debug-x64-stable"
   }
 }
+job {
+  id: "vm-kernel-precomp-linux-debug-x64c"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-kernel-precomp-linux-debug-x64c"
+  }
+}
 job {
   id: "vm-kernel-precomp-linux-product-x64"
   realm: "ci.sandbox"
@@ -2714,16 +2714,6 @@ job {
     builder: "vm-kernel-precomp-nnbd-linux-debug-x64"
   }
 }
-job {
-  id: "vm-kernel-precomp-nnbd-linux-debug-x64c"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-debug-x64c"
-  }
-}
 job {
   id: "vm-kernel-precomp-nnbd-linux-release-simarm64"
   realm: "ci.sandbox"
@@ -2804,16 +2794,6 @@ job {
     builder: "vm-kernel-precomp-nnbd-mac-release-simarm64"
   }
 }
-job {
-  id: "vm-kernel-precomp-nnbd-win-debug-x64c"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-win-debug-x64c"
-  }
-}
 job {
   id: "vm-kernel-precomp-nnbd-win-release-x64"
   realm: "ci.sandbox"
@@ -2864,6 +2844,16 @@ job {
     builder: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
   }
 }
+job {
+  id: "vm-kernel-precomp-win-debug-x64c"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-kernel-precomp-win-debug-x64c"
+  }
+}
 job {
   id: "vm-kernel-precomp-win-product-x64"
   realm: "ci.sandbox"
@@ -2964,6 +2954,16 @@ job {
     builder: "vm-kernel-win-debug-x64-stable"
   }
 }
+job {
+  id: "vm-kernel-win-debug-x64c"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-kernel-win-debug-x64c"
+  }
+}
 job {
   id: "vm-kernel-win-release-ia32"
   realm: "ci.sandbox"
@@ -3485,11 +3485,11 @@ trigger {
   triggers: "vm-eager-optimization-linux-release-ia32"
   triggers: "vm-kernel-gcc-linux"
   triggers: "vm-kernel-linux-debug-ia32"
+  triggers: "vm-kernel-linux-debug-x64c"
   triggers: "vm-kernel-linux-release-ia32"
   triggers: "vm-kernel-msvc-windows"
   triggers: "vm-kernel-nnbd-linux-debug-ia32"
   triggers: "vm-kernel-nnbd-linux-debug-simriscv64"
-  triggers: "vm-kernel-nnbd-linux-debug-x64c"
   triggers: "vm-kernel-nnbd-linux-release-ia32"
   triggers: "vm-kernel-nnbd-linux-release-simarm"
   triggers: "vm-kernel-nnbd-linux-release-simarm64"
@@ -3497,23 +3497,23 @@ trigger {
   triggers: "vm-kernel-nnbd-mac-debug-x64"
   triggers: "vm-kernel-nnbd-mac-release-x64"
   triggers: "vm-kernel-nnbd-win-debug-x64"
-  triggers: "vm-kernel-nnbd-win-debug-x64c"
   triggers: "vm-kernel-nnbd-win-release-ia32"
   triggers: "vm-kernel-nnbd-win-release-x64"
   triggers: "vm-kernel-precomp-dwarf-linux-product-x64"
+  triggers: "vm-kernel-precomp-linux-debug-x64c"
   triggers: "vm-kernel-precomp-linux-product-x64"
   triggers: "vm-kernel-precomp-mac-product-x64"
   triggers: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
   triggers: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
   triggers: "vm-kernel-precomp-nnbd-linux-debug-x64"
-  triggers: "vm-kernel-precomp-nnbd-linux-debug-x64c"
   triggers: "vm-kernel-precomp-nnbd-linux-release-simarm64"
   triggers: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
   triggers: "vm-kernel-precomp-nnbd-mac-release-simarm64"
-  triggers: "vm-kernel-precomp-nnbd-win-debug-x64c"
   triggers: "vm-kernel-precomp-nnbd-win-release-x64"
+  triggers: "vm-kernel-precomp-win-debug-x64c"
   triggers: "vm-kernel-precomp-win-product-x64"
   triggers: "vm-kernel-win-debug-ia32"
+  triggers: "vm-kernel-win-debug-x64c"
   triggers: "vm-kernel-win-release-ia32"
   triggers: "vm-msan-linux-release-x64"
   triggers: "vm-nnbd-linux-release-x64"
diff --git a/generated/project.cfg b/generated/project.cfg
index 0bfd7dea5da2..6d63a4087885 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.37.0"
+  version: "1.37.1"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/vm.star b/vm.star
index e70003065a8b..b5b05b5d420b 100644
--- a/vm.star
+++ b/vm.star
@@ -471,23 +471,23 @@ _nightly_builder(
     channels = ["try"],
 )
 _nightly_builder(
-    "vm-kernel-nnbd-linux-debug-x64c",
+    "vm-kernel-linux-debug-x64c",
     category = "vm|misc|compressed|jl",
     channels = ["try"],
 )
 _nightly_builder(
-    "vm-kernel-precomp-nnbd-linux-debug-x64c",
+    "vm-kernel-precomp-linux-debug-x64c",
     category = "vm|misc|compressed|al",
     channels = ["try"],
 )
 _nightly_builder(
-    "vm-kernel-nnbd-win-debug-x64c",
+    "vm-kernel-win-debug-x64c",
     category = "vm|misc|compressed|jw",
     channels = ["try"],
     dimensions = windows,
 )
 _nightly_builder(
-    "vm-kernel-precomp-nnbd-win-debug-x64c",
+    "vm-kernel-precomp-win-debug-x64c",
     category = "vm|misc|compressed|aw",
     channels = ["try"],
     dimensions = windows,

From ede88b5a8af26a1411ee076150dd2cfbc9b36c42 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 1 Feb 2023 13:22:44 +0000
Subject: [PATCH 608/826] [infra] Remove duplicated legacy builders

* vm-canary-linux-debug is completely removed: It isn't faster than the
  regular debug builder and duplicates work done on other builders.
* Remove legacy builders that have corresponding null safe builders,
  already. Leave regular linux debug/release x64 legacy for now.
* "Upgrade" null safe builders to match the channels and frequency of
  the removed builders.

Bug: b/201271877
Change-Id: Icdbfdc18832b5f829292d4813e604b401c8df580
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/280105
Reviewed-by: Jonas Termansen <sortie@google.com>
Reviewed-by: Siva Annamalai <asiva@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   |  502 +----
 generated/cr-buildbucket.cfg | 3552 +++++++++++-----------------------
 generated/luci-milo.cfg      |  565 ++----
 generated/luci-notify.cfg    |  224 +--
 generated/luci-scheduler.cfg |  623 +++---
 vm.star                      |  120 +-
 6 files changed, 1678 insertions(+), 3908 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index a5b0eb7962f9..f55933d294da 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -792,69 +792,6 @@ config_groups {
         name: "dart/try/stable-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-canary-linux-debug-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/vm/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "runtime/.+"
-        }
-      }
       builders {
         name: "dart/try/vm-ffi-android-debug-arm-try"
         includable_only: true
@@ -887,25 +824,9 @@ config_groups {
         name: "dart/try/vm-kernel-linux-debug-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-linux-release-simarm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-linux-release-simarm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-linux-release-x64-try"
       }
-      builders {
-        name: "dart/try/vm-kernel-mac-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-mac-release-x64-try"
-        experiment_percentage: 5
-      }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-debug-x64-try"
         location_filters {
@@ -969,6 +890,14 @@ config_groups {
           path_regexp: "runtime/.+"
         }
       }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-release-simarm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-release-simarm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-release-x64-try"
         location_filters {
@@ -1033,31 +962,39 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-android-release-arm64c-try"
+        name: "dart/try/vm-kernel-nnbd-mac-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-android-release-arm_x64-try"
+        name: "dart/try/vm-kernel-nnbd-mac-release-arm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-simarm_x64-try"
+        name: "dart/try/vm-kernel-nnbd-mac-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
+        name: "dart/try/vm-kernel-nnbd-win-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
+        name: "dart/try/vm-kernel-nnbd-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-android-release-arm64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-android-release-arm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm64-try"
+        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm_x64-try"
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
         includable_only: true
       }
       builders {
@@ -1065,27 +1002,31 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-mac-release-simarm64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-win-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-win-debug-x64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-win-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
         includable_only: true
       }
       builders {
@@ -1834,69 +1775,6 @@ config_groups {
         name: "dart/try/stable-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-canary-linux-debug-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/vm/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "runtime/.+"
-        }
-      }
       builders {
         name: "dart/try/vm-ffi-android-debug-arm-try"
         includable_only: true
@@ -1929,29 +1807,9 @@ config_groups {
         name: "dart/try/vm-kernel-linux-debug-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-linux-release-simarm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-linux-release-simarm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-linux-release-x64-try"
       }
-      builders {
-        name: "dart/try/vm-kernel-mac-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-mac-release-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-mac-release-x64-try"
-        experiment_percentage: 5
-      }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-debug-x64-try"
         location_filters {
@@ -2015,6 +1873,14 @@ config_groups {
           path_regexp: "runtime/.+"
         }
       }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-release-simarm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-release-simarm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-release-x64-try"
         location_filters {
@@ -2079,31 +1945,39 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-android-release-arm64c-try"
+        name: "dart/try/vm-kernel-nnbd-mac-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-android-release-arm_x64-try"
+        name: "dart/try/vm-kernel-nnbd-mac-release-arm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-simarm_x64-try"
+        name: "dart/try/vm-kernel-nnbd-mac-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
+        name: "dart/try/vm-kernel-nnbd-win-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
+        name: "dart/try/vm-kernel-nnbd-win-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm64-try"
+        name: "dart/try/vm-kernel-precomp-android-release-arm64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm_x64-try"
+        name: "dart/try/vm-kernel-precomp-android-release-arm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
         includable_only: true
       }
       builders {
@@ -2111,27 +1985,31 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-mac-release-simarm64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-win-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-win-debug-x64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-win-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
         includable_only: true
       }
       builders {
@@ -3101,69 +2979,6 @@ config_groups {
         name: "dart/try/vm-asan-linux-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-canary-linux-debug-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/vm/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "runtime/.+"
-        }
-      }
       builders {
         name: "dart/try/vm-eager-optimization-linux-release-ia32-try"
         includable_only: true
@@ -3208,10 +3023,6 @@ config_groups {
         name: "dart/try/vm-kernel-gcc-linux-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-linux-debug-ia32-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-linux-debug-x64-try"
         includable_only: true
@@ -3220,33 +3031,9 @@ config_groups {
         name: "dart/try/vm-kernel-linux-debug-x64c-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-linux-release-ia32-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-linux-release-simarm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-linux-release-simarm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-linux-release-x64-try"
       }
-      builders {
-        name: "dart/try/vm-kernel-mac-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-mac-release-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-mac-release-x64-try"
-        experiment_percentage: 5
-      }
       builders {
         name: "dart/try/vm-kernel-msvc-windows-try"
         includable_only: true
@@ -3437,10 +3224,6 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-dwarf-linux-product-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-simarm_x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
         includable_only: true
@@ -3457,14 +3240,6 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm_x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
         includable_only: true
@@ -3473,10 +3248,6 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-mac-product-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-precomp-mac-release-simarm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
         includable_only: true
@@ -3525,30 +3296,14 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-win-product-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-precomp-win-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-win-debug-ia32-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-win-debug-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-win-debug-x64c-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-win-release-ia32-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-win-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-msan-linux-release-x64-try"
         includable_only: true
@@ -4323,69 +4078,6 @@ config_groups {
         name: "dart/try/stable-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-canary-linux-debug-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/vm/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "runtime/.+"
-        }
-      }
       builders {
         name: "dart/try/vm-ffi-android-debug-arm-try"
         includable_only: true
@@ -4418,25 +4110,9 @@ config_groups {
         name: "dart/try/vm-kernel-linux-debug-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-linux-release-simarm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-linux-release-simarm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-linux-release-x64-try"
       }
-      builders {
-        name: "dart/try/vm-kernel-mac-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-mac-release-x64-try"
-        experiment_percentage: 5
-      }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-debug-x64-try"
         location_filters {
@@ -4500,6 +4176,14 @@ config_groups {
           path_regexp: "runtime/.+"
         }
       }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-release-simarm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-nnbd-linux-release-simarm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-release-x64-try"
         location_filters {
@@ -4564,31 +4248,39 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-android-release-arm64c-try"
+        name: "dart/try/vm-kernel-nnbd-mac-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-android-release-arm_x64-try"
+        name: "dart/try/vm-kernel-nnbd-mac-release-arm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-simarm_x64-try"
+        name: "dart/try/vm-kernel-nnbd-mac-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
+        name: "dart/try/vm-kernel-nnbd-win-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
+        name: "dart/try/vm-kernel-nnbd-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-android-release-arm64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm64-try"
+        name: "dart/try/vm-kernel-precomp-android-release-arm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm_x64-try"
+        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
         includable_only: true
       }
       builders {
@@ -4596,27 +4288,31 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-mac-release-simarm64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-win-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-win-debug-x64-try"
+        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-win-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
         includable_only: true
       }
       builders {
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 205c7d5b30f9..f90f605fec01 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -6207,10 +6207,10 @@ buckets {
       }
     }
     builders {
-      name: "vm-canary-linux-debug"
+      name: "vm-canary-linux-debug-experimental"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
+      dimensions: "host_class:experimental"
       dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
@@ -6234,7 +6234,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6243,7 +6243,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-canary-linux-debug-beta"
+      name: "vm-eager-optimization-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6270,7 +6270,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6279,7 +6279,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-canary-linux-debug-dev"
+      name: "vm-eager-optimization-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6306,7 +6306,8 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6315,10 +6316,10 @@ buckets {
       }
     }
     builders {
-      name: "vm-canary-linux-debug-experimental"
+      name: "vm-ffi-android-debug-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "host_class:experimental"
+      dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
@@ -6342,7 +6343,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6351,7 +6352,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-canary-linux-debug-stable"
+      name: "vm-ffi-android-debug-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6387,7 +6388,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-eager-optimization-linux-release-ia32"
+      name: "vm-ffi-android-debug-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6414,7 +6415,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6423,7 +6424,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-eager-optimization-linux-release-x64"
+      name: "vm-ffi-android-debug-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6450,8 +6451,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      expiration_secs: 86400
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6460,7 +6460,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm"
+      name: "vm-ffi-android-debug-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6496,7 +6496,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm-beta"
+      name: "vm-ffi-android-debug-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6532,7 +6532,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm-dev"
+      name: "vm-ffi-android-debug-arm64c-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6568,7 +6568,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm-stable"
+      name: "vm-ffi-android-debug-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6604,7 +6604,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c"
+      name: "vm-ffi-android-product-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6640,7 +6640,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c-beta"
+      name: "vm-ffi-android-product-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6676,7 +6676,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c-dev"
+      name: "vm-ffi-android-product-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6712,7 +6712,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c-stable"
+      name: "vm-ffi-android-product-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6748,7 +6748,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm"
+      name: "vm-ffi-android-product-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6784,7 +6784,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm-beta"
+      name: "vm-ffi-android-product-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6820,7 +6820,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm-dev"
+      name: "vm-ffi-android-product-arm64c-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6856,7 +6856,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm-stable"
+      name: "vm-ffi-android-product-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6892,7 +6892,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c"
+      name: "vm-ffi-android-release-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6928,7 +6928,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c-beta"
+      name: "vm-ffi-android-release-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6964,7 +6964,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c-dev"
+      name: "vm-ffi-android-release-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7000,7 +7000,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c-stable"
+      name: "vm-ffi-android-release-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7036,7 +7036,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm"
+      name: "vm-ffi-android-release-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7072,7 +7072,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm-beta"
+      name: "vm-ffi-android-release-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7108,7 +7108,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm-dev"
+      name: "vm-ffi-android-release-arm64c-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7144,7 +7144,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm-stable"
+      name: "vm-ffi-android-release-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7180,7 +7180,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c"
+      name: "vm-fuchsia-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7207,7 +7207,8 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7216,7 +7217,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c-beta"
+      name: "vm-kernel-checked-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7246,13 +7247,17 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c-dev"
+      name: "vm-kernel-checked-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7282,13 +7287,17 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c-stable"
+      name: "vm-kernel-checked-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7318,13 +7327,17 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-fuchsia-release-x64"
+      name: "vm-kernel-checked-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7351,17 +7364,20 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      expiration_secs: 86400
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64"
+      name: "vm-kernel-gcc-linux"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7374,10 +7390,9 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true,'
+        '    "timeout": 4500'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -7388,20 +7403,17 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      execution_timeout_secs: 18000
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-beta"
+      name: "vm-kernel-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7431,17 +7443,13 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-dev"
+      name: "vm-kernel-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7471,17 +7479,13 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-stable"
+      name: "vm-kernel-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7511,17 +7515,13 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-gcc-linux"
+      name: "vm-kernel-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7534,9 +7534,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true,'
-        '    "timeout": 4500'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -7547,8 +7548,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      execution_timeout_secs: 18000
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7557,7 +7557,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-ia32"
+      name: "vm-kernel-linux-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7593,7 +7593,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64"
+      name: "vm-kernel-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7629,7 +7629,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64-beta"
+      name: "vm-kernel-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7665,7 +7665,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64-dev"
+      name: "vm-kernel-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7701,7 +7701,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64-stable"
+      name: "vm-kernel-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7737,11 +7737,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64c"
+      name: "vm-kernel-msvc-windows"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7750,10 +7750,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -7773,7 +7771,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-ia32"
+      name: "vm-kernel-nnbd-linux-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7798,7 +7796,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 70
       build_numbers: YES
@@ -7809,7 +7808,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-simarm"
+      name: "vm-kernel-nnbd-linux-debug-simriscv64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7836,7 +7835,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7845,7 +7844,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-simarm-beta"
+      name: "vm-kernel-nnbd-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7881,7 +7880,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-simarm-dev"
+      name: "vm-kernel-nnbd-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7917,7 +7916,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-simarm-stable"
+      name: "vm-kernel-nnbd-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7953,7 +7952,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-simarm64"
+      name: "vm-kernel-nnbd-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7989,7 +7988,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-simarm64-beta"
+      name: "vm-kernel-nnbd-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8016,7 +8015,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8025,7 +8024,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-simarm64-dev"
+      name: "vm-kernel-nnbd-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8061,7 +8060,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-simarm64-stable"
+      name: "vm-kernel-nnbd-linux-release-simarm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8097,7 +8096,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-x64"
+      name: "vm-kernel-nnbd-linux-release-simarm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8133,7 +8132,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-x64-beta"
+      name: "vm-kernel-nnbd-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8169,7 +8168,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-x64-dev"
+      name: "vm-kernel-nnbd-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8205,7 +8204,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-x64-stable"
+      name: "vm-kernel-nnbd-linux-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8241,11 +8240,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-mac-debug-x64"
+      name: "vm-kernel-nnbd-linux-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8255,13 +8254,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8272,10 +8268,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8284,11 +8276,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-mac-debug-x64-beta"
+      name: "vm-kernel-nnbd-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8298,13 +8290,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8315,10 +8304,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8327,11 +8312,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-mac-debug-x64-dev"
+      name: "vm-kernel-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8341,13 +8326,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8358,10 +8340,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8370,11 +8348,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-mac-debug-x64-stable"
+      name: "vm-kernel-nnbd-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8384,13 +8362,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8401,10 +8376,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8413,11 +8384,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-mac-release-arm64"
+      name: "vm-kernel-nnbd-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8427,13 +8398,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8441,16 +8409,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8459,11 +8420,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-mac-release-arm64-dev"
+      name: "vm-kernel-nnbd-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8473,13 +8434,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8487,16 +8445,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8505,9 +8456,9 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-mac-release-x64"
+      name: "vm-kernel-nnbd-mac-debug-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
@@ -8533,9 +8484,13 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 70
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
@@ -8548,7 +8503,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-mac-release-x64-beta"
+      name: "vm-kernel-nnbd-mac-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8576,7 +8531,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       caches {
@@ -8591,7 +8547,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-mac-release-x64-dev"
+      name: "vm-kernel-nnbd-mac-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8619,7 +8575,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       caches {
@@ -8634,7 +8591,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-mac-release-x64-stable"
+      name: "vm-kernel-nnbd-mac-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8662,7 +8619,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       caches {
@@ -8677,11 +8635,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-msvc-windows"
+      name: "vm-kernel-nnbd-mac-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8690,8 +8648,13 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -8700,9 +8663,14 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8711,11 +8679,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-ia32"
+      name: "vm-kernel-nnbd-mac-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8725,10 +8693,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8736,10 +8707,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8748,11 +8725,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-simriscv64"
+      name: "vm-kernel-nnbd-mac-release-arm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8762,10 +8739,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8773,9 +8753,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8784,11 +8771,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64"
+      name: "vm-kernel-nnbd-mac-release-arm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8798,10 +8785,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8809,9 +8799,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8820,11 +8817,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64-beta"
+      name: "vm-kernel-nnbd-mac-release-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8834,10 +8831,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8845,9 +8845,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8856,11 +8863,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64-dev"
+      name: "vm-kernel-nnbd-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8870,10 +8877,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8884,6 +8894,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8892,11 +8906,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64-stable"
+      name: "vm-kernel-nnbd-mac-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8906,10 +8920,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8920,6 +8937,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8928,11 +8949,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-ia32"
+      name: "vm-kernel-nnbd-mac-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8942,10 +8963,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8955,7 +8979,11 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8964,11 +8992,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-simarm"
+      name: "vm-kernel-nnbd-mac-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8978,10 +9006,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8991,7 +9022,11 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9000,11 +9035,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-simarm64"
+      name: "vm-kernel-nnbd-win-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9014,7 +9049,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9025,9 +9060,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9036,11 +9072,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-x64"
+      name: "vm-kernel-nnbd-win-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9050,7 +9086,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9061,7 +9097,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -9072,11 +9109,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-x64-beta"
+      name: "vm-kernel-nnbd-win-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9086,7 +9123,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9097,7 +9134,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -9108,11 +9146,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-x64-dev"
+      name: "vm-kernel-nnbd-win-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9122,7 +9160,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9133,7 +9171,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -9144,11 +9183,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-x64-stable"
+      name: "vm-kernel-nnbd-win-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9158,7 +9197,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9171,7 +9210,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9180,11 +9219,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-debug-arm64"
+      name: "vm-kernel-nnbd-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9198,9 +9237,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9208,17 +9244,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9227,11 +9255,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-debug-x64"
+      name: "vm-kernel-nnbd-win-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9245,9 +9273,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9255,14 +9280,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9271,11 +9291,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-release-arm64"
+      name: "vm-kernel-nnbd-win-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9289,9 +9309,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9299,16 +9316,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9317,11 +9327,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-release-x64"
+      name: "vm-kernel-nnbd-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9335,9 +9345,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9347,11 +9354,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9360,11 +9363,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-debug-x64"
+      name: "vm-kernel-precomp-android-release-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9374,7 +9377,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9388,7 +9391,7 @@ buckets {
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9397,11 +9400,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-ia32"
+      name: "vm-kernel-precomp-android-release-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9411,7 +9414,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9422,9 +9425,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9433,11 +9437,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-x64"
+      name: "vm-kernel-precomp-android-release-arm64c-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9447,7 +9451,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9458,9 +9462,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9469,7 +9474,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64c"
+      name: "vm-kernel-precomp-android-release-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9506,7 +9511,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64c-beta"
+      name: "vm-kernel-precomp-android-release-arm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9543,7 +9548,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64c-dev"
+      name: "vm-kernel-precomp-android-release-arm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9580,7 +9585,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64c-stable"
+      name: "vm-kernel-precomp-android-release-arm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9617,7 +9622,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm_x64"
+      name: "vm-kernel-precomp-android-release-arm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9654,7 +9659,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm_x64-beta"
+      name: "vm-kernel-precomp-dwarf-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9679,10 +9684,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9691,7 +9695,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm_x64-dev"
+      name: "vm-kernel-precomp-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9716,8 +9720,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -9728,7 +9731,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm_x64-stable"
+      name: "vm-kernel-precomp-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9753,8 +9756,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -9765,7 +9767,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-dwarf-linux-product-x64"
+      name: "vm-kernel-precomp-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9792,7 +9794,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9801,7 +9803,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-simarm_x64"
+      name: "vm-kernel-precomp-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9826,8 +9828,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -9838,7 +9839,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
+      name: "vm-kernel-precomp-linux-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9863,10 +9864,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9875,7 +9875,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
+      name: "vm-kernel-precomp-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9900,10 +9900,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9912,7 +9911,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
+      name: "vm-kernel-precomp-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9937,8 +9936,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -9949,7 +9947,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64"
+      name: "vm-kernel-precomp-linux-release-simarm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9985,7 +9983,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-beta"
+      name: "vm-kernel-precomp-linux-release-simarm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10021,7 +10019,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-dev"
+      name: "vm-kernel-precomp-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10057,7 +10055,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-stable"
+      name: "vm-kernel-precomp-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10093,7 +10091,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64c"
+      name: "vm-kernel-precomp-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10120,7 +10118,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10129,7 +10127,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-product-x64"
+      name: "vm-kernel-precomp-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10156,7 +10154,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10165,7 +10163,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm"
+      name: "vm-kernel-precomp-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10201,11 +10199,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-beta"
+      name: "vm-kernel-precomp-mac-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10215,10 +10213,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10228,7 +10229,11 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10237,7 +10242,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-dev"
+      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10273,7 +10278,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-stable"
+      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10309,7 +10314,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm64"
+      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10345,7 +10350,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm64-beta"
+      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10381,7 +10386,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm64-dev"
+      name: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10406,9 +10411,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10417,7 +10423,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm64-stable"
+      name: "vm-kernel-precomp-nnbd-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10442,9 +10448,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10453,7 +10460,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm_x64"
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10489,7 +10496,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm_x64-beta"
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10525,7 +10532,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm_x64-dev"
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10561,7 +10568,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm_x64-stable"
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10597,7 +10604,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64"
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10633,7 +10640,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64-beta"
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10669,7 +10676,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64-dev"
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10705,7 +10712,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64-stable"
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10741,11 +10748,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-mac-product-x64"
+      name: "vm-kernel-precomp-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10755,13 +10762,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10771,11 +10775,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10784,11 +10784,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-mac-release-simarm64"
+      name: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10798,13 +10798,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10815,10 +10812,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10827,11 +10820,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-mac-release-simarm64-beta"
+      name: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10841,13 +10834,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10858,10 +10848,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10870,11 +10856,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-mac-release-simarm64-dev"
+      name: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10884,13 +10870,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10901,10 +10884,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10913,9 +10892,9 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-mac-release-simarm64-stable"
+      name: "vm-kernel-precomp-nnbd-mac-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
@@ -10941,7 +10920,11 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       caches {
@@ -10956,11 +10939,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+      name: "vm-kernel-precomp-nnbd-mac-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10970,10 +10953,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10981,9 +10967,14 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10992,11 +10983,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
+      name: "vm-kernel-precomp-nnbd-mac-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11006,10 +10997,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11020,20 +11014,24 @@ buckets {
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-x64"
+      name: "vm-kernel-precomp-nnbd-mac-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11043,10 +11041,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11057,7 +11058,11 @@ buckets {
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11066,11 +11071,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm64"
+      name: "vm-kernel-precomp-nnbd-mac-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11080,10 +11085,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11091,9 +11099,14 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11102,11 +11115,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+      name: "vm-kernel-precomp-nnbd-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11116,7 +11129,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11129,7 +11142,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11138,11 +11151,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64"
+      name: "vm-kernel-precomp-nnbd-win-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11152,7 +11165,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11174,11 +11187,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
+      name: "vm-kernel-precomp-nnbd-win-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11188,7 +11201,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11210,11 +11223,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
+      name: "vm-kernel-precomp-nnbd-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11224,7 +11237,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11246,7 +11259,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11282,11 +11295,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-mac-release-arm64"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11296,13 +11309,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11310,17 +11320,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11329,11 +11331,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-mac-release-simarm64"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11343,13 +11345,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11357,14 +11356,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11373,11 +11367,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-win-release-x64"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11387,7 +11381,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11400,7 +11394,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11409,11 +11403,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64"
+      name: "vm-kernel-precomp-win-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11423,7 +11417,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11436,7 +11430,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11445,11 +11439,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+      name: "vm-kernel-precomp-win-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11459,7 +11453,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11472,7 +11466,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11481,11 +11475,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+      name: "vm-kernel-win-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11495,7 +11489,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11506,9 +11500,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11517,11 +11512,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+      name: "vm-kernel-win-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11531,7 +11526,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11544,7 +11539,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11553,11 +11548,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-debug-x64c"
+      name: "vm-msan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11567,7 +11562,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11577,6 +11572,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -11589,11 +11585,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-product-x64"
+      name: "vm-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11603,7 +11599,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11613,6 +11609,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -11625,11 +11622,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-release-x64"
+      name: "vm-precomp-ffi-qemu-linux-release-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11639,7 +11636,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11661,11 +11658,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-release-x64-beta"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11675,7 +11672,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11697,11 +11694,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-release-x64-dev"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11711,7 +11708,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11733,11 +11730,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-release-x64-stable"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "host_class:experimental"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11747,7 +11744,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11760,7 +11757,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11769,11 +11766,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-ia32"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11783,7 +11780,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11794,10 +11791,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11806,11 +11802,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-x64"
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11820,7 +11816,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11842,11 +11838,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-x64-beta"
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11856,7 +11852,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11878,11 +11874,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-x64-dev"
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11892,7 +11888,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11914,11 +11910,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-x64-stable"
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11928,7 +11924,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11950,11 +11946,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-x64c"
+      name: "vm-reload-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11964,7 +11960,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11986,11 +11982,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-release-ia32"
+      name: "vm-reload-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12000,7 +11996,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12022,11 +12018,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-release-x64"
+      name: "vm-reload-rollback-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12036,7 +12032,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12049,7 +12045,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12058,11 +12054,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-release-x64-beta"
+      name: "vm-reload-rollback-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12072,7 +12068,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12085,7 +12081,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12094,11 +12090,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-release-x64-dev"
+      name: "vm-ubsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12107,10 +12103,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -12118,1018 +12112,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-win-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-msan-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-nnbd-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:experimental"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-reload-linux-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-reload-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-reload-rollback-linux-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-reload-rollback-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-ubsan-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-  }
-}
-buckets {
-  name: "try"
-  swarming {
-    builders {
-      name: "analyzer-analysis-server-linux-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-linux-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-mac-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "analyzer-win-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "app-kernel-linux-debug-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "app-kernel-linux-product-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "app-kernel-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "benchmark-linux-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "checkout_javascript_engines": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "beta-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "from_ref": "refs/heads/dev",'
-        '  "recipe": "release/merge",'
-        '  "to_ref": "refs/heads/beta"'
-        '}'
-      priority: 30
-      execution_timeout_secs: 900
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.non_production"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-linux-arm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$dart/build": {'
-        '    "timeout": 6000'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "archs": ['
-        '    "arm",'
-        '    "arm64"'
-        '  ],'
-        '  "clobber": true,'
-        '  "disable_bcid": true,'
-        '  "recipe": "release/sdk"'
-        '}'
-      priority: 30
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13137,8 +12124,13 @@ buckets {
         value: 100
       }
     }
+  }
+}
+buckets {
+  name: "try"
+  swarming {
     builders {
-      name: "dart-sdk-linux-riscv64-try"
+      name: "analyzer-analysis-server-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13156,24 +12148,14 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$dart/build": {'
-        '    "timeout": 6000'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "archs": ['
-        '    "riscv64"'
-        '  ],'
-        '  "args": ['
-        '    "--no-clang"'
-        '  ],'
         '  "clobber": true,'
-        '  "disable_bcid": true,'
-        '  "recipe": "release/sdk"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -13184,7 +12166,7 @@ buckets {
       }
     }
     builders {
-      name: "dart-sdk-linux-try"
+      name: "analyzer-linux-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13202,76 +12184,16 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$dart/build": {'
-        '    "timeout": 6000'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "archs": ['
-        '    "ia32",'
-        '    "x64"'
-        '  ],'
-        '  "clobber": true,'
-        '  "dartdoc_arch": "x64",'
-        '  "disable_bcid": true,'
-        '  "recipe": "release/sdk",'
-        '  "upload_version": true'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-mac-arm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "archs": ['
-        '    "arm64"'
-        '  ],'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "disable_bcid": true,'
-        '  "recipe": "release/sdk"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13280,7 +12202,7 @@ buckets {
       }
     }
     builders {
-      name: "dart-sdk-mac-try"
+      name: "analyzer-mac-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13307,12 +12229,8 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "archs": ['
-        '    "x64"'
-        '  ],'
         '  "clobber": true,'
-        '  "disable_bcid": true,'
-        '  "recipe": "release/sdk"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       caches {
@@ -13327,7 +12245,7 @@ buckets {
       }
     }
     builders {
-      name: "dart-sdk-win-arm64-try"
+      name: "analyzer-win-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13351,64 +12269,23 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "archs": ['
-        '    "arm64"'
-        '  ],'
         '  "clobber": true,'
-        '  "disable_bcid": true,'
-        '  "recipe": "release/sdk"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart-sdk-win-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "archs": ['
-        '    "ia32",'
-        '    "x64"'
-        '  ],'
-        '  "clobber": true,'
-        '  "disable_bcid": true,'
-        '  "recipe": "release/sdk"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "dart2js-canary-x64-try"
+      name: "app-kernel-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13433,11 +12310,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -13448,7 +12322,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-csp-minified-linux-x64-chrome-try"
+      name: "app-kernel-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13473,10 +12347,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13488,7 +12358,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-minified-strong-linux-x64-d8-try"
+      name: "app-kernel-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13513,9 +12383,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13527,7 +12394,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-nnbd-linux-x64-chrome-try"
+      name: "benchmark-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13553,8 +12420,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "checkout_javascript_engines": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -13567,7 +12433,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-hostasserts-linux-ia32-d8-try"
+      name: "beta-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13592,21 +12458,25 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "from_ref": "refs/heads/dev",'
+        '  "recipe": "release/merge",'
+        '  "to_ref": "refs/heads/beta"'
         '}'
       priority: 30
+      execution_timeout_secs: 900
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.non_production"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "dart2js-strong-linux-x64-chrome-try"
+      name: "dart-sdk-linux-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13624,18 +12494,22 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$dart/build": {'
+        '    "timeout": 6000'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "archs": ['
+        '    "arm",'
+        '    "arm64"'
+        '  ],'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "disable_bcid": true,'
+        '  "recipe": "release/sdk"'
         '}'
       priority: 30
       build_numbers: YES
@@ -13646,7 +12520,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-linux-x64-firefox-try"
+      name: "dart-sdk-linux-riscv64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13664,18 +12538,24 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$dart/build": {'
+        '    "timeout": 6000'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "archs": ['
+        '    "riscv64"'
+        '  ],'
+        '  "args": ['
+        '    "--no-clang"'
+        '  ],'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_firefox": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "disable_bcid": true,'
+        '  "recipe": "release/sdk"'
         '}'
       priority: 30
       build_numbers: YES
@@ -13686,11 +12566,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-mac-x64-chrome-try"
+      name: "dart-sdk-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13700,12 +12580,12 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
+        '  "$dart/build": {'
+        '    "timeout": 6000'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -13713,18 +12593,17 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "archs": ['
+        '    "ia32",'
+        '    "x64"'
+        '  ],'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "dartdoc_arch": "x64",'
+        '  "disable_bcid": true,'
+        '  "recipe": "release/sdk",'
+        '  "upload_version": true'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13733,9 +12612,9 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-mac-x64-safari-try"
+      name: "dart-sdk-mac-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
@@ -13760,11 +12639,15 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "archs": ['
+        '    "arm64"'
+        '  ],'
         '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
-        '  "recipe": "dart/neo"'
+        '  "disable_bcid": true,'
+        '  "recipe": "release/sdk"'
         '}'
       priority: 30
       caches {
@@ -13779,11 +12662,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-win-x64-chrome-try"
+      name: "dart-sdk-mac-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13797,20 +12680,27 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "archs": ['
+        '    "x64"'
+        '  ],'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "disable_bcid": true,'
+        '  "recipe": "release/sdk"'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13819,11 +12709,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-unit-linux-x64-release-try"
+      name: "dart-sdk-win-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13833,7 +12723,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -13843,11 +12733,12 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "archs": ['
+        '    "arm64"'
+        '  ],'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "disable_bcid": true,'
+        '  "recipe": "release/sdk"'
         '}'
       priority: 30
       build_numbers: YES
@@ -13858,11 +12749,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2wasm-linux-x64-d8-try"
+      name: "dart-sdk-win-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13872,7 +12763,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -13882,11 +12773,13 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "archs": ['
+        '    "ia32",'
+        '    "x64"'
+        '  ],'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_emscripten": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "disable_bcid": true,'
+        '  "recipe": "release/sdk"'
         '}'
       priority: 30
       build_numbers: YES
@@ -13897,7 +12790,7 @@ buckets {
       }
     }
     builders {
-      name: "ddc-canary-linux-release-chrome-try"
+      name: "dart2js-canary-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13923,6 +12816,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -13936,7 +12830,7 @@ buckets {
       }
     }
     builders {
-      name: "ddc-linux-release-chrome-try"
+      name: "dart2js-csp-minified-linux-x64-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13962,6 +12856,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -13975,11 +12870,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-mac-release-chrome-try"
+      name: "dart2js-minified-strong-linux-x64-d8-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13989,13 +12884,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14004,15 +12896,11 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_chrome": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14021,7 +12909,7 @@ buckets {
       }
     }
     builders {
-      name: "ddc-nnbd-linux-release-chrome-try"
+      name: "dart2js-nnbd-linux-x64-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14047,6 +12935,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -14060,11 +12949,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-win-release-chrome-try"
+      name: "dart2js-strong-hostasserts-linux-ia32-d8-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14074,7 +12963,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -14086,7 +12975,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_chrome": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -14099,7 +12988,7 @@ buckets {
       }
     }
     builders {
-      name: "ddk-linux-release-firefox-try"
+      name: "dart2js-strong-linux-x64-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14125,7 +13014,8 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_firefox": true'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -14138,7 +13028,7 @@ buckets {
       }
     }
     builders {
-      name: "dev-try"
+      name: "dart2js-strong-linux-x64-firefox-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14163,29 +13053,26 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "from_ref": "refs/heads/lkgr",'
-        '  "recipe": "release/merge",'
-        '  "to_ref": "refs/heads/dev"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 900
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.non_production"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "flutter-analyze-try"
+      name: "dart2js-strong-mac-x64-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14195,10 +13082,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14206,10 +13096,17 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 2700
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14218,24 +13115,27 @@ buckets {
       }
     }
     builders {
-      name: "flutter-android-debug-try"
+      name: "dart2js-strong-mac-x64-safari-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14243,10 +13143,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 3600
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14255,21 +13161,21 @@ buckets {
       }
     }
     builders {
-      name: "flutter-android-profile-try"
+      name: "dart2js-strong-win-x64-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -14280,10 +13186,13 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14292,7 +13201,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-engine-linux-try"
+      name: "dart2js-unit-linux-x64-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14316,19 +13225,13 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "flutter_test_suites": ['
-        '    "add_to_app_life_cycle_tests",'
-        '    "flutter_plugins",'
-        '    "framework_coverage",'
-        '    "framework_tests",'
-        '    "tool_tests"'
-        '  ],'
-        '  "recipe": "dart/flutter_engine"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 28800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14337,7 +13240,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-engine-linux-web_tests-try"
+      name: "dart2wasm-linux-x64-d8-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14362,14 +13265,12 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "flutter_test_suites": ['
-        '    "web_tests",'
-        '    "web_tool_tests"'
-        '  ],'
-        '  "recipe": "dart/flutter_engine"'
+        '  "custom_vars": {'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 28800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14378,7 +13279,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-frontend-try"
+      name: "ddc-canary-linux-release-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14403,6 +13304,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14414,14 +13318,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-debug-try"
+      name: "ddc-linux-release-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -14439,10 +13343,12 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14451,24 +13357,27 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-debug-unopt-try"
+      name: "ddc-mac-release-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14476,10 +13385,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 3600
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14488,14 +13403,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-profile-try"
+      name: "ddc-nnbd-linux-release-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -14513,10 +13428,12 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14525,21 +13442,21 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-release-try"
+      name: "ddc-win-release-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -14550,10 +13467,12 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14562,14 +13481,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-try"
+      name: "ddk-linux-release-firefox-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -14580,24 +13499,19 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$fuchsia/goma": {'
-        '    "server": "goma.chromium.org"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "builder_name_suffix": "-try",'
         '  "clobber": true,'
-        '  "config_name": "host_linux",'
-        '  "environment": "unused",'
-        '  "goma_jobs": "200",'
-        '  "recipe": "engine_v2/engine_v2"'
+        '  "custom_vars": {'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 7200
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14606,14 +13520,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-0-try"
+      name: "dev-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -14631,26 +13545,32 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "from_ref": "refs/heads/lkgr",'
+        '  "recipe": "release/merge",'
+        '  "to_ref": "refs/heads/dev"'
         '}'
       priority: 30
-      execution_timeout_secs: 5400
+      execution_timeout_secs: 900
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.non_production"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "flutter-linux-web-tests-1-try"
+      name: "flutter-analyze-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -14668,10 +13588,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 5400
+      execution_timeout_secs: 2700
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14680,7 +13600,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-2-try"
+      name: "flutter-android-debug-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14705,10 +13625,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
-      execution_timeout_secs: 5400
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14717,7 +13637,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-3-try"
+      name: "flutter-android-profile-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14742,10 +13662,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
-      execution_timeout_secs: 5400
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14754,14 +13674,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-4-try"
+      name: "flutter-engine-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -14778,11 +13698,19 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "flutter_test_suites": ['
+        '    "add_to_app_life_cycle_tests",'
+        '    "flutter_plugins",'
+        '    "framework_coverage",'
+        '    "framework_tests",'
+        '    "tool_tests"'
+        '  ],'
+        '  "recipe": "dart/flutter_engine"'
         '}'
       priority: 30
-      execution_timeout_secs: 5400
+      execution_timeout_secs: 28800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14791,14 +13719,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-5-try"
+      name: "flutter-engine-linux-web_tests-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -14816,10 +13744,14 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "flutter_test_suites": ['
+        '    "web_tests",'
+        '    "web_tool_tests"'
+        '  ],'
+        '  "recipe": "dart/flutter_engine"'
         '}'
       priority: 30
-      execution_timeout_secs: 5400
+      execution_timeout_secs: 28800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14828,14 +13760,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-6-try"
+      name: "flutter-frontend-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -14853,10 +13785,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14865,7 +13796,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-7-last-try"
+      name: "flutter-linux-debug-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14890,10 +13821,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
-      execution_timeout_secs: 5400
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14902,7 +13833,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tool-tests-try"
+      name: "flutter-linux-debug-unopt-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14927,10 +13858,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
-      execution_timeout_secs: 5400
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14939,14 +13870,14 @@ buckets {
       }
     }
     builders {
-      name: "front-end-linux-release-x64-try"
+      name: "flutter-linux-profile-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -14964,9 +13895,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14975,27 +13907,24 @@ buckets {
       }
     }
     builders {
-      name: "front-end-mac-release-x64-try"
+      name: "flutter-linux-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15003,13 +13932,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -15018,14 +13944,14 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-linux-release-x64-try"
+      name: "flutter-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -15036,16 +13962,24 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$fuchsia/goma": {'
+        '    "server": "goma.chromium.org"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "builder_name_suffix": "-try",'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "config_name": "host_linux",'
+        '  "environment": "unused",'
+        '  "goma_jobs": "200",'
+        '  "recipe": "engine_v2/engine_v2"'
         '}'
       priority: 30
+      execution_timeout_secs: 7200
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -15054,27 +13988,24 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-mac-release-x64-try"
+      name: "flutter-linux-web-tests-0-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15082,13 +14013,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -15097,21 +14025,21 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-win-release-x64-try"
+      name: "flutter-linux-web-tests-1-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -15122,9 +14050,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -15133,21 +14062,21 @@ buckets {
       }
     }
     builders {
-      name: "front-end-win-release-x64-try"
+      name: "flutter-linux-web-tests-2-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -15158,9 +14087,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -15169,14 +14099,14 @@ buckets {
       }
     }
     builders {
-      name: "gclient-try"
+      name: "flutter-linux-web-tests-3-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -15194,9 +14124,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/gclient"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -15205,14 +14136,14 @@ buckets {
       }
     }
     builders {
-      name: "monorepo-roller-try"
+      name: "flutter-linux-web-tests-4-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -15230,30 +14161,26 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "roller/monorepo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
-      execution_timeout_secs: 1800
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.non_production"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "pkg-linux-debug-try"
+      name: "flutter-linux-web-tests-5-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -15271,12 +14198,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -15285,14 +14210,14 @@ buckets {
       }
     }
     builders {
-      name: "pkg-linux-release-try"
+      name: "flutter-linux-web-tests-6-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -15303,9 +14228,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15313,12 +14235,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -15327,27 +14247,24 @@ buckets {
       }
     }
     builders {
-      name: "pkg-mac-release-arm64-try"
+      name: "flutter-linux-web-tests-7-last-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15355,50 +14272,36 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "pkg-mac-release-try"
+      name: "flutter-linux-web-tool-tests-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15406,16 +14309,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -15424,11 +14321,11 @@ buckets {
       }
     }
     builders {
-      name: "pkg-win-release-try"
+      name: "front-end-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15438,7 +14335,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -15449,29 +14346,22 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "stable-try"
+      name: "front-end-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15481,10 +14371,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15492,25 +14385,22 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "from_ref": "refs/heads/beta",'
-        '  "recipe": "release/merge",'
-        '  "to_ref": "refs/heads/stable"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 900
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.non_production"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-aot-asan-linux-release-x64-try"
+      name: "front-end-nnbd-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15534,7 +14424,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -15547,11 +14436,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-msan-linux-release-x64-try"
+      name: "front-end-nnbd-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15561,21 +14450,27 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -15584,11 +14479,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-tsan-linux-release-x64-try"
+      name: "front-end-nnbd-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15598,7 +14493,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -15608,7 +14503,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -15621,11 +14515,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-ubsan-linux-release-x64-try"
+      name: "front-end-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15634,8 +14528,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -15643,7 +14539,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -15656,7 +14551,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-asan-linux-release-x64-try"
+      name: "gclient-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15680,9 +14575,8 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/gclient"'
         '}'
       priority: 30
       build_numbers: YES
@@ -15693,7 +14587,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-canary-linux-debug-try"
+      name: "monorepo-roller-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15718,18 +14612,23 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "roller/monorepo"'
         '}'
       priority: 30
+      execution_timeout_secs: 1800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.non_production"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-eager-optimization-linux-release-ia32-try"
+      name: "pkg-linux-debug-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15754,6 +14653,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -15765,7 +14667,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-eager-optimization-linux-release-x64-try"
+      name: "pkg-linux-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15783,6 +14685,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15790,6 +14695,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -15801,11 +14709,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm-try"
+      name: "pkg-mac-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15815,10 +14723,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15826,22 +14737,34 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c-try"
+      name: "pkg-mac-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15851,10 +14774,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15862,9 +14788,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -15873,11 +14806,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm-try"
+      name: "pkg-win-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15887,7 +14820,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -15898,18 +14831,25 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c-try"
+      name: "stable-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15934,18 +14874,25 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "from_ref": "refs/heads/beta",'
+        '  "recipe": "release/merge",'
+        '  "to_ref": "refs/heads/stable"'
         '}'
       priority: 30
+      execution_timeout_secs: 900
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.non_production"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm-try"
+      name: "vm-aot-asan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15969,6 +14916,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -15981,7 +14929,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c-try"
+      name: "vm-aot-msan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16005,6 +14953,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -16017,7 +14966,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-fuchsia-release-x64-try"
+      name: "vm-aot-tsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16041,6 +14990,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -16053,7 +15003,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-try"
+      name: "vm-aot-ubsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16066,10 +15016,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -16077,23 +15025,20 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-gcc-linux-try"
+      name: "vm-asan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16106,9 +15051,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true,'
-        '    "timeout": 4500'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -16116,11 +15062,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 18000
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -16129,7 +15075,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-ia32-try"
+      name: "vm-eager-optimization-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16165,7 +15111,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64-try"
+      name: "vm-eager-optimization-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16201,7 +15147,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64c-try"
+      name: "vm-ffi-android-debug-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16237,7 +15183,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-ia32-try"
+      name: "vm-ffi-android-debug-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16273,7 +15219,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-simarm-try"
+      name: "vm-ffi-android-product-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16309,7 +15255,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-simarm64-try"
+      name: "vm-ffi-android-product-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16345,7 +15291,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-x64-try"
+      name: "vm-ffi-android-release-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16381,11 +15327,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-mac-debug-x64-try"
+      name: "vm-ffi-android-release-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16395,13 +15341,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16412,10 +15355,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -16424,11 +15363,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-mac-release-arm64-try"
+      name: "vm-fuchsia-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16438,13 +15377,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16452,16 +15388,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -16470,11 +15399,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-mac-release-x64-try"
+      name: "vm-kernel-checked-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16484,13 +15413,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16501,23 +15427,23 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-msvc-windows-try"
+      name: "vm-kernel-gcc-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16527,7 +15453,8 @@ buckets {
       properties:
         '{'
         '  "$dart/build": {'
-        '    "disable_goma": true'
+        '    "disable_goma": true,'
+        '    "timeout": 4500'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -16539,6 +15466,7 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      execution_timeout_secs: 18000
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -16547,7 +15475,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-ia32-try"
+      name: "vm-kernel-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16572,8 +15500,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -16584,7 +15511,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-simriscv64-try"
+      name: "vm-kernel-linux-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16620,7 +15547,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64-try"
+      name: "vm-kernel-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16656,11 +15583,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-ia32-try"
+      name: "vm-kernel-msvc-windows-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16669,10 +15596,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -16692,7 +15617,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-simarm-try"
+      name: "vm-kernel-nnbd-linux-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16717,7 +15642,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -16728,7 +15654,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-simarm64-try"
+      name: "vm-kernel-nnbd-linux-debug-simriscv64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16764,7 +15690,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-x64-try"
+      name: "vm-kernel-nnbd-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16800,11 +15726,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-debug-arm64-try"
+      name: "vm-kernel-nnbd-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16814,13 +15740,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16828,17 +15751,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -16847,11 +15762,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-debug-x64-try"
+      name: "vm-kernel-nnbd-linux-release-simarm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16861,13 +15776,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16875,14 +15787,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -16891,11 +15798,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-release-arm64-try"
+      name: "vm-kernel-nnbd-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16905,13 +15812,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16919,16 +15823,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -16937,11 +15834,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-release-x64-try"
+      name: "vm-kernel-nnbd-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16951,13 +15848,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16966,12 +15860,8 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+        '}'
+      priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -16980,11 +15870,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-debug-x64-try"
+      name: "vm-kernel-nnbd-mac-debug-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16998,6 +15888,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -17005,10 +15898,17 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -17017,11 +15917,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-ia32-try"
+      name: "vm-kernel-nnbd-mac-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -17035,6 +15935,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -17042,9 +15945,14 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -17053,11 +15961,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-x64-try"
+      name: "vm-kernel-nnbd-mac-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -17071,6 +15979,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -17078,9 +15989,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -17089,11 +16007,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64c-try"
+      name: "vm-kernel-nnbd-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -17103,10 +16021,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -17114,10 +16035,13 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -17126,11 +16050,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm_x64-try"
+      name: "vm-kernel-nnbd-win-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -17140,7 +16064,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -17163,11 +16087,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-dwarf-linux-product-x64-try"
+      name: "vm-kernel-nnbd-win-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -17177,7 +16101,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -17199,11 +16123,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-simarm_x64-try"
+      name: "vm-kernel-nnbd-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -17213,7 +16137,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -17224,8 +16148,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -17236,7 +16159,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-try"
+      name: "vm-kernel-precomp-android-release-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17261,7 +16184,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -17272,7 +16196,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64c-try"
+      name: "vm-kernel-precomp-android-release-arm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17297,7 +16221,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -17308,7 +16233,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-product-x64-try"
+      name: "vm-kernel-precomp-dwarf-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17344,7 +16269,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-try"
+      name: "vm-kernel-precomp-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17380,7 +16305,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm64-try"
+      name: "vm-kernel-precomp-linux-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17416,7 +16341,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm_x64-try"
+      name: "vm-kernel-precomp-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17452,7 +16377,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64-try"
+      name: "vm-kernel-precomp-linux-release-simarm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17488,11 +16413,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-mac-product-x64-try"
+      name: "vm-kernel-precomp-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -17502,13 +16427,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -17519,10 +16441,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -17531,7 +16449,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-mac-release-simarm64-try"
+      name: "vm-kernel-precomp-mac-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -18026,42 +16944,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-precomp-win-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-win-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -18099,42 +16981,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-win-debug-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-win-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -18171,78 +17017,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-win-release-ia32-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-win-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-msan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 6a72e2a92bd3..45056796ecb2 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -109,78 +109,30 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/app-kernel-linux-release-x64-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-canary-linux-debug-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simarm-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-simarm64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-ia32-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-checked-linux-release-x64-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-ia32-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-mac-debug-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-mac-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-mac-release-arm64-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-win-debug-ia32-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-release-ia32-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-release-x64-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm64-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-x64-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-simarm_x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm_x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-mac-release-simarm64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-release-x64-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-dwarf-linux-product-x64-try"
   }
@@ -681,31 +633,11 @@ consoles {
     category: "vm|app-kernel"
     short_name: "r64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
-    category: "vm|kernel"
-    short_name: "c"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
     category: "vm|kernel"
     short_name: "d"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
-    category: "vm|kernel"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
-    category: "vm|kernel"
-    short_name: "a64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32"
-    category: "vm|kernel"
-    short_name: "r32"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
     category: "vm|kernel"
@@ -716,46 +648,11 @@ consoles {
     category: "vm|kernel"
     short_name: "rc"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32"
-    category: "vm|kernel"
-    short_name: "d32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
-    category: "vm|kernel"
-    short_name: "md"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
-    category: "vm|kernel"
-    short_name: "mr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-arm64"
-    category: "vm|kernel"
-    short_name: "m1r"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
     category: "vm|kernel"
     short_name: "wd3"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64"
-    category: "vm|kernel"
-    short_name: "wd"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32"
-    category: "vm|kernel"
-    short_name: "wr3"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
-    category: "vm|kernel"
-    short_name: "wr"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
     category: "vm|kernel"
@@ -771,11 +668,6 @@ consoles {
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "a64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
     category: "vm|kernel-precomp"
@@ -786,26 +678,6 @@ consoles {
     category: "vm|kernel-precomp"
     short_name: "o"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64"
-    category: "vm|kernel-precomp"
-    short_name: "adx"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64"
-    category: "vm|kernel-precomp"
-    short_name: "arx"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "ma"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "wr"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/cross-vm-precomp-linux-release-arm64"
     category: "vm|kernel-precomp"
@@ -1552,31 +1424,11 @@ consoles {
     category: "vm|app-kernel"
     short_name: "r64"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug"
-    category: "vm|kernel"
-    short_name: "c"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
     category: "vm|kernel"
     short_name: "d"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm"
-    category: "vm|kernel"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64"
-    category: "vm|kernel"
-    short_name: "a64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-ia32"
-    category: "vm|kernel"
-    short_name: "r32"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
     category: "vm|kernel"
@@ -1587,46 +1439,11 @@ consoles {
     category: "vm|kernel"
     short_name: "rc"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-ia32"
-    category: "vm|kernel"
-    short_name: "d32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64"
-    category: "vm|kernel"
-    short_name: "md"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64"
-    category: "vm|kernel"
-    short_name: "mr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-arm64"
-    category: "vm|kernel"
-    short_name: "m1r"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
     category: "vm|kernel"
     short_name: "wd3"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64"
-    category: "vm|kernel"
-    short_name: "wd"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-ia32"
-    category: "vm|kernel"
-    short_name: "wr3"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64"
-    category: "vm|kernel"
-    short_name: "wr"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
     category: "vm|kernel"
@@ -1642,11 +1459,6 @@ consoles {
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "a64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
     category: "vm|kernel-precomp"
@@ -1657,26 +1469,6 @@ consoles {
     category: "vm|kernel-precomp"
     short_name: "o"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64"
-    category: "vm|kernel-precomp"
-    short_name: "adx"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64"
-    category: "vm|kernel-precomp"
-    short_name: "arx"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64"
-    category: "vm|kernel-precomp"
-    short_name: "ma"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "wr"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/cross-vm-precomp-linux-release-arm64"
     category: "vm|kernel-precomp"
@@ -1994,74 +1786,94 @@ consoles {
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-dev"
-    category: "vm|nnbd|aot"
-    short_name: "r"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm-dev"
+    category: "vm|nnbd|jit"
+    short_name: "ra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-dev"
-    category: "vm|app-kernel"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm64-dev"
+    category: "vm|nnbd|jit"
+    short_name: "ra6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-dev"
-    category: "vm|app-kernel"
-    short_name: "r64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-x64-dev"
+    category: "vm|nnbd|jit"
+    short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-dev"
-    category: "vm|kernel"
-    short_name: "c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-arm64-dev"
+    category: "vm|nnbd|jit"
+    short_name: "m1r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-dev"
-    category: "vm|kernel"
-    short_name: "d"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-x64-dev"
+    category: "vm|nnbd|jit"
+    short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-dev"
-    category: "vm|kernel"
-    short_name: "a32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64-dev"
+    category: "vm|nnbd|jit"
+    short_name: "wd"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-dev"
-    category: "vm|kernel"
-    short_name: "a64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-x64-dev"
+    category: "vm|nnbd|jit"
+    short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-dev"
-    category: "vm|kernel"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-dev"
+    category: "vm|nnbd|aot"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-dev"
-    category: "vm|kernel"
-    short_name: "rc"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-dev"
+    category: "vm|nnbd|aot"
+    short_name: "da"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-dev"
-    category: "vm|kernel"
-    short_name: "md"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm_x64-dev"
+    category: "vm|nnbd|aot"
+    short_name: "ra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-dev"
-    category: "vm|kernel"
-    short_name: "mr"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64-dev"
+    category: "vm|nnbd|aot"
+    short_name: "ra6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-arm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64-dev"
+    category: "vm|nnbd|aot"
+    short_name: "ma6"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-release-x64-dev"
+    category: "vm|nnbd|aot"
+    short_name: "wr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-dev"
+    category: "vm|app-kernel"
+    short_name: "d64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-dev"
+    category: "vm|app-kernel"
+    short_name: "r64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-dev"
     category: "vm|kernel"
-    short_name: "m1r"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-dev"
     category: "vm|kernel"
-    short_name: "wd"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-dev"
     category: "vm|kernel"
-    short_name: "wr"
+    short_name: "rc"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-dev"
@@ -2073,11 +1885,6 @@ consoles {
     category: "vm|kernel-precomp"
     short_name: "a32"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "a64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-dev"
     category: "vm|kernel-precomp"
@@ -2088,26 +1895,6 @@ consoles {
     category: "vm|kernel-precomp"
     short_name: "o"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "adx"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "arx"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "ma"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "wr"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-dev"
     category: "vm|kernel-precomp|android"
@@ -2390,114 +2177,114 @@ consoles {
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-beta"
-    category: "vm|nnbd|aot"
-    short_name: "r"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm-beta"
+    category: "vm|nnbd|jit"
+    short_name: "ra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-beta"
-    category: "vm|app-kernel"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm64-beta"
+    category: "vm|nnbd|jit"
+    short_name: "ra6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-beta"
-    category: "vm|app-kernel"
-    short_name: "r64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-x64-beta"
+    category: "vm|nnbd|jit"
+    short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-beta"
-    category: "vm|kernel"
-    short_name: "c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-arm64-beta"
+    category: "vm|nnbd|jit"
+    short_name: "m1r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-beta"
-    category: "vm|kernel"
-    short_name: "d"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-x64-beta"
+    category: "vm|nnbd|jit"
+    short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-beta"
-    category: "vm|kernel"
-    short_name: "a32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64-beta"
+    category: "vm|nnbd|jit"
+    short_name: "wd"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-beta"
-    category: "vm|kernel"
-    short_name: "a64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-x64-beta"
+    category: "vm|nnbd|jit"
+    short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-beta"
-    category: "vm|kernel"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-beta"
+    category: "vm|nnbd|aot"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-beta"
-    category: "vm|kernel"
-    short_name: "rc"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-beta"
+    category: "vm|nnbd|aot"
+    short_name: "da"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-beta"
-    category: "vm|kernel"
-    short_name: "md"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm_x64-beta"
+    category: "vm|nnbd|aot"
+    short_name: "ra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-beta"
-    category: "vm|kernel"
-    short_name: "mr"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64-beta"
+    category: "vm|nnbd|aot"
+    short_name: "ra6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-beta"
-    category: "vm|kernel"
-    short_name: "wd"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64-beta"
+    category: "vm|nnbd|aot"
+    short_name: "ma6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-beta"
-    category: "vm|kernel"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-release-x64-beta"
+    category: "vm|nnbd|aot"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-beta"
-    category: "vm|kernel-precomp"
-    short_name: "d"
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-beta"
+    category: "vm|app-kernel"
+    short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-beta"
-    category: "vm|kernel-precomp"
-    short_name: "a32"
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-beta"
+    category: "vm|app-kernel"
+    short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-beta"
-    category: "vm|kernel-precomp"
-    short_name: "a64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-beta"
+    category: "vm|kernel"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-beta"
-    category: "vm|kernel-precomp"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-beta"
+    category: "vm|kernel"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-beta"
-    category: "vm|kernel-precomp"
-    short_name: "o"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-beta"
+    category: "vm|kernel"
+    short_name: "rc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-beta"
     category: "vm|kernel-precomp"
-    short_name: "adx"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-beta"
     category: "vm|kernel-precomp"
-    short_name: "arx"
+    short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-beta"
     category: "vm|kernel-precomp"
-    short_name: "ma"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-beta"
     category: "vm|kernel-precomp"
-    short_name: "wr"
+    short_name: "o"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-beta"
@@ -2781,114 +2568,114 @@ consoles {
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-stable"
-    category: "vm|nnbd|aot"
-    short_name: "r"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm-stable"
+    category: "vm|nnbd|jit"
+    short_name: "ra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-stable"
-    category: "vm|app-kernel"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm64-stable"
+    category: "vm|nnbd|jit"
+    short_name: "ra6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-stable"
-    category: "vm|app-kernel"
-    short_name: "r64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-x64-stable"
+    category: "vm|nnbd|jit"
+    short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-canary-linux-debug-stable"
-    category: "vm|kernel"
-    short_name: "c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-arm64-stable"
+    category: "vm|nnbd|jit"
+    short_name: "m1r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-stable"
-    category: "vm|kernel"
-    short_name: "d"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-x64-stable"
+    category: "vm|nnbd|jit"
+    short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm-stable"
-    category: "vm|kernel"
-    short_name: "a32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64-stable"
+    category: "vm|nnbd|jit"
+    short_name: "wd"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-simarm64-stable"
-    category: "vm|kernel"
-    short_name: "a64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-x64-stable"
+    category: "vm|nnbd|jit"
+    short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-stable"
-    category: "vm|kernel"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-stable"
+    category: "vm|nnbd|aot"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-stable"
-    category: "vm|kernel"
-    short_name: "rc"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-stable"
+    category: "vm|nnbd|aot"
+    short_name: "da"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-debug-x64-stable"
-    category: "vm|kernel"
-    short_name: "md"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm_x64-stable"
+    category: "vm|nnbd|aot"
+    short_name: "ra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-mac-release-x64-stable"
-    category: "vm|kernel"
-    short_name: "mr"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64-stable"
+    category: "vm|nnbd|aot"
+    short_name: "ra6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64-stable"
-    category: "vm|kernel"
-    short_name: "wd"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64-stable"
+    category: "vm|nnbd|aot"
+    short_name: "ma6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-release-x64-stable"
-    category: "vm|kernel"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-release-x64-stable"
+    category: "vm|nnbd|aot"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "d"
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-stable"
+    category: "vm|app-kernel"
+    short_name: "d64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-stable"
-    category: "vm|kernel-precomp"
-    short_name: "a32"
+    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-stable"
+    category: "vm|app-kernel"
+    short_name: "r64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "a64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-stable"
+    category: "vm|kernel"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-stable"
-    category: "vm|kernel-precomp"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-stable"
+    category: "vm|kernel"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "o"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-stable"
+    category: "vm|kernel"
+    short_name: "rc"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-simarm_x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-stable"
     category: "vm|kernel-precomp"
-    short_name: "adx"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm_x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-stable"
     category: "vm|kernel-precomp"
-    short_name: "arx"
+    short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-release-simarm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-stable"
     category: "vm|kernel-precomp"
-    short_name: "ma"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-stable"
     category: "vm|kernel-precomp"
-    short_name: "wr"
+    short_name: "o"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-stable"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 1c7bf5ab0364..d04ce0018cb0 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -583,17 +583,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-canary-linux-debug"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -734,19 +723,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-debug-ia32"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -771,41 +747,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-release-ia32"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-release-simarm"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-release-simarm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -817,39 +758,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-mac-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-mac-release-arm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-mac-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -916,9 +824,7 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
@@ -929,9 +835,7 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
@@ -966,9 +870,7 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
@@ -990,9 +892,7 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
@@ -1003,9 +903,7 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
@@ -1029,9 +927,7 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
@@ -1074,17 +970,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-debug-simarm_x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1133,28 +1018,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-release-simarm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-release-simarm_x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1184,19 +1047,6 @@ notifiers {
     on_new_failure: true
     notify_blamelist {}
   }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-mac-release-simarm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
   builders {
     bucket: "ci.sandbox"
     name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
@@ -1232,9 +1082,7 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
@@ -1245,9 +1093,7 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
@@ -1280,9 +1126,7 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
@@ -1293,9 +1137,7 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
@@ -1340,17 +1182,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-win-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1364,17 +1195,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-win-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1388,30 +1208,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-win-release-ia32"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-win-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 2abd343d5321..45f6cad22f92 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1414,36 +1414,6 @@ job {
     builder: "vm-asan-linux-release-x64"
   }
 }
-job {
-  id: "vm-canary-linux-debug"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-canary-linux-debug"
-  }
-}
-job {
-  id: "vm-canary-linux-debug-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-canary-linux-debug-beta"
-  }
-}
-job {
-  id: "vm-canary-linux-debug-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-canary-linux-debug-dev"
-  }
-}
 job {
   id: "vm-canary-linux-debug-experimental"
   realm: "ci.sandbox"
@@ -1454,16 +1424,6 @@ job {
     builder: "vm-canary-linux-debug-experimental"
   }
 }
-job {
-  id: "vm-canary-linux-debug-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-canary-linux-debug-stable"
-  }
-}
 job {
   id: "vm-eager-optimization-linux-release-ia32"
   realm: "ci.sandbox"
@@ -1784,16 +1744,6 @@ job {
     builder: "vm-kernel-gcc-linux"
   }
 }
-job {
-  id: "vm-kernel-linux-debug-ia32"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-debug-ia32"
-  }
-}
 job {
   id: "vm-kernel-linux-debug-x64"
   realm: "ci.sandbox"
@@ -1845,423 +1795,413 @@ job {
   }
 }
 job {
-  id: "vm-kernel-linux-release-ia32"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-release-ia32"
-  }
-}
-job {
-  id: "vm-kernel-linux-release-simarm"
+  id: "vm-kernel-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm"
+    builder: "vm-kernel-linux-release-x64"
   }
 }
 job {
-  id: "vm-kernel-linux-release-simarm-beta"
+  id: "vm-kernel-linux-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm-beta"
+    builder: "vm-kernel-linux-release-x64-beta"
   }
 }
 job {
-  id: "vm-kernel-linux-release-simarm-dev"
+  id: "vm-kernel-linux-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm-dev"
+    builder: "vm-kernel-linux-release-x64-dev"
   }
 }
 job {
-  id: "vm-kernel-linux-release-simarm-stable"
+  id: "vm-kernel-linux-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm-stable"
+    builder: "vm-kernel-linux-release-x64-stable"
   }
 }
 job {
-  id: "vm-kernel-linux-release-simarm64"
+  id: "vm-kernel-msvc-windows"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm64"
+    builder: "vm-kernel-msvc-windows"
   }
 }
 job {
-  id: "vm-kernel-linux-release-simarm64-beta"
+  id: "vm-kernel-nnbd-linux-debug-ia32"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm64-beta"
+    builder: "vm-kernel-nnbd-linux-debug-ia32"
   }
 }
 job {
-  id: "vm-kernel-linux-release-simarm64-dev"
+  id: "vm-kernel-nnbd-linux-debug-simriscv64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm64-dev"
+    builder: "vm-kernel-nnbd-linux-debug-simriscv64"
   }
 }
 job {
-  id: "vm-kernel-linux-release-simarm64-stable"
+  id: "vm-kernel-nnbd-linux-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-release-simarm64-stable"
+    builder: "vm-kernel-nnbd-linux-debug-x64"
   }
 }
 job {
-  id: "vm-kernel-linux-release-x64"
+  id: "vm-kernel-nnbd-linux-debug-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-release-x64"
+    builder: "vm-kernel-nnbd-linux-debug-x64-beta"
   }
 }
 job {
-  id: "vm-kernel-linux-release-x64-beta"
+  id: "vm-kernel-nnbd-linux-debug-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-release-x64-beta"
+    builder: "vm-kernel-nnbd-linux-debug-x64-dev"
   }
 }
 job {
-  id: "vm-kernel-linux-release-x64-dev"
+  id: "vm-kernel-nnbd-linux-debug-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-release-x64-dev"
+    builder: "vm-kernel-nnbd-linux-debug-x64-stable"
   }
 }
 job {
-  id: "vm-kernel-linux-release-x64-stable"
+  id: "vm-kernel-nnbd-linux-release-ia32"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-release-x64-stable"
+    builder: "vm-kernel-nnbd-linux-release-ia32"
   }
 }
 job {
-  id: "vm-kernel-mac-debug-x64"
+  id: "vm-kernel-nnbd-linux-release-simarm"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-mac-debug-x64"
+    builder: "vm-kernel-nnbd-linux-release-simarm"
   }
 }
 job {
-  id: "vm-kernel-mac-debug-x64-beta"
+  id: "vm-kernel-nnbd-linux-release-simarm-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-mac-debug-x64-beta"
+    builder: "vm-kernel-nnbd-linux-release-simarm-beta"
   }
 }
 job {
-  id: "vm-kernel-mac-debug-x64-dev"
+  id: "vm-kernel-nnbd-linux-release-simarm-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-mac-debug-x64-dev"
+    builder: "vm-kernel-nnbd-linux-release-simarm-dev"
   }
 }
 job {
-  id: "vm-kernel-mac-debug-x64-stable"
+  id: "vm-kernel-nnbd-linux-release-simarm-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-mac-debug-x64-stable"
+    builder: "vm-kernel-nnbd-linux-release-simarm-stable"
   }
 }
 job {
-  id: "vm-kernel-mac-release-arm64"
+  id: "vm-kernel-nnbd-linux-release-simarm64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-mac-release-arm64"
+    builder: "vm-kernel-nnbd-linux-release-simarm64"
   }
 }
 job {
-  id: "vm-kernel-mac-release-arm64-dev"
+  id: "vm-kernel-nnbd-linux-release-simarm64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-mac-release-arm64-dev"
+    builder: "vm-kernel-nnbd-linux-release-simarm64-beta"
   }
 }
 job {
-  id: "vm-kernel-mac-release-x64"
+  id: "vm-kernel-nnbd-linux-release-simarm64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-mac-release-x64"
+    builder: "vm-kernel-nnbd-linux-release-simarm64-dev"
   }
 }
 job {
-  id: "vm-kernel-mac-release-x64-beta"
+  id: "vm-kernel-nnbd-linux-release-simarm64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-mac-release-x64-beta"
+    builder: "vm-kernel-nnbd-linux-release-simarm64-stable"
   }
 }
 job {
-  id: "vm-kernel-mac-release-x64-dev"
+  id: "vm-kernel-nnbd-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-mac-release-x64-dev"
+    builder: "vm-kernel-nnbd-linux-release-x64"
   }
 }
 job {
-  id: "vm-kernel-mac-release-x64-stable"
+  id: "vm-kernel-nnbd-linux-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-mac-release-x64-stable"
+    builder: "vm-kernel-nnbd-linux-release-x64-beta"
   }
 }
 job {
-  id: "vm-kernel-msvc-windows"
+  id: "vm-kernel-nnbd-linux-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-msvc-windows"
+    builder: "vm-kernel-nnbd-linux-release-x64-dev"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-debug-ia32"
+  id: "vm-kernel-nnbd-linux-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-debug-ia32"
+    builder: "vm-kernel-nnbd-linux-release-x64-stable"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-debug-simriscv64"
+  id: "vm-kernel-nnbd-mac-debug-arm64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-debug-simriscv64"
+    builder: "vm-kernel-nnbd-mac-debug-arm64"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-debug-x64"
+  id: "vm-kernel-nnbd-mac-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-debug-x64"
+    builder: "vm-kernel-nnbd-mac-debug-x64"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-debug-x64-beta"
+  id: "vm-kernel-nnbd-mac-debug-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-debug-x64-beta"
+    builder: "vm-kernel-nnbd-mac-debug-x64-beta"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-debug-x64-dev"
+  id: "vm-kernel-nnbd-mac-debug-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-debug-x64-dev"
+    builder: "vm-kernel-nnbd-mac-debug-x64-dev"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-debug-x64-stable"
+  id: "vm-kernel-nnbd-mac-debug-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-debug-x64-stable"
+    builder: "vm-kernel-nnbd-mac-debug-x64-stable"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-release-ia32"
+  id: "vm-kernel-nnbd-mac-release-arm64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-release-ia32"
+    builder: "vm-kernel-nnbd-mac-release-arm64"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-release-simarm"
+  id: "vm-kernel-nnbd-mac-release-arm64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-release-simarm"
+    builder: "vm-kernel-nnbd-mac-release-arm64-beta"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-release-simarm64"
+  id: "vm-kernel-nnbd-mac-release-arm64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-release-simarm64"
+    builder: "vm-kernel-nnbd-mac-release-arm64-dev"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-release-x64"
+  id: "vm-kernel-nnbd-mac-release-arm64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-release-x64"
+    builder: "vm-kernel-nnbd-mac-release-arm64-stable"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-release-x64-beta"
+  id: "vm-kernel-nnbd-mac-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-release-x64-beta"
+    builder: "vm-kernel-nnbd-mac-release-x64"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-release-x64-dev"
+  id: "vm-kernel-nnbd-mac-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-release-x64-dev"
+    builder: "vm-kernel-nnbd-mac-release-x64-beta"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-release-x64-stable"
+  id: "vm-kernel-nnbd-mac-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-release-x64-stable"
+    builder: "vm-kernel-nnbd-mac-release-x64-dev"
   }
 }
 job {
-  id: "vm-kernel-nnbd-mac-debug-arm64"
+  id: "vm-kernel-nnbd-mac-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-mac-debug-arm64"
+    builder: "vm-kernel-nnbd-mac-release-x64-stable"
   }
 }
 job {
-  id: "vm-kernel-nnbd-mac-debug-x64"
+  id: "vm-kernel-nnbd-win-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-mac-debug-x64"
+    builder: "vm-kernel-nnbd-win-debug-x64"
   }
 }
 job {
-  id: "vm-kernel-nnbd-mac-release-arm64"
+  id: "vm-kernel-nnbd-win-debug-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-mac-release-arm64"
+    builder: "vm-kernel-nnbd-win-debug-x64-beta"
   }
 }
 job {
-  id: "vm-kernel-nnbd-mac-release-x64"
+  id: "vm-kernel-nnbd-win-debug-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-mac-release-x64"
+    builder: "vm-kernel-nnbd-win-debug-x64-dev"
   }
 }
 job {
-  id: "vm-kernel-nnbd-win-debug-x64"
+  id: "vm-kernel-nnbd-win-debug-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-win-debug-x64"
+    builder: "vm-kernel-nnbd-win-debug-x64-stable"
   }
 }
 job {
@@ -2285,133 +2225,123 @@ job {
   }
 }
 job {
-  id: "vm-kernel-precomp-android-release-arm64c"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm64c"
-  }
-}
-job {
-  id: "vm-kernel-precomp-android-release-arm64c-beta"
+  id: "vm-kernel-nnbd-win-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm64c-beta"
+    builder: "vm-kernel-nnbd-win-release-x64-beta"
   }
 }
 job {
-  id: "vm-kernel-precomp-android-release-arm64c-dev"
+  id: "vm-kernel-nnbd-win-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm64c-dev"
+    builder: "vm-kernel-nnbd-win-release-x64-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-android-release-arm64c-stable"
+  id: "vm-kernel-nnbd-win-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm64c-stable"
+    builder: "vm-kernel-nnbd-win-release-x64-stable"
   }
 }
 job {
-  id: "vm-kernel-precomp-android-release-arm_x64"
+  id: "vm-kernel-precomp-android-release-arm64c"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm_x64"
+    builder: "vm-kernel-precomp-android-release-arm64c"
   }
 }
 job {
-  id: "vm-kernel-precomp-android-release-arm_x64-beta"
+  id: "vm-kernel-precomp-android-release-arm64c-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm_x64-beta"
+    builder: "vm-kernel-precomp-android-release-arm64c-beta"
   }
 }
 job {
-  id: "vm-kernel-precomp-android-release-arm_x64-dev"
+  id: "vm-kernel-precomp-android-release-arm64c-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm_x64-dev"
+    builder: "vm-kernel-precomp-android-release-arm64c-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-android-release-arm_x64-stable"
+  id: "vm-kernel-precomp-android-release-arm64c-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm_x64-stable"
+    builder: "vm-kernel-precomp-android-release-arm64c-stable"
   }
 }
 job {
-  id: "vm-kernel-precomp-dwarf-linux-product-x64"
+  id: "vm-kernel-precomp-android-release-arm_x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-dwarf-linux-product-x64"
+    builder: "vm-kernel-precomp-android-release-arm_x64"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-debug-simarm_x64"
+  id: "vm-kernel-precomp-android-release-arm_x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-simarm_x64"
+    builder: "vm-kernel-precomp-android-release-arm_x64-beta"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
+  id: "vm-kernel-precomp-android-release-arm_x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
+    builder: "vm-kernel-precomp-android-release-arm_x64-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
+  id: "vm-kernel-precomp-android-release-arm_x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
+    builder: "vm-kernel-precomp-android-release-arm_x64-stable"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
+  id: "vm-kernel-precomp-dwarf-linux-product-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
+    builder: "vm-kernel-precomp-dwarf-linux-product-x64"
   }
 }
 job {
@@ -2514,86 +2444,6 @@ job {
     builder: "vm-kernel-precomp-linux-release-simarm-stable"
   }
 }
-job {
-  id: "vm-kernel-precomp-linux-release-simarm64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-simarm64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm64-beta"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-simarm64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm64-dev"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-simarm64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm64-stable"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-simarm_x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm_x64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-simarm_x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm_x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-simarm_x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm_x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-simarm_x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm_x64-stable"
-  }
-}
 job {
   id: "vm-kernel-precomp-linux-release-x64"
   realm: "ci.sandbox"
@@ -2645,53 +2495,43 @@ job {
   }
 }
 job {
-  id: "vm-kernel-precomp-mac-release-simarm64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-mac-release-simarm64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-mac-release-simarm64-beta"
+  id: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-mac-release-simarm64-beta"
+    builder: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
   }
 }
 job {
-  id: "vm-kernel-precomp-mac-release-simarm64-dev"
+  id: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-mac-release-simarm64-dev"
+    builder: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-beta"
   }
 }
 job {
-  id: "vm-kernel-precomp-mac-release-simarm64-stable"
+  id: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-mac-release-simarm64-stable"
+    builder: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+  id: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+    builder: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-stable"
   }
 }
 job {
@@ -2725,293 +2565,283 @@ job {
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-nnbd-linux-release-x64"
+  id: "vm-kernel-precomp-nnbd-linux-release-simarm64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-x64"
+    builder: "vm-kernel-precomp-nnbd-linux-release-simarm64-beta"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
+  id: "vm-kernel-precomp-nnbd-linux-release-simarm64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
+    builder: "vm-kernel-precomp-nnbd-linux-release-simarm64-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
+  id: "vm-kernel-precomp-nnbd-linux-release-simarm64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
+    builder: "vm-kernel-precomp-nnbd-linux-release-simarm64-stable"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
+  id: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
+    builder: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-mac-release-arm64"
+  id: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-mac-release-arm64"
+    builder: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-beta"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-mac-release-simarm64"
+  id: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-mac-release-simarm64"
+    builder: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-win-release-x64"
+  id: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-win-release-x64"
+    builder: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-stable"
   }
 }
 job {
-  id: "vm-kernel-precomp-obfuscate-linux-release-x64"
+  id: "vm-kernel-precomp-nnbd-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-obfuscate-linux-release-x64"
+    builder: "vm-kernel-precomp-nnbd-linux-release-x64"
   }
 }
 job {
-  id: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+  id: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+    builder: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
   }
 }
 job {
-  id: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+  id: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+    builder: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+  id: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+    builder: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
   }
 }
 job {
-  id: "vm-kernel-precomp-win-debug-x64c"
+  id: "vm-kernel-precomp-nnbd-mac-release-arm64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-win-debug-x64c"
+    builder: "vm-kernel-precomp-nnbd-mac-release-arm64"
   }
 }
 job {
-  id: "vm-kernel-precomp-win-product-x64"
+  id: "vm-kernel-precomp-nnbd-mac-release-simarm64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-win-product-x64"
+    builder: "vm-kernel-precomp-nnbd-mac-release-simarm64"
   }
 }
 job {
-  id: "vm-kernel-precomp-win-release-x64"
+  id: "vm-kernel-precomp-nnbd-mac-release-simarm64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-x64"
+    builder: "vm-kernel-precomp-nnbd-mac-release-simarm64-beta"
   }
 }
 job {
-  id: "vm-kernel-precomp-win-release-x64-beta"
+  id: "vm-kernel-precomp-nnbd-mac-release-simarm64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-x64-beta"
+    builder: "vm-kernel-precomp-nnbd-mac-release-simarm64-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-win-release-x64-dev"
+  id: "vm-kernel-precomp-nnbd-mac-release-simarm64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-x64-dev"
+    builder: "vm-kernel-precomp-nnbd-mac-release-simarm64-stable"
   }
 }
 job {
-  id: "vm-kernel-precomp-win-release-x64-stable"
+  id: "vm-kernel-precomp-nnbd-win-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-win-release-x64-stable"
+    builder: "vm-kernel-precomp-nnbd-win-release-x64"
   }
 }
 job {
-  id: "vm-kernel-win-debug-ia32"
+  id: "vm-kernel-precomp-nnbd-win-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-win-debug-ia32"
+    builder: "vm-kernel-precomp-nnbd-win-release-x64-beta"
   }
 }
 job {
-  id: "vm-kernel-win-debug-x64"
+  id: "vm-kernel-precomp-nnbd-win-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-win-debug-x64"
+    builder: "vm-kernel-precomp-nnbd-win-release-x64-dev"
   }
 }
 job {
-  id: "vm-kernel-win-debug-x64-beta"
+  id: "vm-kernel-precomp-nnbd-win-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-win-debug-x64-beta"
+    builder: "vm-kernel-precomp-nnbd-win-release-x64-stable"
   }
 }
 job {
-  id: "vm-kernel-win-debug-x64-dev"
+  id: "vm-kernel-precomp-obfuscate-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-win-debug-x64-dev"
+    builder: "vm-kernel-precomp-obfuscate-linux-release-x64"
   }
 }
 job {
-  id: "vm-kernel-win-debug-x64-stable"
+  id: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-win-debug-x64-stable"
+    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
   }
 }
 job {
-  id: "vm-kernel-win-debug-x64c"
+  id: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-win-debug-x64c"
+    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
   }
 }
 job {
-  id: "vm-kernel-win-release-ia32"
+  id: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-win-release-ia32"
+    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
   }
 }
 job {
-  id: "vm-kernel-win-release-x64"
+  id: "vm-kernel-precomp-win-debug-x64c"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-win-release-x64"
+    builder: "vm-kernel-precomp-win-debug-x64c"
   }
 }
 job {
-  id: "vm-kernel-win-release-x64-beta"
+  id: "vm-kernel-precomp-win-product-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-win-release-x64-beta"
+    builder: "vm-kernel-precomp-win-product-x64"
   }
 }
 job {
-  id: "vm-kernel-win-release-x64-dev"
+  id: "vm-kernel-win-debug-ia32"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-win-release-x64-dev"
+    builder: "vm-kernel-win-debug-ia32"
   }
 }
 job {
-  id: "vm-kernel-win-release-x64-stable"
+  id: "vm-kernel-win-debug-x64c"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-win-release-x64-stable"
+    builder: "vm-kernel-win-debug-x64c"
   }
 }
 job {
@@ -3216,7 +3046,6 @@ trigger {
   triggers: "pkg-linux-release-beta"
   triggers: "pkg-mac-release-beta"
   triggers: "pkg-win-release-beta"
-  triggers: "vm-canary-linux-debug-beta"
   triggers: "vm-ffi-android-debug-arm-beta"
   triggers: "vm-ffi-android-debug-arm64c-beta"
   triggers: "vm-ffi-android-product-arm-beta"
@@ -3225,27 +3054,28 @@ trigger {
   triggers: "vm-ffi-android-release-arm64c-beta"
   triggers: "vm-kernel-checked-linux-release-x64-beta"
   triggers: "vm-kernel-linux-debug-x64-beta"
-  triggers: "vm-kernel-linux-release-simarm-beta"
-  triggers: "vm-kernel-linux-release-simarm64-beta"
   triggers: "vm-kernel-linux-release-x64-beta"
-  triggers: "vm-kernel-mac-debug-x64-beta"
-  triggers: "vm-kernel-mac-release-x64-beta"
   triggers: "vm-kernel-nnbd-linux-debug-x64-beta"
+  triggers: "vm-kernel-nnbd-linux-release-simarm-beta"
+  triggers: "vm-kernel-nnbd-linux-release-simarm64-beta"
   triggers: "vm-kernel-nnbd-linux-release-x64-beta"
+  triggers: "vm-kernel-nnbd-mac-debug-x64-beta"
+  triggers: "vm-kernel-nnbd-mac-release-arm64-beta"
+  triggers: "vm-kernel-nnbd-mac-release-x64-beta"
+  triggers: "vm-kernel-nnbd-win-debug-x64-beta"
+  triggers: "vm-kernel-nnbd-win-release-x64-beta"
   triggers: "vm-kernel-precomp-android-release-arm64c-beta"
   triggers: "vm-kernel-precomp-android-release-arm_x64-beta"
-  triggers: "vm-kernel-precomp-linux-debug-simarm_x64-beta"
   triggers: "vm-kernel-precomp-linux-debug-x64-beta"
   triggers: "vm-kernel-precomp-linux-release-simarm-beta"
-  triggers: "vm-kernel-precomp-linux-release-simarm64-beta"
-  triggers: "vm-kernel-precomp-linux-release-simarm_x64-beta"
   triggers: "vm-kernel-precomp-linux-release-x64-beta"
-  triggers: "vm-kernel-precomp-mac-release-simarm64-beta"
+  triggers: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-beta"
+  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm64-beta"
+  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-beta"
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
+  triggers: "vm-kernel-precomp-nnbd-mac-release-simarm64-beta"
+  triggers: "vm-kernel-precomp-nnbd-win-release-x64-beta"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
-  triggers: "vm-kernel-precomp-win-release-x64-beta"
-  triggers: "vm-kernel-win-debug-x64-beta"
-  triggers: "vm-kernel-win-release-x64-beta"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm-beta"
   triggers: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
   gitiles {
@@ -3285,7 +3115,6 @@ trigger {
   triggers: "pkg-linux-release-dev"
   triggers: "pkg-mac-release-dev"
   triggers: "pkg-win-release-dev"
-  triggers: "vm-canary-linux-debug-dev"
   triggers: "vm-ffi-android-debug-arm-dev"
   triggers: "vm-ffi-android-debug-arm64c-dev"
   triggers: "vm-ffi-android-product-arm-dev"
@@ -3294,28 +3123,28 @@ trigger {
   triggers: "vm-ffi-android-release-arm64c-dev"
   triggers: "vm-kernel-checked-linux-release-x64-dev"
   triggers: "vm-kernel-linux-debug-x64-dev"
-  triggers: "vm-kernel-linux-release-simarm-dev"
-  triggers: "vm-kernel-linux-release-simarm64-dev"
   triggers: "vm-kernel-linux-release-x64-dev"
-  triggers: "vm-kernel-mac-debug-x64-dev"
-  triggers: "vm-kernel-mac-release-arm64-dev"
-  triggers: "vm-kernel-mac-release-x64-dev"
   triggers: "vm-kernel-nnbd-linux-debug-x64-dev"
+  triggers: "vm-kernel-nnbd-linux-release-simarm-dev"
+  triggers: "vm-kernel-nnbd-linux-release-simarm64-dev"
   triggers: "vm-kernel-nnbd-linux-release-x64-dev"
+  triggers: "vm-kernel-nnbd-mac-debug-x64-dev"
+  triggers: "vm-kernel-nnbd-mac-release-arm64-dev"
+  triggers: "vm-kernel-nnbd-mac-release-x64-dev"
+  triggers: "vm-kernel-nnbd-win-debug-x64-dev"
+  triggers: "vm-kernel-nnbd-win-release-x64-dev"
   triggers: "vm-kernel-precomp-android-release-arm64c-dev"
   triggers: "vm-kernel-precomp-android-release-arm_x64-dev"
-  triggers: "vm-kernel-precomp-linux-debug-simarm_x64-dev"
   triggers: "vm-kernel-precomp-linux-debug-x64-dev"
   triggers: "vm-kernel-precomp-linux-release-simarm-dev"
-  triggers: "vm-kernel-precomp-linux-release-simarm64-dev"
-  triggers: "vm-kernel-precomp-linux-release-simarm_x64-dev"
   triggers: "vm-kernel-precomp-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-mac-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-dev"
+  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-dev"
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
+  triggers: "vm-kernel-precomp-nnbd-mac-release-simarm64-dev"
+  triggers: "vm-kernel-precomp-nnbd-win-release-x64-dev"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-win-release-x64-dev"
-  triggers: "vm-kernel-win-debug-x64-dev"
-  triggers: "vm-kernel-win-release-x64-dev"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm-dev"
   triggers: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
   gitiles {
@@ -3379,11 +3208,11 @@ trigger {
   triggers: "pkg-win-release"
   triggers: "vm-kernel-linux-debug-x64"
   triggers: "vm-kernel-linux-release-x64"
-  triggers: "vm-kernel-mac-debug-x64"
-  triggers: "vm-kernel-mac-release-arm64"
-  triggers: "vm-kernel-mac-release-x64"
-  triggers: "vm-kernel-win-debug-x64"
-  triggers: "vm-kernel-win-release-x64"
+  triggers: "vm-kernel-nnbd-mac-debug-x64"
+  triggers: "vm-kernel-nnbd-mac-release-arm64"
+  triggers: "vm-kernel-nnbd-mac-release-x64"
+  triggers: "vm-kernel-nnbd-win-debug-x64"
+  triggers: "vm-kernel-nnbd-win-release-x64"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/main"
@@ -3430,7 +3259,6 @@ trigger {
   triggers: "pkg-linux-release-stable"
   triggers: "pkg-mac-release-stable"
   triggers: "pkg-win-release-stable"
-  triggers: "vm-canary-linux-debug-stable"
   triggers: "vm-ffi-android-debug-arm-stable"
   triggers: "vm-ffi-android-debug-arm64c-stable"
   triggers: "vm-ffi-android-product-arm-stable"
@@ -3439,27 +3267,28 @@ trigger {
   triggers: "vm-ffi-android-release-arm64c-stable"
   triggers: "vm-kernel-checked-linux-release-x64-stable"
   triggers: "vm-kernel-linux-debug-x64-stable"
-  triggers: "vm-kernel-linux-release-simarm-stable"
-  triggers: "vm-kernel-linux-release-simarm64-stable"
   triggers: "vm-kernel-linux-release-x64-stable"
-  triggers: "vm-kernel-mac-debug-x64-stable"
-  triggers: "vm-kernel-mac-release-x64-stable"
   triggers: "vm-kernel-nnbd-linux-debug-x64-stable"
+  triggers: "vm-kernel-nnbd-linux-release-simarm-stable"
+  triggers: "vm-kernel-nnbd-linux-release-simarm64-stable"
   triggers: "vm-kernel-nnbd-linux-release-x64-stable"
+  triggers: "vm-kernel-nnbd-mac-debug-x64-stable"
+  triggers: "vm-kernel-nnbd-mac-release-arm64-stable"
+  triggers: "vm-kernel-nnbd-mac-release-x64-stable"
+  triggers: "vm-kernel-nnbd-win-debug-x64-stable"
+  triggers: "vm-kernel-nnbd-win-release-x64-stable"
   triggers: "vm-kernel-precomp-android-release-arm64c-stable"
   triggers: "vm-kernel-precomp-android-release-arm_x64-stable"
-  triggers: "vm-kernel-precomp-linux-debug-simarm_x64-stable"
   triggers: "vm-kernel-precomp-linux-debug-x64-stable"
   triggers: "vm-kernel-precomp-linux-release-simarm-stable"
-  triggers: "vm-kernel-precomp-linux-release-simarm64-stable"
-  triggers: "vm-kernel-precomp-linux-release-simarm_x64-stable"
   triggers: "vm-kernel-precomp-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-mac-release-simarm64-stable"
+  triggers: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-stable"
+  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm64-stable"
+  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-stable"
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
+  triggers: "vm-kernel-precomp-nnbd-mac-release-simarm64-stable"
+  triggers: "vm-kernel-precomp-nnbd-win-release-x64-stable"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-win-release-x64-stable"
-  triggers: "vm-kernel-win-debug-x64-stable"
-  triggers: "vm-kernel-win-release-x64-stable"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm-stable"
   triggers: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
   gitiles {
@@ -3484,37 +3313,23 @@ trigger {
   triggers: "vm-canary-linux-debug-experimental"
   triggers: "vm-eager-optimization-linux-release-ia32"
   triggers: "vm-kernel-gcc-linux"
-  triggers: "vm-kernel-linux-debug-ia32"
   triggers: "vm-kernel-linux-debug-x64c"
-  triggers: "vm-kernel-linux-release-ia32"
   triggers: "vm-kernel-msvc-windows"
   triggers: "vm-kernel-nnbd-linux-debug-ia32"
   triggers: "vm-kernel-nnbd-linux-debug-simriscv64"
   triggers: "vm-kernel-nnbd-linux-release-ia32"
-  triggers: "vm-kernel-nnbd-linux-release-simarm"
-  triggers: "vm-kernel-nnbd-linux-release-simarm64"
   triggers: "vm-kernel-nnbd-mac-debug-arm64"
-  triggers: "vm-kernel-nnbd-mac-debug-x64"
-  triggers: "vm-kernel-nnbd-mac-release-x64"
-  triggers: "vm-kernel-nnbd-win-debug-x64"
   triggers: "vm-kernel-nnbd-win-release-ia32"
-  triggers: "vm-kernel-nnbd-win-release-x64"
   triggers: "vm-kernel-precomp-dwarf-linux-product-x64"
   triggers: "vm-kernel-precomp-linux-debug-x64c"
   triggers: "vm-kernel-precomp-linux-product-x64"
   triggers: "vm-kernel-precomp-mac-product-x64"
-  triggers: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
   triggers: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
   triggers: "vm-kernel-precomp-nnbd-linux-debug-x64"
-  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm64"
-  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
-  triggers: "vm-kernel-precomp-nnbd-mac-release-simarm64"
-  triggers: "vm-kernel-precomp-nnbd-win-release-x64"
   triggers: "vm-kernel-precomp-win-debug-x64c"
   triggers: "vm-kernel-precomp-win-product-x64"
   triggers: "vm-kernel-win-debug-ia32"
   triggers: "vm-kernel-win-debug-x64c"
-  triggers: "vm-kernel-win-release-ia32"
   triggers: "vm-msan-linux-release-x64"
   triggers: "vm-nnbd-linux-release-x64"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
@@ -3535,7 +3350,6 @@ trigger {
   triggers: "app-kernel-linux-release-x64"
   triggers: "cross-vm-linux-release-arm64"
   triggers: "iso-stress-linux"
-  triggers: "vm-canary-linux-debug"
   triggers: "vm-eager-optimization-linux-release-x64"
   triggers: "vm-ffi-android-debug-arm"
   triggers: "vm-ffi-android-debug-arm64c"
@@ -3545,24 +3359,23 @@ trigger {
   triggers: "vm-ffi-android-release-arm64c"
   triggers: "vm-fuchsia-release-x64"
   triggers: "vm-kernel-checked-linux-release-x64"
-  triggers: "vm-kernel-linux-release-simarm"
-  triggers: "vm-kernel-linux-release-simarm64"
   triggers: "vm-kernel-nnbd-linux-debug-x64"
+  triggers: "vm-kernel-nnbd-linux-release-simarm"
+  triggers: "vm-kernel-nnbd-linux-release-simarm64"
   triggers: "vm-kernel-nnbd-linux-release-x64"
-  triggers: "vm-kernel-nnbd-mac-release-arm64"
   triggers: "vm-kernel-precomp-android-release-arm64c"
   triggers: "vm-kernel-precomp-android-release-arm_x64"
-  triggers: "vm-kernel-precomp-linux-debug-simarm_x64"
   triggers: "vm-kernel-precomp-linux-debug-x64"
   triggers: "vm-kernel-precomp-linux-release-simarm"
-  triggers: "vm-kernel-precomp-linux-release-simarm64"
-  triggers: "vm-kernel-precomp-linux-release-simarm_x64"
   triggers: "vm-kernel-precomp-linux-release-x64"
-  triggers: "vm-kernel-precomp-mac-release-simarm64"
+  triggers: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm64"
+  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
   triggers: "vm-kernel-precomp-nnbd-linux-release-x64"
   triggers: "vm-kernel-precomp-nnbd-mac-release-arm64"
+  triggers: "vm-kernel-precomp-nnbd-mac-release-simarm64"
+  triggers: "vm-kernel-precomp-nnbd-win-release-x64"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64"
-  triggers: "vm-kernel-precomp-win-release-x64"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm"
   triggers: "vm-precomp-ffi-qemu-linux-release-riscv64"
   gitiles {
diff --git a/vm.star b/vm.star
index b5b05b5d420b..be1be3332fcc 100644
--- a/vm.star
+++ b/vm.star
@@ -104,15 +104,13 @@ _nightly_builder(
     category = "vm|nnbd|jit|r3",
     channels = ["try"],
 )
-_nightly_builder(
+_extra_builder(
     "vm-kernel-nnbd-linux-release-simarm",
     category = "vm|nnbd|jit|ra",
-    channels = ["try"],
 )
-_nightly_builder(
+_extra_builder(
     "vm-kernel-nnbd-linux-release-simarm64",
     category = "vm|nnbd|jit|ra6",
-    channels = ["try"],
 )
 _nightly_builder(
     "vm-kernel-nnbd-mac-debug-arm64",
@@ -121,24 +119,21 @@ _nightly_builder(
     dimensions = [mac, arm64],
     properties = [no_android, pinned_xcode, slow_shards],
 )
-_nightly_builder(
+_builder(
     "vm-kernel-nnbd-mac-debug-x64",
     category = "vm|nnbd|jit|md",
-    channels = ["try"],
     dimensions = mac,
     properties = [pinned_xcode, slow_shards],
 )
-_extra_builder(
+_builder(
     "vm-kernel-nnbd-mac-release-arm64",
     category = "vm|nnbd|jit|m1r",
-    channels = ["try"],
     dimensions = [mac, arm64],
     properties = [no_android, pinned_xcode],
 )
-_nightly_builder(
+_builder(
     "vm-kernel-nnbd-mac-release-x64",
     category = "vm|nnbd|jit|mr",
-    channels = ["try"],
     dimensions = mac,
     properties = pinned_xcode,
 )
@@ -148,17 +143,15 @@ _nightly_builder(
     channels = ["try"],
     dimensions = windows,
 )
-_nightly_builder(
+_builder(
     "vm-kernel-nnbd-win-debug-x64",
     category = "vm|nnbd|jit|wd",
-    channels = ["try"],
     properties = slow_shards,
     dimensions = windows,
 )
-_nightly_builder(
+_builder(
     "vm-kernel-nnbd-win-release-x64",
     category = "vm|nnbd|jit|wr",
-    channels = ["try"],
     dimensions = windows,
 )
 
@@ -167,15 +160,13 @@ _extra_builder(
     "vm-kernel-precomp-nnbd-linux-release-x64",
     category = "vm|nnbd|aot|r",
 )
-_nightly_builder(
+_extra_builder(
     "vm-kernel-precomp-nnbd-linux-debug-simarm_x64",
     category = "vm|nnbd|aot|da",
-    channels = ["try"],
 )
-_nightly_builder(
+_extra_builder(
     "vm-kernel-precomp-nnbd-linux-release-simarm_x64",
     category = "vm|nnbd|aot|ra",
-    channels = ["try"],
 )
 _nightly_builder(
     "vm-kernel-precomp-nnbd-linux-debug-x64",
@@ -183,10 +174,9 @@ _nightly_builder(
     channels = ["try"],
     properties = slow_shards,
 )
-_nightly_builder(
+_extra_builder(
     "vm-kernel-precomp-nnbd-linux-release-simarm64",
     category = "vm|nnbd|aot|ra6",
-    channels = ["try"],
 )
 _extra_builder(
     "vm-kernel-precomp-nnbd-mac-release-arm64",
@@ -195,17 +185,15 @@ _extra_builder(
     dimensions = [mac, arm64],
     properties = [no_android, pinned_xcode, slow_shards],
 )
-_nightly_builder(
+_extra_builder(
     "vm-kernel-precomp-nnbd-mac-release-simarm64",
     category = "vm|nnbd|aot|ma6",
-    channels = ["try"],
     dimensions = mac,
     properties = [pinned_xcode, slow_shards],
 )
-_nightly_builder(
+_extra_builder(
     "vm-kernel-precomp-nnbd-win-release-x64",
     category = "vm|nnbd|aot|wr",
-    channels = ["try"],
     dimensions = windows,
 )
 
@@ -226,25 +214,7 @@ _extra_builder(
 )
 
 #vm|kernel
-_extra_builder(
-    "vm-canary-linux-debug",
-    category = "vm|kernel|c",
-    on_cq = True,
-)
 _builder("vm-kernel-linux-debug-x64", category = "vm|kernel|d")
-_extra_builder(
-    "vm-kernel-linux-release-simarm",
-    category = "vm|kernel|a32",
-)
-_extra_builder(
-    "vm-kernel-linux-release-simarm64",
-    category = "vm|kernel|a64",
-)
-_nightly_builder(
-    "vm-kernel-linux-release-ia32",
-    category = "vm|kernel|r32",
-    channels = ["try"],
-)
 _builder(
     "vm-kernel-linux-release-x64",
     category = "vm|kernel|r",
@@ -255,32 +225,6 @@ _extra_builder(
     category = "vm|kernel|rc",
     experiments = {"dart.use_update_script": 100},
 )
-_nightly_builder(
-    "vm-kernel-linux-debug-ia32",
-    category = "vm|kernel|d32",
-    channels = ["try"],
-)
-_builder(
-    "vm-kernel-mac-debug-x64",
-    category = "vm|kernel|md",
-    dimensions = mac,
-    properties = pinned_xcode,
-)
-_builder(
-    "vm-kernel-mac-release-x64",
-    category = "vm|kernel|mr",
-    dimensions = mac,
-    on_cq = True,
-    experiment_percentage = 5,
-    properties = pinned_xcode,
-)
-_builder(
-    "vm-kernel-mac-release-arm64",
-    category = "vm|kernel|m1r",
-    channels = ["try", "dev"],
-    dimensions = [mac, arm64],
-    properties = [no_android, pinned_xcode],
-)
 _nightly_builder(
     "vm-kernel-win-debug-ia32",
     category = "vm|kernel|wd3",
@@ -288,22 +232,6 @@ _nightly_builder(
     dimensions = windows,
     properties = [slow_shards],
 )
-_builder(
-    "vm-kernel-win-debug-x64",
-    category = "vm|kernel|wd",
-    dimensions = windows,
-)
-_nightly_builder(
-    "vm-kernel-win-release-ia32",
-    category = "vm|kernel|wr3",
-    channels = ["try"],
-    dimensions = windows,
-)
-_builder(
-    "vm-kernel-win-release-x64",
-    category = "vm|kernel|wr",
-    dimensions = windows,
-)
 _extra_builder(
     "cross-vm-linux-release-arm64",
     category = "vm|kernel|cra",
@@ -321,10 +249,6 @@ _extra_builder(
     "vm-kernel-precomp-linux-release-simarm",
     category = "vm|kernel-precomp|a32",
 )
-_extra_builder(
-    "vm-kernel-precomp-linux-release-simarm64",
-    category = "vm|kernel-precomp|a64",
-)
 _extra_builder(
     "vm-kernel-precomp-linux-release-x64",
     category = "vm|kernel-precomp|r",
@@ -333,26 +257,6 @@ _extra_builder(
     "vm-kernel-precomp-obfuscate-linux-release-x64",
     category = "vm|kernel-precomp|o",
 )
-_extra_builder(
-    "vm-kernel-precomp-linux-debug-simarm_x64",
-    category = "vm|kernel-precomp|adx",
-    properties = slow_shards,
-)
-_extra_builder(
-    "vm-kernel-precomp-linux-release-simarm_x64",
-    category = "vm|kernel-precomp|arx",
-)
-_extra_builder(
-    "vm-kernel-precomp-mac-release-simarm64",
-    category = "vm|kernel-precomp|ma",
-    dimensions = mac,
-    properties = pinned_xcode,
-)
-_extra_builder(
-    "vm-kernel-precomp-win-release-x64",
-    category = "vm|kernel-precomp|wr",
-    dimensions = windows,
-)
 _nightly_builder(
     "cross-vm-precomp-linux-release-arm64",
     category = "vm|kernel-precomp|cra",

From 4f11640c0b2c2dfedc0ac80e57cfdcaad3ad924b Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 1 Feb 2023 15:50:40 +0000
Subject: [PATCH 609/826] [infra] Fix tsan builder name

Bug: b/201271877
Change-Id: Icb0514a3717b28a5fad3feaba1874a09830bdd3b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/280174
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/commit-queue.cfg   |  8 ++---
 generated/cr-buildbucket.cfg | 66 ++++++++++++++++++------------------
 generated/luci-milo.cfg      |  6 ++--
 generated/luci-notify.cfg    | 26 +++++++-------
 generated/luci-scheduler.cfg | 22 ++++++------
 vm.star                      |  2 +-
 6 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index f55933d294da..c69654450a5f 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -3308,10 +3308,6 @@ config_groups {
         name: "dart/try/vm-msan-linux-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-nnbd-linux-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-precomp-ffi-qemu-linux-release-arm-try"
         includable_only: true
@@ -3336,6 +3332,10 @@ config_groups {
         name: "dart/try/vm-reload-rollback-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-tsan-linux-release-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-ubsan-linux-release-x64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index f90f605fec01..f513ab47d609 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -11585,11 +11585,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-nnbd-linux-release-x64"
+      name: "vm-precomp-ffi-qemu-linux-release-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11609,11 +11609,10 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11622,7 +11621,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11658,7 +11657,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-beta"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11694,10 +11693,10 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-dev"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
+      dimensions: "host_class:experimental"
       dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
@@ -11721,7 +11720,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11730,10 +11729,10 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "host_class:experimental"
+      dimensions: "host_class:default"
       dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
@@ -11757,7 +11756,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11766,7 +11765,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-stable"
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11802,7 +11801,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64"
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11838,7 +11837,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11874,7 +11873,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11910,11 +11909,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
+      name: "vm-reload-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11937,7 +11936,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11946,7 +11945,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-linux-debug-x64"
+      name: "vm-reload-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11982,7 +11981,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-linux-release-x64"
+      name: "vm-reload-rollback-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12018,7 +12017,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-rollback-linux-debug-x64"
+      name: "vm-reload-rollback-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12054,7 +12053,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-rollback-linux-release-x64"
+      name: "vm-tsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12078,6 +12077,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -17055,11 +17055,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-nnbd-linux-release-x64-try"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -17079,7 +17079,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -17092,7 +17091,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-try"
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17128,11 +17127,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64-try"
+      name: "vm-reload-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -17164,7 +17163,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-linux-debug-x64-try"
+      name: "vm-reload-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17200,7 +17199,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-linux-release-x64-try"
+      name: "vm-reload-rollback-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17236,7 +17235,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-rollback-linux-debug-x64-try"
+      name: "vm-reload-rollback-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17272,7 +17271,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-rollback-linux-release-x64-try"
+      name: "vm-tsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17296,6 +17295,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 45056796ecb2..5208ba4586a7 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -164,7 +164,7 @@ consoles {
     name: "buildbucket/luci.dart.try/vm-msan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-nnbd-linux-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-tsan-linux-release-x64-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-ubsan-linux-release-x64-try"
@@ -734,7 +734,7 @@ consoles {
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-nnbd-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-tsan-linux-release-x64"
     category: "vm|misc|sanitizer"
     short_name: "t"
   }
@@ -1525,7 +1525,7 @@ consoles {
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-nnbd-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-tsan-linux-release-x64"
     category: "vm|misc|sanitizer"
     short_name: "t"
   }
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index d04ce0018cb0..2c09298f8096 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -1221,19 +1221,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-nnbd-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1323,6 +1310,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-tsan-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 45f6cad22f92..fedf8c07dee9 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -2854,16 +2854,6 @@ job {
     builder: "vm-msan-linux-release-x64"
   }
 }
-job {
-  id: "vm-nnbd-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-nnbd-linux-release-x64"
-  }
-}
 job {
   id: "vm-precomp-ffi-qemu-linux-release-arm"
   realm: "ci.sandbox"
@@ -2994,6 +2984,16 @@ job {
     builder: "vm-reload-rollback-linux-release-x64"
   }
 }
+job {
+  id: "vm-tsan-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-tsan-linux-release-x64"
+  }
+}
 job {
   id: "vm-ubsan-linux-release-x64"
   realm: "ci.sandbox"
@@ -3331,12 +3331,12 @@ trigger {
   triggers: "vm-kernel-win-debug-ia32"
   triggers: "vm-kernel-win-debug-x64c"
   triggers: "vm-msan-linux-release-x64"
-  triggers: "vm-nnbd-linux-release-x64"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
   triggers: "vm-reload-linux-debug-x64"
   triggers: "vm-reload-linux-release-x64"
   triggers: "vm-reload-rollback-linux-debug-x64"
   triggers: "vm-reload-rollback-linux-release-x64"
+  triggers: "vm-tsan-linux-release-x64"
   triggers: "vm-ubsan-linux-release-x64"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
diff --git a/vm.star b/vm.star
index be1be3332fcc..7f3f8a131ddf 100644
--- a/vm.star
+++ b/vm.star
@@ -329,7 +329,7 @@ dart_vm_sanitizer_builder(
     category = "vm|misc|sanitizer|m",
 )
 dart_vm_sanitizer_builder(
-    "vm-nnbd-linux-release-x64",
+    "vm-tsan-linux-release-x64",
     category = "vm|misc|sanitizer|t",
 )
 dart_vm_sanitizer_builder(

From d9bf24b70edaa065b4af95ea9aceb82905049a7d Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Thu, 2 Feb 2023 14:27:01 +0000
Subject: [PATCH 610/826] Add buildbucket Pub/Sub notifications to dart-ci
 project

LUCI can publish all buildbucket events in a project to a Pub/Sub topic
in that project. This sets up that configuration, publishing events
to the topic projects/dart-ci/topics/buildbucket-messages.

Bug: b/267463004
Change-Id: I6718a5feb3dc89c8ff172d4674303bc573bf4904
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/280175
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 5 +++++
 generated/project.cfg        | 2 +-
 project.star                 | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index f513ab47d609..610580823b33 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -17389,3 +17389,8 @@ buckets {
     }
   }
 }
+common_config {
+  builds_notification_topics {
+    name: "projects/dart-ci/topics/buildbucket-messages"
+  }
+}
diff --git a/generated/project.cfg b/generated/project.cfg
index 6d63a4087885..319cfe54b116 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.37.1"
+  version: "1.37.2"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/project.star b/project.star
index b155dfccf6bd..61ce8e42967b 100644
--- a/project.star
+++ b/project.star
@@ -75,6 +75,10 @@ luci.project(
 
 luci.logdog(gs_bucket = "chromium-luci-logdog")
 
+luci.buildbucket_notification_topic(
+    name = "projects/dart-ci/topics/buildbucket-messages",
+)
+
 luci.bucket(
     name = "ci",
     acls = [

From 3b2f0f524e483e1fc58f778c4cd6d082b422ef26 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 6 Feb 2023 11:01:17 +0000
Subject: [PATCH 611/826] [infra] Move AppJIT builders to NNBD.

Change-Id: I3358cc8b86e9492daaf5a136b57a766c09f940d2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/280247
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   |   72 +-
 generated/cr-buildbucket.cfg | 1652 +++++++++++++++++-----------------
 generated/luci-milo.cfg      |   78 +-
 generated/luci-notify.cfg    |   70 +-
 generated/luci-scheduler.cfg |  198 ++--
 vm.star                      |   18 +-
 6 files changed, 1044 insertions(+), 1044 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index c69654450a5f..62e00d8961ef 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -195,14 +195,6 @@ config_groups {
         name: "dart/try/analyzer-win-release-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/app-kernel-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/app-kernel-linux-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/benchmark-linux-try"
       }
@@ -792,6 +784,14 @@ config_groups {
         name: "dart/try/stable-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-appjit-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-appjit-linux-release-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-ffi-android-debug-arm-try"
         includable_only: true
@@ -1178,14 +1178,6 @@ config_groups {
         name: "dart/try/analyzer-win-release-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/app-kernel-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/app-kernel-linux-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/benchmark-linux-try"
       }
@@ -1775,6 +1767,14 @@ config_groups {
         name: "dart/try/stable-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-appjit-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-appjit-linux-release-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-ffi-android-debug-arm-try"
         includable_only: true
@@ -2188,18 +2188,6 @@ config_groups {
         name: "dart/try/analyzer-win-release-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/app-kernel-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/app-kernel-linux-product-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/app-kernel-linux-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/benchmark-linux-try"
       }
@@ -2975,6 +2963,18 @@ config_groups {
         name: "dart/try/vm-aot-ubsan-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-appjit-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-appjit-linux-product-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-appjit-linux-release-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-asan-linux-release-x64-try"
         includable_only: true
@@ -3481,14 +3481,6 @@ config_groups {
         name: "dart/try/analyzer-win-release-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/app-kernel-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/app-kernel-linux-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/benchmark-linux-try"
       }
@@ -4078,6 +4070,14 @@ config_groups {
         name: "dart/try/stable-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-appjit-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-appjit-linux-release-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-ffi-android-debug-arm-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 610580823b33..42b6d8aca126 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -671,7 +671,7 @@ buckets {
       }
     }
     builders {
-      name: "app-kernel-linux-debug-x64"
+      name: "ci-test-data"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -695,9 +695,9 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -708,7 +708,7 @@ buckets {
       }
     }
     builders {
-      name: "app-kernel-linux-debug-x64-beta"
+      name: "cross-vm-linux-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -734,9 +734,10 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "shard_timeout": 7200'
         '}'
       priority: 50
+      execution_timeout_secs: 14400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -745,7 +746,7 @@ buckets {
       }
     }
     builders {
-      name: "app-kernel-linux-debug-x64-dev"
+      name: "cross-vm-precomp-linux-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -773,7 +774,7 @@ buckets {
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -782,7 +783,7 @@ buckets {
       }
     }
     builders {
-      name: "app-kernel-linux-debug-x64-stable"
+      name: "dart2js-canary-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -807,8 +808,11 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -819,7 +823,7 @@ buckets {
       }
     }
     builders {
-      name: "app-kernel-linux-product-x64"
+      name: "dart2js-canary-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -844,9 +848,13 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -855,7 +863,7 @@ buckets {
       }
     }
     builders {
-      name: "app-kernel-linux-release-x64"
+      name: "dart2js-canary-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -880,6 +888,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -891,7 +903,7 @@ buckets {
       }
     }
     builders {
-      name: "app-kernel-linux-release-x64-beta"
+      name: "dart2js-canary-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -916,6 +928,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -927,7 +943,7 @@ buckets {
       }
     }
     builders {
-      name: "app-kernel-linux-release-x64-dev"
+      name: "dart2js-csp-minified-linux-x64-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -952,6 +968,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -963,7 +983,7 @@ buckets {
       }
     }
     builders {
-      name: "app-kernel-linux-release-x64-stable"
+      name: "dart2js-csp-minified-linux-x64-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -988,6 +1008,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -999,7 +1023,7 @@ buckets {
       }
     }
     builders {
-      name: "ci-test-data"
+      name: "dart2js-csp-minified-linux-x64-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1023,8 +1047,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -1036,7 +1063,7 @@ buckets {
       }
     }
     builders {
-      name: "cross-vm-linux-release-arm64"
+      name: "dart2js-csp-minified-linux-x64-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1061,11 +1088,13 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 7200'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      execution_timeout_secs: 14400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1074,7 +1103,7 @@ buckets {
       }
     }
     builders {
-      name: "cross-vm-precomp-linux-release-arm64"
+      name: "dart2js-minified-strong-linux-x64-d8"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1099,10 +1128,12 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1111,7 +1142,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-canary-x64"
+      name: "dart2js-minified-strong-linux-x64-d8-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1137,8 +1168,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -1151,7 +1181,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-canary-x64-beta"
+      name: "dart2js-minified-strong-linux-x64-d8-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1177,8 +1207,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -1191,7 +1220,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-canary-x64-dev"
+      name: "dart2js-minified-strong-linux-x64-d8-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1217,8 +1246,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -1231,7 +1259,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-canary-x64-stable"
+      name: "dart2js-nnbd-linux-x64-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1271,7 +1299,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-csp-minified-linux-x64-chrome"
+      name: "dart2js-nnbd-linux-x64-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1311,7 +1339,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-csp-minified-linux-x64-chrome-beta"
+      name: "dart2js-nnbd-linux-x64-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1351,7 +1379,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-csp-minified-linux-x64-chrome-dev"
+      name: "dart2js-nnbd-linux-x64-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1391,7 +1419,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-csp-minified-linux-x64-chrome-stable"
+      name: "dart2js-strong-hostasserts-linux-ia32-d8"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1417,8 +1445,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -1431,7 +1458,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-minified-strong-linux-x64-d8"
+      name: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1470,7 +1497,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-minified-strong-linux-x64-d8-beta"
+      name: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1509,7 +1536,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-minified-strong-linux-x64-d8-dev"
+      name: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1548,7 +1575,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-minified-strong-linux-x64-d8-stable"
+      name: "dart2js-strong-linux-x64-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1574,7 +1601,8 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -1587,7 +1615,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-nnbd-linux-x64-chrome"
+      name: "dart2js-strong-linux-x64-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1627,7 +1655,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-nnbd-linux-x64-chrome-beta"
+      name: "dart2js-strong-linux-x64-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1667,7 +1695,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-nnbd-linux-x64-chrome-dev"
+      name: "dart2js-strong-linux-x64-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1707,7 +1735,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-nnbd-linux-x64-chrome-stable"
+      name: "dart2js-strong-linux-x64-firefox"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1734,7 +1762,7 @@ buckets {
         '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -1747,7 +1775,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-hostasserts-linux-ia32-d8"
+      name: "dart2js-strong-linux-x64-firefox-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1773,7 +1801,8 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_android_deps": false,'
+        '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -1786,7 +1815,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
+      name: "dart2js-strong-linux-x64-firefox-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1812,7 +1841,8 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_android_deps": false,'
+        '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -1825,7 +1855,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
+      name: "dart2js-strong-linux-x64-firefox-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1851,7 +1881,8 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_android_deps": false,'
+        '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -1864,11 +1895,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
+      name: "dart2js-strong-mac-x64-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1878,10 +1909,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1890,11 +1924,16 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1903,11 +1942,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-linux-x64-chrome"
+      name: "dart2js-strong-mac-x64-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1917,10 +1956,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1935,6 +1977,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1943,11 +1989,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-linux-x64-chrome-beta"
+      name: "dart2js-strong-mac-x64-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1957,10 +2003,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1975,6 +2024,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1983,11 +2036,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-linux-x64-chrome-dev"
+      name: "dart2js-strong-mac-x64-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1997,10 +2050,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2015,6 +2071,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2023,11 +2083,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-linux-x64-chrome-stable"
+      name: "dart2js-strong-mac-x64-safari"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2037,10 +2097,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2049,12 +2112,15 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2063,11 +2129,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-linux-x64-firefox"
+      name: "dart2js-strong-mac-x64-safari-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2077,10 +2143,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2089,12 +2158,15 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_firefox": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2103,11 +2175,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-linux-x64-firefox-beta"
+      name: "dart2js-strong-mac-x64-safari-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2117,10 +2189,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2129,12 +2204,15 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_firefox": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2143,11 +2221,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-linux-x64-firefox-dev"
+      name: "dart2js-strong-mac-x64-safari-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2157,10 +2235,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2169,25 +2250,28 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_firefox": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "dart2js-strong-linux-x64-firefox-stable"
+      name: "dart2js-strong-win-x64-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2197,7 +2281,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2210,7 +2294,7 @@ buckets {
         '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
-        '    "download_firefox": true'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -2223,11 +2307,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-mac-x64-chrome"
+      name: "dart2js-strong-win-x64-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2241,9 +2325,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2258,10 +2339,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2270,11 +2347,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-mac-x64-chrome-beta"
+      name: "dart2js-strong-win-x64-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2288,9 +2365,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2305,10 +2379,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2317,11 +2387,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-mac-x64-chrome-dev"
+      name: "dart2js-strong-win-x64-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2335,9 +2405,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2352,10 +2419,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2364,11 +2427,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-mac-x64-chrome-stable"
+      name: "dart2js-strong-win-x64-firefox"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2382,9 +2445,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2394,15 +2454,11 @@ buckets {
         '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2411,11 +2467,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-mac-x64-safari"
+      name: "dart2js-unit-linux-x64-release"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2425,13 +2481,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2445,10 +2498,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2457,11 +2506,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-mac-x64-safari-beta"
+      name: "dart2js-unit-linux-x64-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2471,13 +2520,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2491,10 +2537,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2503,11 +2545,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-mac-x64-safari-dev"
+      name: "dart2js-unit-linux-x64-release-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2517,13 +2559,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2537,10 +2576,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2549,11 +2584,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-mac-x64-safari-stable"
+      name: "dart2js-unit-linux-x64-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2563,13 +2598,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2583,10 +2615,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2595,11 +2623,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-win-x64-chrome"
+      name: "dart2wasm-linux-x64-d8"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2609,7 +2637,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2621,8 +2649,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_emscripten": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -2635,11 +2662,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-win-x64-chrome-beta"
+      name: "ddc-canary-linux-release-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2649,7 +2676,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2661,12 +2688,11 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2675,11 +2701,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-win-x64-chrome-dev"
+      name: "ddc-linux-release-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2689,7 +2715,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2701,7 +2727,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -2715,11 +2740,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-win-x64-chrome-stable"
+      name: "ddc-linux-release-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2729,7 +2754,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2741,7 +2766,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -2755,11 +2779,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-win-x64-firefox"
+      name: "ddc-linux-release-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2769,7 +2793,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2781,8 +2805,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_firefox": true'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -2795,7 +2818,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-unit-linux-x64-release"
+      name: "ddc-linux-release-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -2821,7 +2844,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -2834,11 +2857,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-unit-linux-x64-release-beta"
+      name: "ddc-mac-release-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2848,10 +2871,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2860,11 +2886,15 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2873,11 +2903,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-unit-linux-x64-release-dev"
+      name: "ddc-mac-release-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2887,10 +2917,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2899,11 +2932,15 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2912,11 +2949,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-unit-linux-x64-release-stable"
+      name: "ddc-mac-release-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2926,10 +2963,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2938,11 +2978,15 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2951,11 +2995,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2wasm-linux-x64-d8"
+      name: "ddc-mac-release-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2965,10 +3009,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2977,11 +3024,15 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_emscripten": true'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2990,7 +3041,7 @@ buckets {
       }
     }
     builders {
-      name: "ddc-canary-linux-release-chrome"
+      name: "ddc-nnbd-linux-release-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -3020,7 +3071,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3029,11 +3080,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-linux-release-chrome"
+      name: "ddc-win-release-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3043,7 +3094,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -3068,11 +3119,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-linux-release-chrome-beta"
+      name: "ddc-win-release-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3082,7 +3133,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -3107,11 +3158,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-linux-release-chrome-dev"
+      name: "ddc-win-release-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3121,7 +3172,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -3146,11 +3197,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-linux-release-chrome-stable"
+      name: "ddc-win-release-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3160,7 +3211,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -3185,11 +3236,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-mac-release-chrome"
+      name: "ddk-linux-release-firefox"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3199,13 +3250,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3214,15 +3262,11 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_chrome": true'
+        '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3231,11 +3275,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-mac-release-chrome-beta"
+      name: "ddk-linux-release-firefox-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3245,13 +3289,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3260,15 +3301,11 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_chrome": true'
+        '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3277,11 +3314,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-mac-release-chrome-dev"
+      name: "ddk-linux-release-firefox-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3291,13 +3328,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3306,15 +3340,11 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_chrome": true'
+        '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3323,11 +3353,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-mac-release-chrome-stable"
+      name: "ddk-linux-release-firefox-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3337,13 +3367,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3352,15 +3379,11 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_chrome": true'
+        '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3369,7 +3392,7 @@ buckets {
       }
     }
     builders {
-      name: "ddc-nnbd-linux-release-chrome"
+      name: "flutter-analyze"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -3394,12 +3417,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      execution_timeout_secs: 2700
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3408,21 +3429,21 @@ buckets {
       }
     }
     builders {
-      name: "ddc-win-release-chrome"
+      name: "flutter-android-debug"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -3433,12 +3454,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3447,21 +3466,21 @@ buckets {
       }
     }
     builders {
-      name: "ddc-win-release-chrome-beta"
+      name: "flutter-android-profile"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -3472,12 +3491,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3486,11 +3503,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-win-release-chrome-dev"
+      name: "flutter-engine-linux"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3500,7 +3517,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -3510,13 +3527,19 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "flutter_test_suites": ['
+        '    "add_to_app_life_cycle_tests",'
+        '    "flutter_plugins",'
+        '    "framework_coverage",'
+        '    "framework_tests",'
+        '    "tool_tests"'
+        '  ],'
+        '  "recipe": "dart/flutter_engine"'
         '}'
       priority: 50
+      execution_timeout_secs: 28800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3525,11 +3548,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-win-release-chrome-stable"
+      name: "flutter-frontend"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3539,7 +3562,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -3550,9 +3573,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -3564,14 +3584,14 @@ buckets {
       }
     }
     builders {
-      name: "ddk-linux-release-firefox"
+      name: "flutter-linux"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -3582,6 +3602,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$fuchsia/goma": {'
+        '    "server": "goma.chromium.org"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3589,12 +3612,13 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_firefox": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "config_name": "host_linux",'
+        '  "environment": "unused",'
+        '  "goma_jobs": "200",'
+        '  "recipe": "engine_v2/engine_v2"'
         '}'
       priority: 50
+      execution_timeout_secs: 7200
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3603,14 +3627,14 @@ buckets {
       }
     }
     builders {
-      name: "ddk-linux-release-firefox-beta"
+      name: "flutter-linux-debug"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -3628,12 +3652,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_firefox": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3642,14 +3664,14 @@ buckets {
       }
     }
     builders {
-      name: "ddk-linux-release-firefox-dev"
+      name: "flutter-linux-debug-unopt"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -3667,12 +3689,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_firefox": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3681,14 +3701,14 @@ buckets {
       }
     }
     builders {
-      name: "ddk-linux-release-firefox-stable"
+      name: "flutter-linux-profile"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -3706,12 +3726,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_firefox": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3720,14 +3738,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-analyze"
+      name: "flutter-linux-release"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -3745,10 +3763,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
-      execution_timeout_secs: 2700
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3757,7 +3775,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-android-debug"
+      name: "flutter-linux-web-tests-0"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -3782,10 +3800,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
-      execution_timeout_secs: 3600
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3794,7 +3812,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-android-profile"
+      name: "flutter-linux-web-tests-1"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -3819,10 +3837,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
-      execution_timeout_secs: 3600
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3831,14 +3849,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-engine-linux"
+      name: "flutter-linux-web-tests-2"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -3855,19 +3873,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "flutter_test_suites": ['
-        '    "add_to_app_life_cycle_tests",'
-        '    "flutter_plugins",'
-        '    "framework_coverage",'
-        '    "framework_tests",'
-        '    "tool_tests"'
-        '  ],'
-        '  "recipe": "dart/flutter_engine"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
-      execution_timeout_secs: 28800
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3876,14 +3886,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-frontend"
+      name: "flutter-linux-web-tests-3"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -3901,9 +3911,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3912,12 +3923,12 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux"
+      name: "flutter-linux-web-tests-4"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
@@ -3930,9 +3941,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$fuchsia/goma": {'
-        '    "server": "goma.chromium.org"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3940,13 +3948,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "config_name": "host_linux",'
-        '  "environment": "unused",'
-        '  "goma_jobs": "200",'
-        '  "recipe": "engine_v2/engine_v2"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
-      execution_timeout_secs: 7200
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3955,7 +3960,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-debug"
+      name: "flutter-linux-web-tests-5"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -3980,10 +3985,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
-      execution_timeout_secs: 3600
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3992,7 +3997,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-debug-unopt"
+      name: "flutter-linux-web-tests-6"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4017,10 +4022,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
-      execution_timeout_secs: 3600
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4029,7 +4034,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-profile"
+      name: "flutter-linux-web-tests-7-last"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4054,10 +4059,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
-      execution_timeout_secs: 3600
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4066,7 +4071,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-release"
+      name: "flutter-linux-web-tool-tests"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4091,10 +4096,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
-      execution_timeout_secs: 3600
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4103,14 +4108,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-0"
+      name: "front-end-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -4128,10 +4133,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4140,14 +4144,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-1"
+      name: "front-end-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -4165,10 +4169,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4177,14 +4180,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-2"
+      name: "front-end-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -4202,10 +4205,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4214,14 +4216,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-3"
+      name: "front-end-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -4239,10 +4241,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4251,24 +4252,27 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-4"
+      name: "front-end-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4276,10 +4280,13 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      execution_timeout_secs: 5400
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4288,24 +4295,27 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-5"
+      name: "front-end-mac-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4313,10 +4323,13 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      execution_timeout_secs: 5400
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4325,24 +4338,27 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-6"
+      name: "front-end-mac-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4350,10 +4366,13 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      execution_timeout_secs: 5400
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4362,24 +4381,27 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-7-last"
+      name: "front-end-mac-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4387,10 +4409,13 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      execution_timeout_secs: 5400
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4399,14 +4424,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tool-tests"
+      name: "front-end-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -4424,10 +4449,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4436,7 +4460,7 @@ buckets {
       }
     }
     builders {
-      name: "front-end-linux-release-x64"
+      name: "front-end-nnbd-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4472,7 +4496,7 @@ buckets {
       }
     }
     builders {
-      name: "front-end-linux-release-x64-beta"
+      name: "front-end-nnbd-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4508,7 +4532,7 @@ buckets {
       }
     }
     builders {
-      name: "front-end-linux-release-x64-dev"
+      name: "front-end-nnbd-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4544,11 +4568,11 @@ buckets {
       }
     }
     builders {
-      name: "front-end-linux-release-x64-stable"
+      name: "front-end-nnbd-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4558,10 +4582,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4571,7 +4598,11 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4580,11 +4611,11 @@ buckets {
       }
     }
     builders {
-      name: "front-end-mac-release-x64"
+      name: "front-end-nnbd-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4598,9 +4629,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4610,11 +4638,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4623,11 +4647,11 @@ buckets {
       }
     }
     builders {
-      name: "front-end-mac-release-x64-beta"
+      name: "front-end-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4641,9 +4665,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4654,10 +4675,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4666,11 +4683,11 @@ buckets {
       }
     }
     builders {
-      name: "front-end-mac-release-x64-dev"
+      name: "front-end-win-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4684,9 +4701,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4697,10 +4711,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4709,11 +4719,11 @@ buckets {
       }
     }
     builders {
-      name: "front-end-mac-release-x64-stable"
+      name: "front-end-win-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4727,9 +4737,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4740,10 +4747,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4752,11 +4755,11 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-linux-release-x64"
+      name: "front-end-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4766,7 +4769,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -4788,7 +4791,7 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-linux-release-x64-beta"
+      name: "frontend-weekly"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4815,7 +4818,8 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      execution_timeout_secs: 43200
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4824,7 +4828,7 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-linux-release-x64-dev"
+      name: "fuzz-linux"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4860,7 +4864,7 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-linux-release-x64-stable"
+      name: "gclient"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4885,7 +4889,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/gclient"'
         '}'
       priority: 50
       build_numbers: YES
@@ -4896,11 +4900,11 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-mac-release-x64"
+      name: "gclient-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4910,13 +4914,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4924,13 +4925,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/gclient"'
         '}'
-      priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4939,11 +4936,11 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-win-release-x64"
+      name: "gclient-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4953,7 +4950,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -4964,9 +4961,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/gclient"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4975,11 +4972,11 @@ buckets {
       }
     }
     builders {
-      name: "front-end-win-release-x64"
+      name: "gclient-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4989,7 +4986,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5000,7 +4997,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/gclient"'
         '}'
       priority: 50
       build_numbers: YES
@@ -5011,11 +5008,11 @@ buckets {
       }
     }
     builders {
-      name: "front-end-win-release-x64-beta"
+      name: "google"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5025,7 +5022,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5036,9 +5033,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/external"'
         '}'
-      priority: 50
+      priority: 30
+      execution_timeout_secs: 300
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5047,11 +5045,11 @@ buckets {
       }
     }
     builders {
-      name: "front-end-win-release-x64-dev"
+      name: "iso-stress-linux"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5061,7 +5059,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5072,7 +5070,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -5083,11 +5082,11 @@ buckets {
       }
     }
     builders {
-      name: "front-end-win-release-x64-stable"
+      name: "pkg-linux-debug"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5097,7 +5096,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5108,6 +5107,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5119,7 +5121,7 @@ buckets {
       }
     }
     builders {
-      name: "frontend-weekly"
+      name: "pkg-linux-release"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5137,6 +5139,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5144,10 +5149,12 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      execution_timeout_secs: 43200
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5156,7 +5163,7 @@ buckets {
       }
     }
     builders {
-      name: "fuzz-linux"
+      name: "pkg-linux-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5174,6 +5181,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5181,6 +5191,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5192,7 +5205,7 @@ buckets {
       }
     }
     builders {
-      name: "gclient"
+      name: "pkg-linux-release-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5210,6 +5223,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5217,7 +5233,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/gclient"'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -5228,7 +5247,7 @@ buckets {
       }
     }
     builders {
-      name: "gclient-beta"
+      name: "pkg-linux-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5246,6 +5265,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5253,7 +5275,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/gclient"'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -5264,11 +5289,11 @@ buckets {
       }
     }
     builders {
-      name: "gclient-dev"
+      name: "pkg-mac-release"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5278,10 +5303,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5289,9 +5317,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/gclient"'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5300,11 +5335,11 @@ buckets {
       }
     }
     builders {
-      name: "gclient-stable"
+      name: "pkg-mac-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5314,10 +5349,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5325,22 +5363,34 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/gclient"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "google"
+      name: "pkg-mac-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5350,10 +5400,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5361,10 +5414,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/external"'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 30
-      execution_timeout_secs: 300
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5373,11 +5432,11 @@ buckets {
       }
     }
     builders {
-      name: "iso-stress-linux"
+      name: "pkg-mac-release-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5387,10 +5446,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5398,10 +5460,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5410,11 +5478,11 @@ buckets {
       }
     }
     builders {
-      name: "pkg-linux-debug"
+      name: "pkg-mac-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5424,10 +5492,13 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5441,6 +5512,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5449,11 +5524,11 @@ buckets {
       }
     }
     builders {
-      name: "pkg-linux-release"
+      name: "pkg-win-release"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5463,13 +5538,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5485,17 +5557,21 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "pkg-linux-release-beta"
+      name: "pkg-win-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5505,13 +5581,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5527,17 +5600,21 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "pkg-linux-release-dev"
+      name: "pkg-win-release-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5547,13 +5624,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5569,17 +5643,21 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "pkg-linux-release-stable"
+      name: "pkg-win-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5589,13 +5667,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5611,17 +5686,21 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "pkg-mac-release"
+      name: "vm-aot-asan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5631,30 +5710,21 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5663,11 +5733,11 @@ buckets {
       }
     }
     builders {
-      name: "pkg-mac-release-arm64"
+      name: "vm-aot-msan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5677,48 +5747,34 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "pkg-mac-release-beta"
+      name: "vm-aot-tsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5728,30 +5784,21 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5760,11 +5807,11 @@ buckets {
       }
     }
     builders {
-      name: "pkg-mac-release-dev"
+      name: "vm-aot-ubsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5773,13 +5820,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -5787,17 +5829,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5806,11 +5842,11 @@ buckets {
       }
     }
     builders {
-      name: "pkg-mac-release-stable"
+      name: "vm-appjit-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5820,13 +5856,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5834,16 +5867,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5852,11 +5879,11 @@ buckets {
       }
     }
     builders {
-      name: "pkg-win-release"
+      name: "vm-appjit-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5866,7 +5893,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5877,29 +5904,23 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "pkg-win-release-beta"
+      name: "vm-appjit-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5909,7 +5930,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5920,29 +5941,23 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "pkg-win-release-dev"
+      name: "vm-appjit-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5952,7 +5967,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5962,30 +5977,24 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "pkg-win-release-stable"
+      name: "vm-appjit-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5995,7 +6004,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6006,25 +6015,18 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-aot-asan-linux-release-x64"
+      name: "vm-appjit-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6048,11 +6050,10 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6061,7 +6062,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-msan-linux-release-x64"
+      name: "vm-appjit-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6085,11 +6086,10 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6098,7 +6098,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-tsan-linux-release-x64"
+      name: "vm-appjit-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6122,11 +6122,10 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6135,7 +6134,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-ubsan-linux-release-x64"
+      name: "vm-appjit-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6148,8 +6147,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -6157,11 +6158,10 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12284,115 +12284,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "app-kernel-linux-debug-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "app-kernel-linux-product-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "app-kernel-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "benchmark-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -15037,6 +14928,115 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-appjit-linux-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-appjit-linux-product-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-appjit-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-asan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 5208ba4586a7..5ea9ff4f2673 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -101,13 +101,13 @@ consoles {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-win-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/app-kernel-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.try/vm-appjit-linux-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/app-kernel-linux-product-x64-try"
+    name: "buildbucket/luci.dart.try/vm-appjit-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/app-kernel-linux-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-appjit-linux-product-x64-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64-try"
@@ -619,19 +619,19 @@ consoles {
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
-    category: "vm|app-kernel"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-debug-x64"
+    category: "vm|appjit"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64"
-    category: "vm|app-kernel"
-    short_name: "p64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-release-x64"
+    category: "vm|appjit"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64"
-    category: "vm|app-kernel"
-    short_name: "r64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-product-x64"
+    category: "vm|appjit"
+    short_name: "p"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
@@ -1410,19 +1410,19 @@ consoles {
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64"
-    category: "vm|app-kernel"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-debug-x64"
+    category: "vm|appjit"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-product-x64"
-    category: "vm|app-kernel"
-    short_name: "p64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-release-x64"
+    category: "vm|appjit"
+    short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64"
-    category: "vm|app-kernel"
-    short_name: "r64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-product-x64"
+    category: "vm|appjit"
+    short_name: "p"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
@@ -1851,14 +1851,14 @@ consoles {
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-dev"
-    category: "vm|app-kernel"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-debug-x64-dev"
+    category: "vm|appjit"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-dev"
-    category: "vm|app-kernel"
-    short_name: "r64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-release-x64-dev"
+    category: "vm|appjit"
+    short_name: "r"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-dev"
@@ -2242,14 +2242,14 @@ consoles {
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-beta"
-    category: "vm|app-kernel"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-debug-x64-beta"
+    category: "vm|appjit"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-beta"
-    category: "vm|app-kernel"
-    short_name: "r64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-release-x64-beta"
+    category: "vm|appjit"
+    short_name: "r"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-beta"
@@ -2633,14 +2633,14 @@ consoles {
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-debug-x64-stable"
-    category: "vm|app-kernel"
-    short_name: "d64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-debug-x64-stable"
+    category: "vm|appjit"
+    short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/app-kernel-linux-release-x64-stable"
-    category: "vm|app-kernel"
-    short_name: "r64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-release-x64-stable"
+    category: "vm|appjit"
+    short_name: "r"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-stable"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 2c09298f8096..06ab3b1e8e49 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -48,41 +48,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "app-kernel-linux-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "app-kernel-linux-product-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "app-kernel-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_success: true
@@ -570,6 +535,41 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-appjit-linux-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-appjit-linux-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-appjit-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index fedf8c07dee9..813108298edf 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -164,96 +164,6 @@ job {
     builder: "analyzer-win-release-stable"
   }
 }
-job {
-  id: "app-kernel-linux-debug-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "app-kernel-linux-debug-x64"
-  }
-}
-job {
-  id: "app-kernel-linux-debug-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "app-kernel-linux-debug-x64-beta"
-  }
-}
-job {
-  id: "app-kernel-linux-debug-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "app-kernel-linux-debug-x64-dev"
-  }
-}
-job {
-  id: "app-kernel-linux-debug-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "app-kernel-linux-debug-x64-stable"
-  }
-}
-job {
-  id: "app-kernel-linux-product-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "app-kernel-linux-product-x64"
-  }
-}
-job {
-  id: "app-kernel-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "app-kernel-linux-release-x64"
-  }
-}
-job {
-  id: "app-kernel-linux-release-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "app-kernel-linux-release-x64-beta"
-  }
-}
-job {
-  id: "app-kernel-linux-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "app-kernel-linux-release-x64-dev"
-  }
-}
-job {
-  id: "app-kernel-linux-release-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "app-kernel-linux-release-x64-stable"
-  }
-}
 job {
   id: "ci-test-data"
   realm: "ci.sandbox"
@@ -1404,6 +1314,96 @@ job {
     builder: "vm-aot-ubsan-linux-release-x64"
   }
 }
+job {
+  id: "vm-appjit-linux-debug-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-appjit-linux-debug-x64"
+  }
+}
+job {
+  id: "vm-appjit-linux-debug-x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-appjit-linux-debug-x64-beta"
+  }
+}
+job {
+  id: "vm-appjit-linux-debug-x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-appjit-linux-debug-x64-dev"
+  }
+}
+job {
+  id: "vm-appjit-linux-debug-x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-appjit-linux-debug-x64-stable"
+  }
+}
+job {
+  id: "vm-appjit-linux-product-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-appjit-linux-product-x64"
+  }
+}
+job {
+  id: "vm-appjit-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-appjit-linux-release-x64"
+  }
+}
+job {
+  id: "vm-appjit-linux-release-x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-appjit-linux-release-x64-beta"
+  }
+}
+job {
+  id: "vm-appjit-linux-release-x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-appjit-linux-release-x64-dev"
+  }
+}
+job {
+  id: "vm-appjit-linux-release-x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-appjit-linux-release-x64-stable"
+  }
+}
 job {
   id: "vm-asan-linux-release-x64"
   realm: "ci.sandbox"
@@ -3021,8 +3021,6 @@ trigger {
   triggers: "analyzer-linux-release-beta"
   triggers: "analyzer-mac-release-beta"
   triggers: "analyzer-win-release-beta"
-  triggers: "app-kernel-linux-debug-x64-beta"
-  triggers: "app-kernel-linux-release-x64-beta"
   triggers: "dart2js-canary-x64-beta"
   triggers: "dart2js-csp-minified-linux-x64-chrome-beta"
   triggers: "dart2js-minified-strong-linux-x64-d8-beta"
@@ -3046,6 +3044,8 @@ trigger {
   triggers: "pkg-linux-release-beta"
   triggers: "pkg-mac-release-beta"
   triggers: "pkg-win-release-beta"
+  triggers: "vm-appjit-linux-debug-x64-beta"
+  triggers: "vm-appjit-linux-release-x64-beta"
   triggers: "vm-ffi-android-debug-arm-beta"
   triggers: "vm-ffi-android-debug-arm64c-beta"
   triggers: "vm-ffi-android-product-arm-beta"
@@ -3090,8 +3090,6 @@ trigger {
   triggers: "analyzer-linux-release-dev"
   triggers: "analyzer-mac-release-dev"
   triggers: "analyzer-win-release-dev"
-  triggers: "app-kernel-linux-debug-x64-dev"
-  triggers: "app-kernel-linux-release-x64-dev"
   triggers: "dart2js-canary-x64-dev"
   triggers: "dart2js-csp-minified-linux-x64-chrome-dev"
   triggers: "dart2js-minified-strong-linux-x64-d8-dev"
@@ -3115,6 +3113,8 @@ trigger {
   triggers: "pkg-linux-release-dev"
   triggers: "pkg-mac-release-dev"
   triggers: "pkg-win-release-dev"
+  triggers: "vm-appjit-linux-debug-x64-dev"
+  triggers: "vm-appjit-linux-release-x64-dev"
   triggers: "vm-ffi-android-debug-arm-dev"
   triggers: "vm-ffi-android-debug-arm64c-dev"
   triggers: "vm-ffi-android-product-arm-dev"
@@ -3234,8 +3234,6 @@ trigger {
   triggers: "analyzer-linux-release-stable"
   triggers: "analyzer-mac-release-stable"
   triggers: "analyzer-win-release-stable"
-  triggers: "app-kernel-linux-debug-x64-stable"
-  triggers: "app-kernel-linux-release-x64-stable"
   triggers: "dart2js-canary-x64-stable"
   triggers: "dart2js-csp-minified-linux-x64-chrome-stable"
   triggers: "dart2js-minified-strong-linux-x64-d8-stable"
@@ -3259,6 +3257,8 @@ trigger {
   triggers: "pkg-linux-release-stable"
   triggers: "pkg-mac-release-stable"
   triggers: "pkg-win-release-stable"
+  triggers: "vm-appjit-linux-debug-x64-stable"
+  triggers: "vm-appjit-linux-release-x64-stable"
   triggers: "vm-ffi-android-debug-arm-stable"
   triggers: "vm-ffi-android-debug-arm64c-stable"
   triggers: "vm-ffi-android-product-arm-stable"
@@ -3300,7 +3300,6 @@ trigger {
   id: "dart-nightly-trigger"
   realm: "ci"
   schedule: "0 5 * * *"
-  triggers: "app-kernel-linux-product-x64"
   triggers: "cross-vm-precomp-linux-release-arm64"
   triggers: "ddc-canary-linux-release-chrome"
   triggers: "front-end-nnbd-mac-release-x64"
@@ -3309,6 +3308,7 @@ trigger {
   triggers: "vm-aot-msan-linux-release-x64"
   triggers: "vm-aot-tsan-linux-release-x64"
   triggers: "vm-aot-ubsan-linux-release-x64"
+  triggers: "vm-appjit-linux-product-x64"
   triggers: "vm-asan-linux-release-x64"
   triggers: "vm-canary-linux-debug-experimental"
   triggers: "vm-eager-optimization-linux-release-ia32"
@@ -3346,10 +3346,10 @@ trigger {
 trigger {
   id: "dart-vm-gitiles-trigger-main"
   realm: "ci"
-  triggers: "app-kernel-linux-debug-x64"
-  triggers: "app-kernel-linux-release-x64"
   triggers: "cross-vm-linux-release-arm64"
   triggers: "iso-stress-linux"
+  triggers: "vm-appjit-linux-debug-x64"
+  triggers: "vm-appjit-linux-release-x64"
   triggers: "vm-eager-optimization-linux-release-x64"
   triggers: "vm-ffi-android-debug-arm"
   triggers: "vm-ffi-android-debug-arm64c"
diff --git a/vm.star b/vm.star
index 7f3f8a131ddf..a02d93face4c 100644
--- a/vm.star
+++ b/vm.star
@@ -197,21 +197,21 @@ _extra_builder(
     dimensions = windows,
 )
 
-# vm|app-kernel
+# vm|appjit
 _extra_builder(
-    "app-kernel-linux-debug-x64",
-    category = "vm|app-kernel|d64",
+    "vm-appjit-linux-debug-x64",
+    category = "vm|appjit|d",
     properties = slow_shards,
 )
+_extra_builder(
+    "vm-appjit-linux-release-x64",
+    category = "vm|appjit|r",
+)
 _nightly_builder(
-    "app-kernel-linux-product-x64",
-    category = "vm|app-kernel|p64",
+    "vm-appjit-linux-product-x64",
+    category = "vm|appjit|p",
     channels = ["try"],
 )
-_extra_builder(
-    "app-kernel-linux-release-x64",
-    category = "vm|app-kernel|r64",
-)
 
 #vm|kernel
 _builder("vm-kernel-linux-debug-x64", category = "vm|kernel|d")

From 19ab7d3b8a2528b8a9ecb82fe957b7b0ca53ac13 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 8 Feb 2023 09:54:58 +0000
Subject: [PATCH 612/826] [infra] Switch to pkg-linux-release for image
 validation

Bug: b/268006207
Change-Id: Ia4ddc700e3a73276bbecfd61135d67faf7d58352
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/281101
Commit-Queue: William Hesse <whesse@google.com>
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 72 ++++++++++++++++++------------------
 generated/luci-notify.cfg    | 30 +++++++--------
 generated/luci-scheduler.cfg | 22 +++++------
 generated/project.cfg        |  2 +-
 main.star                    |  4 +-
 5 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 42b6d8aca126..cc2bb9732f2b 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5246,6 +5246,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "pkg-linux-release-experimental"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:experimental"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "pkg-linux-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
@@ -6206,42 +6242,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-canary-linux-debug-experimental"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:experimental"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-eager-optimization-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 06ab3b1e8e49..8d380aebb663 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -450,6 +450,21 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "pkg-linux-release-experimental"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -583,21 +598,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-canary-linux-debug-experimental"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 813108298edf..fd9f5f5da360 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1174,6 +1174,16 @@ job {
     builder: "pkg-linux-release-dev"
   }
 }
+job {
+  id: "pkg-linux-release-experimental"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "pkg-linux-release-experimental"
+  }
+}
 job {
   id: "pkg-linux-release-stable"
   realm: "ci.sandbox"
@@ -1414,16 +1424,6 @@ job {
     builder: "vm-asan-linux-release-x64"
   }
 }
-job {
-  id: "vm-canary-linux-debug-experimental"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-canary-linux-debug-experimental"
-  }
-}
 job {
   id: "vm-eager-optimization-linux-release-ia32"
   realm: "ci.sandbox"
@@ -3304,13 +3304,13 @@ trigger {
   triggers: "ddc-canary-linux-release-chrome"
   triggers: "front-end-nnbd-mac-release-x64"
   triggers: "front-end-nnbd-win-release-x64"
+  triggers: "pkg-linux-release-experimental"
   triggers: "vm-aot-asan-linux-release-x64"
   triggers: "vm-aot-msan-linux-release-x64"
   triggers: "vm-aot-tsan-linux-release-x64"
   triggers: "vm-aot-ubsan-linux-release-x64"
   triggers: "vm-appjit-linux-product-x64"
   triggers: "vm-asan-linux-release-x64"
-  triggers: "vm-canary-linux-debug-experimental"
   triggers: "vm-eager-optimization-linux-release-ia32"
   triggers: "vm-kernel-gcc-linux"
   triggers: "vm-kernel-linux-debug-x64c"
diff --git a/generated/project.cfg b/generated/project.cfg
index 319cfe54b116..6d63a4087885 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.37.2"
+  version: "1.37.1"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/main.star b/main.star
index 045c2f07ba31..058b9134a9d3 100755
--- a/main.star
+++ b/main.star
@@ -589,7 +589,7 @@ dart.ci_sandbox_builder(
 # Builders that test the dev Linux images. When the image autoroller detects
 # successful builds of these builders with a dev images, that dev image becomes
 # the new prod image. Newly created bots will than use the updated image. The
-# `vm-precomp-ffi-qemu-linux-release-arm` and the `vm-canary-linux-debug`
+# `vm-precomp-ffi-qemu-linux-release-arm` and the `pkg-linux-release`
 # are used because qemu is the main difference on focal, they don't trigger
 # shards and run a few different builds. See also https://crbug.com/1207358.
 cron.nightly_builder(
@@ -599,7 +599,7 @@ cron.nightly_builder(
     notifies = "infra",
 )
 cron.nightly_builder(
-    "vm-canary-linux-debug-experimental",
+    "pkg-linux-release-experimental",
     channels = [],
     dimensions = experimental,
     notifies = "infra",

From 8e0ddcd86244b5d4bdf509d75d2ce7e47730cb83 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 8 Feb 2023 11:18:38 +0000
Subject: [PATCH 613/826] [infra] Use more fine-grained paths for core library
 changes

Change-Id: I3420be227455024f7b8d5bb18412306b2cf819e0
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/281420
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: Aske Simon Christensen <askesc@google.com>
---
 generated/commit-queue.cfg   | 447 +++++++++++++++++++++++++++++++----
 generated/luci-scheduler.cfg |  11 +-
 generated/project.cfg        |   2 +-
 lib/paths.star               |  18 +-
 4 files changed, 426 insertions(+), 52 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 62e00d8961ef..10df5a85dc7d 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -111,7 +111,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -164,7 +164,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -287,7 +287,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -309,6 +309,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -355,7 +365,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -377,6 +387,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -423,7 +443,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -445,6 +465,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -491,7 +521,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -513,6 +543,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -575,7 +615,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -597,6 +637,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -643,7 +693,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -665,6 +715,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -734,7 +794,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -857,7 +917,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -889,6 +949,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "runtime/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_http/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm.+"
+        }
       }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-release-simarm-try"
@@ -928,7 +998,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -960,6 +1030,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "runtime/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_http/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm.+"
+        }
       }
       builders {
         name: "dart/try/vm-kernel-nnbd-mac-debug-x64-try"
@@ -1094,7 +1174,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -1147,7 +1227,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -1270,7 +1350,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -1292,6 +1372,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1338,7 +1428,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -1360,6 +1450,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1406,7 +1506,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -1428,6 +1528,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1474,7 +1584,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -1496,6 +1606,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1558,7 +1678,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -1580,6 +1700,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1626,7 +1756,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -1648,6 +1778,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1717,7 +1857,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -1840,7 +1980,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -1872,6 +2012,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "runtime/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_http/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm.+"
+        }
       }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-release-simarm-try"
@@ -1911,7 +2061,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -1943,6 +2093,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "runtime/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_http/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm.+"
+        }
       }
       builders {
         name: "dart/try/vm-kernel-nnbd-mac-debug-x64-try"
@@ -2104,7 +2264,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -2157,7 +2317,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -2280,7 +2440,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -2302,6 +2462,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2348,7 +2518,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -2370,6 +2540,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2416,7 +2596,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -2438,6 +2618,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2484,7 +2674,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -2506,6 +2696,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2568,7 +2768,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -2590,6 +2790,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2636,7 +2846,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -2663,6 +2873,31 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm_shared/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/wasm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
       }
       builders {
         name: "dart/try/ddc-canary-linux-release-chrome-try"
@@ -2698,7 +2933,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -2720,6 +2955,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2770,7 +3015,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -2792,6 +3037,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2881,7 +3136,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -3076,7 +3331,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -3108,6 +3363,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "runtime/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_http/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm.+"
+        }
       }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-release-ia32-try"
@@ -3151,7 +3416,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -3183,6 +3448,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "runtime/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_http/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm.+"
+        }
       }
       builders {
         name: "dart/try/vm-kernel-nnbd-mac-debug-arm64-try"
@@ -3397,7 +3672,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -3450,7 +3725,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -3573,7 +3848,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -3595,6 +3870,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3641,7 +3926,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -3663,6 +3948,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3709,7 +4004,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -3731,6 +4026,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3777,7 +4082,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -3799,6 +4104,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3861,7 +4176,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -3883,6 +4198,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3929,7 +4254,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -3951,6 +4276,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -4020,7 +4355,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -4143,7 +4478,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -4175,6 +4510,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "runtime/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_http/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm.+"
+        }
       }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-release-simarm-try"
@@ -4214,7 +4559,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -4246,6 +4591,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "runtime/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_http/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm.+"
+        }
       }
       builders {
         name: "dart/try/vm-kernel-nnbd-mac-debug-x64-try"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index fd9f5f5da360..63aa44c3e0cb 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -3386,13 +3386,15 @@ trigger {
     path_regexps: "BUILD.gn"
     path_regexps: "sdk_args.gni"
     path_regexps: ".dart_tool/package_config.json"
-    path_regexps: "sdk/.+"
+    path_regexps: "sdk/lib/[^_].+"
     path_regexps: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
     path_regexps: "tools/bots/test_matrix.json"
     path_regexps: "tests/.+"
     path_regexps: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
     path_regexps: "pkg/vm/.+"
     path_regexps: "runtime/.+"
+    path_regexps: "sdk/lib/_http/.+"
+    path_regexps: "sdk/lib/_internal/vm.+"
   }
 }
 trigger {
@@ -3417,11 +3419,16 @@ trigger {
     path_regexps: "BUILD.gn"
     path_regexps: "sdk_args.gni"
     path_regexps: ".dart_tool/package_config.json"
-    path_regexps: "sdk/.+"
+    path_regexps: "sdk/lib/[^_].+"
     path_regexps: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
     path_regexps: "tools/bots/test_matrix.json"
     path_regexps: "tests/.+"
     path_regexps: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
     path_regexps: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
+    path_regexps: "sdk/lib/_internal/vm_shared/.+"
+    path_regexps: "sdk/lib/_internal/vm/lib/ffi_.+"
+    path_regexps: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
+    path_regexps: "sdk/lib/_internal/wasm.+"
+    path_regexps: "sdk/lib/_js_interop/.+"
   }
 }
diff --git a/generated/project.cfg b/generated/project.cfg
index 6d63a4087885..319cfe54b116 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.37.1"
+  version: "1.37.2"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/lib/paths.star b/lib/paths.star
index 87da5c45b697..530e9f5a7791 100644
--- a/lib/paths.star
+++ b/lib/paths.star
@@ -15,7 +15,7 @@ _STANDARD_PATHS = [
     "sdk_args.gni",
     # core libraries
     ".dart_tool/package_config.json",
-    "sdk/.+",
+    "sdk/lib/[^_].+",
     # testing
     _TEST_PY_PATHS,
     "tools/bots/test_matrix.json",
@@ -33,9 +33,16 @@ _VM_PATHS = _CFE_PATHS + [
     # VM sources
     "pkg/vm/.+",
     "runtime/.+",
+    "sdk/lib/_http/.+",
+    "sdk/lib/_internal/vm.+",
 ]
 
-_DART2JS_PATHS = _CFE_PATHS + [
+_WEB_PATHS = _CFE_PATHS + [
+    "sdk/lib/_js_interop/.+",
+    "sdk/lib/_internal/js.+",
+]
+
+_DART2JS_PATHS = _WEB_PATHS + [
     # compiler sources
     "pkg/(compiler|dart2js_tools|js_ast)/.+",
     "utils/compiler/.+",
@@ -43,7 +50,7 @@ _DART2JS_PATHS = _CFE_PATHS + [
     "pkg/(js|modular_test|sourcemap_testing)/.+",
 ]
 
-_DDC_PATHS = _CFE_PATHS + [
+_DDC_PATHS = _WEB_PATHS + [
     # compiler sources
     "pkg/(build_integration|dev_compiler|meta)/.+",
     "utils/dartdevc/.+",
@@ -63,6 +70,11 @@ _ANALYZER_PATHS = _STANDARD_PATHS + [
 
 _DART2WASM_PATHS = _CFE_PATHS + [
     "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+",
+    "sdk/lib/_internal/vm_shared/.+",
+    "sdk/lib/_internal/vm/lib/ffi_.+",
+    "sdk/lib/_internal/vm/lib/typed_data_patch.dart",
+    "sdk/lib/_internal/wasm.+",
+    "sdk/lib/_js_interop/.+",
 ]
 
 _RELEASE_PATHS = [

From adba8675dd0108686f58370e0391b9a9dea1bc90 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 13 Feb 2023 08:45:13 +0000
Subject: [PATCH 614/826] [infra] Move Android builders to NNBD.

Change-Id: I62d7e400a4db53ece394f1d0421b2cf569ec8902
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/281780
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   |  64 +--
 generated/cr-buildbucket.cfg | 834 +++++++++++++++++------------------
 generated/luci-milo.cfg      |  44 +-
 generated/luci-notify.cfg    |  44 +-
 generated/luci-scheduler.cfg | 176 ++++----
 vm.star                      |  10 +-
 6 files changed, 586 insertions(+), 586 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 10df5a85dc7d..15fcfffaba24 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -844,6 +844,14 @@ config_groups {
         name: "dart/try/stable-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-android-release-arm64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-android-release-arm_x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-appjit-linux-debug-x64-try"
         includable_only: true
@@ -1061,14 +1069,6 @@ config_groups {
         name: "dart/try/vm-kernel-nnbd-win-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-precomp-android-release-arm64c-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-android-release-arm_x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
         includable_only: true
@@ -1907,6 +1907,14 @@ config_groups {
         name: "dart/try/stable-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-android-release-arm64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-android-release-arm_x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-appjit-linux-debug-x64-try"
         includable_only: true
@@ -2124,14 +2132,6 @@ config_groups {
         name: "dart/try/vm-kernel-nnbd-win-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-precomp-android-release-arm64c-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-android-release-arm_x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
         includable_only: true
@@ -3202,6 +3202,14 @@ config_groups {
         name: "dart/try/stable-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-android-release-arm64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-android-release-arm_x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-asan-linux-release-x64-try"
         includable_only: true
@@ -3487,14 +3495,6 @@ config_groups {
         name: "dart/try/vm-kernel-nnbd-win-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-precomp-android-release-arm64c-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-android-release-arm_x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-precomp-dwarf-linux-product-x64-try"
         includable_only: true
@@ -4405,6 +4405,14 @@ config_groups {
         name: "dart/try/stable-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-android-release-arm64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-android-release-arm_x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-appjit-linux-debug-x64-try"
         includable_only: true
@@ -4622,14 +4630,6 @@ config_groups {
         name: "dart/try/vm-kernel-nnbd-win-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-precomp-android-release-arm64c-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-android-release-arm_x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index cc2bb9732f2b..18ab26b4a6a6 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5732,7 +5732,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-asan-linux-release-x64"
+      name: "vm-aot-android-release-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5756,11 +5756,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5769,7 +5769,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-msan-linux-release-x64"
+      name: "vm-aot-android-release-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5793,11 +5793,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5806,7 +5806,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-tsan-linux-release-x64"
+      name: "vm-aot-android-release-arm64c-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5830,11 +5830,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5843,7 +5843,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-ubsan-linux-release-x64"
+      name: "vm-aot-android-release-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5856,8 +5856,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -5865,11 +5867,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5878,7 +5880,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-debug-x64"
+      name: "vm-aot-android-release-arm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5915,7 +5917,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-debug-x64-beta"
+      name: "vm-aot-android-release-arm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5952,7 +5954,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-debug-x64-dev"
+      name: "vm-aot-android-release-arm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5989,7 +5991,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-debug-x64-stable"
+      name: "vm-aot-android-release-arm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6026,7 +6028,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-product-x64"
+      name: "vm-aot-asan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6050,6 +6052,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -6062,7 +6065,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-release-x64"
+      name: "vm-aot-msan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6086,10 +6089,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6098,7 +6102,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-release-x64-beta"
+      name: "vm-aot-tsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6122,10 +6126,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6134,7 +6139,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-release-x64-dev"
+      name: "vm-aot-ubsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6147,10 +6152,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -6158,10 +6161,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6170,7 +6174,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-release-x64-stable"
+      name: "vm-appjit-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6195,7 +6199,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -6206,7 +6211,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-asan-linux-release-x64"
+      name: "vm-appjit-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6230,11 +6235,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6243,7 +6248,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-eager-optimization-linux-release-ia32"
+      name: "vm-appjit-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6268,9 +6273,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6279,7 +6285,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-eager-optimization-linux-release-x64"
+      name: "vm-appjit-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6304,10 +6310,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
-      expiration_secs: 86400
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6316,7 +6322,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm"
+      name: "vm-appjit-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6343,7 +6349,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6352,7 +6358,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm-beta"
+      name: "vm-appjit-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6388,7 +6394,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm-dev"
+      name: "vm-appjit-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6424,7 +6430,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm-stable"
+      name: "vm-appjit-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6460,7 +6466,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c"
+      name: "vm-appjit-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6496,7 +6502,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c-beta"
+      name: "vm-asan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6520,10 +6526,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6532,7 +6539,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c-dev"
+      name: "vm-eager-optimization-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6559,7 +6566,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6568,7 +6575,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c-stable"
+      name: "vm-eager-optimization-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6595,7 +6602,8 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6604,7 +6612,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm"
+      name: "vm-ffi-android-debug-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6640,7 +6648,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm-beta"
+      name: "vm-ffi-android-debug-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6676,7 +6684,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm-dev"
+      name: "vm-ffi-android-debug-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6712,7 +6720,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm-stable"
+      name: "vm-ffi-android-debug-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6748,7 +6756,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c"
+      name: "vm-ffi-android-debug-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6784,7 +6792,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c-beta"
+      name: "vm-ffi-android-debug-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6820,7 +6828,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c-dev"
+      name: "vm-ffi-android-debug-arm64c-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6856,7 +6864,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c-stable"
+      name: "vm-ffi-android-debug-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6892,7 +6900,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm"
+      name: "vm-ffi-android-product-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6928,7 +6936,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm-beta"
+      name: "vm-ffi-android-product-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6964,7 +6972,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm-dev"
+      name: "vm-ffi-android-product-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7000,7 +7008,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm-stable"
+      name: "vm-ffi-android-product-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7036,7 +7044,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c"
+      name: "vm-ffi-android-product-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7072,7 +7080,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c-beta"
+      name: "vm-ffi-android-product-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7108,7 +7116,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c-dev"
+      name: "vm-ffi-android-product-arm64c-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7144,7 +7152,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c-stable"
+      name: "vm-ffi-android-product-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7180,7 +7188,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-fuchsia-release-x64"
+      name: "vm-ffi-android-release-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7207,8 +7215,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      expiration_secs: 86400
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7217,7 +7224,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64"
+      name: "vm-ffi-android-release-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7247,17 +7254,13 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-beta"
+      name: "vm-ffi-android-release-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7287,17 +7290,13 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-dev"
+      name: "vm-ffi-android-release-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7327,17 +7326,13 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-stable"
+      name: "vm-ffi-android-release-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7367,17 +7362,13 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-gcc-linux"
+      name: "vm-ffi-android-release-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7390,9 +7381,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true,'
-        '    "timeout": 4500'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -7403,8 +7395,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      execution_timeout_secs: 18000
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7413,7 +7404,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64"
+      name: "vm-ffi-android-release-arm64c-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7449,7 +7440,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64-beta"
+      name: "vm-ffi-android-release-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7485,7 +7476,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64-dev"
+      name: "vm-fuchsia-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7512,7 +7503,8 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7521,7 +7513,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64-stable"
+      name: "vm-kernel-checked-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7551,13 +7543,17 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64c"
+      name: "vm-kernel-checked-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7584,16 +7580,20 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-linux-release-x64"
+      name: "vm-kernel-checked-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7623,13 +7623,17 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-linux-release-x64-beta"
+      name: "vm-kernel-checked-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7659,13 +7663,17 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-linux-release-x64-dev"
+      name: "vm-kernel-gcc-linux"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7678,10 +7686,9 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true,'
+        '    "timeout": 4500'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -7692,7 +7699,8 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      execution_timeout_secs: 18000
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7701,7 +7709,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-x64-stable"
+      name: "vm-kernel-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7737,11 +7745,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-msvc-windows"
+      name: "vm-kernel-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7750,8 +7758,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -7762,7 +7772,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7771,7 +7781,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-ia32"
+      name: "vm-kernel-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7796,10 +7806,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7808,7 +7817,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-simriscv64"
+      name: "vm-kernel-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7835,7 +7844,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7844,7 +7853,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64"
+      name: "vm-kernel-linux-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7871,7 +7880,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7880,7 +7889,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64-beta"
+      name: "vm-kernel-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7916,7 +7925,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64-dev"
+      name: "vm-kernel-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7952,7 +7961,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64-stable"
+      name: "vm-kernel-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7988,7 +7997,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-ia32"
+      name: "vm-kernel-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8015,7 +8024,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8024,11 +8033,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-simarm"
+      name: "vm-kernel-msvc-windows"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8037,10 +8046,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -8051,7 +8058,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8060,7 +8067,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-simarm-beta"
+      name: "vm-kernel-nnbd-linux-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8085,9 +8092,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8096,7 +8104,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-simarm-dev"
+      name: "vm-kernel-nnbd-linux-debug-simriscv64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8123,7 +8131,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8132,7 +8140,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-simarm-stable"
+      name: "vm-kernel-nnbd-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8168,7 +8176,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-simarm64"
+      name: "vm-kernel-nnbd-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8204,7 +8212,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-simarm64-beta"
+      name: "vm-kernel-nnbd-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8240,7 +8248,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-simarm64-dev"
+      name: "vm-kernel-nnbd-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8276,7 +8284,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-simarm64-stable"
+      name: "vm-kernel-nnbd-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8303,7 +8311,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8312,7 +8320,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-x64"
+      name: "vm-kernel-nnbd-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8348,7 +8356,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-x64-beta"
+      name: "vm-kernel-nnbd-linux-release-simarm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8384,7 +8392,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-x64-dev"
+      name: "vm-kernel-nnbd-linux-release-simarm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8420,7 +8428,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-x64-stable"
+      name: "vm-kernel-nnbd-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8456,11 +8464,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-debug-arm64"
+      name: "vm-kernel-nnbd-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8470,13 +8478,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8484,17 +8489,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8503,11 +8500,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-debug-x64"
+      name: "vm-kernel-nnbd-linux-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8517,13 +8514,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8531,14 +8525,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8547,11 +8536,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-debug-x64-beta"
+      name: "vm-kernel-nnbd-linux-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8561,13 +8550,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8575,14 +8561,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8591,11 +8572,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-debug-x64-dev"
+      name: "vm-kernel-nnbd-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8605,13 +8586,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8619,14 +8597,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8635,11 +8608,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-debug-x64-stable"
+      name: "vm-kernel-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8649,13 +8622,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8663,14 +8633,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8679,11 +8644,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-release-arm64"
+      name: "vm-kernel-nnbd-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8693,13 +8658,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8707,16 +8669,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8725,11 +8680,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-release-arm64-beta"
+      name: "vm-kernel-nnbd-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8739,13 +8694,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8753,16 +8705,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8771,11 +8716,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-release-arm64-dev"
+      name: "vm-kernel-nnbd-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8785,13 +8730,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8799,16 +8741,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8817,7 +8752,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-release-arm64-stable"
+      name: "vm-kernel-nnbd-mac-debug-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
@@ -8848,9 +8783,10 @@ buckets {
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 70
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
@@ -8863,7 +8799,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-release-x64"
+      name: "vm-kernel-nnbd-mac-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8891,7 +8827,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       caches {
@@ -8906,7 +8843,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-release-x64-beta"
+      name: "vm-kernel-nnbd-mac-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8934,7 +8871,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       caches {
@@ -8949,7 +8887,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-release-x64-dev"
+      name: "vm-kernel-nnbd-mac-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8977,7 +8915,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       caches {
@@ -8992,7 +8931,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-release-x64-stable"
+      name: "vm-kernel-nnbd-mac-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9020,7 +8959,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       caches {
@@ -9035,11 +8975,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-debug-x64"
+      name: "vm-kernel-nnbd-mac-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9053,6 +8993,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9060,10 +9003,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9072,11 +9021,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-debug-x64-beta"
+      name: "vm-kernel-nnbd-mac-release-arm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9090,6 +9039,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9097,10 +9049,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9109,11 +9067,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-debug-x64-dev"
+      name: "vm-kernel-nnbd-mac-release-arm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9127,6 +9085,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9134,10 +9095,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9146,11 +9113,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-debug-x64-stable"
+      name: "vm-kernel-nnbd-mac-release-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9164,6 +9131,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9171,10 +9141,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9183,11 +9159,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-ia32"
+      name: "vm-kernel-nnbd-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9201,6 +9177,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9210,7 +9189,11 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9219,11 +9202,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-x64"
+      name: "vm-kernel-nnbd-mac-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9237,6 +9220,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9247,6 +9233,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9255,11 +9245,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-x64-beta"
+      name: "vm-kernel-nnbd-mac-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9273,6 +9263,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9283,6 +9276,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9291,11 +9288,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-x64-dev"
+      name: "vm-kernel-nnbd-mac-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9309,6 +9306,9 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9319,6 +9319,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9327,7 +9331,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-x64-stable"
+      name: "vm-kernel-nnbd-win-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9352,7 +9356,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -9363,11 +9368,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64c"
+      name: "vm-kernel-nnbd-win-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9377,7 +9382,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9400,11 +9405,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64c-beta"
+      name: "vm-kernel-nnbd-win-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9414,7 +9419,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9437,11 +9442,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64c-dev"
+      name: "vm-kernel-nnbd-win-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9451,7 +9456,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9474,11 +9479,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm64c-stable"
+      name: "vm-kernel-nnbd-win-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9488,7 +9493,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9499,10 +9504,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9511,11 +9515,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm_x64"
+      name: "vm-kernel-nnbd-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9525,7 +9529,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9536,8 +9540,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -9548,11 +9551,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm_x64-beta"
+      name: "vm-kernel-nnbd-win-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9562,7 +9565,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9573,8 +9576,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -9585,11 +9587,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm_x64-dev"
+      name: "vm-kernel-nnbd-win-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9599,7 +9601,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9610,8 +9612,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -9622,11 +9623,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-android-release-arm_x64-stable"
+      name: "vm-kernel-nnbd-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9636,7 +9637,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9647,8 +9648,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -14782,6 +14782,80 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-android-release-arm64c-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-aot-android-release-arm_x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-asan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -16158,80 +16232,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-precomp-android-release-arm64c-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-android-release-arm_x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-precomp-dwarf-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 5ea9ff4f2673..510541a579f4 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -137,10 +137,10 @@ consoles {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-dwarf-linux-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm_x64-try"
+    name: "buildbucket/luci.dart.try/vm-aot-android-release-arm_x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-android-release-arm64c-try"
+    name: "buildbucket/luci.dart.try/vm-aot-android-release-arm64c-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-product-x64-try"
@@ -689,13 +689,13 @@ consoles {
     short_name: "dw"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64"
-    category: "vm|kernel-precomp|android"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm_x64"
+    category: "vm|android"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c"
-    category: "vm|kernel-precomp|android"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm64c"
+    category: "vm|android"
     short_name: "a64"
   }
   builders {
@@ -1480,13 +1480,13 @@ consoles {
     short_name: "dw"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64"
-    category: "vm|kernel-precomp|android"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm_x64"
+    category: "vm|android"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c"
-    category: "vm|kernel-precomp|android"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm64c"
+    category: "vm|android"
     short_name: "a64"
   }
   builders {
@@ -1896,13 +1896,13 @@ consoles {
     short_name: "o"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-dev"
-    category: "vm|kernel-precomp|android"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm_x64-dev"
+    category: "vm|android"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-dev"
-    category: "vm|kernel-precomp|android"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm64c-dev"
+    category: "vm|android"
     short_name: "a64"
   }
   builders {
@@ -2287,13 +2287,13 @@ consoles {
     short_name: "o"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-beta"
-    category: "vm|kernel-precomp|android"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm_x64-beta"
+    category: "vm|android"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-beta"
-    category: "vm|kernel-precomp|android"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm64c-beta"
+    category: "vm|android"
     short_name: "a64"
   }
   builders {
@@ -2678,13 +2678,13 @@ consoles {
     short_name: "o"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm_x64-stable"
-    category: "vm|kernel-precomp|android"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm_x64-stable"
+    category: "vm|android"
     short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-android-release-arm64c-stable"
-    category: "vm|kernel-precomp|android"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm64c-stable"
+    category: "vm|android"
     short_name: "a64"
   }
   builders {
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 8d380aebb663..7e06925821ab 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -498,6 +498,28 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-android-release-arm64c"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-android-release-arm_x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -935,28 +957,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-android-release-arm64c"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-android-release-arm_x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 63aa44c3e0cb..5681d05c8704 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1284,6 +1284,86 @@ job {
     builder: "pkg-win-release-stable"
   }
 }
+job {
+  id: "vm-aot-android-release-arm64c"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-android-release-arm64c"
+  }
+}
+job {
+  id: "vm-aot-android-release-arm64c-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-android-release-arm64c-beta"
+  }
+}
+job {
+  id: "vm-aot-android-release-arm64c-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-android-release-arm64c-dev"
+  }
+}
+job {
+  id: "vm-aot-android-release-arm64c-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-android-release-arm64c-stable"
+  }
+}
+job {
+  id: "vm-aot-android-release-arm_x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-android-release-arm_x64"
+  }
+}
+job {
+  id: "vm-aot-android-release-arm_x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-android-release-arm_x64-beta"
+  }
+}
+job {
+  id: "vm-aot-android-release-arm_x64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-android-release-arm_x64-dev"
+  }
+}
+job {
+  id: "vm-aot-android-release-arm_x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-android-release-arm_x64-stable"
+  }
+}
 job {
   id: "vm-aot-asan-linux-release-x64"
   realm: "ci.sandbox"
@@ -2254,86 +2334,6 @@ job {
     builder: "vm-kernel-nnbd-win-release-x64-stable"
   }
 }
-job {
-  id: "vm-kernel-precomp-android-release-arm64c"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm64c"
-  }
-}
-job {
-  id: "vm-kernel-precomp-android-release-arm64c-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm64c-beta"
-  }
-}
-job {
-  id: "vm-kernel-precomp-android-release-arm64c-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm64c-dev"
-  }
-}
-job {
-  id: "vm-kernel-precomp-android-release-arm64c-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm64c-stable"
-  }
-}
-job {
-  id: "vm-kernel-precomp-android-release-arm_x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm_x64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-android-release-arm_x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm_x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-precomp-android-release-arm_x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm_x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-precomp-android-release-arm_x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-android-release-arm_x64-stable"
-  }
-}
 job {
   id: "vm-kernel-precomp-dwarf-linux-product-x64"
   realm: "ci.sandbox"
@@ -3044,6 +3044,8 @@ trigger {
   triggers: "pkg-linux-release-beta"
   triggers: "pkg-mac-release-beta"
   triggers: "pkg-win-release-beta"
+  triggers: "vm-aot-android-release-arm64c-beta"
+  triggers: "vm-aot-android-release-arm_x64-beta"
   triggers: "vm-appjit-linux-debug-x64-beta"
   triggers: "vm-appjit-linux-release-x64-beta"
   triggers: "vm-ffi-android-debug-arm-beta"
@@ -3064,8 +3066,6 @@ trigger {
   triggers: "vm-kernel-nnbd-mac-release-x64-beta"
   triggers: "vm-kernel-nnbd-win-debug-x64-beta"
   triggers: "vm-kernel-nnbd-win-release-x64-beta"
-  triggers: "vm-kernel-precomp-android-release-arm64c-beta"
-  triggers: "vm-kernel-precomp-android-release-arm_x64-beta"
   triggers: "vm-kernel-precomp-linux-debug-x64-beta"
   triggers: "vm-kernel-precomp-linux-release-simarm-beta"
   triggers: "vm-kernel-precomp-linux-release-x64-beta"
@@ -3113,6 +3113,8 @@ trigger {
   triggers: "pkg-linux-release-dev"
   triggers: "pkg-mac-release-dev"
   triggers: "pkg-win-release-dev"
+  triggers: "vm-aot-android-release-arm64c-dev"
+  triggers: "vm-aot-android-release-arm_x64-dev"
   triggers: "vm-appjit-linux-debug-x64-dev"
   triggers: "vm-appjit-linux-release-x64-dev"
   triggers: "vm-ffi-android-debug-arm-dev"
@@ -3133,8 +3135,6 @@ trigger {
   triggers: "vm-kernel-nnbd-mac-release-x64-dev"
   triggers: "vm-kernel-nnbd-win-debug-x64-dev"
   triggers: "vm-kernel-nnbd-win-release-x64-dev"
-  triggers: "vm-kernel-precomp-android-release-arm64c-dev"
-  triggers: "vm-kernel-precomp-android-release-arm_x64-dev"
   triggers: "vm-kernel-precomp-linux-debug-x64-dev"
   triggers: "vm-kernel-precomp-linux-release-simarm-dev"
   triggers: "vm-kernel-precomp-linux-release-x64-dev"
@@ -3257,6 +3257,8 @@ trigger {
   triggers: "pkg-linux-release-stable"
   triggers: "pkg-mac-release-stable"
   triggers: "pkg-win-release-stable"
+  triggers: "vm-aot-android-release-arm64c-stable"
+  triggers: "vm-aot-android-release-arm_x64-stable"
   triggers: "vm-appjit-linux-debug-x64-stable"
   triggers: "vm-appjit-linux-release-x64-stable"
   triggers: "vm-ffi-android-debug-arm-stable"
@@ -3277,8 +3279,6 @@ trigger {
   triggers: "vm-kernel-nnbd-mac-release-x64-stable"
   triggers: "vm-kernel-nnbd-win-debug-x64-stable"
   triggers: "vm-kernel-nnbd-win-release-x64-stable"
-  triggers: "vm-kernel-precomp-android-release-arm64c-stable"
-  triggers: "vm-kernel-precomp-android-release-arm_x64-stable"
   triggers: "vm-kernel-precomp-linux-debug-x64-stable"
   triggers: "vm-kernel-precomp-linux-release-simarm-stable"
   triggers: "vm-kernel-precomp-linux-release-x64-stable"
@@ -3348,6 +3348,8 @@ trigger {
   realm: "ci"
   triggers: "cross-vm-linux-release-arm64"
   triggers: "iso-stress-linux"
+  triggers: "vm-aot-android-release-arm64c"
+  triggers: "vm-aot-android-release-arm_x64"
   triggers: "vm-appjit-linux-debug-x64"
   triggers: "vm-appjit-linux-release-x64"
   triggers: "vm-eager-optimization-linux-release-x64"
@@ -3363,8 +3365,6 @@ trigger {
   triggers: "vm-kernel-nnbd-linux-release-simarm"
   triggers: "vm-kernel-nnbd-linux-release-simarm64"
   triggers: "vm-kernel-nnbd-linux-release-x64"
-  triggers: "vm-kernel-precomp-android-release-arm64c"
-  triggers: "vm-kernel-precomp-android-release-arm_x64"
   triggers: "vm-kernel-precomp-linux-debug-x64"
   triggers: "vm-kernel-precomp-linux-release-simarm"
   triggers: "vm-kernel-precomp-linux-release-x64"
diff --git a/vm.star b/vm.star
index a02d93face4c..d51ab74d105b 100644
--- a/vm.star
+++ b/vm.star
@@ -269,15 +269,15 @@ _nightly_builder(
     channels = ["try"],
 )
 
-# vm|kernel-precomp|android
+# vm|android
 _extra_builder(
-    "vm-kernel-precomp-android-release-arm_x64",
-    category = "vm|kernel-precomp|android|a32",
+    "vm-aot-android-release-arm_x64",
+    category = "vm|android|a32",
     properties = slow_shards,
 )
 _extra_builder(
-    "vm-kernel-precomp-android-release-arm64c",
-    category = "vm|kernel-precomp|android|a64",
+    "vm-aot-android-release-arm64c",
+    category = "vm|android|a64",
     properties = slow_shards,
 )
 

From a4c17bc8b5af78117f2b0653c612fa34d25a5bbc Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Fri, 17 Feb 2023 10:44:30 +0000
Subject: [PATCH 615/826] [infra] Move product builders to NNBD.

Change-Id: I23ea1ac321098a8cddfa669b022a83db3925a435
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/282823
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   |  24 +-
 generated/cr-buildbucket.cfg | 460 +++++++++++++++++------------------
 generated/luci-milo.cfg      |  18 +-
 generated/luci-notify.cfg    |  78 +++---
 generated/luci-scheduler.cfg |  66 ++---
 generated/project.cfg        |   2 +-
 vm.star                      |   6 +-
 7 files changed, 327 insertions(+), 327 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 15fcfffaba24..e79c1c12137e 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -3214,6 +3214,14 @@ config_groups {
         name: "dart/try/vm-aot-asan-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-linux-product-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-mac-product-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-msan-linux-release-x64-try"
         includable_only: true
@@ -3226,6 +3234,10 @@ config_groups {
         name: "dart/try/vm-aot-ubsan-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-win-product-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-appjit-linux-debug-x64-try"
         includable_only: true
@@ -3507,10 +3519,6 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-linux-debug-x64c-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-product-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
         includable_only: true
@@ -3519,10 +3527,6 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-precomp-mac-product-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
         includable_only: true
@@ -3567,10 +3571,6 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-win-debug-x64c-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-precomp-win-product-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-win-debug-ia32-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 18ab26b4a6a6..48a080184729 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -6064,6 +6064,85 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-linux-product-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-aot-mac-product-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-msan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -6173,6 +6252,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-win-product-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-appjit-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -9874,42 +9989,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-precomp-linux-product-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10198,49 +10277,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-precomp-mac-product-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -11438,42 +11474,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-precomp-win-product-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-win-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
@@ -14893,6 +14893,85 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-linux-product-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-aot-mac-product-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$depot_tools/osx_sdk": {'
+        '    "sdk_version": "12d4e"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-msan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -15002,6 +15081,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-win-product-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-appjit-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -16340,42 +16455,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-precomp-linux-product-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -16448,49 +16527,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-precomp-mac-product-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -16908,42 +16944,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-precomp-win-product-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-win-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 510541a579f4..b14c5d0eb3a4 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -143,13 +143,13 @@ consoles {
     name: "buildbucket/luci.dart.try/vm-aot-android-release-arm64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-product-x64-try"
+    name: "buildbucket/luci.dart.try/vm-aot-linux-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-mac-product-x64-try"
+    name: "buildbucket/luci.dart.try/vm-aot-mac-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-product-x64-try"
+    name: "buildbucket/luci.dart.try/vm-aot-win-product-x64-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-eager-optimization-linux-release-ia32-try"
@@ -699,17 +699,17 @@ consoles {
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-product-x64"
     category: "vm|product"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-product-x64"
     category: "vm|product"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-product-x64"
     category: "vm|product"
     short_name: "w"
   }
@@ -1490,17 +1490,17 @@ consoles {
     short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-product-x64"
     category: "vm|product"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-mac-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-product-x64"
     category: "vm|product"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-product-x64"
     category: "vm|product"
     short_name: "w"
   }
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 7e06925821ab..3512d66d99ee 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -533,6 +533,32 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-linux-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-mac-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -572,6 +598,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-win-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -994,19 +1033,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-product-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1029,19 +1055,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-mac-product-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1169,19 +1182,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-win-product-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 5681d05c8704..86a619560e90 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1374,6 +1374,26 @@ job {
     builder: "vm-aot-asan-linux-release-x64"
   }
 }
+job {
+  id: "vm-aot-linux-product-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-linux-product-x64"
+  }
+}
+job {
+  id: "vm-aot-mac-product-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-mac-product-x64"
+  }
+}
 job {
   id: "vm-aot-msan-linux-release-x64"
   realm: "ci.sandbox"
@@ -1404,6 +1424,16 @@ job {
     builder: "vm-aot-ubsan-linux-release-x64"
   }
 }
+job {
+  id: "vm-aot-win-product-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-win-product-x64"
+  }
+}
 job {
   id: "vm-appjit-linux-debug-x64"
   realm: "ci.sandbox"
@@ -2394,16 +2424,6 @@ job {
     builder: "vm-kernel-precomp-linux-debug-x64c"
   }
 }
-job {
-  id: "vm-kernel-precomp-linux-product-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-product-x64"
-  }
-}
 job {
   id: "vm-kernel-precomp-linux-release-simarm"
   realm: "ci.sandbox"
@@ -2484,16 +2504,6 @@ job {
     builder: "vm-kernel-precomp-linux-release-x64-stable"
   }
 }
-job {
-  id: "vm-kernel-precomp-mac-product-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-mac-product-x64"
-  }
-}
 job {
   id: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
   realm: "ci.sandbox"
@@ -2814,16 +2824,6 @@ job {
     builder: "vm-kernel-precomp-win-debug-x64c"
   }
 }
-job {
-  id: "vm-kernel-precomp-win-product-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-win-product-x64"
-  }
-}
 job {
   id: "vm-kernel-win-debug-ia32"
   realm: "ci.sandbox"
@@ -3306,9 +3306,12 @@ trigger {
   triggers: "front-end-nnbd-win-release-x64"
   triggers: "pkg-linux-release-experimental"
   triggers: "vm-aot-asan-linux-release-x64"
+  triggers: "vm-aot-linux-product-x64"
+  triggers: "vm-aot-mac-product-x64"
   triggers: "vm-aot-msan-linux-release-x64"
   triggers: "vm-aot-tsan-linux-release-x64"
   triggers: "vm-aot-ubsan-linux-release-x64"
+  triggers: "vm-aot-win-product-x64"
   triggers: "vm-appjit-linux-product-x64"
   triggers: "vm-asan-linux-release-x64"
   triggers: "vm-eager-optimization-linux-release-ia32"
@@ -3322,12 +3325,9 @@ trigger {
   triggers: "vm-kernel-nnbd-win-release-ia32"
   triggers: "vm-kernel-precomp-dwarf-linux-product-x64"
   triggers: "vm-kernel-precomp-linux-debug-x64c"
-  triggers: "vm-kernel-precomp-linux-product-x64"
-  triggers: "vm-kernel-precomp-mac-product-x64"
   triggers: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
   triggers: "vm-kernel-precomp-nnbd-linux-debug-x64"
   triggers: "vm-kernel-precomp-win-debug-x64c"
-  triggers: "vm-kernel-precomp-win-product-x64"
   triggers: "vm-kernel-win-debug-ia32"
   triggers: "vm-kernel-win-debug-x64c"
   triggers: "vm-msan-linux-release-x64"
diff --git a/generated/project.cfg b/generated/project.cfg
index 319cfe54b116..7f4af3390279 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.37.2"
+  version: "1.38.1"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/vm.star b/vm.star
index d51ab74d105b..45d1181d3d0e 100644
--- a/vm.star
+++ b/vm.star
@@ -283,19 +283,19 @@ _extra_builder(
 
 # vm|product
 _nightly_builder(
-    "vm-kernel-precomp-linux-product-x64",
+    "vm-aot-linux-product-x64",
     category = "vm|product|l",
     channels = ["try"],
 )
 _nightly_builder(
-    "vm-kernel-precomp-mac-product-x64",
+    "vm-aot-mac-product-x64",
     category = "vm|product|m",
     channels = ["try"],
     dimensions = mac,
     properties = pinned_xcode,
 )
 _nightly_builder(
-    "vm-kernel-precomp-win-product-x64",
+    "vm-aot-win-product-x64",
     category = "vm|product|w",
     channels = ["try"],
     dimensions = windows,

From 231f80d9d45b58563401de8cc29a26bd0949478b Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Tue, 21 Feb 2023 14:51:29 +0000
Subject: [PATCH 616/826] =?UTF-8?q?[infra]=C2=A0Pin=20Windows=20builders?=
 =?UTF-8?q?=20to=20Windows=2010.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: b/233173990
Change-Id: I08b048f04c0af2411af1d63e8b0c5c20f58462ea
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/284305
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 generated/cr-buildbucket.cfg | 114 +++++++++++++++++------------------
 lib/defaults.star            |   5 +-
 2 files changed, 60 insertions(+), 59 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 48a080184729..2f6c2f58375e 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -515,7 +515,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -555,7 +555,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -595,7 +595,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -635,7 +635,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2271,7 +2271,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2311,7 +2311,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2351,7 +2351,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2391,7 +2391,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2431,7 +2431,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3084,7 +3084,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3123,7 +3123,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3162,7 +3162,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3201,7 +3201,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4615,7 +4615,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4651,7 +4651,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4687,7 +4687,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4723,7 +4723,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4759,7 +4759,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5564,7 +5564,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5607,7 +5607,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5650,7 +5650,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5693,7 +5693,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6257,7 +6257,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8152,7 +8152,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9450,7 +9450,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9487,7 +9487,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9524,7 +9524,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9561,7 +9561,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9598,7 +9598,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9634,7 +9634,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9670,7 +9670,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9706,7 +9706,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9742,7 +9742,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11155,7 +11155,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11191,7 +11191,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11227,7 +11227,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11263,7 +11263,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11443,7 +11443,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11479,7 +11479,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11516,7 +11516,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12249,7 +12249,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12604,7 +12604,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12644,7 +12644,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13056,7 +13056,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13337,7 +13337,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14374,7 +14374,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14410,7 +14410,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14701,7 +14701,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15086,7 +15086,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15776,7 +15776,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16243,7 +16243,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16280,7 +16280,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16316,7 +16316,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16841,7 +16841,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16913,7 +16913,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16949,7 +16949,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16986,7 +16986,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
diff --git a/lib/defaults.star b/lib/defaults.star
index 4ab7a4d79e78..b745a69477e4 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -27,7 +27,7 @@ _ARM64 = {"cpu": "arm64"}
 _MAC = {"os": "Mac"}
 _BIONIC = {"os": "Ubuntu-18"}
 _FOCAL = {"os": "Ubuntu-20"}
-_WINDOWS = {"os": "Windows"}
+_WINDOWS10 = {"os": "Windows-10"}
 
 _EXPERIMENTAL = {"host_class": "experimental"}
 
@@ -74,7 +74,8 @@ experimental = _EXPERIMENTAL
 focal = _FOCAL
 linux = _BIONIC
 mac = _MAC
-windows = _WINDOWS
+windows = _WINDOWS10
+windows10 = _WINDOWS10
 
 # Properties
 

From a67d165b2c3c3c3d2db00c525ee3b7108ed30d5c Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Thu, 23 Feb 2023 12:10:40 +0000
Subject: [PATCH 617/826] [infra] Move compressed builders to NNBD.

Change-Id: Ie5c5257279e7b4b30d4364044ca6a0eedee6f98f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/284484
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   |  26 +--
 generated/cr-buildbucket.cfg | 426 +++++++++++++++++------------------
 generated/luci-milo.cfg      |  24 +-
 generated/luci-notify.cfg    |  80 +++----
 generated/luci-scheduler.cfg |  72 +++---
 vm.star                      |   8 +-
 6 files changed, 318 insertions(+), 318 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index e79c1c12137e..8d8722530e0e 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -3214,6 +3214,10 @@ config_groups {
         name: "dart/try/vm-aot-asan-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-linux-debug-x64c-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-linux-product-x64-try"
         includable_only: true
@@ -3234,6 +3238,10 @@ config_groups {
         name: "dart/try/vm-aot-ubsan-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-win-debug-x64c-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-win-product-x64-try"
         includable_only: true
@@ -3302,10 +3310,6 @@ config_groups {
         name: "dart/try/vm-kernel-linux-debug-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-linux-debug-x64c-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-linux-release-x64-try"
       }
@@ -3515,10 +3519,6 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-x64c-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
         includable_only: true
@@ -3567,16 +3567,12 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-precomp-win-debug-x64c-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-win-debug-ia32-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-win-debug-x64c-try"
+        name: "dart/try/vm-linux-debug-x64c-try"
         includable_only: true
       }
       builders {
@@ -3615,6 +3611,10 @@ config_groups {
         name: "dart/try/vm-ubsan-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-win-debug-x64c-try"
+        includable_only: true
+      }
       retry_config {}
     }
   }
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 2f6c2f58375e..c4d3e0be9643 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -6064,6 +6064,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-linux-debug-x64c"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -6252,6 +6288,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-win-debug-x64c"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-win-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -7967,42 +8039,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-linux-debug-x64c"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -9953,42 +9989,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-precomp-linux-debug-x64c"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
@@ -11438,42 +11438,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-precomp-win-debug-x64c"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-win-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
@@ -11512,11 +11476,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-x64c"
+      name: "vm-linux-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11526,7 +11490,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12124,6 +12088,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-win-debug-x64c"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
   }
 }
 buckets {
@@ -14893,6 +14893,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-linux-debug-x64c-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -15082,7 +15118,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-win-product-x64-try"
+      name: "vm-aot-win-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15118,11 +15154,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-debug-x64-try"
+      name: "vm-aot-win-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15132,7 +15168,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -15143,8 +15179,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -15155,7 +15190,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-product-x64-try"
+      name: "vm-appjit-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15180,7 +15215,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -15191,7 +15227,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-release-x64-try"
+      name: "vm-appjit-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15227,7 +15263,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-asan-linux-release-x64-try"
+      name: "vm-appjit-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15251,7 +15287,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -15264,7 +15299,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-eager-optimization-linux-release-ia32-try"
+      name: "vm-asan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15288,6 +15323,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -15300,7 +15336,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-eager-optimization-linux-release-x64-try"
+      name: "vm-eager-optimization-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15336,7 +15372,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm-try"
+      name: "vm-eager-optimization-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15372,7 +15408,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c-try"
+      name: "vm-ffi-android-debug-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15408,7 +15444,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm-try"
+      name: "vm-ffi-android-debug-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15444,7 +15480,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c-try"
+      name: "vm-ffi-android-product-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15480,7 +15516,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm-try"
+      name: "vm-ffi-android-product-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15516,7 +15552,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c-try"
+      name: "vm-ffi-android-release-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15552,7 +15588,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-fuchsia-release-x64-try"
+      name: "vm-ffi-android-release-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15588,7 +15624,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-try"
+      name: "vm-fuchsia-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15618,17 +15654,13 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-gcc-linux-try"
+      name: "vm-kernel-checked-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15641,9 +15673,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true,'
-        '    "timeout": 4500'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -15655,16 +15688,19 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 18000
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64-try"
+      name: "vm-kernel-gcc-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15677,10 +15713,9 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true,'
+        '    "timeout": 4500'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -15692,6 +15727,7 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      execution_timeout_secs: 18000
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -15700,7 +15736,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64c-try"
+      name: "vm-kernel-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16419,42 +16455,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-precomp-linux-debug-x64c-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-precomp-linux-release-simarm-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -16909,7 +16909,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-win-debug-x64c-try"
+      name: "vm-kernel-win-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16934,7 +16934,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -16945,11 +16946,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-ia32-try"
+      name: "vm-linux-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16959,7 +16960,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -16970,8 +16971,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -16982,11 +16982,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-x64c-try"
+      name: "vm-msan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16996,7 +16996,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -17006,6 +17006,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -17018,11 +17019,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-msan-linux-release-x64-try"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -17042,7 +17043,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -17055,7 +17055,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-try"
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17091,11 +17091,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64-try"
+      name: "vm-reload-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -17127,7 +17127,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-linux-debug-x64-try"
+      name: "vm-reload-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17163,7 +17163,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-linux-release-x64-try"
+      name: "vm-reload-rollback-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17199,7 +17199,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-rollback-linux-debug-x64-try"
+      name: "vm-reload-rollback-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17235,7 +17235,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-rollback-linux-release-x64-try"
+      name: "vm-tsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17259,6 +17259,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -17271,7 +17272,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-tsan-linux-release-x64-try"
+      name: "vm-ubsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -17284,10 +17285,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -17308,11 +17307,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ubsan-linux-release-x64-try"
+      name: "vm-win-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -17321,8 +17320,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -17330,7 +17331,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index b14c5d0eb3a4..b144461b9971 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -194,16 +194,16 @@ consoles {
     name: "buildbucket/luci.dart.try/vm-reload-rollback-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64c-try"
+    name: "buildbucket/luci.dart.try/vm-linux-debug-x64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64c-try"
+    name: "buildbucket/luci.dart.try/vm-aot-linux-debug-x64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-x64c-try"
+    name: "buildbucket/luci.dart.try/vm-win-debug-x64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-win-debug-x64c-try"
+    name: "buildbucket/luci.dart.try/vm-aot-win-debug-x64c-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-fuchsia-release-x64-try"
@@ -784,22 +784,22 @@ consoles {
     short_name: "rrb"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64c"
     category: "vm|misc|compressed"
     short_name: "jl"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-debug-x64c"
     category: "vm|misc|compressed"
     short_name: "al"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64c"
     category: "vm|misc|compressed"
     short_name: "jw"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-debug-x64c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-debug-x64c"
     category: "vm|misc|compressed"
     short_name: "aw"
   }
@@ -1575,22 +1575,22 @@ consoles {
     short_name: "rrb"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64c"
     category: "vm|misc|compressed"
     short_name: "jl"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-debug-x64c"
     category: "vm|misc|compressed"
     short_name: "al"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-x64c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64c"
     category: "vm|misc|compressed"
     short_name: "jw"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-win-debug-x64c"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-debug-x64c"
     category: "vm|misc|compressed"
     short_name: "aw"
   }
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 3512d66d99ee..860a8a7f8724 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -533,6 +533,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-linux-debug-x64c"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -598,6 +611,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-win-debug-x64c"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -795,19 +821,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-debug-x64c"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1020,19 +1033,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-debug-x64c"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1169,19 +1169,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-win-debug-x64c"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1204,7 +1191,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-win-debug-x64c"
+    name: "vm-linux-debug-x64c"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1336,3 +1323,16 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-win-debug-x64c"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 86a619560e90..cccd6d8c66b9 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1374,6 +1374,16 @@ job {
     builder: "vm-aot-asan-linux-release-x64"
   }
 }
+job {
+  id: "vm-aot-linux-debug-x64c"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-linux-debug-x64c"
+  }
+}
 job {
   id: "vm-aot-linux-product-x64"
   realm: "ci.sandbox"
@@ -1424,6 +1434,16 @@ job {
     builder: "vm-aot-ubsan-linux-release-x64"
   }
 }
+job {
+  id: "vm-aot-win-debug-x64c"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-win-debug-x64c"
+  }
+}
 job {
   id: "vm-aot-win-product-x64"
   realm: "ci.sandbox"
@@ -1894,16 +1914,6 @@ job {
     builder: "vm-kernel-linux-debug-x64-stable"
   }
 }
-job {
-  id: "vm-kernel-linux-debug-x64c"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-debug-x64c"
-  }
-}
 job {
   id: "vm-kernel-linux-release-x64"
   realm: "ci.sandbox"
@@ -2414,16 +2424,6 @@ job {
     builder: "vm-kernel-precomp-linux-debug-x64-stable"
   }
 }
-job {
-  id: "vm-kernel-precomp-linux-debug-x64c"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64c"
-  }
-}
 job {
   id: "vm-kernel-precomp-linux-release-simarm"
   realm: "ci.sandbox"
@@ -2814,16 +2814,6 @@ job {
     builder: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
   }
 }
-job {
-  id: "vm-kernel-precomp-win-debug-x64c"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-win-debug-x64c"
-  }
-}
 job {
   id: "vm-kernel-win-debug-ia32"
   realm: "ci.sandbox"
@@ -2835,13 +2825,13 @@ job {
   }
 }
 job {
-  id: "vm-kernel-win-debug-x64c"
+  id: "vm-linux-debug-x64c"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-win-debug-x64c"
+    builder: "vm-linux-debug-x64c"
   }
 }
 job {
@@ -3004,6 +2994,16 @@ job {
     builder: "vm-ubsan-linux-release-x64"
   }
 }
+job {
+  id: "vm-win-debug-x64c"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-win-debug-x64c"
+  }
+}
 trigger {
   id: "dart-ci-test-data-trigger"
   realm: "ci"
@@ -3306,17 +3306,18 @@ trigger {
   triggers: "front-end-nnbd-win-release-x64"
   triggers: "pkg-linux-release-experimental"
   triggers: "vm-aot-asan-linux-release-x64"
+  triggers: "vm-aot-linux-debug-x64c"
   triggers: "vm-aot-linux-product-x64"
   triggers: "vm-aot-mac-product-x64"
   triggers: "vm-aot-msan-linux-release-x64"
   triggers: "vm-aot-tsan-linux-release-x64"
   triggers: "vm-aot-ubsan-linux-release-x64"
+  triggers: "vm-aot-win-debug-x64c"
   triggers: "vm-aot-win-product-x64"
   triggers: "vm-appjit-linux-product-x64"
   triggers: "vm-asan-linux-release-x64"
   triggers: "vm-eager-optimization-linux-release-ia32"
   triggers: "vm-kernel-gcc-linux"
-  triggers: "vm-kernel-linux-debug-x64c"
   triggers: "vm-kernel-msvc-windows"
   triggers: "vm-kernel-nnbd-linux-debug-ia32"
   triggers: "vm-kernel-nnbd-linux-debug-simriscv64"
@@ -3324,12 +3325,10 @@ trigger {
   triggers: "vm-kernel-nnbd-mac-debug-arm64"
   triggers: "vm-kernel-nnbd-win-release-ia32"
   triggers: "vm-kernel-precomp-dwarf-linux-product-x64"
-  triggers: "vm-kernel-precomp-linux-debug-x64c"
   triggers: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
   triggers: "vm-kernel-precomp-nnbd-linux-debug-x64"
-  triggers: "vm-kernel-precomp-win-debug-x64c"
   triggers: "vm-kernel-win-debug-ia32"
-  triggers: "vm-kernel-win-debug-x64c"
+  triggers: "vm-linux-debug-x64c"
   triggers: "vm-msan-linux-release-x64"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
   triggers: "vm-reload-linux-debug-x64"
@@ -3338,6 +3337,7 @@ trigger {
   triggers: "vm-reload-rollback-linux-release-x64"
   triggers: "vm-tsan-linux-release-x64"
   triggers: "vm-ubsan-linux-release-x64"
+  triggers: "vm-win-debug-x64c"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/main"
diff --git a/vm.star b/vm.star
index 45d1181d3d0e..c107f1b23690 100644
--- a/vm.star
+++ b/vm.star
@@ -375,23 +375,23 @@ _nightly_builder(
     channels = ["try"],
 )
 _nightly_builder(
-    "vm-kernel-linux-debug-x64c",
+    "vm-linux-debug-x64c",
     category = "vm|misc|compressed|jl",
     channels = ["try"],
 )
 _nightly_builder(
-    "vm-kernel-precomp-linux-debug-x64c",
+    "vm-aot-linux-debug-x64c",
     category = "vm|misc|compressed|al",
     channels = ["try"],
 )
 _nightly_builder(
-    "vm-kernel-win-debug-x64c",
+    "vm-win-debug-x64c",
     category = "vm|misc|compressed|jw",
     channels = ["try"],
     dimensions = windows,
 )
 _nightly_builder(
-    "vm-kernel-precomp-win-debug-x64c",
+    "vm-aot-win-debug-x64c",
     category = "vm|misc|compressed|aw",
     channels = ["try"],
     dimensions = windows,

From 44bb1830139277678bdddd4a8a59ef4fa73b58fd Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 24 Feb 2023 10:27:21 +0000
Subject: [PATCH 618/826] [infra] Update DDC configurations

The new configs were defined in:
https://dart-review.googlesource.com/c/sdk/+/279750

Bug: b/269725993
Change-Id: I8df16f183272abc59ddd36ec084e18007cfbf9fe
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/284621
Reviewed-by: Jonas Termansen <sortie@google.com>
Reviewed-by: Nicholas Shahan <nshahan@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 ddc.star                     |  65 +++++++++
 generated/commit-queue.cfg   |  48 +++----
 generated/cr-buildbucket.cfg | 265 ++++++++++-------------------------
 generated/luci-milo.cfg      | 261 ++++++++++++++++------------------
 generated/luci-notify.cfg    |  12 +-
 generated/luci-scheduler.cfg | 146 +++++++++----------
 main.star                    |  39 +-----
 7 files changed, 358 insertions(+), 478 deletions(-)
 create mode 100644 ddc.star

diff --git a/ddc.star b/ddc.star
new file mode 100644
index 000000000000..1b406f323144
--- /dev/null
+++ b/ddc.star
@@ -0,0 +1,65 @@
+# Copyright (c) 2023 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Defines the DDC builders.
+"""
+
+load("//lib/cron.star", "cron")
+load("//lib/dart.star", "dart")
+load(
+    "//lib/defaults.star",
+    "arm64",
+    "chrome",
+    "firefox",
+    "mac",
+    "no_android",
+    "windows",
+)
+load("//lib/paths.star", "paths")
+
+dart.poller("ddc-gitiles-trigger", branches = ["main"], paths = paths.ddc)
+
+dart.ci_sandbox_builder(
+    "ddc-linux-chrome",
+    category = "ddc|l",
+    properties = [chrome, no_android],
+    location_filters = paths.to_location_filters(paths.ddc),
+)
+
+dart.ci_sandbox_builder(
+    "ddc-mac-chrome",
+    category = "ddc|m",
+    dimensions = [arm64, mac],
+    properties = [chrome, no_android],
+)
+
+dart.ci_sandbox_builder(
+    "ddc-win-chrome",
+    category = "ddc|w",
+    dimensions = windows,
+    properties = [chrome, no_android],
+)
+
+dart.ci_sandbox_builder(
+    "ddc-linux-firefox",
+    category = "ddc|f",
+    channels = ["try"],
+    properties = [firefox, no_android],
+    triggered_by = ["ddc-gitiles-trigger-%s"],
+)
+
+dart.ci_sandbox_builder(
+    "ddc-linux-chrome-unsound",
+    category = "ddc|u",
+    channels = ["try"],
+    location_filters = paths.to_location_filters(paths.ddc),
+    properties = [chrome, no_android],
+)
+
+cron.nightly_builder(
+    "ddc-canary-linux-chrome",
+    category = "ddc|c",
+    channels = ["try"],
+    properties = [chrome, no_android],
+)
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 8d8722530e0e..79c17aad97f0 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -664,7 +664,7 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/ddc-linux-release-chrome-try"
+        name: "dart/try/ddc-linux-chrome-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -742,15 +742,11 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/ddc-mac-release-chrome-try"
+        name: "dart/try/ddc-mac-chrome-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/ddc-win-release-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/ddk-linux-release-firefox-try"
+        name: "dart/try/ddc-win-chrome-try"
         includable_only: true
       }
       builders {
@@ -1727,7 +1723,7 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/ddc-linux-release-chrome-try"
+        name: "dart/try/ddc-linux-chrome-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1805,15 +1801,11 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/ddc-mac-release-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/ddc-win-release-chrome-try"
+        name: "dart/try/ddc-mac-chrome-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/ddk-linux-release-firefox-try"
+        name: "dart/try/ddc-win-chrome-try"
         includable_only: true
       }
       builders {
@@ -2900,11 +2892,11 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/ddc-canary-linux-release-chrome-try"
+        name: "dart/try/ddc-canary-linux-chrome-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/ddc-linux-release-chrome-try"
+        name: "dart/try/ddc-linux-chrome-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2982,11 +2974,7 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/ddc-mac-release-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/ddc-nnbd-linux-release-chrome-try"
+        name: "dart/try/ddc-linux-chrome-unsound-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3064,11 +3052,15 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/ddc-win-release-chrome-try"
+        name: "dart/try/ddc-linux-firefox-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/ddc-mac-chrome-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/ddk-linux-release-firefox-try"
+        name: "dart/try/ddc-win-chrome-try"
         includable_only: true
       }
       builders {
@@ -4225,7 +4217,7 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/ddc-linux-release-chrome-try"
+        name: "dart/try/ddc-linux-chrome-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -4303,15 +4295,11 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/ddc-mac-release-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/ddc-win-release-chrome-try"
+        name: "dart/try/ddc-mac-chrome-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/ddk-linux-release-firefox-try"
+        name: "dart/try/ddc-win-chrome-try"
         includable_only: true
       }
       builders {
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index c4d3e0be9643..26e195fb8edc 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -2662,7 +2662,7 @@ buckets {
       }
     }
     builders {
-      name: "ddc-canary-linux-release-chrome"
+      name: "ddc-canary-linux-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -2688,6 +2688,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -2701,7 +2702,7 @@ buckets {
       }
     }
     builders {
-      name: "ddc-linux-release-chrome"
+      name: "ddc-linux-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -2727,6 +2728,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -2740,7 +2742,7 @@ buckets {
       }
     }
     builders {
-      name: "ddc-linux-release-chrome-beta"
+      name: "ddc-linux-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -2766,6 +2768,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -2779,7 +2782,7 @@ buckets {
       }
     }
     builders {
-      name: "ddc-linux-release-chrome-dev"
+      name: "ddc-linux-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -2805,6 +2808,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -2818,7 +2822,7 @@ buckets {
       }
     }
     builders {
-      name: "ddc-linux-release-chrome-stable"
+      name: "ddc-linux-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -2844,6 +2848,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -2857,11 +2862,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-mac-release-chrome"
+      name: "ddc-linux-chrome-unsound"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2871,13 +2876,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2886,15 +2888,12 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2903,11 +2902,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-mac-release-chrome-beta"
+      name: "ddc-linux-firefox"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2917,13 +2916,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2932,15 +2928,12 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_chrome": true'
+        '    "download_android_deps": false,'
+        '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2949,9 +2942,9 @@ buckets {
       }
     }
     builders {
-      name: "ddc-mac-release-chrome-dev"
+      name: "ddc-mac-chrome"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
@@ -2967,9 +2960,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2978,6 +2968,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -2995,9 +2986,9 @@ buckets {
       }
     }
     builders {
-      name: "ddc-mac-release-chrome-stable"
+      name: "ddc-mac-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
@@ -3013,9 +3004,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3024,6 +3012,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -3041,11 +3030,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-nnbd-linux-release-chrome"
+      name: "ddc-mac-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3055,7 +3044,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -3067,11 +3056,16 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3080,11 +3074,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-win-release-chrome"
+      name: "ddc-mac-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3106,11 +3100,16 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3119,7 +3118,7 @@ buckets {
       }
     }
     builders {
-      name: "ddc-win-release-chrome-beta"
+      name: "ddc-win-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -3145,6 +3144,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -3158,7 +3158,7 @@ buckets {
       }
     }
     builders {
-      name: "ddc-win-release-chrome-dev"
+      name: "ddc-win-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -3184,6 +3184,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -3197,7 +3198,7 @@ buckets {
       }
     }
     builders {
-      name: "ddc-win-release-chrome-stable"
+      name: "ddc-win-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -3223,6 +3224,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -3236,128 +3238,11 @@ buckets {
       }
     }
     builders {
-      name: "ddk-linux-release-firefox"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_firefox": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "ddk-linux-release-firefox-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_firefox": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "ddk-linux-release-firefox-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_firefox": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "ddk-linux-release-firefox-stable"
+      name: "ddc-win-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3367,7 +3252,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -3379,7 +3264,8 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_firefox": true'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -13170,7 +13056,7 @@ buckets {
       }
     }
     builders {
-      name: "ddc-canary-linux-release-chrome-try"
+      name: "ddc-canary-linux-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13196,6 +13082,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -13209,7 +13096,7 @@ buckets {
       }
     }
     builders {
-      name: "ddc-linux-release-chrome-try"
+      name: "ddc-linux-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13235,6 +13122,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -13248,11 +13136,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-mac-release-chrome-try"
+      name: "ddc-linux-chrome-unsound-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13262,13 +13150,10 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13277,15 +13162,12 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13294,7 +13176,7 @@ buckets {
       }
     }
     builders {
-      name: "ddc-nnbd-linux-release-chrome-try"
+      name: "ddc-linux-firefox-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13320,7 +13202,8 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_chrome": true'
+        '    "download_android_deps": false,'
+        '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -13333,11 +13216,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-win-release-chrome-try"
+      name: "ddc-mac-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13359,11 +13242,16 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13372,11 +13260,11 @@ buckets {
       }
     }
     builders {
-      name: "ddk-linux-release-firefox-try"
+      name: "ddc-win-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13386,7 +13274,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -13398,7 +13286,8 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_firefox": true'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index b144461b9971..ebd755e1c69b 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -37,6 +37,24 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/dart2wasm-linux-x64-d8-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/ddc-linux-chrome-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/ddc-mac-chrome-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/ddc-win-chrome-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/ddc-linux-firefox-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/ddc-linux-chrome-unsound-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/ddc-canary-linux-chrome-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-x64-try"
   }
@@ -328,24 +346,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/dart-sdk-win-arm64-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/ddc-canary-linux-release-chrome-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/ddc-linux-release-chrome-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/ddc-nnbd-linux-release-chrome-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/ddc-mac-release-chrome-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/ddc-win-release-chrome-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/ddk-linux-release-firefox-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/gclient-try"
   }
@@ -513,6 +513,36 @@ consoles {
     category: "d2w"
     short_name: "d"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome"
+    category: "ddc"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-chrome"
+    category: "ddc"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-chrome"
+    category: "ddc"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-firefox"
+    category: "ddc"
+    short_name: "f"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome-unsound"
+    category: "ddc"
+    short_name: "u"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-canary-linux-chrome"
+    category: "ddc"
+    short_name: "c"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
     category: "vm|nnbd|jit"
@@ -973,36 +1003,6 @@ consoles {
     category: "analyzer"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-canary-linux-release-chrome"
-    category: "ddc"
-    short_name: "c"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
-    category: "ddc"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-nnbd-linux-release-chrome"
-    category: "ddc"
-    short_name: "nn"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
-    category: "ddc"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
-    category: "ddc"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox"
-    category: "ddc"
-    short_name: "fl"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/gclient"
     category: "misc"
@@ -1159,6 +1159,36 @@ consoles {
     category: "d2w"
     short_name: "d"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome"
+    category: "ddc"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-chrome"
+    category: "ddc"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-chrome"
+    category: "ddc"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-firefox"
+    category: "ddc"
+    short_name: "f"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome-unsound"
+    category: "ddc"
+    short_name: "u"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-canary-linux-chrome"
+    category: "ddc"
+    short_name: "c"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
@@ -1264,36 +1294,6 @@ consoles {
     category: "analyzer"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-canary-linux-release-chrome"
-    category: "ddc"
-    short_name: "c"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome"
-    category: "ddc"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-nnbd-linux-release-chrome"
-    category: "ddc"
-    short_name: "nn"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome"
-    category: "ddc"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome"
-    category: "ddc"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox"
-    category: "ddc"
-    short_name: "fl"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/gclient"
     category: "misc"
@@ -1775,6 +1775,21 @@ consoles {
     category: "cfe|nnbd"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome-dev"
+    category: "ddc"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-chrome-dev"
+    category: "ddc"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-chrome-dev"
+    category: "ddc"
+    short_name: "w"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-dev"
     category: "vm|nnbd|jit"
@@ -2035,26 +2050,6 @@ consoles {
     category: "analyzer"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-dev"
-    category: "ddc"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-dev"
-    category: "ddc"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-dev"
-    category: "ddc"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-dev"
-    category: "ddc"
-    short_name: "fl"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/gclient-dev"
     category: "misc"
@@ -2166,6 +2161,21 @@ consoles {
     category: "cfe|nnbd"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome-beta"
+    category: "ddc"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-chrome-beta"
+    category: "ddc"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-chrome-beta"
+    category: "ddc"
+    short_name: "w"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-beta"
     category: "vm|nnbd|jit"
@@ -2426,26 +2436,6 @@ consoles {
     category: "analyzer"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-beta"
-    category: "ddc"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-beta"
-    category: "ddc"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-beta"
-    category: "ddc"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-beta"
-    category: "ddc"
-    short_name: "fl"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/gclient-beta"
     category: "misc"
@@ -2557,6 +2547,21 @@ consoles {
     category: "cfe|nnbd"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome-stable"
+    category: "ddc"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-chrome-stable"
+    category: "ddc"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-chrome-stable"
+    category: "ddc"
+    short_name: "w"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-stable"
     category: "vm|nnbd|jit"
@@ -2817,26 +2822,6 @@ consoles {
     category: "analyzer"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-release-chrome-stable"
-    category: "ddc"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-release-chrome-stable"
-    category: "ddc"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-release-chrome-stable"
-    category: "ddc"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddk-linux-release-firefox-stable"
-    category: "ddc"
-    short_name: "fl"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/gclient-stable"
     category: "misc"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 860a8a7f8724..93d737123389 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -221,7 +221,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "ddc-canary-linux-release-chrome"
+    name: "ddc-canary-linux-chrome"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -232,7 +232,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "ddc-linux-release-chrome"
+    name: "ddc-linux-chrome"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -243,7 +243,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "ddc-mac-release-chrome"
+    name: "ddc-linux-chrome-unsound"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -254,7 +254,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "ddc-nnbd-linux-release-chrome"
+    name: "ddc-linux-firefox"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -265,7 +265,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "ddc-win-release-chrome"
+    name: "ddc-mac-chrome"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -276,7 +276,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "ddk-linux-release-firefox"
+    name: "ddc-win-chrome"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index cccd6d8c66b9..93cead4225e6 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -645,183 +645,153 @@ job {
   }
 }
 job {
-  id: "ddc-canary-linux-release-chrome"
+  id: "ddc-canary-linux-chrome"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "ddc-canary-linux-release-chrome"
+    builder: "ddc-canary-linux-chrome"
   }
 }
 job {
-  id: "ddc-linux-release-chrome"
+  id: "ddc-linux-chrome"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "ddc-linux-release-chrome"
+    builder: "ddc-linux-chrome"
   }
 }
 job {
-  id: "ddc-linux-release-chrome-beta"
+  id: "ddc-linux-chrome-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "ddc-linux-release-chrome-beta"
+    builder: "ddc-linux-chrome-beta"
   }
 }
 job {
-  id: "ddc-linux-release-chrome-dev"
+  id: "ddc-linux-chrome-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "ddc-linux-release-chrome-dev"
+    builder: "ddc-linux-chrome-dev"
   }
 }
 job {
-  id: "ddc-linux-release-chrome-stable"
+  id: "ddc-linux-chrome-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "ddc-linux-release-chrome-stable"
+    builder: "ddc-linux-chrome-stable"
   }
 }
 job {
-  id: "ddc-mac-release-chrome"
+  id: "ddc-linux-chrome-unsound"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "ddc-mac-release-chrome"
+    builder: "ddc-linux-chrome-unsound"
   }
 }
 job {
-  id: "ddc-mac-release-chrome-beta"
+  id: "ddc-linux-firefox"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "ddc-mac-release-chrome-beta"
+    builder: "ddc-linux-firefox"
   }
 }
 job {
-  id: "ddc-mac-release-chrome-dev"
+  id: "ddc-mac-chrome"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "ddc-mac-release-chrome-dev"
+    builder: "ddc-mac-chrome"
   }
 }
 job {
-  id: "ddc-mac-release-chrome-stable"
+  id: "ddc-mac-chrome-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "ddc-mac-release-chrome-stable"
+    builder: "ddc-mac-chrome-beta"
   }
 }
 job {
-  id: "ddc-nnbd-linux-release-chrome"
+  id: "ddc-mac-chrome-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "ddc-nnbd-linux-release-chrome"
+    builder: "ddc-mac-chrome-dev"
   }
 }
 job {
-  id: "ddc-win-release-chrome"
+  id: "ddc-mac-chrome-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "ddc-win-release-chrome"
+    builder: "ddc-mac-chrome-stable"
   }
 }
 job {
-  id: "ddc-win-release-chrome-beta"
+  id: "ddc-win-chrome"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "ddc-win-release-chrome-beta"
+    builder: "ddc-win-chrome"
   }
 }
 job {
-  id: "ddc-win-release-chrome-dev"
+  id: "ddc-win-chrome-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "ddc-win-release-chrome-dev"
+    builder: "ddc-win-chrome-beta"
   }
 }
 job {
-  id: "ddc-win-release-chrome-stable"
+  id: "ddc-win-chrome-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "ddc-win-release-chrome-stable"
+    builder: "ddc-win-chrome-dev"
   }
 }
 job {
-  id: "ddk-linux-release-firefox"
+  id: "ddc-win-chrome-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "ddk-linux-release-firefox"
-  }
-}
-job {
-  id: "ddk-linux-release-firefox-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "ddk-linux-release-firefox-beta"
-  }
-}
-job {
-  id: "ddk-linux-release-firefox-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "ddk-linux-release-firefox-dev"
-  }
-}
-job {
-  id: "ddk-linux-release-firefox-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "ddk-linux-release-firefox-stable"
+    builder: "ddc-win-chrome-stable"
   }
 }
 job {
@@ -3032,10 +3002,9 @@ trigger {
   triggers: "dart2js-strong-mac-x64-safari-beta"
   triggers: "dart2js-strong-win-x64-chrome-beta"
   triggers: "dart2js-unit-linux-x64-release-beta"
-  triggers: "ddc-linux-release-chrome-beta"
-  triggers: "ddc-mac-release-chrome-beta"
-  triggers: "ddc-win-release-chrome-beta"
-  triggers: "ddk-linux-release-firefox-beta"
+  triggers: "ddc-linux-chrome-beta"
+  triggers: "ddc-mac-chrome-beta"
+  triggers: "ddc-win-chrome-beta"
   triggers: "front-end-linux-release-x64-beta"
   triggers: "front-end-mac-release-x64-beta"
   triggers: "front-end-nnbd-linux-release-x64-beta"
@@ -3101,10 +3070,9 @@ trigger {
   triggers: "dart2js-strong-mac-x64-safari-dev"
   triggers: "dart2js-strong-win-x64-chrome-dev"
   triggers: "dart2js-unit-linux-x64-release-dev"
-  triggers: "ddc-linux-release-chrome-dev"
-  triggers: "ddc-mac-release-chrome-dev"
-  triggers: "ddc-win-release-chrome-dev"
-  triggers: "ddk-linux-release-firefox-dev"
+  triggers: "ddc-linux-chrome-dev"
+  triggers: "ddc-mac-chrome-dev"
+  triggers: "ddc-win-chrome-dev"
   triggers: "front-end-linux-release-x64-dev"
   triggers: "front-end-mac-release-x64-dev"
   triggers: "front-end-nnbd-linux-release-x64-dev"
@@ -3189,11 +3157,10 @@ trigger {
   triggers: "dart2js-strong-mac-x64-safari"
   triggers: "dart2js-strong-win-x64-chrome"
   triggers: "dart2js-unit-linux-x64-release"
-  triggers: "ddc-linux-release-chrome"
-  triggers: "ddc-mac-release-chrome"
-  triggers: "ddc-nnbd-linux-release-chrome"
-  triggers: "ddc-win-release-chrome"
-  triggers: "ddk-linux-release-firefox"
+  triggers: "ddc-linux-chrome"
+  triggers: "ddc-linux-chrome-unsound"
+  triggers: "ddc-mac-chrome"
+  triggers: "ddc-win-chrome"
   triggers: "flutter-analyze"
   triggers: "flutter-frontend"
   triggers: "front-end-linux-release-x64"
@@ -3245,10 +3212,9 @@ trigger {
   triggers: "dart2js-strong-mac-x64-safari-stable"
   triggers: "dart2js-strong-win-x64-chrome-stable"
   triggers: "dart2js-unit-linux-x64-release-stable"
-  triggers: "ddc-linux-release-chrome-stable"
-  triggers: "ddc-mac-release-chrome-stable"
-  triggers: "ddc-win-release-chrome-stable"
-  triggers: "ddk-linux-release-firefox-stable"
+  triggers: "ddc-linux-chrome-stable"
+  triggers: "ddc-mac-chrome-stable"
+  triggers: "ddc-win-chrome-stable"
   triggers: "front-end-linux-release-x64-stable"
   triggers: "front-end-mac-release-x64-stable"
   triggers: "front-end-nnbd-linux-release-x64-stable"
@@ -3301,7 +3267,7 @@ trigger {
   realm: "ci"
   schedule: "0 5 * * *"
   triggers: "cross-vm-precomp-linux-release-arm64"
-  triggers: "ddc-canary-linux-release-chrome"
+  triggers: "ddc-canary-linux-chrome"
   triggers: "front-end-nnbd-mac-release-x64"
   triggers: "front-end-nnbd-win-release-x64"
   triggers: "pkg-linux-release-experimental"
@@ -3432,3 +3398,27 @@ trigger {
     path_regexps: "sdk/lib/_js_interop/.+"
   }
 }
+trigger {
+  id: "ddc-gitiles-trigger-main"
+  realm: "ci"
+  triggers: "ddc-linux-firefox"
+  gitiles {
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/main"
+    path_regexps: "DEPS"
+    path_regexps: "build/.+"
+    path_regexps: "BUILD.gn"
+    path_regexps: "sdk_args.gni"
+    path_regexps: ".dart_tool/package_config.json"
+    path_regexps: "sdk/lib/[^_].+"
+    path_regexps: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+    path_regexps: "tools/bots/test_matrix.json"
+    path_regexps: "tests/.+"
+    path_regexps: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+    path_regexps: "sdk/lib/_js_interop/.+"
+    path_regexps: "sdk/lib/_internal/js.+"
+    path_regexps: "pkg/(build_integration|dev_compiler|meta)/.+"
+    path_regexps: "utils/dartdevc/.+"
+    path_regexps: "pkg/(js|modular_test|sourcemap_testing)/.+"
+  }
+}
diff --git a/main.star b/main.star
index 058b9134a9d3..8eef98b8d5ca 100755
--- a/main.star
+++ b/main.star
@@ -312,6 +312,7 @@ dart.ci_builder(
 )
 
 exec("//dart2wasm.star")
+exec("//ddc.star")
 
 vm = exec("//vm.star")
 
@@ -533,44 +534,6 @@ dart.try_builder(
     recipe = "release/sdk",
 )
 
-# ddc
-cron.nightly_builder(
-    "ddc-canary-linux-release-chrome",
-    category = "ddc|c",
-    channels = ["try"],
-    properties = chrome,
-)
-dart.ci_sandbox_builder(
-    "ddc-linux-release-chrome",
-    category = "ddc|l",
-    location_filters = paths.to_location_filters(paths.ddc),
-    properties = chrome,
-)
-dart.ci_sandbox_builder(
-    "ddc-nnbd-linux-release-chrome",
-    category = "ddc|nn",
-    channels = ["try"],
-    location_filters = paths.to_location_filters(paths.ddc),
-    properties = chrome,
-)
-dart.ci_sandbox_builder(
-    "ddc-mac-release-chrome",
-    category = "ddc|m",
-    dimensions = mac,
-    properties = [chrome, pinned_xcode],
-)
-dart.ci_sandbox_builder(
-    "ddc-win-release-chrome",
-    category = "ddc|w",
-    dimensions = windows,
-    properties = chrome,
-)
-dart.ci_sandbox_builder(
-    "ddk-linux-release-firefox",
-    category = "ddc|fl",
-    properties = firefox,
-)
-
 # misc
 dart.ci_sandbox_builder("gclient", recipe = "dart/gclient", category = "misc|g")
 

From 8657c546aafb665f5d7270c74d9f75898569a545 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 24 Feb 2023 10:33:54 +0000
Subject: [PATCH 619/826] [infra] Unpin xcode

This workaround is no longer needed.

Fixes: https://github.com/dart-lang/sdk/issues/47948
Change-Id: Icdd45ada3ae59f044e264fb655963d1a278894ad
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/284640
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 generated/cr-buildbucket.cfg | 186 -----------------------------------
 lib/defaults.star            |   2 -
 main.star                    |  17 ++--
 vm.star                      |  13 +--
 4 files changed, 11 insertions(+), 207 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 26e195fb8edc..c77863d75c74 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -357,9 +357,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -400,9 +397,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -443,9 +437,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -486,9 +477,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1913,9 +1901,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1960,9 +1945,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2007,9 +1989,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2054,9 +2033,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2101,9 +2077,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2147,9 +2120,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2193,9 +2163,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2239,9 +2206,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4156,9 +4120,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4199,9 +4160,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4242,9 +4200,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4285,9 +4240,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4472,9 +4424,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5025,9 +4974,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5067,9 +5013,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5109,9 +5052,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5187,9 +5127,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5229,9 +5166,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5275,9 +5209,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5326,9 +5257,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5372,9 +5300,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5418,9 +5343,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6041,9 +5963,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8807,9 +8726,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8854,9 +8770,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8898,9 +8811,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8942,9 +8852,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8986,9 +8893,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9030,9 +8934,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9076,9 +8977,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9122,9 +9020,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9168,9 +9063,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9214,9 +9106,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9257,9 +9146,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9300,9 +9186,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9343,9 +9226,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10832,9 +10712,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10879,9 +10756,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10923,9 +10797,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10967,9 +10838,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11011,9 +10879,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12106,9 +11971,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12407,9 +12269,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12457,9 +12316,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12863,9 +12719,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12910,9 +12763,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14155,9 +14005,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14234,9 +14081,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14465,9 +14309,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14507,9 +14348,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14558,9 +14396,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14873,9 +14708,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16002,9 +15834,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16049,9 +15878,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16093,9 +15919,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16139,9 +15962,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16653,9 +16473,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16700,9 +16517,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$depot_tools/osx_sdk": {'
-        '    "sdk_version": "12d4e"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
diff --git a/lib/defaults.star b/lib/defaults.star
index b745a69477e4..fa250e107ada 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -20,7 +20,6 @@ _CHROME = {"custom_vars": {"download_chrome": True}}
 _EMSCRIPTEN = {"custom_vars": {"download_emscripten": True}}
 _FIREFOX = {"custom_vars": {"download_firefox": True}}
 _JS_ENGINES = {"custom_vars": {"checkout_javascript_engines": True}}
-_PINNED_XCODE = {"$depot_tools/osx_sdk": {"sdk_version": "12d4e"}}
 _SLOW_SHARDS = {"shard_timeout": (90 * time.minute) // time.second}
 
 _ARM64 = {"cpu": "arm64"}
@@ -84,5 +83,4 @@ emscripten = _EMSCRIPTEN
 firefox = _FIREFOX
 js_engines = _JS_ENGINES
 no_android = _NO_ANDROID
-pinned_xcode = _PINNED_XCODE
 slow_shards = _SLOW_SHARDS
diff --git a/main.star b/main.star
index 8eef98b8d5ca..b870ba2bf4b4 100755
--- a/main.star
+++ b/main.star
@@ -24,7 +24,6 @@ load(
     "js_engines",
     "mac",
     "no_android",
-    "pinned_xcode",
     "windows",
 )
 load("//lib/paths.star", "paths")
@@ -229,7 +228,6 @@ dart.ci_sandbox_builder(
     "front-end-mac-release-x64",
     category = "cfe|m",
     dimensions = mac,
-    properties = pinned_xcode,
 )
 dart.ci_sandbox_builder(
     "front-end-win-release-x64",
@@ -246,7 +244,6 @@ cron.nightly_builder(
     category = "cfe|nnbd|m",
     channels = ["try"],
     dimensions = mac,
-    properties = pinned_xcode,
 )
 cron.nightly_builder(
     "front-end-nnbd-win-release-x64",
@@ -321,20 +318,20 @@ dart.ci_sandbox_builder(
     "pkg-linux-release",
     category = "pkg|l",
     on_cq = True,
-    properties = [chrome, pinned_xcode],
+    properties = chrome,
 )
 dart.ci_sandbox_builder(
     "pkg-mac-release",
     category = "pkg|m",
     dimensions = mac,
-    properties = [chrome, pinned_xcode],
+    properties = chrome,
 )
 dart.ci_sandbox_builder(
     "pkg-mac-release-arm64",
     category = "pkg|m1",
     channels = ["try"],
     dimensions = [mac, arm64],
-    properties = [chrome, no_android, pinned_xcode],
+    properties = [chrome, no_android],
     experiments = {"dart.use_update_script": 100},
 )
 dart.ci_sandbox_builder(
@@ -390,7 +387,7 @@ dart.ci_sandbox_builder(
     "dart2js-strong-mac-x64-chrome",
     category = "dart2js|chrome|m",
     dimensions = mac,
-    properties = [chrome, pinned_xcode, no_android],
+    properties = [chrome, no_android],
 )
 dart.ci_sandbox_builder(
     "dart2js-strong-win-x64-chrome",
@@ -419,7 +416,7 @@ dart.ci_sandbox_builder(
     "dart2js-strong-mac-x64-safari",
     category = "dart2js|safari|m",
     dimensions = mac,
-    properties = [pinned_xcode, no_android],
+    properties = no_android,
 )
 
 # analyzer
@@ -446,7 +443,6 @@ dart.ci_sandbox_builder(
     category = "analyzer|m",
     channels = dart.channels,
     dimensions = mac,
-    properties = pinned_xcode,
 )
 dart.ci_sandbox_builder(
     "analyzer-win-release",
@@ -501,7 +497,7 @@ dart.try_builder(
 dart.try_builder(
     "dart-sdk-mac",
     dimensions = mac,
-    properties = [pinned_xcode, {"archs": ["x64"], "disable_bcid": True}],
+    properties = [{"archs": ["x64"], "disable_bcid": True}],
     location_filters = paths.to_location_filters(paths.release),
     recipe = "release/sdk",
 )
@@ -511,7 +507,6 @@ dart.try_builder(
     dimensions = [mac, arm64],
     properties = [
         no_android,
-        pinned_xcode,
         {"archs": ["arm64"], "disable_bcid": True},
     ],
     location_filters = paths.to_location_filters(paths.release),
diff --git a/vm.star b/vm.star
index c107f1b23690..8e0e7e36f80d 100644
--- a/vm.star
+++ b/vm.star
@@ -13,7 +13,6 @@ load(
     "focal",
     "mac",
     "no_android",
-    "pinned_xcode",
     "slow_shards",
     "windows",
 )
@@ -117,25 +116,24 @@ _nightly_builder(
     category = "vm|nnbd|jit|m1d",
     channels = ["try"],
     dimensions = [mac, arm64],
-    properties = [no_android, pinned_xcode, slow_shards],
+    properties = [no_android, slow_shards],
 )
 _builder(
     "vm-kernel-nnbd-mac-debug-x64",
     category = "vm|nnbd|jit|md",
     dimensions = mac,
-    properties = [pinned_xcode, slow_shards],
+    properties = slow_shards,
 )
 _builder(
     "vm-kernel-nnbd-mac-release-arm64",
     category = "vm|nnbd|jit|m1r",
     dimensions = [mac, arm64],
-    properties = [no_android, pinned_xcode],
+    properties = no_android,
 )
 _builder(
     "vm-kernel-nnbd-mac-release-x64",
     category = "vm|nnbd|jit|mr",
     dimensions = mac,
-    properties = pinned_xcode,
 )
 _nightly_builder(
     "vm-kernel-nnbd-win-release-ia32",
@@ -183,13 +181,13 @@ _extra_builder(
     category = "vm|nnbd|aot|m1",
     channels = ["try"],
     dimensions = [mac, arm64],
-    properties = [no_android, pinned_xcode, slow_shards],
+    properties = [no_android, slow_shards],
 )
 _extra_builder(
     "vm-kernel-precomp-nnbd-mac-release-simarm64",
     category = "vm|nnbd|aot|ma6",
     dimensions = mac,
-    properties = [pinned_xcode, slow_shards],
+    properties = slow_shards,
 )
 _extra_builder(
     "vm-kernel-precomp-nnbd-win-release-x64",
@@ -292,7 +290,6 @@ _nightly_builder(
     category = "vm|product|m",
     channels = ["try"],
     dimensions = mac,
-    properties = pinned_xcode,
 )
 _nightly_builder(
     "vm-aot-win-product-x64",

From 23c20287849ffb603536a629d030773120826df2 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 24 Feb 2023 10:33:54 +0000
Subject: [PATCH 620/826] [infra] Split up main.star

Change-Id: I641300e3adfbca07b8c4b894827d394f675e6067
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/284680
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 analyzer.star           |  53 +++++
 cfe.star                |  74 +++++++
 dart2js.star            |  87 ++++++++
 flutter.star            |  91 ++++++++
 generated/luci-milo.cfg |  88 ++++----
 main.star               | 445 +---------------------------------------
 monorepo.star           |  14 ++
 pkg.star                |  50 +++++
 sdk.star                | 140 +++++++++++++
 9 files changed, 559 insertions(+), 483 deletions(-)
 create mode 100644 analyzer.star
 create mode 100644 cfe.star
 create mode 100644 dart2js.star
 create mode 100644 flutter.star
 create mode 100644 pkg.star
 create mode 100644 sdk.star

diff --git a/analyzer.star b/analyzer.star
new file mode 100644
index 000000000000..c22676bce26a
--- /dev/null
+++ b/analyzer.star
@@ -0,0 +1,53 @@
+# Copyright (c) 2023 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Defines the analyzer builders.
+"""
+
+load("//lib/dart.star", "dart")
+load(
+    "//lib/defaults.star",
+    "mac",
+    "windows",
+)
+load("//lib/paths.star", "paths")
+
+dart.ci_sandbox_builder(
+    "flutter-analyze",
+    category = "analyzer|fa",
+    channels = ["try"],
+    execution_timeout = 45 * time.minute,
+)
+dart.ci_sandbox_builder(
+    "analyzer-analysis-server-linux",
+    category = "analyzer|as",
+    channels = dart.channels,
+    location_filters = paths.to_location_filters(paths.analyzer),
+)
+dart.ci_sandbox_builder(
+    "analyzer-linux-release",
+    category = "analyzer|l",
+    channels = dart.channels,
+    location_filters = paths.to_location_filters(paths.analyzer),
+)
+dart.ci_sandbox_builder(
+    "analyzer-mac-release",
+    category = "analyzer|m",
+    channels = dart.channels,
+    dimensions = mac,
+)
+dart.ci_sandbox_builder(
+    "analyzer-win-release",
+    category = "analyzer|w",
+    channels = dart.channels,
+    dimensions = windows,
+    experiments = {"dart.use_update_script": 100},
+)
+
+luci.console_view_entry(
+    builder = "flutter-analyze",
+    short_name = "fa",
+    category = "analyzer",
+    console_view = "flutter",
+)
diff --git a/cfe.star b/cfe.star
new file mode 100644
index 000000000000..adad0ddf73f5
--- /dev/null
+++ b/cfe.star
@@ -0,0 +1,74 @@
+# Copyright (c) 2023 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Defines the CFE builders.
+"""
+
+load("//lib/cron.star", "cron")
+load("//lib/dart.star", "dart")
+load(
+    "//lib/defaults.star",
+    "mac",
+    "windows",
+)
+load("//lib/paths.star", "paths")
+
+luci.notifier(
+    name = "frontend-team",
+    on_failure = True,
+    notify_emails = ["jensj@google.com"],
+)
+
+dart.ci_sandbox_builder(
+    "front-end-linux-release-x64",
+    category = "cfe|l",
+    on_cq = True,
+)
+dart.ci_sandbox_builder(
+    "front-end-mac-release-x64",
+    category = "cfe|m",
+    dimensions = mac,
+)
+dart.ci_sandbox_builder(
+    "front-end-win-release-x64",
+    category = "cfe|w",
+    dimensions = windows,
+)
+dart.ci_sandbox_builder(
+    "front-end-nnbd-linux-release-x64",
+    category = "cfe|nnbd|l",
+    location_filters = paths.to_location_filters(paths.cfe),
+)
+cron.nightly_builder(
+    "front-end-nnbd-mac-release-x64",
+    category = "cfe|nnbd|m",
+    channels = ["try"],
+    dimensions = mac,
+)
+cron.nightly_builder(
+    "front-end-nnbd-win-release-x64",
+    category = "cfe|nnbd|w",
+    channels = ["try"],
+    dimensions = windows,
+)
+dart.ci_sandbox_builder(
+    "flutter-frontend",
+    category = "cfe|fl",
+    channels = ["try"],
+    notifies = "frontend-team",
+    location_filters = paths.to_location_filters(paths.cfe_only),
+)
+cron.weekly_builder(
+    "frontend-weekly",
+    notifies = "frontend-team",
+    channels = [],
+    execution_timeout = 12 * time.hour,
+)
+
+luci.console_view_entry(
+    builder = "flutter-frontend",
+    short_name = "fl",
+    category = "fasta",
+    console_view = "flutter",
+)
diff --git a/dart2js.star b/dart2js.star
new file mode 100644
index 000000000000..54236ca65b7f
--- /dev/null
+++ b/dart2js.star
@@ -0,0 +1,87 @@
+# Copyright (c) 2023 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Defines the dart2js builders.
+"""
+
+load("//lib/dart.star", "dart")
+load(
+    "//lib/defaults.star",
+    "chrome",
+    "firefox",
+    "mac",
+    "no_android",
+    "windows",
+)
+load("//lib/paths.star", "paths")
+
+dart.ci_sandbox_builder(
+    "dart2js-canary-x64",
+    category = "dart2js|c",
+    properties = [chrome, no_android],
+)
+dart.ci_sandbox_builder(
+    "dart2js-strong-hostasserts-linux-ia32-d8",
+    category = "dart2js|d8|ha",
+    location_filters = paths.to_location_filters(paths.dart2js),
+    properties = no_android,
+)
+dart.ci_sandbox_builder(
+    "dart2js-minified-strong-linux-x64-d8",
+    category = "dart2js|d8|mi",
+    location_filters = paths.to_location_filters(paths.dart2js),
+    properties = no_android,
+)
+dart.ci_sandbox_builder(
+    "dart2js-unit-linux-x64-release",
+    category = "dart2js|d8|u",
+    location_filters = paths.to_location_filters(paths.dart2js),
+    properties = no_android,
+)
+dart.ci_sandbox_builder(
+    "dart2js-strong-linux-x64-chrome",
+    category = "dart2js|chrome|l",
+    location_filters = paths.to_location_filters(paths.dart2js),
+    properties = [chrome, no_android],
+)
+dart.ci_sandbox_builder(
+    "dart2js-csp-minified-linux-x64-chrome",
+    category = "dart2js|chrome|csp",
+    properties = [chrome, no_android],
+)
+dart.ci_sandbox_builder(
+    "dart2js-strong-mac-x64-chrome",
+    category = "dart2js|chrome|m",
+    dimensions = mac,
+    properties = [chrome, no_android],
+)
+dart.ci_sandbox_builder(
+    "dart2js-strong-win-x64-chrome",
+    category = "dart2js|chrome|w",
+    dimensions = windows,
+    properties = [chrome, no_android],
+)
+dart.ci_sandbox_builder(
+    "dart2js-nnbd-linux-x64-chrome",
+    category = "dart2js|chrome|nn",
+    location_filters = paths.to_location_filters(paths.dart2js),
+    properties = [chrome, no_android],
+)
+dart.ci_sandbox_builder(
+    "dart2js-strong-linux-x64-firefox",
+    category = "dart2js|firefox|l",
+    properties = [firefox, no_android],
+)
+dart.ci_sandbox_builder(
+    "dart2js-strong-win-x64-firefox",
+    dimensions = windows,
+    enabled = False,
+    properties = [firefox, no_android],
+)
+dart.ci_sandbox_builder(
+    "dart2js-strong-mac-x64-safari",
+    category = "dart2js|safari|m",
+    dimensions = mac,
+    properties = no_android,
+)
diff --git a/flutter.star b/flutter.star
new file mode 100644
index 000000000000..e078344e458c
--- /dev/null
+++ b/flutter.star
@@ -0,0 +1,91 @@
+# Copyright (c) 2023 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Defines the flutter builders.
+"""
+
+load("//lib/dart.star", "dart")
+
+luci.console_view(
+    name = "flutter",
+    repo = dart.git,
+    title = "Dart/Flutter Console",
+    refs = ["refs/heads/main"],
+)
+
+luci.console_view(
+    name = "flutter-hhh",
+    repo = "https://dart.googlesource.com/linear_sdk_flutter_engine",
+    title = "Dart/Flutter Linear History Console",
+    refs = ["refs/heads/master"],
+)
+
+luci.gitiles_poller(
+    name = "dart-gitiles-trigger-flutter",
+    bucket = "ci",
+    repo = "https://dart.googlesource.com/linear_sdk_flutter_engine/",
+    refs = ["refs/heads/master"],
+)
+
+luci.gitiles_poller(
+    name = "dart-gitiles-trigger-flutter-daily",
+    bucket = "ci",
+    repo = "https://dart.googlesource.com/linear_sdk_flutter_engine/",
+    refs = ["refs/heads/master"],
+    schedule = "0 8 * * *",  # daily, at 08:00 UTC
+)
+
+dart.ci_sandbox_builder(
+    "flutter-engine-linux",
+    recipe = "dart/flutter_engine",
+    category = "flutter|3H",
+    channels = ["try"],
+    execution_timeout = 8 * time.hour,
+    triggered_by = ["dart-gitiles-trigger-flutter"],
+    properties = [{
+        "bisection_enabled": True,
+        "flutter_test_suites": [
+            "add_to_app_life_cycle_tests",
+            "flutter_plugins",
+            "framework_coverage",
+            "framework_tests",
+            "tool_tests",
+        ],
+    }],
+)
+
+dart.try_builder(
+    "flutter-engine-linux-web_tests",
+    recipe = "dart/flutter_engine",
+    cq_branches = ["main"],
+    execution_timeout = 8 * time.hour,
+    properties = {
+        "flutter_test_suites": [
+            "web_tests",
+            "web_tool_tests",
+        ],
+    },
+)
+
+dart.ci_builder(
+    "flutter-engine-ios",
+    recipe = "flutter/engine",
+    category = "flutter|i",
+    channels = [],
+    execution_timeout = 2 * time.hour,
+    triggered_by = ["dart-gitiles-trigger-flutter-daily"],
+    notifies = None,
+)
+
+luci.console_view_entry(
+    builder = "flutter-engine-linux",
+    short_name = "3H",
+    console_view = "flutter-hhh",
+)
+
+luci.console_view_entry(
+    builder = "flutter-engine-ios",
+    short_name = "ios",
+    console_view = "flutter-hhh",
+)
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index ebd755e1c69b..7cee76e2b77d 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -7,6 +7,27 @@
 consoles {
   id: "cq"
   name: "SDK CQ Console"
+  builders {
+    name: "buildbucket/luci.dart.try/dart-sdk-linux-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/dart-sdk-linux-arm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/dart-sdk-linux-riscv64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/dart-sdk-mac-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/dart-sdk-mac-arm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/dart-sdk-win-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/dart-sdk-win-arm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/front-end-linux-release-x64-try"
   }
@@ -325,27 +346,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/analyzer-win-release-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/dart-sdk-linux-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/dart-sdk-linux-arm64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/dart-sdk-linux-riscv64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/dart-sdk-mac-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/dart-sdk-mac-arm64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/dart-sdk-win-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/dart-sdk-win-arm64-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/gclient-try"
   }
@@ -463,6 +463,11 @@ consoles {
     category: "sdk"
     short_name: "dp"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/google"
+    category: "sdk"
+    short_name: "g3"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
     category: "cfe"
@@ -1008,11 +1013,6 @@ consoles {
     category: "misc"
     short_name: "g"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/google"
-    category: "sdk"
-    short_name: "g3"
-  }
   header {
     links {
       name: "Consoles"
@@ -1109,6 +1109,11 @@ consoles {
     category: "sdk"
     short_name: "dp"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/google"
+    category: "sdk"
+    short_name: "g3"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
     category: "cfe"
@@ -1299,11 +1304,6 @@ consoles {
     category: "misc"
     short_name: "g"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/google"
-    category: "sdk"
-    short_name: "g3"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
     category: "vm|nnbd|jit"
@@ -2885,22 +2885,30 @@ consoles {
   }
   builder_view_only: true
 }
+consoles {
+  id: "iso-stress"
+  name: "VM Isolate Stress Test Console"
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/iso-stress-linux"
+  }
+  builder_view_only: true
+}
 consoles {
   id: "flutter"
   name: "Dart/Flutter Console"
   repo_url: "https://dart.googlesource.com/sdk"
   refs: "regexp:refs/heads/main"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
-    category: "analyzer"
-    short_name: "fa"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
     category: "fasta"
     short_name: "fl"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
+    category: "analyzer"
+    short_name: "fa"
+  }
 }
 consoles {
   id: "flutter-hhh"
@@ -2917,14 +2925,6 @@ consoles {
     short_name: "ios"
   }
 }
-consoles {
-  id: "iso-stress"
-  name: "VM Isolate Stress Test Console"
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/iso-stress-linux"
-  }
-  builder_view_only: true
-}
 consoles {
   id: "monorepo"
   name: "Monorepo Console"
diff --git a/main.star b/main.star
index b870ba2bf4b4..cae5dc228e68 100755
--- a/main.star
+++ b/main.star
@@ -16,18 +16,10 @@ load("//lib/cron.star", "cron")
 load("//lib/dart.star", "dart")
 load(
     "//lib/defaults.star",
-    "arm64",
-    "chrome",
     "experimental",
-    "firefox",
     "focal",
     "js_engines",
-    "mac",
-    "no_android",
-    "windows",
 )
-load("//lib/paths.star", "paths")
-load("//lib/priority.star", "priority")
 
 lucicfg.check_version("1.33.7")
 
@@ -96,83 +88,11 @@ luci.list_view(
     title = "Dart Fuzzer Console",
 )
 
-luci.console_view(
-    name = "flutter",
-    repo = dart.git,
-    title = "Dart/Flutter Console",
-    refs = ["refs/heads/main"],
-)
-
-luci.console_view(
-    name = "flutter-hhh",
-    repo = "https://dart.googlesource.com/linear_sdk_flutter_engine",
-    title = "Dart/Flutter Linear History Console",
-    refs = ["refs/heads/master"],
-)
-
 luci.list_view(
     name = "iso-stress",
     title = "VM Isolate Stress Test Console",
 )
 
-def sdk_builder_category():
-    """Put the SDK category first on the consoles"""
-    for channel, console in [
-        ["main", "be"],
-        ["main", "alt"],
-        ["beta", "beta"],
-        ["dev", "dev"],
-        ["stable", "stable"],
-    ]:
-        for builder_type, short_name in [
-            ["linux", "l"],
-            ["linux-arm64", "la"],
-            ["linux-riscv64", "lv"],
-            ["mac", "m"],
-            ["mac-arm64", "m1"],
-            ["win", "w"],
-            ["win-arm64", "wa"],
-        ]:
-            if channel not in ["beta", "stable"] or \
-               builder_type not in ["linux-riscv64", "win-arm64"]:
-                luci.console_view_entry(
-                    builder = "dart-internal:ci/dart-sdk-%s-%s" %
-                              (builder_type, channel),
-                    short_name = short_name,
-                    category = "sdk",
-                    console_view = console,
-                )
-        luci.console_view_entry(
-            builder = "dart-internal:ci/debianpackage-linux-%s" % channel,
-            short_name = "dp",
-            category = "sdk",
-            console_view = console,
-        )
-
-sdk_builder_category()
-
-luci.gitiles_poller(
-    name = "dart-gitiles-trigger-flutter",
-    bucket = "ci",
-    repo = "https://dart.googlesource.com/linear_sdk_flutter_engine/",
-    refs = ["refs/heads/master"],
-)
-
-luci.gitiles_poller(
-    name = "dart-gitiles-trigger-flutter-daily",
-    bucket = "ci",
-    repo = "https://dart.googlesource.com/linear_sdk_flutter_engine/",
-    refs = ["refs/heads/master"],
-    schedule = "0 8 * * *",  # daily, at 08:00 UTC
-)
-
-luci.gitiles_poller(
-    name = "dart-gitiles-trigger-monorepo",
-    bucket = "ci",
-    repo = "https://dart.googlesource.com/monorepo/",
-    refs = ["refs/heads/main"],
-)
-
 luci.gitiles_poller(
     name = "dart-ci-test-data-trigger",
     bucket = "ci",
@@ -206,344 +126,25 @@ luci.notifier(
     notify_emails = ["bkonyi@google.com"],
 )
 
-luci.notifier(
-    name = "frontend-team",
-    on_failure = True,
-    notify_emails = ["jensj@google.com"],
-)
-
 luci.notifier(
     name = "ci-test-data",
     on_success = True,
     on_failure = True,
 )
 
-# cfe
-dart.ci_sandbox_builder(
-    "front-end-linux-release-x64",
-    category = "cfe|l",
-    on_cq = True,
-)
-dart.ci_sandbox_builder(
-    "front-end-mac-release-x64",
-    category = "cfe|m",
-    dimensions = mac,
-)
-dart.ci_sandbox_builder(
-    "front-end-win-release-x64",
-    category = "cfe|w",
-    dimensions = windows,
-)
-dart.ci_sandbox_builder(
-    "front-end-nnbd-linux-release-x64",
-    category = "cfe|nnbd|l",
-    location_filters = paths.to_location_filters(paths.cfe),
-)
-cron.nightly_builder(
-    "front-end-nnbd-mac-release-x64",
-    category = "cfe|nnbd|m",
-    channels = ["try"],
-    dimensions = mac,
-)
-cron.nightly_builder(
-    "front-end-nnbd-win-release-x64",
-    category = "cfe|nnbd|w",
-    channels = ["try"],
-    dimensions = windows,
-)
-dart.ci_sandbox_builder(
-    "flutter-frontend",
-    category = "cfe|fl",
-    channels = ["try"],
-    notifies = "frontend-team",
-    location_filters = paths.to_location_filters(paths.cfe_only),
-)
-cron.weekly_builder(
-    "frontend-weekly",
-    notifies = "frontend-team",
-    channels = [],
-    execution_timeout = 12 * time.hour,
-)
-
-# flutter
-dart.ci_sandbox_builder(
-    "flutter-engine-linux",
-    recipe = "dart/flutter_engine",
-    category = "flutter|3H",
-    channels = ["try"],
-    execution_timeout = 8 * time.hour,
-    triggered_by = ["dart-gitiles-trigger-flutter"],
-    properties = [{
-        "bisection_enabled": True,
-        "flutter_test_suites": [
-            "add_to_app_life_cycle_tests",
-            "flutter_plugins",
-            "framework_coverage",
-            "framework_tests",
-            "tool_tests",
-        ],
-    }],
-)
-
-dart.try_builder(
-    "flutter-engine-linux-web_tests",
-    recipe = "dart/flutter_engine",
-    cq_branches = ["main"],
-    execution_timeout = 8 * time.hour,
-    properties = {
-        "flutter_test_suites": [
-            "web_tests",
-            "web_tool_tests",
-        ],
-    },
-)
-
-dart.ci_builder(
-    "flutter-engine-ios",
-    recipe = "flutter/engine",
-    category = "flutter|i",
-    channels = [],
-    execution_timeout = 2 * time.hour,
-    triggered_by = ["dart-gitiles-trigger-flutter-daily"],
-    notifies = None,
-)
-
+exec("//sdk.star")
+exec("//cfe.star")
+exec("//flutter.star")
 exec("//dart2wasm.star")
 exec("//ddc.star")
-
 vm = exec("//vm.star")
-
-# pkg
-dart.ci_sandbox_builder(
-    "pkg-linux-release",
-    category = "pkg|l",
-    on_cq = True,
-    properties = chrome,
-)
-dart.ci_sandbox_builder(
-    "pkg-mac-release",
-    category = "pkg|m",
-    dimensions = mac,
-    properties = chrome,
-)
-dart.ci_sandbox_builder(
-    "pkg-mac-release-arm64",
-    category = "pkg|m1",
-    channels = ["try"],
-    dimensions = [mac, arm64],
-    properties = [chrome, no_android],
-    experiments = {"dart.use_update_script": 100},
-)
-dart.ci_sandbox_builder(
-    "pkg-win-release",
-    category = "pkg|w",
-    dimensions = windows,
-    properties = chrome,
-    experiments = {"dart.use_update_script": 100},
-)
-dart.ci_sandbox_builder(
-    "pkg-linux-debug",
-    category = "pkg|ld",
-    channels = ["try"],
-    properties = chrome,
-)
-
-# dart2js
-dart.ci_sandbox_builder(
-    "dart2js-canary-x64",
-    category = "dart2js|c",
-    properties = [chrome, no_android],
-)
-dart.ci_sandbox_builder(
-    "dart2js-strong-hostasserts-linux-ia32-d8",
-    category = "dart2js|d8|ha",
-    location_filters = paths.to_location_filters(paths.dart2js),
-    properties = no_android,
-)
-dart.ci_sandbox_builder(
-    "dart2js-minified-strong-linux-x64-d8",
-    category = "dart2js|d8|mi",
-    location_filters = paths.to_location_filters(paths.dart2js),
-    properties = no_android,
-)
-dart.ci_sandbox_builder(
-    "dart2js-unit-linux-x64-release",
-    category = "dart2js|d8|u",
-    location_filters = paths.to_location_filters(paths.dart2js),
-    properties = no_android,
-)
-dart.ci_sandbox_builder(
-    "dart2js-strong-linux-x64-chrome",
-    category = "dart2js|chrome|l",
-    location_filters = paths.to_location_filters(paths.dart2js),
-    properties = [chrome, no_android],
-)
-dart.ci_sandbox_builder(
-    "dart2js-csp-minified-linux-x64-chrome",
-    category = "dart2js|chrome|csp",
-    properties = [chrome, no_android],
-)
-dart.ci_sandbox_builder(
-    "dart2js-strong-mac-x64-chrome",
-    category = "dart2js|chrome|m",
-    dimensions = mac,
-    properties = [chrome, no_android],
-)
-dart.ci_sandbox_builder(
-    "dart2js-strong-win-x64-chrome",
-    category = "dart2js|chrome|w",
-    dimensions = windows,
-    properties = [chrome, no_android],
-)
-dart.ci_sandbox_builder(
-    "dart2js-nnbd-linux-x64-chrome",
-    category = "dart2js|chrome|nn",
-    location_filters = paths.to_location_filters(paths.dart2js),
-    properties = [chrome, no_android],
-)
-dart.ci_sandbox_builder(
-    "dart2js-strong-linux-x64-firefox",
-    category = "dart2js|firefox|l",
-    properties = [firefox, no_android],
-)
-dart.ci_sandbox_builder(
-    "dart2js-strong-win-x64-firefox",
-    dimensions = windows,
-    enabled = False,
-    properties = [firefox, no_android],
-)
-dart.ci_sandbox_builder(
-    "dart2js-strong-mac-x64-safari",
-    category = "dart2js|safari|m",
-    dimensions = mac,
-    properties = no_android,
-)
-
-# analyzer
-dart.ci_sandbox_builder(
-    "flutter-analyze",
-    category = "analyzer|fa",
-    channels = ["try"],
-    execution_timeout = 45 * time.minute,
-)
-dart.ci_sandbox_builder(
-    "analyzer-analysis-server-linux",
-    category = "analyzer|as",
-    channels = dart.channels,
-    location_filters = paths.to_location_filters(paths.analyzer),
-)
-dart.ci_sandbox_builder(
-    "analyzer-linux-release",
-    category = "analyzer|l",
-    channels = dart.channels,
-    location_filters = paths.to_location_filters(paths.analyzer),
-)
-dart.ci_sandbox_builder(
-    "analyzer-mac-release",
-    category = "analyzer|m",
-    channels = dart.channels,
-    dimensions = mac,
-)
-dart.ci_sandbox_builder(
-    "analyzer-win-release",
-    category = "analyzer|w",
-    channels = dart.channels,
-    dimensions = windows,
-    experiments = {"dart.use_update_script": 100},
-)
-
-# sdk
-dart.try_builder(
-    "dart-sdk-linux",
-    properties = {
-        "$dart/build": {
-            "timeout": 100 * 60,  # 100 minutes,
-        },
-        "archs": ["ia32", "x64"],
-        "dartdoc_arch": "x64",
-        "disable_bcid": True,
-        "upload_version": True,
-    },
-    location_filters = paths.to_location_filters(paths.release),
-    recipe = "release/sdk",
-)
-
-dart.try_builder(
-    "dart-sdk-linux-arm64",
-    properties = {
-        "$dart/build": {
-            "timeout": 100 * 60,  # 100 minutes,
-        },
-        "archs": ["arm", "arm64"],
-        "disable_bcid": True,
-    },
-    location_filters = paths.to_location_filters(paths.release),
-    recipe = "release/sdk",
-)
-
-dart.try_builder(
-    "dart-sdk-linux-riscv64",
-    properties = {
-        "$dart/build": {
-            "timeout": 100 * 60,  # 100 minutes,
-        },
-        "archs": ["riscv64"],
-        "args": ["--no-clang"],
-        "disable_bcid": True,
-    },
-    recipe = "release/sdk",
-)
-
-dart.try_builder(
-    "dart-sdk-mac",
-    dimensions = mac,
-    properties = [{"archs": ["x64"], "disable_bcid": True}],
-    location_filters = paths.to_location_filters(paths.release),
-    recipe = "release/sdk",
-)
-
-dart.try_builder(
-    "dart-sdk-mac-arm64",
-    dimensions = [mac, arm64],
-    properties = [
-        no_android,
-        {"archs": ["arm64"], "disable_bcid": True},
-    ],
-    location_filters = paths.to_location_filters(paths.release),
-    recipe = "release/sdk",
-)
-
-dart.try_builder(
-    "dart-sdk-win",
-    dimensions = windows,
-    properties = {"archs": ["ia32", "x64"], "disable_bcid": True},
-    recipe = "release/sdk",
-    on_cq = True,
-)
-
-dart.try_builder(
-    "dart-sdk-win-arm64",
-    dimensions = windows,
-    properties = {"archs": ["arm64"], "disable_bcid": True},
-    location_filters = paths.to_location_filters(paths.release),
-    recipe = "release/sdk",
-)
+exec("//pkg.star")
+exec("//dart2js.star")
+exec("//analyzer.star")
 
 # misc
 dart.ci_sandbox_builder("gclient", recipe = "dart/gclient", category = "misc|g")
 
-# external
-dart.ci_sandbox_builder(
-    "google",
-    recipe = "dart/external",
-    category = "sdk|g3",
-    channels = [],
-    execution_timeout = 5 * time.minute,
-    notifies = None,
-    priority = priority.high,
-    triggered_by = None,
-)
-
 # Builders that test the dev Linux images. When the image autoroller detects
 # successful builds of these builders with a dev images, that dev image becomes
 # the new prod image. Newly created bots will than use the updated image. The
@@ -603,33 +204,6 @@ luci.list_view_entry(
     list_view = "dart-fuzz",
 )
 
-# Flutter consoles
-luci.console_view_entry(
-    builder = "flutter-analyze",
-    short_name = "fa",
-    category = "analyzer",
-    console_view = "flutter",
-)
-
-luci.console_view_entry(
-    builder = "flutter-frontend",
-    short_name = "fl",
-    category = "fasta",
-    console_view = "flutter",
-)
-
-luci.console_view_entry(
-    builder = "flutter-engine-linux",
-    short_name = "3H",
-    console_view = "flutter-hhh",
-)
-
-luci.console_view_entry(
-    builder = "flutter-engine-ios",
-    short_name = "ios",
-    console_view = "flutter-hhh",
-)
-
 # VM isolate stress test console
 luci.list_view_entry(
     builder = "iso-stress-linux",
@@ -660,11 +234,4 @@ dart.try_builder(
     properties = {"from_ref": "refs/heads/beta", "to_ref": "refs/heads/stable"},
 )
 
-dart.try_builder(
-    "monorepo-roller",
-    experiments = {"luci.non_production": 100},
-    recipe = "roller/monorepo",
-    execution_timeout = 30 * time.minute,
-)
-
 exec("//monorepo.star")
diff --git a/monorepo.star b/monorepo.star
index a3433b209f99..5d2e91d81f8c 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -8,6 +8,13 @@ Defines the monorepo builders.
 load("//lib/dart.star", "dart")
 load("//lib/priority.star", "priority")
 
+luci.gitiles_poller(
+    name = "dart-gitiles-trigger-monorepo",
+    bucket = "ci",
+    repo = "https://dart.googlesource.com/monorepo/",
+    refs = ["refs/heads/main"],
+)
+
 luci.console_view(
     name = "monorepo",
     repo = "https://dart.googlesource.com/monorepo",
@@ -32,6 +39,13 @@ luci.console_view(
     header = "console-header.textpb",
 )
 
+dart.try_builder(
+    "monorepo-roller",
+    experiments = {"luci.non_production": 100},
+    recipe = "roller/monorepo",
+    execution_timeout = 30 * time.minute,
+)
+
 dart.ci_sandbox_builder(
     name = "flutter-linux",
     channels = [],
diff --git a/pkg.star b/pkg.star
new file mode 100644
index 000000000000..eee2dfb27344
--- /dev/null
+++ b/pkg.star
@@ -0,0 +1,50 @@
+# Copyright (c) 2023 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Defines the pkg builders.
+"""
+
+load("//lib/dart.star", "dart")
+load(
+    "//lib/defaults.star",
+    "arm64",
+    "chrome",
+    "mac",
+    "no_android",
+    "windows",
+)
+
+dart.ci_sandbox_builder(
+    "pkg-linux-release",
+    category = "pkg|l",
+    on_cq = True,
+    properties = chrome,
+)
+dart.ci_sandbox_builder(
+    "pkg-mac-release",
+    category = "pkg|m",
+    dimensions = mac,
+    properties = chrome,
+)
+dart.ci_sandbox_builder(
+    "pkg-mac-release-arm64",
+    category = "pkg|m1",
+    channels = ["try"],
+    dimensions = [mac, arm64],
+    properties = [chrome, no_android],
+    experiments = {"dart.use_update_script": 100},
+)
+dart.ci_sandbox_builder(
+    "pkg-win-release",
+    category = "pkg|w",
+    dimensions = windows,
+    properties = chrome,
+    experiments = {"dart.use_update_script": 100},
+)
+dart.ci_sandbox_builder(
+    "pkg-linux-debug",
+    category = "pkg|ld",
+    channels = ["try"],
+    properties = chrome,
+)
diff --git a/sdk.star b/sdk.star
new file mode 100644
index 000000000000..ef724a94f00c
--- /dev/null
+++ b/sdk.star
@@ -0,0 +1,140 @@
+# Copyright (c) 2023 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Defines the sdk builders.
+"""
+
+load("//lib/dart.star", "dart")
+load(
+    "//lib/defaults.star",
+    "arm64",
+    "mac",
+    "no_android",
+    "windows",
+)
+load("//lib/paths.star", "paths")
+load("//lib/priority.star", "priority")
+
+def sdk_builder_category():
+    """Put the SDK category first on the consoles"""
+    for channel, console in [
+        ["main", "be"],
+        ["main", "alt"],
+        ["beta", "beta"],
+        ["dev", "dev"],
+        ["stable", "stable"],
+    ]:
+        for builder_type, short_name in [
+            ["linux", "l"],
+            ["linux-arm64", "la"],
+            ["linux-riscv64", "lv"],
+            ["mac", "m"],
+            ["mac-arm64", "m1"],
+            ["win", "w"],
+            ["win-arm64", "wa"],
+        ]:
+            if channel not in ["beta", "stable"] or \
+               builder_type not in ["linux-riscv64", "win-arm64"]:
+                luci.console_view_entry(
+                    builder = "dart-internal:ci/dart-sdk-%s-%s" %
+                              (builder_type, channel),
+                    short_name = short_name,
+                    category = "sdk",
+                    console_view = console,
+                )
+        luci.console_view_entry(
+            builder = "dart-internal:ci/debianpackage-linux-%s" % channel,
+            short_name = "dp",
+            category = "sdk",
+            console_view = console,
+        )
+
+sdk_builder_category()
+
+dart.try_builder(
+    "dart-sdk-linux",
+    properties = {
+        "$dart/build": {
+            "timeout": 100 * 60,  # 100 minutes,
+        },
+        "archs": ["ia32", "x64"],
+        "dartdoc_arch": "x64",
+        "disable_bcid": True,
+        "upload_version": True,
+    },
+    location_filters = paths.to_location_filters(paths.release),
+    recipe = "release/sdk",
+)
+
+dart.try_builder(
+    "dart-sdk-linux-arm64",
+    properties = {
+        "$dart/build": {
+            "timeout": 100 * 60,  # 100 minutes,
+        },
+        "archs": ["arm", "arm64"],
+        "disable_bcid": True,
+    },
+    location_filters = paths.to_location_filters(paths.release),
+    recipe = "release/sdk",
+)
+
+dart.try_builder(
+    "dart-sdk-linux-riscv64",
+    properties = {
+        "$dart/build": {
+            "timeout": 100 * 60,  # 100 minutes,
+        },
+        "archs": ["riscv64"],
+        "args": ["--no-clang"],
+        "disable_bcid": True,
+    },
+    recipe = "release/sdk",
+)
+
+dart.try_builder(
+    "dart-sdk-mac",
+    dimensions = mac,
+    properties = [{"archs": ["x64"], "disable_bcid": True}],
+    location_filters = paths.to_location_filters(paths.release),
+    recipe = "release/sdk",
+)
+
+dart.try_builder(
+    "dart-sdk-mac-arm64",
+    dimensions = [mac, arm64],
+    properties = [
+        no_android,
+        {"archs": ["arm64"], "disable_bcid": True},
+    ],
+    location_filters = paths.to_location_filters(paths.release),
+    recipe = "release/sdk",
+)
+
+dart.try_builder(
+    "dart-sdk-win",
+    dimensions = windows,
+    properties = {"archs": ["ia32", "x64"], "disable_bcid": True},
+    recipe = "release/sdk",
+    on_cq = True,
+)
+
+dart.try_builder(
+    "dart-sdk-win-arm64",
+    dimensions = windows,
+    properties = {"archs": ["arm64"], "disable_bcid": True},
+    location_filters = paths.to_location_filters(paths.release),
+    recipe = "release/sdk",
+)
+
+dart.ci_sandbox_builder(
+    "google",
+    recipe = "dart/external",
+    category = "sdk|g3",
+    channels = [],
+    execution_timeout = 5 * time.minute,
+    notifies = None,
+    priority = priority.high,
+    triggered_by = None,
+)

From e4c81ddf38e01bb5d78ab1ce94df51002032b0b0 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 24 Feb 2023 11:09:39 +0000
Subject: [PATCH 621/826] [infra] Move DDC back next to dart2js on consoles

Change-Id: I69e513cd2148dd86db68f37cfa25c0cfbb9e8069
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/285280
Commit-Queue: Jonas Termansen <sortie@google.com>
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 generated/luci-milo.cfg | 246 ++++++++++++++++++++--------------------
 main.star               |   2 +-
 2 files changed, 124 insertions(+), 124 deletions(-)

diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 7cee76e2b77d..6d6cd0dfd1e0 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -58,24 +58,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/dart2wasm-linux-x64-d8-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/ddc-linux-chrome-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/ddc-mac-chrome-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/ddc-win-chrome-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/ddc-linux-firefox-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/ddc-linux-chrome-unsound-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/ddc-canary-linux-chrome-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-x64-try"
   }
@@ -331,6 +313,24 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/dart2js-strong-mac-x64-safari-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/ddc-linux-chrome-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/ddc-mac-chrome-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/ddc-win-chrome-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/ddc-linux-firefox-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/ddc-linux-chrome-unsound-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/ddc-canary-linux-chrome-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/flutter-analyze-try"
   }
@@ -518,36 +518,6 @@ consoles {
     category: "d2w"
     short_name: "d"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome"
-    category: "ddc"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-chrome"
-    category: "ddc"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-chrome"
-    category: "ddc"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-firefox"
-    category: "ddc"
-    short_name: "f"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome-unsound"
-    category: "ddc"
-    short_name: "u"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-canary-linux-chrome"
-    category: "ddc"
-    short_name: "c"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
     category: "vm|nnbd|jit"
@@ -983,6 +953,36 @@ consoles {
     category: "dart2js|safari"
     short_name: "m"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome"
+    category: "ddc"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-chrome"
+    category: "ddc"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-chrome"
+    category: "ddc"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-firefox"
+    category: "ddc"
+    short_name: "f"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome-unsound"
+    category: "ddc"
+    short_name: "u"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-canary-linux-chrome"
+    category: "ddc"
+    short_name: "c"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
     category: "analyzer"
@@ -1164,36 +1164,6 @@ consoles {
     category: "d2w"
     short_name: "d"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome"
-    category: "ddc"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-chrome"
-    category: "ddc"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-chrome"
-    category: "ddc"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-firefox"
-    category: "ddc"
-    short_name: "f"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome-unsound"
-    category: "ddc"
-    short_name: "u"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-canary-linux-chrome"
-    category: "ddc"
-    short_name: "c"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
@@ -1274,6 +1244,36 @@ consoles {
     category: "dart2js|safari"
     short_name: "m"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome"
+    category: "ddc"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-chrome"
+    category: "ddc"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-chrome"
+    category: "ddc"
+    short_name: "w"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-firefox"
+    category: "ddc"
+    short_name: "f"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome-unsound"
+    category: "ddc"
+    short_name: "u"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-canary-linux-chrome"
+    category: "ddc"
+    short_name: "c"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
     category: "analyzer"
@@ -1775,21 +1775,6 @@ consoles {
     category: "cfe|nnbd"
     short_name: "l"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome-dev"
-    category: "ddc"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-chrome-dev"
-    category: "ddc"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-chrome-dev"
-    category: "ddc"
-    short_name: "w"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-dev"
     category: "vm|nnbd|jit"
@@ -2030,6 +2015,21 @@ consoles {
     category: "dart2js|safari"
     short_name: "m"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome-dev"
+    category: "ddc"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-chrome-dev"
+    category: "ddc"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-chrome-dev"
+    category: "ddc"
+    short_name: "w"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-dev"
     category: "analyzer"
@@ -2161,21 +2161,6 @@ consoles {
     category: "cfe|nnbd"
     short_name: "l"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome-beta"
-    category: "ddc"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-chrome-beta"
-    category: "ddc"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-chrome-beta"
-    category: "ddc"
-    short_name: "w"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-beta"
     category: "vm|nnbd|jit"
@@ -2416,6 +2401,21 @@ consoles {
     category: "dart2js|safari"
     short_name: "m"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome-beta"
+    category: "ddc"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-chrome-beta"
+    category: "ddc"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-chrome-beta"
+    category: "ddc"
+    short_name: "w"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-beta"
     category: "analyzer"
@@ -2547,21 +2547,6 @@ consoles {
     category: "cfe|nnbd"
     short_name: "l"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome-stable"
-    category: "ddc"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-chrome-stable"
-    category: "ddc"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-chrome-stable"
-    category: "ddc"
-    short_name: "w"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-stable"
     category: "vm|nnbd|jit"
@@ -2802,6 +2787,21 @@ consoles {
     category: "dart2js|safari"
     short_name: "m"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome-stable"
+    category: "ddc"
+    short_name: "l"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-chrome-stable"
+    category: "ddc"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-chrome-stable"
+    category: "ddc"
+    short_name: "w"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-stable"
     category: "analyzer"
diff --git a/main.star b/main.star
index cae5dc228e68..a3a7bb86c744 100755
--- a/main.star
+++ b/main.star
@@ -136,10 +136,10 @@ exec("//sdk.star")
 exec("//cfe.star")
 exec("//flutter.star")
 exec("//dart2wasm.star")
-exec("//ddc.star")
 vm = exec("//vm.star")
 exec("//pkg.star")
 exec("//dart2js.star")
+exec("//ddc.star")
 exec("//analyzer.star")
 
 # misc

From 0b64f6e2ee5c6befa522cba22284051303048d5c Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Fri, 24 Feb 2023 18:01:56 +0000
Subject: [PATCH 622/826] [infra] Re-categorize VM builders.

 - Remove "nnbd" group: this is the default.
 - Add "legacy" group: this is the exception.
 - Move RISC-V from "misc" to the normal groups: this port is complete and we publish an SDK for it.
 - Nest "product" under "aot".
 - Nest "android" under "aot".

Change-Id: I3a254ed5fd33e011b3a79f3f5f0cc07c7a07c203
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/285060
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/luci-milo.cfg | 894 ++++++++++++++++++++--------------------
 vm.star                 | 227 +++++-----
 2 files changed, 560 insertions(+), 561 deletions(-)

diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 6d6cd0dfd1e0..e935a54e0b31 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -76,6 +76,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-simarm64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-simriscv64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-debug-arm64-try"
   }
@@ -97,30 +100,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-release-x64-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-mac-release-arm64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-win-release-x64-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-appjit-linux-debug-x64-try"
   }
@@ -131,31 +110,31 @@ consoles {
     name: "buildbucket/luci.dart.try/vm-appjit-linux-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-checked-linux-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-ia32-try"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm-try"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-simriscv64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-mac-release-arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-dwarf-linux-product-x64-try"
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-win-release-x64-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-android-release-arm_x64-try"
@@ -235,12 +214,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-msvc-windows-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-simriscv64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-simriscv64-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm-try"
   }
@@ -265,6 +238,33 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-checked-linux-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-ia32-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-kernel-precomp-dwarf-linux-product-x64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/pkg-linux-release-try"
   }
@@ -520,107 +520,72 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "d"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "r"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-ia32"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "d3"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-ia32"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "r3"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "ra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm64"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "ra6"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-simriscv64"
+    category: "vm|jit"
+    short_name: "rv"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-arm64"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "m1d"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-x64"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "md"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-arm64"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "m1r"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-x64"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "mr"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-ia32"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "wr3"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "wd"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-x64"
-    category: "vm|nnbd|jit"
-    short_name: "wr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64"
-    category: "vm|nnbd|aot"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
-    category: "vm|nnbd|aot"
-    short_name: "da"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm_x64"
-    category: "vm|nnbd|aot"
-    short_name: "ra"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-x64"
-    category: "vm|nnbd|aot"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64"
-    category: "vm|nnbd|aot"
-    short_name: "ra6"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-arm64"
-    category: "vm|nnbd|aot"
-    short_name: "m1"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64"
-    category: "vm|nnbd|aot"
-    short_name: "ma6"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-release-x64"
-    category: "vm|nnbd|aot"
+    category: "vm|jit"
     short_name: "wr"
   }
   builders {
@@ -639,83 +604,73 @@ consoles {
     short_name: "p"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
-    category: "vm|kernel"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
-    category: "vm|kernel"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64"
+    category: "vm|aot"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
-    category: "vm|kernel"
-    short_name: "rc"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
-    category: "vm|kernel"
-    short_name: "wd3"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+    category: "vm|aot"
+    short_name: "da"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
-    category: "vm|kernel"
-    short_name: "cra"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+    category: "vm|aot"
+    short_name: "ra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
-    category: "vm|kernel-precomp"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-x64"
+    category: "vm|aot"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
-    category: "vm|kernel-precomp"
-    short_name: "a32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64"
+    category: "vm|aot"
+    short_name: "ra6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "r"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simriscv64"
+    category: "vm|aot"
+    short_name: "rv"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "o"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-arm64"
+    category: "vm|aot"
+    short_name: "m1"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-precomp-linux-release-arm64"
-    category: "vm|kernel-precomp"
-    short_name: "cra"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64"
+    category: "vm|aot"
+    short_name: "ma6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-dwarf-linux-product-x64"
-    category: "vm|kernel-precomp"
-    short_name: "dw"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-release-x64"
+    category: "vm|aot"
+    short_name: "wr"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm_x64"
-    category: "vm|android"
+    category: "vm|aot|android"
     short_name: "a32"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm64c"
-    category: "vm|android"
+    category: "vm|aot|android"
     short_name: "a64"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-product-x64"
-    category: "vm|product"
+    category: "vm|aot|product"
     short_name: "l"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-product-x64"
-    category: "vm|product"
+    category: "vm|aot|product"
     short_name: "m"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-product-x64"
-    category: "vm|product"
+    category: "vm|aot|product"
     short_name: "w"
   }
   builders {
@@ -823,16 +778,6 @@ consoles {
     category: "vm|misc"
     short_name: "m"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-simriscv64"
-    category: "vm|misc"
-    short_name: "rv64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simriscv64"
-    category: "vm|misc"
-    short_name: "rv64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
     category: "vm|ffi"
@@ -873,6 +818,61 @@ consoles {
     category: "vm|ffi"
     short_name: "qr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
+    category: "vm|legacy|jit"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
+    category: "vm|legacy|jit"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
+    category: "vm|legacy|jit"
+    short_name: "rc"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
+    category: "vm|legacy|jit"
+    short_name: "wd3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
+    category: "vm|legacy|jit"
+    short_name: "cra"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
+    category: "vm|legacy|aot"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
+    category: "vm|legacy|aot"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
+    category: "vm|legacy|aot"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
+    category: "vm|legacy|aot"
+    short_name: "o"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-precomp-linux-release-arm64"
+    category: "vm|legacy|aot"
+    short_name: "cra"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-dwarf-linux-product-x64"
+    category: "vm|legacy|aot"
+    short_name: "dw"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
@@ -1306,208 +1306,163 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "d"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "r"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-ia32"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "d3"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-ia32"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "r3"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "ra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm64"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "ra6"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-simriscv64"
+    category: "vm|jit"
+    short_name: "rv"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-arm64"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "m1d"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-x64"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "md"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-arm64"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "m1r"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-x64"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "mr"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-ia32"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "wr3"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "wd"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-x64"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "wr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-debug-x64"
+    category: "vm|appjit"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-release-x64"
+    category: "vm|appjit"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-product-x64"
+    category: "vm|appjit"
+    short_name: "p"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64"
-    category: "vm|nnbd|aot"
+    category: "vm|aot"
     short_name: "r"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
-    category: "vm|nnbd|aot"
+    category: "vm|aot"
     short_name: "da"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm_x64"
-    category: "vm|nnbd|aot"
+    category: "vm|aot"
     short_name: "ra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-x64"
-    category: "vm|nnbd|aot"
+    category: "vm|aot"
     short_name: "d"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64"
-    category: "vm|nnbd|aot"
+    category: "vm|aot"
     short_name: "ra6"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simriscv64"
+    category: "vm|aot"
+    short_name: "rv"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-arm64"
-    category: "vm|nnbd|aot"
+    category: "vm|aot"
     short_name: "m1"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64"
-    category: "vm|nnbd|aot"
+    category: "vm|aot"
     short_name: "ma6"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-release-x64"
-    category: "vm|nnbd|aot"
+    category: "vm|aot"
     short_name: "wr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-debug-x64"
-    category: "vm|appjit"
-    short_name: "d"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm_x64"
+    category: "vm|aot|android"
+    short_name: "a32"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-release-x64"
-    category: "vm|appjit"
-    short_name: "r"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm64c"
+    category: "vm|aot|android"
+    short_name: "a64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-product-x64"
-    category: "vm|appjit"
-    short_name: "p"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-product-x64"
+    category: "vm|aot|product"
+    short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
-    category: "vm|kernel"
-    short_name: "d"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-product-x64"
+    category: "vm|aot|product"
+    short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
-    category: "vm|kernel"
-    short_name: "r"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-product-x64"
+    category: "vm|aot|product"
+    short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
-    category: "vm|kernel"
-    short_name: "rc"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
-    category: "vm|kernel"
-    short_name: "wd3"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
-    category: "vm|kernel"
-    short_name: "cra"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
-    category: "vm|kernel-precomp"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
-    category: "vm|kernel-precomp"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
-    category: "vm|kernel-precomp"
-    short_name: "o"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-precomp-linux-release-arm64"
-    category: "vm|kernel-precomp"
-    short_name: "cra"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-dwarf-linux-product-x64"
-    category: "vm|kernel-precomp"
-    short_name: "dw"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm_x64"
-    category: "vm|android"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm64c"
-    category: "vm|android"
-    short_name: "a64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-product-x64"
-    category: "vm|product"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-product-x64"
-    category: "vm|product"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-product-x64"
-    category: "vm|product"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-eager-optimization-linux-release-ia32"
-    category: "vm|misc"
-    short_name: "o32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-eager-optimization-linux-release-ia32"
+    category: "vm|misc"
+    short_name: "o32"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-eager-optimization-linux-release-x64"
@@ -1609,16 +1564,6 @@ consoles {
     category: "vm|misc"
     short_name: "m"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-simriscv64"
-    category: "vm|misc"
-    short_name: "rv64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simriscv64"
-    category: "vm|misc"
-    short_name: "rv64"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
     category: "vm|ffi"
@@ -1659,6 +1604,61 @@ consoles {
     category: "vm|ffi"
     short_name: "qr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
+    category: "vm|legacy|jit"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
+    category: "vm|legacy|jit"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
+    category: "vm|legacy|jit"
+    short_name: "rc"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
+    category: "vm|legacy|jit"
+    short_name: "wd3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
+    category: "vm|legacy|jit"
+    short_name: "cra"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
+    category: "vm|legacy|aot"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
+    category: "vm|legacy|aot"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
+    category: "vm|legacy|aot"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
+    category: "vm|legacy|aot"
+    short_name: "o"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-precomp-linux-release-arm64"
+    category: "vm|legacy|aot"
+    short_name: "cra"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-dwarf-linux-product-x64"
+    category: "vm|legacy|aot"
+    short_name: "dw"
+  }
   header {
     links {
       name: "Consoles"
@@ -1777,132 +1777,97 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-dev"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "d"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-dev"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "r"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm-dev"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "ra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm64-dev"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "ra6"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-x64-dev"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "md"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-arm64-dev"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "m1r"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-x64-dev"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "mr"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64-dev"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "wd"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-x64-dev"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "wr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-debug-x64-dev"
+    category: "vm|appjit"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-release-x64-dev"
+    category: "vm|appjit"
+    short_name: "r"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-dev"
-    category: "vm|nnbd|aot"
+    category: "vm|aot"
     short_name: "r"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-dev"
-    category: "vm|nnbd|aot"
+    category: "vm|aot"
     short_name: "da"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm_x64-dev"
-    category: "vm|nnbd|aot"
+    category: "vm|aot"
     short_name: "ra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64-dev"
-    category: "vm|nnbd|aot"
+    category: "vm|aot"
     short_name: "ra6"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64-dev"
-    category: "vm|nnbd|aot"
+    category: "vm|aot"
     short_name: "ma6"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-release-x64-dev"
-    category: "vm|nnbd|aot"
+    category: "vm|aot"
     short_name: "wr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-debug-x64-dev"
-    category: "vm|appjit"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-release-x64-dev"
-    category: "vm|appjit"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-dev"
-    category: "vm|kernel"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-dev"
-    category: "vm|kernel"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-dev"
-    category: "vm|kernel"
-    short_name: "rc"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-dev"
-    category: "vm|kernel-precomp"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-    category: "vm|kernel-precomp"
-    short_name: "o"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm_x64-dev"
-    category: "vm|android"
+    category: "vm|aot|android"
     short_name: "a32"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm64c-dev"
-    category: "vm|android"
+    category: "vm|aot|android"
     short_name: "a64"
   }
   builders {
@@ -1945,6 +1910,41 @@ consoles {
     category: "vm|ffi"
     short_name: "qr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-dev"
+    category: "vm|legacy|jit"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-dev"
+    category: "vm|legacy|jit"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-dev"
+    category: "vm|legacy|jit"
+    short_name: "rc"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-dev"
+    category: "vm|legacy|aot"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-dev"
+    category: "vm|legacy|aot"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-dev"
+    category: "vm|legacy|aot"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+    category: "vm|legacy|aot"
+    short_name: "o"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
     category: "pkg"
@@ -2163,132 +2163,97 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-beta"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "d"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-beta"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "r"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm-beta"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "ra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm64-beta"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "ra6"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-x64-beta"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "md"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-arm64-beta"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "m1r"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-x64-beta"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "mr"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64-beta"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "wd"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-x64-beta"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "wr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-debug-x64-beta"
+    category: "vm|appjit"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-release-x64-beta"
+    category: "vm|appjit"
+    short_name: "r"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-beta"
-    category: "vm|nnbd|aot"
+    category: "vm|aot"
     short_name: "r"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-beta"
-    category: "vm|nnbd|aot"
+    category: "vm|aot"
     short_name: "da"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm_x64-beta"
-    category: "vm|nnbd|aot"
+    category: "vm|aot"
     short_name: "ra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64-beta"
-    category: "vm|nnbd|aot"
+    category: "vm|aot"
     short_name: "ra6"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64-beta"
-    category: "vm|nnbd|aot"
+    category: "vm|aot"
     short_name: "ma6"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-release-x64-beta"
-    category: "vm|nnbd|aot"
+    category: "vm|aot"
     short_name: "wr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-debug-x64-beta"
-    category: "vm|appjit"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-release-x64-beta"
-    category: "vm|appjit"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-beta"
-    category: "vm|kernel"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-beta"
-    category: "vm|kernel"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-beta"
-    category: "vm|kernel"
-    short_name: "rc"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-beta"
-    category: "vm|kernel-precomp"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-beta"
-    category: "vm|kernel-precomp"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-beta"
-    category: "vm|kernel-precomp"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-beta"
-    category: "vm|kernel-precomp"
-    short_name: "o"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm_x64-beta"
-    category: "vm|android"
+    category: "vm|aot|android"
     short_name: "a32"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm64c-beta"
-    category: "vm|android"
+    category: "vm|aot|android"
     short_name: "a64"
   }
   builders {
@@ -2331,6 +2296,41 @@ consoles {
     category: "vm|ffi"
     short_name: "qr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-beta"
+    category: "vm|legacy|jit"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-beta"
+    category: "vm|legacy|jit"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-beta"
+    category: "vm|legacy|jit"
+    short_name: "rc"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-beta"
+    category: "vm|legacy|aot"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-beta"
+    category: "vm|legacy|aot"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-beta"
+    category: "vm|legacy|aot"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+    category: "vm|legacy|aot"
+    short_name: "o"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-beta"
     category: "pkg"
@@ -2549,132 +2549,97 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-stable"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "d"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-stable"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "r"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm-stable"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "ra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm64-stable"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "ra6"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-x64-stable"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "md"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-arm64-stable"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "m1r"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-x64-stable"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "mr"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64-stable"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "wd"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-x64-stable"
-    category: "vm|nnbd|jit"
+    category: "vm|jit"
     short_name: "wr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-debug-x64-stable"
+    category: "vm|appjit"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-release-x64-stable"
+    category: "vm|appjit"
+    short_name: "r"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-stable"
-    category: "vm|nnbd|aot"
+    category: "vm|aot"
     short_name: "r"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-stable"
-    category: "vm|nnbd|aot"
+    category: "vm|aot"
     short_name: "da"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm_x64-stable"
-    category: "vm|nnbd|aot"
+    category: "vm|aot"
     short_name: "ra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64-stable"
-    category: "vm|nnbd|aot"
+    category: "vm|aot"
     short_name: "ra6"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64-stable"
-    category: "vm|nnbd|aot"
+    category: "vm|aot"
     short_name: "ma6"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-release-x64-stable"
-    category: "vm|nnbd|aot"
+    category: "vm|aot"
     short_name: "wr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-debug-x64-stable"
-    category: "vm|appjit"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-release-x64-stable"
-    category: "vm|appjit"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-stable"
-    category: "vm|kernel"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-stable"
-    category: "vm|kernel"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-stable"
-    category: "vm|kernel"
-    short_name: "rc"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-stable"
-    category: "vm|kernel-precomp"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-stable"
-    category: "vm|kernel-precomp"
-    short_name: "o"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm_x64-stable"
-    category: "vm|android"
+    category: "vm|aot|android"
     short_name: "a32"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm64c-stable"
-    category: "vm|android"
+    category: "vm|aot|android"
     short_name: "a64"
   }
   builders {
@@ -2717,6 +2682,41 @@ consoles {
     category: "vm|ffi"
     short_name: "qr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-stable"
+    category: "vm|legacy|jit"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-stable"
+    category: "vm|legacy|jit"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-stable"
+    category: "vm|legacy|jit"
+    short_name: "rc"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-stable"
+    category: "vm|legacy|aot"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-stable"
+    category: "vm|legacy|aot"
+    short_name: "a32"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-stable"
+    category: "vm|legacy|aot"
+    short_name: "r"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+    category: "vm|legacy|aot"
+    short_name: "o"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
     category: "pkg"
diff --git a/vm.star b/vm.star
index 8e0e7e36f80d..bbac8f2ffc8a 100644
--- a/vm.star
+++ b/vm.star
@@ -81,219 +81,174 @@ def add_postponed_alt_console_entries():
     for entry in _postponed_alt_console_entries:
         luci.console_view_entry(console_view = "alt", **entry)
 
-# vm|nnbd|jit
+# vm|jit
 _extra_builder(
     "vm-kernel-nnbd-linux-debug-x64",
-    category = "vm|nnbd|jit|d",
+    category = "vm|jit|d",
     on_cq = True,
 )
 _extra_builder(
     "vm-kernel-nnbd-linux-release-x64",
-    category = "vm|nnbd|jit|r",
+    category = "vm|jit|r",
     on_cq = True,
 )
 _nightly_builder(
     "vm-kernel-nnbd-linux-debug-ia32",
-    category = "vm|nnbd|jit|d3",
+    category = "vm|jit|d3",
     channels = ["try"],
     properties = slow_shards,
 )
 _nightly_builder(
     "vm-kernel-nnbd-linux-release-ia32",
-    category = "vm|nnbd|jit|r3",
+    category = "vm|jit|r3",
     channels = ["try"],
 )
 _extra_builder(
     "vm-kernel-nnbd-linux-release-simarm",
-    category = "vm|nnbd|jit|ra",
+    category = "vm|jit|ra",
 )
 _extra_builder(
     "vm-kernel-nnbd-linux-release-simarm64",
-    category = "vm|nnbd|jit|ra6",
+    category = "vm|jit|ra6",
+)
+_nightly_builder(
+    "vm-kernel-nnbd-linux-debug-simriscv64",
+    category = "vm|jit|rv",
+    channels = ["try"],
 )
 _nightly_builder(
     "vm-kernel-nnbd-mac-debug-arm64",
-    category = "vm|nnbd|jit|m1d",
+    category = "vm|jit|m1d",
     channels = ["try"],
     dimensions = [mac, arm64],
     properties = [no_android, slow_shards],
 )
 _builder(
     "vm-kernel-nnbd-mac-debug-x64",
-    category = "vm|nnbd|jit|md",
+    category = "vm|jit|md",
     dimensions = mac,
     properties = slow_shards,
 )
 _builder(
     "vm-kernel-nnbd-mac-release-arm64",
-    category = "vm|nnbd|jit|m1r",
+    category = "vm|jit|m1r",
     dimensions = [mac, arm64],
     properties = no_android,
 )
 _builder(
     "vm-kernel-nnbd-mac-release-x64",
-    category = "vm|nnbd|jit|mr",
+    category = "vm|jit|mr",
     dimensions = mac,
 )
 _nightly_builder(
     "vm-kernel-nnbd-win-release-ia32",
-    category = "vm|nnbd|jit|wr3",
+    category = "vm|jit|wr3",
     channels = ["try"],
     dimensions = windows,
 )
 _builder(
     "vm-kernel-nnbd-win-debug-x64",
-    category = "vm|nnbd|jit|wd",
+    category = "vm|jit|wd",
     properties = slow_shards,
     dimensions = windows,
 )
 _builder(
     "vm-kernel-nnbd-win-release-x64",
-    category = "vm|nnbd|jit|wr",
+    category = "vm|jit|wr",
     dimensions = windows,
 )
 
-# vm|nnbd|aot
+# vm|appjit
+_extra_builder(
+    "vm-appjit-linux-debug-x64",
+    category = "vm|appjit|d",
+    properties = slow_shards,
+)
+_extra_builder(
+    "vm-appjit-linux-release-x64",
+    category = "vm|appjit|r",
+)
+_nightly_builder(
+    "vm-appjit-linux-product-x64",
+    category = "vm|appjit|p",
+    channels = ["try"],
+)
+
+# vm|aot
 _extra_builder(
     "vm-kernel-precomp-nnbd-linux-release-x64",
-    category = "vm|nnbd|aot|r",
+    category = "vm|aot|r",
 )
 _extra_builder(
     "vm-kernel-precomp-nnbd-linux-debug-simarm_x64",
-    category = "vm|nnbd|aot|da",
+    category = "vm|aot|da",
 )
 _extra_builder(
     "vm-kernel-precomp-nnbd-linux-release-simarm_x64",
-    category = "vm|nnbd|aot|ra",
+    category = "vm|aot|ra",
 )
 _nightly_builder(
     "vm-kernel-precomp-nnbd-linux-debug-x64",
-    category = "vm|nnbd|aot|d",
+    category = "vm|aot|d",
     channels = ["try"],
     properties = slow_shards,
 )
 _extra_builder(
     "vm-kernel-precomp-nnbd-linux-release-simarm64",
-    category = "vm|nnbd|aot|ra6",
+    category = "vm|aot|ra6",
+)
+_nightly_builder(
+    "vm-kernel-precomp-nnbd-linux-debug-simriscv64",
+    category = "vm|aot|rv",
+    channels = ["try"],
+    properties = [slow_shards],
 )
 _extra_builder(
     "vm-kernel-precomp-nnbd-mac-release-arm64",
-    category = "vm|nnbd|aot|m1",
+    category = "vm|aot|m1",
     channels = ["try"],
     dimensions = [mac, arm64],
     properties = [no_android, slow_shards],
 )
 _extra_builder(
     "vm-kernel-precomp-nnbd-mac-release-simarm64",
-    category = "vm|nnbd|aot|ma6",
+    category = "vm|aot|ma6",
     dimensions = mac,
     properties = slow_shards,
 )
 _extra_builder(
     "vm-kernel-precomp-nnbd-win-release-x64",
-    category = "vm|nnbd|aot|wr",
+    category = "vm|aot|wr",
     dimensions = windows,
 )
 
-# vm|appjit
-_extra_builder(
-    "vm-appjit-linux-debug-x64",
-    category = "vm|appjit|d",
-    properties = slow_shards,
-)
-_extra_builder(
-    "vm-appjit-linux-release-x64",
-    category = "vm|appjit|r",
-)
-_nightly_builder(
-    "vm-appjit-linux-product-x64",
-    category = "vm|appjit|p",
-    channels = ["try"],
-)
-
-#vm|kernel
-_builder("vm-kernel-linux-debug-x64", category = "vm|kernel|d")
-_builder(
-    "vm-kernel-linux-release-x64",
-    category = "vm|kernel|r",
-    on_cq = True,
-)
-_extra_builder(
-    "vm-kernel-checked-linux-release-x64",
-    category = "vm|kernel|rc",
-    experiments = {"dart.use_update_script": 100},
-)
-_nightly_builder(
-    "vm-kernel-win-debug-ia32",
-    category = "vm|kernel|wd3",
-    channels = ["try"],
-    dimensions = windows,
-    properties = [slow_shards],
-)
-_extra_builder(
-    "cross-vm-linux-release-arm64",
-    category = "vm|kernel|cra",
-    channels = [],
-    execution_timeout = 4 * time.hour,
-    properties = {"shard_timeout": (120 * time.minute) // time.second},
-)
-
-# vm|kernel-precomp
-_extra_builder(
-    "vm-kernel-precomp-linux-debug-x64",
-    category = "vm|kernel-precomp|d",
-)
-_extra_builder(
-    "vm-kernel-precomp-linux-release-simarm",
-    category = "vm|kernel-precomp|a32",
-)
-_extra_builder(
-    "vm-kernel-precomp-linux-release-x64",
-    category = "vm|kernel-precomp|r",
-)
-_extra_builder(
-    "vm-kernel-precomp-obfuscate-linux-release-x64",
-    category = "vm|kernel-precomp|o",
-)
-_nightly_builder(
-    "cross-vm-precomp-linux-release-arm64",
-    category = "vm|kernel-precomp|cra",
-    channels = [],
-    properties = slow_shards,
-)
-_nightly_builder(
-    "vm-kernel-precomp-dwarf-linux-product-x64",
-    category = "vm|kernel-precomp|dw",
-    channels = ["try"],
-)
-
-# vm|android
+# vm|aot|android
 _extra_builder(
     "vm-aot-android-release-arm_x64",
-    category = "vm|android|a32",
+    category = "vm|aot|android|a32",
     properties = slow_shards,
 )
 _extra_builder(
     "vm-aot-android-release-arm64c",
-    category = "vm|android|a64",
+    category = "vm|aot|android|a64",
     properties = slow_shards,
 )
 
-# vm|product
+# vm|aot|product
 _nightly_builder(
     "vm-aot-linux-product-x64",
-    category = "vm|product|l",
+    category = "vm|aot|product|l",
     channels = ["try"],
 )
 _nightly_builder(
     "vm-aot-mac-product-x64",
-    category = "vm|product|m",
+    category = "vm|aot|product|m",
     channels = ["try"],
     dimensions = mac,
 )
 _nightly_builder(
     "vm-aot-win-product-x64",
-    category = "vm|product|w",
+    category = "vm|aot|product|w",
     channels = ["try"],
     dimensions = windows,
 )
@@ -417,18 +372,6 @@ _nightly_builder(
     goma = False,
 )
 
-_nightly_builder(
-    "vm-kernel-nnbd-linux-debug-simriscv64",
-    category = "vm|misc|rv64",
-    channels = ["try"],
-)
-_nightly_builder(
-    "vm-kernel-precomp-nnbd-linux-debug-simriscv64",
-    category = "vm|misc|rv64",
-    channels = ["try"],
-    properties = [slow_shards],
-)
-
 # vm|ffi
 _extra_builder("vm-ffi-android-debug-arm", category = "vm|ffi|d32")
 _extra_builder("vm-ffi-android-release-arm", category = "vm|ffi|r32")
@@ -447,6 +390,62 @@ _extra_builder(
     dimensions = focal,
 )
 
+#vm|legacy|jit
+_builder("vm-kernel-linux-debug-x64", category = "vm|legacy|jit|d")
+_builder(
+    "vm-kernel-linux-release-x64",
+    category = "vm|legacy|jit|r",
+    on_cq = True,
+)
+_extra_builder(
+    "vm-kernel-checked-linux-release-x64",
+    category = "vm|legacy|jit|rc",
+    experiments = {"dart.use_update_script": 100},
+)
+_nightly_builder(
+    "vm-kernel-win-debug-ia32",
+    category = "vm|legacy|jit|wd3",
+    channels = ["try"],
+    dimensions = windows,
+    properties = [slow_shards],
+)
+_extra_builder(
+    "cross-vm-linux-release-arm64",
+    category = "vm|legacy|jit|cra",
+    channels = [],
+    execution_timeout = 4 * time.hour,
+    properties = {"shard_timeout": (120 * time.minute) // time.second},
+)
+
+# vm|legacy|aot
+_extra_builder(
+    "vm-kernel-precomp-linux-debug-x64",
+    category = "vm|legacy|aot|d",
+)
+_extra_builder(
+    "vm-kernel-precomp-linux-release-simarm",
+    category = "vm|legacy|aot|a32",
+)
+_extra_builder(
+    "vm-kernel-precomp-linux-release-x64",
+    category = "vm|legacy|aot|r",
+)
+_extra_builder(
+    "vm-kernel-precomp-obfuscate-linux-release-x64",
+    category = "vm|legacy|aot|o",
+)
+_nightly_builder(
+    "cross-vm-precomp-linux-release-arm64",
+    category = "vm|legacy|aot|cra",
+    channels = [],
+    properties = slow_shards,
+)
+_nightly_builder(
+    "vm-kernel-precomp-dwarf-linux-product-x64",
+    category = "vm|legacy|aot|dw",
+    channels = ["try"],
+)
+
 # Isolate stress test builder
 _extra_builder(
     "iso-stress-linux",

From af37f9b7766034534608313eac4b16e532efee0f Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 28 Feb 2023 12:04:18 +0000
Subject: [PATCH 623/826] [infra] Remove legacy mac/win CFE builders

Keep the Linux builder until legacy support is removed from the CFE.

Change-Id: I561913e29cada0a74c145221135cfa78c3f142ba
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/285624
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cfe.star                     |  10 -
 generated/commit-queue.cfg   |  32 ---
 generated/cr-buildbucket.cfg | 380 -----------------------------------
 generated/luci-milo.cfg      |  56 ------
 generated/luci-notify.cfg    |  22 --
 generated/luci-scheduler.cfg |  88 --------
 6 files changed, 588 deletions(-)

diff --git a/cfe.star b/cfe.star
index adad0ddf73f5..caa6fa3b5f6f 100644
--- a/cfe.star
+++ b/cfe.star
@@ -25,16 +25,6 @@ dart.ci_sandbox_builder(
     category = "cfe|l",
     on_cq = True,
 )
-dart.ci_sandbox_builder(
-    "front-end-mac-release-x64",
-    category = "cfe|m",
-    dimensions = mac,
-)
-dart.ci_sandbox_builder(
-    "front-end-win-release-x64",
-    category = "cfe|w",
-    dimensions = windows,
-)
 dart.ci_sandbox_builder(
     "front-end-nnbd-linux-release-x64",
     category = "cfe|nnbd|l",
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 79c17aad97f0..cb932fb7d412 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -756,10 +756,6 @@ config_groups {
       builders {
         name: "dart/try/front-end-linux-release-x64-try"
       }
-      builders {
-        name: "dart/try/front-end-mac-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/front-end-nnbd-linux-release-x64-try"
         location_filters {
@@ -813,10 +809,6 @@ config_groups {
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
       }
-      builders {
-        name: "dart/try/front-end-win-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/gclient-try"
         includable_only: true
@@ -1815,10 +1807,6 @@ config_groups {
       builders {
         name: "dart/try/front-end-linux-release-x64-try"
       }
-      builders {
-        name: "dart/try/front-end-mac-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/front-end-nnbd-linux-release-x64-try"
         location_filters {
@@ -1872,10 +1860,6 @@ config_groups {
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
       }
-      builders {
-        name: "dart/try/front-end-win-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/gclient-try"
         includable_only: true
@@ -3094,10 +3078,6 @@ config_groups {
       builders {
         name: "dart/try/front-end-linux-release-x64-try"
       }
-      builders {
-        name: "dart/try/front-end-mac-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/front-end-nnbd-linux-release-x64-try"
         location_filters {
@@ -3159,10 +3139,6 @@ config_groups {
         name: "dart/try/front-end-nnbd-win-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/front-end-win-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/gclient-try"
         includable_only: true
@@ -4309,10 +4285,6 @@ config_groups {
       builders {
         name: "dart/try/front-end-linux-release-x64-try"
       }
-      builders {
-        name: "dart/try/front-end-mac-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/front-end-nnbd-linux-release-x64-try"
         location_filters {
@@ -4366,10 +4338,6 @@ config_groups {
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
       }
-      builders {
-        name: "dart/try/front-end-win-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/gclient-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index c77863d75c74..99ee6a6cad64 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -4101,166 +4101,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "front-end-mac-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-mac-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-mac-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-mac-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "front-end-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -4481,150 +4321,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "front-end-win-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-win-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-win-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-win-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "frontend-weekly"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13986,46 +13682,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "front-end-mac-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "front-end-nnbd-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -14138,42 +13794,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "front-end-win-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "gclient-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index e935a54e0b31..ece06f0794e7 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -31,12 +31,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/front-end-linux-release-x64-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/front-end-mac-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/front-end-win-release-x64-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/front-end-nnbd-linux-release-x64-try"
   }
@@ -473,16 +467,6 @@ consoles {
     category: "cfe"
     short_name: "l"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
-    category: "cfe"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
-    category: "cfe"
-    short_name: "w"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64"
     category: "cfe|nnbd"
@@ -1119,16 +1103,6 @@ consoles {
     category: "cfe"
     short_name: "l"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64"
-    category: "cfe"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64"
-    category: "cfe"
-    short_name: "w"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64"
     category: "cfe|nnbd"
@@ -1760,16 +1734,6 @@ consoles {
     category: "cfe"
     short_name: "l"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-dev"
-    category: "cfe"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-dev"
-    category: "cfe"
-    short_name: "w"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-dev"
     category: "cfe|nnbd"
@@ -2146,16 +2110,6 @@ consoles {
     category: "cfe"
     short_name: "l"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-beta"
-    category: "cfe"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-beta"
-    category: "cfe"
-    short_name: "w"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-beta"
     category: "cfe|nnbd"
@@ -2532,16 +2486,6 @@ consoles {
     category: "cfe"
     short_name: "l"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-mac-release-x64-stable"
-    category: "cfe"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-win-release-x64-stable"
-    category: "cfe"
-    short_name: "w"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-stable"
     category: "cfe|nnbd"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 93d737123389..3f5f2cf8a430 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -326,17 +326,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "front-end-mac-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -368,17 +357,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "front-end-win-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 93cead4225e6..f119acd942e8 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -884,46 +884,6 @@ job {
     builder: "front-end-linux-release-x64-stable"
   }
 }
-job {
-  id: "front-end-mac-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "front-end-mac-release-x64"
-  }
-}
-job {
-  id: "front-end-mac-release-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "front-end-mac-release-x64-beta"
-  }
-}
-job {
-  id: "front-end-mac-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "front-end-mac-release-x64-dev"
-  }
-}
-job {
-  id: "front-end-mac-release-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "front-end-mac-release-x64-stable"
-  }
-}
 job {
   id: "front-end-nnbd-linux-release-x64"
   realm: "ci.sandbox"
@@ -984,46 +944,6 @@ job {
     builder: "front-end-nnbd-win-release-x64"
   }
 }
-job {
-  id: "front-end-win-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "front-end-win-release-x64"
-  }
-}
-job {
-  id: "front-end-win-release-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "front-end-win-release-x64-beta"
-  }
-}
-job {
-  id: "front-end-win-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "front-end-win-release-x64-dev"
-  }
-}
-job {
-  id: "front-end-win-release-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "front-end-win-release-x64-stable"
-  }
-}
 job {
   id: "frontend-weekly"
   realm: "ci.sandbox"
@@ -3006,9 +2926,7 @@ trigger {
   triggers: "ddc-mac-chrome-beta"
   triggers: "ddc-win-chrome-beta"
   triggers: "front-end-linux-release-x64-beta"
-  triggers: "front-end-mac-release-x64-beta"
   triggers: "front-end-nnbd-linux-release-x64-beta"
-  triggers: "front-end-win-release-x64-beta"
   triggers: "gclient-beta"
   triggers: "pkg-linux-release-beta"
   triggers: "pkg-mac-release-beta"
@@ -3074,9 +2992,7 @@ trigger {
   triggers: "ddc-mac-chrome-dev"
   triggers: "ddc-win-chrome-dev"
   triggers: "front-end-linux-release-x64-dev"
-  triggers: "front-end-mac-release-x64-dev"
   triggers: "front-end-nnbd-linux-release-x64-dev"
-  triggers: "front-end-win-release-x64-dev"
   triggers: "gclient-dev"
   triggers: "pkg-linux-release-dev"
   triggers: "pkg-mac-release-dev"
@@ -3164,9 +3080,7 @@ trigger {
   triggers: "flutter-analyze"
   triggers: "flutter-frontend"
   triggers: "front-end-linux-release-x64"
-  triggers: "front-end-mac-release-x64"
   triggers: "front-end-nnbd-linux-release-x64"
-  triggers: "front-end-win-release-x64"
   triggers: "gclient"
   triggers: "pkg-linux-debug"
   triggers: "pkg-linux-release"
@@ -3216,9 +3130,7 @@ trigger {
   triggers: "ddc-mac-chrome-stable"
   triggers: "ddc-win-chrome-stable"
   triggers: "front-end-linux-release-x64-stable"
-  triggers: "front-end-mac-release-x64-stable"
   triggers: "front-end-nnbd-linux-release-x64-stable"
-  triggers: "front-end-win-release-x64-stable"
   triggers: "gclient-stable"
   triggers: "pkg-linux-release-stable"
   triggers: "pkg-mac-release-stable"

From 97ba4b7d07cbb5ae78cdd382f95601b1347b0176 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Wed, 1 Mar 2023 09:42:49 +0000
Subject: [PATCH 624/826] [infra] Move Linux ARM64 to NNBD.

Change-Id: I836b8888cb613988536b5d7f5b2fc5ca06debd28
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/285402
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 150 +++++++++++++++++------------------
 generated/luci-milo.cfg      |  40 +++++-----
 generated/luci-notify.cfg    |  48 +++++------
 generated/luci-scheduler.cfg |  44 +++++-----
 vm.star                      |  26 +++---
 5 files changed, 154 insertions(+), 154 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 99ee6a6cad64..d4f6b94c4599 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -695,81 +695,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "cross-vm-linux-release-arm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 7200'
-        '}'
-      priority: 50
-      execution_timeout_secs: 14400
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "cross-vm-precomp-linux-release-arm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "dart2js-canary-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -5640,6 +5565,43 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-linux-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-mac-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10958,6 +10920,44 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-linux-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 7200'
+        '}'
+      priority: 50
+      execution_timeout_secs: 14400
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-msan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index ece06f0794e7..b30315b4da4c 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -537,6 +537,11 @@ consoles {
     category: "vm|jit"
     short_name: "rv"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-arm64"
+    category: "vm|jit"
+    short_name: "a6"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-arm64"
     category: "vm|jit"
@@ -617,6 +622,11 @@ consoles {
     category: "vm|aot"
     short_name: "rv"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-arm64"
+    category: "vm|aot"
+    short_name: "a6"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-arm64"
     category: "vm|aot"
@@ -822,11 +832,6 @@ consoles {
     category: "vm|legacy|jit"
     short_name: "wd3"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
-    category: "vm|legacy|jit"
-    short_name: "cra"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
     category: "vm|legacy|aot"
@@ -847,11 +852,6 @@ consoles {
     category: "vm|legacy|aot"
     short_name: "o"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-precomp-linux-release-arm64"
-    category: "vm|legacy|aot"
-    short_name: "cra"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-dwarf-linux-product-x64"
     category: "vm|legacy|aot"
@@ -1313,6 +1313,11 @@ consoles {
     category: "vm|jit"
     short_name: "rv"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-arm64"
+    category: "vm|jit"
+    short_name: "a6"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-arm64"
     category: "vm|jit"
@@ -1393,6 +1398,11 @@ consoles {
     category: "vm|aot"
     short_name: "rv"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-arm64"
+    category: "vm|aot"
+    short_name: "a6"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-arm64"
     category: "vm|aot"
@@ -1598,11 +1608,6 @@ consoles {
     category: "vm|legacy|jit"
     short_name: "wd3"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-linux-release-arm64"
-    category: "vm|legacy|jit"
-    short_name: "cra"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
     category: "vm|legacy|aot"
@@ -1623,11 +1628,6 @@ consoles {
     category: "vm|legacy|aot"
     short_name: "o"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/cross-vm-precomp-linux-release-arm64"
-    category: "vm|legacy|aot"
-    short_name: "cra"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-dwarf-linux-product-x64"
     category: "vm|legacy|aot"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 3f5f2cf8a430..aa9146e4529d 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -59,30 +59,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "cross-vm-linux-release-arm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "cross-vm-precomp-linux-release-arm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -537,6 +513,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-linux-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1173,6 +1162,17 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-linux-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index f119acd942e8..b59f5e2dd116 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -174,26 +174,6 @@ job {
     builder: "ci-test-data"
   }
 }
-job {
-  id: "cross-vm-linux-release-arm64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "cross-vm-linux-release-arm64"
-  }
-}
-job {
-  id: "cross-vm-precomp-linux-release-arm64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "cross-vm-precomp-linux-release-arm64"
-  }
-}
 job {
   id: "dart2js-canary-x64"
   realm: "ci.sandbox"
@@ -1284,6 +1264,16 @@ job {
     builder: "vm-aot-linux-product-x64"
   }
 }
+job {
+  id: "vm-aot-linux-release-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-linux-release-arm64"
+  }
+}
 job {
   id: "vm-aot-mac-product-x64"
   realm: "ci.sandbox"
@@ -2724,6 +2714,16 @@ job {
     builder: "vm-linux-debug-x64c"
   }
 }
+job {
+  id: "vm-linux-release-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-linux-release-arm64"
+  }
+}
 job {
   id: "vm-msan-linux-release-x64"
   realm: "ci.sandbox"
@@ -3178,7 +3178,6 @@ trigger {
   id: "dart-nightly-trigger"
   realm: "ci"
   schedule: "0 5 * * *"
-  triggers: "cross-vm-precomp-linux-release-arm64"
   triggers: "ddc-canary-linux-chrome"
   triggers: "front-end-nnbd-mac-release-x64"
   triggers: "front-end-nnbd-win-release-x64"
@@ -3186,6 +3185,7 @@ trigger {
   triggers: "vm-aot-asan-linux-release-x64"
   triggers: "vm-aot-linux-debug-x64c"
   triggers: "vm-aot-linux-product-x64"
+  triggers: "vm-aot-linux-release-arm64"
   triggers: "vm-aot-mac-product-x64"
   triggers: "vm-aot-msan-linux-release-x64"
   triggers: "vm-aot-tsan-linux-release-x64"
@@ -3224,7 +3224,6 @@ trigger {
 trigger {
   id: "dart-vm-gitiles-trigger-main"
   realm: "ci"
-  triggers: "cross-vm-linux-release-arm64"
   triggers: "iso-stress-linux"
   triggers: "vm-aot-android-release-arm64c"
   triggers: "vm-aot-android-release-arm_x64"
@@ -3254,6 +3253,7 @@ trigger {
   triggers: "vm-kernel-precomp-nnbd-mac-release-simarm64"
   triggers: "vm-kernel-precomp-nnbd-win-release-x64"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64"
+  triggers: "vm-linux-release-arm64"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm"
   triggers: "vm-precomp-ffi-qemu-linux-release-riscv64"
   gitiles {
diff --git a/vm.star b/vm.star
index bbac8f2ffc8a..9ce594bdbc92 100644
--- a/vm.star
+++ b/vm.star
@@ -116,6 +116,13 @@ _nightly_builder(
     category = "vm|jit|rv",
     channels = ["try"],
 )
+_extra_builder(
+    "vm-linux-release-arm64",
+    category = "vm|jit|a6",
+    channels = [],
+    execution_timeout = 4 * time.hour,
+    properties = {"shard_timeout": (120 * time.minute) // time.second},
+)
 _nightly_builder(
     "vm-kernel-nnbd-mac-debug-arm64",
     category = "vm|jit|m1d",
@@ -203,6 +210,12 @@ _nightly_builder(
     channels = ["try"],
     properties = [slow_shards],
 )
+_nightly_builder(
+    "vm-aot-linux-release-arm64",
+    category = "vm|aot|a6",
+    channels = [],
+    properties = slow_shards,
+)
 _extra_builder(
     "vm-kernel-precomp-nnbd-mac-release-arm64",
     category = "vm|aot|m1",
@@ -409,13 +422,6 @@ _nightly_builder(
     dimensions = windows,
     properties = [slow_shards],
 )
-_extra_builder(
-    "cross-vm-linux-release-arm64",
-    category = "vm|legacy|jit|cra",
-    channels = [],
-    execution_timeout = 4 * time.hour,
-    properties = {"shard_timeout": (120 * time.minute) // time.second},
-)
 
 # vm|legacy|aot
 _extra_builder(
@@ -434,12 +440,6 @@ _extra_builder(
     "vm-kernel-precomp-obfuscate-linux-release-x64",
     category = "vm|legacy|aot|o",
 )
-_nightly_builder(
-    "cross-vm-precomp-linux-release-arm64",
-    category = "vm|legacy|aot|cra",
-    channels = [],
-    properties = slow_shards,
-)
 _nightly_builder(
     "vm-kernel-precomp-dwarf-linux-product-x64",
     category = "vm|legacy|aot|dw",

From fd55eadb224dd41b5c506856f74c23f5f6f9e531 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Mon, 6 Mar 2023 14:36:47 +0000
Subject: [PATCH 625/826] Add commit queues for dart-docker and homebrew-dart.

Add presubmit-try builder on the dart_ci repository.

Fixes: b/271830156
Change-Id: I87a79077eeca6a4e485a05d3225c49c797f7b5d5
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/286929
Commit-Queue: Jonas Termansen <sortie@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 cq.star                    | 29 ++++++++----------
 generated/commit-queue.cfg | 61 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 16 deletions(-)

diff --git a/cq.star b/cq.star
index 1f25eef407a0..1591ab6d230b 100644
--- a/cq.star
+++ b/cq.star
@@ -48,23 +48,20 @@ luci.cq_group(
     verifiers = default_verifiers(),
 )
 
-luci.cq_group(
-    name = "recipes",
-    watch = cq.refset(DART_GERRIT + "recipes", refs = ["refs/heads/main"]),
-    allow_submit_with_open_deps = True,
-    tree_status_host = "dart-status.appspot.com",
-    retry_config = cq.RETRY_NONE,
-    verifiers = default_verifiers(),
-)
+def basic_cq(repository):
+    luci.cq_group(
+        name = repository,
+        watch = cq.refset(DART_GERRIT + repository, refs = ["refs/heads/main"]),
+        allow_submit_with_open_deps = True,
+        tree_status_host = "dart-status.appspot.com",
+        retry_config = cq.RETRY_NONE,
+        verifiers = default_verifiers(),
+    )
 
-luci.cq_group(
-    name = "dart_ci",
-    watch = cq.refset(DART_GERRIT + "dart_ci", refs = ["refs/heads/main"]),
-    allow_submit_with_open_deps = True,
-    tree_status_host = "dart-status.appspot.com",
-    retry_config = cq.RETRY_NONE,
-    verifiers = None,
-)
+basic_cq("dart_ci")
+basic_cq("dart-docker")
+basic_cq("homebrew-dart")
+basic_cq("recipes")
 
 luci.list_view(
     name = "cq",
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index cb932fb7d412..ae14afbc918c 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -11,6 +11,33 @@ submit_options {
     seconds: 480
   }
 }
+config_groups {
+  name: "dart-docker"
+  gerrit {
+    url: "https://dart-review.googlesource.com"
+    projects {
+      name: "dart-docker"
+      ref_regexp: "refs/heads/main"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "project-dart-committers"
+      dry_run_access_list: "project-dart-tryjob-access"
+      allow_submit_with_open_deps: true
+    }
+    tree_status {
+      url: "https://dart-status.appspot.com"
+    }
+    tryjob {
+      builders {
+        name: "dart/try.shared/presubmit-try"
+        disable_reuse: true
+      }
+      retry_config {}
+    }
+  }
+}
 config_groups {
   name: "dart_ci"
   gerrit {
@@ -29,6 +56,40 @@ config_groups {
     tree_status {
       url: "https://dart-status.appspot.com"
     }
+    tryjob {
+      builders {
+        name: "dart/try.shared/presubmit-try"
+        disable_reuse: true
+      }
+      retry_config {}
+    }
+  }
+}
+config_groups {
+  name: "homebrew-dart"
+  gerrit {
+    url: "https://dart-review.googlesource.com"
+    projects {
+      name: "homebrew-dart"
+      ref_regexp: "refs/heads/main"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "project-dart-committers"
+      dry_run_access_list: "project-dart-tryjob-access"
+      allow_submit_with_open_deps: true
+    }
+    tree_status {
+      url: "https://dart-status.appspot.com"
+    }
+    tryjob {
+      builders {
+        name: "dart/try.shared/presubmit-try"
+        disable_reuse: true
+      }
+      retry_config {}
+    }
   }
 }
 config_groups {

From d5717d3e67c785103f45511b58f659daff3e1568 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 6 Mar 2023 17:47:42 +0000
Subject: [PATCH 626/826] [infra] Increase timeout of
 vm-aot-linux-release-arm64.

Increase the shard timeout of vm-aot-linux-release-arm64 from 90 minutes to 120 minutes, matching vm-linux-release-arm64.

Change-Id: I21d5a3e88ad44e0fe4e6f257035a59b72360f0b5
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/286946
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/cr-buildbucket.cfg | 2 +-
 vm.star                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index d4f6b94c4599..a0d2554591bc 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5592,7 +5592,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "shard_timeout": 7200'
         '}'
       priority: 70
       build_numbers: YES
diff --git a/vm.star b/vm.star
index 9ce594bdbc92..740efde7dfd8 100644
--- a/vm.star
+++ b/vm.star
@@ -214,7 +214,7 @@ _nightly_builder(
     "vm-aot-linux-release-arm64",
     category = "vm|aot|a6",
     channels = [],
-    properties = slow_shards,
+    properties = {"shard_timeout": (120 * time.minute) // time.second},
 )
 _extra_builder(
     "vm-kernel-precomp-nnbd-mac-release-arm64",

From 939733d742343606f0c59dc48e6d137459338373 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 8 Mar 2023 08:32:03 +0000
Subject: [PATCH 627/826] [infra] Convert dart2js builders to null safety

Bug: b/270918398
Change-Id: I965d7df981c4aad18fc8dff31988c4951b36083d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/286924
Reviewed-by: Nicholas Shahan <nshahan@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 dart2js.star                 |  37 +-
 generated/commit-queue.cfg   | 678 +++++---------------------------
 generated/cr-buildbucket.cfg | 729 +++++++++--------------------------
 generated/luci-milo.cfg      | 151 +++-----
 generated/luci-notify.cfg    |  22 +-
 generated/luci-scheduler.cfg | 324 ++++++----------
 6 files changed, 496 insertions(+), 1445 deletions(-)

diff --git a/dart2js.star b/dart2js.star
index 54236ca65b7f..801b8ae70198 100644
--- a/dart2js.star
+++ b/dart2js.star
@@ -8,6 +8,7 @@ Defines the dart2js builders.
 load("//lib/dart.star", "dart")
 load(
     "//lib/defaults.star",
+    "arm64",
     "chrome",
     "firefox",
     "mac",
@@ -16,19 +17,25 @@ load(
 )
 load("//lib/paths.star", "paths")
 
+dart.poller("dart2js-gitiles-trigger", branches = ["main"], paths = paths.dart2js)
+
 dart.ci_sandbox_builder(
-    "dart2js-canary-x64",
+    "dart2js-canary-linux",
     category = "dart2js|c",
+    channels = ["try"],
     properties = [chrome, no_android],
+    triggered_by = ["dart2js-gitiles-trigger-%s"],
 )
 dart.ci_sandbox_builder(
-    "dart2js-strong-hostasserts-linux-ia32-d8",
+    "dart2js-hostasserts-linux-d8",
     category = "dart2js|d8|ha",
+    channels = ["try"],
     location_filters = paths.to_location_filters(paths.dart2js),
     properties = no_android,
+    triggered_by = ["dart2js-gitiles-trigger-%s"],
 )
 dart.ci_sandbox_builder(
-    "dart2js-minified-strong-linux-x64-d8",
+    "dart2js-minified-linux-d8",
     category = "dart2js|d8|mi",
     location_filters = paths.to_location_filters(paths.dart2js),
     properties = no_android,
@@ -40,48 +47,50 @@ dart.ci_sandbox_builder(
     properties = no_android,
 )
 dart.ci_sandbox_builder(
-    "dart2js-strong-linux-x64-chrome",
+    "dart2js-linux-chrome",
     category = "dart2js|chrome|l",
     location_filters = paths.to_location_filters(paths.dart2js),
     properties = [chrome, no_android],
 )
 dart.ci_sandbox_builder(
-    "dart2js-csp-minified-linux-x64-chrome",
+    "dart2js-minified-csp-linux-chrome",
     category = "dart2js|chrome|csp",
     properties = [chrome, no_android],
 )
 dart.ci_sandbox_builder(
-    "dart2js-strong-mac-x64-chrome",
+    "dart2js-mac-chrome",
     category = "dart2js|chrome|m",
-    dimensions = mac,
+    dimensions = [arm64, mac],
     properties = [chrome, no_android],
 )
 dart.ci_sandbox_builder(
-    "dart2js-strong-win-x64-chrome",
+    "dart2js-win-chrome",
     category = "dart2js|chrome|w",
     dimensions = windows,
     properties = [chrome, no_android],
 )
 dart.ci_sandbox_builder(
-    "dart2js-nnbd-linux-x64-chrome",
-    category = "dart2js|chrome|nn",
+    "dart2js-hostasserts-linux-unsound",
+    category = "dart2js|chrome|un",
+    channels = ["try"],
     location_filters = paths.to_location_filters(paths.dart2js),
     properties = [chrome, no_android],
+    triggered_by = ["dart2js-gitiles-trigger-%s"],
 )
 dart.ci_sandbox_builder(
-    "dart2js-strong-linux-x64-firefox",
+    "dart2js-linux-firefox",
     category = "dart2js|firefox|l",
     properties = [firefox, no_android],
 )
 dart.ci_sandbox_builder(
-    "dart2js-strong-win-x64-firefox",
+    "dart2js-win-firefox",
     dimensions = windows,
     enabled = False,
     properties = [firefox, no_android],
 )
 dart.ci_sandbox_builder(
-    "dart2js-strong-mac-x64-safari",
+    "dart2js-mac-safari",
     category = "dart2js|safari|m",
-    dimensions = mac,
+    dimensions = [arm64, mac],
     properties = no_android,
 )
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index ae14afbc918c..52f3a3ac4314 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -311,15 +311,7 @@ config_groups {
         name: "dart/try/dart-sdk-win-try"
       }
       builders {
-        name: "dart/try/dart2js-canary-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-csp-minified-linux-x64-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-minified-strong-linux-x64-d8-try"
+        name: "dart/try/dart2js-linux-chrome-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -397,163 +389,23 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/dart2js-nnbd-linux-x64-chrome-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/js.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "utils/compiler/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
-        }
+        name: "dart/try/dart2js-linux-firefox-try"
+        includable_only: true
       }
       builders {
-        name: "dart/try/dart2js-strong-hostasserts-linux-ia32-d8-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/js.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "utils/compiler/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
-        }
+        name: "dart/try/dart2js-mac-chrome-try"
+        includable_only: true
       }
       builders {
-        name: "dart/try/dart2js-strong-linux-x64-chrome-try"
+        name: "dart/try/dart2js-mac-safari-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-minified-csp-linux-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-minified-linux-d8-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -630,22 +482,6 @@ config_groups {
           path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
-      builders {
-        name: "dart/try/dart2js-strong-linux-x64-firefox-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-strong-mac-x64-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-strong-mac-x64-safari-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-strong-win-x64-chrome-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/dart2js-unit-linux-x64-release-try"
         location_filters {
@@ -724,6 +560,10 @@ config_groups {
           path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
+      builders {
+        name: "dart/try/dart2js-win-chrome-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/ddc-linux-chrome-try"
         location_filters {
@@ -1331,202 +1171,38 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "tools/VERSION"
-        }
-      }
-      builders {
-        name: "dart/try/dart-sdk-mac-arm64-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/VERSION"
-        }
-      }
-      builders {
-        name: "dart/try/dart-sdk-mac-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/VERSION"
-        }
-      }
-      builders {
-        name: "dart/try/dart-sdk-win-arm64-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/VERSION"
-        }
-      }
-      builders {
-        name: "dart/try/dart-sdk-win-try"
-      }
-      builders {
-        name: "dart/try/dart2js-canary-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-csp-minified-linux-x64-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-minified-strong-linux-x64-d8-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/js.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "utils/compiler/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
-        }
-      }
-      builders {
-        name: "dart/try/dart2js-nnbd-linux-x64-chrome-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/js.+"
+          path_regexp: "tools/VERSION"
         }
+      }
+      builders {
+        name: "dart/try/dart-sdk-mac-arm64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+          path_regexp: "tools/VERSION"
         }
+      }
+      builders {
+        name: "dart/try/dart-sdk-mac-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "utils/compiler/.+"
+          path_regexp: "tools/VERSION"
         }
+      }
+      builders {
+        name: "dart/try/dart-sdk-win-arm64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+          path_regexp: "tools/VERSION"
         }
       }
       builders {
-        name: "dart/try/dart2js-strong-hostasserts-linux-ia32-d8-try"
+        name: "dart/try/dart-sdk-win-try"
+      }
+      builders {
+        name: "dart/try/dart2js-linux-chrome-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1604,7 +1280,23 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/dart2js-strong-linux-x64-chrome-try"
+        name: "dart/try/dart2js-linux-firefox-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-mac-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-mac-safari-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-minified-csp-linux-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-minified-linux-d8-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1681,22 +1373,6 @@ config_groups {
           path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
-      builders {
-        name: "dart/try/dart2js-strong-linux-x64-firefox-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-strong-mac-x64-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-strong-mac-x64-safari-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-strong-win-x64-chrome-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/dart2js-unit-linux-x64-release-try"
         location_filters {
@@ -1775,6 +1451,10 @@ config_groups {
           path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
+      builders {
+        name: "dart/try/dart2js-win-chrome-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/ddc-linux-chrome-try"
         location_filters {
@@ -2440,15 +2120,11 @@ config_groups {
         name: "dart/try/dart-sdk-win-try"
       }
       builders {
-        name: "dart/try/dart2js-canary-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-csp-minified-linux-x64-chrome-try"
+        name: "dart/try/dart2js-canary-linux-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/dart2js-minified-strong-linux-x64-d8-try"
+        name: "dart/try/dart2js-hostasserts-linux-d8-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2526,7 +2202,7 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/dart2js-nnbd-linux-x64-chrome-try"
+        name: "dart/try/dart2js-hostasserts-linux-unsound-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2604,7 +2280,7 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/dart2js-strong-hostasserts-linux-ia32-d8-try"
+        name: "dart/try/dart2js-linux-chrome-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2682,7 +2358,23 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/dart2js-strong-linux-x64-chrome-try"
+        name: "dart/try/dart2js-linux-firefox-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-mac-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-mac-safari-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-minified-csp-linux-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-minified-linux-d8-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2759,22 +2451,6 @@ config_groups {
           path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
-      builders {
-        name: "dart/try/dart2js-strong-linux-x64-firefox-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-strong-mac-x64-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-strong-mac-x64-safari-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-strong-win-x64-chrome-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/dart2js-unit-linux-x64-release-try"
         location_filters {
@@ -2853,6 +2529,10 @@ config_groups {
           path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
+      builders {
+        name: "dart/try/dart2js-win-chrome-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/dart2wasm-linux-x64-d8-try"
         location_filters {
@@ -3840,15 +3520,7 @@ config_groups {
         name: "dart/try/dart-sdk-win-try"
       }
       builders {
-        name: "dart/try/dart2js-canary-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-csp-minified-linux-x64-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-minified-strong-linux-x64-d8-try"
+        name: "dart/try/dart2js-linux-chrome-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3926,163 +3598,23 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/dart2js-nnbd-linux-x64-chrome-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/js.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "utils/compiler/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
-        }
+        name: "dart/try/dart2js-linux-firefox-try"
+        includable_only: true
       }
       builders {
-        name: "dart/try/dart2js-strong-hostasserts-linux-ia32-d8-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/js.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "utils/compiler/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
-        }
+        name: "dart/try/dart2js-mac-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-mac-safari-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-minified-csp-linux-chrome-try"
+        includable_only: true
       }
       builders {
-        name: "dart/try/dart2js-strong-linux-x64-chrome-try"
+        name: "dart/try/dart2js-minified-linux-d8-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -4159,22 +3691,6 @@ config_groups {
           path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
-      builders {
-        name: "dart/try/dart2js-strong-linux-x64-firefox-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-strong-mac-x64-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-strong-mac-x64-safari-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-strong-win-x64-chrome-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/dart2js-unit-linux-x64-release-try"
         location_filters {
@@ -4253,6 +3769,10 @@ config_groups {
           path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
+      builders {
+        name: "dart/try/dart2js-win-chrome-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/ddc-linux-chrome-try"
         location_filters {
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index a0d2554591bc..c919cd111270 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -696,7 +696,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-canary-x64"
+      name: "dart2js-canary-linux"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -736,7 +736,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-canary-x64-beta"
+      name: "dart2js-hostasserts-linux-d8"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -762,8 +762,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -776,7 +775,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-canary-x64-dev"
+      name: "dart2js-hostasserts-linux-unsound"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -816,7 +815,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-canary-x64-stable"
+      name: "dart2js-linux-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -856,7 +855,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-csp-minified-linux-x64-chrome"
+      name: "dart2js-linux-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -896,7 +895,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-csp-minified-linux-x64-chrome-beta"
+      name: "dart2js-linux-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -936,7 +935,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-csp-minified-linux-x64-chrome-dev"
+      name: "dart2js-linux-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -976,7 +975,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-csp-minified-linux-x64-chrome-stable"
+      name: "dart2js-linux-firefox"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1003,163 +1002,7 @@ buckets {
         '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-minified-strong-linux-x64-d8"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-minified-strong-linux-x64-d8-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-minified-strong-linux-x64-d8-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-minified-strong-linux-x64-d8-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -1172,7 +1015,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-nnbd-linux-x64-chrome"
+      name: "dart2js-linux-firefox-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1199,7 +1042,7 @@ buckets {
         '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -1212,7 +1055,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-nnbd-linux-x64-chrome-beta"
+      name: "dart2js-linux-firefox-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1239,7 +1082,7 @@ buckets {
         '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -1252,7 +1095,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-nnbd-linux-x64-chrome-dev"
+      name: "dart2js-linux-firefox-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1279,7 +1122,7 @@ buckets {
         '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -1292,11 +1135,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-nnbd-linux-x64-chrome-stable"
+      name: "dart2js-mac-chrome"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1306,7 +1149,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -1324,162 +1167,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-hostasserts-linux-ia32-d8"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1488,11 +1179,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-linux-x64-chrome"
+      name: "dart2js-mac-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1502,7 +1193,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -1520,46 +1211,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2js-strong-linux-x64-chrome-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
       }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1568,11 +1223,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-linux-x64-chrome-dev"
+      name: "dart2js-mac-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1582,7 +1237,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -1600,6 +1255,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1608,11 +1267,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-linux-x64-chrome-stable"
+      name: "dart2js-mac-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1622,7 +1281,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -1640,6 +1299,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1648,11 +1311,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-linux-x64-firefox"
+      name: "dart2js-mac-safari"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1662,7 +1325,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -1674,12 +1337,15 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_firefox": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1688,11 +1354,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-linux-x64-firefox-beta"
+      name: "dart2js-mac-safari-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1702,7 +1368,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -1714,12 +1380,15 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_firefox": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1728,11 +1397,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-linux-x64-firefox-dev"
+      name: "dart2js-mac-safari-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1742,7 +1411,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -1754,12 +1423,15 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_firefox": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1768,11 +1440,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-linux-x64-firefox-stable"
+      name: "dart2js-mac-safari-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1782,7 +1454,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -1794,12 +1466,15 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_firefox": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1808,11 +1483,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-mac-x64-chrome"
+      name: "dart2js-minified-csp-linux-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1822,7 +1497,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -1840,10 +1515,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1852,11 +1523,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-mac-x64-chrome-beta"
+      name: "dart2js-minified-csp-linux-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1866,7 +1537,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -1884,10 +1555,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1896,11 +1563,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-mac-x64-chrome-dev"
+      name: "dart2js-minified-csp-linux-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1910,7 +1577,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -1928,10 +1595,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1940,11 +1603,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-mac-x64-chrome-stable"
+      name: "dart2js-minified-csp-linux-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1954,7 +1617,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -1972,10 +1635,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1984,11 +1643,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-mac-x64-safari"
+      name: "dart2js-minified-linux-d8"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1998,7 +1657,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2015,10 +1674,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2027,11 +1682,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-mac-x64-safari-beta"
+      name: "dart2js-minified-linux-d8-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2041,7 +1696,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2058,10 +1713,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2070,11 +1721,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-mac-x64-safari-dev"
+      name: "dart2js-minified-linux-d8-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2084,7 +1735,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2101,10 +1752,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2113,11 +1760,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-mac-x64-safari-stable"
+      name: "dart2js-minified-linux-d8-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2127,7 +1774,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2144,10 +1791,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2156,11 +1799,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-win-x64-chrome"
+      name: "dart2js-unit-linux-x64-release"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2170,7 +1813,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2182,8 +1825,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -2196,11 +1838,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-win-x64-chrome-beta"
+      name: "dart2js-unit-linux-x64-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2210,7 +1852,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2222,8 +1864,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -2236,11 +1877,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-win-x64-chrome-dev"
+      name: "dart2js-unit-linux-x64-release-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2250,7 +1891,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2262,8 +1903,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -2276,11 +1916,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-win-x64-chrome-stable"
+      name: "dart2js-unit-linux-x64-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2290,7 +1930,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2302,8 +1942,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -2316,7 +1955,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-win-x64-firefox"
+      name: "dart2js-win-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -2343,7 +1982,7 @@ buckets {
         '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
-        '    "download_firefox": true'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -2356,11 +1995,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-unit-linux-x64-release"
+      name: "dart2js-win-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2370,7 +2009,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2382,7 +2021,8 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -2395,11 +2035,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-unit-linux-x64-release-beta"
+      name: "dart2js-win-chrome-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2409,7 +2049,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2421,7 +2061,8 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -2434,11 +2075,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-unit-linux-x64-release-dev"
+      name: "dart2js-win-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2448,7 +2089,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2460,7 +2101,8 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -2473,11 +2115,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-unit-linux-x64-release-stable"
+      name: "dart2js-win-firefox"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2487,7 +2129,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2499,7 +2141,8 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_android_deps": false,'
+        '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -12119,7 +11762,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-canary-x64-try"
+      name: "dart2js-canary-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12159,7 +11802,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-csp-minified-linux-x64-chrome-try"
+      name: "dart2js-hostasserts-linux-d8-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12185,8 +11828,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -12199,7 +11841,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-minified-strong-linux-x64-d8-try"
+      name: "dart2js-hostasserts-linux-unsound-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12225,7 +11867,8 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -12238,7 +11881,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-nnbd-linux-x64-chrome-try"
+      name: "dart2js-linux-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12278,7 +11921,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-hostasserts-linux-ia32-d8-try"
+      name: "dart2js-linux-firefox-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12304,7 +11947,8 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_android_deps": false,'
+        '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -12317,11 +11961,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-linux-x64-chrome-try"
+      name: "dart2js-mac-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12331,7 +11975,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12349,6 +11993,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12357,11 +12005,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-linux-x64-firefox-try"
+      name: "dart2js-mac-safari-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12371,7 +12019,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12383,12 +12031,15 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_firefox": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12397,11 +12048,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-mac-x64-chrome-try"
+      name: "dart2js-minified-csp-linux-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12411,7 +12062,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12429,10 +12080,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12441,11 +12088,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-mac-x64-safari-try"
+      name: "dart2js-minified-linux-d8-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12455,7 +12102,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12472,10 +12119,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12484,11 +12127,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-strong-win-x64-chrome-try"
+      name: "dart2js-unit-linux-x64-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12498,7 +12141,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12510,8 +12153,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -12524,11 +12166,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-unit-linux-x64-release-try"
+      name: "dart2js-win-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12538,7 +12180,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12550,7 +12192,8 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index b30315b4da4c..c9ce52da5261 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -275,37 +275,37 @@ consoles {
     name: "buildbucket/luci.dart.try/pkg-linux-debug-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-canary-x64-try"
+    name: "buildbucket/luci.dart.try/dart2js-canary-linux-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-hostasserts-linux-ia32-d8-try"
+    name: "buildbucket/luci.dart.try/dart2js-hostasserts-linux-d8-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-minified-strong-linux-x64-d8-try"
+    name: "buildbucket/luci.dart.try/dart2js-minified-linux-d8-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/dart2js-unit-linux-x64-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-chrome-try"
+    name: "buildbucket/luci.dart.try/dart2js-linux-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-csp-minified-linux-x64-chrome-try"
+    name: "buildbucket/luci.dart.try/dart2js-minified-csp-linux-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-mac-x64-chrome-try"
+    name: "buildbucket/luci.dart.try/dart2js-mac-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-win-x64-chrome-try"
+    name: "buildbucket/luci.dart.try/dart2js-win-chrome-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-nnbd-linux-x64-chrome-try"
+    name: "buildbucket/luci.dart.try/dart2js-hostasserts-linux-unsound-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-linux-x64-firefox-try"
+    name: "buildbucket/luci.dart.try/dart2js-linux-firefox-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2js-strong-mac-x64-safari-try"
+    name: "buildbucket/luci.dart.try/dart2js-mac-safari-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/ddc-linux-chrome-try"
@@ -883,17 +883,17 @@ consoles {
     short_name: "ld"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-linux"
     category: "dart2js"
     short_name: "c"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostasserts-linux-d8"
     category: "dart2js|d8"
     short_name: "ha"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-linux-d8"
     category: "dart2js|d8"
     short_name: "mi"
   }
@@ -903,37 +903,37 @@ consoles {
     short_name: "u"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-csp-linux-chrome"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostasserts-linux-unsound"
     category: "dart2js|chrome"
-    short_name: "nn"
+    short_name: "un"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-firefox"
     category: "dart2js|firefox"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-safari"
     category: "dart2js|safari"
     short_name: "m"
   }
@@ -1164,17 +1164,17 @@ consoles {
     short_name: "ld"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-linux"
     category: "dart2js"
     short_name: "c"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostasserts-linux-d8"
     category: "dart2js|d8"
     short_name: "ha"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-linux-d8"
     category: "dart2js|d8"
     short_name: "mi"
   }
@@ -1184,37 +1184,37 @@ consoles {
     short_name: "u"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-chrome"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-csp-linux-chrome"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-chrome"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-chrome"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostasserts-linux-unsound"
     category: "dart2js|chrome"
-    short_name: "nn"
+    short_name: "un"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-firefox"
     category: "dart2js|firefox"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-safari"
     category: "dart2js|safari"
     short_name: "m"
   }
@@ -1925,17 +1925,7 @@ consoles {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-dev"
-    category: "dart2js"
-    short_name: "c"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-dev"
-    category: "dart2js|d8"
-    short_name: "ha"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-linux-d8-dev"
     category: "dart2js|d8"
     short_name: "mi"
   }
@@ -1945,37 +1935,32 @@ consoles {
     short_name: "u"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-chrome-dev"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-csp-linux-chrome-dev"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-chrome-dev"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-chrome-dev"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-dev"
-    category: "dart2js|chrome"
-    short_name: "nn"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-firefox-dev"
     category: "dart2js|firefox"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-safari-dev"
     category: "dart2js|safari"
     short_name: "m"
   }
@@ -2301,17 +2286,7 @@ consoles {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-beta"
-    category: "dart2js"
-    short_name: "c"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-beta"
-    category: "dart2js|d8"
-    short_name: "ha"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-linux-d8-beta"
     category: "dart2js|d8"
     short_name: "mi"
   }
@@ -2321,37 +2296,32 @@ consoles {
     short_name: "u"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-chrome-beta"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-csp-linux-chrome-beta"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-chrome-beta"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-chrome-beta"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-beta"
-    category: "dart2js|chrome"
-    short_name: "nn"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-firefox-beta"
     category: "dart2js|firefox"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-safari-beta"
     category: "dart2js|safari"
     short_name: "m"
   }
@@ -2677,17 +2647,7 @@ consoles {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-canary-x64-stable"
-    category: "dart2js"
-    short_name: "c"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-hostasserts-linux-ia32-d8-stable"
-    category: "dart2js|d8"
-    short_name: "ha"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-strong-linux-x64-d8-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-linux-d8-stable"
     category: "dart2js|d8"
     short_name: "mi"
   }
@@ -2697,37 +2657,32 @@ consoles {
     short_name: "u"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-chrome-stable"
     category: "dart2js|chrome"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-csp-minified-linux-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-csp-linux-chrome-stable"
     category: "dart2js|chrome"
     short_name: "csp"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-chrome-stable"
     category: "dart2js|chrome"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-win-x64-chrome-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-chrome-stable"
     category: "dart2js|chrome"
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-nnbd-linux-x64-chrome-stable"
-    category: "dart2js|chrome"
-    short_name: "nn"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-linux-x64-firefox-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-firefox-stable"
     category: "dart2js|firefox"
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-strong-mac-x64-safari-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-safari-stable"
     category: "dart2js|safari"
     short_name: "m"
   }
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index aa9146e4529d..a9b7affc7482 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -66,7 +66,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "dart2js-canary-x64"
+    name: "dart2js-canary-linux"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -77,7 +77,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "dart2js-csp-minified-linux-x64-chrome"
+    name: "dart2js-hostasserts-linux-d8"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -88,7 +88,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "dart2js-minified-strong-linux-x64-d8"
+    name: "dart2js-hostasserts-linux-unsound"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -99,7 +99,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "dart2js-nnbd-linux-x64-chrome"
+    name: "dart2js-linux-chrome"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -110,7 +110,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "dart2js-strong-hostasserts-linux-ia32-d8"
+    name: "dart2js-linux-firefox"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -121,7 +121,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "dart2js-strong-linux-x64-chrome"
+    name: "dart2js-mac-chrome"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -132,7 +132,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "dart2js-strong-linux-x64-firefox"
+    name: "dart2js-mac-safari"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -143,7 +143,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "dart2js-strong-mac-x64-chrome"
+    name: "dart2js-minified-csp-linux-chrome"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -154,7 +154,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "dart2js-strong-mac-x64-safari"
+    name: "dart2js-minified-linux-d8"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -165,7 +165,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "dart2js-strong-win-x64-chrome"
+    name: "dart2js-unit-linux-x64-release"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -176,7 +176,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "dart2js-unit-linux-x64-release"
+    name: "dart2js-win-chrome"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index b59f5e2dd116..9a487e6870a1 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -175,443 +175,353 @@ job {
   }
 }
 job {
-  id: "dart2js-canary-x64"
+  id: "dart2js-canary-linux"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-canary-x64"
+    builder: "dart2js-canary-linux"
   }
 }
 job {
-  id: "dart2js-canary-x64-beta"
+  id: "dart2js-hostasserts-linux-d8"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-canary-x64-beta"
+    builder: "dart2js-hostasserts-linux-d8"
   }
 }
 job {
-  id: "dart2js-canary-x64-dev"
+  id: "dart2js-hostasserts-linux-unsound"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-canary-x64-dev"
+    builder: "dart2js-hostasserts-linux-unsound"
   }
 }
 job {
-  id: "dart2js-canary-x64-stable"
+  id: "dart2js-linux-chrome"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-canary-x64-stable"
+    builder: "dart2js-linux-chrome"
   }
 }
 job {
-  id: "dart2js-csp-minified-linux-x64-chrome"
+  id: "dart2js-linux-chrome-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-csp-minified-linux-x64-chrome"
+    builder: "dart2js-linux-chrome-beta"
   }
 }
 job {
-  id: "dart2js-csp-minified-linux-x64-chrome-beta"
+  id: "dart2js-linux-chrome-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-csp-minified-linux-x64-chrome-beta"
+    builder: "dart2js-linux-chrome-dev"
   }
 }
 job {
-  id: "dart2js-csp-minified-linux-x64-chrome-dev"
+  id: "dart2js-linux-chrome-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-csp-minified-linux-x64-chrome-dev"
+    builder: "dart2js-linux-chrome-stable"
   }
 }
 job {
-  id: "dart2js-csp-minified-linux-x64-chrome-stable"
+  id: "dart2js-linux-firefox"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-csp-minified-linux-x64-chrome-stable"
+    builder: "dart2js-linux-firefox"
   }
 }
 job {
-  id: "dart2js-minified-strong-linux-x64-d8"
+  id: "dart2js-linux-firefox-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-minified-strong-linux-x64-d8"
+    builder: "dart2js-linux-firefox-beta"
   }
 }
 job {
-  id: "dart2js-minified-strong-linux-x64-d8-beta"
+  id: "dart2js-linux-firefox-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-minified-strong-linux-x64-d8-beta"
+    builder: "dart2js-linux-firefox-dev"
   }
 }
 job {
-  id: "dart2js-minified-strong-linux-x64-d8-dev"
+  id: "dart2js-linux-firefox-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-minified-strong-linux-x64-d8-dev"
+    builder: "dart2js-linux-firefox-stable"
   }
 }
 job {
-  id: "dart2js-minified-strong-linux-x64-d8-stable"
+  id: "dart2js-mac-chrome"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-minified-strong-linux-x64-d8-stable"
+    builder: "dart2js-mac-chrome"
   }
 }
 job {
-  id: "dart2js-nnbd-linux-x64-chrome"
+  id: "dart2js-mac-chrome-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-nnbd-linux-x64-chrome"
+    builder: "dart2js-mac-chrome-beta"
   }
 }
 job {
-  id: "dart2js-nnbd-linux-x64-chrome-beta"
+  id: "dart2js-mac-chrome-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-nnbd-linux-x64-chrome-beta"
+    builder: "dart2js-mac-chrome-dev"
   }
 }
 job {
-  id: "dart2js-nnbd-linux-x64-chrome-dev"
+  id: "dart2js-mac-chrome-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-nnbd-linux-x64-chrome-dev"
+    builder: "dart2js-mac-chrome-stable"
   }
 }
 job {
-  id: "dart2js-nnbd-linux-x64-chrome-stable"
+  id: "dart2js-mac-safari"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-nnbd-linux-x64-chrome-stable"
+    builder: "dart2js-mac-safari"
   }
 }
 job {
-  id: "dart2js-strong-hostasserts-linux-ia32-d8"
+  id: "dart2js-mac-safari-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-strong-hostasserts-linux-ia32-d8"
+    builder: "dart2js-mac-safari-beta"
   }
 }
 job {
-  id: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
+  id: "dart2js-mac-safari-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
+    builder: "dart2js-mac-safari-dev"
   }
 }
 job {
-  id: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
+  id: "dart2js-mac-safari-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
+    builder: "dart2js-mac-safari-stable"
   }
 }
 job {
-  id: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
+  id: "dart2js-minified-csp-linux-chrome"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
+    builder: "dart2js-minified-csp-linux-chrome"
   }
 }
 job {
-  id: "dart2js-strong-linux-x64-chrome"
+  id: "dart2js-minified-csp-linux-chrome-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-strong-linux-x64-chrome"
+    builder: "dart2js-minified-csp-linux-chrome-beta"
   }
 }
 job {
-  id: "dart2js-strong-linux-x64-chrome-beta"
+  id: "dart2js-minified-csp-linux-chrome-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-strong-linux-x64-chrome-beta"
+    builder: "dart2js-minified-csp-linux-chrome-dev"
   }
 }
 job {
-  id: "dart2js-strong-linux-x64-chrome-dev"
+  id: "dart2js-minified-csp-linux-chrome-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-strong-linux-x64-chrome-dev"
+    builder: "dart2js-minified-csp-linux-chrome-stable"
   }
 }
 job {
-  id: "dart2js-strong-linux-x64-chrome-stable"
+  id: "dart2js-minified-linux-d8"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-strong-linux-x64-chrome-stable"
+    builder: "dart2js-minified-linux-d8"
   }
 }
 job {
-  id: "dart2js-strong-linux-x64-firefox"
+  id: "dart2js-minified-linux-d8-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-strong-linux-x64-firefox"
+    builder: "dart2js-minified-linux-d8-beta"
   }
 }
 job {
-  id: "dart2js-strong-linux-x64-firefox-beta"
+  id: "dart2js-minified-linux-d8-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-strong-linux-x64-firefox-beta"
+    builder: "dart2js-minified-linux-d8-dev"
   }
 }
 job {
-  id: "dart2js-strong-linux-x64-firefox-dev"
+  id: "dart2js-minified-linux-d8-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-strong-linux-x64-firefox-dev"
+    builder: "dart2js-minified-linux-d8-stable"
   }
 }
 job {
-  id: "dart2js-strong-linux-x64-firefox-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "dart2js-strong-linux-x64-firefox-stable"
-  }
-}
-job {
-  id: "dart2js-strong-mac-x64-chrome"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "dart2js-strong-mac-x64-chrome"
-  }
-}
-job {
-  id: "dart2js-strong-mac-x64-chrome-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "dart2js-strong-mac-x64-chrome-beta"
-  }
-}
-job {
-  id: "dart2js-strong-mac-x64-chrome-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "dart2js-strong-mac-x64-chrome-dev"
-  }
-}
-job {
-  id: "dart2js-strong-mac-x64-chrome-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "dart2js-strong-mac-x64-chrome-stable"
-  }
-}
-job {
-  id: "dart2js-strong-mac-x64-safari"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "dart2js-strong-mac-x64-safari"
-  }
-}
-job {
-  id: "dart2js-strong-mac-x64-safari-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "dart2js-strong-mac-x64-safari-beta"
-  }
-}
-job {
-  id: "dart2js-strong-mac-x64-safari-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "dart2js-strong-mac-x64-safari-dev"
-  }
-}
-job {
-  id: "dart2js-strong-mac-x64-safari-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "dart2js-strong-mac-x64-safari-stable"
-  }
-}
-job {
-  id: "dart2js-strong-win-x64-chrome"
+  id: "dart2js-unit-linux-x64-release"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-strong-win-x64-chrome"
+    builder: "dart2js-unit-linux-x64-release"
   }
 }
 job {
-  id: "dart2js-strong-win-x64-chrome-beta"
+  id: "dart2js-unit-linux-x64-release-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-strong-win-x64-chrome-beta"
+    builder: "dart2js-unit-linux-x64-release-beta"
   }
 }
 job {
-  id: "dart2js-strong-win-x64-chrome-dev"
+  id: "dart2js-unit-linux-x64-release-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-strong-win-x64-chrome-dev"
+    builder: "dart2js-unit-linux-x64-release-dev"
   }
 }
 job {
-  id: "dart2js-strong-win-x64-chrome-stable"
+  id: "dart2js-unit-linux-x64-release-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-strong-win-x64-chrome-stable"
+    builder: "dart2js-unit-linux-x64-release-stable"
   }
 }
 job {
-  id: "dart2js-unit-linux-x64-release"
+  id: "dart2js-win-chrome"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-unit-linux-x64-release"
+    builder: "dart2js-win-chrome"
   }
 }
 job {
-  id: "dart2js-unit-linux-x64-release-beta"
+  id: "dart2js-win-chrome-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-unit-linux-x64-release-beta"
+    builder: "dart2js-win-chrome-beta"
   }
 }
 job {
-  id: "dart2js-unit-linux-x64-release-dev"
+  id: "dart2js-win-chrome-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-unit-linux-x64-release-dev"
+    builder: "dart2js-win-chrome-dev"
   }
 }
 job {
-  id: "dart2js-unit-linux-x64-release-stable"
+  id: "dart2js-win-chrome-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2js-unit-linux-x64-release-stable"
+    builder: "dart2js-win-chrome-stable"
   }
 }
 job {
@@ -2911,17 +2821,14 @@ trigger {
   triggers: "analyzer-linux-release-beta"
   triggers: "analyzer-mac-release-beta"
   triggers: "analyzer-win-release-beta"
-  triggers: "dart2js-canary-x64-beta"
-  triggers: "dart2js-csp-minified-linux-x64-chrome-beta"
-  triggers: "dart2js-minified-strong-linux-x64-d8-beta"
-  triggers: "dart2js-nnbd-linux-x64-chrome-beta"
-  triggers: "dart2js-strong-hostasserts-linux-ia32-d8-beta"
-  triggers: "dart2js-strong-linux-x64-chrome-beta"
-  triggers: "dart2js-strong-linux-x64-firefox-beta"
-  triggers: "dart2js-strong-mac-x64-chrome-beta"
-  triggers: "dart2js-strong-mac-x64-safari-beta"
-  triggers: "dart2js-strong-win-x64-chrome-beta"
+  triggers: "dart2js-linux-chrome-beta"
+  triggers: "dart2js-linux-firefox-beta"
+  triggers: "dart2js-mac-chrome-beta"
+  triggers: "dart2js-mac-safari-beta"
+  triggers: "dart2js-minified-csp-linux-chrome-beta"
+  triggers: "dart2js-minified-linux-d8-beta"
   triggers: "dart2js-unit-linux-x64-release-beta"
+  triggers: "dart2js-win-chrome-beta"
   triggers: "ddc-linux-chrome-beta"
   triggers: "ddc-mac-chrome-beta"
   triggers: "ddc-win-chrome-beta"
@@ -2977,17 +2884,14 @@ trigger {
   triggers: "analyzer-linux-release-dev"
   triggers: "analyzer-mac-release-dev"
   triggers: "analyzer-win-release-dev"
-  triggers: "dart2js-canary-x64-dev"
-  triggers: "dart2js-csp-minified-linux-x64-chrome-dev"
-  triggers: "dart2js-minified-strong-linux-x64-d8-dev"
-  triggers: "dart2js-nnbd-linux-x64-chrome-dev"
-  triggers: "dart2js-strong-hostasserts-linux-ia32-d8-dev"
-  triggers: "dart2js-strong-linux-x64-chrome-dev"
-  triggers: "dart2js-strong-linux-x64-firefox-dev"
-  triggers: "dart2js-strong-mac-x64-chrome-dev"
-  triggers: "dart2js-strong-mac-x64-safari-dev"
-  triggers: "dart2js-strong-win-x64-chrome-dev"
+  triggers: "dart2js-linux-chrome-dev"
+  triggers: "dart2js-linux-firefox-dev"
+  triggers: "dart2js-mac-chrome-dev"
+  triggers: "dart2js-mac-safari-dev"
+  triggers: "dart2js-minified-csp-linux-chrome-dev"
+  triggers: "dart2js-minified-linux-d8-dev"
   triggers: "dart2js-unit-linux-x64-release-dev"
+  triggers: "dart2js-win-chrome-dev"
   triggers: "ddc-linux-chrome-dev"
   triggers: "ddc-mac-chrome-dev"
   triggers: "ddc-win-chrome-dev"
@@ -3062,17 +2966,14 @@ trigger {
   triggers: "analyzer-linux-release"
   triggers: "analyzer-mac-release"
   triggers: "analyzer-win-release"
-  triggers: "dart2js-canary-x64"
-  triggers: "dart2js-csp-minified-linux-x64-chrome"
-  triggers: "dart2js-minified-strong-linux-x64-d8"
-  triggers: "dart2js-nnbd-linux-x64-chrome"
-  triggers: "dart2js-strong-hostasserts-linux-ia32-d8"
-  triggers: "dart2js-strong-linux-x64-chrome"
-  triggers: "dart2js-strong-linux-x64-firefox"
-  triggers: "dart2js-strong-mac-x64-chrome"
-  triggers: "dart2js-strong-mac-x64-safari"
-  triggers: "dart2js-strong-win-x64-chrome"
+  triggers: "dart2js-linux-chrome"
+  triggers: "dart2js-linux-firefox"
+  triggers: "dart2js-mac-chrome"
+  triggers: "dart2js-mac-safari"
+  triggers: "dart2js-minified-csp-linux-chrome"
+  triggers: "dart2js-minified-linux-d8"
   triggers: "dart2js-unit-linux-x64-release"
+  triggers: "dart2js-win-chrome"
   triggers: "ddc-linux-chrome"
   triggers: "ddc-linux-chrome-unsound"
   triggers: "ddc-mac-chrome"
@@ -3115,17 +3016,14 @@ trigger {
   triggers: "analyzer-linux-release-stable"
   triggers: "analyzer-mac-release-stable"
   triggers: "analyzer-win-release-stable"
-  triggers: "dart2js-canary-x64-stable"
-  triggers: "dart2js-csp-minified-linux-x64-chrome-stable"
-  triggers: "dart2js-minified-strong-linux-x64-d8-stable"
-  triggers: "dart2js-nnbd-linux-x64-chrome-stable"
-  triggers: "dart2js-strong-hostasserts-linux-ia32-d8-stable"
-  triggers: "dart2js-strong-linux-x64-chrome-stable"
-  triggers: "dart2js-strong-linux-x64-firefox-stable"
-  triggers: "dart2js-strong-mac-x64-chrome-stable"
-  triggers: "dart2js-strong-mac-x64-safari-stable"
-  triggers: "dart2js-strong-win-x64-chrome-stable"
+  triggers: "dart2js-linux-chrome-stable"
+  triggers: "dart2js-linux-firefox-stable"
+  triggers: "dart2js-mac-chrome-stable"
+  triggers: "dart2js-mac-safari-stable"
+  triggers: "dart2js-minified-csp-linux-chrome-stable"
+  triggers: "dart2js-minified-linux-d8-stable"
   triggers: "dart2js-unit-linux-x64-release-stable"
+  triggers: "dart2js-win-chrome-stable"
   triggers: "ddc-linux-chrome-stable"
   triggers: "ddc-mac-chrome-stable"
   triggers: "ddc-win-chrome-stable"
@@ -3285,6 +3183,32 @@ trigger {
     refs: "regexp:refs/heads/main"
   }
 }
+trigger {
+  id: "dart2js-gitiles-trigger-main"
+  realm: "ci"
+  triggers: "dart2js-canary-linux"
+  triggers: "dart2js-hostasserts-linux-d8"
+  triggers: "dart2js-hostasserts-linux-unsound"
+  gitiles {
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/main"
+    path_regexps: "DEPS"
+    path_regexps: "build/.+"
+    path_regexps: "BUILD.gn"
+    path_regexps: "sdk_args.gni"
+    path_regexps: ".dart_tool/package_config.json"
+    path_regexps: "sdk/lib/[^_].+"
+    path_regexps: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+    path_regexps: "tools/bots/test_matrix.json"
+    path_regexps: "tests/.+"
+    path_regexps: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+    path_regexps: "sdk/lib/_js_interop/.+"
+    path_regexps: "sdk/lib/_internal/js.+"
+    path_regexps: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+    path_regexps: "utils/compiler/.+"
+    path_regexps: "pkg/(js|modular_test|sourcemap_testing)/.+"
+  }
+}
 trigger {
   id: "dart2wasm-gitiles-trigger-main"
   realm: "ci"

From 90010e5f14c144c35a84a6d57aabcc98504fae10 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Wed, 8 Mar 2023 10:49:04 +0000
Subject: [PATCH 628/826] Add flutter-wasm builder for monorepo builds

A new monorepo builder will build the platform-independent wasm
artifacts for the Flutter web engine.

Will be used by the configuration change at
https://dart-review.googlesource.com/c/monorepo/+/287380

Bug: https://github.com/flutter/engine/pull/40000
Change-Id: Ie96e734cf82a4d2532f4e81b659eeeefd85e6d8e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/287463
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 generated/cr-buildbucket.cfg | 74 ++++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      | 12 ++++++
 monorepo.star                |  1 +
 3 files changed, 87 insertions(+)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index c919cd111270..84ff8463d036 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -3525,6 +3525,43 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "flutter-wasm-release"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "front-end-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13289,6 +13326,43 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "flutter-wasm-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "front-end-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index c9ce52da5261..389c27f66be3 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -382,6 +382,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/flutter-linux-release-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/flutter-wasm-release-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/flutter-linux-web-tests-0-try"
   }
@@ -2865,6 +2868,11 @@ consoles {
     category: "build"
     short_name: "release"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-wasm-release"
+    category: "build"
+    short_name: "wasm"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-0"
     category: "web_test"
@@ -2990,6 +2998,10 @@ consoles {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-release"
     short_name: "release"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-wasm-release"
+    short_name: "wasm"
+  }
   header {
     links {
       name: "Consoles"
diff --git a/monorepo.star b/monorepo.star
index 5d2e91d81f8c..eefe9b76bbad 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -121,6 +121,7 @@ monorepo_builder("flutter-linux-debug", "debug", "build")
 monorepo_builder("flutter-linux-debug-unopt", "debug-unopt", "build")
 monorepo_builder("flutter-linux-profile", "profile", "build")
 monorepo_builder("flutter-linux-release", "release", "build")
+monorepo_builder("flutter-wasm-release", "wasm", "build")
 
 def monorepo_tester(name, short_name, category):
     dart.ci_sandbox_builder(

From d14d8ba65b3affe62d1d6b95c8e18217a4da585c Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Fri, 10 Mar 2023 21:04:01 +0000
Subject: [PATCH 629/826] [monorepo] Flutter engine builds are changed to use
 flutter/goma

The recipe module used by Flutter recipes has been changed to
flutter/goma, a fork of fuchsia/goma. Property settings for this
module must use its new name.

Bug: https://flutter-review.googlesource.com/c/recipes/+/40260
Change-Id: I6ea15bfd4bceea5861619ed4509a9ca9280e011b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/288281
Reviewed-by: Godofredo Contreras <godofredoc@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 4 ++--
 monorepo.star                | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 84ff8463d036..b998b237d40d 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -3020,7 +3020,7 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$fuchsia/goma": {'
+        '  "$flutter/goma": {'
         '    "server": "goma.chromium.org"'
         '  },'
         '  "$recipe_engine/isolated": {'
@@ -12968,7 +12968,7 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$fuchsia/goma": {'
+        '  "$flutter/goma": {'
         '    "server": "goma.chromium.org"'
         '  },'
         '  "$recipe_engine/isolated": {'
diff --git a/monorepo.star b/monorepo.star
index eefe9b76bbad..2b78ec358e69 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -54,7 +54,7 @@ dart.ci_sandbox_builder(
     notifies = None,
     priority = priority.normal,
     properties = {
-        "$fuchsia/goma": {"server": "goma.chromium.org"},
+        "$flutter/goma": {"server": "goma.chromium.org"},
         "config_name": "host_linux",
         "environment": "unused",
         "goma_jobs": "200",
@@ -73,7 +73,7 @@ dart.try_builder(
     executable = dart.flutter_recipe("engine_v2/engine_v2"),
     execution_timeout = 120 * time.minute,
     properties = {
-        "$fuchsia/goma": {"server": "goma.chromium.org"},
+        "$flutter/goma": {"server": "goma.chromium.org"},
         "builder_name_suffix": "-try",
         "config_name": "host_linux",
         "environment": "unused",

From 78b1b941512cfd73b4d6a700f5c59450ce535ef1 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Mon, 13 Mar 2023 11:39:25 +0000
Subject: [PATCH 630/826] [monorepo] Add an empty cq implementation for
 monorepo

This cq runs no builders, but allows the CommitQueue +2 option
to submit a change on the main branch.

Change-Id: I98edba4a4315891c4dd5abe87baec2a5d4e0a1f9
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/287842
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 cq.star                    | 12 ++++++++++++
 generated/commit-queue.cfg | 20 ++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/cq.star b/cq.star
index 1591ab6d230b..523aceb8410c 100644
--- a/cq.star
+++ b/cq.star
@@ -63,6 +63,18 @@ basic_cq("dart-docker")
 basic_cq("homebrew-dart")
 basic_cq("recipes")
 
+def empty_cq(repository):
+    luci.cq_group(
+        name = repository,
+        watch = cq.refset(DART_GERRIT + repository, refs = ["refs/heads/main"]),
+        allow_submit_with_open_deps = True,
+        tree_status_host = "dart-status.appspot.com",
+        retry_config = cq.RETRY_NONE,
+        verifiers = None,
+    )
+
+empty_cq("monorepo")
+
 luci.list_view(
     name = "cq",
     title = "SDK CQ Console",
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 52f3a3ac4314..f83c3979905c 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -92,6 +92,26 @@ config_groups {
     }
   }
 }
+config_groups {
+  name: "monorepo"
+  gerrit {
+    url: "https://dart-review.googlesource.com"
+    projects {
+      name: "monorepo"
+      ref_regexp: "refs/heads/main"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "project-dart-committers"
+      dry_run_access_list: "project-dart-tryjob-access"
+      allow_submit_with_open_deps: true
+    }
+    tree_status {
+      url: "https://dart-status.appspot.com"
+    }
+  }
+}
 config_groups {
   name: "recipes"
   gerrit {

From 2bc1e8c6998e86583dad5500ecef3ce4c343b5a5 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 13 Mar 2023 16:35:41 +0000
Subject: [PATCH 631/826] [infra] Limit legacy VM configurations to main

This change also removes them from the default CQ.

Change-Id: I0bc93a5e6f5ecfa17216078402acac2ce1ebbaef
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/288500
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: Ryan Macnak <rmacnak@google.com>
---
 generated/commit-queue.cfg   |  22 +---
 generated/cr-buildbucket.cfg | 216 -----------------------------------
 generated/luci-milo.cfg      |  30 -----
 generated/luci-scheduler.cfg |  70 +-----------
 generated/project.cfg        |   2 +-
 vm.star                      |  10 +-
 6 files changed, 11 insertions(+), 339 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index f83c3979905c..cce0aed8fc34 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -797,13 +797,6 @@ config_groups {
         name: "dart/try/vm-kernel-checked-linux-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-linux-release-x64-try"
-      }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-debug-x64-try"
         location_filters {
@@ -1688,13 +1681,6 @@ config_groups {
         name: "dart/try/vm-kernel-checked-linux-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-linux-release-x64-try"
-      }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-debug-x64-try"
         location_filters {
@@ -3041,6 +3027,7 @@ config_groups {
       }
       builders {
         name: "dart/try/vm-kernel-linux-release-x64-try"
+        includable_only: true
       }
       builders {
         name: "dart/try/vm-kernel-msvc-windows-try"
@@ -4006,13 +3993,6 @@ config_groups {
         name: "dart/try/vm-kernel-checked-linux-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-linux-release-x64-try"
-      }
       builders {
         name: "dart/try/vm-kernel-nnbd-linux-debug-x64-try"
         location_filters {
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index b998b237d40d..db09d44f0512 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -7074,114 +7074,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-linux-debug-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-debug-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-debug-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -7218,114 +7110,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-msvc-windows"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 389c27f66be3..1d92e99e5123 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -1877,16 +1877,6 @@ consoles {
     category: "vm|ffi"
     short_name: "qr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-dev"
-    category: "vm|legacy|jit"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-dev"
-    category: "vm|legacy|jit"
-    short_name: "r"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-dev"
     category: "vm|legacy|jit"
@@ -2238,16 +2228,6 @@ consoles {
     category: "vm|ffi"
     short_name: "qr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-beta"
-    category: "vm|legacy|jit"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-beta"
-    category: "vm|legacy|jit"
-    short_name: "r"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-beta"
     category: "vm|legacy|jit"
@@ -2599,16 +2579,6 @@ consoles {
     category: "vm|ffi"
     short_name: "qr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64-stable"
-    category: "vm|legacy|jit"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64-stable"
-    category: "vm|legacy|jit"
-    short_name: "r"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-stable"
     category: "vm|legacy|jit"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 9a487e6870a1..ad188984f831 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1674,36 +1674,6 @@ job {
     builder: "vm-kernel-linux-debug-x64"
   }
 }
-job {
-  id: "vm-kernel-linux-debug-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-debug-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-linux-debug-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-debug-x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-linux-debug-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-debug-x64-stable"
-  }
-}
 job {
   id: "vm-kernel-linux-release-x64"
   realm: "ci.sandbox"
@@ -1714,36 +1684,6 @@ job {
     builder: "vm-kernel-linux-release-x64"
   }
 }
-job {
-  id: "vm-kernel-linux-release-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-release-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-linux-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-release-x64-dev"
-  }
-}
-job {
-  id: "vm-kernel-linux-release-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-release-x64-stable"
-  }
-}
 job {
   id: "vm-kernel-msvc-windows"
   realm: "ci.sandbox"
@@ -2849,8 +2789,6 @@ trigger {
   triggers: "vm-ffi-android-release-arm-beta"
   triggers: "vm-ffi-android-release-arm64c-beta"
   triggers: "vm-kernel-checked-linux-release-x64-beta"
-  triggers: "vm-kernel-linux-debug-x64-beta"
-  triggers: "vm-kernel-linux-release-x64-beta"
   triggers: "vm-kernel-nnbd-linux-debug-x64-beta"
   triggers: "vm-kernel-nnbd-linux-release-simarm-beta"
   triggers: "vm-kernel-nnbd-linux-release-simarm64-beta"
@@ -2912,8 +2850,6 @@ trigger {
   triggers: "vm-ffi-android-release-arm-dev"
   triggers: "vm-ffi-android-release-arm64c-dev"
   triggers: "vm-kernel-checked-linux-release-x64-dev"
-  triggers: "vm-kernel-linux-debug-x64-dev"
-  triggers: "vm-kernel-linux-release-x64-dev"
   triggers: "vm-kernel-nnbd-linux-debug-x64-dev"
   triggers: "vm-kernel-nnbd-linux-release-simarm-dev"
   triggers: "vm-kernel-nnbd-linux-release-simarm64-dev"
@@ -2988,8 +2924,6 @@ trigger {
   triggers: "pkg-mac-release"
   triggers: "pkg-mac-release-arm64"
   triggers: "pkg-win-release"
-  triggers: "vm-kernel-linux-debug-x64"
-  triggers: "vm-kernel-linux-release-x64"
   triggers: "vm-kernel-nnbd-mac-debug-x64"
   triggers: "vm-kernel-nnbd-mac-release-arm64"
   triggers: "vm-kernel-nnbd-mac-release-x64"
@@ -3044,8 +2978,6 @@ trigger {
   triggers: "vm-ffi-android-release-arm-stable"
   triggers: "vm-ffi-android-release-arm64c-stable"
   triggers: "vm-kernel-checked-linux-release-x64-stable"
-  triggers: "vm-kernel-linux-debug-x64-stable"
-  triggers: "vm-kernel-linux-release-x64-stable"
   triggers: "vm-kernel-nnbd-linux-debug-x64-stable"
   triggers: "vm-kernel-nnbd-linux-release-simarm-stable"
   triggers: "vm-kernel-nnbd-linux-release-simarm64-stable"
@@ -3136,6 +3068,8 @@ trigger {
   triggers: "vm-ffi-android-release-arm64c"
   triggers: "vm-fuchsia-release-x64"
   triggers: "vm-kernel-checked-linux-release-x64"
+  triggers: "vm-kernel-linux-debug-x64"
+  triggers: "vm-kernel-linux-release-x64"
   triggers: "vm-kernel-nnbd-linux-debug-x64"
   triggers: "vm-kernel-nnbd-linux-release-simarm"
   triggers: "vm-kernel-nnbd-linux-release-simarm64"
diff --git a/generated/project.cfg b/generated/project.cfg
index 7f4af3390279..5a43732cd954 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.38.1"
+  version: "1.38.2"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/vm.star b/vm.star
index 740efde7dfd8..fe13b486029c 100644
--- a/vm.star
+++ b/vm.star
@@ -404,11 +404,15 @@ _extra_builder(
 )
 
 #vm|legacy|jit
-_builder("vm-kernel-linux-debug-x64", category = "vm|legacy|jit|d")
-_builder(
+_extra_builder(
+    "vm-kernel-linux-debug-x64",
+    category = "vm|legacy|jit|d",
+    channels = ["try"],
+)
+_extra_builder(
     "vm-kernel-linux-release-x64",
     category = "vm|legacy|jit|r",
-    on_cq = True,
+    channels = ["try"],
 )
 _extra_builder(
     "vm-kernel-checked-linux-release-x64",

From cd1857ba660edd4f19262e3289d2f10211c3c7e1 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 14 Mar 2023 08:33:37 +0000
Subject: [PATCH 632/826] [infra] Use new names for JIT NNBD builders.

Change-Id: Ie5f0d4205cb012bd0f77b3f4b282d8089b51700b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/286223
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   | 480 +++++++++---------
 generated/cr-buildbucket.cfg | 938 +++++++++++++++++------------------
 generated/luci-milo.cfg      | 138 +++---
 generated/luci-notify.cfg    | 162 +++---
 generated/luci-scheduler.cfg | 502 +++++++++----------
 vm.star                      |  28 +-
 6 files changed, 1124 insertions(+), 1124 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index cce0aed8fc34..ab242150bc61 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -798,7 +798,47 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-linux-debug-x64-try"
+        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-linux-debug-x64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -871,15 +911,15 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-linux-release-simarm-try"
+        name: "dart/try/vm-linux-release-simarm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-linux-release-simarm64-try"
+        name: "dart/try/vm-linux-release-simarm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-linux-release-x64-try"
+        name: "dart/try/vm-linux-release-x64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -952,71 +992,31 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-mac-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-mac-release-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-mac-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-win-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-win-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
+        name: "dart/try/vm-mac-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
+        name: "dart/try/vm-mac-release-arm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
+        name: "dart/try/vm-mac-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
+        name: "dart/try/vm-precomp-ffi-qemu-linux-release-arm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
+        name: "dart/try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-precomp-ffi-qemu-linux-release-arm-try"
+        name: "dart/try/vm-win-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
+        name: "dart/try/vm-win-release-x64-try"
         includable_only: true
       }
       retry_config {}
@@ -1682,7 +1682,47 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-linux-debug-x64-try"
+        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-linux-debug-x64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1755,15 +1795,15 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-linux-release-simarm-try"
+        name: "dart/try/vm-linux-release-simarm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-linux-release-simarm64-try"
+        name: "dart/try/vm-linux-release-simarm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-linux-release-x64-try"
+        name: "dart/try/vm-linux-release-x64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1836,71 +1876,31 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-mac-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-mac-release-arm64-try"
+        name: "dart/try/vm-mac-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-mac-release-x64-try"
+        name: "dart/try/vm-mac-release-arm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-win-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-win-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
+        name: "dart/try/vm-mac-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
+        name: "dart/try/vm-precomp-ffi-qemu-linux-release-arm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
+        name: "dart/try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-precomp-ffi-qemu-linux-release-arm-try"
+        name: "dart/try/vm-win-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
+        name: "dart/try/vm-win-release-x64-try"
         includable_only: true
       }
       retry_config {}
@@ -3034,15 +3034,75 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-linux-debug-ia32-try"
+        name: "dart/try/vm-kernel-precomp-dwarf-linux-product-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simriscv64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-win-debug-ia32-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-linux-debug-ia32-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-linux-debug-simriscv64-try"
+        name: "dart/try/vm-linux-debug-simriscv64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-linux-debug-x64-try"
+        name: "dart/try/vm-linux-debug-x64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3115,19 +3175,23 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-linux-release-ia32-try"
+        name: "dart/try/vm-linux-debug-x64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-linux-release-simarm-try"
+        name: "dart/try/vm-linux-release-ia32-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-linux-release-simarm64-try"
+        name: "dart/try/vm-linux-release-simarm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-linux-release-x64-try"
+        name: "dart/try/vm-linux-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-linux-release-x64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3200,95 +3264,19 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-mac-debug-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-mac-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-mac-release-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-mac-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-win-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-win-release-ia32-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-win-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-dwarf-linux-product-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simriscv64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-x64-try"
+        name: "dart/try/vm-mac-debug-arm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
+        name: "dart/try/vm-mac-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
+        name: "dart/try/vm-mac-release-arm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-win-debug-ia32-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-linux-debug-x64c-try"
+        name: "dart/try/vm-mac-release-x64-try"
         includable_only: true
       }
       builders {
@@ -3327,10 +3315,22 @@ config_groups {
         name: "dart/try/vm-ubsan-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-win-debug-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-win-debug-x64c-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-win-release-ia32-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-win-release-x64-try"
+        includable_only: true
+      }
       retry_config {}
     }
   }
@@ -3994,7 +3994,47 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-linux-debug-x64-try"
+        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-linux-debug-x64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -4067,15 +4107,15 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-linux-release-simarm-try"
+        name: "dart/try/vm-linux-release-simarm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-linux-release-simarm64-try"
+        name: "dart/try/vm-linux-release-simarm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-linux-release-x64-try"
+        name: "dart/try/vm-linux-release-x64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -4148,71 +4188,31 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-mac-debug-x64-try"
+        name: "dart/try/vm-mac-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-mac-release-arm64-try"
+        name: "dart/try/vm-mac-release-arm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-mac-release-x64-try"
+        name: "dart/try/vm-mac-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-nnbd-win-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-nnbd-win-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
+        name: "dart/try/vm-precomp-ffi-qemu-linux-release-arm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
+        name: "dart/try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-precomp-ffi-qemu-linux-release-arm-try"
+        name: "dart/try/vm-win-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
+        name: "dart/try/vm-win-release-x64-try"
         includable_only: true
       }
       retry_config {}
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index db09d44f0512..47e2c7c9dcf4 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -7145,7 +7145,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-ia32"
+      name: "vm-kernel-precomp-dwarf-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7170,8 +7170,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 70
       build_numbers: YES
@@ -7182,7 +7181,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-simriscv64"
+      name: "vm-kernel-precomp-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7209,7 +7208,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7218,7 +7217,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64"
+      name: "vm-kernel-precomp-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7254,7 +7253,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64-beta"
+      name: "vm-kernel-precomp-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7290,7 +7289,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64-dev"
+      name: "vm-kernel-precomp-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7326,7 +7325,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64-stable"
+      name: "vm-kernel-precomp-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7362,7 +7361,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-ia32"
+      name: "vm-kernel-precomp-linux-release-simarm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7389,7 +7388,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7398,7 +7397,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-simarm"
+      name: "vm-kernel-precomp-linux-release-simarm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7434,7 +7433,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-simarm-beta"
+      name: "vm-kernel-precomp-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7470,7 +7469,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-simarm-dev"
+      name: "vm-kernel-precomp-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7506,7 +7505,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-simarm-stable"
+      name: "vm-kernel-precomp-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7542,7 +7541,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-simarm64"
+      name: "vm-kernel-precomp-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7578,7 +7577,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-simarm64-beta"
+      name: "vm-kernel-precomp-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7614,7 +7613,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-simarm64-dev"
+      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7650,7 +7649,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-simarm64-stable"
+      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7686,7 +7685,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-x64"
+      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7722,7 +7721,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-x64-beta"
+      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7758,7 +7757,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-x64-dev"
+      name: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7783,9 +7782,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7794,7 +7794,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-x64-stable"
+      name: "vm-kernel-precomp-nnbd-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7819,9 +7819,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7830,11 +7831,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-debug-arm64"
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7844,7 +7845,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -7855,17 +7856,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7874,11 +7867,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-debug-x64"
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7888,7 +7881,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -7899,14 +7892,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7915,11 +7903,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-debug-x64-beta"
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7929,7 +7917,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -7940,14 +7928,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7956,11 +7939,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-debug-x64-dev"
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7970,7 +7953,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -7981,14 +7964,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7997,11 +7975,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-debug-x64-stable"
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8011,7 +7989,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8022,14 +8000,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8038,11 +8011,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-release-arm64"
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8052,7 +8025,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8063,16 +8036,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8081,11 +8047,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-release-arm64-beta"
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8095,7 +8061,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8106,16 +8072,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8124,11 +8083,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-release-arm64-dev"
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8138,7 +8097,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8149,16 +8108,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8167,11 +8119,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-release-arm64-stable"
+      name: "vm-kernel-precomp-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8181,7 +8133,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8192,16 +8144,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8210,11 +8155,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-release-x64"
+      name: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8224,7 +8169,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8238,10 +8183,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8250,11 +8191,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-release-x64-beta"
+      name: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8264,7 +8205,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8278,10 +8219,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8290,11 +8227,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-release-x64-dev"
+      name: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8304,7 +8241,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8318,10 +8255,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8330,9 +8263,9 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-release-x64-stable"
+      name: "vm-kernel-precomp-nnbd-mac-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
@@ -8355,7 +8288,11 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       caches {
@@ -8370,11 +8307,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-debug-x64"
+      name: "vm-kernel-precomp-nnbd-mac-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8399,6 +8336,10 @@ buckets {
         '  "shard_timeout": 5400'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8407,11 +8348,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-debug-x64-beta"
+      name: "vm-kernel-precomp-nnbd-mac-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8436,6 +8377,10 @@ buckets {
         '  "shard_timeout": 5400'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8444,11 +8389,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-debug-x64-dev"
+      name: "vm-kernel-precomp-nnbd-mac-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8473,6 +8418,10 @@ buckets {
         '  "shard_timeout": 5400'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8481,11 +8430,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-debug-x64-stable"
+      name: "vm-kernel-precomp-nnbd-mac-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8510,6 +8459,10 @@ buckets {
         '  "shard_timeout": 5400'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8518,7 +8471,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-ia32"
+      name: "vm-kernel-precomp-nnbd-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8545,7 +8498,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8554,7 +8507,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-x64"
+      name: "vm-kernel-precomp-nnbd-win-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8590,7 +8543,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-x64-beta"
+      name: "vm-kernel-precomp-nnbd-win-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8626,7 +8579,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-x64-dev"
+      name: "vm-kernel-precomp-nnbd-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8662,11 +8615,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-x64-stable"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8676,7 +8629,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8698,7 +8651,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-dwarf-linux-product-x64"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8725,7 +8678,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8734,7 +8687,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8770,7 +8723,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-beta"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8806,11 +8759,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-dev"
+      name: "vm-kernel-win-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8820,7 +8773,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8831,9 +8784,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8842,7 +8796,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-stable"
+      name: "vm-linux-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8867,9 +8821,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8878,7 +8833,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm"
+      name: "vm-linux-debug-simriscv64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8905,7 +8860,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8914,7 +8869,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-beta"
+      name: "vm-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8950,7 +8905,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-dev"
+      name: "vm-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8986,7 +8941,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-stable"
+      name: "vm-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9022,7 +8977,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64"
+      name: "vm-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9058,7 +9013,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64-beta"
+      name: "vm-linux-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9085,7 +9040,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9094,7 +9049,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64-dev"
+      name: "vm-linux-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9119,9 +9074,11 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 7200'
         '}'
       priority: 50
+      execution_timeout_secs: 14400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9130,7 +9087,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64-stable"
+      name: "vm-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9157,7 +9114,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9166,7 +9123,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+      name: "vm-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9202,7 +9159,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-beta"
+      name: "vm-linux-release-simarm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9238,7 +9195,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-dev"
+      name: "vm-linux-release-simarm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9274,7 +9231,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-stable"
+      name: "vm-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9310,7 +9267,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
+      name: "vm-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9335,10 +9292,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9347,7 +9303,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-x64"
+      name: "vm-linux-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9372,10 +9328,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9384,7 +9339,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm64"
+      name: "vm-linux-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9420,7 +9375,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-beta"
+      name: "vm-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9456,7 +9411,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-dev"
+      name: "vm-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9492,7 +9447,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-stable"
+      name: "vm-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9528,7 +9483,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+      name: "vm-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9564,7 +9519,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-beta"
+      name: "vm-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9600,11 +9555,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-dev"
+      name: "vm-mac-debug-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9614,7 +9569,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9625,9 +9580,17 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9636,11 +9599,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-stable"
+      name: "vm-mac-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9650,7 +9613,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9661,9 +9624,14 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9672,11 +9640,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64"
+      name: "vm-mac-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9686,7 +9654,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9697,9 +9665,14 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9708,11 +9681,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
+      name: "vm-mac-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9722,7 +9695,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9733,9 +9706,14 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9744,11 +9722,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
+      name: "vm-mac-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9758,7 +9736,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9769,9 +9747,14 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9780,11 +9763,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
+      name: "vm-mac-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9794,7 +9777,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9805,9 +9788,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9816,7 +9806,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-mac-release-arm64"
+      name: "vm-mac-release-arm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
@@ -9844,8 +9834,7 @@ buckets {
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       caches {
@@ -9860,9 +9849,9 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-mac-release-simarm64"
+      name: "vm-mac-release-arm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
@@ -9885,8 +9874,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       caches {
@@ -9901,9 +9892,9 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-mac-release-simarm64-beta"
+      name: "vm-mac-release-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
@@ -9926,8 +9917,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       caches {
@@ -9942,7 +9935,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-mac-release-simarm64-dev"
+      name: "vm-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9967,8 +9960,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       caches {
@@ -9983,7 +9975,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-mac-release-simarm64-stable"
+      name: "vm-mac-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10008,8 +10000,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       caches {
@@ -10024,11 +10015,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-win-release-x64"
+      name: "vm-mac-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10052,6 +10043,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10060,11 +10055,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-win-release-x64-beta"
+      name: "vm-mac-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10088,6 +10083,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10096,11 +10095,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-win-release-x64-dev"
+      name: "vm-msan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10110,7 +10109,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10120,10 +10119,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10132,11 +10132,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-win-release-x64-stable"
+      name: "vm-precomp-ffi-qemu-linux-release-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10146,7 +10146,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10168,11 +10168,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10204,11 +10204,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10240,11 +10240,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "host_class:experimental"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10267,7 +10267,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10276,11 +10276,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10312,11 +10312,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-ia32"
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10326,7 +10326,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10337,10 +10337,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10349,11 +10348,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-x64c"
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10376,7 +10375,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10385,11 +10384,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-arm64"
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10410,11 +10409,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 7200'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      execution_timeout_secs: 14400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10423,11 +10420,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-msan-linux-release-x64"
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10447,11 +10444,10 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10460,11 +10456,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm"
+      name: "vm-reload-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10487,7 +10483,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10496,11 +10492,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-beta"
+      name: "vm-reload-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10523,7 +10519,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10532,11 +10528,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-dev"
+      name: "vm-reload-rollback-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10559,7 +10555,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10568,11 +10564,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
+      name: "vm-reload-rollback-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "host_class:experimental"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10604,11 +10600,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-stable"
+      name: "vm-tsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10628,10 +10624,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10640,11 +10637,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64"
+      name: "vm-ubsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10653,10 +10650,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -10664,10 +10659,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10676,11 +10672,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
+      name: "vm-win-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10690,7 +10686,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10701,7 +10697,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -10712,11 +10709,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
+      name: "vm-win-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10726,7 +10723,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10737,7 +10734,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -10748,11 +10746,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
+      name: "vm-win-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10762,7 +10760,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10773,7 +10771,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -10784,11 +10783,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-linux-debug-x64"
+      name: "vm-win-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10798,7 +10797,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10809,9 +10808,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10820,11 +10820,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-linux-release-x64"
+      name: "vm-win-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10834,7 +10834,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10856,11 +10856,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-rollback-linux-debug-x64"
+      name: "vm-win-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10870,7 +10870,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10892,11 +10892,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-rollback-linux-release-x64"
+      name: "vm-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10906,7 +10906,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10919,7 +10919,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10928,11 +10928,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-tsan-linux-release-x64"
+      name: "vm-win-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10942,7 +10942,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10952,11 +10952,10 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10965,11 +10964,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ubsan-linux-release-x64"
+      name: "vm-win-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10978,8 +10977,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -10987,11 +10988,10 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11000,7 +11000,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-win-debug-x64c"
+      name: "vm-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11027,7 +11027,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14684,7 +14684,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-ia32-try"
+      name: "vm-kernel-precomp-dwarf-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14709,8 +14709,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -14721,7 +14720,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-simriscv64-try"
+      name: "vm-kernel-precomp-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14757,7 +14756,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-debug-x64-try"
+      name: "vm-kernel-precomp-linux-release-simarm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14793,7 +14792,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-ia32-try"
+      name: "vm-kernel-precomp-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14829,7 +14828,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-simarm-try"
+      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14865,7 +14864,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-simarm64-try"
+      name: "vm-kernel-precomp-nnbd-linux-debug-simriscv64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14890,7 +14889,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -14901,7 +14901,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-linux-release-x64-try"
+      name: "vm-kernel-precomp-nnbd-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14926,7 +14926,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -14937,11 +14938,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-debug-arm64-try"
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14951,7 +14952,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -14962,17 +14963,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14981,11 +14974,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-debug-x64-try"
+      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14995,7 +14988,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -15006,14 +14999,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -15022,11 +15010,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-release-arm64-try"
+      name: "vm-kernel-precomp-nnbd-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15036,7 +15024,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -15047,16 +15035,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -15065,9 +15046,9 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-mac-release-x64-try"
+      name: "vm-kernel-precomp-nnbd-mac-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
@@ -15090,7 +15071,11 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       caches {
@@ -15105,11 +15090,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-debug-x64-try"
+      name: "vm-kernel-precomp-nnbd-mac-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15134,6 +15119,10 @@ buckets {
         '  "shard_timeout": 5400'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -15142,7 +15131,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-ia32-try"
+      name: "vm-kernel-precomp-nnbd-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15178,11 +15167,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-nnbd-win-release-x64-try"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15192,7 +15181,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -15214,11 +15203,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-dwarf-linux-product-x64-try"
+      name: "vm-kernel-win-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15228,7 +15217,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -15239,7 +15228,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -15250,7 +15240,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-try"
+      name: "vm-linux-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15275,7 +15265,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -15286,7 +15277,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-try"
+      name: "vm-linux-debug-simriscv64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15322,7 +15313,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64-try"
+      name: "vm-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15358,7 +15349,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
+      name: "vm-linux-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15394,7 +15385,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-simriscv64-try"
+      name: "vm-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15419,8 +15410,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -15431,7 +15421,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-x64-try"
+      name: "vm-linux-release-simarm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15456,8 +15446,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -15468,7 +15457,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-try"
+      name: "vm-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15504,7 +15493,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
+      name: "vm-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15540,11 +15529,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64-try"
+      name: "vm-mac-debug-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15554,7 +15543,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -15565,9 +15554,17 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -15576,9 +15573,9 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-mac-release-arm64-try"
+      name: "vm-mac-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
@@ -15601,9 +15598,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -15620,9 +15614,9 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-mac-release-simarm64-try"
+      name: "vm-mac-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
@@ -15645,8 +15639,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       caches {
@@ -15661,11 +15657,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-win-release-x64-try"
+      name: "vm-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15689,6 +15685,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -15697,7 +15697,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-try"
+      name: "vm-msan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15721,6 +15721,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -15733,11 +15734,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-ia32-try"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15747,7 +15748,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -15758,8 +15759,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -15770,11 +15770,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-x64c-try"
+      name: "vm-precomp-ffi-qemu-linux-release-riscv64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15806,7 +15806,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-msan-linux-release-x64-try"
+      name: "vm-reload-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15830,7 +15830,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -15843,11 +15842,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-try"
+      name: "vm-reload-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15879,11 +15878,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64-try"
+      name: "vm-reload-rollback-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15915,7 +15914,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-linux-debug-x64-try"
+      name: "vm-reload-rollback-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15951,7 +15950,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-linux-release-x64-try"
+      name: "vm-tsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15975,6 +15974,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -15987,7 +15987,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-rollback-linux-debug-x64-try"
+      name: "vm-ubsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -16000,10 +16000,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -16011,6 +16009,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -16023,11 +16022,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-rollback-linux-release-x64-try"
+      name: "vm-win-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16037,7 +16036,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -16048,7 +16047,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -16059,11 +16059,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-tsan-linux-release-x64-try"
+      name: "vm-win-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16073,7 +16073,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -16083,7 +16083,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -16096,11 +16095,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ubsan-linux-release-x64-try"
+      name: "vm-win-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -16109,8 +16108,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -16118,7 +16119,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -16131,7 +16131,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-win-debug-x64c-try"
+      name: "vm-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 1d92e99e5123..64788e249980 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -53,46 +53,46 @@ consoles {
     name: "buildbucket/luci.dart.try/dart2wasm-linux-x64-d8-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.try/vm-linux-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-ia32-try"
+    name: "buildbucket/luci.dart.try/vm-linux-debug-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-ia32-try"
+    name: "buildbucket/luci.dart.try/vm-linux-release-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-simarm-try"
+    name: "buildbucket/luci.dart.try/vm-linux-release-simarm-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-release-simarm64-try"
+    name: "buildbucket/luci.dart.try/vm-linux-release-simarm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-linux-debug-simriscv64-try"
+    name: "buildbucket/luci.dart.try/vm-linux-debug-simriscv64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-debug-arm64-try"
+    name: "buildbucket/luci.dart.try/vm-mac-debug-arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-debug-x64-try"
+    name: "buildbucket/luci.dart.try/vm-mac-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-release-arm64-try"
+    name: "buildbucket/luci.dart.try/vm-mac-release-arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-mac-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-mac-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-release-ia32-try"
+    name: "buildbucket/luci.dart.try/vm-win-release-ia32-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-debug-x64-try"
+    name: "buildbucket/luci.dart.try/vm-win-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-nnbd-win-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-win-release-x64-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-appjit-linux-debug-x64-try"
@@ -506,37 +506,37 @@ consoles {
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64"
     category: "vm|jit"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-x64"
     category: "vm|jit"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-ia32"
     category: "vm|jit"
     short_name: "d3"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-ia32"
     category: "vm|jit"
     short_name: "r3"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm"
     category: "vm|jit"
     short_name: "ra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64"
     category: "vm|jit"
     short_name: "ra6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-simriscv64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simriscv64"
     category: "vm|jit"
     short_name: "rv"
   }
@@ -546,37 +546,37 @@ consoles {
     short_name: "a6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-arm64"
     category: "vm|jit"
     short_name: "m1d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64"
     category: "vm|jit"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-arm64"
     category: "vm|jit"
     short_name: "m1r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64"
     category: "vm|jit"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-ia32"
     category: "vm|jit"
     short_name: "wr3"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64"
     category: "vm|jit"
     short_name: "wd"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-x64"
     category: "vm|jit"
     short_name: "wr"
   }
@@ -1282,37 +1282,37 @@ consoles {
     short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64"
     category: "vm|jit"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-x64"
     category: "vm|jit"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-ia32"
     category: "vm|jit"
     short_name: "d3"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-ia32"
     category: "vm|jit"
     short_name: "r3"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm"
     category: "vm|jit"
     short_name: "ra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64"
     category: "vm|jit"
     short_name: "ra6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-simriscv64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simriscv64"
     category: "vm|jit"
     short_name: "rv"
   }
@@ -1322,37 +1322,37 @@ consoles {
     short_name: "a6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-arm64"
     category: "vm|jit"
     short_name: "m1d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64"
     category: "vm|jit"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-arm64"
     category: "vm|jit"
     short_name: "m1r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64"
     category: "vm|jit"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-ia32"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-ia32"
     category: "vm|jit"
     short_name: "wr3"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64"
     category: "vm|jit"
     short_name: "wd"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-x64"
     category: "vm|jit"
     short_name: "wr"
   }
@@ -1743,47 +1743,47 @@ consoles {
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64-dev"
     category: "vm|jit"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-x64-dev"
     category: "vm|jit"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm-dev"
     category: "vm|jit"
     short_name: "ra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64-dev"
     category: "vm|jit"
     short_name: "ra6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64-dev"
     category: "vm|jit"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-arm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-arm64-dev"
     category: "vm|jit"
     short_name: "m1r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64-dev"
     category: "vm|jit"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64-dev"
     category: "vm|jit"
     short_name: "wd"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-x64-dev"
     category: "vm|jit"
     short_name: "wr"
   }
@@ -2094,47 +2094,47 @@ consoles {
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64-beta"
     category: "vm|jit"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-x64-beta"
     category: "vm|jit"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm-beta"
     category: "vm|jit"
     short_name: "ra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64-beta"
     category: "vm|jit"
     short_name: "ra6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64-beta"
     category: "vm|jit"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-arm64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-arm64-beta"
     category: "vm|jit"
     short_name: "m1r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64-beta"
     category: "vm|jit"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64-beta"
     category: "vm|jit"
     short_name: "wd"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-x64-beta"
     category: "vm|jit"
     short_name: "wr"
   }
@@ -2445,47 +2445,47 @@ consoles {
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64-stable"
     category: "vm|jit"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-x64-stable"
     category: "vm|jit"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm-stable"
     category: "vm|jit"
     short_name: "ra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-linux-release-simarm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64-stable"
     category: "vm|jit"
     short_name: "ra6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64-stable"
     category: "vm|jit"
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-arm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-arm64-stable"
     category: "vm|jit"
     short_name: "m1r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-mac-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64-stable"
     category: "vm|jit"
     short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64-stable"
     category: "vm|jit"
     short_name: "wd"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-nnbd-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-x64-stable"
     category: "vm|jit"
     short_name: "wr"
   }
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index a9b7affc7482..e3b7020b1253 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -821,20 +821,18 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-linux-debug-ia32"
+    name: "vm-kernel-precomp-dwarf-linux-product-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-linux-debug-simriscv64"
+    name: "vm-kernel-precomp-linux-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -845,20 +843,18 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-linux-debug-x64"
+    name: "vm-kernel-precomp-linux-release-simarm"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-linux-release-ia32"
+    name: "vm-kernel-precomp-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -869,42 +865,44 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-linux-release-simarm"
+    name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-linux-release-simarm64"
+    name: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-linux-release-x64"
+    name: "vm-kernel-precomp-nnbd-linux-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-mac-debug-arm64"
+    name: "vm-kernel-precomp-nnbd-linux-release-simarm64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -915,7 +913,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-mac-debug-x64"
+    name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -926,7 +924,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-mac-release-arm64"
+    name: "vm-kernel-precomp-nnbd-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -937,7 +935,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-mac-release-x64"
+    name: "vm-kernel-precomp-nnbd-mac-release-arm64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -948,20 +946,18 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-win-debug-x64"
+    name: "vm-kernel-precomp-nnbd-mac-release-simarm64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-win-release-ia32"
+    name: "vm-kernel-precomp-nnbd-win-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -972,7 +968,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-nnbd-win-release-x64"
+    name: "vm-kernel-precomp-obfuscate-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -985,29 +981,33 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-dwarf-linux-product-x64"
+    name: "vm-kernel-win-debug-ia32"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-debug-x64"
+    name: "vm-linux-debug-ia32"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-release-simarm"
+    name: "vm-linux-debug-simriscv64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1018,31 +1018,31 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-release-x64"
+    name: "vm-linux-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+    name: "vm-linux-debug-x64c"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
+    name: "vm-linux-release-arm64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1055,7 +1055,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-linux-debug-x64"
+    name: "vm-linux-release-ia32"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1066,7 +1066,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-linux-release-simarm64"
+    name: "vm-linux-release-simarm"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1077,7 +1077,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+    name: "vm-linux-release-simarm64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1088,18 +1088,20 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-linux-release-x64"
+    name: "vm-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-mac-release-arm64"
+    name: "vm-mac-debug-arm64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1110,7 +1112,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-mac-release-simarm64"
+    name: "vm-mac-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1121,7 +1123,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-win-release-x64"
+    name: "vm-mac-release-arm64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1132,7 +1134,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-obfuscate-linux-release-x64"
+    name: "vm-mac-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1145,55 +1147,57 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-win-debug-ia32"
+    name: "vm-msan-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-linux-debug-x64c"
+    name: "vm-precomp-ffi-qemu-linux-release-arm"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-linux-release-arm64"
+    name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-msan-linux-release-x64"
+    name: "vm-precomp-ffi-qemu-linux-release-riscv64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-precomp-ffi-qemu-linux-release-arm"
+    name: "vm-reload-linux-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1201,25 +1205,25 @@ notifiers {
   notifications {
     on_new_failure: true
     email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
+      recipients: "dart-vm-team-breakages@google.com"
     }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
+    name: "vm-reload-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-precomp-ffi-qemu-linux-release-riscv64"
+    name: "vm-reload-rollback-linux-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1232,7 +1236,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-reload-linux-debug-x64"
+    name: "vm-reload-rollback-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1245,7 +1249,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-reload-linux-release-x64"
+    name: "vm-tsan-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1258,20 +1262,18 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-reload-rollback-linux-debug-x64"
+    name: "vm-ubsan-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-reload-rollback-linux-release-x64"
+    name: "vm-win-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1284,7 +1286,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-tsan-linux-release-x64"
+    name: "vm-win-debug-x64c"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1297,20 +1299,18 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-ubsan-linux-release-x64"
+    name: "vm-win-release-ia32"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-win-debug-x64c"
+    name: "vm-win-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index ad188984f831..006a2f105e69 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1695,1053 +1695,1053 @@ job {
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-debug-ia32"
+  id: "vm-kernel-precomp-dwarf-linux-product-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-debug-ia32"
+    builder: "vm-kernel-precomp-dwarf-linux-product-x64"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-debug-simriscv64"
+  id: "vm-kernel-precomp-linux-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-debug-simriscv64"
+    builder: "vm-kernel-precomp-linux-debug-x64"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-debug-x64"
+  id: "vm-kernel-precomp-linux-debug-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-debug-x64"
+    builder: "vm-kernel-precomp-linux-debug-x64-beta"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-debug-x64-beta"
+  id: "vm-kernel-precomp-linux-debug-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-debug-x64-beta"
+    builder: "vm-kernel-precomp-linux-debug-x64-dev"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-debug-x64-dev"
+  id: "vm-kernel-precomp-linux-debug-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-debug-x64-dev"
+    builder: "vm-kernel-precomp-linux-debug-x64-stable"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-debug-x64-stable"
+  id: "vm-kernel-precomp-linux-release-simarm"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-debug-x64-stable"
+    builder: "vm-kernel-precomp-linux-release-simarm"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-release-ia32"
+  id: "vm-kernel-precomp-linux-release-simarm-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-release-ia32"
+    builder: "vm-kernel-precomp-linux-release-simarm-beta"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-release-simarm"
+  id: "vm-kernel-precomp-linux-release-simarm-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-release-simarm"
+    builder: "vm-kernel-precomp-linux-release-simarm-dev"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-release-simarm-beta"
+  id: "vm-kernel-precomp-linux-release-simarm-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-release-simarm-beta"
+    builder: "vm-kernel-precomp-linux-release-simarm-stable"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-release-simarm-dev"
+  id: "vm-kernel-precomp-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-release-simarm-dev"
+    builder: "vm-kernel-precomp-linux-release-x64"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-release-simarm-stable"
+  id: "vm-kernel-precomp-linux-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-release-simarm-stable"
+    builder: "vm-kernel-precomp-linux-release-x64-beta"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-release-simarm64"
+  id: "vm-kernel-precomp-linux-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-release-simarm64"
+    builder: "vm-kernel-precomp-linux-release-x64-dev"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-release-simarm64-beta"
+  id: "vm-kernel-precomp-linux-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-release-simarm64-beta"
+    builder: "vm-kernel-precomp-linux-release-x64-stable"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-release-simarm64-dev"
+  id: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-release-simarm64-dev"
+    builder: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-release-simarm64-stable"
+  id: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-release-simarm64-stable"
+    builder: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-beta"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-release-x64"
+  id: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-release-x64"
+    builder: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-dev"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-release-x64-beta"
+  id: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-release-x64-beta"
+    builder: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-stable"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-release-x64-dev"
+  id: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-release-x64-dev"
+    builder: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
   }
 }
 job {
-  id: "vm-kernel-nnbd-linux-release-x64-stable"
+  id: "vm-kernel-precomp-nnbd-linux-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-linux-release-x64-stable"
+    builder: "vm-kernel-precomp-nnbd-linux-debug-x64"
   }
 }
 job {
-  id: "vm-kernel-nnbd-mac-debug-arm64"
+  id: "vm-kernel-precomp-nnbd-linux-release-simarm64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-mac-debug-arm64"
+    builder: "vm-kernel-precomp-nnbd-linux-release-simarm64"
   }
 }
 job {
-  id: "vm-kernel-nnbd-mac-debug-x64"
+  id: "vm-kernel-precomp-nnbd-linux-release-simarm64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-mac-debug-x64"
+    builder: "vm-kernel-precomp-nnbd-linux-release-simarm64-beta"
   }
 }
 job {
-  id: "vm-kernel-nnbd-mac-debug-x64-beta"
+  id: "vm-kernel-precomp-nnbd-linux-release-simarm64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-mac-debug-x64-beta"
+    builder: "vm-kernel-precomp-nnbd-linux-release-simarm64-dev"
   }
 }
 job {
-  id: "vm-kernel-nnbd-mac-debug-x64-dev"
+  id: "vm-kernel-precomp-nnbd-linux-release-simarm64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-mac-debug-x64-dev"
+    builder: "vm-kernel-precomp-nnbd-linux-release-simarm64-stable"
   }
 }
 job {
-  id: "vm-kernel-nnbd-mac-debug-x64-stable"
+  id: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-mac-debug-x64-stable"
+    builder: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
   }
 }
 job {
-  id: "vm-kernel-nnbd-mac-release-arm64"
+  id: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-mac-release-arm64"
+    builder: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-beta"
   }
 }
 job {
-  id: "vm-kernel-nnbd-mac-release-arm64-beta"
+  id: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-mac-release-arm64-beta"
+    builder: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-dev"
   }
 }
 job {
-  id: "vm-kernel-nnbd-mac-release-arm64-dev"
+  id: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-mac-release-arm64-dev"
+    builder: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-stable"
   }
 }
 job {
-  id: "vm-kernel-nnbd-mac-release-arm64-stable"
+  id: "vm-kernel-precomp-nnbd-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-mac-release-arm64-stable"
+    builder: "vm-kernel-precomp-nnbd-linux-release-x64"
   }
 }
 job {
-  id: "vm-kernel-nnbd-mac-release-x64"
+  id: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-mac-release-x64"
+    builder: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
   }
 }
 job {
-  id: "vm-kernel-nnbd-mac-release-x64-beta"
+  id: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-mac-release-x64-beta"
+    builder: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
   }
 }
 job {
-  id: "vm-kernel-nnbd-mac-release-x64-dev"
+  id: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-mac-release-x64-dev"
+    builder: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
   }
 }
 job {
-  id: "vm-kernel-nnbd-mac-release-x64-stable"
+  id: "vm-kernel-precomp-nnbd-mac-release-arm64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-mac-release-x64-stable"
+    builder: "vm-kernel-precomp-nnbd-mac-release-arm64"
   }
 }
 job {
-  id: "vm-kernel-nnbd-win-debug-x64"
+  id: "vm-kernel-precomp-nnbd-mac-release-simarm64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-win-debug-x64"
+    builder: "vm-kernel-precomp-nnbd-mac-release-simarm64"
   }
 }
 job {
-  id: "vm-kernel-nnbd-win-debug-x64-beta"
+  id: "vm-kernel-precomp-nnbd-mac-release-simarm64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-win-debug-x64-beta"
+    builder: "vm-kernel-precomp-nnbd-mac-release-simarm64-beta"
   }
 }
 job {
-  id: "vm-kernel-nnbd-win-debug-x64-dev"
+  id: "vm-kernel-precomp-nnbd-mac-release-simarm64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-win-debug-x64-dev"
+    builder: "vm-kernel-precomp-nnbd-mac-release-simarm64-dev"
   }
 }
 job {
-  id: "vm-kernel-nnbd-win-debug-x64-stable"
+  id: "vm-kernel-precomp-nnbd-mac-release-simarm64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-win-debug-x64-stable"
+    builder: "vm-kernel-precomp-nnbd-mac-release-simarm64-stable"
   }
 }
 job {
-  id: "vm-kernel-nnbd-win-release-ia32"
+  id: "vm-kernel-precomp-nnbd-win-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-win-release-ia32"
+    builder: "vm-kernel-precomp-nnbd-win-release-x64"
   }
 }
 job {
-  id: "vm-kernel-nnbd-win-release-x64"
+  id: "vm-kernel-precomp-nnbd-win-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-win-release-x64"
+    builder: "vm-kernel-precomp-nnbd-win-release-x64-beta"
   }
 }
 job {
-  id: "vm-kernel-nnbd-win-release-x64-beta"
+  id: "vm-kernel-precomp-nnbd-win-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-win-release-x64-beta"
+    builder: "vm-kernel-precomp-nnbd-win-release-x64-dev"
   }
 }
 job {
-  id: "vm-kernel-nnbd-win-release-x64-dev"
+  id: "vm-kernel-precomp-nnbd-win-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-win-release-x64-dev"
+    builder: "vm-kernel-precomp-nnbd-win-release-x64-stable"
   }
 }
 job {
-  id: "vm-kernel-nnbd-win-release-x64-stable"
+  id: "vm-kernel-precomp-obfuscate-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-nnbd-win-release-x64-stable"
+    builder: "vm-kernel-precomp-obfuscate-linux-release-x64"
   }
 }
 job {
-  id: "vm-kernel-precomp-dwarf-linux-product-x64"
+  id: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-dwarf-linux-product-x64"
+    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-debug-x64"
+  id: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64"
+    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-debug-x64-beta"
+  id: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64-beta"
+    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-debug-x64-dev"
+  id: "vm-kernel-win-debug-ia32"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64-dev"
+    builder: "vm-kernel-win-debug-ia32"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-debug-x64-stable"
+  id: "vm-linux-debug-ia32"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64-stable"
+    builder: "vm-linux-debug-ia32"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-release-simarm"
+  id: "vm-linux-debug-simriscv64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm"
+    builder: "vm-linux-debug-simriscv64"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-release-simarm-beta"
+  id: "vm-linux-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm-beta"
+    builder: "vm-linux-debug-x64"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-release-simarm-dev"
+  id: "vm-linux-debug-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm-dev"
+    builder: "vm-linux-debug-x64-beta"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-release-simarm-stable"
+  id: "vm-linux-debug-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm-stable"
+    builder: "vm-linux-debug-x64-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-release-x64"
+  id: "vm-linux-debug-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-x64"
+    builder: "vm-linux-debug-x64-stable"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-release-x64-beta"
+  id: "vm-linux-debug-x64c"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-x64-beta"
+    builder: "vm-linux-debug-x64c"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-release-x64-dev"
+  id: "vm-linux-release-arm64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-x64-dev"
+    builder: "vm-linux-release-arm64"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-release-x64-stable"
+  id: "vm-linux-release-ia32"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-x64-stable"
+    builder: "vm-linux-release-ia32"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+  id: "vm-linux-release-simarm"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+    builder: "vm-linux-release-simarm"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-beta"
+  id: "vm-linux-release-simarm-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-beta"
+    builder: "vm-linux-release-simarm-beta"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-dev"
+  id: "vm-linux-release-simarm-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-dev"
+    builder: "vm-linux-release-simarm-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-stable"
+  id: "vm-linux-release-simarm-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-stable"
+    builder: "vm-linux-release-simarm-stable"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
+  id: "vm-linux-release-simarm64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
+    builder: "vm-linux-release-simarm64"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-debug-x64"
+  id: "vm-linux-release-simarm64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-debug-x64"
+    builder: "vm-linux-release-simarm64-beta"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-simarm64"
+  id: "vm-linux-release-simarm64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-simarm64"
+    builder: "vm-linux-release-simarm64-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-simarm64-beta"
+  id: "vm-linux-release-simarm64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-simarm64-beta"
+    builder: "vm-linux-release-simarm64-stable"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-simarm64-dev"
+  id: "vm-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-simarm64-dev"
+    builder: "vm-linux-release-x64"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-simarm64-stable"
+  id: "vm-linux-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-simarm64-stable"
+    builder: "vm-linux-release-x64-beta"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+  id: "vm-linux-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+    builder: "vm-linux-release-x64-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-beta"
+  id: "vm-linux-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-beta"
+    builder: "vm-linux-release-x64-stable"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-dev"
+  id: "vm-mac-debug-arm64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-dev"
+    builder: "vm-mac-debug-arm64"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-stable"
+  id: "vm-mac-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-stable"
+    builder: "vm-mac-debug-x64"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-x64"
+  id: "vm-mac-debug-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-x64"
+    builder: "vm-mac-debug-x64-beta"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
+  id: "vm-mac-debug-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
+    builder: "vm-mac-debug-x64-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
+  id: "vm-mac-debug-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
+    builder: "vm-mac-debug-x64-stable"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
+  id: "vm-mac-release-arm64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
+    builder: "vm-mac-release-arm64"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-mac-release-arm64"
+  id: "vm-mac-release-arm64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-mac-release-arm64"
+    builder: "vm-mac-release-arm64-beta"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-mac-release-simarm64"
+  id: "vm-mac-release-arm64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-mac-release-simarm64"
+    builder: "vm-mac-release-arm64-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-mac-release-simarm64-beta"
+  id: "vm-mac-release-arm64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-mac-release-simarm64-beta"
+    builder: "vm-mac-release-arm64-stable"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-mac-release-simarm64-dev"
+  id: "vm-mac-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-mac-release-simarm64-dev"
+    builder: "vm-mac-release-x64"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-mac-release-simarm64-stable"
+  id: "vm-mac-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-mac-release-simarm64-stable"
+    builder: "vm-mac-release-x64-beta"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-win-release-x64"
+  id: "vm-mac-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-win-release-x64"
+    builder: "vm-mac-release-x64-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-win-release-x64-beta"
+  id: "vm-mac-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-win-release-x64-beta"
+    builder: "vm-mac-release-x64-stable"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-win-release-x64-dev"
+  id: "vm-msan-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-win-release-x64-dev"
+    builder: "vm-msan-linux-release-x64"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-win-release-x64-stable"
+  id: "vm-precomp-ffi-qemu-linux-release-arm"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-win-release-x64-stable"
+    builder: "vm-precomp-ffi-qemu-linux-release-arm"
   }
 }
 job {
-  id: "vm-kernel-precomp-obfuscate-linux-release-x64"
+  id: "vm-precomp-ffi-qemu-linux-release-arm-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-obfuscate-linux-release-x64"
+    builder: "vm-precomp-ffi-qemu-linux-release-arm-beta"
   }
 }
 job {
-  id: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+  id: "vm-precomp-ffi-qemu-linux-release-arm-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+    builder: "vm-precomp-ffi-qemu-linux-release-arm-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+  id: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+    builder: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
   }
 }
 job {
-  id: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+  id: "vm-precomp-ffi-qemu-linux-release-arm-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+    builder: "vm-precomp-ffi-qemu-linux-release-arm-stable"
   }
 }
 job {
-  id: "vm-kernel-win-debug-ia32"
+  id: "vm-precomp-ffi-qemu-linux-release-riscv64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-win-debug-ia32"
+    builder: "vm-precomp-ffi-qemu-linux-release-riscv64"
   }
 }
 job {
-  id: "vm-linux-debug-x64c"
+  id: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-linux-debug-x64c"
+    builder: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
   }
 }
 job {
-  id: "vm-linux-release-arm64"
+  id: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-linux-release-arm64"
+    builder: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
   }
 }
 job {
-  id: "vm-msan-linux-release-x64"
+  id: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-msan-linux-release-x64"
+    builder: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
   }
 }
 job {
-  id: "vm-precomp-ffi-qemu-linux-release-arm"
+  id: "vm-reload-linux-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-arm"
+    builder: "vm-reload-linux-debug-x64"
   }
 }
 job {
-  id: "vm-precomp-ffi-qemu-linux-release-arm-beta"
+  id: "vm-reload-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-arm-beta"
+    builder: "vm-reload-linux-release-x64"
   }
 }
 job {
-  id: "vm-precomp-ffi-qemu-linux-release-arm-dev"
+  id: "vm-reload-rollback-linux-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-arm-dev"
+    builder: "vm-reload-rollback-linux-debug-x64"
   }
 }
 job {
-  id: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
+  id: "vm-reload-rollback-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
+    builder: "vm-reload-rollback-linux-release-x64"
   }
 }
 job {
-  id: "vm-precomp-ffi-qemu-linux-release-arm-stable"
+  id: "vm-tsan-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-arm-stable"
+    builder: "vm-tsan-linux-release-x64"
   }
 }
 job {
-  id: "vm-precomp-ffi-qemu-linux-release-riscv64"
+  id: "vm-ubsan-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-riscv64"
+    builder: "vm-ubsan-linux-release-x64"
   }
 }
 job {
-  id: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
+  id: "vm-win-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
+    builder: "vm-win-debug-x64"
   }
 }
 job {
-  id: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
+  id: "vm-win-debug-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
+    builder: "vm-win-debug-x64-beta"
   }
 }
 job {
-  id: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
+  id: "vm-win-debug-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
+    builder: "vm-win-debug-x64-dev"
   }
 }
 job {
-  id: "vm-reload-linux-debug-x64"
+  id: "vm-win-debug-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-reload-linux-debug-x64"
+    builder: "vm-win-debug-x64-stable"
   }
 }
 job {
-  id: "vm-reload-linux-release-x64"
+  id: "vm-win-debug-x64c"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-reload-linux-release-x64"
+    builder: "vm-win-debug-x64c"
   }
 }
 job {
-  id: "vm-reload-rollback-linux-debug-x64"
+  id: "vm-win-release-ia32"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-reload-rollback-linux-debug-x64"
+    builder: "vm-win-release-ia32"
   }
 }
 job {
-  id: "vm-reload-rollback-linux-release-x64"
+  id: "vm-win-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-reload-rollback-linux-release-x64"
+    builder: "vm-win-release-x64"
   }
 }
 job {
-  id: "vm-tsan-linux-release-x64"
+  id: "vm-win-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-tsan-linux-release-x64"
+    builder: "vm-win-release-x64-beta"
   }
 }
 job {
-  id: "vm-ubsan-linux-release-x64"
+  id: "vm-win-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-ubsan-linux-release-x64"
+    builder: "vm-win-release-x64-dev"
   }
 }
 job {
-  id: "vm-win-debug-x64c"
+  id: "vm-win-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-win-debug-x64c"
+    builder: "vm-win-release-x64-stable"
   }
 }
 trigger {
@@ -2789,15 +2789,6 @@ trigger {
   triggers: "vm-ffi-android-release-arm-beta"
   triggers: "vm-ffi-android-release-arm64c-beta"
   triggers: "vm-kernel-checked-linux-release-x64-beta"
-  triggers: "vm-kernel-nnbd-linux-debug-x64-beta"
-  triggers: "vm-kernel-nnbd-linux-release-simarm-beta"
-  triggers: "vm-kernel-nnbd-linux-release-simarm64-beta"
-  triggers: "vm-kernel-nnbd-linux-release-x64-beta"
-  triggers: "vm-kernel-nnbd-mac-debug-x64-beta"
-  triggers: "vm-kernel-nnbd-mac-release-arm64-beta"
-  triggers: "vm-kernel-nnbd-mac-release-x64-beta"
-  triggers: "vm-kernel-nnbd-win-debug-x64-beta"
-  triggers: "vm-kernel-nnbd-win-release-x64-beta"
   triggers: "vm-kernel-precomp-linux-debug-x64-beta"
   triggers: "vm-kernel-precomp-linux-release-simarm-beta"
   triggers: "vm-kernel-precomp-linux-release-x64-beta"
@@ -2808,8 +2799,17 @@ trigger {
   triggers: "vm-kernel-precomp-nnbd-mac-release-simarm64-beta"
   triggers: "vm-kernel-precomp-nnbd-win-release-x64-beta"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+  triggers: "vm-linux-debug-x64-beta"
+  triggers: "vm-linux-release-simarm-beta"
+  triggers: "vm-linux-release-simarm64-beta"
+  triggers: "vm-linux-release-x64-beta"
+  triggers: "vm-mac-debug-x64-beta"
+  triggers: "vm-mac-release-arm64-beta"
+  triggers: "vm-mac-release-x64-beta"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm-beta"
   triggers: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
+  triggers: "vm-win-debug-x64-beta"
+  triggers: "vm-win-release-x64-beta"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/beta"
@@ -2850,15 +2850,6 @@ trigger {
   triggers: "vm-ffi-android-release-arm-dev"
   triggers: "vm-ffi-android-release-arm64c-dev"
   triggers: "vm-kernel-checked-linux-release-x64-dev"
-  triggers: "vm-kernel-nnbd-linux-debug-x64-dev"
-  triggers: "vm-kernel-nnbd-linux-release-simarm-dev"
-  triggers: "vm-kernel-nnbd-linux-release-simarm64-dev"
-  triggers: "vm-kernel-nnbd-linux-release-x64-dev"
-  triggers: "vm-kernel-nnbd-mac-debug-x64-dev"
-  triggers: "vm-kernel-nnbd-mac-release-arm64-dev"
-  triggers: "vm-kernel-nnbd-mac-release-x64-dev"
-  triggers: "vm-kernel-nnbd-win-debug-x64-dev"
-  triggers: "vm-kernel-nnbd-win-release-x64-dev"
   triggers: "vm-kernel-precomp-linux-debug-x64-dev"
   triggers: "vm-kernel-precomp-linux-release-simarm-dev"
   triggers: "vm-kernel-precomp-linux-release-x64-dev"
@@ -2869,8 +2860,17 @@ trigger {
   triggers: "vm-kernel-precomp-nnbd-mac-release-simarm64-dev"
   triggers: "vm-kernel-precomp-nnbd-win-release-x64-dev"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+  triggers: "vm-linux-debug-x64-dev"
+  triggers: "vm-linux-release-simarm-dev"
+  triggers: "vm-linux-release-simarm64-dev"
+  triggers: "vm-linux-release-x64-dev"
+  triggers: "vm-mac-debug-x64-dev"
+  triggers: "vm-mac-release-arm64-dev"
+  triggers: "vm-mac-release-x64-dev"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm-dev"
   triggers: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
+  triggers: "vm-win-debug-x64-dev"
+  triggers: "vm-win-release-x64-dev"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/dev"
@@ -2924,11 +2924,11 @@ trigger {
   triggers: "pkg-mac-release"
   triggers: "pkg-mac-release-arm64"
   triggers: "pkg-win-release"
-  triggers: "vm-kernel-nnbd-mac-debug-x64"
-  triggers: "vm-kernel-nnbd-mac-release-arm64"
-  triggers: "vm-kernel-nnbd-mac-release-x64"
-  triggers: "vm-kernel-nnbd-win-debug-x64"
-  triggers: "vm-kernel-nnbd-win-release-x64"
+  triggers: "vm-mac-debug-x64"
+  triggers: "vm-mac-release-arm64"
+  triggers: "vm-mac-release-x64"
+  triggers: "vm-win-debug-x64"
+  triggers: "vm-win-release-x64"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/main"
@@ -2978,15 +2978,6 @@ trigger {
   triggers: "vm-ffi-android-release-arm-stable"
   triggers: "vm-ffi-android-release-arm64c-stable"
   triggers: "vm-kernel-checked-linux-release-x64-stable"
-  triggers: "vm-kernel-nnbd-linux-debug-x64-stable"
-  triggers: "vm-kernel-nnbd-linux-release-simarm-stable"
-  triggers: "vm-kernel-nnbd-linux-release-simarm64-stable"
-  triggers: "vm-kernel-nnbd-linux-release-x64-stable"
-  triggers: "vm-kernel-nnbd-mac-debug-x64-stable"
-  triggers: "vm-kernel-nnbd-mac-release-arm64-stable"
-  triggers: "vm-kernel-nnbd-mac-release-x64-stable"
-  triggers: "vm-kernel-nnbd-win-debug-x64-stable"
-  triggers: "vm-kernel-nnbd-win-release-x64-stable"
   triggers: "vm-kernel-precomp-linux-debug-x64-stable"
   triggers: "vm-kernel-precomp-linux-release-simarm-stable"
   triggers: "vm-kernel-precomp-linux-release-x64-stable"
@@ -2997,8 +2988,17 @@ trigger {
   triggers: "vm-kernel-precomp-nnbd-mac-release-simarm64-stable"
   triggers: "vm-kernel-precomp-nnbd-win-release-x64-stable"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+  triggers: "vm-linux-debug-x64-stable"
+  triggers: "vm-linux-release-simarm-stable"
+  triggers: "vm-linux-release-simarm64-stable"
+  triggers: "vm-linux-release-x64-stable"
+  triggers: "vm-mac-debug-x64-stable"
+  triggers: "vm-mac-release-arm64-stable"
+  triggers: "vm-mac-release-x64-stable"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm-stable"
   triggers: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
+  triggers: "vm-win-debug-x64-stable"
+  triggers: "vm-win-release-x64-stable"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/stable"
@@ -3027,16 +3027,15 @@ trigger {
   triggers: "vm-eager-optimization-linux-release-ia32"
   triggers: "vm-kernel-gcc-linux"
   triggers: "vm-kernel-msvc-windows"
-  triggers: "vm-kernel-nnbd-linux-debug-ia32"
-  triggers: "vm-kernel-nnbd-linux-debug-simriscv64"
-  triggers: "vm-kernel-nnbd-linux-release-ia32"
-  triggers: "vm-kernel-nnbd-mac-debug-arm64"
-  triggers: "vm-kernel-nnbd-win-release-ia32"
   triggers: "vm-kernel-precomp-dwarf-linux-product-x64"
   triggers: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
   triggers: "vm-kernel-precomp-nnbd-linux-debug-x64"
   triggers: "vm-kernel-win-debug-ia32"
+  triggers: "vm-linux-debug-ia32"
+  triggers: "vm-linux-debug-simriscv64"
   triggers: "vm-linux-debug-x64c"
+  triggers: "vm-linux-release-ia32"
+  triggers: "vm-mac-debug-arm64"
   triggers: "vm-msan-linux-release-x64"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
   triggers: "vm-reload-linux-debug-x64"
@@ -3046,6 +3045,7 @@ trigger {
   triggers: "vm-tsan-linux-release-x64"
   triggers: "vm-ubsan-linux-release-x64"
   triggers: "vm-win-debug-x64c"
+  triggers: "vm-win-release-ia32"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/main"
@@ -3070,10 +3070,6 @@ trigger {
   triggers: "vm-kernel-checked-linux-release-x64"
   triggers: "vm-kernel-linux-debug-x64"
   triggers: "vm-kernel-linux-release-x64"
-  triggers: "vm-kernel-nnbd-linux-debug-x64"
-  triggers: "vm-kernel-nnbd-linux-release-simarm"
-  triggers: "vm-kernel-nnbd-linux-release-simarm64"
-  triggers: "vm-kernel-nnbd-linux-release-x64"
   triggers: "vm-kernel-precomp-linux-debug-x64"
   triggers: "vm-kernel-precomp-linux-release-simarm"
   triggers: "vm-kernel-precomp-linux-release-x64"
@@ -3085,7 +3081,11 @@ trigger {
   triggers: "vm-kernel-precomp-nnbd-mac-release-simarm64"
   triggers: "vm-kernel-precomp-nnbd-win-release-x64"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64"
+  triggers: "vm-linux-debug-x64"
   triggers: "vm-linux-release-arm64"
+  triggers: "vm-linux-release-simarm"
+  triggers: "vm-linux-release-simarm64"
+  triggers: "vm-linux-release-x64"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm"
   triggers: "vm-precomp-ffi-qemu-linux-release-riscv64"
   gitiles {
diff --git a/vm.star b/vm.star
index fe13b486029c..514126c11873 100644
--- a/vm.star
+++ b/vm.star
@@ -83,36 +83,36 @@ def add_postponed_alt_console_entries():
 
 # vm|jit
 _extra_builder(
-    "vm-kernel-nnbd-linux-debug-x64",
+    "vm-linux-debug-x64",
     category = "vm|jit|d",
     on_cq = True,
 )
 _extra_builder(
-    "vm-kernel-nnbd-linux-release-x64",
+    "vm-linux-release-x64",
     category = "vm|jit|r",
     on_cq = True,
 )
 _nightly_builder(
-    "vm-kernel-nnbd-linux-debug-ia32",
+    "vm-linux-debug-ia32",
     category = "vm|jit|d3",
     channels = ["try"],
     properties = slow_shards,
 )
 _nightly_builder(
-    "vm-kernel-nnbd-linux-release-ia32",
+    "vm-linux-release-ia32",
     category = "vm|jit|r3",
     channels = ["try"],
 )
 _extra_builder(
-    "vm-kernel-nnbd-linux-release-simarm",
+    "vm-linux-release-simarm",
     category = "vm|jit|ra",
 )
 _extra_builder(
-    "vm-kernel-nnbd-linux-release-simarm64",
+    "vm-linux-release-simarm64",
     category = "vm|jit|ra6",
 )
 _nightly_builder(
-    "vm-kernel-nnbd-linux-debug-simriscv64",
+    "vm-linux-debug-simriscv64",
     category = "vm|jit|rv",
     channels = ["try"],
 )
@@ -124,43 +124,43 @@ _extra_builder(
     properties = {"shard_timeout": (120 * time.minute) // time.second},
 )
 _nightly_builder(
-    "vm-kernel-nnbd-mac-debug-arm64",
+    "vm-mac-debug-arm64",
     category = "vm|jit|m1d",
     channels = ["try"],
     dimensions = [mac, arm64],
     properties = [no_android, slow_shards],
 )
 _builder(
-    "vm-kernel-nnbd-mac-debug-x64",
+    "vm-mac-debug-x64",
     category = "vm|jit|md",
     dimensions = mac,
     properties = slow_shards,
 )
 _builder(
-    "vm-kernel-nnbd-mac-release-arm64",
+    "vm-mac-release-arm64",
     category = "vm|jit|m1r",
     dimensions = [mac, arm64],
     properties = no_android,
 )
 _builder(
-    "vm-kernel-nnbd-mac-release-x64",
+    "vm-mac-release-x64",
     category = "vm|jit|mr",
     dimensions = mac,
 )
 _nightly_builder(
-    "vm-kernel-nnbd-win-release-ia32",
+    "vm-win-release-ia32",
     category = "vm|jit|wr3",
     channels = ["try"],
     dimensions = windows,
 )
 _builder(
-    "vm-kernel-nnbd-win-debug-x64",
+    "vm-win-debug-x64",
     category = "vm|jit|wd",
     properties = slow_shards,
     dimensions = windows,
 )
 _builder(
-    "vm-kernel-nnbd-win-release-x64",
+    "vm-win-release-x64",
     category = "vm|jit|wr",
     dimensions = windows,
 )

From f10d9d73ecb69e1094e9e3dace6b629adebecdaf Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Wed, 15 Mar 2023 17:23:53 +0000
Subject: [PATCH 633/826] [infra] Create a separate builder for Fuchsia ARM64.

Change-Id: Id87c6df83906e4874b435d57cc368a93f0ca9f1b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/288828
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   |  4 ++
 generated/cr-buildbucket.cfg | 73 ++++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      | 13 +++++++
 generated/luci-notify.cfg    | 11 ++++++
 generated/luci-scheduler.cfg | 11 ++++++
 vm.star                      |  1 +
 6 files changed, 113 insertions(+)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index ab242150bc61..31ba8620521e 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -3009,6 +3009,10 @@ config_groups {
         name: "dart/try/vm-ffi-android-release-arm64c-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-fuchsia-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-fuchsia-release-x64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 47e2c7c9dcf4..88652bdb9d71 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -6805,6 +6805,43 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-fuchsia-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      expiration_secs: 86400
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-fuchsia-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -14465,6 +14502,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-fuchsia-release-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-fuchsia-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 64788e249980..dfb43a1869ad 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -199,6 +199,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-win-debug-x64c-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-fuchsia-release-arm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-fuchsia-release-x64-try"
   }
@@ -760,6 +763,11 @@ consoles {
     category: "vm|misc|compressed"
     short_name: "aw"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-fuchsia-release-arm64"
+    category: "vm|misc"
+    short_name: "f"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-fuchsia-release-x64"
     category: "vm|misc"
@@ -1536,6 +1544,11 @@ consoles {
     category: "vm|misc|compressed"
     short_name: "aw"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-fuchsia-release-arm64"
+    category: "vm|misc"
+    short_name: "f"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-fuchsia-release-x64"
     category: "vm|misc"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index e3b7020b1253..ed35497bc263 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -742,6 +742,17 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-fuchsia-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 006a2f105e69..12bf7ec0b341 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1604,6 +1604,16 @@ job {
     builder: "vm-ffi-android-release-arm64c-stable"
   }
 }
+job {
+  id: "vm-fuchsia-release-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-fuchsia-release-arm64"
+  }
+}
 job {
   id: "vm-fuchsia-release-x64"
   realm: "ci.sandbox"
@@ -3066,6 +3076,7 @@ trigger {
   triggers: "vm-ffi-android-product-arm64c"
   triggers: "vm-ffi-android-release-arm"
   triggers: "vm-ffi-android-release-arm64c"
+  triggers: "vm-fuchsia-release-arm64"
   triggers: "vm-fuchsia-release-x64"
   triggers: "vm-kernel-checked-linux-release-x64"
   triggers: "vm-kernel-linux-debug-x64"
diff --git a/vm.star b/vm.star
index 514126c11873..cfff32ff61d9 100644
--- a/vm.star
+++ b/vm.star
@@ -361,6 +361,7 @@ _nightly_builder(
     channels = ["try"],
     dimensions = windows,
 )
+_low_priority_builder("vm-fuchsia-release-arm64", category = "vm|misc|f")
 _low_priority_builder("vm-fuchsia-release-x64", category = "vm|misc|f")
 
 # Our sysroot does not support gcc, we can't use goma on RBE for this builder

From 04bb472a465dc6fb8d43bedb67d5148c16b217bf Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 24 Mar 2023 13:00:29 +0000
Subject: [PATCH 634/826] [infra] Add riscv SDK builder to the beta console

Change-Id: I5c3ac39733976a0a173a8295b767816341d0cb44
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/291065
Auto-Submit: Alexander Thomas <athom@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 generated/luci-milo.cfg |  5 +++++
 sdk.star                | 20 +++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index dfb43a1869ad..2f46918229b8 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -2076,6 +2076,11 @@ consoles {
     category: "sdk"
     short_name: "la"
   }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-linux-riscv64-beta"
+    category: "sdk"
+    short_name: "lv"
+  }
   builders {
     name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-beta"
     category: "sdk"
diff --git a/sdk.star b/sdk.star
index ef724a94f00c..70b5d47dbf98 100644
--- a/sdk.star
+++ b/sdk.star
@@ -34,15 +34,17 @@ def sdk_builder_category():
             ["win", "w"],
             ["win-arm64", "wa"],
         ]:
-            if channel not in ["beta", "stable"] or \
-               builder_type not in ["linux-riscv64", "win-arm64"]:
-                luci.console_view_entry(
-                    builder = "dart-internal:ci/dart-sdk-%s-%s" %
-                              (builder_type, channel),
-                    short_name = short_name,
-                    category = "sdk",
-                    console_view = console,
-                )
+            if channel == "stable" and builder_type == "linux-riscv64":
+                continue
+            if channel in ["beta", "stable"] and builder_type == "win-arm64":
+                continue
+            luci.console_view_entry(
+                builder = "dart-internal:ci/dart-sdk-%s-%s" %
+                          (builder_type, channel),
+                short_name = short_name,
+                category = "sdk",
+                console_view = console,
+            )
         luci.console_view_entry(
             builder = "dart-internal:ci/debianpackage-linux-%s" % channel,
             short_name = "dp",

From 9ca68d9f33ad6d5b75397ddaf5ff8a39a78f4039 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Sun, 2 Apr 2023 08:21:52 +0000
Subject: [PATCH 635/826] [infra] Use new names for AOT NNBD builders.

Change-Id: I93a0e0699b6a9dba374f0c049c5164d235649431
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/286225
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   | 180 ++++----
 generated/cr-buildbucket.cfg | 800 +++++++++++++++++------------------
 generated/luci-milo.cfg      |  90 ++--
 generated/luci-notify.cfg    | 154 +++----
 generated/luci-scheduler.cfg | 434 +++++++++----------
 vm.star                      |  18 +-
 6 files changed, 838 insertions(+), 838 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 31ba8620521e..9d5fb6a5a530 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -762,75 +762,75 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-appjit-linux-debug-x64-try"
+        name: "dart/try/vm-aot-linux-debug-simarm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-appjit-linux-release-x64-try"
+        name: "dart/try/vm-aot-linux-release-simarm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-android-debug-arm-try"
+        name: "dart/try/vm-aot-linux-release-simarm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-android-debug-arm64c-try"
+        name: "dart/try/vm-aot-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-android-product-arm-try"
+        name: "dart/try/vm-aot-mac-release-simarm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-android-product-arm64c-try"
+        name: "dart/try/vm-aot-win-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-android-release-arm-try"
+        name: "dart/try/vm-appjit-linux-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-android-release-arm64c-try"
+        name: "dart/try/vm-appjit-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-checked-linux-release-x64-try"
+        name: "dart/try/vm-ffi-android-debug-arm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
+        name: "dart/try/vm-ffi-android-debug-arm64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
+        name: "dart/try/vm-ffi-android-product-arm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
+        name: "dart/try/vm-ffi-android-product-arm64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
+        name: "dart/try/vm-ffi-android-release-arm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
+        name: "dart/try/vm-ffi-android-release-arm64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
+        name: "dart/try/vm-kernel-checked-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
         includable_only: true
       }
       builders {
@@ -1646,75 +1646,75 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-appjit-linux-debug-x64-try"
+        name: "dart/try/vm-aot-linux-debug-simarm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-appjit-linux-release-x64-try"
+        name: "dart/try/vm-aot-linux-release-simarm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-android-debug-arm-try"
+        name: "dart/try/vm-aot-linux-release-simarm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-android-debug-arm64c-try"
+        name: "dart/try/vm-aot-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-android-product-arm-try"
+        name: "dart/try/vm-aot-mac-release-simarm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-android-product-arm64c-try"
+        name: "dart/try/vm-aot-win-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-android-release-arm-try"
+        name: "dart/try/vm-appjit-linux-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-android-release-arm64c-try"
+        name: "dart/try/vm-appjit-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-checked-linux-release-x64-try"
+        name: "dart/try/vm-ffi-android-debug-arm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
+        name: "dart/try/vm-ffi-android-debug-arm64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
+        name: "dart/try/vm-ffi-android-product-arm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
+        name: "dart/try/vm-ffi-android-product-arm64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
+        name: "dart/try/vm-ffi-android-release-arm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
+        name: "dart/try/vm-ffi-android-release-arm64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
+        name: "dart/try/vm-kernel-checked-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
         includable_only: true
       }
       builders {
@@ -2929,6 +2929,18 @@ config_groups {
         name: "dart/try/vm-aot-asan-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-linux-debug-simarm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-linux-debug-simriscv64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-linux-debug-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-linux-debug-x64c-try"
         includable_only: true
@@ -2937,10 +2949,30 @@ config_groups {
         name: "dart/try/vm-aot-linux-product-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-linux-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-linux-release-simarm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-linux-release-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-mac-product-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-mac-release-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-mac-release-simarm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-msan-linux-release-x64-try"
         includable_only: true
@@ -2961,6 +2993,10 @@ config_groups {
         name: "dart/try/vm-aot-win-product-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-win-release-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-appjit-linux-debug-x64-try"
         includable_only: true
@@ -3053,42 +3089,6 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simriscv64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
         includable_only: true
@@ -3962,75 +3962,75 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-appjit-linux-debug-x64-try"
+        name: "dart/try/vm-aot-linux-debug-simarm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-appjit-linux-release-x64-try"
+        name: "dart/try/vm-aot-linux-release-simarm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-android-debug-arm-try"
+        name: "dart/try/vm-aot-linux-release-simarm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-android-debug-arm64c-try"
+        name: "dart/try/vm-aot-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-android-product-arm-try"
+        name: "dart/try/vm-aot-mac-release-simarm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-android-product-arm64c-try"
+        name: "dart/try/vm-aot-win-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-android-release-arm-try"
+        name: "dart/try/vm-appjit-linux-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-android-release-arm64c-try"
+        name: "dart/try/vm-appjit-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-checked-linux-release-x64-try"
+        name: "dart/try/vm-ffi-android-debug-arm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
+        name: "dart/try/vm-ffi-android-debug-arm64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
+        name: "dart/try/vm-ffi-android-product-arm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
+        name: "dart/try/vm-ffi-android-product-arm64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
+        name: "dart/try/vm-ffi-android-release-arm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
+        name: "dart/try/vm-ffi-android-release-arm64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
+        name: "dart/try/vm-kernel-checked-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-linux-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
+        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-nnbd-win-release-x64-try"
+        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
         includable_only: true
       }
       builders {
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 88652bdb9d71..bb8ffa28c7fe 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5174,7 +5174,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-debug-x64c"
+      name: "vm-aot-linux-debug-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5201,7 +5201,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5210,7 +5210,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-product-x64"
+      name: "vm-aot-linux-debug-simarm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5237,7 +5237,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5246,7 +5246,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-release-arm64"
+      name: "vm-aot-linux-debug-simarm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5271,10 +5271,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 7200'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5283,11 +5282,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-mac-product-x64"
+      name: "vm-aot-linux-debug-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5297,7 +5296,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5310,11 +5309,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5323,7 +5318,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-msan-linux-release-x64"
+      name: "vm-aot-linux-debug-simriscv64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5347,9 +5342,9 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 70
       build_numbers: YES
@@ -5360,7 +5355,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-tsan-linux-release-x64"
+      name: "vm-aot-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5384,9 +5379,9 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 70
       build_numbers: YES
@@ -5397,7 +5392,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-ubsan-linux-release-x64"
+      name: "vm-aot-linux-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5410,8 +5405,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -5419,7 +5416,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -5432,11 +5428,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-win-debug-x64c"
+      name: "vm-aot-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5446,7 +5442,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5468,11 +5464,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-win-product-x64"
+      name: "vm-aot-linux-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5482,7 +5478,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5493,7 +5489,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 7200'
         '}'
       priority: 70
       build_numbers: YES
@@ -5504,7 +5501,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-debug-x64"
+      name: "vm-aot-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5529,8 +5526,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -5541,7 +5537,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-debug-x64-beta"
+      name: "vm-aot-linux-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5566,8 +5562,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -5578,7 +5573,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-debug-x64-dev"
+      name: "vm-aot-linux-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5603,8 +5598,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -5615,7 +5609,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-debug-x64-stable"
+      name: "vm-aot-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5640,8 +5634,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -5652,7 +5645,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-product-x64"
+      name: "vm-aot-linux-release-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5679,7 +5672,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5688,7 +5681,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-release-x64"
+      name: "vm-aot-linux-release-simarm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5724,7 +5717,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-release-x64-beta"
+      name: "vm-aot-linux-release-simarm_x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5760,7 +5753,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-release-x64-dev"
+      name: "vm-aot-linux-release-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5796,7 +5789,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-release-x64-stable"
+      name: "vm-aot-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5832,7 +5825,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-asan-linux-release-x64"
+      name: "vm-aot-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5856,11 +5849,10 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5869,7 +5861,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-eager-optimization-linux-release-ia32"
+      name: "vm-aot-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5896,7 +5888,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5905,7 +5897,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-eager-optimization-linux-release-x64"
+      name: "vm-aot-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5932,8 +5924,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      expiration_secs: 86400
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5942,11 +5933,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm"
+      name: "vm-aot-mac-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5956,7 +5947,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5969,7 +5960,11 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5978,11 +5973,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm-beta"
+      name: "vm-aot-mac-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5992,7 +5987,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6003,9 +5998,17 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6014,11 +6017,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm-dev"
+      name: "vm-aot-mac-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6028,7 +6031,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6039,9 +6042,14 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6050,11 +6058,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm-stable"
+      name: "vm-aot-mac-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6064,7 +6072,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6075,9 +6083,14 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6086,11 +6099,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c"
+      name: "vm-aot-mac-release-simarm64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6100,7 +6113,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6111,9 +6124,14 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6122,11 +6140,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c-beta"
+      name: "vm-aot-mac-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6136,7 +6154,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6147,9 +6165,14 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6158,7 +6181,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c-dev"
+      name: "vm-aot-msan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6182,10 +6205,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6194,7 +6218,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c-stable"
+      name: "vm-aot-tsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6218,10 +6242,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6230,7 +6255,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm"
+      name: "vm-aot-ubsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6243,10 +6268,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -6254,10 +6277,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6266,11 +6290,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm-beta"
+      name: "vm-aot-win-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6280,7 +6304,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6293,7 +6317,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6302,11 +6326,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm-dev"
+      name: "vm-aot-win-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6316,7 +6340,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6329,7 +6353,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6338,11 +6362,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm-stable"
+      name: "vm-aot-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6352,7 +6376,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6374,11 +6398,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c"
+      name: "vm-aot-win-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6388,7 +6412,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6410,11 +6434,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c-beta"
+      name: "vm-aot-win-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6424,7 +6448,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6446,11 +6470,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c-dev"
+      name: "vm-aot-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6460,7 +6484,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6482,7 +6506,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c-stable"
+      name: "vm-appjit-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6507,7 +6531,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -6518,7 +6543,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm"
+      name: "vm-appjit-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6543,7 +6568,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -6554,7 +6580,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm-beta"
+      name: "vm-appjit-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6579,7 +6605,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -6590,7 +6617,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm-dev"
+      name: "vm-appjit-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6615,7 +6642,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -6626,7 +6654,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm-stable"
+      name: "vm-appjit-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6653,7 +6681,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6662,7 +6690,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c"
+      name: "vm-appjit-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6698,7 +6726,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c-beta"
+      name: "vm-appjit-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6734,7 +6762,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c-dev"
+      name: "vm-appjit-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6770,7 +6798,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c-stable"
+      name: "vm-appjit-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6806,7 +6834,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-fuchsia-release-arm64"
+      name: "vm-asan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6830,11 +6858,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
-      expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6843,7 +6871,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-fuchsia-release-x64"
+      name: "vm-eager-optimization-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6871,7 +6899,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
-      expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6880,7 +6907,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64"
+      name: "vm-eager-optimization-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6907,20 +6934,17 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-beta"
+      name: "vm-ffi-android-debug-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6950,17 +6974,13 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-dev"
+      name: "vm-ffi-android-debug-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6990,17 +7010,13 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-stable"
+      name: "vm-ffi-android-debug-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7030,17 +7046,13 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-gcc-linux"
+      name: "vm-ffi-android-debug-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7053,9 +7065,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true,'
-        '    "timeout": 4500'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -7066,8 +7079,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      execution_timeout_secs: 18000
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7076,7 +7088,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64"
+      name: "vm-ffi-android-debug-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7112,7 +7124,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-x64"
+      name: "vm-ffi-android-debug-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7148,11 +7160,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-msvc-windows"
+      name: "vm-ffi-android-debug-arm64c-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7161,8 +7173,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -7173,7 +7187,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7182,7 +7196,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-dwarf-linux-product-x64"
+      name: "vm-ffi-android-debug-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7209,7 +7223,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7218,7 +7232,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64"
+      name: "vm-ffi-android-product-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7254,7 +7268,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-beta"
+      name: "vm-ffi-android-product-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7290,7 +7304,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-dev"
+      name: "vm-ffi-android-product-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7326,7 +7340,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-stable"
+      name: "vm-ffi-android-product-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7362,7 +7376,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm"
+      name: "vm-ffi-android-product-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7398,7 +7412,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-beta"
+      name: "vm-ffi-android-product-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7434,7 +7448,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-dev"
+      name: "vm-ffi-android-product-arm64c-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7470,7 +7484,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-stable"
+      name: "vm-ffi-android-product-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7506,7 +7520,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64"
+      name: "vm-ffi-android-release-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7542,7 +7556,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64-beta"
+      name: "vm-ffi-android-release-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7578,7 +7592,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64-dev"
+      name: "vm-ffi-android-release-arm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7614,7 +7628,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64-stable"
+      name: "vm-ffi-android-release-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7650,7 +7664,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+      name: "vm-ffi-android-release-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7686,7 +7700,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-beta"
+      name: "vm-ffi-android-release-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7722,7 +7736,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-dev"
+      name: "vm-ffi-android-release-arm64c-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7758,7 +7772,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-stable"
+      name: "vm-ffi-android-release-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7794,7 +7808,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
+      name: "vm-fuchsia-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7819,10 +7833,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 70
+      expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7831,7 +7845,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-x64"
+      name: "vm-fuchsia-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7856,10 +7870,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 70
+      expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7868,7 +7882,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm64"
+      name: "vm-kernel-checked-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7898,13 +7912,17 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-beta"
+      name: "vm-kernel-checked-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7934,13 +7952,17 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-dev"
+      name: "vm-kernel-checked-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7970,13 +7992,17 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-stable"
+      name: "vm-kernel-checked-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8006,13 +8032,17 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+      name: "vm-kernel-gcc-linux"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8025,10 +8055,9 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true,'
+        '    "timeout": 4500'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -8039,7 +8068,8 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      execution_timeout_secs: 18000
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8048,7 +8078,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-beta"
+      name: "vm-kernel-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8084,7 +8114,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-dev"
+      name: "vm-kernel-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8120,11 +8150,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-stable"
+      name: "vm-kernel-msvc-windows"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8133,10 +8163,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -8147,7 +8175,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8156,7 +8184,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64"
+      name: "vm-kernel-precomp-dwarf-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8183,7 +8211,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8192,7 +8220,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
+      name: "vm-kernel-precomp-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8228,7 +8256,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
+      name: "vm-kernel-precomp-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8264,7 +8292,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
+      name: "vm-kernel-precomp-linux-debug-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8300,11 +8328,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-mac-release-arm64"
+      name: "vm-kernel-precomp-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8314,7 +8342,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8325,17 +8353,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8344,11 +8364,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-mac-release-simarm64"
+      name: "vm-kernel-precomp-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8358,7 +8378,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8369,14 +8389,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8385,11 +8400,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-mac-release-simarm64-beta"
+      name: "vm-kernel-precomp-linux-release-simarm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8399,7 +8414,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8410,14 +8425,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8426,11 +8436,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-mac-release-simarm64-dev"
+      name: "vm-kernel-precomp-linux-release-simarm-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8440,7 +8450,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8451,14 +8461,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8467,11 +8472,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-mac-release-simarm64-stable"
+      name: "vm-kernel-precomp-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8481,7 +8486,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8492,14 +8497,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8508,11 +8508,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-win-release-x64"
+      name: "vm-kernel-precomp-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8522,7 +8522,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8544,11 +8544,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-win-release-x64-beta"
+      name: "vm-kernel-precomp-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8558,7 +8558,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8580,11 +8580,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-win-release-x64-dev"
+      name: "vm-kernel-precomp-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8594,7 +8594,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8616,11 +8616,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-win-release-x64-stable"
+      name: "vm-kernel-precomp-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8630,7 +8630,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -13776,7 +13776,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-debug-x64c-try"
+      name: "vm-aot-linux-debug-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13812,7 +13812,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-product-x64-try"
+      name: "vm-aot-linux-debug-simriscv64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13837,7 +13837,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -13848,11 +13849,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-mac-product-x64-try"
+      name: "vm-aot-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13862,7 +13863,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -13873,13 +13874,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13888,7 +13886,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-msan-linux-release-x64-try"
+      name: "vm-aot-linux-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13912,7 +13910,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -13925,7 +13922,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-tsan-linux-release-x64-try"
+      name: "vm-aot-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13949,7 +13946,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -13962,7 +13958,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-ubsan-linux-release-x64-try"
+      name: "vm-aot-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13975,8 +13971,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -13984,7 +13982,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -13997,11 +13994,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-win-debug-x64c-try"
+      name: "vm-aot-linux-release-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14011,7 +14008,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -14033,11 +14030,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-win-product-x64-try"
+      name: "vm-aot-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14047,7 +14044,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -14069,11 +14066,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-debug-x64-try"
+      name: "vm-aot-mac-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14083,7 +14080,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -14094,10 +14091,13 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14106,11 +14106,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-product-x64-try"
+      name: "vm-aot-mac-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14120,7 +14120,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -14131,9 +14131,17 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14142,11 +14150,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-release-x64-try"
+      name: "vm-aot-mac-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14156,7 +14164,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -14167,9 +14175,14 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14178,7 +14191,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-asan-linux-release-x64-try"
+      name: "vm-aot-msan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14215,7 +14228,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-eager-optimization-linux-release-ia32-try"
+      name: "vm-aot-tsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14239,6 +14252,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -14251,7 +14265,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-eager-optimization-linux-release-x64-try"
+      name: "vm-aot-ubsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14264,10 +14278,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -14275,6 +14287,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -14287,11 +14300,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm-try"
+      name: "vm-aot-win-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14301,7 +14314,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -14323,11 +14336,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c-try"
+      name: "vm-aot-win-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14337,7 +14350,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -14359,11 +14372,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm-try"
+      name: "vm-aot-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14373,7 +14386,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -14395,7 +14408,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c-try"
+      name: "vm-appjit-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14420,7 +14433,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -14431,7 +14445,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm-try"
+      name: "vm-appjit-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14467,7 +14481,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c-try"
+      name: "vm-appjit-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14503,7 +14517,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-fuchsia-release-arm64-try"
+      name: "vm-asan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14527,6 +14541,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -14539,7 +14554,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-fuchsia-release-x64-try"
+      name: "vm-eager-optimization-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14575,7 +14590,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-try"
+      name: "vm-eager-optimization-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14605,17 +14620,13 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-gcc-linux-try"
+      name: "vm-ffi-android-debug-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14628,9 +14639,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true,'
-        '    "timeout": 4500'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -14642,7 +14654,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 18000
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14651,7 +14662,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64-try"
+      name: "vm-ffi-android-debug-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14687,7 +14698,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-x64-try"
+      name: "vm-ffi-android-product-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14723,11 +14734,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-msvc-windows-try"
+      name: "vm-ffi-android-product-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14736,8 +14747,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -14757,7 +14770,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-dwarf-linux-product-x64-try"
+      name: "vm-ffi-android-release-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14793,7 +14806,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-try"
+      name: "vm-ffi-android-release-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14829,7 +14842,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-try"
+      name: "vm-fuchsia-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14865,7 +14878,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64-try"
+      name: "vm-fuchsia-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14901,7 +14914,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
+      name: "vm-kernel-checked-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14931,13 +14944,17 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-simriscv64-try"
+      name: "vm-kernel-gcc-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14950,10 +14967,9 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true,'
+        '    "timeout": 4500'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -14962,10 +14978,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      execution_timeout_secs: 18000
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14974,7 +14990,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-debug-x64-try"
+      name: "vm-kernel-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14999,8 +15015,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -15011,7 +15026,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm64-try"
+      name: "vm-kernel-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15047,11 +15062,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
+      name: "vm-kernel-msvc-windows-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15060,10 +15075,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -15083,7 +15096,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-linux-release-x64-try"
+      name: "vm-kernel-precomp-dwarf-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15119,11 +15132,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-mac-release-arm64-try"
+      name: "vm-kernel-precomp-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15133,7 +15146,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -15144,17 +15157,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -15163,11 +15168,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-mac-release-simarm64-try"
+      name: "vm-kernel-precomp-linux-release-simarm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15177,7 +15182,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -15188,14 +15193,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -15204,11 +15204,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-nnbd-win-release-x64-try"
+      name: "vm-kernel-precomp-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15218,7 +15218,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 2f46918229b8..390c303c25d9 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -104,31 +104,31 @@ consoles {
     name: "buildbucket/luci.dart.try/vm-appjit-linux-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-aot-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try"
+    name: "buildbucket/luci.dart.try/vm-aot-linux-debug-simarm_x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-simarm_x64-try"
+    name: "buildbucket/luci.dart.try/vm-aot-linux-release-simarm_x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-x64-try"
+    name: "buildbucket/luci.dart.try/vm-aot-linux-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-release-simarm64-try"
+    name: "buildbucket/luci.dart.try/vm-aot-linux-release-simarm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-linux-debug-simriscv64-try"
+    name: "buildbucket/luci.dart.try/vm-aot-linux-debug-simriscv64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-mac-release-arm64-try"
+    name: "buildbucket/luci.dart.try/vm-aot-mac-release-arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-mac-release-simarm64-try"
+    name: "buildbucket/luci.dart.try/vm-aot-mac-release-simarm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-nnbd-win-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-aot-win-release-x64-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-android-release-arm_x64-try"
@@ -599,32 +599,32 @@ consoles {
     short_name: "p"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-x64"
     category: "vm|aot"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-debug-simarm_x64"
     category: "vm|aot"
     short_name: "da"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-simarm_x64"
     category: "vm|aot"
     short_name: "ra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-debug-x64"
     category: "vm|aot"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-simarm64"
     category: "vm|aot"
     short_name: "ra6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simriscv64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-debug-simriscv64"
     category: "vm|aot"
     short_name: "rv"
   }
@@ -634,17 +634,17 @@ consoles {
     short_name: "a6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-arm64"
     category: "vm|aot"
     short_name: "m1"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-simarm64"
     category: "vm|aot"
     short_name: "ma6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-release-x64"
     category: "vm|aot"
     short_name: "wr"
   }
@@ -1380,32 +1380,32 @@ consoles {
     short_name: "p"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-x64"
     category: "vm|aot"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-debug-simarm_x64"
     category: "vm|aot"
     short_name: "da"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-simarm_x64"
     category: "vm|aot"
     short_name: "ra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-debug-x64"
     category: "vm|aot"
     short_name: "d"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-simarm64"
     category: "vm|aot"
     short_name: "ra6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simriscv64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-debug-simriscv64"
     category: "vm|aot"
     short_name: "rv"
   }
@@ -1415,17 +1415,17 @@ consoles {
     short_name: "a6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-arm64"
     category: "vm|aot"
     short_name: "m1"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-simarm64"
     category: "vm|aot"
     short_name: "ma6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-release-x64"
     category: "vm|aot"
     short_name: "wr"
   }
@@ -1811,32 +1811,32 @@ consoles {
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-x64-dev"
     category: "vm|aot"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-debug-simarm_x64-dev"
     category: "vm|aot"
     short_name: "da"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm_x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-simarm_x64-dev"
     category: "vm|aot"
     short_name: "ra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-simarm64-dev"
     category: "vm|aot"
     short_name: "ra6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-simarm64-dev"
     category: "vm|aot"
     short_name: "ma6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-release-x64-dev"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-release-x64-dev"
     category: "vm|aot"
     short_name: "wr"
   }
@@ -2167,32 +2167,32 @@ consoles {
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-x64-beta"
     category: "vm|aot"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-debug-simarm_x64-beta"
     category: "vm|aot"
     short_name: "da"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm_x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-simarm_x64-beta"
     category: "vm|aot"
     short_name: "ra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-simarm64-beta"
     category: "vm|aot"
     short_name: "ra6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-simarm64-beta"
     category: "vm|aot"
     short_name: "ma6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-release-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-release-x64-beta"
     category: "vm|aot"
     short_name: "wr"
   }
@@ -2518,32 +2518,32 @@ consoles {
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-x64-stable"
     category: "vm|aot"
     short_name: "r"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-debug-simarm_x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-debug-simarm_x64-stable"
     category: "vm|aot"
     short_name: "da"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm_x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-simarm_x64-stable"
     category: "vm|aot"
     short_name: "ra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-linux-release-simarm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-simarm64-stable"
     category: "vm|aot"
     short_name: "ra6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-mac-release-simarm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-simarm64-stable"
     category: "vm|aot"
     short_name: "ma6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-nnbd-win-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-release-x64-stable"
     category: "vm|aot"
     short_name: "wr"
   }
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index ed35497bc263..9e126d9b5b9f 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -490,13 +490,11 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-aot-linux-debug-x64c"
+    name: "vm-aot-linux-debug-simarm_x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -509,7 +507,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-aot-linux-product-x64"
+    name: "vm-aot-linux-debug-simriscv64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -522,7 +520,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-aot-linux-release-arm64"
+    name: "vm-aot-linux-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -535,7 +533,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-aot-mac-product-x64"
+    name: "vm-aot-linux-debug-x64c"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -548,7 +546,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-aot-msan-linux-release-x64"
+    name: "vm-aot-linux-product-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -561,70 +559,64 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-aot-tsan-linux-release-x64"
+    name: "vm-aot-linux-release-arm64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-aot-ubsan-linux-release-x64"
+    name: "vm-aot-linux-release-simarm64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-aot-win-debug-x64c"
+    name: "vm-aot-linux-release-simarm_x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-aot-win-product-x64"
+    name: "vm-aot-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-appjit-linux-debug-x64"
+    name: "vm-aot-mac-product-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-appjit-linux-product-x64"
+    name: "vm-aot-mac-release-arm64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -635,7 +627,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-appjit-linux-release-x64"
+    name: "vm-aot-mac-release-simarm64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -648,7 +640,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-asan-linux-release-x64"
+    name: "vm-aot-msan-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -661,40 +653,46 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-eager-optimization-linux-release-ia32"
+    name: "vm-aot-tsan-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-eager-optimization-linux-release-x64"
+    name: "vm-aot-ubsan-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-ffi-android-debug-arm"
+    name: "vm-aot-win-debug-x64c"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-ffi-android-debug-arm64c"
+    name: "vm-aot-win-product-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -705,7 +703,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-ffi-android-product-arm"
+    name: "vm-aot-win-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -716,18 +714,20 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-ffi-android-product-arm64c"
+    name: "vm-appjit-linux-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-ffi-android-release-arm"
+    name: "vm-appjit-linux-product-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -738,29 +738,33 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-ffi-android-release-arm64c"
+    name: "vm-appjit-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-fuchsia-release-arm64"
+    name: "vm-asan-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-fuchsia-release-x64"
+    name: "vm-eager-optimization-linux-release-ia32"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -771,20 +775,18 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-checked-linux-release-x64"
+    name: "vm-eager-optimization-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-gcc-linux"
+    name: "vm-ffi-android-debug-arm"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -795,7 +797,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-linux-debug-x64"
+    name: "vm-ffi-android-debug-arm64c"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -806,33 +808,29 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-linux-release-x64"
+    name: "vm-ffi-android-product-arm"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-msvc-windows"
+    name: "vm-ffi-android-product-arm64c"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-dwarf-linux-product-x64"
+    name: "vm-ffi-android-release-arm"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -843,7 +841,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-debug-x64"
+    name: "vm-ffi-android-release-arm64c"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -854,7 +852,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-release-simarm"
+    name: "vm-fuchsia-release-arm64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -865,7 +863,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-release-x64"
+    name: "vm-fuchsia-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -876,7 +874,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+    name: "vm-kernel-checked-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -889,20 +887,18 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
+    name: "vm-kernel-gcc-linux"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-linux-debug-x64"
+    name: "vm-kernel-linux-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -913,29 +909,33 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-linux-release-simarm64"
+    name: "vm-kernel-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+    name: "vm-kernel-msvc-windows"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-linux-release-x64"
+    name: "vm-kernel-precomp-dwarf-linux-product-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -946,7 +946,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-mac-release-arm64"
+    name: "vm-kernel-precomp-linux-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -957,7 +957,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-mac-release-simarm64"
+    name: "vm-kernel-precomp-linux-release-simarm"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -968,7 +968,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-nnbd-win-release-x64"
+    name: "vm-kernel-precomp-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 12bf7ec0b341..3c13a5108ca3 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1155,953 +1155,953 @@ job {
   }
 }
 job {
-  id: "vm-aot-linux-debug-x64c"
+  id: "vm-aot-linux-debug-simarm_x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-aot-linux-debug-x64c"
+    builder: "vm-aot-linux-debug-simarm_x64"
   }
 }
 job {
-  id: "vm-aot-linux-product-x64"
+  id: "vm-aot-linux-debug-simarm_x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-aot-linux-product-x64"
+    builder: "vm-aot-linux-debug-simarm_x64-beta"
   }
 }
 job {
-  id: "vm-aot-linux-release-arm64"
+  id: "vm-aot-linux-debug-simarm_x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-aot-linux-release-arm64"
+    builder: "vm-aot-linux-debug-simarm_x64-dev"
   }
 }
 job {
-  id: "vm-aot-mac-product-x64"
+  id: "vm-aot-linux-debug-simarm_x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-aot-mac-product-x64"
+    builder: "vm-aot-linux-debug-simarm_x64-stable"
   }
 }
 job {
-  id: "vm-aot-msan-linux-release-x64"
+  id: "vm-aot-linux-debug-simriscv64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-aot-msan-linux-release-x64"
+    builder: "vm-aot-linux-debug-simriscv64"
   }
 }
 job {
-  id: "vm-aot-tsan-linux-release-x64"
+  id: "vm-aot-linux-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-aot-tsan-linux-release-x64"
+    builder: "vm-aot-linux-debug-x64"
   }
 }
 job {
-  id: "vm-aot-ubsan-linux-release-x64"
+  id: "vm-aot-linux-debug-x64c"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-aot-ubsan-linux-release-x64"
+    builder: "vm-aot-linux-debug-x64c"
   }
 }
 job {
-  id: "vm-aot-win-debug-x64c"
+  id: "vm-aot-linux-product-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-aot-win-debug-x64c"
+    builder: "vm-aot-linux-product-x64"
   }
 }
 job {
-  id: "vm-aot-win-product-x64"
+  id: "vm-aot-linux-release-arm64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-aot-win-product-x64"
+    builder: "vm-aot-linux-release-arm64"
   }
 }
 job {
-  id: "vm-appjit-linux-debug-x64"
+  id: "vm-aot-linux-release-simarm64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-appjit-linux-debug-x64"
+    builder: "vm-aot-linux-release-simarm64"
   }
 }
 job {
-  id: "vm-appjit-linux-debug-x64-beta"
+  id: "vm-aot-linux-release-simarm64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-appjit-linux-debug-x64-beta"
+    builder: "vm-aot-linux-release-simarm64-beta"
   }
 }
 job {
-  id: "vm-appjit-linux-debug-x64-dev"
+  id: "vm-aot-linux-release-simarm64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-appjit-linux-debug-x64-dev"
+    builder: "vm-aot-linux-release-simarm64-dev"
   }
 }
 job {
-  id: "vm-appjit-linux-debug-x64-stable"
+  id: "vm-aot-linux-release-simarm64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-appjit-linux-debug-x64-stable"
+    builder: "vm-aot-linux-release-simarm64-stable"
   }
 }
 job {
-  id: "vm-appjit-linux-product-x64"
+  id: "vm-aot-linux-release-simarm_x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-appjit-linux-product-x64"
+    builder: "vm-aot-linux-release-simarm_x64"
   }
 }
 job {
-  id: "vm-appjit-linux-release-x64"
+  id: "vm-aot-linux-release-simarm_x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-appjit-linux-release-x64"
+    builder: "vm-aot-linux-release-simarm_x64-beta"
   }
 }
 job {
-  id: "vm-appjit-linux-release-x64-beta"
+  id: "vm-aot-linux-release-simarm_x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-appjit-linux-release-x64-beta"
+    builder: "vm-aot-linux-release-simarm_x64-dev"
   }
 }
 job {
-  id: "vm-appjit-linux-release-x64-dev"
+  id: "vm-aot-linux-release-simarm_x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-appjit-linux-release-x64-dev"
+    builder: "vm-aot-linux-release-simarm_x64-stable"
   }
 }
 job {
-  id: "vm-appjit-linux-release-x64-stable"
+  id: "vm-aot-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-appjit-linux-release-x64-stable"
+    builder: "vm-aot-linux-release-x64"
   }
 }
 job {
-  id: "vm-asan-linux-release-x64"
+  id: "vm-aot-linux-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-asan-linux-release-x64"
+    builder: "vm-aot-linux-release-x64-beta"
   }
 }
 job {
-  id: "vm-eager-optimization-linux-release-ia32"
+  id: "vm-aot-linux-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-eager-optimization-linux-release-ia32"
+    builder: "vm-aot-linux-release-x64-dev"
   }
 }
 job {
-  id: "vm-eager-optimization-linux-release-x64"
+  id: "vm-aot-linux-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-eager-optimization-linux-release-x64"
+    builder: "vm-aot-linux-release-x64-stable"
   }
 }
 job {
-  id: "vm-ffi-android-debug-arm"
+  id: "vm-aot-mac-product-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-ffi-android-debug-arm"
+    builder: "vm-aot-mac-product-x64"
   }
 }
 job {
-  id: "vm-ffi-android-debug-arm-beta"
+  id: "vm-aot-mac-release-arm64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-ffi-android-debug-arm-beta"
+    builder: "vm-aot-mac-release-arm64"
   }
 }
 job {
-  id: "vm-ffi-android-debug-arm-dev"
+  id: "vm-aot-mac-release-simarm64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-ffi-android-debug-arm-dev"
+    builder: "vm-aot-mac-release-simarm64"
   }
 }
 job {
-  id: "vm-ffi-android-debug-arm-stable"
+  id: "vm-aot-mac-release-simarm64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-ffi-android-debug-arm-stable"
+    builder: "vm-aot-mac-release-simarm64-beta"
   }
 }
 job {
-  id: "vm-ffi-android-debug-arm64c"
+  id: "vm-aot-mac-release-simarm64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-ffi-android-debug-arm64c"
+    builder: "vm-aot-mac-release-simarm64-dev"
   }
 }
 job {
-  id: "vm-ffi-android-debug-arm64c-beta"
+  id: "vm-aot-mac-release-simarm64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-ffi-android-debug-arm64c-beta"
+    builder: "vm-aot-mac-release-simarm64-stable"
   }
 }
 job {
-  id: "vm-ffi-android-debug-arm64c-dev"
+  id: "vm-aot-msan-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-ffi-android-debug-arm64c-dev"
+    builder: "vm-aot-msan-linux-release-x64"
   }
 }
 job {
-  id: "vm-ffi-android-debug-arm64c-stable"
+  id: "vm-aot-tsan-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-ffi-android-debug-arm64c-stable"
+    builder: "vm-aot-tsan-linux-release-x64"
   }
 }
 job {
-  id: "vm-ffi-android-product-arm"
+  id: "vm-aot-ubsan-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-ffi-android-product-arm"
+    builder: "vm-aot-ubsan-linux-release-x64"
   }
 }
 job {
-  id: "vm-ffi-android-product-arm-beta"
+  id: "vm-aot-win-debug-x64c"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-ffi-android-product-arm-beta"
+    builder: "vm-aot-win-debug-x64c"
   }
 }
 job {
-  id: "vm-ffi-android-product-arm-dev"
+  id: "vm-aot-win-product-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-ffi-android-product-arm-dev"
+    builder: "vm-aot-win-product-x64"
   }
 }
 job {
-  id: "vm-ffi-android-product-arm-stable"
+  id: "vm-aot-win-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-ffi-android-product-arm-stable"
+    builder: "vm-aot-win-release-x64"
   }
 }
 job {
-  id: "vm-ffi-android-product-arm64c"
+  id: "vm-aot-win-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-ffi-android-product-arm64c"
+    builder: "vm-aot-win-release-x64-beta"
   }
 }
 job {
-  id: "vm-ffi-android-product-arm64c-beta"
+  id: "vm-aot-win-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-ffi-android-product-arm64c-beta"
+    builder: "vm-aot-win-release-x64-dev"
   }
 }
 job {
-  id: "vm-ffi-android-product-arm64c-dev"
+  id: "vm-aot-win-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-ffi-android-product-arm64c-dev"
+    builder: "vm-aot-win-release-x64-stable"
   }
 }
 job {
-  id: "vm-ffi-android-product-arm64c-stable"
+  id: "vm-appjit-linux-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-ffi-android-product-arm64c-stable"
+    builder: "vm-appjit-linux-debug-x64"
   }
 }
 job {
-  id: "vm-ffi-android-release-arm"
+  id: "vm-appjit-linux-debug-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-ffi-android-release-arm"
+    builder: "vm-appjit-linux-debug-x64-beta"
   }
 }
 job {
-  id: "vm-ffi-android-release-arm-beta"
+  id: "vm-appjit-linux-debug-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-ffi-android-release-arm-beta"
+    builder: "vm-appjit-linux-debug-x64-dev"
   }
 }
 job {
-  id: "vm-ffi-android-release-arm-dev"
+  id: "vm-appjit-linux-debug-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-ffi-android-release-arm-dev"
+    builder: "vm-appjit-linux-debug-x64-stable"
   }
 }
 job {
-  id: "vm-ffi-android-release-arm-stable"
+  id: "vm-appjit-linux-product-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-ffi-android-release-arm-stable"
+    builder: "vm-appjit-linux-product-x64"
   }
 }
 job {
-  id: "vm-ffi-android-release-arm64c"
+  id: "vm-appjit-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-ffi-android-release-arm64c"
+    builder: "vm-appjit-linux-release-x64"
   }
 }
 job {
-  id: "vm-ffi-android-release-arm64c-beta"
+  id: "vm-appjit-linux-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-ffi-android-release-arm64c-beta"
+    builder: "vm-appjit-linux-release-x64-beta"
   }
 }
 job {
-  id: "vm-ffi-android-release-arm64c-dev"
+  id: "vm-appjit-linux-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-ffi-android-release-arm64c-dev"
+    builder: "vm-appjit-linux-release-x64-dev"
   }
 }
 job {
-  id: "vm-ffi-android-release-arm64c-stable"
+  id: "vm-appjit-linux-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-ffi-android-release-arm64c-stable"
+    builder: "vm-appjit-linux-release-x64-stable"
   }
 }
 job {
-  id: "vm-fuchsia-release-arm64"
+  id: "vm-asan-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-fuchsia-release-arm64"
+    builder: "vm-asan-linux-release-x64"
   }
 }
 job {
-  id: "vm-fuchsia-release-x64"
+  id: "vm-eager-optimization-linux-release-ia32"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-fuchsia-release-x64"
+    builder: "vm-eager-optimization-linux-release-ia32"
   }
 }
 job {
-  id: "vm-kernel-checked-linux-release-x64"
+  id: "vm-eager-optimization-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-checked-linux-release-x64"
+    builder: "vm-eager-optimization-linux-release-x64"
   }
 }
 job {
-  id: "vm-kernel-checked-linux-release-x64-beta"
+  id: "vm-ffi-android-debug-arm"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-checked-linux-release-x64-beta"
+    builder: "vm-ffi-android-debug-arm"
   }
 }
 job {
-  id: "vm-kernel-checked-linux-release-x64-dev"
+  id: "vm-ffi-android-debug-arm-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-checked-linux-release-x64-dev"
+    builder: "vm-ffi-android-debug-arm-beta"
   }
 }
 job {
-  id: "vm-kernel-checked-linux-release-x64-stable"
+  id: "vm-ffi-android-debug-arm-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-checked-linux-release-x64-stable"
+    builder: "vm-ffi-android-debug-arm-dev"
   }
 }
 job {
-  id: "vm-kernel-gcc-linux"
+  id: "vm-ffi-android-debug-arm-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-gcc-linux"
+    builder: "vm-ffi-android-debug-arm-stable"
   }
 }
 job {
-  id: "vm-kernel-linux-debug-x64"
+  id: "vm-ffi-android-debug-arm64c"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-debug-x64"
+    builder: "vm-ffi-android-debug-arm64c"
   }
 }
 job {
-  id: "vm-kernel-linux-release-x64"
+  id: "vm-ffi-android-debug-arm64c-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-release-x64"
+    builder: "vm-ffi-android-debug-arm64c-beta"
   }
 }
 job {
-  id: "vm-kernel-msvc-windows"
+  id: "vm-ffi-android-debug-arm64c-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-msvc-windows"
+    builder: "vm-ffi-android-debug-arm64c-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-dwarf-linux-product-x64"
+  id: "vm-ffi-android-debug-arm64c-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-dwarf-linux-product-x64"
+    builder: "vm-ffi-android-debug-arm64c-stable"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-debug-x64"
+  id: "vm-ffi-android-product-arm"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64"
+    builder: "vm-ffi-android-product-arm"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-debug-x64-beta"
+  id: "vm-ffi-android-product-arm-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64-beta"
+    builder: "vm-ffi-android-product-arm-beta"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-debug-x64-dev"
+  id: "vm-ffi-android-product-arm-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64-dev"
+    builder: "vm-ffi-android-product-arm-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-debug-x64-stable"
+  id: "vm-ffi-android-product-arm-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64-stable"
+    builder: "vm-ffi-android-product-arm-stable"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-release-simarm"
+  id: "vm-ffi-android-product-arm64c"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm"
+    builder: "vm-ffi-android-product-arm64c"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-release-simarm-beta"
+  id: "vm-ffi-android-product-arm64c-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm-beta"
+    builder: "vm-ffi-android-product-arm64c-beta"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-release-simarm-dev"
+  id: "vm-ffi-android-product-arm64c-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm-dev"
+    builder: "vm-ffi-android-product-arm64c-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-release-simarm-stable"
+  id: "vm-ffi-android-product-arm64c-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm-stable"
+    builder: "vm-ffi-android-product-arm64c-stable"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-release-x64"
+  id: "vm-ffi-android-release-arm"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-x64"
+    builder: "vm-ffi-android-release-arm"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-release-x64-beta"
+  id: "vm-ffi-android-release-arm-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-x64-beta"
+    builder: "vm-ffi-android-release-arm-beta"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-release-x64-dev"
+  id: "vm-ffi-android-release-arm-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-x64-dev"
+    builder: "vm-ffi-android-release-arm-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-linux-release-x64-stable"
+  id: "vm-ffi-android-release-arm-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-x64-stable"
+    builder: "vm-ffi-android-release-arm-stable"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+  id: "vm-ffi-android-release-arm64c"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
+    builder: "vm-ffi-android-release-arm64c"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-beta"
+  id: "vm-ffi-android-release-arm64c-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-beta"
+    builder: "vm-ffi-android-release-arm64c-beta"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-dev"
+  id: "vm-ffi-android-release-arm64c-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-dev"
+    builder: "vm-ffi-android-release-arm64c-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-stable"
+  id: "vm-ffi-android-release-arm64c-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-stable"
+    builder: "vm-ffi-android-release-arm64c-stable"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
+  id: "vm-fuchsia-release-arm64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
+    builder: "vm-fuchsia-release-arm64"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-debug-x64"
+  id: "vm-fuchsia-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-debug-x64"
+    builder: "vm-fuchsia-release-x64"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-simarm64"
+  id: "vm-kernel-checked-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-simarm64"
+    builder: "vm-kernel-checked-linux-release-x64"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-simarm64-beta"
+  id: "vm-kernel-checked-linux-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-simarm64-beta"
+    builder: "vm-kernel-checked-linux-release-x64-beta"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-simarm64-dev"
+  id: "vm-kernel-checked-linux-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-simarm64-dev"
+    builder: "vm-kernel-checked-linux-release-x64-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-simarm64-stable"
+  id: "vm-kernel-checked-linux-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-simarm64-stable"
+    builder: "vm-kernel-checked-linux-release-x64-stable"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+  id: "vm-kernel-gcc-linux"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
+    builder: "vm-kernel-gcc-linux"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-beta"
+  id: "vm-kernel-linux-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-beta"
+    builder: "vm-kernel-linux-debug-x64"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-dev"
+  id: "vm-kernel-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-dev"
+    builder: "vm-kernel-linux-release-x64"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-stable"
+  id: "vm-kernel-msvc-windows"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-stable"
+    builder: "vm-kernel-msvc-windows"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-x64"
+  id: "vm-kernel-precomp-dwarf-linux-product-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-x64"
+    builder: "vm-kernel-precomp-dwarf-linux-product-x64"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
+  id: "vm-kernel-precomp-linux-debug-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
+    builder: "vm-kernel-precomp-linux-debug-x64"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
+  id: "vm-kernel-precomp-linux-debug-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
+    builder: "vm-kernel-precomp-linux-debug-x64-beta"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
+  id: "vm-kernel-precomp-linux-debug-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
+    builder: "vm-kernel-precomp-linux-debug-x64-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-mac-release-arm64"
+  id: "vm-kernel-precomp-linux-debug-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-mac-release-arm64"
+    builder: "vm-kernel-precomp-linux-debug-x64-stable"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-mac-release-simarm64"
+  id: "vm-kernel-precomp-linux-release-simarm"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-mac-release-simarm64"
+    builder: "vm-kernel-precomp-linux-release-simarm"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-mac-release-simarm64-beta"
+  id: "vm-kernel-precomp-linux-release-simarm-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-mac-release-simarm64-beta"
+    builder: "vm-kernel-precomp-linux-release-simarm-beta"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-mac-release-simarm64-dev"
+  id: "vm-kernel-precomp-linux-release-simarm-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-mac-release-simarm64-dev"
+    builder: "vm-kernel-precomp-linux-release-simarm-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-mac-release-simarm64-stable"
+  id: "vm-kernel-precomp-linux-release-simarm-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-mac-release-simarm64-stable"
+    builder: "vm-kernel-precomp-linux-release-simarm-stable"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-win-release-x64"
+  id: "vm-kernel-precomp-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-win-release-x64"
+    builder: "vm-kernel-precomp-linux-release-x64"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-win-release-x64-beta"
+  id: "vm-kernel-precomp-linux-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-win-release-x64-beta"
+    builder: "vm-kernel-precomp-linux-release-x64-beta"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-win-release-x64-dev"
+  id: "vm-kernel-precomp-linux-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-win-release-x64-dev"
+    builder: "vm-kernel-precomp-linux-release-x64-dev"
   }
 }
 job {
-  id: "vm-kernel-precomp-nnbd-win-release-x64-stable"
+  id: "vm-kernel-precomp-linux-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-nnbd-win-release-x64-stable"
+    builder: "vm-kernel-precomp-linux-release-x64-stable"
   }
 }
 job {
@@ -2790,6 +2790,12 @@ trigger {
   triggers: "pkg-win-release-beta"
   triggers: "vm-aot-android-release-arm64c-beta"
   triggers: "vm-aot-android-release-arm_x64-beta"
+  triggers: "vm-aot-linux-debug-simarm_x64-beta"
+  triggers: "vm-aot-linux-release-simarm64-beta"
+  triggers: "vm-aot-linux-release-simarm_x64-beta"
+  triggers: "vm-aot-linux-release-x64-beta"
+  triggers: "vm-aot-mac-release-simarm64-beta"
+  triggers: "vm-aot-win-release-x64-beta"
   triggers: "vm-appjit-linux-debug-x64-beta"
   triggers: "vm-appjit-linux-release-x64-beta"
   triggers: "vm-ffi-android-debug-arm-beta"
@@ -2802,12 +2808,6 @@ trigger {
   triggers: "vm-kernel-precomp-linux-debug-x64-beta"
   triggers: "vm-kernel-precomp-linux-release-simarm-beta"
   triggers: "vm-kernel-precomp-linux-release-x64-beta"
-  triggers: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-beta"
-  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm64-beta"
-  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-beta"
-  triggers: "vm-kernel-precomp-nnbd-linux-release-x64-beta"
-  triggers: "vm-kernel-precomp-nnbd-mac-release-simarm64-beta"
-  triggers: "vm-kernel-precomp-nnbd-win-release-x64-beta"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
   triggers: "vm-linux-debug-x64-beta"
   triggers: "vm-linux-release-simarm-beta"
@@ -2851,6 +2851,12 @@ trigger {
   triggers: "pkg-win-release-dev"
   triggers: "vm-aot-android-release-arm64c-dev"
   triggers: "vm-aot-android-release-arm_x64-dev"
+  triggers: "vm-aot-linux-debug-simarm_x64-dev"
+  triggers: "vm-aot-linux-release-simarm64-dev"
+  triggers: "vm-aot-linux-release-simarm_x64-dev"
+  triggers: "vm-aot-linux-release-x64-dev"
+  triggers: "vm-aot-mac-release-simarm64-dev"
+  triggers: "vm-aot-win-release-x64-dev"
   triggers: "vm-appjit-linux-debug-x64-dev"
   triggers: "vm-appjit-linux-release-x64-dev"
   triggers: "vm-ffi-android-debug-arm-dev"
@@ -2863,12 +2869,6 @@ trigger {
   triggers: "vm-kernel-precomp-linux-debug-x64-dev"
   triggers: "vm-kernel-precomp-linux-release-simarm-dev"
   triggers: "vm-kernel-precomp-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-dev"
-  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm64-dev"
-  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-dev"
-  triggers: "vm-kernel-precomp-nnbd-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-nnbd-mac-release-simarm64-dev"
-  triggers: "vm-kernel-precomp-nnbd-win-release-x64-dev"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
   triggers: "vm-linux-debug-x64-dev"
   triggers: "vm-linux-release-simarm-dev"
@@ -2979,6 +2979,12 @@ trigger {
   triggers: "pkg-win-release-stable"
   triggers: "vm-aot-android-release-arm64c-stable"
   triggers: "vm-aot-android-release-arm_x64-stable"
+  triggers: "vm-aot-linux-debug-simarm_x64-stable"
+  triggers: "vm-aot-linux-release-simarm64-stable"
+  triggers: "vm-aot-linux-release-simarm_x64-stable"
+  triggers: "vm-aot-linux-release-x64-stable"
+  triggers: "vm-aot-mac-release-simarm64-stable"
+  triggers: "vm-aot-win-release-x64-stable"
   triggers: "vm-appjit-linux-debug-x64-stable"
   triggers: "vm-appjit-linux-release-x64-stable"
   triggers: "vm-ffi-android-debug-arm-stable"
@@ -2991,12 +2997,6 @@ trigger {
   triggers: "vm-kernel-precomp-linux-debug-x64-stable"
   triggers: "vm-kernel-precomp-linux-release-simarm-stable"
   triggers: "vm-kernel-precomp-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64-stable"
-  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm64-stable"
-  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm_x64-stable"
-  triggers: "vm-kernel-precomp-nnbd-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-nnbd-mac-release-simarm64-stable"
-  triggers: "vm-kernel-precomp-nnbd-win-release-x64-stable"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
   triggers: "vm-linux-debug-x64-stable"
   triggers: "vm-linux-release-simarm-stable"
@@ -3023,6 +3023,8 @@ trigger {
   triggers: "front-end-nnbd-win-release-x64"
   triggers: "pkg-linux-release-experimental"
   triggers: "vm-aot-asan-linux-release-x64"
+  triggers: "vm-aot-linux-debug-simriscv64"
+  triggers: "vm-aot-linux-debug-x64"
   triggers: "vm-aot-linux-debug-x64c"
   triggers: "vm-aot-linux-product-x64"
   triggers: "vm-aot-linux-release-arm64"
@@ -3038,8 +3040,6 @@ trigger {
   triggers: "vm-kernel-gcc-linux"
   triggers: "vm-kernel-msvc-windows"
   triggers: "vm-kernel-precomp-dwarf-linux-product-x64"
-  triggers: "vm-kernel-precomp-nnbd-linux-debug-simriscv64"
-  triggers: "vm-kernel-precomp-nnbd-linux-debug-x64"
   triggers: "vm-kernel-win-debug-ia32"
   triggers: "vm-linux-debug-ia32"
   triggers: "vm-linux-debug-simriscv64"
@@ -3067,6 +3067,13 @@ trigger {
   triggers: "iso-stress-linux"
   triggers: "vm-aot-android-release-arm64c"
   triggers: "vm-aot-android-release-arm_x64"
+  triggers: "vm-aot-linux-debug-simarm_x64"
+  triggers: "vm-aot-linux-release-simarm64"
+  triggers: "vm-aot-linux-release-simarm_x64"
+  triggers: "vm-aot-linux-release-x64"
+  triggers: "vm-aot-mac-release-arm64"
+  triggers: "vm-aot-mac-release-simarm64"
+  triggers: "vm-aot-win-release-x64"
   triggers: "vm-appjit-linux-debug-x64"
   triggers: "vm-appjit-linux-release-x64"
   triggers: "vm-eager-optimization-linux-release-x64"
@@ -3084,13 +3091,6 @@ trigger {
   triggers: "vm-kernel-precomp-linux-debug-x64"
   triggers: "vm-kernel-precomp-linux-release-simarm"
   triggers: "vm-kernel-precomp-linux-release-x64"
-  triggers: "vm-kernel-precomp-nnbd-linux-debug-simarm_x64"
-  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm64"
-  triggers: "vm-kernel-precomp-nnbd-linux-release-simarm_x64"
-  triggers: "vm-kernel-precomp-nnbd-linux-release-x64"
-  triggers: "vm-kernel-precomp-nnbd-mac-release-arm64"
-  triggers: "vm-kernel-precomp-nnbd-mac-release-simarm64"
-  triggers: "vm-kernel-precomp-nnbd-win-release-x64"
   triggers: "vm-kernel-precomp-obfuscate-linux-release-x64"
   triggers: "vm-linux-debug-x64"
   triggers: "vm-linux-release-arm64"
diff --git a/vm.star b/vm.star
index cfff32ff61d9..4cb4a24a5679 100644
--- a/vm.star
+++ b/vm.star
@@ -183,29 +183,29 @@ _nightly_builder(
 
 # vm|aot
 _extra_builder(
-    "vm-kernel-precomp-nnbd-linux-release-x64",
+    "vm-aot-linux-release-x64",
     category = "vm|aot|r",
 )
 _extra_builder(
-    "vm-kernel-precomp-nnbd-linux-debug-simarm_x64",
+    "vm-aot-linux-debug-simarm_x64",
     category = "vm|aot|da",
 )
 _extra_builder(
-    "vm-kernel-precomp-nnbd-linux-release-simarm_x64",
+    "vm-aot-linux-release-simarm_x64",
     category = "vm|aot|ra",
 )
 _nightly_builder(
-    "vm-kernel-precomp-nnbd-linux-debug-x64",
+    "vm-aot-linux-debug-x64",
     category = "vm|aot|d",
     channels = ["try"],
     properties = slow_shards,
 )
 _extra_builder(
-    "vm-kernel-precomp-nnbd-linux-release-simarm64",
+    "vm-aot-linux-release-simarm64",
     category = "vm|aot|ra6",
 )
 _nightly_builder(
-    "vm-kernel-precomp-nnbd-linux-debug-simriscv64",
+    "vm-aot-linux-debug-simriscv64",
     category = "vm|aot|rv",
     channels = ["try"],
     properties = [slow_shards],
@@ -217,20 +217,20 @@ _nightly_builder(
     properties = {"shard_timeout": (120 * time.minute) // time.second},
 )
 _extra_builder(
-    "vm-kernel-precomp-nnbd-mac-release-arm64",
+    "vm-aot-mac-release-arm64",
     category = "vm|aot|m1",
     channels = ["try"],
     dimensions = [mac, arm64],
     properties = [no_android, slow_shards],
 )
 _extra_builder(
-    "vm-kernel-precomp-nnbd-mac-release-simarm64",
+    "vm-aot-mac-release-simarm64",
     category = "vm|aot|ma6",
     dimensions = mac,
     properties = slow_shards,
 )
 _extra_builder(
-    "vm-kernel-precomp-nnbd-win-release-x64",
+    "vm-aot-win-release-x64",
     category = "vm|aot|wr",
     dimensions = windows,
 )

From b50fe2f8e604dafb70f24ff3f7749cc9e7db44ff Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 3 Apr 2023 14:14:24 +0000
Subject: [PATCH 636/826] [infra] Increase shard timeout on
 vm-aot-linux-debug-simarm_x64

Change-Id: Ib5e97cad6084db90c269e2bc56786a1ea799fe53
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/292663
Commit-Queue: Jonas Termansen <sortie@google.com>
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 generated/cr-buildbucket.cfg | 15 ++++++++++-----
 vm.star                      |  1 +
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index bb8ffa28c7fe..0e079b2b83c6 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5199,7 +5199,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -5235,7 +5236,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -5271,7 +5273,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -5307,7 +5310,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -13801,7 +13805,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
diff --git a/vm.star b/vm.star
index 4cb4a24a5679..da32885530c4 100644
--- a/vm.star
+++ b/vm.star
@@ -189,6 +189,7 @@ _extra_builder(
 _extra_builder(
     "vm-aot-linux-debug-simarm_x64",
     category = "vm|aot|da",
+    properties = slow_shards,
 )
 _extra_builder(
     "vm-aot-linux-release-simarm_x64",

From efc503d542d24950e8b36f74100fa89f119b434c Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Tue, 4 Apr 2023 13:41:48 +0000
Subject: [PATCH 637/826] Increase google builder priority.

The google builder takes 25 seconds to run and unblocks lkgr from being
able to find dev release candidates and advance the branch.
Unfortunately when the commit queue is massively overloaded with try
jobs of equal prioritiy, the google builder can be triggered for up to 6
hours and time out.

This change makes the google builder more important than try jobs and
shards, which has big benefits in improving lkgr rolls (the rest of the
lkgr builders run in their own fast pool), and is safe since it doesn't
block other work for more than a minute on a single bot.

Fixes: b/276851232
Change-Id: Ia87e8fa582c54ff0a473fead564f6bb26f6252dd
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/292723
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 generated/cr-buildbucket.cfg | 2 +-
 generated/project.cfg        | 2 +-
 lib/priority.star            | 3 ++-
 sdk.star                     | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 0e079b2b83c6..f332a78562dd 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -4171,7 +4171,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/external"'
         '}'
-      priority: 30
+      priority: 20
       execution_timeout_secs: 300
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
diff --git a/generated/project.cfg b/generated/project.cfg
index 5a43732cd954..e5d934faf5e1 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.38.2"
+  version: "1.39.2"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/lib/priority.star b/lib/priority.star
index ced75b831c22..71588c7b0394 100644
--- a/lib/priority.star
+++ b/lib/priority.star
@@ -10,5 +10,6 @@ priority = struct(
     low = 70,  # Used for "FYI" post-submit builds.
     normal = 50,  # Used for post-submit builds.
     high = 30,  # Used for try-jobs.
-    highest = 25,  # Used for shards in the recipes, only here for completeness.
+    very_high = 25,  # Used for shards in the recipes, here for completeness.
+    highest = 20,  # Used for very quick builders like the google builder.
 )
diff --git a/sdk.star b/sdk.star
index 70b5d47dbf98..776997f0c731 100644
--- a/sdk.star
+++ b/sdk.star
@@ -137,6 +137,6 @@ dart.ci_sandbox_builder(
     channels = [],
     execution_timeout = 5 * time.minute,
     notifies = None,
-    priority = priority.high,
+    priority = priority.highest,
     triggered_by = None,
 )

From 6e51b0034ba8418397352750c1ab146903d690e8 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 4 Apr 2023 20:19:19 +0000
Subject: [PATCH 638/826] [infra] Rename GCC and MSVC builders.

Change-Id: I4f0f2b6422ead817a1aa48a079f286c122d37173
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/293080
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/commit-queue.cfg   |  12 +--
 generated/cr-buildbucket.cfg | 200 +++++++++++++++++------------------
 generated/luci-milo.cfg      |  12 +--
 generated/luci-notify.cfg    |  36 +++----
 generated/luci-scheduler.cfg |  44 ++++----
 vm.star                      |   4 +-
 6 files changed, 154 insertions(+), 154 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 9d5fb6a5a530..5eb907ede4d7 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -3054,11 +3054,11 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-checked-linux-release-x64-try"
+        name: "dart/try/vm-gcc-linux-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-gcc-linux-try"
+        name: "dart/try/vm-kernel-checked-linux-release-x64-try"
         includable_only: true
       }
       builders {
@@ -3069,10 +3069,6 @@ config_groups {
         name: "dart/try/vm-kernel-linux-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-msvc-windows-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-precomp-dwarf-linux-product-x64-try"
         includable_only: true
@@ -3287,6 +3283,10 @@ config_groups {
         name: "dart/try/vm-msan-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-msvc-windows-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-precomp-ffi-qemu-linux-release-arm-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index f332a78562dd..13be3d75e63e 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -7886,7 +7886,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64"
+      name: "vm-gcc-linux"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7899,10 +7899,9 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true,'
+        '    "timeout": 4500'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -7913,20 +7912,17 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      execution_timeout_secs: 18000
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-beta"
+      name: "vm-kernel-checked-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7966,7 +7962,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-dev"
+      name: "vm-kernel-checked-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8006,7 +8002,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-stable"
+      name: "vm-kernel-checked-linux-release-x64-dev"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8046,7 +8042,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-gcc-linux"
+      name: "vm-kernel-checked-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8059,9 +8055,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true,'
-        '    "timeout": 4500'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -8072,10 +8069,13 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      execution_timeout_secs: 18000
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
@@ -8153,40 +8153,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-msvc-windows"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-precomp-dwarf-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10172,6 +10138,40 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-msvc-windows"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm"
       swarming_host: "chromium-swarm.appspot.com"
@@ -14919,47 +14919,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-gcc-linux-try"
+      name: "vm-gcc-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14995,7 +14955,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64-try"
+      name: "vm-kernel-checked-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15025,13 +14985,17 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-linux-release-x64-try"
+      name: "vm-kernel-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15067,11 +15031,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-msvc-windows-try"
+      name: "vm-kernel-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15080,8 +15044,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -15811,6 +15777,40 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-msvc-windows-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 390c303c25d9..87b0d536a919 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -206,10 +206,10 @@ consoles {
     name: "buildbucket/luci.dart.try/vm-fuchsia-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-gcc-linux-try"
+    name: "buildbucket/luci.dart.try/vm-gcc-linux-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-msvc-windows-try"
+    name: "buildbucket/luci.dart.try/vm-msvc-windows-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm-try"
@@ -774,12 +774,12 @@ consoles {
     short_name: "f"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-gcc-linux"
     category: "vm|misc"
     short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msvc-windows"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-msvc-windows"
     category: "vm|misc"
     short_name: "m"
   }
@@ -1555,12 +1555,12 @@ consoles {
     short_name: "f"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-gcc-linux"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-gcc-linux"
     category: "vm|misc"
     short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-msvc-windows"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-msvc-windows"
     category: "vm|misc"
     short_name: "m"
   }
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 9e126d9b5b9f..eb7ae098f194 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -867,17 +867,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-checked-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -887,7 +876,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-gcc-linux"
+    name: "vm-gcc-linux"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -898,7 +887,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-linux-debug-x64"
+    name: "vm-kernel-checked-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -909,20 +898,18 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-linux-release-x64"
+    name: "vm-kernel-linux-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-msvc-windows"
+    name: "vm-kernel-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1162,6 +1149,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-msvc-windows"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 3c13a5108ca3..3349b86d8088 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1895,53 +1895,53 @@ job {
   }
 }
 job {
-  id: "vm-kernel-checked-linux-release-x64"
+  id: "vm-gcc-linux"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-checked-linux-release-x64"
+    builder: "vm-gcc-linux"
   }
 }
 job {
-  id: "vm-kernel-checked-linux-release-x64-beta"
+  id: "vm-kernel-checked-linux-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-checked-linux-release-x64-beta"
+    builder: "vm-kernel-checked-linux-release-x64"
   }
 }
 job {
-  id: "vm-kernel-checked-linux-release-x64-dev"
+  id: "vm-kernel-checked-linux-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-checked-linux-release-x64-dev"
+    builder: "vm-kernel-checked-linux-release-x64-beta"
   }
 }
 job {
-  id: "vm-kernel-checked-linux-release-x64-stable"
+  id: "vm-kernel-checked-linux-release-x64-dev"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-checked-linux-release-x64-stable"
+    builder: "vm-kernel-checked-linux-release-x64-dev"
   }
 }
 job {
-  id: "vm-kernel-gcc-linux"
+  id: "vm-kernel-checked-linux-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-kernel-gcc-linux"
+    builder: "vm-kernel-checked-linux-release-x64-stable"
   }
 }
 job {
@@ -1964,16 +1964,6 @@ job {
     builder: "vm-kernel-linux-release-x64"
   }
 }
-job {
-  id: "vm-kernel-msvc-windows"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-msvc-windows"
-  }
-}
 job {
   id: "vm-kernel-precomp-dwarf-linux-product-x64"
   realm: "ci.sandbox"
@@ -2504,6 +2494,16 @@ job {
     builder: "vm-msan-linux-release-x64"
   }
 }
+job {
+  id: "vm-msvc-windows"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-msvc-windows"
+  }
+}
 job {
   id: "vm-precomp-ffi-qemu-linux-release-arm"
   realm: "ci.sandbox"
@@ -3037,8 +3037,7 @@ trigger {
   triggers: "vm-appjit-linux-product-x64"
   triggers: "vm-asan-linux-release-x64"
   triggers: "vm-eager-optimization-linux-release-ia32"
-  triggers: "vm-kernel-gcc-linux"
-  triggers: "vm-kernel-msvc-windows"
+  triggers: "vm-gcc-linux"
   triggers: "vm-kernel-precomp-dwarf-linux-product-x64"
   triggers: "vm-kernel-win-debug-ia32"
   triggers: "vm-linux-debug-ia32"
@@ -3047,6 +3046,7 @@ trigger {
   triggers: "vm-linux-release-ia32"
   triggers: "vm-mac-debug-arm64"
   triggers: "vm-msan-linux-release-x64"
+  triggers: "vm-msvc-windows"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
   triggers: "vm-reload-linux-debug-x64"
   triggers: "vm-reload-linux-release-x64"
diff --git a/vm.star b/vm.star
index da32885530c4..47156308baa6 100644
--- a/vm.star
+++ b/vm.star
@@ -367,7 +367,7 @@ _low_priority_builder("vm-fuchsia-release-x64", category = "vm|misc|f")
 
 # Our sysroot does not support gcc, we can't use goma on RBE for this builder
 _nightly_builder(
-    "vm-kernel-gcc-linux",
+    "vm-gcc-linux",
     category = "vm|misc|g",
     channels = ["try"],
     execution_timeout = 5 * time.hour,
@@ -380,7 +380,7 @@ _nightly_builder(
 )
 
 _nightly_builder(
-    "vm-kernel-msvc-windows",
+    "vm-msvc-windows",
     category = "vm|misc|m",
     channels = ["try"],
     dimensions = windows,

From b9f7e01a81ced701a10747cfd4fec73b84908e4d Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Thu, 6 Apr 2023 20:03:35 +0000
Subject: [PATCH 639/826] [infra] Mark debug AOT builders with slow_shards.

Change-Id: I562c0076452d72ea82628f0d6ddb27b68e81221c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/294120
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/cr-buildbucket.cfg | 12 ++++++++----
 vm.star                      |  2 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 13be3d75e63e..39709baa629c 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5421,7 +5421,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 70
       build_numbers: YES
@@ -6319,7 +6320,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 70
       build_numbers: YES
@@ -13916,7 +13918,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -14330,7 +14333,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
diff --git a/vm.star b/vm.star
index 47156308baa6..b48976fa042f 100644
--- a/vm.star
+++ b/vm.star
@@ -349,6 +349,7 @@ _nightly_builder(
     "vm-aot-linux-debug-x64c",
     category = "vm|misc|compressed|al",
     channels = ["try"],
+    properties = slow_shards,
 )
 _nightly_builder(
     "vm-win-debug-x64c",
@@ -361,6 +362,7 @@ _nightly_builder(
     category = "vm|misc|compressed|aw",
     channels = ["try"],
     dimensions = windows,
+    properties = slow_shards,
 )
 _low_priority_builder("vm-fuchsia-release-arm64", category = "vm|misc|f")
 _low_priority_builder("vm-fuchsia-release-x64", category = "vm|misc|f")

From 8c9c05f90ef07a4eee63377e1b2d131ef27bf69b Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Wed, 12 Apr 2023 19:31:51 +0000
Subject: [PATCH 640/826] [infra] Move VM CQ to Mac ARM64.

The CQ load is almost all on Linux X64: analyzer, dart2js, ddc, front_end, pkg, vm. The Linux X64 pool is usually busy for the entire West Coast work day, while the Mac pool usually catches up.

Change-Id: If7ae77d59775bf9c0a112c926c664951e31ccd1d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/291966
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/commit-queue.cfg   | 148 +++++++++++++++++++----------------
 generated/cr-buildbucket.cfg | 134 ++++++++++++++++++++++++++++++-
 generated/luci-milo.cfg      |  15 ++++
 generated/luci-notify.cfg    |   4 +-
 generated/luci-scheduler.cfg |  37 ++++++++-
 vm.star                      |   9 +--
 6 files changed, 268 insertions(+), 79 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 5eb907ede4d7..03732c0e9fd8 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -839,6 +839,22 @@ config_groups {
       }
       builders {
         name: "dart/try/vm-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-linux-release-simarm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-linux-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-mac-debug-arm64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -911,15 +927,11 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/vm-linux-release-simarm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-linux-release-simarm64-try"
+        name: "dart/try/vm-mac-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-linux-release-x64-try"
+        name: "dart/try/vm-mac-release-arm64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -991,14 +1003,6 @@ config_groups {
           path_regexp: "sdk/lib/_internal/vm.+"
         }
       }
-      builders {
-        name: "dart/try/vm-mac-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-mac-release-arm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-mac-release-x64-try"
         includable_only: true
@@ -1723,6 +1727,22 @@ config_groups {
       }
       builders {
         name: "dart/try/vm-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-linux-release-simarm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-linux-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-mac-debug-arm64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1795,15 +1815,11 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/vm-linux-release-simarm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-linux-release-simarm64-try"
+        name: "dart/try/vm-mac-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-linux-release-x64-try"
+        name: "dart/try/vm-mac-release-arm64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1875,14 +1891,6 @@ config_groups {
           path_regexp: "sdk/lib/_internal/vm.+"
         }
       }
-      builders {
-        name: "dart/try/vm-mac-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-mac-release-arm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-mac-release-x64-try"
         includable_only: true
@@ -3103,6 +3111,30 @@ config_groups {
       }
       builders {
         name: "dart/try/vm-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-linux-debug-x64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-linux-release-ia32-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-linux-release-simarm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-linux-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-mac-debug-arm64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3175,23 +3207,11 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/vm-linux-debug-x64c-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-linux-release-ia32-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-linux-release-simarm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-linux-release-simarm64-try"
+        name: "dart/try/vm-mac-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-linux-release-x64-try"
+        name: "dart/try/vm-mac-release-arm64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3263,18 +3283,6 @@ config_groups {
           path_regexp: "sdk/lib/_internal/vm.+"
         }
       }
-      builders {
-        name: "dart/try/vm-mac-debug-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-mac-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-mac-release-arm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-mac-release-x64-try"
         includable_only: true
@@ -4039,6 +4047,22 @@ config_groups {
       }
       builders {
         name: "dart/try/vm-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-linux-release-simarm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-linux-release-simarm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-mac-debug-arm64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -4111,15 +4135,11 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/vm-linux-release-simarm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-linux-release-simarm64-try"
+        name: "dart/try/vm-mac-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-linux-release-x64-try"
+        name: "dart/try/vm-mac-release-arm64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -4191,14 +4211,6 @@ config_groups {
           path_regexp: "sdk/lib/_internal/vm.+"
         }
       }
-      builders {
-        name: "dart/try/vm-mac-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-mac-release-arm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-mac-release-x64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 39709baa629c..5b7d4a2c417c 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -9595,7 +9595,139 @@ buckets {
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-mac-debug-arm64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-mac-debug-arm64-dev"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-mac-debug-arm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 50
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 87b0d536a919..b2863043e763 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -1775,6 +1775,11 @@ consoles {
     category: "vm|jit"
     short_name: "ra6"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-arm64-dev"
+    category: "vm|jit"
+    short_name: "m1d"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64-dev"
     category: "vm|jit"
@@ -2131,6 +2136,11 @@ consoles {
     category: "vm|jit"
     short_name: "ra6"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-arm64-beta"
+    category: "vm|jit"
+    short_name: "m1d"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64-beta"
     category: "vm|jit"
@@ -2482,6 +2492,11 @@ consoles {
     category: "vm|jit"
     short_name: "ra6"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-arm64-stable"
+    category: "vm|jit"
+    short_name: "m1d"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64-stable"
     category: "vm|jit"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index eb7ae098f194..262b21cf2564 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -1093,9 +1093,7 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 3349b86d8088..ec86b6f4dac5 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -2364,6 +2364,36 @@ job {
     builder: "vm-mac-debug-arm64"
   }
 }
+job {
+  id: "vm-mac-debug-arm64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-mac-debug-arm64-beta"
+  }
+}
+job {
+  id: "vm-mac-debug-arm64-dev"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-mac-debug-arm64-dev"
+  }
+}
+job {
+  id: "vm-mac-debug-arm64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-mac-debug-arm64-stable"
+  }
+}
 job {
   id: "vm-mac-debug-x64"
   realm: "ci.sandbox"
@@ -2813,6 +2843,7 @@ trigger {
   triggers: "vm-linux-release-simarm-beta"
   triggers: "vm-linux-release-simarm64-beta"
   triggers: "vm-linux-release-x64-beta"
+  triggers: "vm-mac-debug-arm64-beta"
   triggers: "vm-mac-debug-x64-beta"
   triggers: "vm-mac-release-arm64-beta"
   triggers: "vm-mac-release-x64-beta"
@@ -2874,6 +2905,7 @@ trigger {
   triggers: "vm-linux-release-simarm-dev"
   triggers: "vm-linux-release-simarm64-dev"
   triggers: "vm-linux-release-x64-dev"
+  triggers: "vm-mac-debug-arm64-dev"
   triggers: "vm-mac-debug-x64-dev"
   triggers: "vm-mac-release-arm64-dev"
   triggers: "vm-mac-release-x64-dev"
@@ -2935,7 +2967,6 @@ trigger {
   triggers: "pkg-mac-release-arm64"
   triggers: "pkg-win-release"
   triggers: "vm-mac-debug-x64"
-  triggers: "vm-mac-release-arm64"
   triggers: "vm-mac-release-x64"
   triggers: "vm-win-debug-x64"
   triggers: "vm-win-release-x64"
@@ -3002,6 +3033,7 @@ trigger {
   triggers: "vm-linux-release-simarm-stable"
   triggers: "vm-linux-release-simarm64-stable"
   triggers: "vm-linux-release-x64-stable"
+  triggers: "vm-mac-debug-arm64-stable"
   triggers: "vm-mac-debug-x64-stable"
   triggers: "vm-mac-release-arm64-stable"
   triggers: "vm-mac-release-x64-stable"
@@ -3044,7 +3076,6 @@ trigger {
   triggers: "vm-linux-debug-simriscv64"
   triggers: "vm-linux-debug-x64c"
   triggers: "vm-linux-release-ia32"
-  triggers: "vm-mac-debug-arm64"
   triggers: "vm-msan-linux-release-x64"
   triggers: "vm-msvc-windows"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
@@ -3097,6 +3128,8 @@ trigger {
   triggers: "vm-linux-release-simarm"
   triggers: "vm-linux-release-simarm64"
   triggers: "vm-linux-release-x64"
+  triggers: "vm-mac-debug-arm64"
+  triggers: "vm-mac-release-arm64"
   triggers: "vm-precomp-ffi-qemu-linux-release-arm"
   triggers: "vm-precomp-ffi-qemu-linux-release-riscv64"
   gitiles {
diff --git a/vm.star b/vm.star
index b48976fa042f..98c270fb4d8d 100644
--- a/vm.star
+++ b/vm.star
@@ -85,12 +85,10 @@ def add_postponed_alt_console_entries():
 _extra_builder(
     "vm-linux-debug-x64",
     category = "vm|jit|d",
-    on_cq = True,
 )
 _extra_builder(
     "vm-linux-release-x64",
     category = "vm|jit|r",
-    on_cq = True,
 )
 _nightly_builder(
     "vm-linux-debug-ia32",
@@ -123,12 +121,12 @@ _extra_builder(
     execution_timeout = 4 * time.hour,
     properties = {"shard_timeout": (120 * time.minute) // time.second},
 )
-_nightly_builder(
+_extra_builder(
     "vm-mac-debug-arm64",
     category = "vm|jit|m1d",
-    channels = ["try"],
     dimensions = [mac, arm64],
     properties = [no_android, slow_shards],
+    on_cq = True,
 )
 _builder(
     "vm-mac-debug-x64",
@@ -136,11 +134,12 @@ _builder(
     dimensions = mac,
     properties = slow_shards,
 )
-_builder(
+_extra_builder(
     "vm-mac-release-arm64",
     category = "vm|jit|m1r",
     dimensions = [mac, arm64],
     properties = no_android,
+    on_cq = True,
 )
 _builder(
     "vm-mac-release-x64",

From 66bd88203d5c6c3b6cb355d840e58d344cef7079 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 18 Apr 2023 19:50:57 +0000
Subject: [PATCH 641/826] [infra] Update GCC bot to Focal.

Might fix https://github.com/dart-lang/sdk/issues/52080.

Change-Id: Ib68a0947758a7e00c90c176ee95882230e994820
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/295921
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/cr-buildbucket.cfg | 4 ++--
 generated/project.cfg        | 2 +-
 vm.star                      | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 5b7d4a2c417c..637999d3933b 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -7892,7 +7892,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -15059,7 +15059,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
diff --git a/generated/project.cfg b/generated/project.cfg
index e5d934faf5e1..0bbc9d405147 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.39.2"
+  version: "1.39.4"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/vm.star b/vm.star
index 98c270fb4d8d..4b789c8e3516 100644
--- a/vm.star
+++ b/vm.star
@@ -371,6 +371,7 @@ _nightly_builder(
     "vm-gcc-linux",
     category = "vm|misc|g",
     channels = ["try"],
+    dimensions = focal,
     execution_timeout = 5 * time.hour,
     goma = False,
     properties = {

From 9ed6f4f4620e708f1d592c9337ecf7d61905a23b Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 19 Apr 2023 09:19:49 +0000
Subject: [PATCH 642/826] [infra] Stop running tests on the dev channel

This testing consumes ~15% of our overall capacity and doesn't provide
much value:
* dev only differs from main in the version number.
* dev results are not being triaged by anyone.

Change-Id: I9e6d6f02fb7e1eaae6b0f6c0ed98954ce303adb7
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/296200
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 generated/commit-queue.cfg   |  801 +-------
 generated/cr-buildbucket.cfg | 3554 +++++++---------------------------
 generated/luci-milo.cfg      |  270 ---
 generated/luci-scheduler.cfg |  594 ------
 generated/project.cfg        |    2 +-
 lib/dart.star                |    2 +-
 6 files changed, 752 insertions(+), 4471 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 03732c0e9fd8..9cb95c141192 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -1050,120 +1050,6 @@ config_groups {
         name: "dart/try.shared/presubmit-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/analyzer-analysis-server-linux-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/.+"
-        }
-      }
-      builders {
-        name: "dart/try/analyzer-linux-release-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/.+"
-        }
-      }
-      builders {
-        name: "dart/try/analyzer-mac-release-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/analyzer-win-release-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/benchmark-linux-try"
       }
@@ -1219,696 +1105,15 @@ config_groups {
         name: "dart/try/dart-sdk-win-try"
       }
       builders {
-        name: "dart/try/dart2js-linux-chrome-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/js.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "utils/compiler/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
-        }
-      }
-      builders {
-        name: "dart/try/dart2js-linux-firefox-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-mac-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-mac-safari-try"
+        name: "dart/try/dev-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/dart2js-minified-csp-linux-chrome-try"
+        name: "dart/try/monorepo-roller-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/dart2js-minified-linux-d8-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/js.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "utils/compiler/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
-        }
-      }
-      builders {
-        name: "dart/try/dart2js-unit-linux-x64-release-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/js.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "utils/compiler/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
-        }
-      }
-      builders {
-        name: "dart/try/dart2js-win-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/ddc-linux-chrome-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/js.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(build_integration|dev_compiler|meta)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "utils/dartdevc/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
-        }
-      }
-      builders {
-        name: "dart/try/ddc-mac-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/ddc-win-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dev-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/front-end-linux-release-x64-try"
-      }
-      builders {
-        name: "dart/try/front-end-nnbd-linux-release-x64-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-      }
-      builders {
-        name: "dart/try/gclient-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/monorepo-roller-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/pkg-linux-release-try"
-      }
-      builders {
-        name: "dart/try/pkg-mac-release-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/pkg-win-release-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/stable-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-aot-android-release-arm64c-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-aot-android-release-arm_x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-aot-linux-debug-simarm_x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-aot-linux-release-simarm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-aot-linux-release-simarm_x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-aot-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-aot-mac-release-simarm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-aot-win-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-appjit-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-appjit-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-ffi-android-debug-arm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-ffi-android-debug-arm64c-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-ffi-android-product-arm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-ffi-android-product-arm64c-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-ffi-android-release-arm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-ffi-android-release-arm64c-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-checked-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-linux-release-simarm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-linux-release-simarm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-mac-debug-arm64-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/vm/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "runtime/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_http/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm.+"
-        }
-      }
-      builders {
-        name: "dart/try/vm-mac-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-mac-release-arm64-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/vm/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "runtime/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_http/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm.+"
-        }
-      }
-      builders {
-        name: "dart/try/vm-mac-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-precomp-ffi-qemu-linux-release-arm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-win-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-win-release-x64-try"
+        name: "dart/try/stable-try"
         includable_only: true
       }
       retry_config {}
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 637999d3933b..59050705b69c 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -122,42 +122,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "analyzer-analysis-server-linux-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "analyzer-analysis-server-linux-stable"
       swarming_host: "chromium-swarm.appspot.com"
@@ -266,42 +230,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "analyzer-linux-release-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "analyzer-linux-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
@@ -418,46 +346,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "analyzer-mac-release-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "analyzer-mac-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
@@ -578,46 +466,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "analyzer-win-release-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "analyzer-win-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
@@ -895,7 +743,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-linux-chrome-dev"
+      name: "dart2js-linux-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -935,7 +783,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-linux-chrome-stable"
+      name: "dart2js-linux-firefox"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -962,7 +810,7 @@ buckets {
         '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -975,7 +823,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-linux-firefox"
+      name: "dart2js-linux-firefox-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1015,7 +863,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-linux-firefox-beta"
+      name: "dart2js-linux-firefox-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1055,11 +903,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-linux-firefox-dev"
+      name: "dart2js-mac-chrome"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1069,7 +917,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -1082,11 +930,15 @@ buckets {
         '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
-        '    "download_firefox": true'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1095,11 +947,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-linux-firefox-stable"
+      name: "dart2js-mac-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1109,7 +961,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -1122,11 +974,15 @@ buckets {
         '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
-        '    "download_firefox": true'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1135,7 +991,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-mac-chrome"
+      name: "dart2js-mac-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
@@ -1179,7 +1035,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-mac-chrome-beta"
+      name: "dart2js-mac-safari"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
@@ -1205,8 +1061,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -1223,7 +1078,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-mac-chrome-dev"
+      name: "dart2js-mac-safari-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
@@ -1249,8 +1104,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -1267,7 +1121,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-mac-chrome-stable"
+      name: "dart2js-mac-safari-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
@@ -1293,8 +1147,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -1311,11 +1164,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-mac-safari"
+      name: "dart2js-minified-csp-linux-chrome"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1325,7 +1178,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -1337,15 +1190,12 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1354,11 +1204,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-mac-safari-beta"
+      name: "dart2js-minified-csp-linux-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1368,7 +1218,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -1380,15 +1230,12 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1397,11 +1244,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-mac-safari-dev"
+      name: "dart2js-minified-csp-linux-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1411,7 +1258,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -1423,15 +1270,12 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1440,11 +1284,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-mac-safari-stable"
+      name: "dart2js-minified-linux-d8"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1454,7 +1298,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -1471,10 +1315,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1483,7 +1323,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-minified-csp-linux-chrome"
+      name: "dart2js-minified-linux-d8-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1509,8 +1349,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -1523,7 +1362,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-minified-csp-linux-chrome-beta"
+      name: "dart2js-minified-linux-d8-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1549,8 +1388,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -1563,7 +1401,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-minified-csp-linux-chrome-dev"
+      name: "dart2js-unit-linux-x64-release"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1589,8 +1427,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -1603,7 +1440,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-minified-csp-linux-chrome-stable"
+      name: "dart2js-unit-linux-x64-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1629,8 +1466,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_android_deps": false'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -1643,7 +1479,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-minified-linux-d8"
+      name: "dart2js-unit-linux-x64-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1682,11 +1518,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-minified-linux-d8-beta"
+      name: "dart2js-win-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1696,7 +1532,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -1708,7 +1544,8 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -1721,11 +1558,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-minified-linux-d8-dev"
+      name: "dart2js-win-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1735,7 +1572,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -1747,7 +1584,8 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -1760,11 +1598,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-minified-linux-d8-stable"
+      name: "dart2js-win-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1774,7 +1612,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -1786,7 +1624,8 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -1799,11 +1638,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-unit-linux-x64-release"
+      name: "dart2js-win-firefox"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1813,7 +1652,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -1825,7 +1664,8 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_android_deps": false,'
+        '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -1838,7 +1678,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-unit-linux-x64-release-beta"
+      name: "dart2wasm-linux-x64-d8"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1864,7 +1704,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_emscripten": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -1877,7 +1717,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-unit-linux-x64-release-dev"
+      name: "ddc-canary-linux-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1903,11 +1743,12 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1916,7 +1757,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-unit-linux-x64-release-stable"
+      name: "ddc-linux-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -1942,7 +1783,8 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -1955,11 +1797,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-win-chrome"
+      name: "ddc-linux-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1969,7 +1811,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -1995,11 +1837,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-win-chrome-beta"
+      name: "ddc-linux-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2009,7 +1851,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2035,11 +1877,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-win-chrome-dev"
+      name: "ddc-linux-chrome-unsound"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2049,7 +1891,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2075,11 +1917,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-win-chrome-stable"
+      name: "ddc-linux-firefox"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2089,7 +1931,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2102,7 +1944,7 @@ buckets {
         '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -2115,11 +1957,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-win-firefox"
+      name: "ddc-mac-chrome"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2142,11 +1984,15 @@ buckets {
         '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
-        '    "download_firefox": true'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2155,11 +2001,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2wasm-linux-x64-d8"
+      name: "ddc-mac-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2169,7 +2015,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2181,11 +2027,16 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_emscripten": true'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2194,11 +2045,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-canary-linux-chrome"
+      name: "ddc-mac-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2208,7 +2059,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2225,7 +2076,11 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2234,11 +2089,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-linux-chrome"
+      name: "ddc-win-chrome"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2248,7 +2103,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2274,11 +2129,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-linux-chrome-beta"
+      name: "ddc-win-chrome-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2288,7 +2143,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2314,11 +2169,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-linux-chrome-dev"
+      name: "ddc-win-chrome-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2328,7 +2183,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2354,7 +2209,7 @@ buckets {
       }
     }
     builders {
-      name: "ddc-linux-chrome-stable"
+      name: "flutter-analyze"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -2379,13 +2234,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      execution_timeout_secs: 2700
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2394,14 +2246,14 @@ buckets {
       }
     }
     builders {
-      name: "ddc-linux-chrome-unsound"
+      name: "flutter-android-debug"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -2419,13 +2271,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2434,14 +2283,14 @@ buckets {
       }
     }
     builders {
-      name: "ddc-linux-firefox"
+      name: "flutter-android-profile"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -2459,13 +2308,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_firefox": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2474,11 +2320,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-mac-chrome"
+      name: "flutter-engine-linux"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2488,7 +2334,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2498,18 +2344,19 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "flutter_test_suites": ['
+        '    "add_to_app_life_cycle_tests",'
+        '    "flutter_plugins",'
+        '    "framework_coverage",'
+        '    "framework_tests",'
+        '    "tool_tests"'
+        '  ],'
+        '  "recipe": "dart/flutter_engine"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      execution_timeout_secs: 28800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2518,11 +2365,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-mac-chrome-beta"
+      name: "flutter-frontend"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2532,7 +2379,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2543,17 +2390,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2562,24 +2401,27 @@ buckets {
       }
     }
     builders {
-      name: "ddc-mac-chrome-dev"
+      name: "flutter-linux"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$flutter/goma": {'
+        '    "server": "goma.chromium.org"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2587,17 +2429,13 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "config_name": "host_linux",'
+        '  "environment": "unused",'
+        '  "goma_jobs": "200",'
+        '  "recipe": "engine_v2/engine_v2"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      execution_timeout_secs: 7200
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2606,65 +2444,21 @@ buckets {
       }
     }
     builders {
-      name: "ddc-mac-chrome-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "ddc-win-chrome"
+      name: "flutter-linux-debug"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2675,13 +2469,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2690,21 +2481,21 @@ buckets {
       }
     }
     builders {
-      name: "ddc-win-chrome-beta"
+      name: "flutter-linux-debug-unopt"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2715,13 +2506,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2730,21 +2518,21 @@ buckets {
       }
     }
     builders {
-      name: "ddc-win-chrome-dev"
+      name: "flutter-linux-profile"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2755,13 +2543,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2770,21 +2555,21 @@ buckets {
       }
     }
     builders {
-      name: "ddc-win-chrome-stable"
+      name: "flutter-linux-release"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -2795,13 +2580,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2810,14 +2592,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-analyze"
+      name: "flutter-linux-web-tests-0"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -2835,10 +2617,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
-      execution_timeout_secs: 2700
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2847,7 +2629,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-android-debug"
+      name: "flutter-linux-web-tests-1"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -2872,10 +2654,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
-      execution_timeout_secs: 3600
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2884,7 +2666,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-android-profile"
+      name: "flutter-linux-web-tests-2"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -2909,10 +2691,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
-      execution_timeout_secs: 3600
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2921,14 +2703,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-engine-linux"
+      name: "flutter-linux-web-tests-3"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -2945,19 +2727,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "flutter_test_suites": ['
-        '    "add_to_app_life_cycle_tests",'
-        '    "flutter_plugins",'
-        '    "framework_coverage",'
-        '    "framework_tests",'
-        '    "tool_tests"'
-        '  ],'
-        '  "recipe": "dart/flutter_engine"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
-      execution_timeout_secs: 28800
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2966,14 +2740,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-frontend"
+      name: "flutter-linux-web-tests-4"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -2991,9 +2765,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3002,12 +2777,12 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux"
+      name: "flutter-linux-web-tests-5"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
@@ -3020,9 +2795,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$flutter/goma": {'
-        '    "server": "goma.chromium.org"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3030,13 +2802,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "config_name": "host_linux",'
-        '  "environment": "unused",'
-        '  "goma_jobs": "200",'
-        '  "recipe": "engine_v2/engine_v2"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
-      execution_timeout_secs: 7200
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3045,7 +2814,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-debug"
+      name: "flutter-linux-web-tests-6"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -3070,10 +2839,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
-      execution_timeout_secs: 3600
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3082,7 +2851,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-debug-unopt"
+      name: "flutter-linux-web-tests-7-last"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -3107,10 +2876,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
-      execution_timeout_secs: 3600
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3119,7 +2888,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-profile"
+      name: "flutter-linux-web-tool-tests"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -3144,10 +2913,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
-      execution_timeout_secs: 3600
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3156,7 +2925,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-release"
+      name: "flutter-wasm-release"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -3193,14 +2962,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-0"
+      name: "front-end-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -3218,10 +2987,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3230,14 +2998,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-1"
+      name: "front-end-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -3255,10 +3023,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3267,14 +3034,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-2"
+      name: "front-end-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -3292,10 +3059,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3304,14 +3070,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-3"
+      name: "front-end-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -3329,10 +3095,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3341,14 +3106,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-4"
+      name: "front-end-nnbd-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -3366,10 +3131,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3378,14 +3142,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-5"
+      name: "front-end-nnbd-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -3403,10 +3167,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3415,1733 +3178,11 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-6"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 5400
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "flutter-linux-web-tests-7-last"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 5400
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "flutter-linux-web-tool-tests"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 5400
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "flutter-wasm-release"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 3600
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-nnbd-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-nnbd-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-nnbd-linux-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-nnbd-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-nnbd-mac-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-nnbd-win-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "frontend-weekly"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      execution_timeout_secs: 43200
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "fuzz-linux"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "gclient"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/gclient"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "gclient-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/gclient"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "gclient-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/gclient"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "gclient-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/gclient"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "google"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/external"'
-        '}'
-      priority: 20
-      execution_timeout_secs: 300
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "iso-stress-linux"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-linux-debug"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-linux-release"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-linux-release-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-linux-release-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-linux-release-experimental"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:experimental"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-linux-release-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-mac-release"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-mac-release-arm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-mac-release-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-mac-release-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-mac-release-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-win-release"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-win-release-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-win-release-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "pkg-win-release-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-aot-android-release-arm64c"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-aot-android-release-arm64c-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-aot-android-release-arm64c-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-aot-android-release-arm64c-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-aot-android-release-arm_x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-aot-android-release-arm_x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-aot-android-release-arm_x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-aot-android-release-arm_x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-aot-asan-linux-release-x64"
+      name: "front-end-nnbd-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5151,7 +3192,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5161,11 +3202,14 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5174,11 +3218,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-debug-simarm_x64"
+      name: "front-end-nnbd-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5188,7 +3232,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5199,10 +3243,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5211,7 +3254,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-debug-simarm_x64-beta"
+      name: "frontend-weekly"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5236,10 +3279,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      execution_timeout_secs: 43200
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5248,7 +3291,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-debug-simarm_x64-dev"
+      name: "fuzz-linux"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5273,8 +3316,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -5285,7 +3327,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-debug-simarm_x64-stable"
+      name: "gclient"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5310,8 +3352,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/gclient"'
         '}'
       priority: 50
       build_numbers: YES
@@ -5322,7 +3363,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-debug-simriscv64"
+      name: "gclient-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5347,10 +3388,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/gclient"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5359,7 +3399,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-debug-x64"
+      name: "gclient-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5384,10 +3424,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/gclient"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5396,7 +3435,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-debug-x64c"
+      name: "google"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5421,10 +3460,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/external"'
         '}'
-      priority: 70
+      priority: 20
+      execution_timeout_secs: 300
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5433,7 +3472,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-product-x64"
+      name: "iso-stress-linux"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5458,9 +3497,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5469,7 +3509,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-release-arm64"
+      name: "pkg-linux-debug"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5494,10 +3534,12 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 7200'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5506,7 +3548,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-release-simarm64"
+      name: "pkg-linux-release"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5531,6 +3573,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5542,7 +3587,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-release-simarm64-beta"
+      name: "pkg-linux-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5567,6 +3612,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5578,10 +3626,10 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-release-simarm64-dev"
+      name: "pkg-linux-release-experimental"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
+      dimensions: "host_class:experimental"
       dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
@@ -5605,7 +3653,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5614,7 +3662,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-release-simarm64-stable"
+      name: "pkg-linux-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5639,6 +3687,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5650,11 +3701,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-release-simarm_x64"
+      name: "pkg-mac-release"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5664,7 +3715,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5675,9 +3726,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5686,11 +3744,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-release-simarm_x64-beta"
+      name: "pkg-mac-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5700,7 +3758,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5711,22 +3769,34 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-aot-linux-release-simarm_x64-dev"
+      name: "pkg-mac-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5736,7 +3806,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5747,9 +3817,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5758,11 +3835,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-release-simarm_x64-stable"
+      name: "pkg-mac-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5772,7 +3849,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5783,9 +3860,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5794,11 +3878,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-release-x64"
+      name: "pkg-win-release"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5808,7 +3892,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5819,22 +3903,29 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-aot-linux-release-x64-beta"
+      name: "pkg-win-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5844,7 +3935,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5855,22 +3946,29 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-aot-linux-release-x64-dev"
+      name: "pkg-win-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5880,7 +3978,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5891,18 +3989,25 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-aot-linux-release-x64-stable"
+      name: "vm-aot-android-release-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5927,7 +4032,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -5938,11 +4044,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-mac-product-x64"
+      name: "vm-aot-android-release-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5952,7 +4058,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5963,13 +4069,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5978,11 +4081,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-mac-release-arm64"
+      name: "vm-aot-android-release-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5992,7 +4095,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6003,17 +4106,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6022,11 +4118,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-mac-release-simarm64"
+      name: "vm-aot-android-release-arm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6036,7 +4132,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6051,10 +4147,6 @@ buckets {
         '  "shard_timeout": 5400'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6063,11 +4155,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-mac-release-simarm64-beta"
+      name: "vm-aot-android-release-arm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6077,7 +4169,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6092,10 +4184,6 @@ buckets {
         '  "shard_timeout": 5400'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6104,11 +4192,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-mac-release-simarm64-dev"
+      name: "vm-aot-android-release-arm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6118,7 +4206,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6133,10 +4221,6 @@ buckets {
         '  "shard_timeout": 5400'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6145,11 +4229,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-mac-release-simarm64-stable"
+      name: "vm-aot-asan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6159,7 +4243,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6169,15 +4253,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6186,7 +4266,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-msan-linux-release-x64"
+      name: "vm-aot-linux-debug-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6210,11 +4290,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6223,7 +4303,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-tsan-linux-release-x64"
+      name: "vm-aot-linux-debug-simarm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6247,11 +4327,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6260,7 +4340,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-ubsan-linux-release-x64"
+      name: "vm-aot-linux-debug-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6273,8 +4353,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -6282,11 +4364,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6295,11 +4377,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-win-debug-x64c"
+      name: "vm-aot-linux-debug-simriscv64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6309,7 +4391,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6332,11 +4414,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-win-product-x64"
+      name: "vm-aot-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6346,7 +4428,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6357,7 +4439,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 70
       build_numbers: YES
@@ -6368,11 +4451,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-win-release-x64"
+      name: "vm-aot-linux-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6382,7 +4465,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6393,9 +4476,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6404,11 +4488,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-win-release-x64-beta"
+      name: "vm-aot-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6418,7 +4502,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6431,7 +4515,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6440,11 +4524,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-win-release-x64-dev"
+      name: "vm-aot-linux-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6454,7 +4538,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6465,9 +4549,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 7200'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6476,11 +4561,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-win-release-x64-stable"
+      name: "vm-aot-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6490,7 +4575,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6512,7 +4597,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-debug-x64"
+      name: "vm-aot-linux-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6537,8 +4622,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -6549,7 +4633,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-debug-x64-beta"
+      name: "vm-aot-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6574,8 +4658,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -6586,7 +4669,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-debug-x64-dev"
+      name: "vm-aot-linux-release-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6611,8 +4694,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -6623,7 +4705,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-debug-x64-stable"
+      name: "vm-aot-linux-release-simarm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6648,8 +4730,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -6660,7 +4741,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-product-x64"
+      name: "vm-aot-linux-release-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6687,7 +4768,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6696,7 +4777,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-release-x64"
+      name: "vm-aot-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6732,7 +4813,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-release-x64-beta"
+      name: "vm-aot-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6768,7 +4849,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-release-x64-dev"
+      name: "vm-aot-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6804,11 +4885,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-release-x64-stable"
+      name: "vm-aot-mac-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6818,7 +4899,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6831,7 +4912,11 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6840,11 +4925,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-asan-linux-release-x64"
+      name: "vm-aot-mac-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6854,7 +4939,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6864,11 +4949,18 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6877,11 +4969,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-eager-optimization-linux-release-ia32"
+      name: "vm-aot-mac-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6891,7 +4983,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6902,9 +4994,14 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6913,11 +5010,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-eager-optimization-linux-release-x64"
+      name: "vm-aot-mac-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6927,7 +5024,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6938,10 +5035,14 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
-      expiration_secs: 86400
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6950,11 +5051,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm"
+      name: "vm-aot-mac-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6964,7 +5065,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6975,9 +5076,14 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6986,7 +5092,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm-beta"
+      name: "vm-aot-msan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7010,10 +5116,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7022,7 +5129,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm-dev"
+      name: "vm-aot-tsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7046,10 +5153,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7058,7 +5166,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm-stable"
+      name: "vm-aot-ubsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7071,10 +5179,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -7082,10 +5188,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7094,11 +5201,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c"
+      name: "vm-aot-win-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7108,7 +5215,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -7119,9 +5226,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7130,11 +5238,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c-beta"
+      name: "vm-aot-win-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7144,7 +5252,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -7157,7 +5265,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7166,11 +5274,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c-dev"
+      name: "vm-aot-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7180,7 +5288,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -7202,11 +5310,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c-stable"
+      name: "vm-aot-win-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7216,7 +5324,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -7238,11 +5346,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm"
+      name: "vm-aot-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7252,7 +5360,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -7274,7 +5382,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm-beta"
+      name: "vm-appjit-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7299,7 +5407,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -7310,7 +5419,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm-dev"
+      name: "vm-appjit-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7335,7 +5444,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -7346,7 +5456,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm-stable"
+      name: "vm-appjit-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7371,7 +5481,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -7382,7 +5493,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c"
+      name: "vm-appjit-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7409,7 +5520,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7418,7 +5529,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c-beta"
+      name: "vm-appjit-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7454,7 +5565,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c-dev"
+      name: "vm-appjit-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7490,7 +5601,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c-stable"
+      name: "vm-appjit-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7526,7 +5637,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm"
+      name: "vm-asan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7550,10 +5661,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7562,7 +5674,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm-beta"
+      name: "vm-eager-optimization-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7589,7 +5701,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7598,7 +5710,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm-dev"
+      name: "vm-eager-optimization-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7625,7 +5737,8 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7634,7 +5747,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm-stable"
+      name: "vm-ffi-android-debug-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7670,7 +5783,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c"
+      name: "vm-ffi-android-debug-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7706,7 +5819,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c-beta"
+      name: "vm-ffi-android-debug-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7742,7 +5855,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c-dev"
+      name: "vm-ffi-android-debug-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7778,7 +5891,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c-stable"
+      name: "vm-ffi-android-debug-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7814,7 +5927,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-fuchsia-release-arm64"
+      name: "vm-ffi-android-debug-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7841,8 +5954,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      expiration_secs: 86400
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7851,7 +5963,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-fuchsia-release-x64"
+      name: "vm-ffi-android-product-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7878,8 +5990,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      expiration_secs: 86400
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7888,11 +5999,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-gcc-linux"
+      name: "vm-ffi-android-product-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7901,9 +6012,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true,'
-        '    "timeout": 4500'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -7914,8 +6026,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      execution_timeout_secs: 18000
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7924,7 +6035,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64"
+      name: "vm-ffi-android-product-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7954,17 +6065,13 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-beta"
+      name: "vm-ffi-android-product-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7994,17 +6101,13 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-dev"
+      name: "vm-ffi-android-product-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8034,17 +6137,13 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-stable"
+      name: "vm-ffi-android-product-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8074,17 +6173,13 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64"
+      name: "vm-ffi-android-release-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8120,7 +6215,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-x64"
+      name: "vm-ffi-android-release-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8156,7 +6251,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-dwarf-linux-product-x64"
+      name: "vm-ffi-android-release-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8183,7 +6278,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8192,7 +6287,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64"
+      name: "vm-ffi-android-release-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8228,7 +6323,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-beta"
+      name: "vm-ffi-android-release-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8264,7 +6359,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-dev"
+      name: "vm-ffi-android-release-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8300,7 +6395,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-stable"
+      name: "vm-fuchsia-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8327,7 +6422,8 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8336,7 +6432,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm"
+      name: "vm-fuchsia-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8363,7 +6459,8 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8372,11 +6469,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-beta"
+      name: "vm-gcc-linux"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8385,10 +6482,9 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true,'
+        '    "timeout": 4500'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -8399,7 +6495,8 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      execution_timeout_secs: 18000
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8408,7 +6505,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-dev"
+      name: "vm-kernel-checked-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8438,13 +6535,17 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-stable"
+      name: "vm-kernel-checked-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8474,13 +6575,17 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64"
+      name: "vm-kernel-checked-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8510,13 +6615,17 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64-beta"
+      name: "vm-kernel-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8552,7 +6661,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64-dev"
+      name: "vm-kernel-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8588,7 +6697,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64-stable"
+      name: "vm-kernel-precomp-dwarf-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8615,7 +6724,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8624,7 +6733,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64"
+      name: "vm-kernel-precomp-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8660,7 +6769,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
+      name: "vm-kernel-precomp-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8696,7 +6805,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
+      name: "vm-kernel-precomp-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8732,7 +6841,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
+      name: "vm-kernel-precomp-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8768,11 +6877,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-ia32"
+      name: "vm-kernel-precomp-linux-release-simarm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8782,7 +6891,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8793,10 +6902,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8805,7 +6913,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-ia32"
+      name: "vm-kernel-precomp-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8830,10 +6938,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8842,7 +6949,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-simriscv64"
+      name: "vm-kernel-precomp-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8869,7 +6976,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8878,7 +6985,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-x64"
+      name: "vm-kernel-precomp-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8914,7 +7021,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-x64-beta"
+      name: "vm-kernel-precomp-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8950,7 +7057,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-x64-dev"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8986,7 +7093,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-x64-stable"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9022,7 +7129,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-x64c"
+      name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9049,7 +7156,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9058,11 +7165,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-arm64"
+      name: "vm-kernel-win-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9072,7 +7179,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9084,10 +7191,9 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "recipe": "dart/neo",'
-        '  "shard_timeout": 7200'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 50
-      execution_timeout_secs: 14400
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9096,7 +7202,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-ia32"
+      name: "vm-linux-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9121,7 +7227,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 70
       build_numbers: YES
@@ -9132,7 +7239,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-simarm"
+      name: "vm-linux-debug-simriscv64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9159,7 +7266,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9168,7 +7275,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-simarm-beta"
+      name: "vm-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9204,7 +7311,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-simarm-dev"
+      name: "vm-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9240,7 +7347,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-simarm-stable"
+      name: "vm-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9276,7 +7383,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-simarm64"
+      name: "vm-linux-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9303,7 +7410,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9312,7 +7419,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-simarm64-beta"
+      name: "vm-linux-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9337,9 +7444,11 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 7200'
         '}'
       priority: 50
+      execution_timeout_secs: 14400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9348,7 +7457,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-simarm64-dev"
+      name: "vm-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9375,7 +7484,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9384,7 +7493,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-simarm64-stable"
+      name: "vm-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9420,7 +7529,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-x64"
+      name: "vm-linux-release-simarm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9456,7 +7565,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-x64-beta"
+      name: "vm-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9492,7 +7601,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-x64-dev"
+      name: "vm-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9528,7 +7637,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-x64-stable"
+      name: "vm-linux-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9564,11 +7673,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-debug-arm64"
+      name: "vm-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9578,7 +7687,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9587,19 +7696,11 @@ buckets {
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9608,11 +7709,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-debug-arm64-beta"
+      name: "vm-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9622,7 +7723,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9633,17 +7734,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9652,11 +7745,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-debug-arm64-dev"
+      name: "vm-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9666,7 +7759,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9677,17 +7770,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9696,11 +7781,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-debug-arm64-stable"
+      name: "vm-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9710,7 +7795,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9721,17 +7806,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9740,9 +7817,9 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-debug-x64"
+      name: "vm-mac-debug-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
@@ -9765,6 +7842,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9781,9 +7861,9 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-debug-x64-beta"
+      name: "vm-mac-debug-arm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
@@ -9806,6 +7886,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9822,9 +7905,9 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-debug-x64-dev"
+      name: "vm-mac-debug-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
@@ -9847,6 +7930,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9863,7 +7949,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-debug-x64-stable"
+      name: "vm-mac-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9904,9 +7990,9 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-release-arm64"
+      name: "vm-mac-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
@@ -9929,10 +8015,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       caches {
@@ -9947,9 +8031,9 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-release-arm64-beta"
+      name: "vm-mac-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
@@ -9972,10 +8056,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       caches {
@@ -9990,7 +8072,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-release-arm64-dev"
+      name: "vm-mac-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
@@ -10033,7 +8115,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-release-arm64-stable"
+      name: "vm-mac-release-arm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
@@ -10076,9 +8158,9 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-release-x64"
+      name: "vm-mac-release-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
@@ -10101,6 +8183,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -10116,7 +8201,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-release-x64-beta"
+      name: "vm-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10156,7 +8241,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-release-x64-dev"
+      name: "vm-mac-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10378,42 +8463,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10558,42 +8607,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10920,43 +8933,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-win-debug-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-win-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
@@ -11138,42 +9114,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-win-release-x64-dev"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index b2863043e763..ccd1b65289ba 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -1745,276 +1745,6 @@ consoles {
     category: "sdk"
     short_name: "dp"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-dev"
-    category: "cfe"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-dev"
-    category: "cfe|nnbd"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64-dev"
-    category: "vm|jit"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-x64-dev"
-    category: "vm|jit"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm-dev"
-    category: "vm|jit"
-    short_name: "ra"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64-dev"
-    category: "vm|jit"
-    short_name: "ra6"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-arm64-dev"
-    category: "vm|jit"
-    short_name: "m1d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64-dev"
-    category: "vm|jit"
-    short_name: "md"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-arm64-dev"
-    category: "vm|jit"
-    short_name: "m1r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64-dev"
-    category: "vm|jit"
-    short_name: "mr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64-dev"
-    category: "vm|jit"
-    short_name: "wd"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-x64-dev"
-    category: "vm|jit"
-    short_name: "wr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-debug-x64-dev"
-    category: "vm|appjit"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-release-x64-dev"
-    category: "vm|appjit"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-x64-dev"
-    category: "vm|aot"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-debug-simarm_x64-dev"
-    category: "vm|aot"
-    short_name: "da"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-simarm_x64-dev"
-    category: "vm|aot"
-    short_name: "ra"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-simarm64-dev"
-    category: "vm|aot"
-    short_name: "ra6"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-simarm64-dev"
-    category: "vm|aot"
-    short_name: "ma6"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-release-x64-dev"
-    category: "vm|aot"
-    short_name: "wr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm_x64-dev"
-    category: "vm|aot|android"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm64c-dev"
-    category: "vm|aot|android"
-    short_name: "a64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-dev"
-    category: "vm|ffi"
-    short_name: "d32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm-dev"
-    category: "vm|ffi"
-    short_name: "r32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm-dev"
-    category: "vm|ffi"
-    short_name: "p32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm64c-dev"
-    category: "vm|ffi"
-    short_name: "d64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-release-arm64c-dev"
-    category: "vm|ffi"
-    short_name: "r64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-product-arm64c-dev"
-    category: "vm|ffi"
-    short_name: "p64"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-dev"
-    category: "vm|ffi"
-    short_name: "qa"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-dev"
-    category: "vm|ffi"
-    short_name: "qr"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-dev"
-    category: "vm|legacy|jit"
-    short_name: "rc"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-dev"
-    category: "vm|legacy|aot"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-dev"
-    category: "vm|legacy|aot"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-dev"
-    category: "vm|legacy|aot"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-    category: "vm|legacy|aot"
-    short_name: "o"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-dev"
-    category: "pkg"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-dev"
-    category: "pkg"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-dev"
-    category: "pkg"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-linux-d8-dev"
-    category: "dart2js|d8"
-    short_name: "mi"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-unit-linux-x64-release-dev"
-    category: "dart2js|d8"
-    short_name: "u"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-chrome-dev"
-    category: "dart2js|chrome"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-csp-linux-chrome-dev"
-    category: "dart2js|chrome"
-    short_name: "csp"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-chrome-dev"
-    category: "dart2js|chrome"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-win-chrome-dev"
-    category: "dart2js|chrome"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-firefox-dev"
-    category: "dart2js|firefox"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-mac-safari-dev"
-    category: "dart2js|safari"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome-dev"
-    category: "ddc"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-chrome-dev"
-    category: "ddc"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-win-chrome-dev"
-    category: "ddc"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-analysis-server-linux-dev"
-    category: "analyzer"
-    short_name: "as"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-linux-release-dev"
-    category: "analyzer"
-    short_name: "l"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-mac-release-dev"
-    category: "analyzer"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/analyzer-win-release-dev"
-    category: "analyzer"
-    short_name: "w"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/gclient-dev"
-    category: "misc"
-    short_name: "g"
-  }
   header {
     links {
       name: "Consoles"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index ec86b6f4dac5..c2d1e986d365 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -24,16 +24,6 @@ job {
     builder: "analyzer-analysis-server-linux-beta"
   }
 }
-job {
-  id: "analyzer-analysis-server-linux-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "analyzer-analysis-server-linux-dev"
-  }
-}
 job {
   id: "analyzer-analysis-server-linux-stable"
   realm: "ci.sandbox"
@@ -64,16 +54,6 @@ job {
     builder: "analyzer-linux-release-beta"
   }
 }
-job {
-  id: "analyzer-linux-release-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "analyzer-linux-release-dev"
-  }
-}
 job {
   id: "analyzer-linux-release-stable"
   realm: "ci.sandbox"
@@ -104,16 +84,6 @@ job {
     builder: "analyzer-mac-release-beta"
   }
 }
-job {
-  id: "analyzer-mac-release-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "analyzer-mac-release-dev"
-  }
-}
 job {
   id: "analyzer-mac-release-stable"
   realm: "ci.sandbox"
@@ -144,16 +114,6 @@ job {
     builder: "analyzer-win-release-beta"
   }
 }
-job {
-  id: "analyzer-win-release-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "analyzer-win-release-dev"
-  }
-}
 job {
   id: "analyzer-win-release-stable"
   realm: "ci.sandbox"
@@ -224,16 +184,6 @@ job {
     builder: "dart2js-linux-chrome-beta"
   }
 }
-job {
-  id: "dart2js-linux-chrome-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "dart2js-linux-chrome-dev"
-  }
-}
 job {
   id: "dart2js-linux-chrome-stable"
   realm: "ci.sandbox"
@@ -264,16 +214,6 @@ job {
     builder: "dart2js-linux-firefox-beta"
   }
 }
-job {
-  id: "dart2js-linux-firefox-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "dart2js-linux-firefox-dev"
-  }
-}
 job {
   id: "dart2js-linux-firefox-stable"
   realm: "ci.sandbox"
@@ -304,16 +244,6 @@ job {
     builder: "dart2js-mac-chrome-beta"
   }
 }
-job {
-  id: "dart2js-mac-chrome-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "dart2js-mac-chrome-dev"
-  }
-}
 job {
   id: "dart2js-mac-chrome-stable"
   realm: "ci.sandbox"
@@ -344,16 +274,6 @@ job {
     builder: "dart2js-mac-safari-beta"
   }
 }
-job {
-  id: "dart2js-mac-safari-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "dart2js-mac-safari-dev"
-  }
-}
 job {
   id: "dart2js-mac-safari-stable"
   realm: "ci.sandbox"
@@ -384,16 +304,6 @@ job {
     builder: "dart2js-minified-csp-linux-chrome-beta"
   }
 }
-job {
-  id: "dart2js-minified-csp-linux-chrome-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "dart2js-minified-csp-linux-chrome-dev"
-  }
-}
 job {
   id: "dart2js-minified-csp-linux-chrome-stable"
   realm: "ci.sandbox"
@@ -424,16 +334,6 @@ job {
     builder: "dart2js-minified-linux-d8-beta"
   }
 }
-job {
-  id: "dart2js-minified-linux-d8-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "dart2js-minified-linux-d8-dev"
-  }
-}
 job {
   id: "dart2js-minified-linux-d8-stable"
   realm: "ci.sandbox"
@@ -464,16 +364,6 @@ job {
     builder: "dart2js-unit-linux-x64-release-beta"
   }
 }
-job {
-  id: "dart2js-unit-linux-x64-release-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "dart2js-unit-linux-x64-release-dev"
-  }
-}
 job {
   id: "dart2js-unit-linux-x64-release-stable"
   realm: "ci.sandbox"
@@ -504,16 +394,6 @@ job {
     builder: "dart2js-win-chrome-beta"
   }
 }
-job {
-  id: "dart2js-win-chrome-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "dart2js-win-chrome-dev"
-  }
-}
 job {
   id: "dart2js-win-chrome-stable"
   realm: "ci.sandbox"
@@ -564,16 +444,6 @@ job {
     builder: "ddc-linux-chrome-beta"
   }
 }
-job {
-  id: "ddc-linux-chrome-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "ddc-linux-chrome-dev"
-  }
-}
 job {
   id: "ddc-linux-chrome-stable"
   realm: "ci.sandbox"
@@ -624,16 +494,6 @@ job {
     builder: "ddc-mac-chrome-beta"
   }
 }
-job {
-  id: "ddc-mac-chrome-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "ddc-mac-chrome-dev"
-  }
-}
 job {
   id: "ddc-mac-chrome-stable"
   realm: "ci.sandbox"
@@ -664,16 +524,6 @@ job {
     builder: "ddc-win-chrome-beta"
   }
 }
-job {
-  id: "ddc-win-chrome-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "ddc-win-chrome-dev"
-  }
-}
 job {
   id: "ddc-win-chrome-stable"
   realm: "ci.sandbox"
@@ -754,16 +604,6 @@ job {
     builder: "front-end-linux-release-x64-beta"
   }
 }
-job {
-  id: "front-end-linux-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "front-end-linux-release-x64-dev"
-  }
-}
 job {
   id: "front-end-linux-release-x64-stable"
   realm: "ci.sandbox"
@@ -794,16 +634,6 @@ job {
     builder: "front-end-nnbd-linux-release-x64-beta"
   }
 }
-job {
-  id: "front-end-nnbd-linux-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "front-end-nnbd-linux-release-x64-dev"
-  }
-}
 job {
   id: "front-end-nnbd-linux-release-x64-stable"
   realm: "ci.sandbox"
@@ -874,16 +704,6 @@ job {
     builder: "gclient-beta"
   }
 }
-job {
-  id: "gclient-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "gclient-dev"
-  }
-}
 job {
   id: "gclient-stable"
   realm: "ci.sandbox"
@@ -944,16 +764,6 @@ job {
     builder: "pkg-linux-release-beta"
   }
 }
-job {
-  id: "pkg-linux-release-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "pkg-linux-release-dev"
-  }
-}
 job {
   id: "pkg-linux-release-experimental"
   realm: "ci.sandbox"
@@ -1004,16 +814,6 @@ job {
     builder: "pkg-mac-release-beta"
   }
 }
-job {
-  id: "pkg-mac-release-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "pkg-mac-release-dev"
-  }
-}
 job {
   id: "pkg-mac-release-stable"
   realm: "ci.sandbox"
@@ -1044,16 +844,6 @@ job {
     builder: "pkg-win-release-beta"
   }
 }
-job {
-  id: "pkg-win-release-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "pkg-win-release-dev"
-  }
-}
 job {
   id: "pkg-win-release-stable"
   realm: "ci.sandbox"
@@ -1084,16 +874,6 @@ job {
     builder: "vm-aot-android-release-arm64c-beta"
   }
 }
-job {
-  id: "vm-aot-android-release-arm64c-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-aot-android-release-arm64c-dev"
-  }
-}
 job {
   id: "vm-aot-android-release-arm64c-stable"
   realm: "ci.sandbox"
@@ -1124,16 +904,6 @@ job {
     builder: "vm-aot-android-release-arm_x64-beta"
   }
 }
-job {
-  id: "vm-aot-android-release-arm_x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-aot-android-release-arm_x64-dev"
-  }
-}
 job {
   id: "vm-aot-android-release-arm_x64-stable"
   realm: "ci.sandbox"
@@ -1174,16 +944,6 @@ job {
     builder: "vm-aot-linux-debug-simarm_x64-beta"
   }
 }
-job {
-  id: "vm-aot-linux-debug-simarm_x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-aot-linux-debug-simarm_x64-dev"
-  }
-}
 job {
   id: "vm-aot-linux-debug-simarm_x64-stable"
   realm: "ci.sandbox"
@@ -1264,16 +1024,6 @@ job {
     builder: "vm-aot-linux-release-simarm64-beta"
   }
 }
-job {
-  id: "vm-aot-linux-release-simarm64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-aot-linux-release-simarm64-dev"
-  }
-}
 job {
   id: "vm-aot-linux-release-simarm64-stable"
   realm: "ci.sandbox"
@@ -1304,16 +1054,6 @@ job {
     builder: "vm-aot-linux-release-simarm_x64-beta"
   }
 }
-job {
-  id: "vm-aot-linux-release-simarm_x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-aot-linux-release-simarm_x64-dev"
-  }
-}
 job {
   id: "vm-aot-linux-release-simarm_x64-stable"
   realm: "ci.sandbox"
@@ -1344,16 +1084,6 @@ job {
     builder: "vm-aot-linux-release-x64-beta"
   }
 }
-job {
-  id: "vm-aot-linux-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-aot-linux-release-x64-dev"
-  }
-}
 job {
   id: "vm-aot-linux-release-x64-stable"
   realm: "ci.sandbox"
@@ -1404,16 +1134,6 @@ job {
     builder: "vm-aot-mac-release-simarm64-beta"
   }
 }
-job {
-  id: "vm-aot-mac-release-simarm64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-aot-mac-release-simarm64-dev"
-  }
-}
 job {
   id: "vm-aot-mac-release-simarm64-stable"
   realm: "ci.sandbox"
@@ -1494,16 +1214,6 @@ job {
     builder: "vm-aot-win-release-x64-beta"
   }
 }
-job {
-  id: "vm-aot-win-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-aot-win-release-x64-dev"
-  }
-}
 job {
   id: "vm-aot-win-release-x64-stable"
   realm: "ci.sandbox"
@@ -1534,16 +1244,6 @@ job {
     builder: "vm-appjit-linux-debug-x64-beta"
   }
 }
-job {
-  id: "vm-appjit-linux-debug-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-appjit-linux-debug-x64-dev"
-  }
-}
 job {
   id: "vm-appjit-linux-debug-x64-stable"
   realm: "ci.sandbox"
@@ -1584,16 +1284,6 @@ job {
     builder: "vm-appjit-linux-release-x64-beta"
   }
 }
-job {
-  id: "vm-appjit-linux-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-appjit-linux-release-x64-dev"
-  }
-}
 job {
   id: "vm-appjit-linux-release-x64-stable"
   realm: "ci.sandbox"
@@ -1654,16 +1344,6 @@ job {
     builder: "vm-ffi-android-debug-arm-beta"
   }
 }
-job {
-  id: "vm-ffi-android-debug-arm-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-ffi-android-debug-arm-dev"
-  }
-}
 job {
   id: "vm-ffi-android-debug-arm-stable"
   realm: "ci.sandbox"
@@ -1694,16 +1374,6 @@ job {
     builder: "vm-ffi-android-debug-arm64c-beta"
   }
 }
-job {
-  id: "vm-ffi-android-debug-arm64c-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-ffi-android-debug-arm64c-dev"
-  }
-}
 job {
   id: "vm-ffi-android-debug-arm64c-stable"
   realm: "ci.sandbox"
@@ -1734,16 +1404,6 @@ job {
     builder: "vm-ffi-android-product-arm-beta"
   }
 }
-job {
-  id: "vm-ffi-android-product-arm-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-ffi-android-product-arm-dev"
-  }
-}
 job {
   id: "vm-ffi-android-product-arm-stable"
   realm: "ci.sandbox"
@@ -1774,16 +1434,6 @@ job {
     builder: "vm-ffi-android-product-arm64c-beta"
   }
 }
-job {
-  id: "vm-ffi-android-product-arm64c-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-ffi-android-product-arm64c-dev"
-  }
-}
 job {
   id: "vm-ffi-android-product-arm64c-stable"
   realm: "ci.sandbox"
@@ -1814,16 +1464,6 @@ job {
     builder: "vm-ffi-android-release-arm-beta"
   }
 }
-job {
-  id: "vm-ffi-android-release-arm-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-ffi-android-release-arm-dev"
-  }
-}
 job {
   id: "vm-ffi-android-release-arm-stable"
   realm: "ci.sandbox"
@@ -1854,16 +1494,6 @@ job {
     builder: "vm-ffi-android-release-arm64c-beta"
   }
 }
-job {
-  id: "vm-ffi-android-release-arm64c-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-ffi-android-release-arm64c-dev"
-  }
-}
 job {
   id: "vm-ffi-android-release-arm64c-stable"
   realm: "ci.sandbox"
@@ -1924,16 +1554,6 @@ job {
     builder: "vm-kernel-checked-linux-release-x64-beta"
   }
 }
-job {
-  id: "vm-kernel-checked-linux-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-checked-linux-release-x64-dev"
-  }
-}
 job {
   id: "vm-kernel-checked-linux-release-x64-stable"
   realm: "ci.sandbox"
@@ -1994,16 +1614,6 @@ job {
     builder: "vm-kernel-precomp-linux-debug-x64-beta"
   }
 }
-job {
-  id: "vm-kernel-precomp-linux-debug-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64-dev"
-  }
-}
 job {
   id: "vm-kernel-precomp-linux-debug-x64-stable"
   realm: "ci.sandbox"
@@ -2034,16 +1644,6 @@ job {
     builder: "vm-kernel-precomp-linux-release-simarm-beta"
   }
 }
-job {
-  id: "vm-kernel-precomp-linux-release-simarm-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm-dev"
-  }
-}
 job {
   id: "vm-kernel-precomp-linux-release-simarm-stable"
   realm: "ci.sandbox"
@@ -2074,16 +1674,6 @@ job {
     builder: "vm-kernel-precomp-linux-release-x64-beta"
   }
 }
-job {
-  id: "vm-kernel-precomp-linux-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-x64-dev"
-  }
-}
 job {
   id: "vm-kernel-precomp-linux-release-x64-stable"
   realm: "ci.sandbox"
@@ -2114,16 +1704,6 @@ job {
     builder: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
   }
 }
-job {
-  id: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-  }
-}
 job {
   id: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
   realm: "ci.sandbox"
@@ -2184,16 +1764,6 @@ job {
     builder: "vm-linux-debug-x64-beta"
   }
 }
-job {
-  id: "vm-linux-debug-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-linux-debug-x64-dev"
-  }
-}
 job {
   id: "vm-linux-debug-x64-stable"
   realm: "ci.sandbox"
@@ -2254,16 +1824,6 @@ job {
     builder: "vm-linux-release-simarm-beta"
   }
 }
-job {
-  id: "vm-linux-release-simarm-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-linux-release-simarm-dev"
-  }
-}
 job {
   id: "vm-linux-release-simarm-stable"
   realm: "ci.sandbox"
@@ -2294,16 +1854,6 @@ job {
     builder: "vm-linux-release-simarm64-beta"
   }
 }
-job {
-  id: "vm-linux-release-simarm64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-linux-release-simarm64-dev"
-  }
-}
 job {
   id: "vm-linux-release-simarm64-stable"
   realm: "ci.sandbox"
@@ -2334,16 +1884,6 @@ job {
     builder: "vm-linux-release-x64-beta"
   }
 }
-job {
-  id: "vm-linux-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-linux-release-x64-dev"
-  }
-}
 job {
   id: "vm-linux-release-x64-stable"
   realm: "ci.sandbox"
@@ -2374,16 +1914,6 @@ job {
     builder: "vm-mac-debug-arm64-beta"
   }
 }
-job {
-  id: "vm-mac-debug-arm64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-mac-debug-arm64-dev"
-  }
-}
 job {
   id: "vm-mac-debug-arm64-stable"
   realm: "ci.sandbox"
@@ -2414,16 +1944,6 @@ job {
     builder: "vm-mac-debug-x64-beta"
   }
 }
-job {
-  id: "vm-mac-debug-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-mac-debug-x64-dev"
-  }
-}
 job {
   id: "vm-mac-debug-x64-stable"
   realm: "ci.sandbox"
@@ -2454,16 +1974,6 @@ job {
     builder: "vm-mac-release-arm64-beta"
   }
 }
-job {
-  id: "vm-mac-release-arm64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-mac-release-arm64-dev"
-  }
-}
 job {
   id: "vm-mac-release-arm64-stable"
   realm: "ci.sandbox"
@@ -2494,16 +2004,6 @@ job {
     builder: "vm-mac-release-x64-beta"
   }
 }
-job {
-  id: "vm-mac-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-mac-release-x64-dev"
-  }
-}
 job {
   id: "vm-mac-release-x64-stable"
   realm: "ci.sandbox"
@@ -2554,16 +2054,6 @@ job {
     builder: "vm-precomp-ffi-qemu-linux-release-arm-beta"
   }
 }
-job {
-  id: "vm-precomp-ffi-qemu-linux-release-arm-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-arm-dev"
-  }
-}
 job {
   id: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
   realm: "ci.sandbox"
@@ -2604,16 +2094,6 @@ job {
     builder: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
   }
 }
-job {
-  id: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
-  }
-}
 job {
   id: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
   realm: "ci.sandbox"
@@ -2704,16 +2184,6 @@ job {
     builder: "vm-win-debug-x64-beta"
   }
 }
-job {
-  id: "vm-win-debug-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-win-debug-x64-dev"
-  }
-}
 job {
   id: "vm-win-debug-x64-stable"
   realm: "ci.sandbox"
@@ -2764,16 +2234,6 @@ job {
     builder: "vm-win-release-x64-beta"
   }
 }
-job {
-  id: "vm-win-release-x64-dev"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-win-release-x64-dev"
-  }
-}
 job {
   id: "vm-win-release-x64-stable"
   realm: "ci.sandbox"
@@ -2859,60 +2319,6 @@ trigger {
 trigger {
   id: "dart-gitiles-trigger-dev"
   realm: "ci"
-  triggers: "analyzer-analysis-server-linux-dev"
-  triggers: "analyzer-linux-release-dev"
-  triggers: "analyzer-mac-release-dev"
-  triggers: "analyzer-win-release-dev"
-  triggers: "dart2js-linux-chrome-dev"
-  triggers: "dart2js-linux-firefox-dev"
-  triggers: "dart2js-mac-chrome-dev"
-  triggers: "dart2js-mac-safari-dev"
-  triggers: "dart2js-minified-csp-linux-chrome-dev"
-  triggers: "dart2js-minified-linux-d8-dev"
-  triggers: "dart2js-unit-linux-x64-release-dev"
-  triggers: "dart2js-win-chrome-dev"
-  triggers: "ddc-linux-chrome-dev"
-  triggers: "ddc-mac-chrome-dev"
-  triggers: "ddc-win-chrome-dev"
-  triggers: "front-end-linux-release-x64-dev"
-  triggers: "front-end-nnbd-linux-release-x64-dev"
-  triggers: "gclient-dev"
-  triggers: "pkg-linux-release-dev"
-  triggers: "pkg-mac-release-dev"
-  triggers: "pkg-win-release-dev"
-  triggers: "vm-aot-android-release-arm64c-dev"
-  triggers: "vm-aot-android-release-arm_x64-dev"
-  triggers: "vm-aot-linux-debug-simarm_x64-dev"
-  triggers: "vm-aot-linux-release-simarm64-dev"
-  triggers: "vm-aot-linux-release-simarm_x64-dev"
-  triggers: "vm-aot-linux-release-x64-dev"
-  triggers: "vm-aot-mac-release-simarm64-dev"
-  triggers: "vm-aot-win-release-x64-dev"
-  triggers: "vm-appjit-linux-debug-x64-dev"
-  triggers: "vm-appjit-linux-release-x64-dev"
-  triggers: "vm-ffi-android-debug-arm-dev"
-  triggers: "vm-ffi-android-debug-arm64c-dev"
-  triggers: "vm-ffi-android-product-arm-dev"
-  triggers: "vm-ffi-android-product-arm64c-dev"
-  triggers: "vm-ffi-android-release-arm-dev"
-  triggers: "vm-ffi-android-release-arm64c-dev"
-  triggers: "vm-kernel-checked-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-linux-debug-x64-dev"
-  triggers: "vm-kernel-precomp-linux-release-simarm-dev"
-  triggers: "vm-kernel-precomp-linux-release-x64-dev"
-  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-dev"
-  triggers: "vm-linux-debug-x64-dev"
-  triggers: "vm-linux-release-simarm-dev"
-  triggers: "vm-linux-release-simarm64-dev"
-  triggers: "vm-linux-release-x64-dev"
-  triggers: "vm-mac-debug-arm64-dev"
-  triggers: "vm-mac-debug-x64-dev"
-  triggers: "vm-mac-release-arm64-dev"
-  triggers: "vm-mac-release-x64-dev"
-  triggers: "vm-precomp-ffi-qemu-linux-release-arm-dev"
-  triggers: "vm-precomp-ffi-qemu-linux-release-riscv64-dev"
-  triggers: "vm-win-debug-x64-dev"
-  triggers: "vm-win-release-x64-dev"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/dev"
diff --git a/generated/project.cfg b/generated/project.cfg
index 0bbc9d405147..5a43732cd954 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.39.4"
+  version: "1.38.2"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/lib/dart.star b/lib/dart.star
index d49d8a0c51d8..33715e411f13 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -16,7 +16,7 @@ _GOMA_RBE = {
 }
 
 _RELEASE_CHANNELS = ["beta", "dev", "stable"]
-_CHANNELS = _RELEASE_CHANNELS + ["try"]
+_CHANNELS = ["beta", "stable", "try"]
 _BRANCHES = ["main"] + _RELEASE_CHANNELS
 
 _DART_GIT = "https://dart.googlesource.com/sdk"

From b2585212014d338f4801eae2b788fa85bdadc64b Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Thu, 20 Apr 2023 12:25:28 +0000
Subject: [PATCH 643/826] [infra] Add VM checked NNBD builder.

Change-Id: I03c9c7152650dd069037744698df94813e34111f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/290609
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   |  12 +++
 generated/cr-buildbucket.cfg | 176 +++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      |  23 +++++
 generated/luci-notify.cfg    |  11 +++
 generated/luci-scheduler.cfg |  33 +++++++
 generated/project.cfg        |   2 +-
 vm.star                      |   6 ++
 7 files changed, 262 insertions(+), 1 deletion(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 9cb95c141192..c697144178bf 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -793,6 +793,10 @@ config_groups {
         name: "dart/try/vm-appjit-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-checked-mac-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-ffi-android-debug-arm-try"
         includable_only: true
@@ -2226,6 +2230,10 @@ config_groups {
         name: "dart/try/vm-asan-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-checked-mac-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-eager-optimization-linux-release-ia32-try"
         includable_only: true
@@ -3206,6 +3214,10 @@ config_groups {
         name: "dart/try/vm-appjit-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-checked-mac-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-ffi-android-debug-arm-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 59050705b69c..10028f1136c3 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5673,6 +5673,138 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-checked-mac-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-checked-mac-release-arm64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-checked-mac-release-arm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-eager-optimization-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
@@ -12634,6 +12766,50 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-checked-mac-release-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-eager-optimization-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index ccd1b65289ba..198123c2c8d3 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -82,6 +82,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-mac-release-arm64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-checked-mac-release-arm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-mac-release-x64-try"
   }
@@ -563,6 +566,11 @@ consoles {
     category: "vm|jit"
     short_name: "m1r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-checked-mac-release-arm64"
+    category: "vm|jit"
+    short_name: "rc"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64"
     category: "vm|jit"
@@ -1344,6 +1352,11 @@ consoles {
     category: "vm|jit"
     short_name: "m1r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-checked-mac-release-arm64"
+    category: "vm|jit"
+    short_name: "rc"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64"
     category: "vm|jit"
@@ -1881,6 +1894,11 @@ consoles {
     category: "vm|jit"
     short_name: "m1r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-checked-mac-release-arm64-beta"
+    category: "vm|jit"
+    short_name: "rc"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64-beta"
     category: "vm|jit"
@@ -2237,6 +2255,11 @@ consoles {
     category: "vm|jit"
     short_name: "m1r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-checked-mac-release-arm64-stable"
+    category: "vm|jit"
+    short_name: "rc"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64-stable"
     category: "vm|jit"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 262b21cf2564..8eadf4cbfe85 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -755,6 +755,17 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-checked-mac-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index c2d1e986d365..e0a2ddfff22e 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1304,6 +1304,36 @@ job {
     builder: "vm-asan-linux-release-x64"
   }
 }
+job {
+  id: "vm-checked-mac-release-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-checked-mac-release-arm64"
+  }
+}
+job {
+  id: "vm-checked-mac-release-arm64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-checked-mac-release-arm64-beta"
+  }
+}
+job {
+  id: "vm-checked-mac-release-arm64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-checked-mac-release-arm64-stable"
+  }
+}
 job {
   id: "vm-eager-optimization-linux-release-ia32"
   realm: "ci.sandbox"
@@ -2288,6 +2318,7 @@ trigger {
   triggers: "vm-aot-win-release-x64-beta"
   triggers: "vm-appjit-linux-debug-x64-beta"
   triggers: "vm-appjit-linux-release-x64-beta"
+  triggers: "vm-checked-mac-release-arm64-beta"
   triggers: "vm-ffi-android-debug-arm-beta"
   triggers: "vm-ffi-android-debug-arm64c-beta"
   triggers: "vm-ffi-android-product-arm-beta"
@@ -2424,6 +2455,7 @@ trigger {
   triggers: "vm-aot-win-release-x64-stable"
   triggers: "vm-appjit-linux-debug-x64-stable"
   triggers: "vm-appjit-linux-release-x64-stable"
+  triggers: "vm-checked-mac-release-arm64-stable"
   triggers: "vm-ffi-android-debug-arm-stable"
   triggers: "vm-ffi-android-debug-arm64c-stable"
   triggers: "vm-ffi-android-product-arm-stable"
@@ -2513,6 +2545,7 @@ trigger {
   triggers: "vm-aot-win-release-x64"
   triggers: "vm-appjit-linux-debug-x64"
   triggers: "vm-appjit-linux-release-x64"
+  triggers: "vm-checked-mac-release-arm64"
   triggers: "vm-eager-optimization-linux-release-x64"
   triggers: "vm-ffi-android-debug-arm"
   triggers: "vm-ffi-android-debug-arm64c"
diff --git a/generated/project.cfg b/generated/project.cfg
index 5a43732cd954..0bbc9d405147 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.38.2"
+  version: "1.39.4"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/vm.star b/vm.star
index 4b789c8e3516..f9818b2a8c37 100644
--- a/vm.star
+++ b/vm.star
@@ -141,6 +141,12 @@ _extra_builder(
     properties = no_android,
     on_cq = True,
 )
+_extra_builder(
+    "vm-checked-mac-release-arm64",
+    category = "vm|jit|rc",
+    dimensions = [mac, arm64],
+    experiments = {"dart.use_update_script": 100},
+)
 _builder(
     "vm-mac-release-x64",
     category = "vm|jit|mr",

From 5bd59f39f3dbc9bd6c340277e7c0c5167120f72d Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Thu, 20 Apr 2023 14:31:30 +0000
Subject: [PATCH 644/826] [infra] Migrate obfuscate and stripped modes.

Change-Id: I1e5592a01ebb5ef59f9759c81c8783a2b97e405b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/296024
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   |  24 +--
 generated/cr-buildbucket.cfg | 360 ++++++++++++++---------------------
 generated/luci-milo.cfg      |  62 +++---
 generated/luci-notify.cfg    |  50 ++---
 generated/luci-scheduler.cfg |  66 +++----
 vm.star                      |  21 +-
 6 files changed, 238 insertions(+), 345 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index c697144178bf..89f2d10fc941 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -837,10 +837,6 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-linux-debug-x64-try"
         includable_only: true
@@ -2146,6 +2142,10 @@ config_groups {
         name: "dart/try/vm-aot-asan-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-dwarf-linux-product-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-linux-debug-simarm_x64-try"
         includable_only: true
@@ -2194,6 +2194,10 @@ config_groups {
         name: "dart/try/vm-aot-msan-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-obfuscate-linux-release-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-tsan-linux-release-x64-try"
         includable_only: true
@@ -2290,10 +2294,6 @@ config_groups {
         name: "dart/try/vm-kernel-linux-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-precomp-dwarf-linux-product-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
         includable_only: true
@@ -2306,10 +2306,6 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-win-debug-ia32-try"
         includable_only: true
@@ -3258,10 +3254,6 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-linux-debug-x64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 10028f1136c3..0090e0cd915b 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -4265,6 +4265,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-dwarf-linux-product-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-linux-debug-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -5128,6 +5164,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-obfuscate-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-tsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -6828,42 +6900,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-precomp-dwarf-linux-product-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-precomp-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -7188,114 +7224,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-win-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
@@ -11985,6 +11913,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-dwarf-linux-product-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-linux-debug-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -12439,6 +12403,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-obfuscate-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-tsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13318,42 +13318,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-precomp-dwarf-linux-product-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-precomp-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13462,42 +13426,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-precomp-obfuscate-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-win-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 198123c2c8d3..cb94f9b2601b 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -148,6 +148,12 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-win-product-x64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-aot-obfuscate-linux-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-aot-dwarf-linux-product-x64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-eager-optimization-linux-release-ia32-try"
   }
@@ -259,12 +265,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-x64-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-obfuscate-linux-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-dwarf-linux-product-x64-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/pkg-linux-release-try"
   }
@@ -681,6 +681,16 @@ consoles {
     category: "vm|aot|product"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-obfuscate-linux-release-x64"
+    category: "vm|aot"
+    short_name: "o"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-dwarf-linux-product-x64"
+    category: "vm|aot"
+    short_name: "dw"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-eager-optimization-linux-release-ia32"
     category: "vm|misc"
@@ -866,16 +876,6 @@ consoles {
     category: "vm|legacy|aot"
     short_name: "r"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
-    category: "vm|legacy|aot"
-    short_name: "o"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-dwarf-linux-product-x64"
-    category: "vm|legacy|aot"
-    short_name: "dw"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
@@ -1467,6 +1467,16 @@ consoles {
     category: "vm|aot|product"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-obfuscate-linux-release-x64"
+    category: "vm|aot"
+    short_name: "o"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-dwarf-linux-product-x64"
+    category: "vm|aot"
+    short_name: "dw"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-eager-optimization-linux-release-ia32"
     category: "vm|misc"
@@ -1652,16 +1662,6 @@ consoles {
     category: "vm|legacy|aot"
     short_name: "r"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64"
-    category: "vm|legacy|aot"
-    short_name: "o"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-dwarf-linux-product-x64"
-    category: "vm|legacy|aot"
-    short_name: "dw"
-  }
   header {
     links {
       name: "Consoles"
@@ -2024,11 +2024,6 @@ consoles {
     category: "vm|legacy|aot"
     short_name: "r"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-beta"
-    category: "vm|legacy|aot"
-    short_name: "o"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-beta"
     category: "pkg"
@@ -2385,11 +2380,6 @@ consoles {
     category: "vm|legacy|aot"
     short_name: "r"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-obfuscate-linux-release-x64-stable"
-    category: "vm|legacy|aot"
-    short_name: "o"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
     category: "pkg"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 8eadf4cbfe85..45067760dfe3 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -487,6 +487,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-dwarf-linux-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -644,6 +657,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-obfuscate-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -924,19 +950,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-dwarf-linux-product-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -970,17 +983,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-obfuscate-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index e0a2ddfff22e..6d19a4f701d5 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -924,6 +924,16 @@ job {
     builder: "vm-aot-asan-linux-release-x64"
   }
 }
+job {
+  id: "vm-aot-dwarf-linux-product-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-dwarf-linux-product-x64"
+  }
+}
 job {
   id: "vm-aot-linux-debug-simarm_x64"
   realm: "ci.sandbox"
@@ -1154,6 +1164,16 @@ job {
     builder: "vm-aot-msan-linux-release-x64"
   }
 }
+job {
+  id: "vm-aot-obfuscate-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-obfuscate-linux-release-x64"
+  }
+}
 job {
   id: "vm-aot-tsan-linux-release-x64"
   realm: "ci.sandbox"
@@ -1614,16 +1634,6 @@ job {
     builder: "vm-kernel-linux-release-x64"
   }
 }
-job {
-  id: "vm-kernel-precomp-dwarf-linux-product-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-dwarf-linux-product-x64"
-  }
-}
 job {
   id: "vm-kernel-precomp-linux-debug-x64"
   realm: "ci.sandbox"
@@ -1714,36 +1724,6 @@ job {
     builder: "vm-kernel-precomp-linux-release-x64-stable"
   }
 }
-job {
-  id: "vm-kernel-precomp-obfuscate-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-obfuscate-linux-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
-  }
-}
 job {
   id: "vm-kernel-win-debug-ia32"
   realm: "ci.sandbox"
@@ -2329,7 +2309,6 @@ trigger {
   triggers: "vm-kernel-precomp-linux-debug-x64-beta"
   triggers: "vm-kernel-precomp-linux-release-simarm-beta"
   triggers: "vm-kernel-precomp-linux-release-x64-beta"
-  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-beta"
   triggers: "vm-linux-debug-x64-beta"
   triggers: "vm-linux-release-simarm-beta"
   triggers: "vm-linux-release-simarm64-beta"
@@ -2466,7 +2445,6 @@ trigger {
   triggers: "vm-kernel-precomp-linux-debug-x64-stable"
   triggers: "vm-kernel-precomp-linux-release-simarm-stable"
   triggers: "vm-kernel-precomp-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64-stable"
   triggers: "vm-linux-debug-x64-stable"
   triggers: "vm-linux-release-simarm-stable"
   triggers: "vm-linux-release-simarm64-stable"
@@ -2493,6 +2471,7 @@ trigger {
   triggers: "front-end-nnbd-win-release-x64"
   triggers: "pkg-linux-release-experimental"
   triggers: "vm-aot-asan-linux-release-x64"
+  triggers: "vm-aot-dwarf-linux-product-x64"
   triggers: "vm-aot-linux-debug-simriscv64"
   triggers: "vm-aot-linux-debug-x64"
   triggers: "vm-aot-linux-debug-x64c"
@@ -2500,6 +2479,7 @@ trigger {
   triggers: "vm-aot-linux-release-arm64"
   triggers: "vm-aot-mac-product-x64"
   triggers: "vm-aot-msan-linux-release-x64"
+  triggers: "vm-aot-obfuscate-linux-release-x64"
   triggers: "vm-aot-tsan-linux-release-x64"
   triggers: "vm-aot-ubsan-linux-release-x64"
   triggers: "vm-aot-win-debug-x64c"
@@ -2508,7 +2488,6 @@ trigger {
   triggers: "vm-asan-linux-release-x64"
   triggers: "vm-eager-optimization-linux-release-ia32"
   triggers: "vm-gcc-linux"
-  triggers: "vm-kernel-precomp-dwarf-linux-product-x64"
   triggers: "vm-kernel-win-debug-ia32"
   triggers: "vm-linux-debug-ia32"
   triggers: "vm-linux-debug-simriscv64"
@@ -2561,7 +2540,6 @@ trigger {
   triggers: "vm-kernel-precomp-linux-debug-x64"
   triggers: "vm-kernel-precomp-linux-release-simarm"
   triggers: "vm-kernel-precomp-linux-release-x64"
-  triggers: "vm-kernel-precomp-obfuscate-linux-release-x64"
   triggers: "vm-linux-debug-x64"
   triggers: "vm-linux-release-arm64"
   triggers: "vm-linux-release-simarm"
diff --git a/vm.star b/vm.star
index f9818b2a8c37..cfc5c169d857 100644
--- a/vm.star
+++ b/vm.star
@@ -272,6 +272,18 @@ _nightly_builder(
     dimensions = windows,
 )
 
+# vm|aot
+_nightly_builder(
+    "vm-aot-obfuscate-linux-release-x64",
+    category = "vm|aot|o",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-aot-dwarf-linux-product-x64",
+    category = "vm|aot|dw",
+    channels = ["try"],
+)
+
 # vm|misc
 _nightly_builder(
     "vm-eager-optimization-linux-release-ia32",
@@ -450,15 +462,6 @@ _extra_builder(
     "vm-kernel-precomp-linux-release-x64",
     category = "vm|legacy|aot|r",
 )
-_extra_builder(
-    "vm-kernel-precomp-obfuscate-linux-release-x64",
-    category = "vm|legacy|aot|o",
-)
-_nightly_builder(
-    "vm-kernel-precomp-dwarf-linux-product-x64",
-    category = "vm|legacy|aot|dw",
-    channels = ["try"],
-)
 
 # Isolate stress test builder
 _extra_builder(

From 1ce8ad9c4489dab14e291264e8a7d0ac47e49a4e Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Thu, 27 Apr 2023 09:16:26 +0000
Subject: [PATCH 645/826] [infra] Migrate QEMU builders to NNBD.

Change-Id: Ib44356f04be2dbfae9094f2f72356c1857c39e8a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/296064
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   |  48 +--
 generated/cr-buildbucket.cfg | 554 +++++++++++++++++------------------
 generated/luci-milo.cfg      |  20 +-
 generated/luci-notify.cfg    |  44 +--
 generated/luci-scheduler.cfg | 132 ++++-----
 vm.star                      |   4 +-
 6 files changed, 401 insertions(+), 401 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 89f2d10fc941..1e0e8f973eb0 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -821,6 +821,14 @@ config_groups {
         name: "dart/try/vm-ffi-android-release-arm64c-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-ffi-qemu-linux-release-arm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-qemu-linux-release-riscv64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-checked-linux-release-x64-try"
         includable_only: true
@@ -1007,14 +1015,6 @@ config_groups {
         name: "dart/try/vm-mac-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-precomp-ffi-qemu-linux-release-arm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-win-debug-x64-try"
         includable_only: true
@@ -2270,6 +2270,14 @@ config_groups {
         name: "dart/try/vm-ffi-android-release-arm64c-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-ffi-qemu-linux-release-arm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-qemu-linux-release-riscv64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-fuchsia-release-arm64-try"
         includable_only: true
@@ -2504,14 +2512,6 @@ config_groups {
         name: "dart/try/vm-msvc-windows-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-precomp-ffi-qemu-linux-release-arm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-reload-linux-debug-x64-try"
         includable_only: true
@@ -3238,6 +3238,14 @@ config_groups {
         name: "dart/try/vm-ffi-android-release-arm64c-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-ffi-qemu-linux-release-arm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-qemu-linux-release-riscv64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-kernel-checked-linux-release-x64-try"
         includable_only: true
@@ -3424,14 +3432,6 @@ config_groups {
         name: "dart/try/vm-mac-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-precomp-ffi-qemu-linux-release-arm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-win-debug-x64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 0090e0cd915b..d7ed9c5a384f 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -6599,11 +6599,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-fuchsia-release-arm64"
+      name: "vm-ffi-qemu-linux-release-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6626,8 +6626,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      expiration_secs: 86400
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6636,11 +6635,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-fuchsia-release-x64"
+      name: "vm-ffi-qemu-linux-release-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6663,8 +6662,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      expiration_secs: 86400
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6673,7 +6671,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-gcc-linux"
+      name: "vm-ffi-qemu-linux-release-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6686,9 +6684,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true,'
-        '    "timeout": 4500'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -6699,8 +6698,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      execution_timeout_secs: 18000
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6709,11 +6707,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64"
+      name: "vm-ffi-qemu-linux-release-riscv64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6739,21 +6737,17 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-beta"
+      name: "vm-ffi-qemu-linux-release-riscv64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6779,21 +6773,17 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-stable"
+      name: "vm-ffi-qemu-linux-release-riscv64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6819,17 +6809,13 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64"
+      name: "vm-fuchsia-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6856,7 +6842,8 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6865,7 +6852,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-x64"
+      name: "vm-fuchsia-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6892,7 +6879,8 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6901,11 +6889,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64"
+      name: "vm-gcc-linux"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6914,10 +6902,9 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true,'
+        '    "timeout": 4500'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -6928,7 +6915,8 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      execution_timeout_secs: 18000
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6937,7 +6925,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-beta"
+      name: "vm-kernel-checked-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6967,13 +6955,17 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-stable"
+      name: "vm-kernel-checked-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7003,13 +6995,17 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm"
+      name: "vm-kernel-checked-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7039,13 +7035,17 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-beta"
+      name: "vm-kernel-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7081,7 +7081,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-stable"
+      name: "vm-kernel-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7117,7 +7117,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64"
+      name: "vm-kernel-precomp-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7153,7 +7153,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64-beta"
+      name: "vm-kernel-precomp-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7189,7 +7189,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64-stable"
+      name: "vm-kernel-precomp-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7225,11 +7225,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-ia32"
+      name: "vm-kernel-precomp-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7239,7 +7239,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -7250,10 +7250,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7262,7 +7261,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-ia32"
+      name: "vm-kernel-precomp-linux-release-simarm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7287,10 +7286,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7299,7 +7297,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-simriscv64"
+      name: "vm-kernel-precomp-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7326,7 +7324,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7335,7 +7333,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-x64"
+      name: "vm-kernel-precomp-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7371,7 +7369,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-x64-beta"
+      name: "vm-kernel-precomp-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7407,7 +7405,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-x64-stable"
+      name: "vm-kernel-precomp-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7443,11 +7441,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-x64c"
+      name: "vm-kernel-win-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7457,7 +7455,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -7468,7 +7466,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 70
       build_numbers: YES
@@ -7479,7 +7478,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-arm64"
+      name: "vm-linux-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7505,10 +7504,9 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "recipe": "dart/neo",'
-        '  "shard_timeout": 7200'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 50
-      execution_timeout_secs: 14400
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7517,7 +7515,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-ia32"
+      name: "vm-linux-debug-simriscv64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7553,7 +7551,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-simarm"
+      name: "vm-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7589,7 +7587,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-simarm-beta"
+      name: "vm-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7625,7 +7623,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-simarm-stable"
+      name: "vm-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7661,7 +7659,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-simarm64"
+      name: "vm-linux-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7688,7 +7686,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7697,7 +7695,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-simarm64-beta"
+      name: "vm-linux-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7722,9 +7720,11 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 7200'
         '}'
       priority: 50
+      execution_timeout_secs: 14400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7733,7 +7733,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-simarm64-stable"
+      name: "vm-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7760,7 +7760,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7769,7 +7769,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-x64"
+      name: "vm-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7805,7 +7805,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-x64-beta"
+      name: "vm-linux-release-simarm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7841,7 +7841,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-x64-stable"
+      name: "vm-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7877,11 +7877,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-debug-arm64"
+      name: "vm-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7891,7 +7891,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -7902,17 +7902,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7921,11 +7913,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-debug-arm64-beta"
+      name: "vm-linux-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7935,7 +7927,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -7946,17 +7938,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7965,11 +7949,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-debug-arm64-stable"
+      name: "vm-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7979,7 +7963,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -7990,17 +7974,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8009,11 +7985,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-debug-x64"
+      name: "vm-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8023,7 +7999,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8034,14 +8010,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8050,11 +8021,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-debug-x64-beta"
+      name: "vm-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8064,7 +8035,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8075,14 +8046,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8091,11 +8057,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-debug-x64-stable"
+      name: "vm-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8105,7 +8071,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8116,14 +8082,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8132,7 +8093,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-release-arm64"
+      name: "vm-mac-debug-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
@@ -8160,7 +8121,8 @@ buckets {
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       caches {
@@ -8175,7 +8137,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-release-arm64-beta"
+      name: "vm-mac-debug-arm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
@@ -8203,7 +8165,8 @@ buckets {
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       caches {
@@ -8218,7 +8181,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-release-arm64-stable"
+      name: "vm-mac-debug-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
@@ -8246,7 +8209,8 @@ buckets {
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       caches {
@@ -8261,7 +8225,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-release-x64"
+      name: "vm-mac-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8286,7 +8250,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       caches {
@@ -8301,7 +8266,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-release-x64-beta"
+      name: "vm-mac-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8326,7 +8291,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       caches {
@@ -8341,7 +8307,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-release-x64-stable"
+      name: "vm-mac-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8366,7 +8332,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       caches {
@@ -8381,11 +8348,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-msan-linux-release-x64"
+      name: "vm-mac-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8395,7 +8362,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8405,11 +8372,17 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8418,11 +8391,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-msvc-windows"
+      name: "vm-mac-release-arm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8431,8 +8404,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -8441,9 +8416,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8452,11 +8434,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm"
+      name: "vm-mac-release-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8466,7 +8448,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8477,9 +8459,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8488,11 +8477,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-beta"
+      name: "vm-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8502,7 +8491,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8516,6 +8505,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8524,11 +8517,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
+      name: "vm-mac-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "host_class:experimental"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8538,7 +8531,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8551,7 +8544,11 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8560,11 +8557,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-stable"
+      name: "vm-mac-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8574,7 +8571,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8588,6 +8585,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8596,11 +8597,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64"
+      name: "vm-msan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8620,10 +8621,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8632,11 +8634,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
+      name: "vm-msvc-windows"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8645,10 +8647,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -8659,7 +8659,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8668,10 +8668,10 @@ buckets {
       }
     }
     builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
+      name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
+      dimensions: "host_class:experimental"
       dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
@@ -8695,7 +8695,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13098,6 +13098,78 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-ffi-qemu-linux-release-arm-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-qemu-linux-release-riscv64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-fuchsia-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13991,78 +14063,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-precomp-ffi-qemu-linux-release-riscv64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-reload-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index cb94f9b2601b..9e28b9e8ee0a 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -239,10 +239,10 @@ consoles {
     name: "buildbucket/luci.dart.try/vm-ffi-android-product-arm64c-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-precomp-ffi-qemu-linux-release-arm-try"
+    name: "buildbucket/luci.dart.try/vm-ffi-qemu-linux-release-arm-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-precomp-ffi-qemu-linux-release-riscv64-try"
+    name: "buildbucket/luci.dart.try/vm-ffi-qemu-linux-release-riscv64-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64-try"
@@ -832,12 +832,12 @@ consoles {
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-qemu-linux-release-arm"
     category: "vm|ffi"
     short_name: "qa"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-qemu-linux-release-riscv64"
     category: "vm|ffi"
     short_name: "qr"
   }
@@ -1618,12 +1618,12 @@ consoles {
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-qemu-linux-release-arm"
     category: "vm|ffi"
     short_name: "qa"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-qemu-linux-release-riscv64"
     category: "vm|ffi"
     short_name: "qr"
   }
@@ -1995,12 +1995,12 @@ consoles {
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-qemu-linux-release-arm-beta"
     category: "vm|ffi"
     short_name: "qa"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-qemu-linux-release-riscv64-beta"
     category: "vm|ffi"
     short_name: "qr"
   }
@@ -2351,12 +2351,12 @@ consoles {
     short_name: "p64"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-arm-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-qemu-linux-release-arm-stable"
     category: "vm|ffi"
     short_name: "qa"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-precomp-ffi-qemu-linux-release-riscv64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-qemu-linux-release-riscv64-stable"
     category: "vm|ffi"
     short_name: "qr"
   }
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 45067760dfe3..2517350c93ef 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -882,6 +882,28 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-ffi-qemu-linux-release-arm"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-ffi-qemu-linux-release-riscv64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1173,17 +1195,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-precomp-ffi-qemu-linux-release-arm"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1199,17 +1210,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-precomp-ffi-qemu-linux-release-riscv64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 6d19a4f701d5..44b440bccb73 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1554,6 +1554,66 @@ job {
     builder: "vm-ffi-android-release-arm64c-stable"
   }
 }
+job {
+  id: "vm-ffi-qemu-linux-release-arm"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-ffi-qemu-linux-release-arm"
+  }
+}
+job {
+  id: "vm-ffi-qemu-linux-release-arm-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-ffi-qemu-linux-release-arm-beta"
+  }
+}
+job {
+  id: "vm-ffi-qemu-linux-release-arm-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-ffi-qemu-linux-release-arm-stable"
+  }
+}
+job {
+  id: "vm-ffi-qemu-linux-release-riscv64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-ffi-qemu-linux-release-riscv64"
+  }
+}
+job {
+  id: "vm-ffi-qemu-linux-release-riscv64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-ffi-qemu-linux-release-riscv64-beta"
+  }
+}
+job {
+  id: "vm-ffi-qemu-linux-release-riscv64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-ffi-qemu-linux-release-riscv64-stable"
+  }
+}
 job {
   id: "vm-fuchsia-release-arm64"
   realm: "ci.sandbox"
@@ -2044,26 +2104,6 @@ job {
     builder: "vm-msvc-windows"
   }
 }
-job {
-  id: "vm-precomp-ffi-qemu-linux-release-arm"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-arm"
-  }
-}
-job {
-  id: "vm-precomp-ffi-qemu-linux-release-arm-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-arm-beta"
-  }
-}
 job {
   id: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
   realm: "ci.sandbox"
@@ -2074,46 +2114,6 @@ job {
     builder: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
   }
 }
-job {
-  id: "vm-precomp-ffi-qemu-linux-release-arm-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-arm-stable"
-  }
-}
-job {
-  id: "vm-precomp-ffi-qemu-linux-release-riscv64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-riscv64"
-  }
-}
-job {
-  id: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
-  }
-}
-job {
-  id: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
-  }
-}
 job {
   id: "vm-reload-linux-debug-x64"
   realm: "ci.sandbox"
@@ -2305,6 +2305,8 @@ trigger {
   triggers: "vm-ffi-android-product-arm64c-beta"
   triggers: "vm-ffi-android-release-arm-beta"
   triggers: "vm-ffi-android-release-arm64c-beta"
+  triggers: "vm-ffi-qemu-linux-release-arm-beta"
+  triggers: "vm-ffi-qemu-linux-release-riscv64-beta"
   triggers: "vm-kernel-checked-linux-release-x64-beta"
   triggers: "vm-kernel-precomp-linux-debug-x64-beta"
   triggers: "vm-kernel-precomp-linux-release-simarm-beta"
@@ -2317,8 +2319,6 @@ trigger {
   triggers: "vm-mac-debug-x64-beta"
   triggers: "vm-mac-release-arm64-beta"
   triggers: "vm-mac-release-x64-beta"
-  triggers: "vm-precomp-ffi-qemu-linux-release-arm-beta"
-  triggers: "vm-precomp-ffi-qemu-linux-release-riscv64-beta"
   triggers: "vm-win-debug-x64-beta"
   triggers: "vm-win-release-x64-beta"
   gitiles {
@@ -2441,6 +2441,8 @@ trigger {
   triggers: "vm-ffi-android-product-arm64c-stable"
   triggers: "vm-ffi-android-release-arm-stable"
   triggers: "vm-ffi-android-release-arm64c-stable"
+  triggers: "vm-ffi-qemu-linux-release-arm-stable"
+  triggers: "vm-ffi-qemu-linux-release-riscv64-stable"
   triggers: "vm-kernel-checked-linux-release-x64-stable"
   triggers: "vm-kernel-precomp-linux-debug-x64-stable"
   triggers: "vm-kernel-precomp-linux-release-simarm-stable"
@@ -2453,8 +2455,6 @@ trigger {
   triggers: "vm-mac-debug-x64-stable"
   triggers: "vm-mac-release-arm64-stable"
   triggers: "vm-mac-release-x64-stable"
-  triggers: "vm-precomp-ffi-qemu-linux-release-arm-stable"
-  triggers: "vm-precomp-ffi-qemu-linux-release-riscv64-stable"
   triggers: "vm-win-debug-x64-stable"
   triggers: "vm-win-release-x64-stable"
   gitiles {
@@ -2532,6 +2532,8 @@ trigger {
   triggers: "vm-ffi-android-product-arm64c"
   triggers: "vm-ffi-android-release-arm"
   triggers: "vm-ffi-android-release-arm64c"
+  triggers: "vm-ffi-qemu-linux-release-arm"
+  triggers: "vm-ffi-qemu-linux-release-riscv64"
   triggers: "vm-fuchsia-release-arm64"
   triggers: "vm-fuchsia-release-x64"
   triggers: "vm-kernel-checked-linux-release-x64"
@@ -2547,8 +2549,6 @@ trigger {
   triggers: "vm-linux-release-x64"
   triggers: "vm-mac-debug-arm64"
   triggers: "vm-mac-release-arm64"
-  triggers: "vm-precomp-ffi-qemu-linux-release-arm"
-  triggers: "vm-precomp-ffi-qemu-linux-release-riscv64"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/main"
diff --git a/vm.star b/vm.star
index cfc5c169d857..da136aed5da3 100644
--- a/vm.star
+++ b/vm.star
@@ -415,12 +415,12 @@ _extra_builder("vm-ffi-android-debug-arm64c", category = "vm|ffi|d64")
 _extra_builder("vm-ffi-android-release-arm64c", category = "vm|ffi|r64")
 _extra_builder("vm-ffi-android-product-arm64c", category = "vm|ffi|p64")
 _extra_builder(
-    "vm-precomp-ffi-qemu-linux-release-arm",
+    "vm-ffi-qemu-linux-release-arm",
     category = "vm|ffi|qa",
     dimensions = focal,
 )
 _extra_builder(
-    "vm-precomp-ffi-qemu-linux-release-riscv64",
+    "vm-ffi-qemu-linux-release-riscv64",
     category = "vm|ffi|qr",
     dimensions = focal,
 )

From abc8502139ee5fdca7acc6785b653bfb4adcfdcb Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 2 May 2023 10:23:15 +0000
Subject: [PATCH 646/826] [infra] Change some Mac architectures.

vm-aot-mac-release-simarm64 -> vm-aot-mac-release-x64
The introduction of Flutter Desktop and "dart compile exe" mean Mac X64 AOT is now used for more than just testing, and iOS ARM64 is better covered by Mac ARM64.

vm-aot-mac-product-x64 -> vm-aot-mac-product-arm64
The future of Mac is ARM64, so testing should concentrate there.

Change-Id: Ibe71f185772db8192f5baa597c336a4c84af4888
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/300040
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   |  8 ++++----
 generated/cr-buildbucket.cfg | 16 ++++++++--------
 generated/luci-milo.cfg      | 24 ++++++++++++------------
 generated/luci-notify.cfg    |  4 ++--
 generated/luci-scheduler.cfg | 24 ++++++++++++------------
 vm.star                      |  8 ++++----
 6 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 1e0e8f973eb0..2be3add2774d 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -778,7 +778,7 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-mac-release-simarm64-try"
+        name: "dart/try/vm-aot-mac-release-x64-try"
         includable_only: true
       }
       builders {
@@ -2179,7 +2179,7 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-mac-product-x64-try"
+        name: "dart/try/vm-aot-mac-product-arm64-try"
         includable_only: true
       }
       builders {
@@ -2187,7 +2187,7 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-mac-release-simarm64-try"
+        name: "dart/try/vm-aot-mac-release-x64-try"
         includable_only: true
       }
       builders {
@@ -3195,7 +3195,7 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-mac-release-simarm64-try"
+        name: "dart/try/vm-aot-mac-release-x64-try"
         includable_only: true
       }
       builders {
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index d7ed9c5a384f..6d0fb2ad6354 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -4921,9 +4921,9 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-mac-product-x64"
+      name: "vm-aot-mac-product-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
@@ -5005,7 +5005,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-mac-release-simarm64"
+      name: "vm-aot-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5046,7 +5046,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-mac-release-simarm64-beta"
+      name: "vm-aot-mac-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5087,7 +5087,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-mac-release-simarm64-stable"
+      name: "vm-aot-mac-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12242,9 +12242,9 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-mac-product-x64-try"
+      name: "vm-aot-mac-product-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
@@ -12326,7 +12326,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-mac-release-simarm64-try"
+      name: "vm-aot-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 9e28b9e8ee0a..c80fb35896ba 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -128,7 +128,7 @@ consoles {
     name: "buildbucket/luci.dart.try/vm-aot-mac-release-arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-aot-mac-release-simarm64-try"
+    name: "buildbucket/luci.dart.try/vm-aot-mac-release-x64-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-win-release-x64-try"
@@ -143,7 +143,7 @@ consoles {
     name: "buildbucket/luci.dart.try/vm-aot-linux-product-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-aot-mac-product-x64-try"
+    name: "buildbucket/luci.dart.try/vm-aot-mac-product-arm64-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-win-product-x64-try"
@@ -647,9 +647,9 @@ consoles {
     short_name: "m1"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-x64"
     category: "vm|aot"
-    short_name: "ma6"
+    short_name: "m"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-release-x64"
@@ -672,7 +672,7 @@ consoles {
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-product-arm64"
     category: "vm|aot|product"
     short_name: "m"
   }
@@ -1433,9 +1433,9 @@ consoles {
     short_name: "m1"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-simarm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-x64"
     category: "vm|aot"
-    short_name: "ma6"
+    short_name: "m"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-release-x64"
@@ -1458,7 +1458,7 @@ consoles {
     short_name: "l"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-product-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-product-arm64"
     category: "vm|aot|product"
     short_name: "m"
   }
@@ -1945,9 +1945,9 @@ consoles {
     short_name: "ra6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-simarm64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-x64-beta"
     category: "vm|aot"
-    short_name: "ma6"
+    short_name: "m"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-release-x64-beta"
@@ -2301,9 +2301,9 @@ consoles {
     short_name: "ra6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-simarm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-x64-stable"
     category: "vm|aot"
-    short_name: "ma6"
+    short_name: "m"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-release-x64-stable"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 2517350c93ef..e9f561814c71 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -618,7 +618,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-aot-mac-product-x64"
+    name: "vm-aot-mac-product-arm64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -640,7 +640,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-aot-mac-release-simarm64"
+    name: "vm-aot-mac-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 44b440bccb73..f4f106a13691 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1105,13 +1105,13 @@ job {
   }
 }
 job {
-  id: "vm-aot-mac-product-x64"
+  id: "vm-aot-mac-product-arm64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-aot-mac-product-x64"
+    builder: "vm-aot-mac-product-arm64"
   }
 }
 job {
@@ -1125,33 +1125,33 @@ job {
   }
 }
 job {
-  id: "vm-aot-mac-release-simarm64"
+  id: "vm-aot-mac-release-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-aot-mac-release-simarm64"
+    builder: "vm-aot-mac-release-x64"
   }
 }
 job {
-  id: "vm-aot-mac-release-simarm64-beta"
+  id: "vm-aot-mac-release-x64-beta"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-aot-mac-release-simarm64-beta"
+    builder: "vm-aot-mac-release-x64-beta"
   }
 }
 job {
-  id: "vm-aot-mac-release-simarm64-stable"
+  id: "vm-aot-mac-release-x64-stable"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-aot-mac-release-simarm64-stable"
+    builder: "vm-aot-mac-release-x64-stable"
   }
 }
 job {
@@ -2294,7 +2294,7 @@ trigger {
   triggers: "vm-aot-linux-release-simarm64-beta"
   triggers: "vm-aot-linux-release-simarm_x64-beta"
   triggers: "vm-aot-linux-release-x64-beta"
-  triggers: "vm-aot-mac-release-simarm64-beta"
+  triggers: "vm-aot-mac-release-x64-beta"
   triggers: "vm-aot-win-release-x64-beta"
   triggers: "vm-appjit-linux-debug-x64-beta"
   triggers: "vm-appjit-linux-release-x64-beta"
@@ -2430,7 +2430,7 @@ trigger {
   triggers: "vm-aot-linux-release-simarm64-stable"
   triggers: "vm-aot-linux-release-simarm_x64-stable"
   triggers: "vm-aot-linux-release-x64-stable"
-  triggers: "vm-aot-mac-release-simarm64-stable"
+  triggers: "vm-aot-mac-release-x64-stable"
   triggers: "vm-aot-win-release-x64-stable"
   triggers: "vm-appjit-linux-debug-x64-stable"
   triggers: "vm-appjit-linux-release-x64-stable"
@@ -2477,7 +2477,7 @@ trigger {
   triggers: "vm-aot-linux-debug-x64c"
   triggers: "vm-aot-linux-product-x64"
   triggers: "vm-aot-linux-release-arm64"
-  triggers: "vm-aot-mac-product-x64"
+  triggers: "vm-aot-mac-product-arm64"
   triggers: "vm-aot-msan-linux-release-x64"
   triggers: "vm-aot-obfuscate-linux-release-x64"
   triggers: "vm-aot-tsan-linux-release-x64"
@@ -2520,7 +2520,7 @@ trigger {
   triggers: "vm-aot-linux-release-simarm_x64"
   triggers: "vm-aot-linux-release-x64"
   triggers: "vm-aot-mac-release-arm64"
-  triggers: "vm-aot-mac-release-simarm64"
+  triggers: "vm-aot-mac-release-x64"
   triggers: "vm-aot-win-release-x64"
   triggers: "vm-appjit-linux-debug-x64"
   triggers: "vm-appjit-linux-release-x64"
diff --git a/vm.star b/vm.star
index da136aed5da3..4252f80a1a3b 100644
--- a/vm.star
+++ b/vm.star
@@ -230,8 +230,8 @@ _extra_builder(
     properties = [no_android, slow_shards],
 )
 _extra_builder(
-    "vm-aot-mac-release-simarm64",
-    category = "vm|aot|ma6",
+    "vm-aot-mac-release-x64",
+    category = "vm|aot|m",
     dimensions = mac,
     properties = slow_shards,
 )
@@ -260,10 +260,10 @@ _nightly_builder(
     channels = ["try"],
 )
 _nightly_builder(
-    "vm-aot-mac-product-x64",
+    "vm-aot-mac-product-arm64",
     category = "vm|aot|product|m",
     channels = ["try"],
-    dimensions = mac,
+    dimensions = [mac, arm64],
 )
 _nightly_builder(
     "vm-aot-win-product-x64",

From 19e306e06e32dd3c1ad69e34fe367d5dd1c9109b Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Wed, 3 May 2023 15:03:44 +0000
Subject: [PATCH 647/826] Move monorepo try subbuilders to a new try.monorepo
 bucket

This will prevent them from appearing as optional try builders
in the Gerrit UI for Dart SDK CLs.

Bug: b/245485535
Change-Id: I96748fd38ee126bb8ddf4f1bd45b047caa49ec42
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/301100
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 985 ++++++++++++++++++-----------------
 generated/luci-milo.cfg      |  32 +-
 generated/project.cfg        |   2 +-
 generated/realms.cfg         |  14 +-
 monorepo.star                |   2 +
 project.star                 |  14 +
 6 files changed, 541 insertions(+), 508 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 6d0fb2ad6354..56cb01a60499 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -10565,14 +10565,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-android-debug-try"
+      name: "flutter-engine-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -10589,11 +10589,19 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "flutter_test_suites": ['
+        '    "add_to_app_life_cycle_tests",'
+        '    "flutter_plugins",'
+        '    "framework_coverage",'
+        '    "framework_tests",'
+        '    "tool_tests"'
+        '  ],'
+        '  "recipe": "dart/flutter_engine"'
         '}'
       priority: 30
-      execution_timeout_secs: 3600
+      execution_timeout_secs: 28800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10602,14 +10610,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-android-profile-try"
+      name: "flutter-engine-linux-web_tests-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -10627,10 +10635,14 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "flutter_test_suites": ['
+        '    "web_tests",'
+        '    "web_tool_tests"'
+        '  ],'
+        '  "recipe": "dart/flutter_engine"'
         '}'
       priority: 30
-      execution_timeout_secs: 3600
+      execution_timeout_secs: 28800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10639,7 +10651,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-engine-linux-try"
+      name: "flutter-frontend-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10663,19 +10675,10 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "flutter_test_suites": ['
-        '    "add_to_app_life_cycle_tests",'
-        '    "flutter_plugins",'
-        '    "framework_coverage",'
-        '    "framework_tests",'
-        '    "tool_tests"'
-        '  ],'
-        '  "recipe": "dart/flutter_engine"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 28800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10684,14 +10687,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-engine-linux-web_tests-try"
+      name: "flutter-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -10702,21 +10705,24 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$flutter/goma": {'
+        '    "server": "goma.chromium.org"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "builder_name_suffix": "-try",'
         '  "clobber": true,'
-        '  "flutter_test_suites": ['
-        '    "web_tests",'
-        '    "web_tool_tests"'
-        '  ],'
-        '  "recipe": "dart/flutter_engine"'
+        '  "config_name": "host_linux",'
+        '  "environment": "unused",'
+        '  "goma_jobs": "200",'
+        '  "recipe": "engine_v2/engine_v2"'
         '}'
       priority: 30
-      execution_timeout_secs: 28800
+      execution_timeout_secs: 7200
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10725,7 +10731,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-frontend-try"
+      name: "front-end-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10761,14 +10767,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-debug-try"
+      name: "front-end-nnbd-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -10786,10 +10792,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10798,21 +10803,21 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-debug-unopt-try"
+      name: "front-end-nnbd-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10823,10 +10828,13 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 3600
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10835,21 +10843,21 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-profile-try"
+      name: "front-end-nnbd-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10860,10 +10868,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10872,14 +10879,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-release-try"
+      name: "gclient-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -10897,10 +10904,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "dart/gclient"'
         '}'
       priority: 30
-      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10909,14 +10915,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-try"
+      name: "monorepo-roller-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -10927,40 +10933,37 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$flutter/goma": {'
-        '    "server": "goma.chromium.org"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "builder_name_suffix": "-try",'
         '  "clobber": true,'
-        '  "config_name": "host_linux",'
-        '  "environment": "unused",'
-        '  "goma_jobs": "200",'
-        '  "recipe": "engine_v2/engine_v2"'
+        '  "recipe": "roller/monorepo"'
         '}'
       priority: 30
-      execution_timeout_secs: 7200
+      execution_timeout_secs: 1800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.non_production"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "flutter-linux-web-tests-0-try"
+      name: "pkg-linux-debug-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -10978,10 +10981,12 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10990,14 +10995,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-1-try"
+      name: "pkg-linux-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -11015,10 +11020,12 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11027,21 +11034,21 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-2-try"
+      name: "pkg-mac-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11052,33 +11059,44 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 5400
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "flutter-linux-web-tests-3-try"
+      name: "pkg-mac-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11089,10 +11107,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 5400
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11101,21 +11125,21 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-4-try"
+      name: "pkg-win-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11126,26 +11150,32 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "flutter-linux-web-tests-5-try"
+      name: "stable-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -11163,26 +11193,32 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "from_ref": "refs/heads/beta",'
+        '  "recipe": "release/merge",'
+        '  "to_ref": "refs/heads/stable"'
         '}'
       priority: 30
-      execution_timeout_secs: 5400
+      execution_timeout_secs: 900
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.non_production"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "flutter-linux-web-tests-6-try"
+      name: "vm-aot-android-release-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -11200,10 +11236,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
-      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11212,14 +11248,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-7-last-try"
+      name: "vm-aot-android-release-arm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -11237,10 +11273,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
-      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11249,14 +11285,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tool-tests-try"
+      name: "vm-aot-asan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -11273,11 +11309,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11286,14 +11322,14 @@ buckets {
       }
     }
     builders {
-      name: "flutter-wasm-release-try"
+      name: "vm-aot-dwarf-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
+      dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -11311,10 +11347,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11323,7 +11358,7 @@ buckets {
       }
     }
     builders {
-      name: "front-end-linux-release-x64-try"
+      name: "vm-aot-linux-debug-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11348,7 +11383,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -11359,7 +11395,7 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-linux-release-x64-try"
+      name: "vm-aot-linux-debug-simriscv64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11384,7 +11420,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -11395,11 +11432,11 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-mac-release-x64-try"
+      name: "vm-aot-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11409,7 +11446,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11420,13 +11457,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11435,11 +11469,11 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-win-release-x64-try"
+      name: "vm-aot-linux-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11449,7 +11483,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11460,7 +11494,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -11471,7 +11506,7 @@ buckets {
       }
     }
     builders {
-      name: "gclient-try"
+      name: "vm-aot-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11496,7 +11531,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/gclient"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -11507,7 +11542,7 @@ buckets {
       }
     }
     builders {
-      name: "monorepo-roller-try"
+      name: "vm-aot-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11532,23 +11567,18 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "roller/monorepo"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 1800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.non_production"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "pkg-linux-debug-try"
+      name: "vm-aot-linux-release-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11573,9 +11603,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11587,7 +11614,7 @@ buckets {
       }
     }
     builders {
-      name: "pkg-linux-release-try"
+      name: "vm-aot-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11612,9 +11639,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11626,7 +11650,7 @@ buckets {
       }
     }
     builders {
-      name: "pkg-mac-release-arm64-try"
+      name: "vm-aot-mac-product-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
@@ -11651,10 +11675,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11664,19 +11684,15 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "pkg-mac-release-try"
+      name: "vm-aot-mac-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
@@ -11700,9 +11716,10 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_chrome": true'
+        '    "download_android_deps": false'
         '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       caches {
@@ -11717,11 +11734,11 @@ buckets {
       }
     }
     builders {
-      name: "pkg-win-release-try"
+      name: "vm-aot-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11742,25 +11759,23 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "stable-try"
+      name: "vm-aot-msan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11784,26 +11799,20 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "from_ref": "refs/heads/beta",'
-        '  "recipe": "release/merge",'
-        '  "to_ref": "refs/heads/stable"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 900
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.non_production"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-aot-android-release-arm64c-try"
+      name: "vm-aot-obfuscate-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11828,8 +11837,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -11840,7 +11848,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-android-release-arm_x64-try"
+      name: "vm-aot-tsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11864,9 +11872,9 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -11877,7 +11885,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-asan-linux-release-x64-try"
+      name: "vm-aot-ubsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11890,10 +11898,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -11914,11 +11920,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-dwarf-linux-product-x64-try"
+      name: "vm-aot-win-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11928,7 +11934,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11939,7 +11945,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -11950,11 +11957,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-debug-simarm_x64-try"
+      name: "vm-aot-win-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11964,7 +11971,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11975,8 +11982,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -11987,11 +11993,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-debug-simriscv64-try"
+      name: "vm-aot-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12001,7 +12007,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12012,8 +12018,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -12024,7 +12029,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-debug-x64-try"
+      name: "vm-appjit-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12061,7 +12066,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-debug-x64c-try"
+      name: "vm-appjit-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12086,8 +12091,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -12098,7 +12102,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-product-x64-try"
+      name: "vm-appjit-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12134,7 +12138,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-release-simarm64-try"
+      name: "vm-asan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12158,6 +12162,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -12170,11 +12175,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-release-simarm_x64-try"
+      name: "vm-checked-mac-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12184,7 +12189,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12198,15 +12203,23 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-aot-linux-release-x64-try"
+      name: "vm-eager-optimization-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12242,11 +12255,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-mac-product-arm64-try"
+      name: "vm-eager-optimization-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12256,7 +12269,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12269,11 +12282,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12282,11 +12291,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-mac-release-arm64-try"
+      name: "vm-ffi-android-debug-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12296,7 +12305,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12307,17 +12316,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12326,11 +12327,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-mac-release-x64-try"
+      name: "vm-ffi-android-debug-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12340,7 +12341,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12351,14 +12352,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12367,7 +12363,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-msan-linux-release-x64-try"
+      name: "vm-ffi-android-product-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12391,7 +12387,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -12404,7 +12399,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-obfuscate-linux-release-x64-try"
+      name: "vm-ffi-android-product-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12440,7 +12435,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-tsan-linux-release-x64-try"
+      name: "vm-ffi-android-release-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12464,7 +12459,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -12477,7 +12471,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-ubsan-linux-release-x64-try"
+      name: "vm-ffi-android-release-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12490,8 +12484,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -12499,7 +12495,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -12512,11 +12507,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-win-debug-x64c-try"
+      name: "vm-ffi-qemu-linux-release-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12526,7 +12521,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12537,8 +12532,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -12549,11 +12543,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-win-product-x64-try"
+      name: "vm-ffi-qemu-linux-release-riscv64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12563,7 +12557,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12585,11 +12579,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-win-release-x64-try"
+      name: "vm-fuchsia-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12599,7 +12593,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12621,7 +12615,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-debug-x64-try"
+      name: "vm-fuchsia-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12646,8 +12640,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -12658,11 +12651,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-product-x64-try"
+      name: "vm-gcc-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12671,10 +12664,9 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true,'
+        '    "timeout": 4500'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -12686,6 +12678,7 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      execution_timeout_secs: 18000
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12694,7 +12687,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-release-x64-try"
+      name: "vm-kernel-checked-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12724,13 +12717,17 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-asan-linux-release-x64-try"
+      name: "vm-kernel-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12754,7 +12751,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -12767,11 +12763,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-checked-mac-release-arm64-try"
+      name: "vm-kernel-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12781,7 +12777,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12795,23 +12791,15 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-eager-optimization-linux-release-ia32-try"
+      name: "vm-kernel-precomp-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12847,7 +12835,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-eager-optimization-linux-release-x64-try"
+      name: "vm-kernel-precomp-linux-release-simarm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12883,7 +12871,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm-try"
+      name: "vm-kernel-precomp-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12919,11 +12907,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c-try"
+      name: "vm-kernel-win-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12933,7 +12921,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12944,7 +12932,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -12955,7 +12944,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm-try"
+      name: "vm-linux-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12980,7 +12969,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -12991,7 +12981,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c-try"
+      name: "vm-linux-debug-simriscv64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13027,7 +13017,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm-try"
+      name: "vm-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13063,7 +13053,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c-try"
+      name: "vm-linux-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13099,11 +13089,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-qemu-linux-release-arm-try"
+      name: "vm-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13135,11 +13125,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-qemu-linux-release-riscv64-try"
+      name: "vm-linux-release-simarm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13171,7 +13161,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-fuchsia-release-arm64-try"
+      name: "vm-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13207,7 +13197,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-fuchsia-release-x64-try"
+      name: "vm-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13243,11 +13233,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-gcc-linux-try"
+      name: "vm-mac-debug-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13256,9 +13246,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true,'
-        '    "timeout": 4500'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -13267,10 +13258,17 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
-      execution_timeout_secs: 18000
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13279,11 +13277,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64-try"
+      name: "vm-mac-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13293,7 +13291,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -13304,26 +13302,27 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64-try"
+      name: "vm-mac-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13333,7 +13332,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -13344,9 +13343,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13355,11 +13361,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-x64-try"
+      name: "vm-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13369,7 +13375,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -13383,6 +13389,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13391,7 +13401,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-try"
+      name: "vm-msan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13415,6 +13425,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -13427,11 +13438,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-try"
+      name: "vm-msvc-windows-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13440,10 +13451,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -13463,7 +13472,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64-try"
+      name: "vm-reload-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13499,11 +13508,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-win-debug-ia32-try"
+      name: "vm-reload-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-18"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13513,7 +13522,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -13524,8 +13533,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -13536,7 +13544,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-ia32-try"
+      name: "vm-reload-rollback-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13561,8 +13569,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -13573,7 +13580,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-simriscv64-try"
+      name: "vm-reload-rollback-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13609,7 +13616,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-x64-try"
+      name: "vm-tsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13633,6 +13640,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -13645,7 +13653,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-x64c-try"
+      name: "vm-ubsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13658,10 +13666,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -13669,6 +13675,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -13681,11 +13688,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-ia32-try"
+      name: "vm-win-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13695,7 +13702,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -13706,7 +13713,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -13717,11 +13725,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-simarm-try"
+      name: "vm-win-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13731,7 +13739,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -13753,11 +13761,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-simarm64-try"
+      name: "vm-win-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13767,7 +13775,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -13789,11 +13797,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-x64-try"
+      name: "vm-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13803,7 +13811,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -13824,22 +13832,27 @@ buckets {
         value: 100
       }
     }
+  }
+}
+buckets {
+  name: "try.monorepo"
+  swarming {
     builders {
-      name: "vm-mac-debug-arm64-try"
+      name: "flutter-android-debug-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -13850,17 +13863,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13869,21 +13875,21 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-debug-x64-try"
+      name: "flutter-android-profile-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -13894,14 +13900,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13910,21 +13912,21 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-release-arm64-try"
+      name: "flutter-linux-debug-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -13935,16 +13937,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13953,21 +13949,21 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-release-x64-try"
+      name: "flutter-linux-debug-unopt-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -13978,13 +13974,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13993,14 +13986,14 @@ buckets {
       }
     }
     builders {
-      name: "vm-msan-linux-release-x64-try"
+      name: "flutter-linux-profile-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -14017,11 +14010,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14030,21 +14023,23 @@ buckets {
       }
     }
     builders {
-      name: "vm-msvc-windows-try"
+      name: "flutter-linux-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -14053,9 +14048,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14064,14 +14060,14 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-linux-debug-x64-try"
+      name: "flutter-linux-web-tests-0-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -14089,9 +14085,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14100,14 +14097,14 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-linux-release-x64-try"
+      name: "flutter-linux-web-tests-1-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -14125,9 +14122,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14136,14 +14134,14 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-rollback-linux-debug-x64-try"
+      name: "flutter-linux-web-tests-2-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -14161,9 +14159,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14172,14 +14171,14 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-rollback-linux-release-x64-try"
+      name: "flutter-linux-web-tests-3-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -14197,9 +14196,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14208,14 +14208,14 @@ buckets {
       }
     }
     builders {
-      name: "vm-tsan-linux-release-x64-try"
+      name: "flutter-linux-web-tests-4-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -14232,11 +14232,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14245,21 +14245,23 @@ buckets {
       }
     }
     builders {
-      name: "vm-ubsan-linux-release-x64-try"
+      name: "flutter-linux-web-tests-5-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -14267,11 +14269,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14280,21 +14282,21 @@ buckets {
       }
     }
     builders {
-      name: "vm-win-debug-x64-try"
+      name: "flutter-linux-web-tests-6-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -14305,10 +14307,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14317,21 +14319,21 @@ buckets {
       }
     }
     builders {
-      name: "vm-win-debug-x64c-try"
+      name: "flutter-linux-web-tests-7-last-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -14342,9 +14344,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14353,21 +14356,21 @@ buckets {
       }
     }
     builders {
-      name: "vm-win-release-ia32-try"
+      name: "flutter-linux-web-tool-tests-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -14378,9 +14381,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14389,21 +14393,21 @@ buckets {
       }
     }
     builders {
-      name: "vm-win-release-x64-try"
+      name: "flutter-wasm-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -14414,9 +14418,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index c80fb35896ba..46405fbbc03e 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -371,52 +371,52 @@ consoles {
     name: "buildbucket/luci.dart.try/flutter-linux-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-android-debug-try"
+    name: "buildbucket/luci.dart.try.monorepo/flutter-android-debug-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-android-profile-try"
+    name: "buildbucket/luci.dart.try.monorepo/flutter-android-profile-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-linux-debug-try"
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-debug-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-linux-debug-unopt-try"
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-debug-unopt-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-linux-profile-try"
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-profile-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-linux-release-try"
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-wasm-release-try"
+    name: "buildbucket/luci.dart.try.monorepo/flutter-wasm-release-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-linux-web-tests-0-try"
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-web-tests-0-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-linux-web-tests-1-try"
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-web-tests-1-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-linux-web-tests-2-try"
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-web-tests-2-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-linux-web-tests-3-try"
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-web-tests-3-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-linux-web-tests-4-try"
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-web-tests-4-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-linux-web-tests-5-try"
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-web-tests-5-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-linux-web-tests-6-try"
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-web-tests-6-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-linux-web-tests-7-last-try"
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-web-tests-7-last-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/flutter-linux-web-tool-tests-try"
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-web-tool-tests-try"
   }
   builder_view_only: true
 }
diff --git a/generated/project.cfg b/generated/project.cfg
index 0bbc9d405147..7c42e6a2f300 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.39.4"
+  version: "1.39.8"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/generated/realms.cfg b/generated/realms.cfg
index f7e9121e3352..ed712487e338 100644
--- a/generated/realms.cfg
+++ b/generated/realms.cfg
@@ -126,7 +126,6 @@ realms {
     principals: "group:project-dart-tryjob-access"
     principals: "group:service-account-cq"
     principals: "user:dart-eng-tool-proxy@system.gserviceaccount.com"
-    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
   }
   bindings {
     role: "role/swarming.taskTriggerer"
@@ -134,6 +133,19 @@ realms {
     principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
   }
 }
+realms {
+  name: "try.monorepo"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "group:project-dart-tryjob-access"
+    principals: "group:service-account-cq"
+    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
+}
 realms {
   name: "try.shared"
   bindings {
diff --git a/monorepo.star b/monorepo.star
index 2b78ec358e69..793ebfb8223d 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -108,6 +108,7 @@ def monorepo_builder(name, short_name, category):
     )
     dart.try_builder(
         name,
+        bucket = "try.monorepo",
         executable = dart.flutter_recipe("engine_v2/builder"),
         execution_timeout = 60 * time.minute,
         pool = "dart.tests",
@@ -148,6 +149,7 @@ def monorepo_tester(name, short_name, category):
     )
     dart.try_builder(
         name,
+        bucket = "try.monorepo",
         executable = dart.flutter_recipe("engine_v2/tester"),
         execution_timeout = 90 * time.minute,
         pool = "dart.tests",
diff --git a/project.star b/project.star
index 61ce8e42967b..630c75b31e37 100644
--- a/project.star
+++ b/project.star
@@ -114,7 +114,21 @@ luci.bucket(
                 # For workflows that need to be authorized by Google-internal
                 # approval mechanisms, see b/231131625
                 "dart-eng-tool-proxy@system.gserviceaccount.com",
+            ],
+        ),
+    ],
+)
+
+# Tryjobs specific to the monorepo repo.
+# These should only be triggered by the monorepo coordinator flutter-linux-try.
+luci.bucket(
+    name = "try.monorepo",
+    acls = TRY_ACLS + [
+        acl.entry(
+            acl.BUILDBUCKET_TRIGGERER,
+            users = [
                 # Monorepo builds use a coordinator build to add try builds.
+                # It runs with the try_builder account.
                 accounts.try_builder,
             ],
         ),

From 3336594aa207de1cfc4459756bf71e546cf47a51 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Thu, 4 May 2023 11:25:17 +0000
Subject: [PATCH 648/826] [infra] Remove monorepo-roller-try

This should never have existed, perhaps was added during prototyping.
The monorepo roller is running on dart-internal.

Change-Id: Idbd57e6b84e7ff6d36e3fde76d8fd28cc1d2d8fb
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/301381
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/commit-queue.cfg   | 16 --------------
 generated/cr-buildbucket.cfg | 41 ------------------------------------
 generated/luci-milo.cfg      |  3 ---
 monorepo.star                |  7 ------
 4 files changed, 67 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 2be3add2774d..a761eec187b1 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -734,10 +734,6 @@ config_groups {
         name: "dart/try/gclient-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/monorepo-roller-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/pkg-linux-release-try"
       }
@@ -1108,10 +1104,6 @@ config_groups {
         name: "dart/try/dev-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/monorepo-roller-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/stable-try"
         includable_only: true
@@ -2103,10 +2095,6 @@ config_groups {
         name: "dart/try/gclient-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/monorepo-roller-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/pkg-linux-debug-try"
         includable_only: true
@@ -3151,10 +3139,6 @@ config_groups {
         name: "dart/try/gclient-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/monorepo-roller-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/pkg-linux-release-try"
       }
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 56cb01a60499..1faa4d8240f9 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -10914,47 +10914,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "monorepo-roller-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "roller/monorepo"'
-        '}'
-      priority: 30
-      execution_timeout_secs: 1800
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.non_production"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "pkg-linux-debug-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 46405fbbc03e..d2002db95910 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -364,9 +364,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/stable-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/monorepo-roller-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/flutter-linux-try"
   }
diff --git a/monorepo.star b/monorepo.star
index 793ebfb8223d..d75de7ce8582 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -39,13 +39,6 @@ luci.console_view(
     header = "console-header.textpb",
 )
 
-dart.try_builder(
-    "monorepo-roller",
-    experiments = {"luci.non_production": 100},
-    recipe = "roller/monorepo",
-    execution_timeout = 30 * time.minute,
-)
-
 dart.ci_sandbox_builder(
     name = "flutter-linux",
     channels = [],

From 2de6d91988bcbadb98cd18ce213d0bfb3794176f Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 9 May 2023 16:42:38 +0000
Subject: [PATCH 649/826] [infra] Require 8 cores for vm-aot-mac-release-x64.

Change-Id: I1b42fd5b8bf7d9d66ee1f21b30acce0fce1a3b8a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/300801
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/cr-buildbucket.cfg | 4 ++++
 vm.star                      | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 1faa4d8240f9..9c088cd54009 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5007,6 +5007,7 @@ buckets {
     builders {
       name: "vm-aot-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -5048,6 +5049,7 @@ buckets {
     builders {
       name: "vm-aot-mac-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -5089,6 +5091,7 @@ buckets {
     builders {
       name: "vm-aot-mac-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -11695,6 +11698,7 @@ buckets {
     builders {
       name: "vm-aot-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
diff --git a/vm.star b/vm.star
index 4252f80a1a3b..e73dfe3d83be 100644
--- a/vm.star
+++ b/vm.star
@@ -232,7 +232,9 @@ _extra_builder(
 _extra_builder(
     "vm-aot-mac-release-x64",
     category = "vm|aot|m",
-    dimensions = mac,
+    # The x64 Mac pool contains a mix of 4- and 8-core machines. This build
+    # times out on a 4-core machine.
+    dimensions = [mac, {"cores": "8"}],
     properties = slow_shards,
 )
 _extra_builder(

From 531878d457a79d06e1338d9b6ce7df7e9f646806 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Thu, 11 May 2023 05:56:28 +0000
Subject: [PATCH 650/826] [infra] Reduce legacy testing now that stable channel
 is on 3.0.

Change-Id: I08b67812a04e24fc65366fc856b41b6bb3d8591e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/302441
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   |  44 ---
 generated/cr-buildbucket.cfg | 534 +----------------------------------
 generated/luci-milo.cfg      |  79 ------
 generated/luci-notify.cfg    |  47 +--
 generated/luci-scheduler.cfg | 129 +--------
 vm.star                      |  28 +-
 6 files changed, 27 insertions(+), 834 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index a761eec187b1..d2d903eff0fc 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -825,22 +825,6 @@ config_groups {
         name: "dart/try/vm-ffi-qemu-linux-release-riscv64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-checked-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-linux-debug-x64-try"
         includable_only: true
@@ -2278,10 +2262,6 @@ config_groups {
         name: "dart/try/vm-gcc-linux-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-checked-linux-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-linux-debug-x64-try"
         includable_only: true
@@ -2294,18 +2274,10 @@ config_groups {
         name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-win-debug-ia32-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-linux-debug-ia32-try"
         includable_only: true
@@ -3230,22 +3202,6 @@ config_groups {
         name: "dart/try/vm-ffi-qemu-linux-release-riscv64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-checked-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-simarm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-linux-debug-x64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 9c088cd54009..6dc27b875395 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -6928,307 +6928,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-checked-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-checked-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-checked-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-debug-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-debug-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-release-simarm"
+      name: "vm-kernel-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7255,7 +6955,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7264,7 +6964,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-beta"
+      name: "vm-kernel-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7291,7 +6991,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7300,7 +7000,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-simarm-stable"
+      name: "vm-kernel-precomp-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7327,7 +7027,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7363,115 +7063,6 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-win-debug-ia32"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
       priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -12649,46 +12240,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-checked-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -12797,42 +12348,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-precomp-linux-release-simarm-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-precomp-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -12869,43 +12384,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-win-debug-ia32-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-linux-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index d2002db95910..835e5c2c6a88 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -250,18 +250,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-checked-linux-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-win-debug-ia32-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-simarm-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-x64-try"
   }
@@ -848,26 +839,11 @@ consoles {
     category: "vm|legacy|jit"
     short_name: "r"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
-    category: "vm|legacy|jit"
-    short_name: "rc"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
-    category: "vm|legacy|jit"
-    short_name: "wd3"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
     category: "vm|legacy|aot"
     short_name: "d"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
-    category: "vm|legacy|aot"
-    short_name: "a32"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
     category: "vm|legacy|aot"
@@ -1634,26 +1610,11 @@ consoles {
     category: "vm|legacy|jit"
     short_name: "r"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64"
-    category: "vm|legacy|jit"
-    short_name: "rc"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-win-debug-ia32"
-    category: "vm|legacy|jit"
-    short_name: "wd3"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
     category: "vm|legacy|aot"
     short_name: "d"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm"
-    category: "vm|legacy|aot"
-    short_name: "a32"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
     category: "vm|legacy|aot"
@@ -2001,26 +1962,6 @@ consoles {
     category: "vm|ffi"
     short_name: "qr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-beta"
-    category: "vm|legacy|jit"
-    short_name: "rc"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-beta"
-    category: "vm|legacy|aot"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-beta"
-    category: "vm|legacy|aot"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-beta"
-    category: "vm|legacy|aot"
-    short_name: "r"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-beta"
     category: "pkg"
@@ -2357,26 +2298,6 @@ consoles {
     category: "vm|ffi"
     short_name: "qr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-checked-linux-release-x64-stable"
-    category: "vm|legacy|jit"
-    short_name: "rc"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64-stable"
-    category: "vm|legacy|aot"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-simarm-stable"
-    category: "vm|legacy|aot"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64-stable"
-    category: "vm|legacy|aot"
-    short_name: "r"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-stable"
     category: "pkg"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index e9f561814c71..818fe0961ee7 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -942,18 +942,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-checked-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
@@ -964,7 +955,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
@@ -975,7 +968,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
@@ -983,28 +978,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-release-simarm"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1014,7 +987,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-kernel-win-debug-ia32"
+    name: "vm-kernel-precomp-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index f4f106a13691..5d1af0c031fc 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1644,36 +1644,6 @@ job {
     builder: "vm-gcc-linux"
   }
 }
-job {
-  id: "vm-kernel-checked-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-checked-linux-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-checked-linux-release-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-checked-linux-release-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-checked-linux-release-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-checked-linux-release-x64-stable"
-  }
-}
 job {
   id: "vm-kernel-linux-debug-x64"
   realm: "ci.sandbox"
@@ -1704,56 +1674,6 @@ job {
     builder: "vm-kernel-precomp-linux-debug-x64"
   }
 }
-job {
-  id: "vm-kernel-precomp-linux-debug-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-debug-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64-stable"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-simarm"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-simarm-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm-beta"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-simarm-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-simarm-stable"
-  }
-}
 job {
   id: "vm-kernel-precomp-linux-release-x64"
   realm: "ci.sandbox"
@@ -1764,36 +1684,6 @@ job {
     builder: "vm-kernel-precomp-linux-release-x64"
   }
 }
-job {
-  id: "vm-kernel-precomp-linux-release-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-x64-beta"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-x64-stable"
-  }
-}
-job {
-  id: "vm-kernel-win-debug-ia32"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-win-debug-ia32"
-  }
-}
 job {
   id: "vm-linux-debug-ia32"
   realm: "ci.sandbox"
@@ -2307,10 +2197,6 @@ trigger {
   triggers: "vm-ffi-android-release-arm64c-beta"
   triggers: "vm-ffi-qemu-linux-release-arm-beta"
   triggers: "vm-ffi-qemu-linux-release-riscv64-beta"
-  triggers: "vm-kernel-checked-linux-release-x64-beta"
-  triggers: "vm-kernel-precomp-linux-debug-x64-beta"
-  triggers: "vm-kernel-precomp-linux-release-simarm-beta"
-  triggers: "vm-kernel-precomp-linux-release-x64-beta"
   triggers: "vm-linux-debug-x64-beta"
   triggers: "vm-linux-release-simarm-beta"
   triggers: "vm-linux-release-simarm64-beta"
@@ -2443,10 +2329,6 @@ trigger {
   triggers: "vm-ffi-android-release-arm64c-stable"
   triggers: "vm-ffi-qemu-linux-release-arm-stable"
   triggers: "vm-ffi-qemu-linux-release-riscv64-stable"
-  triggers: "vm-kernel-checked-linux-release-x64-stable"
-  triggers: "vm-kernel-precomp-linux-debug-x64-stable"
-  triggers: "vm-kernel-precomp-linux-release-simarm-stable"
-  triggers: "vm-kernel-precomp-linux-release-x64-stable"
   triggers: "vm-linux-debug-x64-stable"
   triggers: "vm-linux-release-simarm-stable"
   triggers: "vm-linux-release-simarm64-stable"
@@ -2488,7 +2370,10 @@ trigger {
   triggers: "vm-asan-linux-release-x64"
   triggers: "vm-eager-optimization-linux-release-ia32"
   triggers: "vm-gcc-linux"
-  triggers: "vm-kernel-win-debug-ia32"
+  triggers: "vm-kernel-linux-debug-x64"
+  triggers: "vm-kernel-linux-release-x64"
+  triggers: "vm-kernel-precomp-linux-debug-x64"
+  triggers: "vm-kernel-precomp-linux-release-x64"
   triggers: "vm-linux-debug-ia32"
   triggers: "vm-linux-debug-simriscv64"
   triggers: "vm-linux-debug-x64c"
@@ -2536,12 +2421,6 @@ trigger {
   triggers: "vm-ffi-qemu-linux-release-riscv64"
   triggers: "vm-fuchsia-release-arm64"
   triggers: "vm-fuchsia-release-x64"
-  triggers: "vm-kernel-checked-linux-release-x64"
-  triggers: "vm-kernel-linux-debug-x64"
-  triggers: "vm-kernel-linux-release-x64"
-  triggers: "vm-kernel-precomp-linux-debug-x64"
-  triggers: "vm-kernel-precomp-linux-release-simarm"
-  triggers: "vm-kernel-precomp-linux-release-x64"
   triggers: "vm-linux-debug-x64"
   triggers: "vm-linux-release-arm64"
   triggers: "vm-linux-release-simarm"
diff --git a/vm.star b/vm.star
index e73dfe3d83be..ca8d065f6c3d 100644
--- a/vm.star
+++ b/vm.star
@@ -427,42 +427,28 @@ _extra_builder(
     dimensions = focal,
 )
 
-#vm|legacy|jit
-_extra_builder(
+# vm|legacy|jit
+_nightly_builder(
     "vm-kernel-linux-debug-x64",
     category = "vm|legacy|jit|d",
     channels = ["try"],
 )
-_extra_builder(
+_nightly_builder(
     "vm-kernel-linux-release-x64",
     category = "vm|legacy|jit|r",
     channels = ["try"],
 )
-_extra_builder(
-    "vm-kernel-checked-linux-release-x64",
-    category = "vm|legacy|jit|rc",
-    experiments = {"dart.use_update_script": 100},
-)
-_nightly_builder(
-    "vm-kernel-win-debug-ia32",
-    category = "vm|legacy|jit|wd3",
-    channels = ["try"],
-    dimensions = windows,
-    properties = [slow_shards],
-)
 
 # vm|legacy|aot
-_extra_builder(
+_nightly_builder(
     "vm-kernel-precomp-linux-debug-x64",
     category = "vm|legacy|aot|d",
+    channels = ["try"],
 )
-_extra_builder(
-    "vm-kernel-precomp-linux-release-simarm",
-    category = "vm|legacy|aot|a32",
-)
-_extra_builder(
+_nightly_builder(
     "vm-kernel-precomp-linux-release-x64",
     category = "vm|legacy|aot|r",
+    channels = ["try"],
 )
 
 # Isolate stress test builder

From ec3622580d123c2898d41f2d16100456a2046e53 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Mon, 15 May 2023 10:53:31 +0000
Subject: [PATCH 651/826] [infra] Fix experimental focal ffi qemu arm builder.

Fixes: b/282670841
Change-Id: I2cddd83e5baa1aa11ba4c836821b0bc3e5f60b07
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/303320
Commit-Queue: Jonas Termansen <sortie@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 72 ++++++++++++++++++------------------
 generated/luci-notify.cfg    | 30 +++++++--------
 generated/luci-scheduler.cfg | 22 +++++------
 main.star                    |  4 +-
 4 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 6dc27b875395..0ba8f8d410cb 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -6673,6 +6673,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-ffi-qemu-linux-release-arm-experimental"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:experimental"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-ffi-qemu-linux-release-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8261,42 +8297,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:experimental"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-reload-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 818fe0961ee7..c2928866565d 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -893,6 +893,21 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "athom@google.com"
+      recipients: "sortie@google.com"
+      recipients: "whesse@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-ffi-qemu-linux-release-arm-experimental"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1168,21 +1183,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 5d1af0c031fc..d3ec18f970d6 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1574,6 +1574,16 @@ job {
     builder: "vm-ffi-qemu-linux-release-arm-beta"
   }
 }
+job {
+  id: "vm-ffi-qemu-linux-release-arm-experimental"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-ffi-qemu-linux-release-arm-experimental"
+  }
+}
 job {
   id: "vm-ffi-qemu-linux-release-arm-stable"
   realm: "ci.sandbox"
@@ -1994,16 +2004,6 @@ job {
     builder: "vm-msvc-windows"
   }
 }
-job {
-  id: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
-  }
-}
 job {
   id: "vm-reload-linux-debug-x64"
   realm: "ci.sandbox"
@@ -2369,6 +2369,7 @@ trigger {
   triggers: "vm-appjit-linux-product-x64"
   triggers: "vm-asan-linux-release-x64"
   triggers: "vm-eager-optimization-linux-release-ia32"
+  triggers: "vm-ffi-qemu-linux-release-arm-experimental"
   triggers: "vm-gcc-linux"
   triggers: "vm-kernel-linux-debug-x64"
   triggers: "vm-kernel-linux-release-x64"
@@ -2380,7 +2381,6 @@ trigger {
   triggers: "vm-linux-release-ia32"
   triggers: "vm-msan-linux-release-x64"
   triggers: "vm-msvc-windows"
-  triggers: "vm-precomp-ffi-qemu-linux-release-arm-experimental"
   triggers: "vm-reload-linux-debug-x64"
   triggers: "vm-reload-linux-release-x64"
   triggers: "vm-reload-rollback-linux-debug-x64"
diff --git a/main.star b/main.star
index a3a7bb86c744..b455d57c1638 100755
--- a/main.star
+++ b/main.star
@@ -148,11 +148,11 @@ dart.ci_sandbox_builder("gclient", recipe = "dart/gclient", category = "misc|g")
 # Builders that test the dev Linux images. When the image autoroller detects
 # successful builds of these builders with a dev images, that dev image becomes
 # the new prod image. Newly created bots will than use the updated image. The
-# `vm-precomp-ffi-qemu-linux-release-arm` and the `pkg-linux-release`
+# `vm-ffi-qemu-linux-release-arm` and the `pkg-linux-release`
 # are used because qemu is the main difference on focal, they don't trigger
 # shards and run a few different builds. See also https://crbug.com/1207358.
 cron.nightly_builder(
-    "vm-precomp-ffi-qemu-linux-release-arm-experimental",
+    "vm-ffi-qemu-linux-release-arm-experimental",
     channels = [],
     dimensions = [experimental, focal],
     notifies = "infra",

From e55e33c8cdb559d9d9bc9c8590d4fe03050b360e Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 15 May 2023 19:05:44 +0000
Subject: [PATCH 652/826] [infra] Add try-only vm-win-release-arm64 builder.

Change-Id: If71c9571786688ea5398412c9012f6b54dad50d8
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/303083
Reviewed-by: Yusuf Mohsinally <mohsinally@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   | 16 ++++++++++++++++
 generated/cr-buildbucket.cfg | 36 ++++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      |  3 +++
 lib/dart.star                |  4 ++--
 lib/defaults.star            |  2 ++
 vm.star                      |  6 ++++++
 6 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index d2d903eff0fc..0f3811476adf 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -999,6 +999,10 @@ config_groups {
         name: "dart/try/vm-win-debug-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-win-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-win-release-x64-try"
         includable_only: true
@@ -1092,6 +1096,10 @@ config_groups {
         name: "dart/try/stable-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-win-release-arm64-try"
+        includable_only: true
+      }
       retry_config {}
     }
   }
@@ -2504,6 +2512,10 @@ config_groups {
         name: "dart/try/vm-win-debug-x64c-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-win-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-win-release-ia32-try"
         includable_only: true
@@ -3376,6 +3388,10 @@ config_groups {
         name: "dart/try/vm-win-debug-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-win-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-win-release-x64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 0ba8f8d410cb..7141cb07fa2c 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -13201,6 +13201,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-win-release-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-win-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 835e5c2c6a88..cd21111f698a 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -97,6 +97,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-win-release-x64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-win-release-arm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-appjit-linux-debug-x64-try"
   }
diff --git a/lib/dart.star b/lib/dart.star
index 33715e411f13..31671fbbfed1 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -6,7 +6,7 @@ Defines rules that can be used to define dart builders.
 """
 
 load("//lib/accounts.star", "accounts")
-load("//lib/defaults.star", "defaults", "focal", "linux", "mac", "windows")
+load("//lib/defaults.star", "defaults", "focal", "linux", "mac", "windows", "windows11")
 load("//lib/paths.star", "paths")
 load("//lib/priority.star", "priority")
 
@@ -202,7 +202,7 @@ def _builder(
         if os_pattern in name and os not in expected_os:
             fail("builder %s should be a %s builder but was %s" % (name, expected_os, os))
 
-    expect_os("-win", windows["os"])
+    expect_os("-win", [windows["os"], windows11["os"]])
     expect_os("-linux", [linux["os"], focal["os"]])
     expect_os("-mac", mac["os"])
 
diff --git a/lib/defaults.star b/lib/defaults.star
index fa250e107ada..9dd7b1247b4e 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -27,6 +27,7 @@ _MAC = {"os": "Mac"}
 _BIONIC = {"os": "Ubuntu-18"}
 _FOCAL = {"os": "Ubuntu-20"}
 _WINDOWS10 = {"os": "Windows-10"}
+_WINDOWS11 = {"os": "Windows-11"}
 
 _EXPERIMENTAL = {"host_class": "experimental"}
 
@@ -75,6 +76,7 @@ linux = _BIONIC
 mac = _MAC
 windows = _WINDOWS10
 windows10 = _WINDOWS10
+windows11 = _WINDOWS11
 
 # Properties
 
diff --git a/vm.star b/vm.star
index ca8d065f6c3d..b8d6168dd279 100644
--- a/vm.star
+++ b/vm.star
@@ -15,6 +15,7 @@ load(
     "no_android",
     "slow_shards",
     "windows",
+    "windows11",
 )
 load("//lib/paths.star", "paths")
 load("//lib/priority.star", "priority")
@@ -169,6 +170,11 @@ _builder(
     category = "vm|jit|wr",
     dimensions = windows,
 )
+dart.try_builder(
+    "vm-win-release-arm64",
+    dimensions = [windows11, arm64],
+    pool = "luci.flutter.staging",
+)
 
 # vm|appjit
 _extra_builder(

From 08d2d24882d126f1e6f1ed5b3ef3817e2d03fb7f Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Mon, 22 May 2023 11:35:45 +0000
Subject: [PATCH 653/826] [monorepo] Change the names of monorepo builders

A recipe change in Flutter will change the names of monorepo builders
triggered by the engine_v2 monorepo coordinator build.

That change is https://flutter-review.googlesource.com/c/recipes/+/44300

After that change lands, a follow-up CL will remove the old builder names.

Bug: b/245485535
Change-Id: Ib7e4302662f976137a8a6fbac7718695ebdaa97d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/304680
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 518 +++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      |  84 ++++++
 monorepo.star                |  13 +
 3 files changed, 615 insertions(+)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 7141cb07fa2c..770f7c96937d 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -2443,6 +2443,80 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "flutter-linux-android_debug"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-linux-android_profile"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "flutter-linux-debug"
       swarming_host: "chromium-swarm.appspot.com"
@@ -2517,6 +2591,154 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "flutter-linux-host_debug"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-linux-host_debug_unopt"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-linux-host_profile"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-linux-host_release"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "flutter-linux-profile"
       swarming_host: "chromium-swarm.appspot.com"
@@ -2591,6 +2813,43 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "flutter-linux-wasm_release"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "flutter-linux-web-tests-0"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13388,6 +13647,80 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "flutter-linux-android_debug-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-linux-android_profile-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "flutter-linux-debug-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13462,6 +13795,154 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "flutter-linux-host_debug-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-linux-host_debug_unopt-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-linux-host_profile-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-linux-host_release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "flutter-linux-profile-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13536,6 +14017,43 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "flutter-linux-wasm_release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-18"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "flutter-linux-web-tests-0-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index cd21111f698a..b21a388773c0 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -382,6 +382,27 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try.monorepo/flutter-wasm-release-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-android_debug-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-android_profile-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-host_debug-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-host_debug_unopt-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-host_profile-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-host_release-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-wasm_release-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try.monorepo/flutter-linux-web-tests-0-try"
   }
@@ -2540,6 +2561,41 @@ consoles {
     category: "build"
     short_name: "wasm"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_debug"
+    category: "build"
+    short_name: "android-debug-2"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_profile"
+    category: "build"
+    short_name: "android-profile-2"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-host_debug"
+    category: "build"
+    short_name: "debug-2"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-host_debug_unopt"
+    category: "build"
+    short_name: "debug-unopt-2"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-host_profile"
+    category: "build"
+    short_name: "profile-2"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-host_release"
+    category: "build"
+    short_name: "release-2"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-wasm_release"
+    category: "build"
+    short_name: "wasm-2"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-0"
     category: "web_test"
@@ -2669,6 +2725,34 @@ consoles {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-wasm-release"
     short_name: "wasm"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_debug"
+    short_name: "android-debug-2"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_profile"
+    short_name: "android-profile-2"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-host_debug"
+    short_name: "debug-2"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-host_debug_unopt"
+    short_name: "debug-unopt-2"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-host_profile"
+    short_name: "profile-2"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-host_release"
+    short_name: "release-2"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-wasm_release"
+    short_name: "wasm-2"
+  }
   header {
     links {
       name: "Consoles"
diff --git a/monorepo.star b/monorepo.star
index d75de7ce8582..f9f3bfe2904e 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -109,6 +109,10 @@ def monorepo_builder(name, short_name, category):
         cq_branches = [],
     )
 
+# Builder names before recipe change
+# https://flutter-review.googlesource.com/c/recipes/+/44300 lands.
+# Remove this section after that change lands.
+# Issue b/245485535
 monorepo_builder("flutter-android-debug", "android-debug", "build")
 monorepo_builder("flutter-android-profile", "android-profile", "build")
 monorepo_builder("flutter-linux-debug", "debug", "build")
@@ -117,6 +121,15 @@ monorepo_builder("flutter-linux-profile", "profile", "build")
 monorepo_builder("flutter-linux-release", "release", "build")
 monorepo_builder("flutter-wasm-release", "wasm", "build")
 
+# Builder names after change lands. Remove -2 when old builders are removed.
+monorepo_builder("flutter-linux-android_debug", "android-debug-2", "build")
+monorepo_builder("flutter-linux-android_profile", "android-profile-2", "build")
+monorepo_builder("flutter-linux-host_debug", "debug-2", "build")
+monorepo_builder("flutter-linux-host_debug_unopt", "debug-unopt-2", "build")
+monorepo_builder("flutter-linux-host_profile", "profile-2", "build")
+monorepo_builder("flutter-linux-host_release", "release-2", "build")
+monorepo_builder("flutter-linux-wasm_release", "wasm-2", "build")
+
 def monorepo_tester(name, short_name, category):
     dart.ci_sandbox_builder(
         name = name,

From 74ef10dd38917ffa2af38635359fe5133c7e87ac Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Mon, 22 May 2023 11:44:12 +0000
Subject: [PATCH 654/826] Run experimental builders just before the image
 autoroller.

There was a three hour window between the nightly builders and the
autoroller where a new disk image may have been built, but the bot did
not use it yet. This change reduces that window to 1 hour 15 minutes
which is just enough to run the ffi qemu builder. Hopefully this reduces
the amount of rolls that fail because the bot image wasn't new enough.

Fixes: b/283753779
Change-Id: I00b3d3726121be05744ccc3bfd7d35651beeac87
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/304681
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 generated/luci-scheduler.cfg | 13 +++++++++++--
 lib/cron.star                | 21 +++++++++++++++++++++
 main.star                    |  4 ++--
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index d3ec18f970d6..1305b899d372 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -2344,6 +2344,17 @@ trigger {
     refs: "regexp:refs/heads/stable"
   }
 }
+trigger {
+  id: "dart-image-trigger"
+  realm: "ci"
+  schedule: "45 6 * * 1-5"
+  triggers: "pkg-linux-release-experimental"
+  triggers: "vm-ffi-qemu-linux-release-arm-experimental"
+  gitiles {
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/main"
+  }
+}
 trigger {
   id: "dart-nightly-trigger"
   realm: "ci"
@@ -2351,7 +2362,6 @@ trigger {
   triggers: "ddc-canary-linux-chrome"
   triggers: "front-end-nnbd-mac-release-x64"
   triggers: "front-end-nnbd-win-release-x64"
-  triggers: "pkg-linux-release-experimental"
   triggers: "vm-aot-asan-linux-release-x64"
   triggers: "vm-aot-dwarf-linux-product-x64"
   triggers: "vm-aot-linux-debug-simriscv64"
@@ -2369,7 +2379,6 @@ trigger {
   triggers: "vm-appjit-linux-product-x64"
   triggers: "vm-asan-linux-release-x64"
   triggers: "vm-eager-optimization-linux-release-ia32"
-  triggers: "vm-ffi-qemu-linux-release-arm-experimental"
   triggers: "vm-gcc-linux"
   triggers: "vm-kernel-linux-debug-x64"
   triggers: "vm-kernel-linux-release-x64"
diff --git a/lib/cron.star b/lib/cron.star
index 370562f3e943..6602f7791407 100644
--- a/lib/cron.star
+++ b/lib/cron.star
@@ -8,6 +8,26 @@ Defines rules that can be used to define nightly and weekly builders.
 load("//lib/dart.star", "dart")
 load("//lib/priority.star", "priority")
 
+def _image_builder(name, notifies = None, **kwargs):
+    dart.ci_sandbox_builder(
+        name,
+        notifies = notifies or [luci.notifier(
+            name = "nightly",
+            on_new_failure = True,
+        )],
+        on_cq = False,
+        priority = priority.low,
+        triggered_by = [luci.gitiles_poller(
+            name = "dart-image-trigger",
+            bucket = "ci",
+            repo = dart.git,
+            refs = ["refs/heads/main"],
+            # Finish before the image roller runs at Mon-Fri 08:00 UTC.
+            schedule = "45 6 * * 1-5",  # Mon-Fri at 06:45 UTC
+        )],
+        **kwargs
+    )
+
 def _nightly_builder(name, notifies = None, **kwargs):
     dart.ci_sandbox_builder(
         name,
@@ -44,6 +64,7 @@ def _weekly_builder(name, notifies = None, **kwargs):
     )
 
 cron = struct(
+    image_builder = _image_builder,
     nightly_builder = _nightly_builder,
     weekly_builder = _weekly_builder,
 )
diff --git a/main.star b/main.star
index b455d57c1638..f2e72dac82d4 100755
--- a/main.star
+++ b/main.star
@@ -151,13 +151,13 @@ dart.ci_sandbox_builder("gclient", recipe = "dart/gclient", category = "misc|g")
 # `vm-ffi-qemu-linux-release-arm` and the `pkg-linux-release`
 # are used because qemu is the main difference on focal, they don't trigger
 # shards and run a few different builds. See also https://crbug.com/1207358.
-cron.nightly_builder(
+cron.image_builder(
     "vm-ffi-qemu-linux-release-arm-experimental",
     channels = [],
     dimensions = [experimental, focal],
     notifies = "infra",
 )
-cron.nightly_builder(
+cron.image_builder(
     "pkg-linux-release-experimental",
     channels = [],
     dimensions = experimental,

From a02669dd7a29c3991ae76db52adc5a950461786d Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Tue, 23 May 2023 11:31:34 +0000
Subject: [PATCH 655/826] [monorepo] Remove old monorepo builders, they have
 been replaced

Bug: b/24585535
Change-Id: I6b1361d568c8d3a5368db861fea2af77c671d584
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/304921
Auto-Submit: William Hesse <whesse@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 518 -----------------------------------
 generated/luci-milo.cfg      | 112 +-------
 monorepo.star                |  27 +-
 3 files changed, 21 insertions(+), 636 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 770f7c96937d..7fa1be81112d 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -2245,80 +2245,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "flutter-android-debug"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 3600
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "flutter-android-profile"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 3600
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "flutter-engine-linux"
       swarming_host: "chromium-swarm.appspot.com"
@@ -2517,80 +2443,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "flutter-linux-debug"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 3600
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "flutter-linux-debug-unopt"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 3600
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "flutter-linux-host_debug"
       swarming_host: "chromium-swarm.appspot.com"
@@ -2739,80 +2591,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "flutter-linux-profile"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 3600
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "flutter-linux-release"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 3600
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "flutter-linux-wasm_release"
       swarming_host: "chromium-swarm.appspot.com"
@@ -3183,43 +2961,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "flutter-wasm-release"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 3600
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "front-end-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13573,80 +13314,6 @@ buckets {
 buckets {
   name: "try.monorepo"
   swarming {
-    builders {
-      name: "flutter-android-debug-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
-        '}'
-      priority: 30
-      execution_timeout_secs: 3600
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "flutter-android-profile-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
-        '}'
-      priority: 30
-      execution_timeout_secs: 3600
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "flutter-linux-android_debug-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13721,80 +13388,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "flutter-linux-debug-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
-        '}'
-      priority: 30
-      execution_timeout_secs: 3600
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "flutter-linux-debug-unopt-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
-        '}'
-      priority: 30
-      execution_timeout_secs: 3600
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "flutter-linux-host_debug-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13943,80 +13536,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "flutter-linux-profile-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
-        '}'
-      priority: 30
-      execution_timeout_secs: 3600
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "flutter-linux-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
-        '}'
-      priority: 30
-      execution_timeout_secs: 3600
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "flutter-linux-wasm_release-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -14387,43 +13906,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "flutter-wasm-release-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:dart.tests"
-      exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
-        '}'
-      priority: 30
-      execution_timeout_secs: 3600
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
   }
 }
 buckets {
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index b21a388773c0..ed116bbace1f 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -361,27 +361,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/flutter-linux-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try.monorepo/flutter-android-debug-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try.monorepo/flutter-android-profile-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-debug-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-debug-unopt-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-profile-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-release-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try.monorepo/flutter-wasm-release-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try.monorepo/flutter-linux-android_debug-try"
   }
@@ -2526,75 +2505,40 @@ consoles {
     category: "coordinator"
     short_name: "engine"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-android-debug"
-    category: "build"
-    short_name: "android-debug"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-android-profile"
-    category: "build"
-    short_name: "android-profile"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-debug"
-    category: "build"
-    short_name: "debug"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-debug-unopt"
-    category: "build"
-    short_name: "debug-unopt"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-profile"
-    category: "build"
-    short_name: "profile"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-release"
-    category: "build"
-    short_name: "release"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-wasm-release"
-    category: "build"
-    short_name: "wasm"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_debug"
     category: "build"
-    short_name: "android-debug-2"
+    short_name: "android-debug"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_profile"
     category: "build"
-    short_name: "android-profile-2"
+    short_name: "android-profile"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-host_debug"
     category: "build"
-    short_name: "debug-2"
+    short_name: "debug"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-host_debug_unopt"
     category: "build"
-    short_name: "debug-unopt-2"
+    short_name: "debug-unopt"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-host_profile"
     category: "build"
-    short_name: "profile-2"
+    short_name: "profile"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-host_release"
     category: "build"
-    short_name: "release-2"
+    short_name: "release"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-wasm_release"
     category: "build"
-    short_name: "wasm-2"
+    short_name: "wasm"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-0"
@@ -2697,61 +2641,33 @@ consoles {
   repo_url: "https://dart.googlesource.com/monorepo"
   refs: "regexp:refs/heads/main"
   manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-android-debug"
-    short_name: "android-debug"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-android-profile"
-    short_name: "android-profile"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-debug"
-    short_name: "debug"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-debug-unopt"
-    short_name: "debug-unopt"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-profile"
-    short_name: "profile"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-release"
-    short_name: "release"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-wasm-release"
-    short_name: "wasm"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_debug"
-    short_name: "android-debug-2"
+    short_name: "android-debug"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_profile"
-    short_name: "android-profile-2"
+    short_name: "android-profile"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-host_debug"
-    short_name: "debug-2"
+    short_name: "debug"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-host_debug_unopt"
-    short_name: "debug-unopt-2"
+    short_name: "debug-unopt"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-host_profile"
-    short_name: "profile-2"
+    short_name: "profile"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-host_release"
-    short_name: "release-2"
+    short_name: "release"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-wasm_release"
-    short_name: "wasm-2"
+    short_name: "wasm"
   }
   header {
     links {
diff --git a/monorepo.star b/monorepo.star
index f9f3bfe2904e..cc2436ef6acf 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -109,26 +109,13 @@ def monorepo_builder(name, short_name, category):
         cq_branches = [],
     )
 
-# Builder names before recipe change
-# https://flutter-review.googlesource.com/c/recipes/+/44300 lands.
-# Remove this section after that change lands.
-# Issue b/245485535
-monorepo_builder("flutter-android-debug", "android-debug", "build")
-monorepo_builder("flutter-android-profile", "android-profile", "build")
-monorepo_builder("flutter-linux-debug", "debug", "build")
-monorepo_builder("flutter-linux-debug-unopt", "debug-unopt", "build")
-monorepo_builder("flutter-linux-profile", "profile", "build")
-monorepo_builder("flutter-linux-release", "release", "build")
-monorepo_builder("flutter-wasm-release", "wasm", "build")
-
-# Builder names after change lands. Remove -2 when old builders are removed.
-monorepo_builder("flutter-linux-android_debug", "android-debug-2", "build")
-monorepo_builder("flutter-linux-android_profile", "android-profile-2", "build")
-monorepo_builder("flutter-linux-host_debug", "debug-2", "build")
-monorepo_builder("flutter-linux-host_debug_unopt", "debug-unopt-2", "build")
-monorepo_builder("flutter-linux-host_profile", "profile-2", "build")
-monorepo_builder("flutter-linux-host_release", "release-2", "build")
-monorepo_builder("flutter-linux-wasm_release", "wasm-2", "build")
+monorepo_builder("flutter-linux-android_debug", "android-debug", "build")
+monorepo_builder("flutter-linux-android_profile", "android-profile", "build")
+monorepo_builder("flutter-linux-host_debug", "debug", "build")
+monorepo_builder("flutter-linux-host_debug_unopt", "debug-unopt", "build")
+monorepo_builder("flutter-linux-host_profile", "profile", "build")
+monorepo_builder("flutter-linux-host_release", "release", "build")
+monorepo_builder("flutter-linux-wasm_release", "wasm", "build")
 
 def monorepo_tester(name, short_name, category):
     dart.ci_sandbox_builder(

From 22f6e882c4935c0853cb21aaabe97a63b794ffd7 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Tue, 23 May 2023 15:14:00 +0000
Subject: [PATCH 656/826] [infra] Switch linux builders from bionic to focal

Only the bionic-experimental builder used to check image rolls is kept.

This change should be landed after the corresponding change to swarming pools,
while the tree is closed.

Bug: b/283955602
Change-Id: Idb7dba2236685e086ed78f573157d0b2a0ec079c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/304963
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 510 +++++++++++++++++------------------
 lib/dart.star                |  15 +-
 lib/defaults.star            |   5 +-
 main.star                    |   3 +-
 4 files changed, 272 insertions(+), 261 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 7fa1be81112d..87b07ef0c83e 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -12,7 +12,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.ci"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -55,7 +55,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -91,7 +91,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -127,7 +127,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -163,7 +163,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -199,7 +199,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -235,7 +235,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -511,7 +511,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -548,7 +548,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -588,7 +588,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -627,7 +627,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -667,7 +667,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -707,7 +707,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -747,7 +747,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -787,7 +787,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -827,7 +827,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -867,7 +867,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1168,7 +1168,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1208,7 +1208,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1248,7 +1248,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1288,7 +1288,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1327,7 +1327,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1366,7 +1366,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1405,7 +1405,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1444,7 +1444,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1483,7 +1483,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1682,7 +1682,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1721,7 +1721,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1761,7 +1761,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1801,7 +1801,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1841,7 +1841,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1881,7 +1881,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1921,7 +1921,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2213,7 +2213,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2250,7 +2250,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2295,7 +2295,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2331,7 +2331,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2374,7 +2374,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2411,7 +2411,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2448,7 +2448,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2485,7 +2485,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2522,7 +2522,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2559,7 +2559,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2596,7 +2596,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2633,7 +2633,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2670,7 +2670,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2707,7 +2707,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2744,7 +2744,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2781,7 +2781,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2818,7 +2818,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2855,7 +2855,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2892,7 +2892,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2929,7 +2929,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2966,7 +2966,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3002,7 +3002,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3038,7 +3038,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3074,7 +3074,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3110,7 +3110,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3146,7 +3146,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3258,7 +3258,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3295,7 +3295,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3331,7 +3331,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3367,7 +3367,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3403,7 +3403,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3439,7 +3439,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3476,7 +3476,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3513,7 +3513,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3552,7 +3552,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3591,7 +3591,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3666,7 +3666,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4011,7 +4011,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4048,7 +4048,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4085,7 +4085,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4122,7 +4122,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4159,7 +4159,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4196,7 +4196,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4233,7 +4233,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4270,7 +4270,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4306,7 +4306,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4343,7 +4343,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4380,7 +4380,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4417,7 +4417,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4454,7 +4454,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4491,7 +4491,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4528,7 +4528,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4564,7 +4564,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4601,7 +4601,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4637,7 +4637,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4673,7 +4673,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4709,7 +4709,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4745,7 +4745,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4781,7 +4781,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4817,7 +4817,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4853,7 +4853,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4889,7 +4889,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5135,7 +5135,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5172,7 +5172,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5208,7 +5208,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5245,7 +5245,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5461,7 +5461,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5498,7 +5498,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5535,7 +5535,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5572,7 +5572,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5608,7 +5608,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5644,7 +5644,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5680,7 +5680,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5716,7 +5716,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5885,7 +5885,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5921,7 +5921,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5958,7 +5958,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5994,7 +5994,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6030,7 +6030,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6066,7 +6066,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6102,7 +6102,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6138,7 +6138,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6174,7 +6174,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6210,7 +6210,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6246,7 +6246,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6282,7 +6282,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6318,7 +6318,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6354,7 +6354,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6390,7 +6390,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6426,7 +6426,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6462,7 +6462,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6498,7 +6498,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6534,7 +6534,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6570,7 +6570,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6858,7 +6858,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6895,7 +6895,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6968,7 +6968,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7004,7 +7004,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7040,7 +7040,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7076,7 +7076,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7112,7 +7112,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7149,7 +7149,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7185,7 +7185,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7221,7 +7221,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7257,7 +7257,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7293,7 +7293,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7329,7 +7329,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7367,7 +7367,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7403,7 +7403,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7439,7 +7439,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7475,7 +7475,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7511,7 +7511,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7547,7 +7547,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7583,7 +7583,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7619,7 +7619,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7655,7 +7655,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7691,7 +7691,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8231,7 +8231,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8302,7 +8302,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8338,7 +8338,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8374,7 +8374,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8410,7 +8410,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8446,7 +8446,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8483,7 +8483,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8814,7 +8814,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8850,7 +8850,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8966,7 +8966,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9005,7 +9005,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9048,7 +9048,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9092,7 +9092,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9138,7 +9138,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9356,7 +9356,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9396,7 +9396,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9435,7 +9435,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9475,7 +9475,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9515,7 +9515,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9642,7 +9642,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9682,7 +9682,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9721,7 +9721,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9800,7 +9800,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9839,7 +9839,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9879,7 +9879,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9919,7 +9919,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9959,7 +9959,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10083,7 +10083,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10126,7 +10126,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10163,7 +10163,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10208,7 +10208,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10249,7 +10249,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10285,7 +10285,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -10329,7 +10329,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10365,7 +10365,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10477,7 +10477,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10513,7 +10513,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10552,7 +10552,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10725,7 +10725,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10768,7 +10768,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10805,7 +10805,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10842,7 +10842,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10879,7 +10879,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10915,7 +10915,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10952,7 +10952,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10989,7 +10989,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11026,7 +11026,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11063,7 +11063,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11099,7 +11099,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11135,7 +11135,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11171,7 +11171,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11333,7 +11333,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11370,7 +11370,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11406,7 +11406,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11443,7 +11443,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11587,7 +11587,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11624,7 +11624,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11660,7 +11660,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11696,7 +11696,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11777,7 +11777,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11813,7 +11813,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11849,7 +11849,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11885,7 +11885,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11921,7 +11921,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11957,7 +11957,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11993,7 +11993,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12029,7 +12029,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12137,7 +12137,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12173,7 +12173,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12245,7 +12245,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12281,7 +12281,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12317,7 +12317,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12353,7 +12353,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12389,7 +12389,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12426,7 +12426,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12462,7 +12462,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12498,7 +12498,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12534,7 +12534,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12570,7 +12570,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12606,7 +12606,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12642,7 +12642,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12846,7 +12846,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12917,7 +12917,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12953,7 +12953,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12989,7 +12989,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13025,7 +13025,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13061,7 +13061,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13098,7 +13098,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13319,7 +13319,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -13356,7 +13356,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -13393,7 +13393,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -13430,7 +13430,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -13467,7 +13467,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -13504,7 +13504,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -13541,7 +13541,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -13578,7 +13578,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -13615,7 +13615,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -13652,7 +13652,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -13689,7 +13689,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -13726,7 +13726,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -13763,7 +13763,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -13800,7 +13800,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -13837,7 +13837,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -13874,7 +13874,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -13916,7 +13916,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-18"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
diff --git a/lib/dart.star b/lib/dart.star
index 31671fbbfed1..8b1c975bb381 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -6,7 +6,16 @@ Defines rules that can be used to define dart builders.
 """
 
 load("//lib/accounts.star", "accounts")
-load("//lib/defaults.star", "defaults", "focal", "linux", "mac", "windows", "windows11")
+load(
+    "//lib/defaults.star",
+    "bionic",
+    "defaults",
+    "focal",
+    "linux",
+    "mac",
+    "windows",
+    "windows11",
+)
 load("//lib/paths.star", "paths")
 load("//lib/priority.star", "priority")
 
@@ -66,7 +75,7 @@ def _with_goma(goma, dimensions, properties):
         goma_properties = {}
         goma_properties.update(_GOMA_RBE)
 
-        enable_ats = dimensions["os"] in (linux["os"], focal["os"])
+        enable_ats = dimensions["os"] in (bionic["os"], focal["os"], linux["os"])
 
         goma_properties["enable_ats"] = enable_ats
         updated_properties.setdefault("$build/goma", goma_properties)
@@ -203,7 +212,7 @@ def _builder(
             fail("builder %s should be a %s builder but was %s" % (name, expected_os, os))
 
     expect_os("-win", [windows["os"], windows11["os"]])
-    expect_os("-linux", [linux["os"], focal["os"]])
+    expect_os("-linux", [linux["os"], bionic["os"], focal["os"]])
     expect_os("-mac", mac["os"])
 
     cq_branches = ["main"] + [branch for branch in channels if branch != "try"]
diff --git a/lib/defaults.star b/lib/defaults.star
index 9dd7b1247b4e..ce6e8434e3b3 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -9,7 +9,7 @@ _PROPERTIES = {"clobber": True}
 _DIMENSIONS = {
     "cpu": "x86-64",
     "host_class": "default",
-    "os": "Ubuntu-18",
+    "os": "Ubuntu-20",
     "pool": "luci.dart.try",
 }
 _CACHES = {
@@ -71,8 +71,9 @@ defaults = struct(
 
 arm64 = _ARM64
 experimental = _EXPERIMENTAL
+bionic = _BIONIC
 focal = _FOCAL
-linux = _BIONIC
+linux = _FOCAL
 mac = _MAC
 windows = _WINDOWS10
 windows10 = _WINDOWS10
diff --git a/main.star b/main.star
index f2e72dac82d4..be0f14426de9 100755
--- a/main.star
+++ b/main.star
@@ -16,6 +16,7 @@ load("//lib/cron.star", "cron")
 load("//lib/dart.star", "dart")
 load(
     "//lib/defaults.star",
+    "bionic",
     "experimental",
     "focal",
     "js_engines",
@@ -160,7 +161,7 @@ cron.image_builder(
 cron.image_builder(
     "pkg-linux-release-experimental",
     channels = [],
-    dimensions = experimental,
+    dimensions = [experimental, bionic],
     notifies = "infra",
 )
 

From 08e9d87144354bd666d92c599b16df8c77da7d1d Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Fri, 26 May 2023 17:47:53 +0000
Subject: [PATCH 657/826] [infra] Don't set a host_class dimension for
 vm-win-release-arm64-try.

The Flutter machines don't set this dimension.

Change-Id: I5ce5fbfef1bc92a975344650030bf4f4b060c190
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/306101
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 1 -
 lib/dart.star                | 6 +++++-
 vm.star                      | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 87b07ef0c83e..90843de5ca75 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -13205,7 +13205,6 @@ buckets {
       name: "vm-win-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
       dimensions: "os:Windows-11"
       dimensions: "pool:luci.flutter.staging"
       exe {
diff --git a/lib/dart.star b/lib/dart.star
index 8b1c975bb381..c572aaece818 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -99,7 +99,8 @@ def _try_builder(
         location_filters = None,
         pool = "luci.dart.try",
         properties = None,
-        on_cq = False):
+        on_cq = False,
+        no_host_class = False):
     """Creates a Dart tryjob.
 
     Args:
@@ -117,10 +118,13 @@ def _try_builder(
         pool: The pool to set in dimensions (defaults to "luci.dart.try").
         properties: Extra properties to set for builds.
         on_cq: Whether the build is added to the default set of CQ tryjobs.
+        no_host_class: Whether to filter "host_class" from the default dimensions.
     """
     if on_cq and location_filters:
         fail("Can't be on the default CQ and conditionally on the CQ")
     dimensions = defaults.dimensions(dimensions)
+    if no_host_class:
+        dimensions.pop("host_class")
     dimensions["pool"] = pool
     properties = defaults.properties(properties)
     builder_properties = _with_goma(goma, dimensions, properties)
diff --git a/vm.star b/vm.star
index b8d6168dd279..52a192d82110 100644
--- a/vm.star
+++ b/vm.star
@@ -173,6 +173,8 @@ _builder(
 dart.try_builder(
     "vm-win-release-arm64",
     dimensions = [windows11, arm64],
+    # TODO(https://github.com/flutter/flutter/issues/127691): Remove filtering of host_class.
+    no_host_class = True,
     pool = "luci.flutter.staging",
 )
 

From 3eff4034fb53ba91dd92ad49a2565d80d26b6aaf Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 30 May 2023 16:34:45 +0000
Subject: [PATCH 658/826] [infra] Don't attempt to setup Goma on Windows ARM64.

Change-Id: I2d998657c8c5b951c5bbe32401d86fe0d9762151
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/306132
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/cr-buildbucket.cfg | 6 ++----
 vm.star                      | 2 ++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 90843de5ca75..bdcd9a7cf4a6 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -13214,10 +13214,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
diff --git a/vm.star b/vm.star
index 52a192d82110..16f64ab41851 100644
--- a/vm.star
+++ b/vm.star
@@ -176,6 +176,8 @@ dart.try_builder(
     # TODO(https://github.com/flutter/flutter/issues/127691): Remove filtering of host_class.
     no_host_class = True,
     pool = "luci.flutter.staging",
+    # no such package: infra_internal/goma/client/windows-arm64
+    goma = False,
 )
 
 # vm|appjit

From 4d2bad8f9641ce7327d7985ed2395706773443da Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 2 Jun 2023 12:45:30 +0000
Subject: [PATCH 659/826] [infra] Add dart2wasm-linux-chrome and rename
 dart2wasm-linux-d8

Fixes: b/285245159
Change-Id: I9e753c7bfb448d4260ef19af5edc63881bdad39d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/306760
Reviewed-by: William Hesse <whesse@google.com>
---
 dart2wasm.star               | 19 ++++++--
 generated/commit-queue.cfg   | 85 +++++++++++++++++++++++++++++++++++-
 generated/cr-buildbucket.cfg | 84 ++++++++++++++++++++++++++++++++++-
 generated/luci-milo.cfg      | 19 ++++++--
 generated/luci-notify.cfg    | 13 +++++-
 generated/luci-scheduler.cfg | 17 ++++++--
 6 files changed, 224 insertions(+), 13 deletions(-)

diff --git a/dart2wasm.star b/dart2wasm.star
index 1791ae2bcf41..9e33a253e039 100644
--- a/dart2wasm.star
+++ b/dart2wasm.star
@@ -6,16 +6,29 @@ Defines the dart2wasm builders.
 """
 
 load("//lib/dart.star", "dart")
-load("//lib/defaults.star", "emscripten")
+load("//lib/defaults.star", "chrome", "emscripten")
 load("//lib/paths.star", "paths")
 
-dart.poller("dart2wasm-gitiles-trigger", branches = ["main"], paths = paths.dart2wasm)
+dart.poller(
+    "dart2wasm-gitiles-trigger",
+    branches = ["main"],
+    paths = paths.dart2wasm,
+)
 
 dart.ci_sandbox_builder(
-    "dart2wasm-linux-x64-d8",
+    "dart2wasm-linux-d8",
     category = "d2w|d",
     channels = ["try"],
     properties = emscripten,
     location_filters = paths.to_location_filters(paths.dart2wasm),
     triggered_by = ["dart2wasm-gitiles-trigger-%s"],
 )
+
+dart.ci_sandbox_builder(
+    "dart2wasm-linux-chrome",
+    category = "d2w|c",
+    channels = ["try"],
+    properties = [chrome, emscripten],
+    location_filters = paths.to_location_filters(paths.dart2wasm),
+    triggered_by = ["dart2wasm-gitiles-trigger-%s"],
+)
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 0f3811476adf..ca09f5f01250 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -1737,7 +1737,90 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/dart2wasm-linux-x64-d8-try"
+        name: "dart/try/dart2wasm-linux-chrome-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm_shared/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/wasm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+      }
+      builders {
+        name: "dart/try/dart2wasm-linux-d8-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index bdcd9a7cf4a6..b5e5af60147b 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -1678,7 +1678,47 @@ buckets {
       }
     }
     builders {
-      name: "dart2wasm-linux-x64-d8"
+      name: "dart2wasm-linux-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true,'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2wasm-linux-d8"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9796,7 +9836,47 @@ buckets {
       }
     }
     builders {
-      name: "dart2wasm-linux-x64-d8-try"
+      name: "dart2wasm-linux-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true,'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2wasm-linux-d8-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index ed116bbace1f..53e9e00fcf5e 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -50,7 +50,10 @@ consoles {
     name: "buildbucket/luci.dart.try/flutter-engine-linux-web_tests-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/dart2wasm-linux-x64-d8-try"
+    name: "buildbucket/luci.dart.try/dart2wasm-linux-d8-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/dart2wasm-linux-chrome-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-linux-debug-x64-try"
@@ -498,10 +501,15 @@ consoles {
     short_name: "i"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-x64-d8"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-d8"
     category: "d2w"
     short_name: "d"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-chrome"
+    category: "d2w"
+    short_name: "c"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64"
     category: "vm|jit"
@@ -1129,10 +1137,15 @@ consoles {
     short_name: "i"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-x64-d8"
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-d8"
     category: "d2w"
     short_name: "d"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-chrome"
+    category: "d2w"
+    short_name: "c"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index c2928866565d..81fe3658a6d7 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -187,7 +187,18 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "dart2wasm-linux-x64-d8"
+    name: "dart2wasm-linux-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "dart2wasm-linux-d8"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 1305b899d372..5fb73dce7a8f 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -405,13 +405,23 @@ job {
   }
 }
 job {
-  id: "dart2wasm-linux-x64-d8"
+  id: "dart2wasm-linux-chrome"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "dart2wasm-linux-x64-d8"
+    builder: "dart2wasm-linux-chrome"
+  }
+}
+job {
+  id: "dart2wasm-linux-d8"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "dart2wasm-linux-d8"
   }
 }
 job {
@@ -2495,7 +2505,8 @@ trigger {
 trigger {
   id: "dart2wasm-gitiles-trigger-main"
   realm: "ci"
-  triggers: "dart2wasm-linux-x64-d8"
+  triggers: "dart2wasm-linux-chrome"
+  triggers: "dart2wasm-linux-d8"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/main"

From 542b71fa60782a2b635eb4eca79089c4ddc17d5e Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Fri, 2 Jun 2023 13:15:23 +0000
Subject: [PATCH 660/826] [infra] Create shadow buckets for all buckets in the
 dart-ci project

The new type of led runs, which are real buildbucket builds, use
the shadow bucket of the builder's bucket.

Create these new buckets that are duplicates of existing buckets.
The unused ci.rolls bucket is removed.

Bug: b/285098783
Change-Id: Ieace0e59970ea0f7f9fcd9539836808be27a5c15
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/307045
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 23 +++++++++++++++---
 generated/realms.cfg         | 45 +++++++++++++++++++++++++++++++-----
 project.star                 | 38 +++++++++++++++++++++++++++---
 3 files changed, 94 insertions(+), 12 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index b5e5af60147b..7108d77b5057 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -43,9 +43,7 @@ buckets {
       }
     }
   }
-}
-buckets {
-  name: "ci.roll"
+  shadow: "ci.shadow"
 }
 buckets {
   name: "ci.sandbox"
@@ -8845,6 +8843,13 @@ buckets {
       }
     }
   }
+  shadow: "ci.sandbox.shadow"
+}
+buckets {
+  name: "ci.sandbox.shadow"
+}
+buckets {
+  name: "ci.shadow"
 }
 buckets {
   name: "try"
@@ -13387,6 +13392,7 @@ buckets {
       }
     }
   }
+  shadow: "try.shadow"
 }
 buckets {
   name: "try.monorepo"
@@ -13984,6 +13990,13 @@ buckets {
       }
     }
   }
+  shadow: "try.monorepo.shadow"
+}
+buckets {
+  name: "try.monorepo.shadow"
+}
+buckets {
+  name: "try.shadow"
 }
 buckets {
   name: "try.shared"
@@ -14029,6 +14042,10 @@ buckets {
       }
     }
   }
+  shadow: "try.shared.shadow"
+}
+buckets {
+  name: "try.shared.shadow"
 }
 common_config {
   builds_notification_topics {
diff --git a/generated/realms.cfg b/generated/realms.cfg
index ed712487e338..6620e23fcd3d 100644
--- a/generated/realms.cfg
+++ b/generated/realms.cfg
@@ -75,24 +75,32 @@ realms {
   }
 }
 realms {
-  name: "ci.roll"
+  name: "ci.sandbox"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
   bindings {
     role: "role/buildbucket.triggerer"
-    principals: "group:project-dart-roller-owners"
+    principals: "user:dart-internal-cbuild@dart-ci-internal.iam.gserviceaccount.com"
     principals: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
   }
 }
 realms {
-  name: "ci.sandbox"
+  name: "ci.sandbox.shadow"
   bindings {
-    role: "role/buildbucket.builderServiceAccount"
+    role: "role/buildbucket.triggerer"
+    principals: "user:dart-internal-cbuild@dart-ci-internal.iam.gserviceaccount.com"
+    principals: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
     principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
   }
+}
+realms {
+  name: "ci.shadow"
   bindings {
     role: "role/buildbucket.triggerer"
-    principals: "user:dart-internal-cbuild@dart-ci-internal.iam.gserviceaccount.com"
     principals: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
   }
 }
 realms {
@@ -146,6 +154,23 @@ realms {
     principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
   }
 }
+realms {
+  name: "try.monorepo.shadow"
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "group:project-dart-tryjob-access"
+    principals: "group:service-account-cq"
+    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
+}
+realms {
+  name: "try.shadow"
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "group:project-dart-tryjob-access"
+    principals: "group:service-account-cq"
+  }
+}
 realms {
   name: "try.shared"
   bindings {
@@ -158,3 +183,11 @@ realms {
     principals: "group:service-account-cq"
   }
 }
+realms {
+  name: "try.shared.shadow"
+  bindings {
+    role: "role/buildbucket.triggerer"
+    principals: "group:project-dart-tryjob-access"
+    principals: "group:service-account-cq"
+  }
+}
diff --git a/project.star b/project.star
index 630c75b31e37..7e07bb13906f 100644
--- a/project.star
+++ b/project.star
@@ -86,9 +86,10 @@ luci.bucket(
     ],
 )
 luci.bucket(
-    name = "ci.roll",
+    name = "ci.shadow",
+    shadows = "ci",
     acls = [
-        acl.entry(acl.BUILDBUCKET_TRIGGERER, **ROLL_TRIGGERERS),
+        acl.entry(acl.BUILDBUCKET_TRIGGERER, users = [accounts.ci_builder]),
     ],
 )
 luci.bucket(
@@ -97,6 +98,13 @@ luci.bucket(
         acl.entry(acl.BUILDBUCKET_TRIGGERER, users = CI_SANDBOX_TRIGGERERS),
     ],
 )
+luci.bucket(
+    name = "ci.sandbox.shadow",
+    shadows = "ci.sandbox",
+    acls = [
+        acl.entry(acl.BUILDBUCKET_TRIGGERER, users = CI_SANDBOX_TRIGGERERS),
+    ],
+)
 TRY_ACLS = [
     acl.entry(
         acl.BUILDBUCKET_TRIGGERER,
@@ -119,6 +127,13 @@ luci.bucket(
     ],
 )
 
+# Shadow bucket for try.
+luci.bucket(
+    name = "try.shadow",
+    shadows = "try",
+    acls = TRY_ACLS,
+)
+
 # Tryjobs specific to the monorepo repo.
 # These should only be triggered by the monorepo coordinator flutter-linux-try.
 luci.bucket(
@@ -135,8 +150,25 @@ luci.bucket(
     ],
 )
 
+# Shadow bucket for try.monorepo.
+luci.bucket(
+    name = "try.monorepo.shadow",
+    shadows = "try.monorepo",
+    acls = TRY_ACLS + [
+        acl.entry(
+            acl.BUILDBUCKET_TRIGGERER,
+            users = [
+                # Monorepo builds use a coordinator build to add try builds.
+                # It runs with the try_builder account.
+                accounts.try_builder,
+            ],
+        ),
+    ],
+)
+
 # Tryjobs for all repos.
 luci.bucket(name = "try.shared", acls = TRY_ACLS)
+luci.bucket(name = "try.shared.shadow", shadows = "try.shared", acls = TRY_ACLS)
 
 # Swarming permissions in realms.cfg.
 
@@ -186,7 +218,7 @@ led_users(
     pool_realms = ["pools/try"],
     builder_realm = "try",
     users = [
-        "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com",
+        accounts.try_builder,
     ],
 )
 

From 96f60ef21f6da000342f5443c0e00a754c2b51b5 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Wed, 7 Jun 2023 12:10:07 +0000
Subject: [PATCH 661/826] Remove obsolete dart bionic builders.

Bug: b/284116253
Change-Id: I55395361369a393ace0499a163f2d6bf77544026
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/307640
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 generated/cr-buildbucket.cfg | 36 ------------------------------------
 generated/luci-notify.cfg    | 15 ---------------
 generated/luci-scheduler.cfg | 11 -----------
 lib/dart.star                |  5 ++---
 lib/defaults.star            |  2 --
 main.star                    | 12 +-----------
 6 files changed, 3 insertions(+), 78 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 7108d77b5057..89dd2561a7b6 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -3663,42 +3663,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "pkg-linux-release-experimental"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:experimental"
-      dimensions: "os:Ubuntu-18"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "pkg-linux-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 81fe3658a6d7..00027446bbc5 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -415,21 +415,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "pkg-linux-release-experimental"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 5fb73dce7a8f..a3b143d49200 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -774,16 +774,6 @@ job {
     builder: "pkg-linux-release-beta"
   }
 }
-job {
-  id: "pkg-linux-release-experimental"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "pkg-linux-release-experimental"
-  }
-}
 job {
   id: "pkg-linux-release-stable"
   realm: "ci.sandbox"
@@ -2358,7 +2348,6 @@ trigger {
   id: "dart-image-trigger"
   realm: "ci"
   schedule: "45 6 * * 1-5"
-  triggers: "pkg-linux-release-experimental"
   triggers: "vm-ffi-qemu-linux-release-arm-experimental"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
diff --git a/lib/dart.star b/lib/dart.star
index c572aaece818..c42bfa3e8d07 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -8,7 +8,6 @@ Defines rules that can be used to define dart builders.
 load("//lib/accounts.star", "accounts")
 load(
     "//lib/defaults.star",
-    "bionic",
     "defaults",
     "focal",
     "linux",
@@ -75,7 +74,7 @@ def _with_goma(goma, dimensions, properties):
         goma_properties = {}
         goma_properties.update(_GOMA_RBE)
 
-        enable_ats = dimensions["os"] in (bionic["os"], focal["os"], linux["os"])
+        enable_ats = dimensions["os"] in (focal["os"], linux["os"])
 
         goma_properties["enable_ats"] = enable_ats
         updated_properties.setdefault("$build/goma", goma_properties)
@@ -216,7 +215,7 @@ def _builder(
             fail("builder %s should be a %s builder but was %s" % (name, expected_os, os))
 
     expect_os("-win", [windows["os"], windows11["os"]])
-    expect_os("-linux", [linux["os"], bionic["os"], focal["os"]])
+    expect_os("-linux", [linux["os"], focal["os"]])
     expect_os("-mac", mac["os"])
 
     cq_branches = ["main"] + [branch for branch in channels if branch != "try"]
diff --git a/lib/defaults.star b/lib/defaults.star
index ce6e8434e3b3..2c35f7ffc51a 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -24,7 +24,6 @@ _SLOW_SHARDS = {"shard_timeout": (90 * time.minute) // time.second}
 
 _ARM64 = {"cpu": "arm64"}
 _MAC = {"os": "Mac"}
-_BIONIC = {"os": "Ubuntu-18"}
 _FOCAL = {"os": "Ubuntu-20"}
 _WINDOWS10 = {"os": "Windows-10"}
 _WINDOWS11 = {"os": "Windows-11"}
@@ -71,7 +70,6 @@ defaults = struct(
 
 arm64 = _ARM64
 experimental = _EXPERIMENTAL
-bionic = _BIONIC
 focal = _FOCAL
 linux = _FOCAL
 mac = _MAC
diff --git a/main.star b/main.star
index be0f14426de9..bb5d6300a58a 100755
--- a/main.star
+++ b/main.star
@@ -16,7 +16,6 @@ load("//lib/cron.star", "cron")
 load("//lib/dart.star", "dart")
 load(
     "//lib/defaults.star",
-    "bionic",
     "experimental",
     "focal",
     "js_engines",
@@ -148,22 +147,13 @@ dart.ci_sandbox_builder("gclient", recipe = "dart/gclient", category = "misc|g")
 
 # Builders that test the dev Linux images. When the image autoroller detects
 # successful builds of these builders with a dev images, that dev image becomes
-# the new prod image. Newly created bots will than use the updated image. The
-# `vm-ffi-qemu-linux-release-arm` and the `pkg-linux-release`
-# are used because qemu is the main difference on focal, they don't trigger
-# shards and run a few different builds. See also https://crbug.com/1207358.
+# the new prod image. Newly created bots will than use the updated image.
 cron.image_builder(
     "vm-ffi-qemu-linux-release-arm-experimental",
     channels = [],
     dimensions = [experimental, focal],
     notifies = "infra",
 )
-cron.image_builder(
-    "pkg-linux-release-experimental",
-    channels = [],
-    dimensions = [experimental, bionic],
-    notifies = "infra",
-)
 
 dart.ci_sandbox_builder(
     "ci-test-data",

From cc86de256df91b6967fc1eacca39a778d8c6d4e1 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Fri, 9 Jun 2023 07:50:47 +0000
Subject: [PATCH 662/826] [infra] Add role/buildbucket.creator to project
 admins for new-style led runs

The new --real-build option to led requires a permission that is not in
the role buildbucket.triggerer.

Bug: b/285098783
Change-Id: I133f7cb1dd601f31c9defac7aa0f4d45bdaa51f1
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/308180
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/realms.cfg |  4 ++++
 project.star         | 19 ++++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/generated/realms.cfg b/generated/realms.cfg
index 6620e23fcd3d..3a37dae19deb 100644
--- a/generated/realms.cfg
+++ b/generated/realms.cfg
@@ -6,6 +6,10 @@
 
 realms {
   name: "@root"
+  bindings {
+    role: "role/buildbucket.creator"
+    principals: "group:project-dart-admins"
+  }
   bindings {
     role: "role/buildbucket.reader"
     principals: "group:all"
diff --git a/project.star b/project.star
index 7e07bb13906f..1ad87788611a 100644
--- a/project.star
+++ b/project.star
@@ -47,15 +47,11 @@ luci.project(
                 acl.PROJECT_CONFIGS_READER,
                 acl.SCHEDULER_READER,
             ],
-            groups = ["all"],
+            groups = "all",
         ),
-        acl.entry(acl.LOGDOG_WRITER, groups = ["luci-logdog-chromium-writers"]),
-        acl.entry(
-            [acl.SCHEDULER_OWNER, acl.BUILDBUCKET_TRIGGERER],
-            groups = ["project-dart-admins"],
-        ),
-        acl.entry(acl.CQ_COMMITTER, groups = ["project-dart-committers"]),
-        acl.entry(acl.CQ_DRY_RUNNER, groups = ["project-dart-tryjob-access"]),
+        acl.entry(acl.LOGDOG_WRITER, groups = "luci-logdog-chromium-writers"),
+        acl.entry(acl.CQ_COMMITTER, groups = "project-dart-committers"),
+        acl.entry(acl.CQ_DRY_RUNNER, groups = "project-dart-tryjob-access"),
     ],
     bindings = [
         luci.binding(
@@ -63,7 +59,12 @@ luci.project(
             users = accounts.try_builder,
         ),
         luci.binding(
-            roles = "role/swarming.poolOwner",
+            roles = [
+                "role/buildbucket.creator",
+                "role/buildbucket.triggerer",
+                "role/scheduler.owner",
+                "role/swarming.poolOwner",
+            ],
             groups = "project-dart-admins",
         ),
         luci.binding(

From 84161da683670b8f3ad519ee5f1c7eba937952ea Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Fri, 9 Jun 2023 13:24:22 +0000
Subject: [PATCH 663/826] [infra] Add bucket contraints to all buckets

Bucket constraints, listing the pools and service accounts that
builds from this bucket are allowed to use, are now required
on shadow buckets.

Adding them to all buckets in dart-ci, based on the pools and
service accounts the builders are currently using in each bucket.

Bug: b/285098783
Change-Id: I8a9af76a679c1dc93f6cbfdc7f66731608f8d6cf
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/308041
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 42 +++++++++++++++++++++++++++++
 generated/realms.cfg         | 20 ++++++++++++++
 project.star                 | 51 ++++++++++++++++++++++++++++++++++--
 3 files changed, 111 insertions(+), 2 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 89dd2561a7b6..e9133b46a6fc 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -44,6 +44,10 @@ buckets {
     }
   }
   shadow: "ci.shadow"
+  constraints {
+    pools: "luci.dart.ci"
+    service_accounts: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+  }
 }
 buckets {
   name: "ci.sandbox"
@@ -8808,12 +8812,26 @@ buckets {
     }
   }
   shadow: "ci.sandbox.shadow"
+  constraints {
+    pools: "dart.tests"
+    pools: "luci.dart.try"
+    service_accounts: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
 }
 buckets {
   name: "ci.sandbox.shadow"
+  constraints {
+    pools: "dart.tests"
+    pools: "luci.dart.try"
+    service_accounts: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
 }
 buckets {
   name: "ci.shadow"
+  constraints {
+    pools: "luci.dart.ci"
+    service_accounts: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+  }
 }
 buckets {
   name: "try"
@@ -13357,6 +13375,10 @@ buckets {
     }
   }
   shadow: "try.shadow"
+  constraints {
+    pools: "luci.dart.try"
+    service_accounts: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
 }
 buckets {
   name: "try.monorepo"
@@ -13955,12 +13977,24 @@ buckets {
     }
   }
   shadow: "try.monorepo.shadow"
+  constraints {
+    pools: "dart.tests"
+    service_accounts: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
 }
 buckets {
   name: "try.monorepo.shadow"
+  constraints {
+    pools: "dart.tests"
+    service_accounts: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
 }
 buckets {
   name: "try.shadow"
+  constraints {
+    pools: "luci.dart.try"
+    service_accounts: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
 }
 buckets {
   name: "try.shared"
@@ -14007,9 +14041,17 @@ buckets {
     }
   }
   shadow: "try.shared.shadow"
+  constraints {
+    pools: "luci.dart.try"
+    service_accounts: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
 }
 buckets {
   name: "try.shared.shadow"
+  constraints {
+    pools: "luci.dart.try"
+    service_accounts: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
 }
 common_config {
   builds_notification_topics {
diff --git a/generated/realms.cfg b/generated/realms.cfg
index 3a37dae19deb..d3ca10bdc43e 100644
--- a/generated/realms.cfg
+++ b/generated/realms.cfg
@@ -93,6 +93,10 @@ realms {
 }
 realms {
   name: "ci.sandbox.shadow"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
   bindings {
     role: "role/buildbucket.triggerer"
     principals: "user:dart-internal-cbuild@dart-ci-internal.iam.gserviceaccount.com"
@@ -102,6 +106,10 @@ realms {
 }
 realms {
   name: "ci.shadow"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+  }
   bindings {
     role: "role/buildbucket.triggerer"
     principals: "user:dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
@@ -160,6 +168,10 @@ realms {
 }
 realms {
   name: "try.monorepo.shadow"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
   bindings {
     role: "role/buildbucket.triggerer"
     principals: "group:project-dart-tryjob-access"
@@ -169,6 +181,10 @@ realms {
 }
 realms {
   name: "try.shadow"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
   bindings {
     role: "role/buildbucket.triggerer"
     principals: "group:project-dart-tryjob-access"
@@ -189,6 +205,10 @@ realms {
 }
 realms {
   name: "try.shared.shadow"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
   bindings {
     role: "role/buildbucket.triggerer"
     principals: "group:project-dart-tryjob-access"
diff --git a/project.star b/project.star
index 1ad87788611a..a2574da230ab 100644
--- a/project.star
+++ b/project.star
@@ -85,6 +85,10 @@ luci.bucket(
     acls = [
         acl.entry(acl.BUILDBUCKET_TRIGGERER, users = [accounts.ci_builder]),
     ],
+    constraints = luci.bucket_constraints(
+        pools = ["luci.dart.ci"],
+        service_accounts = [accounts.ci_builder],
+    ),
 )
 luci.bucket(
     name = "ci.shadow",
@@ -92,12 +96,20 @@ luci.bucket(
     acls = [
         acl.entry(acl.BUILDBUCKET_TRIGGERER, users = [accounts.ci_builder]),
     ],
+    constraints = luci.bucket_constraints(
+        pools = ["luci.dart.ci"],
+        service_accounts = [accounts.ci_builder],
+    ),
 )
 luci.bucket(
     name = "ci.sandbox",
     acls = [
         acl.entry(acl.BUILDBUCKET_TRIGGERER, users = CI_SANDBOX_TRIGGERERS),
     ],
+    constraints = luci.bucket_constraints(
+        pools = ["luci.dart.try", "dart.tests"],
+        service_accounts = [accounts.try_builder],
+    ),
 )
 luci.bucket(
     name = "ci.sandbox.shadow",
@@ -105,6 +117,10 @@ luci.bucket(
     acls = [
         acl.entry(acl.BUILDBUCKET_TRIGGERER, users = CI_SANDBOX_TRIGGERERS),
     ],
+    constraints = luci.bucket_constraints(
+        pools = ["luci.dart.try", "dart.tests"],
+        service_accounts = [accounts.try_builder],
+    ),
 )
 TRY_ACLS = [
     acl.entry(
@@ -126,6 +142,10 @@ luci.bucket(
             ],
         ),
     ],
+    constraints = luci.bucket_constraints(
+        pools = ["luci.dart.try"],
+        service_accounts = [accounts.try_builder],
+    ),
 )
 
 # Shadow bucket for try.
@@ -133,6 +153,10 @@ luci.bucket(
     name = "try.shadow",
     shadows = "try",
     acls = TRY_ACLS,
+    constraints = luci.bucket_constraints(
+        pools = ["luci.dart.try"],
+        service_accounts = [accounts.try_builder],
+    ),
 )
 
 # Tryjobs specific to the monorepo repo.
@@ -149,6 +173,10 @@ luci.bucket(
             ],
         ),
     ],
+    constraints = luci.bucket_constraints(
+        pools = ["dart.tests"],
+        service_accounts = [accounts.try_builder],
+    ),
 )
 
 # Shadow bucket for try.monorepo.
@@ -165,11 +193,30 @@ luci.bucket(
             ],
         ),
     ],
+    constraints = luci.bucket_constraints(
+        pools = ["dart.tests"],
+        service_accounts = [accounts.try_builder],
+    ),
 )
 
 # Tryjobs for all repos.
-luci.bucket(name = "try.shared", acls = TRY_ACLS)
-luci.bucket(name = "try.shared.shadow", shadows = "try.shared", acls = TRY_ACLS)
+luci.bucket(
+    name = "try.shared",
+    acls = TRY_ACLS,
+    constraints = luci.bucket_constraints(
+        pools = ["luci.dart.try"],
+        service_accounts = [accounts.try_builder],
+    ),
+)
+luci.bucket(
+    name = "try.shared.shadow",
+    shadows = "try.shared",
+    acls = TRY_ACLS,
+    constraints = luci.bucket_constraints(
+        pools = ["luci.dart.try"],
+        service_accounts = [accounts.try_builder],
+    ),
+)
 
 # Swarming permissions in realms.cfg.
 

From e6578208afd0fbdb922adc0cfddc575daa29a359 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Tue, 13 Jun 2023 11:09:50 +0000
Subject: [PATCH 664/826] Add monorepo builders for android engines and
 framework tests

Adds monorepo subbuilders for android engine builds on arm64, x64, and x86.
Adds tester subbuilders from framework test shards.

These builds and tests are currently on the HHH builder, and will
be moved to the monorepo builders.

Bug: b/231927187
Change-Id: Ia1d098f72b8c8aca2f382999af6d942ce3f5f1fd
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/307803
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 3632 +++++++++++++++++++++-------------
 generated/luci-milo.cfg      |  162 +-
 monorepo.star                |   60 +-
 3 files changed, 2463 insertions(+), 1391 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index e9133b46a6fc..19b4492e45cc 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -2449,7 +2449,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-android_profile"
+      name: "flutter-linux-android_debug_arm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -2486,7 +2486,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-host_debug"
+      name: "flutter-linux-android_debug_x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -2523,7 +2523,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-host_debug_unopt"
+      name: "flutter-linux-android_debug_x86"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -2560,7 +2560,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-host_profile"
+      name: "flutter-linux-android_profile"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -2597,7 +2597,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-host_release"
+      name: "flutter-linux-android_profile_arm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -2634,7 +2634,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-wasm_release"
+      name: "flutter-linux-android_profile_x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -2671,7 +2671,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-0"
+      name: "flutter-linux-android_release"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -2696,10 +2696,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
-      execution_timeout_secs: 5400
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2708,7 +2708,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-1"
+      name: "flutter-linux-android_release_arm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -2733,10 +2733,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
-      execution_timeout_secs: 5400
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2745,7 +2745,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-2"
+      name: "flutter-linux-android_release_x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -2770,10 +2770,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
-      execution_timeout_secs: 5400
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2782,7 +2782,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-3"
+      name: "flutter-linux-flutter-plugins"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -2819,7 +2819,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-4"
+      name: "flutter-linux-framework-coverage"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -2856,7 +2856,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-5"
+      name: "flutter-linux-framework-tests"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -2893,7 +2893,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-6"
+      name: "flutter-linux-host_debug"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -2918,10 +2918,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
-      execution_timeout_secs: 5400
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2930,7 +2930,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tests-7-last"
+      name: "flutter-linux-host_debug_unopt"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -2955,10 +2955,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
-      execution_timeout_secs: 5400
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2967,7 +2967,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-web-tool-tests"
+      name: "flutter-linux-host_profile"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -2992,10 +2992,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/tester"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
-      execution_timeout_secs: 5400
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3004,14 +3004,14 @@ buckets {
       }
     }
     builders {
-      name: "front-end-linux-release-x64"
+      name: "flutter-linux-host_release"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -3029,9 +3029,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3040,14 +3041,14 @@ buckets {
       }
     }
     builders {
-      name: "front-end-linux-release-x64-beta"
+      name: "flutter-linux-tool-tests"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -3065,9 +3066,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3076,14 +3078,14 @@ buckets {
       }
     }
     builders {
-      name: "front-end-linux-release-x64-stable"
+      name: "flutter-linux-wasm_release"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -3101,9 +3103,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3112,14 +3115,14 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-linux-release-x64"
+      name: "flutter-linux-web-tests-0"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -3137,9 +3140,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3148,14 +3152,14 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-linux-release-x64-beta"
+      name: "flutter-linux-web-tests-1"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -3173,9 +3177,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3184,14 +3189,14 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-linux-release-x64-stable"
+      name: "flutter-linux-web-tests-2"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -3209,9 +3214,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3220,21 +3226,21 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-mac-release-x64"
+      name: "flutter-linux-web-tests-3"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -3245,13 +3251,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
-      priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 50
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3260,21 +3263,21 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-win-release-x64"
+      name: "flutter-linux-web-tests-4"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -3285,9 +3288,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
-      priority: 70
+      priority: 50
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3296,14 +3300,14 @@ buckets {
       }
     }
     builders {
-      name: "frontend-weekly"
+      name: "flutter-linux-web-tests-5"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -3321,10 +3325,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
-      priority: 70
-      execution_timeout_secs: 43200
+      priority: 50
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3333,14 +3337,14 @@ buckets {
       }
     }
     builders {
-      name: "fuzz-linux"
+      name: "flutter-linux-web-tests-6"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -3358,9 +3362,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3369,14 +3374,14 @@ buckets {
       }
     }
     builders {
-      name: "gclient"
+      name: "flutter-linux-web-tests-7-last"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -3394,9 +3399,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/gclient"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3405,14 +3411,14 @@ buckets {
       }
     }
     builders {
-      name: "gclient-beta"
+      name: "flutter-linux-web-tool-tests"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -3430,9 +3436,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/gclient"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3441,7 +3448,7 @@ buckets {
       }
     }
     builders {
-      name: "gclient-stable"
+      name: "front-end-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -3466,7 +3473,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/gclient"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -3477,7 +3484,7 @@ buckets {
       }
     }
     builders {
-      name: "google"
+      name: "front-end-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -3502,10 +3509,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/external"'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 20
-      execution_timeout_secs: 300
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3514,7 +3520,7 @@ buckets {
       }
     }
     builders {
-      name: "iso-stress-linux"
+      name: "front-end-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -3539,8 +3545,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -3551,7 +3556,7 @@ buckets {
       }
     }
     builders {
-      name: "pkg-linux-debug"
+      name: "front-end-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -3576,9 +3581,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -3590,7 +3592,7 @@ buckets {
       }
     }
     builders {
-      name: "pkg-linux-release"
+      name: "front-end-nnbd-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -3615,9 +3617,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -3629,7 +3628,7 @@ buckets {
       }
     }
     builders {
-      name: "pkg-linux-release-beta"
+      name: "front-end-nnbd-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -3654,9 +3653,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -3668,11 +3664,11 @@ buckets {
       }
     }
     builders {
-      name: "pkg-linux-release-stable"
+      name: "front-end-nnbd-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3682,7 +3678,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -3693,12 +3689,13 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3707,11 +3704,11 @@ buckets {
       }
     }
     builders {
-      name: "pkg-mac-release"
+      name: "front-end-nnbd-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3732,16 +3729,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3750,11 +3740,11 @@ buckets {
       }
     }
     builders {
-      name: "pkg-mac-release-arm64"
+      name: "frontend-weekly"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3764,7 +3754,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -3775,34 +3765,23 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 70
+      execution_timeout_secs: 43200
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "pkg-mac-release-beta"
+      name: "fuzz-linux"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3812,7 +3791,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -3823,16 +3802,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3841,11 +3813,11 @@ buckets {
       }
     }
     builders {
-      name: "pkg-mac-release-stable"
+      name: "gclient"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3855,7 +3827,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -3866,16 +3838,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/gclient"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3884,11 +3849,11 @@ buckets {
       }
     }
     builders {
-      name: "pkg-win-release"
+      name: "gclient-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3898,7 +3863,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -3909,29 +3874,22 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/gclient"'
         '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "pkg-win-release-beta"
+      name: "gclient-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3941,7 +3899,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -3952,29 +3910,22 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/gclient"'
         '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "pkg-win-release-stable"
+      name: "google"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3984,7 +3935,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -3995,25 +3946,19 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/external"'
         '}'
-      priority: 50
+      priority: 20
+      execution_timeout_secs: 300
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-aot-android-release-arm64c"
+      name: "iso-stress-linux"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4050,7 +3995,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-android-release-arm64c-beta"
+      name: "pkg-linux-debug"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4075,8 +4020,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -4087,7 +4034,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-android-release-arm64c-stable"
+      name: "pkg-linux-release"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4112,8 +4059,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -4124,7 +4073,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-android-release-arm_x64"
+      name: "pkg-linux-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4149,8 +4098,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -4161,7 +4112,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-android-release-arm_x64-beta"
+      name: "pkg-linux-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4186,8 +4137,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -4198,11 +4151,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-android-release-arm_x64-stable"
+      name: "pkg-mac-release"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4212,7 +4165,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -4223,10 +4176,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4235,11 +4194,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-asan-linux-release-x64"
+      name: "pkg-mac-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4249,7 +4208,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -4259,24 +4218,35 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-aot-dwarf-linux-product-x64"
+      name: "pkg-mac-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4286,7 +4256,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -4297,9 +4267,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4308,11 +4285,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-debug-simarm_x64"
+      name: "pkg-mac-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4322,7 +4299,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -4333,10 +4310,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4345,11 +4328,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-debug-simarm_x64-beta"
+      name: "pkg-win-release"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4359,7 +4342,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -4370,23 +4353,29 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-aot-linux-debug-simarm_x64-stable"
+      name: "pkg-win-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4396,7 +4385,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -4407,23 +4396,29 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-aot-linux-debug-simriscv64"
+      name: "pkg-win-release-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4433,7 +4428,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -4444,19 +4439,25 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-aot-linux-debug-x64"
+      name: "vm-aot-android-release-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4484,7 +4485,7 @@ buckets {
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4493,7 +4494,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-debug-x64c"
+      name: "vm-aot-android-release-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4521,7 +4522,7 @@ buckets {
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4530,7 +4531,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-product-x64"
+      name: "vm-aot-android-release-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4555,9 +4556,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4566,7 +4568,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-release-arm64"
+      name: "vm-aot-android-release-arm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4592,9 +4594,9 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "recipe": "dart/neo",'
-        '  "shard_timeout": 7200'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4603,7 +4605,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-release-simarm64"
+      name: "vm-aot-android-release-arm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4628,7 +4630,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -4639,7 +4642,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-release-simarm64-beta"
+      name: "vm-aot-android-release-arm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4664,7 +4667,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -4675,7 +4679,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-release-simarm64-stable"
+      name: "vm-aot-asan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4699,10 +4703,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4711,7 +4716,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-release-simarm_x64"
+      name: "vm-aot-dwarf-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4738,7 +4743,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4747,7 +4752,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-release-simarm_x64-beta"
+      name: "vm-aot-linux-debug-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4772,7 +4777,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -4783,7 +4789,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-release-simarm_x64-stable"
+      name: "vm-aot-linux-debug-simarm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4808,7 +4814,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -4819,7 +4826,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-release-x64"
+      name: "vm-aot-linux-debug-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4844,7 +4851,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -4855,7 +4863,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-release-x64-beta"
+      name: "vm-aot-linux-debug-simriscv64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4880,9 +4888,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4891,7 +4900,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-release-x64-stable"
+      name: "vm-aot-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -4916,9 +4925,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4927,11 +4937,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-mac-product-arm64"
+      name: "vm-aot-linux-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4941,7 +4951,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -4952,13 +4962,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 70
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4967,11 +4974,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-mac-release-arm64"
+      name: "vm-aot-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4981,7 +4988,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -4992,17 +4999,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5011,12 +5010,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-mac-release-x64"
+      name: "vm-aot-linux-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:8"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5026,7 +5024,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5038,13 +5036,9 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "shard_timeout": 7200'
         '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5053,12 +5047,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-mac-release-x64-beta"
+      name: "vm-aot-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:8"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5068,7 +5061,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5079,14 +5072,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5095,12 +5083,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-mac-release-x64-stable"
+      name: "vm-aot-linux-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:8"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5110,7 +5097,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5121,14 +5108,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5137,7 +5119,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-msan-linux-release-x64"
+      name: "vm-aot-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5161,11 +5143,10 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5174,7 +5155,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-obfuscate-linux-release-x64"
+      name: "vm-aot-linux-release-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5201,7 +5182,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5210,7 +5191,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-tsan-linux-release-x64"
+      name: "vm-aot-linux-release-simarm_x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5234,11 +5215,10 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5247,7 +5227,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-ubsan-linux-release-x64"
+      name: "vm-aot-linux-release-simarm_x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5260,8 +5240,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -5269,11 +5251,10 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5282,11 +5263,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-win-debug-x64c"
+      name: "vm-aot-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5296,7 +5277,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5307,10 +5288,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5319,11 +5299,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-win-product-x64"
+      name: "vm-aot-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5333,7 +5313,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5346,7 +5326,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5355,11 +5335,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-win-release-x64"
+      name: "vm-aot-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5369,7 +5349,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5391,11 +5371,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-win-release-x64-beta"
+      name: "vm-aot-mac-product-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5418,7 +5398,11 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5427,11 +5411,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-win-release-x64-stable"
+      name: "vm-aot-mac-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5452,9 +5436,17 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5463,11 +5455,12 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-debug-x64"
+      name: "vm-aot-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5477,7 +5470,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5492,6 +5485,10 @@ buckets {
         '  "shard_timeout": 5400'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5500,11 +5497,12 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-debug-x64-beta"
+      name: "vm-aot-mac-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5514,7 +5512,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5529,6 +5527,10 @@ buckets {
         '  "shard_timeout": 5400'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5537,11 +5539,12 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-debug-x64-stable"
+      name: "vm-aot-mac-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5551,7 +5554,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5566,6 +5569,10 @@ buckets {
         '  "shard_timeout": 5400'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5574,7 +5581,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-product-x64"
+      name: "vm-aot-msan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5598,6 +5605,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -5610,7 +5618,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-release-x64"
+      name: "vm-aot-obfuscate-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5637,7 +5645,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5646,7 +5654,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-release-x64-beta"
+      name: "vm-aot-tsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5670,10 +5678,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5682,7 +5691,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-release-x64-stable"
+      name: "vm-aot-ubsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5695,10 +5704,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -5706,10 +5713,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5718,11 +5726,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-asan-linux-release-x64"
+      name: "vm-aot-win-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5732,7 +5740,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5742,9 +5750,9 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 70
       build_numbers: YES
@@ -5755,11 +5763,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-checked-mac-release-arm64"
+      name: "vm-aot-win-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5782,28 +5790,20 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-checked-mac-release-arm64-beta"
+      name: "vm-aot-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5827,27 +5827,19 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-checked-mac-release-arm64-stable"
+      name: "vm-aot-win-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5871,27 +5863,19 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-eager-optimization-linux-release-ia32"
+      name: "vm-aot-win-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5901,7 +5885,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -5914,7 +5898,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5923,7 +5907,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-eager-optimization-linux-release-x64"
+      name: "vm-appjit-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5948,10 +5932,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
-      expiration_secs: 86400
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5960,7 +5944,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm"
+      name: "vm-appjit-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -5985,7 +5969,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -5996,7 +5981,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm-beta"
+      name: "vm-appjit-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6021,7 +6006,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 50
       build_numbers: YES
@@ -6032,7 +6018,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm-stable"
+      name: "vm-appjit-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6059,7 +6045,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6068,7 +6054,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c"
+      name: "vm-appjit-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6104,7 +6090,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c-beta"
+      name: "vm-appjit-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6140,7 +6126,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c-stable"
+      name: "vm-appjit-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6176,7 +6162,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm"
+      name: "vm-asan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6200,10 +6186,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6212,11 +6199,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm-beta"
+      name: "vm-checked-mac-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6226,7 +6213,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6240,19 +6227,27 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm-stable"
+      name: "vm-checked-mac-release-arm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6262,7 +6257,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6276,19 +6271,27 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c"
+      name: "vm-checked-mac-release-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6298,7 +6301,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -6312,15 +6315,23 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c-beta"
+      name: "vm-eager-optimization-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6347,7 +6358,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6356,7 +6367,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c-stable"
+      name: "vm-eager-optimization-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6383,7 +6394,8 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
+      expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6392,7 +6404,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm"
+      name: "vm-ffi-android-debug-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6428,7 +6440,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm-beta"
+      name: "vm-ffi-android-debug-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6464,7 +6476,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm-stable"
+      name: "vm-ffi-android-debug-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6500,7 +6512,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c"
+      name: "vm-ffi-android-debug-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6536,7 +6548,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c-beta"
+      name: "vm-ffi-android-debug-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6572,7 +6584,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c-stable"
+      name: "vm-ffi-android-debug-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6608,7 +6620,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-qemu-linux-release-arm"
+      name: "vm-ffi-android-product-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6644,7 +6656,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-qemu-linux-release-arm-beta"
+      name: "vm-ffi-android-product-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6680,10 +6692,10 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-qemu-linux-release-arm-experimental"
+      name: "vm-ffi-android-product-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "host_class:experimental"
+      dimensions: "host_class:default"
       dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
@@ -6707,7 +6719,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6716,7 +6728,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-qemu-linux-release-arm-stable"
+      name: "vm-ffi-android-product-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6752,7 +6764,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-qemu-linux-release-riscv64"
+      name: "vm-ffi-android-product-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6788,7 +6800,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-qemu-linux-release-riscv64-beta"
+      name: "vm-ffi-android-product-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6824,7 +6836,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-qemu-linux-release-riscv64-stable"
+      name: "vm-ffi-android-release-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6860,7 +6872,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-fuchsia-release-arm64"
+      name: "vm-ffi-android-release-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6887,8 +6899,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      expiration_secs: 86400
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6897,7 +6908,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-fuchsia-release-x64"
+      name: "vm-ffi-android-release-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6924,8 +6935,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      expiration_secs: 86400
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6934,7 +6944,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-gcc-linux"
+      name: "vm-ffi-android-release-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6947,9 +6957,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true,'
-        '    "timeout": 4500'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -6960,8 +6971,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      execution_timeout_secs: 18000
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6970,7 +6980,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64"
+      name: "vm-ffi-android-release-arm64c-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -6997,7 +7007,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7006,7 +7016,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-x64"
+      name: "vm-ffi-android-release-arm64c-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7033,7 +7043,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7042,7 +7052,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64"
+      name: "vm-ffi-qemu-linux-release-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7069,7 +7079,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7078,7 +7088,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64"
+      name: "vm-ffi-qemu-linux-release-arm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7105,7 +7115,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7114,10 +7124,10 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-ia32"
+      name: "vm-ffi-qemu-linux-release-arm-experimental"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
+      dimensions: "host_class:experimental"
       dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
@@ -7139,8 +7149,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 70
       build_numbers: YES
@@ -7151,7 +7160,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-simriscv64"
+      name: "vm-ffi-qemu-linux-release-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7178,7 +7187,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7187,7 +7196,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-x64"
+      name: "vm-ffi-qemu-linux-release-riscv64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7223,7 +7232,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-x64-beta"
+      name: "vm-ffi-qemu-linux-release-riscv64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7259,7 +7268,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-x64-stable"
+      name: "vm-ffi-qemu-linux-release-riscv64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7295,7 +7304,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-x64c"
+      name: "vm-fuchsia-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7323,6 +7332,7 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
+      expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7331,7 +7341,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-arm64"
+      name: "vm-fuchsia-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7356,11 +7366,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 7200'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 50
-      execution_timeout_secs: 14400
+      priority: 70
+      expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7369,7 +7378,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-ia32"
+      name: "vm-gcc-linux"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7382,10 +7391,9 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true,'
+        '    "timeout": 4500'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -7397,6 +7405,7 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
+      execution_timeout_secs: 18000
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7405,7 +7414,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-simarm"
+      name: "vm-kernel-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7432,7 +7441,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7441,7 +7450,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-simarm-beta"
+      name: "vm-kernel-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7468,7 +7477,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7477,7 +7486,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-simarm-stable"
+      name: "vm-kernel-precomp-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7504,7 +7513,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7513,7 +7522,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-simarm64"
+      name: "vm-kernel-precomp-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7540,7 +7549,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7549,7 +7558,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-simarm64-beta"
+      name: "vm-linux-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7574,9 +7583,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7585,7 +7595,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-simarm64-stable"
+      name: "vm-linux-debug-simriscv64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7612,7 +7622,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7621,7 +7631,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-x64"
+      name: "vm-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7657,7 +7667,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-x64-beta"
+      name: "vm-linux-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7693,7 +7703,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-x64-stable"
+      name: "vm-linux-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -7729,11 +7739,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-debug-arm64"
+      name: "vm-linux-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7743,7 +7753,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -7754,17 +7764,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7773,11 +7775,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-debug-arm64-beta"
+      name: "vm-linux-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7787,7 +7789,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -7798,17 +7800,11 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "shard_timeout": 7200'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      execution_timeout_secs: 14400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7817,11 +7813,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-debug-arm64-stable"
+      name: "vm-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7831,7 +7827,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -7842,17 +7838,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7861,11 +7849,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-debug-x64"
+      name: "vm-linux-release-simarm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7875,7 +7863,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -7886,14 +7874,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7902,11 +7885,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-debug-x64-beta"
+      name: "vm-linux-release-simarm-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7916,7 +7899,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -7927,14 +7910,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7943,11 +7921,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-debug-x64-stable"
+      name: "vm-linux-release-simarm-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7957,7 +7935,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -7968,14 +7946,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7984,11 +7957,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-release-arm64"
+      name: "vm-linux-release-simarm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7998,7 +7971,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8009,16 +7982,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8027,11 +7993,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-release-arm64-beta"
+      name: "vm-linux-release-simarm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8041,7 +8007,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8052,16 +8018,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8070,11 +8029,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-release-arm64-stable"
+      name: "vm-linux-release-simarm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8084,7 +8043,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8095,16 +8054,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8113,11 +8065,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-release-x64"
+      name: "vm-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8127,7 +8079,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8141,10 +8093,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8153,11 +8101,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-release-x64-beta"
+      name: "vm-linux-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8167,7 +8115,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8181,10 +8129,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8193,11 +8137,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-release-x64-stable"
+      name: "vm-linux-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8207,7 +8151,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8221,10 +8165,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8233,11 +8173,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-msan-linux-release-x64"
+      name: "vm-mac-debug-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8247,7 +8187,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8257,11 +8197,18 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8270,11 +8217,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-msvc-windows"
+      name: "vm-mac-debug-arm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8283,8 +8230,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -8293,9 +8242,17 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8304,11 +8261,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-linux-debug-x64"
+      name: "vm-mac-debug-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8318,7 +8275,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8329,9 +8286,17 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8340,11 +8305,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-linux-release-x64"
+      name: "vm-mac-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8354,7 +8319,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8365,9 +8330,14 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8376,11 +8346,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-rollback-linux-debug-x64"
+      name: "vm-mac-debug-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8390,7 +8360,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8401,9 +8371,14 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8412,11 +8387,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-rollback-linux-release-x64"
+      name: "vm-mac-debug-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8426,7 +8401,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8437,9 +8412,14 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8448,11 +8428,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-tsan-linux-release-x64"
+      name: "vm-mac-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8462,7 +8442,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8472,11 +8452,17 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8485,11 +8471,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-ubsan-linux-release-x64"
+      name: "vm-mac-release-arm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8498,8 +8484,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -8507,11 +8495,17 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8520,11 +8514,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-win-debug-x64"
+      name: "vm-mac-release-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8545,10 +8539,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8557,11 +8557,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-win-debug-x64-beta"
+      name: "vm-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8582,10 +8582,13 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8594,11 +8597,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-win-debug-x64-stable"
+      name: "vm-mac-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8619,10 +8622,13 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8631,11 +8637,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-win-debug-x64c"
+      name: "vm-mac-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8658,7 +8664,11 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8667,11 +8677,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-win-release-ia32"
+      name: "vm-msan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8681,7 +8691,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8691,6 +8701,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -8703,7 +8714,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-win-release-x64"
+      name: "vm-msvc-windows"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8716,10 +8727,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -8730,7 +8739,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8739,11 +8748,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-win-release-x64-beta"
+      name: "vm-reload-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8753,7 +8762,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8766,7 +8775,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8775,11 +8784,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-win-release-x64-stable"
+      name: "vm-reload-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8789,7 +8798,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8802,7 +8811,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8810,34 +8819,8 @@ buckets {
         value: 100
       }
     }
-  }
-  shadow: "ci.sandbox.shadow"
-  constraints {
-    pools: "dart.tests"
-    pools: "luci.dart.try"
-    service_accounts: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-  }
-}
-buckets {
-  name: "ci.sandbox.shadow"
-  constraints {
-    pools: "dart.tests"
-    pools: "luci.dart.try"
-    service_accounts: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-  }
-}
-buckets {
-  name: "ci.shadow"
-  constraints {
-    pools: "luci.dart.ci"
-    service_accounts: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-  }
-}
-buckets {
-  name: "try"
-  swarming {
     builders {
-      name: "analyzer-analysis-server-linux-try"
+      name: "vm-reload-rollback-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8864,7 +8847,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 30
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8873,7 +8856,7 @@ buckets {
       }
     }
     builders {
-      name: "analyzer-linux-release-try"
+      name: "vm-reload-rollback-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8900,7 +8883,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 30
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8909,11 +8892,11 @@ buckets {
       }
     }
     builders {
-      name: "analyzer-mac-release-try"
+      name: "vm-tsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8923,7 +8906,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -8933,14 +8916,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8949,11 +8929,11 @@ buckets {
       }
     }
     builders {
-      name: "analyzer-win-release-try"
+      name: "vm-ubsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8962,10 +8942,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -8973,27 +8951,24 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 30
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "benchmark-linux-try"
+      name: "vm-win-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9003,7 +8978,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9014,12 +8989,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "checkout_javascript_engines": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
-      priority: 30
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9028,7 +9001,829 @@ buckets {
       }
     }
     builders {
-      name: "beta-try"
+      name: "vm-win-debug-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-win-debug-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-win-debug-x64c"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-win-release-ia32"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-win-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-win-release-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-win-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+  }
+  shadow: "ci.sandbox.shadow"
+  constraints {
+    pools: "dart.tests"
+    pools: "luci.dart.try"
+    service_accounts: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
+}
+buckets {
+  name: "ci.sandbox.shadow"
+  constraints {
+    pools: "dart.tests"
+    pools: "luci.dart.try"
+    service_accounts: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
+}
+buckets {
+  name: "ci.shadow"
+  constraints {
+    pools: "luci.dart.ci"
+    service_accounts: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
+  }
+}
+buckets {
+  name: "try"
+  swarming {
+    builders {
+      name: "analyzer-analysis-server-linux-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-linux-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-mac-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "analyzer-win-release-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "benchmark-linux-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "checkout_javascript_engines": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "beta-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "from_ref": "refs/heads/dev",'
+        '  "recipe": "release/merge",'
+        '  "to_ref": "refs/heads/beta"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 900
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.non_production"
+        value: 100
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-sdk-linux-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$dart/build": {'
+        '    "timeout": 6000'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "archs": ['
+        '    "arm",'
+        '    "arm64"'
+        '  ],'
+        '  "clobber": true,'
+        '  "disable_bcid": true,'
+        '  "recipe": "release/sdk"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-sdk-linux-riscv64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$dart/build": {'
+        '    "timeout": 6000'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "archs": ['
+        '    "riscv64"'
+        '  ],'
+        '  "args": ['
+        '    "--no-clang"'
+        '  ],'
+        '  "clobber": true,'
+        '  "disable_bcid": true,'
+        '  "recipe": "release/sdk"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-sdk-linux-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$dart/build": {'
+        '    "timeout": 6000'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "archs": ['
+        '    "ia32",'
+        '    "x64"'
+        '  ],'
+        '  "clobber": true,'
+        '  "dartdoc_arch": "x64",'
+        '  "disable_bcid": true,'
+        '  "recipe": "release/sdk",'
+        '  "upload_version": true'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-sdk-mac-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "archs": ['
+        '    "arm64"'
+        '  ],'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "disable_bcid": true,'
+        '  "recipe": "release/sdk"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-sdk-mac-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "archs": ['
+        '    "x64"'
+        '  ],'
+        '  "clobber": true,'
+        '  "disable_bcid": true,'
+        '  "recipe": "release/sdk"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-sdk-win-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "archs": ['
+        '    "arm64"'
+        '  ],'
+        '  "clobber": true,'
+        '  "disable_bcid": true,'
+        '  "recipe": "release/sdk"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart-sdk-win-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "archs": ['
+        '    "ia32",'
+        '    "x64"'
+        '  ],'
+        '  "clobber": true,'
+        '  "disable_bcid": true,'
+        '  "recipe": "release/sdk"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-canary-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9053,25 +9848,61 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "from_ref": "refs/heads/dev",'
-        '  "recipe": "release/merge",'
-        '  "to_ref": "refs/heads/beta"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 900
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
-        key: "luci.non_production"
+        key: "luci.recipes.use_python3"
         value: 100
       }
+    }
+    builders {
+      name: "dart2js-hostasserts-linux-d8-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "dart-sdk-linux-arm64-try"
+      name: "dart2js-hostasserts-linux-unsound-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9089,22 +9920,18 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$dart/build": {'
-        '    "timeout": 6000'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "archs": ['
-        '    "arm",'
-        '    "arm64"'
-        '  ],'
         '  "clobber": true,'
-        '  "disable_bcid": true,'
-        '  "recipe": "release/sdk"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -9115,7 +9942,7 @@ buckets {
       }
     }
     builders {
-      name: "dart-sdk-linux-riscv64-try"
+      name: "dart2js-linux-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9133,24 +9960,18 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$dart/build": {'
-        '    "timeout": 6000'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "archs": ['
-        '    "riscv64"'
-        '  ],'
-        '  "args": ['
-        '    "--no-clang"'
-        '  ],'
         '  "clobber": true,'
-        '  "disable_bcid": true,'
-        '  "recipe": "release/sdk"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -9161,7 +9982,7 @@ buckets {
       }
     }
     builders {
-      name: "dart-sdk-linux-try"
+      name: "dart2js-linux-firefox-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9179,8 +10000,45 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$dart/build": {'
-        '    "timeout": 6000'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-mac-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -9188,17 +10046,18 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "archs": ['
-        '    "ia32",'
-        '    "x64"'
-        '  ],'
         '  "clobber": true,'
-        '  "dartdoc_arch": "x64",'
-        '  "disable_bcid": true,'
-        '  "recipe": "release/sdk",'
-        '  "upload_version": true'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9207,7 +10066,7 @@ buckets {
       }
     }
     builders {
-      name: "dart-sdk-mac-arm64-try"
+      name: "dart2js-mac-safari-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
@@ -9221,7 +10080,90 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-minified-csp-linux-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2js-minified-linux-d8-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9231,21 +10173,13 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "archs": ['
-        '    "arm64"'
-        '  ],'
         '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
-        '  "disable_bcid": true,'
-        '  "recipe": "release/sdk"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9254,11 +10188,11 @@ buckets {
       }
     }
     builders {
-      name: "dart-sdk-mac-try"
+      name: "dart2js-unit-linux-x64-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9268,7 +10202,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9278,18 +10212,13 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "archs": ['
-        '    "x64"'
-        '  ],'
         '  "clobber": true,'
-        '  "disable_bcid": true,'
-        '  "recipe": "release/sdk"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9298,7 +10227,7 @@ buckets {
       }
     }
     builders {
-      name: "dart-sdk-win-arm64-try"
+      name: "dart2js-win-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9322,12 +10251,12 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "archs": ['
-        '    "arm64"'
-        '  ],'
         '  "clobber": true,'
-        '  "disable_bcid": true,'
-        '  "recipe": "release/sdk"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -9338,11 +10267,11 @@ buckets {
       }
     }
     builders {
-      name: "dart-sdk-win-try"
+      name: "dart2wasm-linux-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9352,7 +10281,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9362,13 +10291,12 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "archs": ['
-        '    "ia32",'
-        '    "x64"'
-        '  ],'
         '  "clobber": true,'
-        '  "disable_bcid": true,'
-        '  "recipe": "release/sdk"'
+        '  "custom_vars": {'
+        '    "download_chrome": true,'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -9379,7 +10307,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-canary-linux-try"
+      name: "dart2wasm-linux-d8-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9405,8 +10333,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
+        '    "download_emscripten": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -9419,7 +10346,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-hostasserts-linux-d8-try"
+      name: "ddc-canary-linux-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9445,7 +10372,8 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
@@ -9458,7 +10386,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-hostasserts-linux-unsound-try"
+      name: "ddc-linux-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9498,7 +10426,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-linux-chrome-try"
+      name: "ddc-linux-chrome-unsound-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9538,7 +10466,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-linux-firefox-try"
+      name: "ddc-linux-firefox-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9578,7 +10506,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-mac-chrome-try"
+      name: "ddc-mac-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "host_class:default"
@@ -9622,11 +10550,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-mac-safari-try"
+      name: "ddc-win-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9648,15 +10576,12 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9665,7 +10590,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-minified-csp-linux-chrome-try"
+      name: "dev-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9690,22 +10615,25 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "from_ref": "refs/heads/lkgr",'
+        '  "recipe": "release/merge",'
+        '  "to_ref": "refs/heads/dev"'
         '}'
       priority: 30
+      execution_timeout_secs: 900
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.non_production"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "dart2js-minified-linux-d8-try"
+      name: "flutter-analyze-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9730,12 +10658,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      execution_timeout_secs: 2700
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9744,7 +10670,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-unit-linux-x64-release-try"
+      name: "flutter-engine-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9768,13 +10694,19 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "flutter_test_suites": ['
+        '    "add_to_app_life_cycle_tests",'
+        '    "flutter_plugins",'
+        '    "framework_coverage",'
+        '    "framework_tests",'
+        '    "tool_tests"'
+        '  ],'
+        '  "recipe": "dart/flutter_engine"'
         '}'
       priority: 30
+      execution_timeout_secs: 28800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9783,11 +10715,11 @@ buckets {
       }
     }
     builders {
-      name: "dart2js-win-chrome-try"
+      name: "flutter-engine-linux-web_tests-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9797,7 +10729,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -9808,13 +10740,14 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "flutter_test_suites": ['
+        '    "web_tests",'
+        '    "web_tool_tests"'
+        '  ],'
+        '  "recipe": "dart/flutter_engine"'
         '}'
       priority: 30
+      execution_timeout_secs: 28800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9823,7 +10756,7 @@ buckets {
       }
     }
     builders {
-      name: "dart2wasm-linux-chrome-try"
+      name: "flutter-frontend-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9848,10 +10781,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true,'
-        '    "download_emscripten": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -9863,14 +10792,14 @@ buckets {
       }
     }
     builders {
-      name: "dart2wasm-linux-d8-try"
+      name: "flutter-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -9881,19 +10810,24 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
+        '  "$flutter/goma": {'
+        '    "server": "goma.chromium.org"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "builder_name_suffix": "-try",'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_emscripten": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "config_name": "host_linux",'
+        '  "environment": "unused",'
+        '  "goma_jobs": "200",'
+        '  "recipe": "engine_v2/engine_v2"'
         '}'
       priority: 30
+      execution_timeout_secs: 7200
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9902,7 +10836,7 @@ buckets {
       }
     }
     builders {
-      name: "ddc-canary-linux-chrome-try"
+      name: "front-end-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9927,10 +10861,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -9942,7 +10872,7 @@ buckets {
       }
     }
     builders {
-      name: "ddc-linux-chrome-try"
+      name: "front-end-nnbd-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -9967,10 +10897,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -9982,11 +10908,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-linux-chrome-unsound-try"
+      name: "front-end-nnbd-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9996,7 +10922,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10007,13 +10933,13 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10022,11 +10948,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-linux-firefox-try"
+      name: "front-end-nnbd-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10036,7 +10962,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10047,10 +10973,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_firefox": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -10062,11 +10984,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-mac-chrome-try"
+      name: "gclient-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10076,7 +10998,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10087,17 +11009,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/gclient"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10106,11 +11020,11 @@ buckets {
       }
     }
     builders {
-      name: "ddc-win-chrome-try"
+      name: "pkg-linux-debug-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10120,7 +11034,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10132,7 +11046,6 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -10146,7 +11059,7 @@ buckets {
       }
     }
     builders {
-      name: "dev-try"
+      name: "pkg-linux-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10171,29 +11084,25 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "from_ref": "refs/heads/lkgr",'
-        '  "recipe": "release/merge",'
-        '  "to_ref": "refs/heads/dev"'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 900
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.non_production"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "flutter-analyze-try"
+      name: "pkg-mac-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10203,7 +11112,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10213,24 +11122,35 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 2700
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "flutter-engine-linux-try"
+      name: "pkg-mac-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10240,7 +11160,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10250,19 +11170,17 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "flutter_test_suites": ['
-        '    "add_to_app_life_cycle_tests",'
-        '    "flutter_plugins",'
-        '    "framework_coverage",'
-        '    "framework_tests",'
-        '    "tool_tests"'
-        '  ],'
-        '  "recipe": "dart/flutter_engine"'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 28800
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10271,11 +11189,11 @@ buckets {
       }
     }
     builders {
-      name: "flutter-engine-linux-web_tests-try"
+      name: "pkg-win-release-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10285,7 +11203,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10296,23 +11214,25 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "flutter_test_suites": ['
-        '    "web_tests",'
-        '    "web_tool_tests"'
-        '  ],'
-        '  "recipe": "dart/flutter_engine"'
+        '  "custom_vars": {'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 28800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "flutter-frontend-try"
+      name: "stable-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10337,25 +11257,32 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "from_ref": "refs/heads/beta",'
+        '  "recipe": "release/merge",'
+        '  "to_ref": "refs/heads/stable"'
         '}'
       priority: 30
+      execution_timeout_secs: 900
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.non_production"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "flutter-linux-try"
+      name: "vm-aot-android-release-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
-        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -10366,24 +11293,17 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$flutter/goma": {'
-        '    "server": "goma.chromium.org"'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "builder_name_suffix": "-try",'
         '  "clobber": true,'
-        '  "config_name": "host_linux",'
-        '  "environment": "unused",'
-        '  "goma_jobs": "200",'
-        '  "recipe": "engine_v2/engine_v2"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
-      execution_timeout_secs: 7200
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10392,7 +11312,7 @@ buckets {
       }
     }
     builders {
-      name: "front-end-linux-release-x64-try"
+      name: "vm-aot-android-release-arm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10417,7 +11337,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -10428,7 +11349,7 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-linux-release-x64-try"
+      name: "vm-aot-asan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10452,6 +11373,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -10464,11 +11386,11 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-mac-release-x64-try"
+      name: "vm-aot-dwarf-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10478,7 +11400,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10492,10 +11414,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10504,11 +11422,11 @@ buckets {
       }
     }
     builders {
-      name: "front-end-nnbd-win-release-x64-try"
+      name: "vm-aot-linux-debug-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10518,7 +11436,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10529,7 +11447,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -10540,7 +11459,7 @@ buckets {
       }
     }
     builders {
-      name: "gclient-try"
+      name: "vm-aot-linux-debug-simriscv64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10565,7 +11484,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/gclient"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -10576,7 +11496,7 @@ buckets {
       }
     }
     builders {
-      name: "pkg-linux-debug-try"
+      name: "vm-aot-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10601,10 +11521,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -10615,7 +11533,7 @@ buckets {
       }
     }
     builders {
-      name: "pkg-linux-release-try"
+      name: "vm-aot-linux-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10640,10 +11558,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -10654,11 +11570,11 @@ buckets {
       }
     }
     builders {
-      name: "pkg-mac-release-arm64-try"
+      name: "vm-aot-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10668,7 +11584,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10679,34 +11595,22 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "pkg-mac-release-try"
+      name: "vm-aot-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10716,7 +11620,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10727,16 +11631,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10745,11 +11642,11 @@ buckets {
       }
     }
     builders {
-      name: "pkg-win-release-try"
+      name: "vm-aot-linux-release-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10759,7 +11656,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10770,25 +11667,18 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_chrome": true'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "stable-try"
+      name: "vm-aot-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10813,29 +11703,22 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "from_ref": "refs/heads/beta",'
-        '  "recipe": "release/merge",'
-        '  "to_ref": "refs/heads/stable"'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 900
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.non_production"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-aot-android-release-arm64c-try"
+      name: "vm-aot-mac-product-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10845,7 +11728,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10856,10 +11739,13 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10868,11 +11754,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-android-release-arm_x64-try"
+      name: "vm-aot-mac-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10882,7 +11768,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10893,10 +11779,17 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10905,11 +11798,12 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-asan-linux-release-x64-try"
+      name: "vm-aot-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cores:8"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10919,7 +11813,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -10929,11 +11823,15 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10942,7 +11840,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-dwarf-linux-product-x64-try"
+      name: "vm-aot-msan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -10966,6 +11864,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -10978,7 +11877,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-debug-simarm_x64-try"
+      name: "vm-aot-obfuscate-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11003,8 +11902,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -11015,7 +11913,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-debug-simriscv64-try"
+      name: "vm-aot-tsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11039,9 +11937,9 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -11052,7 +11950,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-debug-x64-try"
+      name: "vm-aot-ubsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11065,10 +11963,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -11076,9 +11972,9 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -11089,11 +11985,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-debug-x64c-try"
+      name: "vm-aot-win-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11103,7 +11999,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11126,11 +12022,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-product-x64-try"
+      name: "vm-aot-win-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11140,7 +12036,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11162,11 +12058,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-release-simarm64-try"
+      name: "vm-aot-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11176,7 +12072,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11198,7 +12094,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-release-simarm_x64-try"
+      name: "vm-appjit-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11223,7 +12119,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -11234,7 +12131,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-linux-release-x64-try"
+      name: "vm-appjit-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11270,11 +12167,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-mac-product-arm64-try"
+      name: "vm-appjit-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11284,7 +12181,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11298,10 +12195,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11310,11 +12203,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-mac-release-arm64-try"
+      name: "vm-asan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11324,7 +12217,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11334,18 +12227,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11354,10 +12240,9 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-mac-release-x64-try"
+      name: "vm-checked-mac-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
@@ -11380,8 +12265,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       caches {
@@ -11390,13 +12274,17 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "dart.use_update_script"
+        value: 100
+      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-aot-msan-linux-release-x64-try"
+      name: "vm-eager-optimization-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11420,7 +12308,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -11433,7 +12320,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-obfuscate-linux-release-x64-try"
+      name: "vm-eager-optimization-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11469,7 +12356,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-tsan-linux-release-x64-try"
+      name: "vm-ffi-android-debug-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11493,7 +12380,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -11506,7 +12392,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-ubsan-linux-release-x64-try"
+      name: "vm-ffi-android-debug-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11519,8 +12405,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -11528,7 +12416,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -11541,11 +12428,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-win-debug-x64c-try"
+      name: "vm-ffi-android-product-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11555,7 +12442,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11566,8 +12453,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -11578,11 +12464,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-win-product-x64-try"
+      name: "vm-ffi-android-product-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11592,7 +12478,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11614,11 +12500,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-win-release-x64-try"
+      name: "vm-ffi-android-release-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11628,7 +12514,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11650,7 +12536,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-debug-x64-try"
+      name: "vm-ffi-android-release-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11675,8 +12561,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -11687,7 +12572,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-product-x64-try"
+      name: "vm-ffi-qemu-linux-release-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11723,7 +12608,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-release-x64-try"
+      name: "vm-ffi-qemu-linux-release-riscv64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11759,7 +12644,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-asan-linux-release-x64-try"
+      name: "vm-fuchsia-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11783,7 +12668,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -11796,11 +12680,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-checked-mac-release-arm64-try"
+      name: "vm-fuchsia-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11810,7 +12694,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -11824,23 +12708,15 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
       }
     }
     builders {
-      name: "vm-eager-optimization-linux-release-ia32-try"
+      name: "vm-gcc-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11853,10 +12729,9 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true,'
+        '    "timeout": 4500'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -11868,6 +12743,7 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      execution_timeout_secs: 18000
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11876,7 +12752,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-eager-optimization-linux-release-x64-try"
+      name: "vm-kernel-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11912,7 +12788,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm-try"
+      name: "vm-kernel-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11948,7 +12824,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-debug-arm64c-try"
+      name: "vm-kernel-precomp-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11984,7 +12860,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm-try"
+      name: "vm-kernel-precomp-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12020,7 +12896,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-product-arm64c-try"
+      name: "vm-linux-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12045,7 +12921,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -12056,7 +12933,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm-try"
+      name: "vm-linux-debug-simriscv64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12092,7 +12969,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-android-release-arm64c-try"
+      name: "vm-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12128,7 +13005,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-qemu-linux-release-arm-try"
+      name: "vm-linux-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12164,7 +13041,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-ffi-qemu-linux-release-riscv64-try"
+      name: "vm-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12200,7 +13077,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-fuchsia-release-arm64-try"
+      name: "vm-linux-release-simarm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12236,7 +13113,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-fuchsia-release-x64-try"
+      name: "vm-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12272,7 +13149,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-gcc-linux-try"
+      name: "vm-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12285,9 +13162,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true,'
-        '    "timeout": 4500'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -12299,7 +13177,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 18000
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12308,11 +13185,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-debug-x64-try"
+      name: "vm-mac-debug-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12322,7 +13199,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12333,9 +13210,17 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12344,11 +13229,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-linux-release-x64-try"
+      name: "vm-mac-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12358,7 +13243,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12369,9 +13254,14 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12380,11 +13270,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-debug-x64-try"
+      name: "vm-mac-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12394,7 +13284,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12405,9 +13295,16 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12416,11 +13313,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-kernel-precomp-linux-release-x64-try"
+      name: "vm-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12430,7 +13327,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12444,6 +13341,10 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12452,7 +13353,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-ia32-try"
+      name: "vm-msan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12476,9 +13377,9 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -12489,11 +13390,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-simriscv64-try"
+      name: "vm-msvc-windows-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12502,10 +13403,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -12525,7 +13424,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-x64-try"
+      name: "vm-reload-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12561,7 +13460,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-debug-x64c-try"
+      name: "vm-reload-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12597,7 +13496,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-ia32-try"
+      name: "vm-reload-rollback-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12633,7 +13532,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-simarm-try"
+      name: "vm-reload-rollback-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12669,7 +13568,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-simarm64-try"
+      name: "vm-tsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12693,6 +13592,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -12705,7 +13605,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-linux-release-x64-try"
+      name: "vm-ubsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12718,10 +13618,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -12729,6 +13627,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -12741,11 +13640,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-debug-arm64-try"
+      name: "vm-win-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12766,17 +13665,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12785,11 +13677,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-debug-x64-try"
+      name: "vm-win-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12810,14 +13702,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12826,12 +13713,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-release-arm64-try"
+      name: "vm-win-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
@@ -12839,10 +13725,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -12851,16 +13735,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12869,11 +13746,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-mac-release-x64-try"
+      name: "vm-win-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Mac"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12897,10 +13774,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12909,11 +13782,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-msan-linux-release-x64-try"
+      name: "vm-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12923,7 +13796,7 @@ buckets {
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": true,'
+        '    "enable_ats": false,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -12933,7 +13806,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -12945,22 +13817,34 @@ buckets {
         value: 100
       }
     }
+  }
+  shadow: "try.shadow"
+  constraints {
+    pools: "luci.dart.try"
+    service_accounts: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+  }
+}
+buckets {
+  name: "try.monorepo"
+  swarming {
     builders {
-      name: "vm-msvc-windows-try"
+      name: "flutter-linux-android_debug-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -12969,9 +13853,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12980,14 +13865,14 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-linux-debug-x64-try"
+      name: "flutter-linux-android_debug_arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -13005,9 +13890,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13016,14 +13902,14 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-linux-release-x64-try"
+      name: "flutter-linux-android_debug_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -13041,9 +13927,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13052,14 +13939,14 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-rollback-linux-debug-x64-try"
+      name: "flutter-linux-android_debug_x86-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -13077,9 +13964,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13088,14 +13976,14 @@ buckets {
       }
     }
     builders {
-      name: "vm-reload-rollback-linux-release-x64-try"
+      name: "flutter-linux-android_profile-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -13113,9 +14001,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13124,14 +14013,14 @@ buckets {
       }
     }
     builders {
-      name: "vm-tsan-linux-release-x64-try"
+      name: "flutter-linux-android_profile_arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
@@ -13148,11 +14037,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13161,21 +14050,23 @@ buckets {
       }
     }
     builders {
-      name: "vm-ubsan-linux-release-x64-try"
+      name: "flutter-linux-android_profile_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -13183,11 +14074,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13196,21 +14087,21 @@ buckets {
       }
     }
     builders {
-      name: "vm-win-debug-x64-try"
+      name: "flutter-linux-android_release-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -13221,10 +14112,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13233,21 +14124,21 @@ buckets {
       }
     }
     builders {
-      name: "vm-win-debug-x64c-try"
+      name: "flutter-linux-android_release_arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -13258,9 +14149,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13269,20 +14161,23 @@ buckets {
       }
     }
     builders {
-      name: "vm-win-release-arm64-try"
+      name: "flutter-linux-android_release_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -13291,9 +14186,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13302,21 +14198,21 @@ buckets {
       }
     }
     builders {
-      name: "vm-win-release-ia32-try"
+      name: "flutter-linux-flutter-plugins-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -13327,9 +14223,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13338,21 +14235,21 @@ buckets {
       }
     }
     builders {
-      name: "vm-win-release-x64-try"
+      name: "flutter-linux-framework-coverage-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:dart.tests"
       exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
         cmd: "luciexe"
       }
       properties:
         '{'
         '  "$build/goma": {'
-        '    "enable_ats": false,'
+        '    "enable_ats": true,'
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
@@ -13363,9 +14260,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13373,18 +14271,8 @@ buckets {
         value: 100
       }
     }
-  }
-  shadow: "try.shadow"
-  constraints {
-    pools: "luci.dart.try"
-    service_accounts: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-  }
-}
-buckets {
-  name: "try.monorepo"
-  swarming {
     builders {
-      name: "flutter-linux-android_debug-try"
+      name: "flutter-linux-framework-tests-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13409,10 +14297,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
-      execution_timeout_secs: 3600
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13421,7 +14309,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-android_profile-try"
+      name: "flutter-linux-host_debug-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13458,7 +14346,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-host_debug-try"
+      name: "flutter-linux-host_debug_unopt-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13495,7 +14383,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-host_debug_unopt-try"
+      name: "flutter-linux-host_profile-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13532,7 +14420,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-host_profile-try"
+      name: "flutter-linux-host_release-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13569,7 +14457,7 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-host_release-try"
+      name: "flutter-linux-tool-tests-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13594,10 +14482,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "engine_v2/builder"'
+        '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
-      execution_timeout_secs: 3600
+      execution_timeout_secs: 5400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 53e9e00fcf5e..d3315bb9ecec 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -370,6 +370,30 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try.monorepo/flutter-linux-android_profile-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-android_release-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-android_debug_arm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-android_profile_arm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-android_release_arm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-android_debug_x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-android_profile_x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-android_release_x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-android_debug_x86-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try.monorepo/flutter-linux-host_debug-try"
   }
@@ -385,6 +409,18 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try.monorepo/flutter-linux-wasm_release-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-flutter-plugins-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-framework-coverage-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-framework-tests-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-tool-tests-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try.monorepo/flutter-linux-web-tests-0-try"
   }
@@ -2528,6 +2564,46 @@ consoles {
     category: "build"
     short_name: "android-profile"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_release"
+    category: "build"
+    short_name: "android-release"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_debug_arm64"
+    category: "build"
+    short_name: "android-debug-arm64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_profile_arm64"
+    category: "build"
+    short_name: "android-profile-arm64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_release_arm64"
+    category: "build"
+    short_name: "android-release-arm64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_debug_x64"
+    category: "build"
+    short_name: "android-debug-x64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_profile_x64"
+    category: "build"
+    short_name: "android-profile-x64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_release_x64"
+    category: "build"
+    short_name: "android-release-x64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_debug_x86"
+    category: "build"
+    short_name: "android-debug-x86"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-host_debug"
     category: "build"
@@ -2553,49 +2629,69 @@ consoles {
     category: "build"
     short_name: "wasm"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-flutter-plugins"
+    category: "flutter-engine"
+    short_name: "plugins"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-framework-coverage"
+    category: "flutter-engine"
+    short_name: "coverage"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-framework-tests"
+    category: "flutter-engine"
+    short_name: "tests"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-tool-tests"
+    category: "flutter-engine"
+    short_name: "tool"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-0"
-    category: "web_test"
+    category: "flutter-web"
     short_name: "wt0"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-1"
-    category: "web_test"
+    category: "flutter-web"
     short_name: "wt1"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-2"
-    category: "web_test"
+    category: "flutter-web"
     short_name: "wt2"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-3"
-    category: "web_test"
+    category: "flutter-web"
     short_name: "wt3"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-4"
-    category: "web_test"
+    category: "flutter-web"
     short_name: "wt4"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-5"
-    category: "web_test"
+    category: "flutter-web"
     short_name: "wt5"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-6"
-    category: "web_test"
+    category: "flutter-web"
     short_name: "wt6"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-7-last"
-    category: "web_test"
+    category: "flutter-web"
     short_name: "wt7"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tool-tests"
-    category: "web_test"
+    category: "flutter-web"
     short_name: "wtool"
   }
   header {
@@ -2662,6 +2758,38 @@ consoles {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_profile"
     short_name: "android-profile"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_release"
+    short_name: "android-release"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_debug_arm64"
+    short_name: "android-debug-arm64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_profile_arm64"
+    short_name: "android-profile-arm64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_release_arm64"
+    short_name: "android-release-arm64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_debug_x64"
+    short_name: "android-debug-x64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_profile_x64"
+    short_name: "android-profile-x64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_release_x64"
+    short_name: "android-release-x64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_debug_x86"
+    short_name: "android-debug-x86"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-host_debug"
     short_name: "debug"
@@ -2682,6 +2810,22 @@ consoles {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-wasm_release"
     short_name: "wasm"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-flutter-plugins"
+    short_name: "plugins"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-framework-coverage"
+    short_name: "coverage"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-framework-tests"
+    short_name: "tests"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-tool-tests"
+    short_name: "tool"
+  }
   header {
     links {
       name: "Consoles"
diff --git a/monorepo.star b/monorepo.star
index cc2436ef6acf..2fd8964b4587 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -111,6 +111,42 @@ def monorepo_builder(name, short_name, category):
 
 monorepo_builder("flutter-linux-android_debug", "android-debug", "build")
 monorepo_builder("flutter-linux-android_profile", "android-profile", "build")
+monorepo_builder("flutter-linux-android_release", "android-release", "build")
+monorepo_builder(
+    "flutter-linux-android_debug_arm64",
+    "android-debug-arm64",
+    "build",
+)
+monorepo_builder(
+    "flutter-linux-android_profile_arm64",
+    "android-profile-arm64",
+    "build",
+)
+monorepo_builder(
+    "flutter-linux-android_release_arm64",
+    "android-release-arm64",
+    "build",
+)
+monorepo_builder(
+    "flutter-linux-android_debug_x64",
+    "android-debug-x64",
+    "build",
+)
+monorepo_builder(
+    "flutter-linux-android_profile_x64",
+    "android-profile-x64",
+    "build",
+)
+monorepo_builder(
+    "flutter-linux-android_release_x64",
+    "android-release-x64",
+    "build",
+)
+monorepo_builder(
+    "flutter-linux-android_debug_x86",
+    "android-debug-x86",
+    "build",
+)
 monorepo_builder("flutter-linux-host_debug", "debug", "build")
 monorepo_builder("flutter-linux-host_debug_unopt", "debug-unopt", "build")
 monorepo_builder("flutter-linux-host_profile", "profile", "build")
@@ -138,7 +174,7 @@ def monorepo_tester(name, short_name, category):
     luci.console_view_entry(
         builder = name,
         short_name = short_name,
-        console_view = "flutter-web",
+        console_view = category,
     )
     dart.try_builder(
         name,
@@ -150,12 +186,16 @@ def monorepo_tester(name, short_name, category):
         cq_branches = [],
     )
 
-monorepo_tester("flutter-linux-web-tests-0", "wt0", "web_test")
-monorepo_tester("flutter-linux-web-tests-1", "wt1", "web_test")
-monorepo_tester("flutter-linux-web-tests-2", "wt2", "web_test")
-monorepo_tester("flutter-linux-web-tests-3", "wt3", "web_test")
-monorepo_tester("flutter-linux-web-tests-4", "wt4", "web_test")
-monorepo_tester("flutter-linux-web-tests-5", "wt5", "web_test")
-monorepo_tester("flutter-linux-web-tests-6", "wt6", "web_test")
-monorepo_tester("flutter-linux-web-tests-7-last", "wt7", "web_test")
-monorepo_tester("flutter-linux-web-tool-tests", "wtool", "web_test")
+monorepo_tester("flutter-linux-flutter-plugins", "plugins", "flutter-engine")
+monorepo_tester("flutter-linux-framework-coverage", "coverage", "flutter-engine")
+monorepo_tester("flutter-linux-framework-tests", "tests", "flutter-engine")
+monorepo_tester("flutter-linux-tool-tests", "tool", "flutter-engine")
+monorepo_tester("flutter-linux-web-tests-0", "wt0", "flutter-web")
+monorepo_tester("flutter-linux-web-tests-1", "wt1", "flutter-web")
+monorepo_tester("flutter-linux-web-tests-2", "wt2", "flutter-web")
+monorepo_tester("flutter-linux-web-tests-3", "wt3", "flutter-web")
+monorepo_tester("flutter-linux-web-tests-4", "wt4", "flutter-web")
+monorepo_tester("flutter-linux-web-tests-5", "wt5", "flutter-web")
+monorepo_tester("flutter-linux-web-tests-6", "wt6", "flutter-web")
+monorepo_tester("flutter-linux-web-tests-7-last", "wt7", "flutter-web")
+monorepo_tester("flutter-linux-web-tool-tests", "wtool", "flutter-web")

From 388890a3604c557c889c10621738df0719b34ead Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Wed, 14 Jun 2023 11:04:50 +0000
Subject: [PATCH 665/826] [monorepo] Increase timeout for monorepo build

Increasing timeout from two hours to three hours
The monorepo coordinator build can now take more than two hours.
The longest build, host_debug_unopt, can take one hour
The coordinator downloading all builds for the global generators
can take 30 minutes.
The longest tester, framework-coverage, takes 35 minutes.

I have filed the linked bug for reducing this run time.
The downloads for the global generators can possibly be sped up,
if they run in parallel.

Bug: b/287183914
Change-Id: Ifdf732dcdd431a0c21b77a8ad52fdeb8868b035d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/309241
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 4 ++--
 monorepo.star                | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 19b4492e45cc..00192a7345e5 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -2403,7 +2403,7 @@ buckets {
         '  "recipe": "engine_v2/engine_v2"'
         '}'
       priority: 50
-      execution_timeout_secs: 7200
+      execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10827,7 +10827,7 @@ buckets {
         '  "recipe": "engine_v2/engine_v2"'
         '}'
       priority: 30
-      execution_timeout_secs: 7200
+      execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
diff --git a/monorepo.star b/monorepo.star
index 2fd8964b4587..9b064d9e312b 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -43,7 +43,7 @@ dart.ci_sandbox_builder(
     name = "flutter-linux",
     channels = [],
     executable = dart.flutter_recipe("engine_v2/engine_v2"),
-    execution_timeout = 120 * time.minute,
+    execution_timeout = 180 * time.minute,
     notifies = None,
     priority = priority.normal,
     properties = {
@@ -64,7 +64,7 @@ luci.console_view_entry(
 dart.try_builder(
     "flutter-linux",
     executable = dart.flutter_recipe("engine_v2/engine_v2"),
-    execution_timeout = 120 * time.minute,
+    execution_timeout = 180 * time.minute,
     properties = {
         "$flutter/goma": {"server": "goma.chromium.org"},
         "builder_name_suffix": "-try",

From 643c395ada6019e29b52553d268977b97c8df354 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Wed, 14 Jun 2023 11:05:02 +0000
Subject: [PATCH 666/826] [infra] Move flutter tests to monorepo

Three flutter testing shards have moved from the HHH builder to
monorepo, and are removed from flutter-engine-linux in this CL.
A fourth is a no-op on linux, and removed. The web tests try
builder is removed, as the monorepo try builder now runs those tests.

Bug: b/231927187
Change-Id: I181070049e69db84406409619a9198fdaba7c538
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/308942
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 flutter.star                 | 17 ------------
 generated/commit-queue.cfg   |  4 ---
 generated/cr-buildbucket.cfg | 53 ++----------------------------------
 generated/luci-milo.cfg      |  3 --
 4 files changed, 2 insertions(+), 75 deletions(-)

diff --git a/flutter.star b/flutter.star
index e078344e458c..d7d88a682aa4 100644
--- a/flutter.star
+++ b/flutter.star
@@ -46,28 +46,11 @@ dart.ci_sandbox_builder(
     properties = [{
         "bisection_enabled": True,
         "flutter_test_suites": [
-            "add_to_app_life_cycle_tests",
-            "flutter_plugins",
-            "framework_coverage",
             "framework_tests",
-            "tool_tests",
         ],
     }],
 )
 
-dart.try_builder(
-    "flutter-engine-linux-web_tests",
-    recipe = "dart/flutter_engine",
-    cq_branches = ["main"],
-    execution_timeout = 8 * time.hour,
-    properties = {
-        "flutter_test_suites": [
-            "web_tests",
-            "web_tool_tests",
-        ],
-    },
-)
-
 dart.ci_builder(
     "flutter-engine-ios",
     recipe = "flutter/engine",
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index ca09f5f01250..fd2b981aeaf8 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -2086,10 +2086,6 @@ config_groups {
         name: "dart/try/flutter-engine-linux-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/flutter-engine-linux-web_tests-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/flutter-frontend-try"
         location_filters {
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 00192a7345e5..7bb402000bea 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -2315,11 +2315,7 @@ buckets {
         '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "flutter_test_suites": ['
-        '    "add_to_app_life_cycle_tests",'
-        '    "flutter_plugins",'
-        '    "framework_coverage",'
-        '    "framework_tests",'
-        '    "tool_tests"'
+        '    "framework_tests"'
         '  ],'
         '  "recipe": "dart/flutter_engine"'
         '}'
@@ -10697,52 +10693,7 @@ buckets {
         '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "flutter_test_suites": ['
-        '    "add_to_app_life_cycle_tests",'
-        '    "flutter_plugins",'
-        '    "framework_coverage",'
-        '    "framework_tests",'
-        '    "tool_tests"'
-        '  ],'
-        '  "recipe": "dart/flutter_engine"'
-        '}'
-      priority: 30
-      execution_timeout_secs: 28800
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "flutter-engine-linux-web_tests-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "flutter_test_suites": ['
-        '    "web_tests",'
-        '    "web_tool_tests"'
+        '    "framework_tests"'
         '  ],'
         '  "recipe": "dart/flutter_engine"'
         '}'
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index d3315bb9ecec..06fb4f7d2e11 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -46,9 +46,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/flutter-engine-linux-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/flutter-engine-linux-web_tests-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/dart2wasm-linux-d8-try"
   }

From a22929848a2767222c286d2e6e0f0bbd11a17919 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Thu, 15 Jun 2023 13:02:31 +0000
Subject: [PATCH 667/826] [monorepo] Add flutter-web builder, split consoles
 into flutter-engine and flutter-web consoles.

The monorepo builders have been split into separate builders in
the build configuration in CL
https://dart-review.googlesource.com/c/monorepo/+/309322

This change adds the new flutter-web builder to the LUCI dart project,
triggered by commits to monorepo.

Bug: b/287183914
Change-Id: I18861c2f6b9c73b792fd7efbe30a04e6c68406cf
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/309741
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 generated/commit-queue.cfg   |  4 ++
 generated/cr-buildbucket.cfg | 87 ++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      | 56 ++++++++++++++--------
 generated/luci-scheduler.cfg | 11 +++++
 monorepo.star                | 91 +++++++++++++++++++++++++++---------
 5 files changed, 209 insertions(+), 40 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index fd2b981aeaf8..0654fc8d3dd3 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -2098,6 +2098,10 @@ config_groups {
         name: "dart/try/flutter-linux-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/flutter-web-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/front-end-linux-release-x64-try"
       }
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 7bb402000bea..5c6e5df20a34 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -3443,6 +3443,49 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "flutter-web"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$flutter/goma": {'
+        '    "server": "goma.chromium.org"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "config_name": "web_linux",'
+        '  "environment": "unused",'
+        '  "goma_jobs": "200",'
+        '  "recipe": "engine_v2/engine_v2"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "front-end-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10786,6 +10829,50 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "flutter-web-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$flutter/goma": {'
+        '    "server": "goma.chromium.org"'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "builder_name_suffix": "-try",'
+        '  "clobber": true,'
+        '  "config_name": "web_linux",'
+        '  "environment": "unused",'
+        '  "goma_jobs": "200",'
+        '  "recipe": "engine_v2/engine_v2"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "front-end-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 06fb4f7d2e11..99b0dce60a25 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -361,6 +361,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/flutter-linux-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/flutter-web-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try.monorepo/flutter-linux-android_debug-try"
   }
@@ -2551,79 +2554,84 @@ consoles {
     category: "coordinator"
     short_name: "engine"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-web"
+    category: "coordinator"
+    short_name: "web"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_debug"
-    category: "build"
+    category: "flutter-engine"
     short_name: "android-debug"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_profile"
-    category: "build"
+    category: "flutter-engine"
     short_name: "android-profile"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_release"
-    category: "build"
+    category: "flutter-engine"
     short_name: "android-release"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_debug_arm64"
-    category: "build"
+    category: "flutter-engine"
     short_name: "android-debug-arm64"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_profile_arm64"
-    category: "build"
+    category: "flutter-engine"
     short_name: "android-profile-arm64"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_release_arm64"
-    category: "build"
+    category: "flutter-engine"
     short_name: "android-release-arm64"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_debug_x64"
-    category: "build"
+    category: "flutter-engine"
     short_name: "android-debug-x64"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_profile_x64"
-    category: "build"
+    category: "flutter-engine"
     short_name: "android-profile-x64"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_release_x64"
-    category: "build"
+    category: "flutter-engine"
     short_name: "android-release-x64"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_debug_x86"
-    category: "build"
+    category: "flutter-engine"
     short_name: "android-debug-x86"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-host_debug"
-    category: "build"
+    category: "flutter-engine"
     short_name: "debug"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-host_debug_unopt"
-    category: "build"
+    category: "flutter-engine"
     short_name: "debug-unopt"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-host_profile"
-    category: "build"
+    category: "flutter-engine"
     short_name: "profile"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-host_release"
-    category: "build"
+    category: "flutter-engine"
     short_name: "release"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-wasm_release"
-    category: "build"
+    category: "flutter-web"
     short_name: "wasm"
   }
   builders {
@@ -2747,6 +2755,11 @@ consoles {
   repo_url: "https://dart.googlesource.com/monorepo"
   refs: "regexp:refs/heads/main"
   manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux"
+    category: "coordinator"
+    short_name: "engine"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-android_debug"
     short_name: "android-debug"
@@ -2803,10 +2816,6 @@ consoles {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-host_release"
     short_name: "release"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-wasm_release"
-    short_name: "wasm"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-flutter-plugins"
     short_name: "plugins"
@@ -2879,6 +2888,15 @@ consoles {
   repo_url: "https://dart.googlesource.com/monorepo"
   refs: "regexp:refs/heads/main"
   manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-web"
+    category: "coordinator"
+    short_name: "web"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-wasm_release"
+    short_name: "wasm"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-0"
     short_name: "wt0"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index a3b143d49200..da43a51ad0d2 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -594,6 +594,16 @@ job {
     builder: "flutter-linux"
   }
 }
+job {
+  id: "flutter-web"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "flutter-web"
+  }
+}
 job {
   id: "front-end-linux-release-x64"
   realm: "ci.sandbox"
@@ -2281,6 +2291,7 @@ trigger {
   id: "dart-gitiles-trigger-monorepo"
   realm: "ci"
   triggers: "flutter-linux"
+  triggers: "flutter-web"
   gitiles {
     repo: "https://dart.googlesource.com/monorepo/"
     refs: "regexp:refs/heads/main"
diff --git a/monorepo.star b/monorepo.star
index 9b064d9e312b..6118f6eaad54 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -61,6 +61,12 @@ luci.console_view_entry(
     category = "coordinator",
     console_view = "monorepo",
 )
+luci.console_view_entry(
+    builder = "flutter-linux",
+    short_name = "engine",
+    category = "coordinator",
+    console_view = "flutter-engine",
+)
 dart.try_builder(
     "flutter-linux",
     executable = dart.flutter_recipe("engine_v2/engine_v2"),
@@ -76,7 +82,50 @@ dart.try_builder(
     cq_branches = ["main"],
 )
 
-def monorepo_builder(name, short_name, category):
+dart.ci_sandbox_builder(
+    name = "flutter-web",
+    channels = [],
+    executable = dart.flutter_recipe("engine_v2/engine_v2"),
+    execution_timeout = 180 * time.minute,
+    notifies = None,
+    priority = priority.normal,
+    properties = {
+        "$flutter/goma": {"server": "goma.chromium.org"},
+        "config_name": "web_linux",
+        "environment": "unused",
+        "goma_jobs": "200",
+    },
+    triggered_by = ["dart-gitiles-trigger-monorepo"],
+    schedule = "triggered",
+)
+luci.console_view_entry(
+    builder = "flutter-web",
+    short_name = "web",
+    category = "coordinator",
+    console_view = "monorepo",
+)
+luci.console_view_entry(
+    builder = "flutter-web",
+    short_name = "web",
+    category = "coordinator",
+    console_view = "flutter-web",
+)
+dart.try_builder(
+    "flutter-web",
+    executable = dart.flutter_recipe("engine_v2/engine_v2"),
+    execution_timeout = 180 * time.minute,
+    properties = {
+        "$flutter/goma": {"server": "goma.chromium.org"},
+        "builder_name_suffix": "-try",
+        "config_name": "web_linux",
+        "environment": "unused",
+        "goma_jobs": "200",
+    },
+    on_cq = False,
+    cq_branches = ["main"],
+)
+
+def monorepo_builder(name, short_name, console):
     dart.ci_sandbox_builder(
         name = name,
         channels = [],
@@ -91,13 +140,13 @@ def monorepo_builder(name, short_name, category):
     luci.console_view_entry(
         builder = name,
         short_name = short_name,
-        category = category,
+        category = console,
         console_view = "monorepo",
     )
     luci.console_view_entry(
         builder = name,
         short_name = short_name,
-        console_view = "flutter-engine",
+        console_view = console,
     )
     dart.try_builder(
         name,
@@ -109,51 +158,51 @@ def monorepo_builder(name, short_name, category):
         cq_branches = [],
     )
 
-monorepo_builder("flutter-linux-android_debug", "android-debug", "build")
-monorepo_builder("flutter-linux-android_profile", "android-profile", "build")
-monorepo_builder("flutter-linux-android_release", "android-release", "build")
+monorepo_builder("flutter-linux-android_debug", "android-debug", "flutter-engine")
+monorepo_builder("flutter-linux-android_profile", "android-profile", "flutter-engine")
+monorepo_builder("flutter-linux-android_release", "android-release", "flutter-engine")
 monorepo_builder(
     "flutter-linux-android_debug_arm64",
     "android-debug-arm64",
-    "build",
+    "flutter-engine",
 )
 monorepo_builder(
     "flutter-linux-android_profile_arm64",
     "android-profile-arm64",
-    "build",
+    "flutter-engine",
 )
 monorepo_builder(
     "flutter-linux-android_release_arm64",
     "android-release-arm64",
-    "build",
+    "flutter-engine",
 )
 monorepo_builder(
     "flutter-linux-android_debug_x64",
     "android-debug-x64",
-    "build",
+    "flutter-engine",
 )
 monorepo_builder(
     "flutter-linux-android_profile_x64",
     "android-profile-x64",
-    "build",
+    "flutter-engine",
 )
 monorepo_builder(
     "flutter-linux-android_release_x64",
     "android-release-x64",
-    "build",
+    "flutter-engine",
 )
 monorepo_builder(
     "flutter-linux-android_debug_x86",
     "android-debug-x86",
-    "build",
+    "flutter-engine",
 )
-monorepo_builder("flutter-linux-host_debug", "debug", "build")
-monorepo_builder("flutter-linux-host_debug_unopt", "debug-unopt", "build")
-monorepo_builder("flutter-linux-host_profile", "profile", "build")
-monorepo_builder("flutter-linux-host_release", "release", "build")
-monorepo_builder("flutter-linux-wasm_release", "wasm", "build")
+monorepo_builder("flutter-linux-host_debug", "debug", "flutter-engine")
+monorepo_builder("flutter-linux-host_debug_unopt", "debug-unopt", "flutter-engine")
+monorepo_builder("flutter-linux-host_profile", "profile", "flutter-engine")
+monorepo_builder("flutter-linux-host_release", "release", "flutter-engine")
+monorepo_builder("flutter-linux-wasm_release", "wasm", "flutter-web")
 
-def monorepo_tester(name, short_name, category):
+def monorepo_tester(name, short_name, console):
     dart.ci_sandbox_builder(
         name = name,
         channels = [],
@@ -168,13 +217,13 @@ def monorepo_tester(name, short_name, category):
     luci.console_view_entry(
         builder = name,
         short_name = short_name,
-        category = category,
+        category = console,
         console_view = "monorepo",
     )
     luci.console_view_entry(
         builder = name,
         short_name = short_name,
-        console_view = category,
+        console_view = console,
     )
     dart.try_builder(
         name,

From a030deaf716917e66d60a260263289f6e0cad7c5 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Mon, 19 Jun 2023 13:10:22 +0000
Subject: [PATCH 668/826] [infra] Disable waiting for cache on presubmit-try.

Bug: b/287942213
Change-Id: Id3a6e11036eae197b85d48c0f2a2d0e5e1501499
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/310162
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 generated/cr-buildbucket.cfg | 58 ++++++++++++++++++++++++++++++++++++
 lib/dart.star                |  5 +++-
 lib/defaults.star            |  7 ++++-
 main.star                    |  2 ++
 4 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 5c6e5df20a34..33922731135b 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -300,6 +300,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -340,6 +341,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -380,6 +382,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -940,6 +943,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -984,6 +988,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1028,6 +1033,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1071,6 +1077,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1114,6 +1121,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -1157,6 +1165,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2034,6 +2043,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2078,6 +2088,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -2122,6 +2133,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -3734,6 +3746,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4224,6 +4237,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4268,6 +4282,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4315,6 +4330,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -4358,6 +4374,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5441,6 +5458,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5485,6 +5503,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5527,6 +5546,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5569,6 +5589,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -5611,6 +5632,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6269,6 +6291,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6313,6 +6336,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -6357,6 +6381,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8247,6 +8272,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8291,6 +8317,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8335,6 +8362,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8376,6 +8404,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8417,6 +8446,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8458,6 +8488,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8501,6 +8532,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8544,6 +8576,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8587,6 +8620,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8627,6 +8661,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8667,6 +8702,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -8707,6 +8743,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9423,6 +9460,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9728,6 +9766,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -9772,6 +9811,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10096,6 +10136,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10139,6 +10180,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10580,6 +10622,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -10977,6 +11020,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -11171,6 +11215,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -11218,6 +11263,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -11783,6 +11829,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -11827,6 +11874,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -11869,6 +11917,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -12309,6 +12358,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -13258,6 +13308,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -13299,6 +13350,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -13342,6 +13394,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -13382,6 +13435,7 @@ buckets {
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
@@ -14958,6 +15012,10 @@ buckets {
         '}'
       priority: 30
       execution_timeout_secs: 600
+      caches {
+        name: "builder"
+        path: "builder"
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
diff --git a/lib/dart.star b/lib/dart.star
index c42bfa3e8d07..7c6b8831a90f 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -88,6 +88,7 @@ def _try_builder(
         name,
         recipe = "dart/neo",
         bucket = "try",
+        caches = None,
         cq_branches = _BRANCHES,
         dimensions = None,
         executable = None,
@@ -106,6 +107,7 @@ def _try_builder(
         name: The builder name.
         recipe: The recipe to use (defaults to "dart/neo").
         bucket: The bucket to use (defaults to "try").
+        caches: A list of swarming caches.
         cq_branches: Make try builder on these branches (defaults to _BRANCHES).
         dimensions: Extra swarming dimensions required by this builder.
         executable: The Luci executable to use.
@@ -128,11 +130,12 @@ def _try_builder(
     properties = defaults.properties(properties)
     builder_properties = _with_goma(goma, dimensions, properties)
     builder = name + "-try"
+    caches = caches if caches != None else defaults.caches(dimensions["os"])
     luci.builder(
         name = builder,
         build_numbers = True,
         bucket = bucket,
-        caches = defaults.caches(dimensions["os"]),
+        caches = caches,
         dimensions = dimensions,
         executable = executable or _recipe(recipe),
         execution_timeout = execution_timeout,
diff --git a/lib/defaults.star b/lib/defaults.star
index 2c35f7ffc51a..d63506988857 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -13,8 +13,12 @@ _DIMENSIONS = {
     "pool": "luci.dart.try",
 }
 _CACHES = {
-    "Mac": [swarming.cache("osx_sdk", name = "osx_sdk")],
+    "Mac": [swarming.cache("osx_sdk", name = "osx_sdk", wait_for_warm_cache = time.minute)],
 }
+
+# Swarming has an implicit cache named builder and defining it explicitly makes
+# the wait_for_warm_cache field default to zero.
+_NO_CACHES = [swarming.cache("builder")]
 _NO_ANDROID = {"custom_vars": {"download_android_deps": False}}
 _CHROME = {"custom_vars": {"download_chrome": True}}
 _EMSCRIPTEN = {"custom_vars": {"download_emscripten": True}}
@@ -85,3 +89,4 @@ firefox = _FIREFOX
 js_engines = _JS_ENGINES
 no_android = _NO_ANDROID
 slow_shards = _SLOW_SHARDS
+no_caches = _NO_CACHES
diff --git a/main.star b/main.star
index bb5d6300a58a..ca803954a9d7 100755
--- a/main.star
+++ b/main.star
@@ -19,6 +19,7 @@ load(
     "experimental",
     "focal",
     "js_engines",
+    "no_caches",
 )
 
 lucicfg.check_version("1.33.7")
@@ -178,6 +179,7 @@ dart.try_builder("benchmark-linux", on_cq = True, properties = js_engines)
 dart.try_builder(
     "presubmit",
     bucket = "try.shared",
+    caches = no_caches,
     execution_timeout = 10 * time.minute,
     properties = {
         "$depot_tools/presubmit": {

From d195d6d549df445ec706686211434481704ddb5d Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Fri, 23 Jun 2023 07:55:31 +0000
Subject: [PATCH 669/826] [infra] Remove Flutter HHH builders and console

These builders have been replaced by monorepo builders.
The other Flutter console is removed, as the analyzer and cfe
Flutter builders are in the main console.

Bug: b/231927187
Change-Id: I608f9d83f5ca6a368a65d7293f27d4ea8b22500a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/310940
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 analyzer.star                |   7 ---
 cfe.star                     |   7 ---
 console-header.textpb        |   2 -
 flutter.star                 |  74 ----------------------
 generated/commit-queue.cfg   |   4 --
 generated/cr-buildbucket.cfg | 119 -----------------------------------
 generated/luci-milo.cfg      |  71 ---------------------
 generated/luci-notify.cfg    |  11 ----
 generated/luci-scheduler.cfg |  39 ------------
 main.star                    |   1 -
 10 files changed, 335 deletions(-)
 delete mode 100644 flutter.star

diff --git a/analyzer.star b/analyzer.star
index c22676bce26a..c5fc1a86d3d9 100644
--- a/analyzer.star
+++ b/analyzer.star
@@ -44,10 +44,3 @@ dart.ci_sandbox_builder(
     dimensions = windows,
     experiments = {"dart.use_update_script": 100},
 )
-
-luci.console_view_entry(
-    builder = "flutter-analyze",
-    short_name = "fa",
-    category = "analyzer",
-    console_view = "flutter",
-)
diff --git a/cfe.star b/cfe.star
index caa6fa3b5f6f..94ca353b0b31 100644
--- a/cfe.star
+++ b/cfe.star
@@ -55,10 +55,3 @@ cron.weekly_builder(
     channels = [],
     execution_timeout = 12 * time.hour,
 )
-
-luci.console_view_entry(
-    builder = "flutter-frontend",
-    short_name = "fl",
-    category = "fasta",
-    console_view = "flutter",
-)
diff --git a/console-header.textpb b/console-header.textpb
index 12dadfef86de..d0e1eb150fc5 100644
--- a/console-header.textpb
+++ b/console-header.textpb
@@ -38,8 +38,6 @@ links: {
 }
 console_groups: {
     console_ids: "dart/dart-fuzz"
-    console_ids: "dart/flutter"
-    console_ids: "dart/flutter-hhh"
     console_ids: "dart/flutter-engine"
     console_ids: "dart/flutter-web"
     console_ids: "dart/iso-stress"
diff --git a/flutter.star b/flutter.star
deleted file mode 100644
index d7d88a682aa4..000000000000
--- a/flutter.star
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright (c) 2023 The Dart project authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-"""
-Defines the flutter builders.
-"""
-
-load("//lib/dart.star", "dart")
-
-luci.console_view(
-    name = "flutter",
-    repo = dart.git,
-    title = "Dart/Flutter Console",
-    refs = ["refs/heads/main"],
-)
-
-luci.console_view(
-    name = "flutter-hhh",
-    repo = "https://dart.googlesource.com/linear_sdk_flutter_engine",
-    title = "Dart/Flutter Linear History Console",
-    refs = ["refs/heads/master"],
-)
-
-luci.gitiles_poller(
-    name = "dart-gitiles-trigger-flutter",
-    bucket = "ci",
-    repo = "https://dart.googlesource.com/linear_sdk_flutter_engine/",
-    refs = ["refs/heads/master"],
-)
-
-luci.gitiles_poller(
-    name = "dart-gitiles-trigger-flutter-daily",
-    bucket = "ci",
-    repo = "https://dart.googlesource.com/linear_sdk_flutter_engine/",
-    refs = ["refs/heads/master"],
-    schedule = "0 8 * * *",  # daily, at 08:00 UTC
-)
-
-dart.ci_sandbox_builder(
-    "flutter-engine-linux",
-    recipe = "dart/flutter_engine",
-    category = "flutter|3H",
-    channels = ["try"],
-    execution_timeout = 8 * time.hour,
-    triggered_by = ["dart-gitiles-trigger-flutter"],
-    properties = [{
-        "bisection_enabled": True,
-        "flutter_test_suites": [
-            "framework_tests",
-        ],
-    }],
-)
-
-dart.ci_builder(
-    "flutter-engine-ios",
-    recipe = "flutter/engine",
-    category = "flutter|i",
-    channels = [],
-    execution_timeout = 2 * time.hour,
-    triggered_by = ["dart-gitiles-trigger-flutter-daily"],
-    notifies = None,
-)
-
-luci.console_view_entry(
-    builder = "flutter-engine-linux",
-    short_name = "3H",
-    console_view = "flutter-hhh",
-)
-
-luci.console_view_entry(
-    builder = "flutter-engine-ios",
-    short_name = "ios",
-    console_view = "flutter-hhh",
-)
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 0654fc8d3dd3..c0b96a44ccd3 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -2082,10 +2082,6 @@ config_groups {
         name: "dart/try/flutter-analyze-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/flutter-engine-linux-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/flutter-frontend-try"
         location_filters {
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 33922731135b..51dce4c246f2 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -6,43 +6,6 @@
 
 buckets {
   name: "ci"
-  swarming {
-    builders {
-      name: "flutter-engine-ios"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.ci"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "flutter/engine"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 7200
-      build_numbers: YES
-      service_account: "dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-  }
   shadow: "ci.shadow"
   constraints {
     pools: "luci.dart.ci"
@@ -2299,47 +2262,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "flutter-engine-linux"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "flutter_test_suites": ['
-        '    "framework_tests"'
-        '  ],'
-        '  "recipe": "dart/flutter_engine"'
-        '}'
-      priority: 50
-      execution_timeout_secs: 28800
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "flutter-frontend"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10751,47 +10673,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "flutter-engine-linux-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "flutter_test_suites": ['
-        '    "framework_tests"'
-        '  ],'
-        '  "recipe": "dart/flutter_engine"'
-        '}'
-      priority: 30
-      execution_timeout_secs: 28800
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "flutter-frontend-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 99b0dce60a25..8c4054ff279f 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -43,9 +43,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/flutter-frontend-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/flutter-engine-linux-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/dart2wasm-linux-d8-try"
   }
@@ -526,16 +523,6 @@ consoles {
     category: "cfe"
     short_name: "fl"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
-    category: "flutter"
-    short_name: "3H"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/flutter-engine-ios"
-    category: "flutter"
-    short_name: "i"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-d8"
     category: "d2w"
@@ -1077,8 +1064,6 @@ consoles {
     }
     console_groups {
       console_ids: "dart/dart-fuzz"
-      console_ids: "dart/flutter"
-      console_ids: "dart/flutter-hhh"
       console_ids: "dart/flutter-engine"
       console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
@@ -1162,16 +1147,6 @@ consoles {
     category: "cfe"
     short_name: "fl"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
-    category: "flutter"
-    short_name: "3H"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/flutter-engine-ios"
-    category: "flutter"
-    short_name: "i"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-d8"
     category: "d2w"
@@ -1713,8 +1688,6 @@ consoles {
     }
     console_groups {
       console_ids: "dart/dart-fuzz"
-      console_ids: "dart/flutter"
-      console_ids: "dart/flutter-hhh"
       console_ids: "dart/flutter-engine"
       console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
@@ -1809,8 +1782,6 @@ consoles {
     }
     console_groups {
       console_ids: "dart/dart-fuzz"
-      console_ids: "dart/flutter"
-      console_ids: "dart/flutter-hhh"
       console_ids: "dart/flutter-engine"
       console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
@@ -2150,8 +2121,6 @@ consoles {
     }
     console_groups {
       console_ids: "dart/dart-fuzz"
-      console_ids: "dart/flutter"
-      console_ids: "dart/flutter-hhh"
       console_ids: "dart/flutter-engine"
       console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
@@ -2486,8 +2455,6 @@ consoles {
     }
     console_groups {
       console_ids: "dart/dart-fuzz"
-      console_ids: "dart/flutter"
-      console_ids: "dart/flutter-hhh"
       console_ids: "dart/flutter-engine"
       console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
@@ -2511,38 +2478,6 @@ consoles {
   }
   builder_view_only: true
 }
-consoles {
-  id: "flutter"
-  name: "Dart/Flutter Console"
-  repo_url: "https://dart.googlesource.com/sdk"
-  refs: "regexp:refs/heads/main"
-  manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-frontend"
-    category: "fasta"
-    short_name: "fl"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
-    category: "analyzer"
-    short_name: "fa"
-  }
-}
-consoles {
-  id: "flutter-hhh"
-  name: "Dart/Flutter Linear History Console"
-  repo_url: "https://dart.googlesource.com/linear_sdk_flutter_engine"
-  refs: "regexp:refs/heads/master"
-  manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-engine-linux"
-    short_name: "3H"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci/flutter-engine-ios"
-    short_name: "ios"
-  }
-}
 consoles {
   id: "monorepo"
   name: "Monorepo Console"
@@ -2740,8 +2675,6 @@ consoles {
     }
     console_groups {
       console_ids: "dart/dart-fuzz"
-      console_ids: "dart/flutter"
-      console_ids: "dart/flutter-hhh"
       console_ids: "dart/flutter-engine"
       console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
@@ -2873,8 +2806,6 @@ consoles {
     }
     console_groups {
       console_ids: "dart/dart-fuzz"
-      console_ids: "dart/flutter"
-      console_ids: "dart/flutter-hhh"
       console_ids: "dart/flutter-engine"
       console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
@@ -2974,8 +2905,6 @@ consoles {
     }
     console_groups {
       console_ids: "dart/dart-fuzz"
-      console_ids: "dart/flutter"
-      console_ids: "dart/flutter-hhh"
       console_ids: "dart/flutter-engine"
       console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 00027446bbc5..f0ca1cd53c97 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -278,17 +278,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "flutter-engine-linux"
-    repository: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
-  }
-}
 notifiers {
   notifications {
     on_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index da43a51ad0d2..2fb290b79658 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -554,26 +554,6 @@ job {
     builder: "flutter-analyze"
   }
 }
-job {
-  id: "flutter-engine-ios"
-  realm: "ci"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "flutter-engine-ios"
-  }
-}
-job {
-  id: "flutter-engine-linux"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "flutter-engine-linux"
-  }
-}
 job {
   id: "flutter-frontend"
   realm: "ci.sandbox"
@@ -2230,25 +2210,6 @@ trigger {
     refs: "regexp:refs/heads/dev"
   }
 }
-trigger {
-  id: "dart-gitiles-trigger-flutter"
-  realm: "ci"
-  triggers: "flutter-engine-linux"
-  gitiles {
-    repo: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
-    refs: "regexp:refs/heads/master"
-  }
-}
-trigger {
-  id: "dart-gitiles-trigger-flutter-daily"
-  realm: "ci"
-  schedule: "0 8 * * *"
-  triggers: "flutter-engine-ios"
-  gitiles {
-    repo: "https://dart.googlesource.com/linear_sdk_flutter_engine/"
-    refs: "regexp:refs/heads/master"
-  }
-}
 trigger {
   id: "dart-gitiles-trigger-main"
   realm: "ci"
diff --git a/main.star b/main.star
index ca803954a9d7..4c2ee6904b8c 100755
--- a/main.star
+++ b/main.star
@@ -135,7 +135,6 @@ luci.notifier(
 
 exec("//sdk.star")
 exec("//cfe.star")
-exec("//flutter.star")
 exec("//dart2wasm.star")
 vm = exec("//vm.star")
 exec("//pkg.star")

From a6aace8b0907717aedaa189f77843a85b6964509 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Wed, 5 Jul 2023 15:09:57 +0000
Subject: [PATCH 670/826] Add paths for pkg-linux-release-try.

Fixes: b/290033300
Change-Id: I12d7fe8f558e32f70cc4c0dc48c07481b8ea7033
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/312481
Commit-Queue: Jonas Termansen <sortie@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 generated/commit-queue.cfg | 270 +++++++++++++++++++++++++++++++++++++
 lib/paths.star             |   8 ++
 pkg.star                   |   3 +-
 3 files changed, 280 insertions(+), 1 deletion(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index c0b96a44ccd3..105290464e1c 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -736,6 +736,96 @@ config_groups {
       }
       builders {
         name: "dart/try/pkg-linux-release-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "runtime/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_http/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "third_party/pkg/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/package_deps/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/.*\\.dart"
+        }
       }
       builders {
         name: "dart/try/pkg-mac-release-try"
@@ -2172,6 +2262,96 @@ config_groups {
       }
       builders {
         name: "dart/try/pkg-linux-release-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "runtime/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_http/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "third_party/pkg/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/package_deps/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/.*\\.dart"
+        }
       }
       builders {
         name: "dart/try/pkg-mac-release-arm64-try"
@@ -3204,6 +3384,96 @@ config_groups {
       }
       builders {
         name: "dart/try/pkg-linux-release-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "runtime/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_http/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "third_party/pkg/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/package_deps/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/.*\\.dart"
+        }
       }
       builders {
         name: "dart/try/pkg-mac-release-try"
diff --git a/lib/paths.star b/lib/paths.star
index 530e9f5a7791..d09bf503a1d6 100644
--- a/lib/paths.star
+++ b/lib/paths.star
@@ -77,6 +77,13 @@ _DART2WASM_PATHS = _CFE_PATHS + [
     "sdk/lib/_js_interop/.+",
 ]
 
+_PKG_PATHS = _VM_PATHS + [
+    "pkg/.+",
+    "third_party/pkg/.+",
+    "tools/package_deps/.+",
+    "tools/.*\\.dart",
+]
+
 _RELEASE_PATHS = [
     # Paths that trigger release tryjobs
     "tools/VERSION",
@@ -93,6 +100,7 @@ paths = struct(
     dart2js = _DART2JS_PATHS,
     dart2wasm = _DART2WASM_PATHS,
     ddc = _DDC_PATHS,
+    pkg = _PKG_PATHS,
     release = _RELEASE_PATHS,
     standard = _STANDARD_PATHS,
     test_py = _TEST_PY_PATHS,
diff --git a/pkg.star b/pkg.star
index eee2dfb27344..463bf054cae0 100644
--- a/pkg.star
+++ b/pkg.star
@@ -14,11 +14,12 @@ load(
     "no_android",
     "windows",
 )
+load("//lib/paths.star", "paths")
 
 dart.ci_sandbox_builder(
     "pkg-linux-release",
     category = "pkg|l",
-    on_cq = True,
+    location_filters = paths.to_location_filters(paths.pkg),
     properties = chrome,
 )
 dart.ci_sandbox_builder(

From af9ee90aca76686d0ddcb24ae89e3500389698eb Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Wed, 5 Jul 2023 17:56:01 +0000
Subject: [PATCH 671/826] [infra] Setup regular Windows ARM64 builders.

There are now 10 Windows ARM64 machines available. This CL replaces one try-only builder (triggered manually with try jobs) with four regular builders (triggered automatically on VM commits, or manually with try jobs).

Change-Id: Icf8a5ad17a56c3e783b687d029c551ea872ea1a3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/306918
Commit-Queue: Yusuf Mohsinally <mohsinally@google.com>
Reviewed-by: Yusuf Mohsinally <mohsinally@google.com>
---
 generated/commit-queue.cfg   |  24 ++--
 generated/cr-buildbucket.cfg | 231 +++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      |  49 ++++++++
 generated/luci-notify.cfg    |  44 +++++++
 generated/luci-scheduler.cfg |  44 +++++++
 lib/dart.star                |  17 +--
 lib/defaults.star            |   2 +
 monorepo.star                |   4 +-
 vm.star                      |  34 ++++--
 9 files changed, 421 insertions(+), 28 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 105290464e1c..889ac91cd0ac 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -1089,10 +1089,6 @@ config_groups {
         name: "dart/try/vm-win-debug-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-win-release-arm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-win-release-x64-try"
         includable_only: true
@@ -1186,10 +1182,6 @@ config_groups {
         name: "dart/try/stable-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-win-release-arm64-try"
-        includable_only: true
-      }
       retry_config {}
     }
   }
@@ -2445,6 +2437,10 @@ config_groups {
         name: "dart/try/vm-aot-ubsan-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-win-debug-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-win-debug-x64c-try"
         includable_only: true
@@ -2453,6 +2449,10 @@ config_groups {
         name: "dart/try/vm-aot-win-product-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-win-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-win-release-x64-try"
         includable_only: true
@@ -2763,6 +2763,10 @@ config_groups {
         name: "dart/try/vm-ubsan-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-win-debug-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-win-debug-x64-try"
         includable_only: true
@@ -3737,10 +3741,6 @@ config_groups {
         name: "dart/try/vm-win-debug-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-win-release-arm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-win-release-x64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 51dce4c246f2..1871c9ea1257 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5708,6 +5708,39 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-win-debug-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-win-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
@@ -5781,6 +5814,39 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-win-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8961,6 +9027,39 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-win-debug-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-win-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -9108,6 +9207,39 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-win-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-win-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
@@ -11952,6 +12084,39 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-win-debug-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-win-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -12025,6 +12190,39 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-win-release-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13612,6 +13810,39 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-win-debug-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-win-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 8c4054ff279f..b82f14e9e439 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -94,6 +94,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-win-release-x64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-win-debug-arm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-win-release-arm64-try"
   }
@@ -133,6 +136,12 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-win-release-x64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-aot-win-debug-arm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-aot-win-release-arm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-android-release-arm_x64-try"
   }
@@ -613,6 +622,16 @@ consoles {
     category: "vm|jit"
     short_name: "wr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-arm64"
+    category: "vm|jit"
+    short_name: "wad"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-arm64"
+    category: "vm|jit"
+    short_name: "war"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-debug-x64"
     category: "vm|appjit"
@@ -678,6 +697,16 @@ consoles {
     category: "vm|aot"
     short_name: "wr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-debug-arm64"
+    category: "vm|aot"
+    short_name: "wad"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-release-arm64"
+    category: "vm|aot"
+    short_name: "war"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm_x64"
     category: "vm|aot|android"
@@ -1377,6 +1406,16 @@ consoles {
     category: "vm|jit"
     short_name: "wr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-arm64"
+    category: "vm|jit"
+    short_name: "wad"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-arm64"
+    category: "vm|jit"
+    short_name: "war"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-debug-x64"
     category: "vm|appjit"
@@ -1442,6 +1481,16 @@ consoles {
     category: "vm|aot"
     short_name: "wr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-debug-arm64"
+    category: "vm|aot"
+    short_name: "wad"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-release-arm64"
+    category: "vm|aot"
+    short_name: "war"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm_x64"
     category: "vm|aot|android"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index f0ca1cd53c97..7e528ae05c9a 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -681,6 +681,17 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-win-debug-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -707,6 +718,17 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-win-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1246,6 +1268,17 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-win-debug-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1270,6 +1303,17 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-win-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 2fb290b79658..7713c6a61b16 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1184,6 +1184,16 @@ job {
     builder: "vm-aot-ubsan-linux-release-x64"
   }
 }
+job {
+  id: "vm-aot-win-debug-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-win-debug-arm64"
+  }
+}
 job {
   id: "vm-aot-win-debug-x64c"
   realm: "ci.sandbox"
@@ -1204,6 +1214,16 @@ job {
     builder: "vm-aot-win-product-x64"
   }
 }
+job {
+  id: "vm-aot-win-release-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-win-release-arm64"
+  }
+}
 job {
   id: "vm-aot-win-release-x64"
   realm: "ci.sandbox"
@@ -2054,6 +2074,16 @@ job {
     builder: "vm-ubsan-linux-release-x64"
   }
 }
+job {
+  id: "vm-win-debug-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-win-debug-arm64"
+  }
+}
 job {
   id: "vm-win-debug-x64"
   realm: "ci.sandbox"
@@ -2094,6 +2124,16 @@ job {
     builder: "vm-win-debug-x64c"
   }
 }
+job {
+  id: "vm-win-release-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-win-release-arm64"
+  }
+}
 job {
   id: "vm-win-release-ia32"
   realm: "ci.sandbox"
@@ -2386,6 +2426,8 @@ trigger {
   triggers: "vm-aot-linux-release-x64"
   triggers: "vm-aot-mac-release-arm64"
   triggers: "vm-aot-mac-release-x64"
+  triggers: "vm-aot-win-debug-arm64"
+  triggers: "vm-aot-win-release-arm64"
   triggers: "vm-aot-win-release-x64"
   triggers: "vm-appjit-linux-debug-x64"
   triggers: "vm-appjit-linux-release-x64"
@@ -2408,6 +2450,8 @@ trigger {
   triggers: "vm-linux-release-x64"
   triggers: "vm-mac-debug-arm64"
   triggers: "vm-mac-release-arm64"
+  triggers: "vm-win-debug-arm64"
+  triggers: "vm-win-release-arm64"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/main"
diff --git a/lib/dart.star b/lib/dart.star
index 7c6b8831a90f..cf17d5f8d650 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -97,10 +97,8 @@ def _try_builder(
         experiments = None,
         goma = None,
         location_filters = None,
-        pool = "luci.dart.try",
         properties = None,
-        on_cq = False,
-        no_host_class = False):
+        on_cq = False):
     """Creates a Dart tryjob.
 
     Args:
@@ -116,17 +114,17 @@ def _try_builder(
         experiments: Experiments to run on this builder, with percentages.
         goma: Whether to use goma or not.
         location_filters: Locations that trigger this tryjob.
-        pool: The pool to set in dimensions (defaults to "luci.dart.try").
         properties: Extra properties to set for builds.
         on_cq: Whether the build is added to the default set of CQ tryjobs.
-        no_host_class: Whether to filter "host_class" from the default dimensions.
     """
     if on_cq and location_filters:
         fail("Can't be on the default CQ and conditionally on the CQ")
     dimensions = defaults.dimensions(dimensions)
-    if no_host_class:
+
+    # TODO(https://github.com/flutter/flutter/issues/127691): Remove filtering
+    # of host_class.
+    if dimensions["pool"] == "luci.flutter.staging":
         dimensions.pop("host_class")
-    dimensions["pool"] = pool
     properties = defaults.properties(properties)
     builder_properties = _with_goma(goma, dimensions, properties)
     builder = name + "-try"
@@ -209,6 +207,11 @@ def _builder(
         location_filters: Locations that trigger this builder.
     """
     dimensions = defaults.dimensions(dimensions)
+
+    # TODO(https://github.com/flutter/flutter/issues/127691): Remove filtering
+    # of host_class.
+    if dimensions["pool"] == "luci.flutter.staging":
+        dimensions.pop("host_class")
     properties = defaults.properties(properties)
 
     os = dimensions["os"]
diff --git a/lib/defaults.star b/lib/defaults.star
index d63506988857..47771cf4c359 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -32,6 +32,7 @@ _FOCAL = {"os": "Ubuntu-20"}
 _WINDOWS10 = {"os": "Windows-10"}
 _WINDOWS11 = {"os": "Windows-11"}
 
+_FLUTTER_POOL = {"pool": "luci.flutter.staging"}
 _EXPERIMENTAL = {"host_class": "experimental"}
 
 def _union(x, overrides):
@@ -74,6 +75,7 @@ defaults = struct(
 
 arm64 = _ARM64
 experimental = _EXPERIMENTAL
+flutter_pool = _FLUTTER_POOL
 focal = _FOCAL
 linux = _FOCAL
 mac = _MAC
diff --git a/monorepo.star b/monorepo.star
index 6118f6eaad54..5abb4e41d564 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -153,7 +153,7 @@ def monorepo_builder(name, short_name, console):
         bucket = "try.monorepo",
         executable = dart.flutter_recipe("engine_v2/builder"),
         execution_timeout = 60 * time.minute,
-        pool = "dart.tests",
+        dimensions = {"pool": "dart.tests"},
         on_cq = False,
         cq_branches = [],
     )
@@ -230,7 +230,7 @@ def monorepo_tester(name, short_name, console):
         bucket = "try.monorepo",
         executable = dart.flutter_recipe("engine_v2/tester"),
         execution_timeout = 90 * time.minute,
-        pool = "dart.tests",
+        dimensions = {"pool": "dart.tests"},
         on_cq = False,
         cq_branches = [],
     )
diff --git a/vm.star b/vm.star
index 16f64ab41851..40fa687d1659 100644
--- a/vm.star
+++ b/vm.star
@@ -10,6 +10,7 @@ load("//lib/dart.star", "dart")
 load(
     "//lib/defaults.star",
     "arm64",
+    "flutter_pool",
     "focal",
     "mac",
     "no_android",
@@ -170,14 +171,19 @@ _builder(
     category = "vm|jit|wr",
     dimensions = windows,
 )
-dart.try_builder(
+_extra_builder(
+    "vm-win-debug-arm64",
+    category = "vm|jit|wad",
+    channels = ["try"],
+    dimensions = [windows11, arm64, flutter_pool],
+    goma = False,  # no such package: infra_internal/goma/client/windows-arm64
+)
+_extra_builder(
     "vm-win-release-arm64",
-    dimensions = [windows11, arm64],
-    # TODO(https://github.com/flutter/flutter/issues/127691): Remove filtering of host_class.
-    no_host_class = True,
-    pool = "luci.flutter.staging",
-    # no such package: infra_internal/goma/client/windows-arm64
-    goma = False,
+    category = "vm|jit|war",
+    channels = ["try"],
+    dimensions = [windows11, arm64, flutter_pool],
+    goma = False,  # no such package: infra_internal/goma/client/windows-arm64
 )
 
 # vm|appjit
@@ -252,6 +258,20 @@ _extra_builder(
     category = "vm|aot|wr",
     dimensions = windows,
 )
+_extra_builder(
+    "vm-aot-win-debug-arm64",
+    category = "vm|aot|wad",
+    channels = ["try"],
+    dimensions = [windows11, arm64, flutter_pool],
+    goma = False,  # no such package: infra_internal/goma/client/windows-arm64
+)
+_extra_builder(
+    "vm-aot-win-release-arm64",
+    category = "vm|aot|war",
+    channels = ["try"],
+    dimensions = [windows11, arm64, flutter_pool],
+    goma = False,  # no such package: infra_internal/goma/client/windows-arm64
+)
 
 # vm|aot|android
 _extra_builder(

From b6f32d6ea6ff7b3cf9d0dd3e343f36f73d22469d Mon Sep 17 00:00:00 2001
From: Yusuf Mohsinally <mohsinally@google.com>
Date: Wed, 5 Jul 2023 18:04:07 +0000
Subject: [PATCH 672/826] Revert "[infra] Setup regular Windows ARM64
 builders."

This reverts commit af9ee90aca76686d0ddcb24ae89e3500389698eb.

Reason for revert: I clicked submit by mistake. Ryan should control the submit.

Original change's description:
> [infra] Setup regular Windows ARM64 builders.
>
> There are now 10 Windows ARM64 machines available. This CL replaces one try-only builder (triggered manually with try jobs) with four regular builders (triggered automatically on VM commits, or manually with try jobs).
>
> Change-Id: Icf8a5ad17a56c3e783b687d029c551ea872ea1a3
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/306918
> Commit-Queue: Yusuf Mohsinally <mohsinally@google.com>
> Reviewed-by: Yusuf Mohsinally <mohsinally@google.com>

Change-Id: I25866191444eaed3490d7aec2129a36a45ff5fd6
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/312362
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: Yusuf Mohsinally <mohsinally@google.com>
---
 generated/commit-queue.cfg   |  24 ++--
 generated/cr-buildbucket.cfg | 231 -----------------------------------
 generated/luci-milo.cfg      |  49 --------
 generated/luci-notify.cfg    |  44 -------
 generated/luci-scheduler.cfg |  44 -------
 lib/dart.star                |  17 ++-
 lib/defaults.star            |   2 -
 monorepo.star                |   4 +-
 vm.star                      |  34 ++----
 9 files changed, 28 insertions(+), 421 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 889ac91cd0ac..105290464e1c 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -1089,6 +1089,10 @@ config_groups {
         name: "dart/try/vm-win-debug-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-win-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-win-release-x64-try"
         includable_only: true
@@ -1182,6 +1186,10 @@ config_groups {
         name: "dart/try/stable-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-win-release-arm64-try"
+        includable_only: true
+      }
       retry_config {}
     }
   }
@@ -2437,10 +2445,6 @@ config_groups {
         name: "dart/try/vm-aot-ubsan-linux-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-aot-win-debug-arm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-aot-win-debug-x64c-try"
         includable_only: true
@@ -2449,10 +2453,6 @@ config_groups {
         name: "dart/try/vm-aot-win-product-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-aot-win-release-arm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-aot-win-release-x64-try"
         includable_only: true
@@ -2763,10 +2763,6 @@ config_groups {
         name: "dart/try/vm-ubsan-linux-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-win-debug-arm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-win-debug-x64-try"
         includable_only: true
@@ -3741,6 +3737,10 @@ config_groups {
         name: "dart/try/vm-win-debug-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-win-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-win-release-x64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 1871c9ea1257..51dce4c246f2 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5708,39 +5708,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-aot-win-debug-arm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-aot-win-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
@@ -5814,39 +5781,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-aot-win-release-arm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-aot-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -9027,39 +8961,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-win-debug-arm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-win-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -9207,39 +9108,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-win-release-arm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-win-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
@@ -12084,39 +11952,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-aot-win-debug-arm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-aot-win-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -12190,39 +12025,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-aot-win-release-arm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-aot-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13810,39 +13612,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-win-debug-arm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-win-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index b82f14e9e439..8c4054ff279f 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -94,9 +94,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-win-release-x64-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-win-debug-arm64-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-win-release-arm64-try"
   }
@@ -136,12 +133,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-win-release-x64-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-aot-win-debug-arm64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-aot-win-release-arm64-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-android-release-arm_x64-try"
   }
@@ -622,16 +613,6 @@ consoles {
     category: "vm|jit"
     short_name: "wr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-arm64"
-    category: "vm|jit"
-    short_name: "wad"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-arm64"
-    category: "vm|jit"
-    short_name: "war"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-debug-x64"
     category: "vm|appjit"
@@ -697,16 +678,6 @@ consoles {
     category: "vm|aot"
     short_name: "wr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-debug-arm64"
-    category: "vm|aot"
-    short_name: "wad"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-release-arm64"
-    category: "vm|aot"
-    short_name: "war"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm_x64"
     category: "vm|aot|android"
@@ -1406,16 +1377,6 @@ consoles {
     category: "vm|jit"
     short_name: "wr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-arm64"
-    category: "vm|jit"
-    short_name: "wad"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-arm64"
-    category: "vm|jit"
-    short_name: "war"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-debug-x64"
     category: "vm|appjit"
@@ -1481,16 +1442,6 @@ consoles {
     category: "vm|aot"
     short_name: "wr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-debug-arm64"
-    category: "vm|aot"
-    short_name: "wad"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-release-arm64"
-    category: "vm|aot"
-    short_name: "war"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm_x64"
     category: "vm|aot|android"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 7e528ae05c9a..f0ca1cd53c97 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -681,17 +681,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-aot-win-debug-arm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -718,17 +707,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-aot-win-release-arm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1268,17 +1246,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-win-debug-arm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1303,17 +1270,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-win-release-arm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 7713c6a61b16..2fb290b79658 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1184,16 +1184,6 @@ job {
     builder: "vm-aot-ubsan-linux-release-x64"
   }
 }
-job {
-  id: "vm-aot-win-debug-arm64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-aot-win-debug-arm64"
-  }
-}
 job {
   id: "vm-aot-win-debug-x64c"
   realm: "ci.sandbox"
@@ -1214,16 +1204,6 @@ job {
     builder: "vm-aot-win-product-x64"
   }
 }
-job {
-  id: "vm-aot-win-release-arm64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-aot-win-release-arm64"
-  }
-}
 job {
   id: "vm-aot-win-release-x64"
   realm: "ci.sandbox"
@@ -2074,16 +2054,6 @@ job {
     builder: "vm-ubsan-linux-release-x64"
   }
 }
-job {
-  id: "vm-win-debug-arm64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-win-debug-arm64"
-  }
-}
 job {
   id: "vm-win-debug-x64"
   realm: "ci.sandbox"
@@ -2124,16 +2094,6 @@ job {
     builder: "vm-win-debug-x64c"
   }
 }
-job {
-  id: "vm-win-release-arm64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-win-release-arm64"
-  }
-}
 job {
   id: "vm-win-release-ia32"
   realm: "ci.sandbox"
@@ -2426,8 +2386,6 @@ trigger {
   triggers: "vm-aot-linux-release-x64"
   triggers: "vm-aot-mac-release-arm64"
   triggers: "vm-aot-mac-release-x64"
-  triggers: "vm-aot-win-debug-arm64"
-  triggers: "vm-aot-win-release-arm64"
   triggers: "vm-aot-win-release-x64"
   triggers: "vm-appjit-linux-debug-x64"
   triggers: "vm-appjit-linux-release-x64"
@@ -2450,8 +2408,6 @@ trigger {
   triggers: "vm-linux-release-x64"
   triggers: "vm-mac-debug-arm64"
   triggers: "vm-mac-release-arm64"
-  triggers: "vm-win-debug-arm64"
-  triggers: "vm-win-release-arm64"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/main"
diff --git a/lib/dart.star b/lib/dart.star
index cf17d5f8d650..7c6b8831a90f 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -97,8 +97,10 @@ def _try_builder(
         experiments = None,
         goma = None,
         location_filters = None,
+        pool = "luci.dart.try",
         properties = None,
-        on_cq = False):
+        on_cq = False,
+        no_host_class = False):
     """Creates a Dart tryjob.
 
     Args:
@@ -114,17 +116,17 @@ def _try_builder(
         experiments: Experiments to run on this builder, with percentages.
         goma: Whether to use goma or not.
         location_filters: Locations that trigger this tryjob.
+        pool: The pool to set in dimensions (defaults to "luci.dart.try").
         properties: Extra properties to set for builds.
         on_cq: Whether the build is added to the default set of CQ tryjobs.
+        no_host_class: Whether to filter "host_class" from the default dimensions.
     """
     if on_cq and location_filters:
         fail("Can't be on the default CQ and conditionally on the CQ")
     dimensions = defaults.dimensions(dimensions)
-
-    # TODO(https://github.com/flutter/flutter/issues/127691): Remove filtering
-    # of host_class.
-    if dimensions["pool"] == "luci.flutter.staging":
+    if no_host_class:
         dimensions.pop("host_class")
+    dimensions["pool"] = pool
     properties = defaults.properties(properties)
     builder_properties = _with_goma(goma, dimensions, properties)
     builder = name + "-try"
@@ -207,11 +209,6 @@ def _builder(
         location_filters: Locations that trigger this builder.
     """
     dimensions = defaults.dimensions(dimensions)
-
-    # TODO(https://github.com/flutter/flutter/issues/127691): Remove filtering
-    # of host_class.
-    if dimensions["pool"] == "luci.flutter.staging":
-        dimensions.pop("host_class")
     properties = defaults.properties(properties)
 
     os = dimensions["os"]
diff --git a/lib/defaults.star b/lib/defaults.star
index 47771cf4c359..d63506988857 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -32,7 +32,6 @@ _FOCAL = {"os": "Ubuntu-20"}
 _WINDOWS10 = {"os": "Windows-10"}
 _WINDOWS11 = {"os": "Windows-11"}
 
-_FLUTTER_POOL = {"pool": "luci.flutter.staging"}
 _EXPERIMENTAL = {"host_class": "experimental"}
 
 def _union(x, overrides):
@@ -75,7 +74,6 @@ defaults = struct(
 
 arm64 = _ARM64
 experimental = _EXPERIMENTAL
-flutter_pool = _FLUTTER_POOL
 focal = _FOCAL
 linux = _FOCAL
 mac = _MAC
diff --git a/monorepo.star b/monorepo.star
index 5abb4e41d564..6118f6eaad54 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -153,7 +153,7 @@ def monorepo_builder(name, short_name, console):
         bucket = "try.monorepo",
         executable = dart.flutter_recipe("engine_v2/builder"),
         execution_timeout = 60 * time.minute,
-        dimensions = {"pool": "dart.tests"},
+        pool = "dart.tests",
         on_cq = False,
         cq_branches = [],
     )
@@ -230,7 +230,7 @@ def monorepo_tester(name, short_name, console):
         bucket = "try.monorepo",
         executable = dart.flutter_recipe("engine_v2/tester"),
         execution_timeout = 90 * time.minute,
-        dimensions = {"pool": "dart.tests"},
+        pool = "dart.tests",
         on_cq = False,
         cq_branches = [],
     )
diff --git a/vm.star b/vm.star
index 40fa687d1659..16f64ab41851 100644
--- a/vm.star
+++ b/vm.star
@@ -10,7 +10,6 @@ load("//lib/dart.star", "dart")
 load(
     "//lib/defaults.star",
     "arm64",
-    "flutter_pool",
     "focal",
     "mac",
     "no_android",
@@ -171,19 +170,14 @@ _builder(
     category = "vm|jit|wr",
     dimensions = windows,
 )
-_extra_builder(
-    "vm-win-debug-arm64",
-    category = "vm|jit|wad",
-    channels = ["try"],
-    dimensions = [windows11, arm64, flutter_pool],
-    goma = False,  # no such package: infra_internal/goma/client/windows-arm64
-)
-_extra_builder(
+dart.try_builder(
     "vm-win-release-arm64",
-    category = "vm|jit|war",
-    channels = ["try"],
-    dimensions = [windows11, arm64, flutter_pool],
-    goma = False,  # no such package: infra_internal/goma/client/windows-arm64
+    dimensions = [windows11, arm64],
+    # TODO(https://github.com/flutter/flutter/issues/127691): Remove filtering of host_class.
+    no_host_class = True,
+    pool = "luci.flutter.staging",
+    # no such package: infra_internal/goma/client/windows-arm64
+    goma = False,
 )
 
 # vm|appjit
@@ -258,20 +252,6 @@ _extra_builder(
     category = "vm|aot|wr",
     dimensions = windows,
 )
-_extra_builder(
-    "vm-aot-win-debug-arm64",
-    category = "vm|aot|wad",
-    channels = ["try"],
-    dimensions = [windows11, arm64, flutter_pool],
-    goma = False,  # no such package: infra_internal/goma/client/windows-arm64
-)
-_extra_builder(
-    "vm-aot-win-release-arm64",
-    category = "vm|aot|war",
-    channels = ["try"],
-    dimensions = [windows11, arm64, flutter_pool],
-    goma = False,  # no such package: infra_internal/goma/client/windows-arm64
-)
 
 # vm|aot|android
 _extra_builder(

From a2ac078d67bea947a2da8ffbe86808dd66b389ca Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 7 Jul 2023 12:49:40 +0000
Subject: [PATCH 673/826] [infra] Increase riscv64 SDK tryjob timout to 120
 minutes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I4baaaee897d780e1ca67de98e5e440dce8915341
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/312803
Commit-Queue: Ömer Ağacan <omersa@google.com>
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: Ömer Ağacan <omersa@google.com>
---
 generated/cr-buildbucket.cfg | 2 +-
 sdk.star                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 51dce4c246f2..9822170f4948 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -9577,7 +9577,7 @@ buckets {
         '    "use_luci_auth": true'
         '  },'
         '  "$dart/build": {'
-        '    "timeout": 6000'
+        '    "timeout": 7200'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
diff --git a/sdk.star b/sdk.star
index 776997f0c731..f23b69bacbfd 100644
--- a/sdk.star
+++ b/sdk.star
@@ -86,7 +86,7 @@ dart.try_builder(
     "dart-sdk-linux-riscv64",
     properties = {
         "$dart/build": {
-            "timeout": 100 * 60,  # 100 minutes,
+            "timeout": 120 * 60,  # 120 minutes,
         },
         "archs": ["riscv64"],
         "args": ["--no-clang"],

From fa4c1cacfbdfc34e65f7dfea2d69459c98e67a37 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Mon, 17 Jul 2023 19:40:34 +0000
Subject: [PATCH 674/826] [infra] Deprioritize beta and stable channel
 builders.

The beta and stable post-submit builders are low priority since they
aren't actually used for anything in practice before we publish. However
they take away a considerable amount of capacity from the try builders
whenever we release, which we should avoid to keep the commit queue
fast.

Bug: b/291593836
Change-Id: I66e79fd35fd8ad7600ab237c09573d799c8eb5f5
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/314082
Commit-Queue: Jonas Termansen <sortie@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 200 +++++++++++++++++------------------
 lib/dart.star                |   3 +-
 2 files changed, 102 insertions(+), 101 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 9822170f4948..c7ecd040dc6d 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -79,7 +79,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -115,7 +115,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -187,7 +187,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -223,7 +223,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -300,7 +300,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
@@ -341,7 +341,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
@@ -422,7 +422,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -462,7 +462,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -702,7 +702,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -742,7 +742,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -822,7 +822,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -862,7 +862,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -947,7 +947,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
@@ -992,7 +992,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
@@ -1080,7 +1080,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
@@ -1124,7 +1124,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
@@ -1209,7 +1209,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1249,7 +1249,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1327,7 +1327,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1366,7 +1366,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1444,7 +1444,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1483,7 +1483,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1563,7 +1563,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1603,7 +1603,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1842,7 +1842,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1882,7 +1882,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2047,7 +2047,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
@@ -2092,7 +2092,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
@@ -2177,7 +2177,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -2217,7 +2217,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3484,7 +3484,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3520,7 +3520,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3592,7 +3592,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3628,7 +3628,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3850,7 +3850,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/gclient"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -3886,7 +3886,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/gclient"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4077,7 +4077,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4116,7 +4116,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4248,7 +4248,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
@@ -4292,7 +4292,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
@@ -4379,7 +4379,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4422,7 +4422,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4500,7 +4500,7 @@ buckets {
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4537,7 +4537,7 @@ buckets {
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4611,7 +4611,7 @@ buckets {
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4648,7 +4648,7 @@ buckets {
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4795,7 +4795,7 @@ buckets {
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -4832,7 +4832,7 @@ buckets {
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5088,7 +5088,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5124,7 +5124,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5196,7 +5196,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5232,7 +5232,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5304,7 +5304,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5340,7 +5340,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5507,7 +5507,7 @@ buckets {
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 60
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
@@ -5550,7 +5550,7 @@ buckets {
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 60
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
@@ -5845,7 +5845,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5881,7 +5881,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5955,7 +5955,7 @@ buckets {
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -5992,7 +5992,7 @@ buckets {
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6100,7 +6100,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6136,7 +6136,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6254,7 +6254,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
@@ -6299,7 +6299,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
@@ -6453,7 +6453,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6489,7 +6489,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6561,7 +6561,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6597,7 +6597,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6669,7 +6669,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6705,7 +6705,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6777,7 +6777,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6813,7 +6813,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6885,7 +6885,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6921,7 +6921,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -6993,7 +6993,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7029,7 +7029,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7101,7 +7101,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7173,7 +7173,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7245,7 +7245,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7281,7 +7281,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7680,7 +7680,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7716,7 +7716,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7898,7 +7898,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7934,7 +7934,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8006,7 +8006,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8042,7 +8042,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8114,7 +8114,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8150,7 +8150,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8235,7 +8235,7 @@ buckets {
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 60
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
@@ -8280,7 +8280,7 @@ buckets {
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 60
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
@@ -8364,7 +8364,7 @@ buckets {
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 60
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
@@ -8406,7 +8406,7 @@ buckets {
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 60
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
@@ -8494,7 +8494,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
@@ -8538,7 +8538,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
@@ -8620,7 +8620,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
@@ -8661,7 +8661,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       caches {
         name: "osx_sdk"
         path: "osx_sdk"
@@ -9027,7 +9027,7 @@ buckets {
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9064,7 +9064,7 @@ buckets {
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9208,7 +9208,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9244,7 +9244,7 @@ buckets {
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
diff --git a/lib/dart.star b/lib/dart.star
index 7c6b8831a90f..a7df92ca0c15 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -260,6 +260,7 @@ def _builder(
                     ]
 
             notifies = [notifies] if type(notifies) == type("") else notifies
+            adjusted_priority = priority + 10 if channel else priority
             luci.builder(
                 name = builder,
                 build_numbers = True,
@@ -271,7 +272,7 @@ def _builder(
                 experimental = experimental,
                 experiments = experiments,
                 expiration_timeout = expiration_timeout,
-                priority = priority,
+                priority = adjusted_priority,
                 properties = builder_properties,
                 notifies = notifies if enabled else None,
                 schedule = schedule if enabled else None,

From 14b766dba5f913359b901be186853347451f798c Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 18 Jul 2023 08:45:45 +0000
Subject: [PATCH 675/826] [infra] Setup Windows ARM64 JIT builders.

There are now 10 Windows ARM64 machines available. This CL replaces one try-only builder (triggered manually with try jobs) with two regular builders (triggered automatically on VM commits, or manually with try jobs).

Change-Id: Ib4ac7665983007cc43d5e7d481926dc0a19af55a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/313080
Reviewed-by: Yusuf Mohsinally <mohsinally@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   | 16 ++----
 generated/cr-buildbucket.cfg | 99 ++++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      | 23 +++++++++
 generated/luci-notify.cfg    | 22 ++++++++
 generated/luci-scheduler.cfg | 22 ++++++++
 lib/dart.star                | 17 ++++---
 lib/defaults.star            |  2 +
 monorepo.star                |  4 +-
 vm.star                      | 20 +++++---
 9 files changed, 197 insertions(+), 28 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 105290464e1c..c9bb62791b41 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -1089,10 +1089,6 @@ config_groups {
         name: "dart/try/vm-win-debug-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-win-release-arm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-win-release-x64-try"
         includable_only: true
@@ -1186,10 +1182,6 @@ config_groups {
         name: "dart/try/stable-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-win-release-arm64-try"
-        includable_only: true
-      }
       retry_config {}
     }
   }
@@ -2763,6 +2755,10 @@ config_groups {
         name: "dart/try/vm-ubsan-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-win-debug-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-win-debug-x64-try"
         includable_only: true
@@ -3737,10 +3733,6 @@ config_groups {
         name: "dart/try/vm-win-debug-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-win-release-arm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-win-release-x64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index c7ecd040dc6d..120b0afd3e87 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -8961,6 +8961,39 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-win-debug-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-win-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -9108,6 +9141,39 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-win-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-win-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13612,6 +13678,39 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-win-debug-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-win-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 8c4054ff279f..2200b96e86e3 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -94,6 +94,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-win-release-x64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-win-debug-arm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-win-release-arm64-try"
   }
@@ -613,6 +616,16 @@ consoles {
     category: "vm|jit"
     short_name: "wr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-arm64"
+    category: "vm|jit"
+    short_name: "wad"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-arm64"
+    category: "vm|jit"
+    short_name: "war"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-debug-x64"
     category: "vm|appjit"
@@ -1377,6 +1390,16 @@ consoles {
     category: "vm|jit"
     short_name: "wr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-arm64"
+    category: "vm|jit"
+    short_name: "wad"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-arm64"
+    category: "vm|jit"
+    short_name: "war"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-debug-x64"
     category: "vm|appjit"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index f0ca1cd53c97..2479679bd8aa 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -1246,6 +1246,17 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-win-debug-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1270,6 +1281,17 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-win-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 2fb290b79658..78602195239e 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -2054,6 +2054,16 @@ job {
     builder: "vm-ubsan-linux-release-x64"
   }
 }
+job {
+  id: "vm-win-debug-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-win-debug-arm64"
+  }
+}
 job {
   id: "vm-win-debug-x64"
   realm: "ci.sandbox"
@@ -2094,6 +2104,16 @@ job {
     builder: "vm-win-debug-x64c"
   }
 }
+job {
+  id: "vm-win-release-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-win-release-arm64"
+  }
+}
 job {
   id: "vm-win-release-ia32"
   realm: "ci.sandbox"
@@ -2408,6 +2428,8 @@ trigger {
   triggers: "vm-linux-release-x64"
   triggers: "vm-mac-debug-arm64"
   triggers: "vm-mac-release-arm64"
+  triggers: "vm-win-debug-arm64"
+  triggers: "vm-win-release-arm64"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/main"
diff --git a/lib/dart.star b/lib/dart.star
index a7df92ca0c15..dc32aa482abb 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -97,10 +97,8 @@ def _try_builder(
         experiments = None,
         goma = None,
         location_filters = None,
-        pool = "luci.dart.try",
         properties = None,
-        on_cq = False,
-        no_host_class = False):
+        on_cq = False):
     """Creates a Dart tryjob.
 
     Args:
@@ -116,17 +114,17 @@ def _try_builder(
         experiments: Experiments to run on this builder, with percentages.
         goma: Whether to use goma or not.
         location_filters: Locations that trigger this tryjob.
-        pool: The pool to set in dimensions (defaults to "luci.dart.try").
         properties: Extra properties to set for builds.
         on_cq: Whether the build is added to the default set of CQ tryjobs.
-        no_host_class: Whether to filter "host_class" from the default dimensions.
     """
     if on_cq and location_filters:
         fail("Can't be on the default CQ and conditionally on the CQ")
     dimensions = defaults.dimensions(dimensions)
-    if no_host_class:
+
+    # TODO(https://github.com/flutter/flutter/issues/127691): Remove filtering
+    # of host_class.
+    if dimensions["pool"] == "luci.flutter.staging":
         dimensions.pop("host_class")
-    dimensions["pool"] = pool
     properties = defaults.properties(properties)
     builder_properties = _with_goma(goma, dimensions, properties)
     builder = name + "-try"
@@ -209,6 +207,11 @@ def _builder(
         location_filters: Locations that trigger this builder.
     """
     dimensions = defaults.dimensions(dimensions)
+
+    # TODO(https://github.com/flutter/flutter/issues/127691): Remove filtering
+    # of host_class.
+    if dimensions["pool"] == "luci.flutter.staging":
+        dimensions.pop("host_class")
     properties = defaults.properties(properties)
 
     os = dimensions["os"]
diff --git a/lib/defaults.star b/lib/defaults.star
index d63506988857..47771cf4c359 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -32,6 +32,7 @@ _FOCAL = {"os": "Ubuntu-20"}
 _WINDOWS10 = {"os": "Windows-10"}
 _WINDOWS11 = {"os": "Windows-11"}
 
+_FLUTTER_POOL = {"pool": "luci.flutter.staging"}
 _EXPERIMENTAL = {"host_class": "experimental"}
 
 def _union(x, overrides):
@@ -74,6 +75,7 @@ defaults = struct(
 
 arm64 = _ARM64
 experimental = _EXPERIMENTAL
+flutter_pool = _FLUTTER_POOL
 focal = _FOCAL
 linux = _FOCAL
 mac = _MAC
diff --git a/monorepo.star b/monorepo.star
index 6118f6eaad54..5abb4e41d564 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -153,7 +153,7 @@ def monorepo_builder(name, short_name, console):
         bucket = "try.monorepo",
         executable = dart.flutter_recipe("engine_v2/builder"),
         execution_timeout = 60 * time.minute,
-        pool = "dart.tests",
+        dimensions = {"pool": "dart.tests"},
         on_cq = False,
         cq_branches = [],
     )
@@ -230,7 +230,7 @@ def monorepo_tester(name, short_name, console):
         bucket = "try.monorepo",
         executable = dart.flutter_recipe("engine_v2/tester"),
         execution_timeout = 90 * time.minute,
-        pool = "dart.tests",
+        dimensions = {"pool": "dart.tests"},
         on_cq = False,
         cq_branches = [],
     )
diff --git a/vm.star b/vm.star
index 16f64ab41851..2fa2c0552fda 100644
--- a/vm.star
+++ b/vm.star
@@ -10,6 +10,7 @@ load("//lib/dart.star", "dart")
 load(
     "//lib/defaults.star",
     "arm64",
+    "flutter_pool",
     "focal",
     "mac",
     "no_android",
@@ -170,14 +171,19 @@ _builder(
     category = "vm|jit|wr",
     dimensions = windows,
 )
-dart.try_builder(
+_extra_builder(
+    "vm-win-debug-arm64",
+    category = "vm|jit|wad",
+    channels = ["try"],
+    dimensions = [windows11, arm64, flutter_pool],
+    goma = False,  # no such package: infra_internal/goma/client/windows-arm64
+)
+_extra_builder(
     "vm-win-release-arm64",
-    dimensions = [windows11, arm64],
-    # TODO(https://github.com/flutter/flutter/issues/127691): Remove filtering of host_class.
-    no_host_class = True,
-    pool = "luci.flutter.staging",
-    # no such package: infra_internal/goma/client/windows-arm64
-    goma = False,
+    category = "vm|jit|war",
+    channels = ["try"],
+    dimensions = [windows11, arm64, flutter_pool],
+    goma = False,  # no such package: infra_internal/goma/client/windows-arm64
 )
 
 # vm|appjit

From 4f084186cdc193f4621df49556dd1dba34f3e7df Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Fri, 21 Jul 2023 08:59:55 +0000
Subject: [PATCH 676/826] [infra] Setup Windows ARM64 AOT builders.

Change-Id: I7f4bec0ea06fd9f34483b3645095d9790121ee61
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/313545
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   |   8 +++
 generated/cr-buildbucket.cfg | 132 +++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      |  26 +++++++
 generated/luci-notify.cfg    |  22 ++++++
 generated/luci-scheduler.cfg |  22 ++++++
 vm.star                      |  14 ++++
 6 files changed, 224 insertions(+)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index c9bb62791b41..889ac91cd0ac 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -2437,6 +2437,10 @@ config_groups {
         name: "dart/try/vm-aot-ubsan-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-win-debug-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-win-debug-x64c-try"
         includable_only: true
@@ -2445,6 +2449,10 @@ config_groups {
         name: "dart/try/vm-aot-win-product-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-win-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-win-release-x64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 120b0afd3e87..6794d29a4452 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5708,6 +5708,39 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-win-debug-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-win-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
@@ -5781,6 +5814,39 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-win-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -12018,6 +12084,39 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-win-debug-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-win-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -12091,6 +12190,39 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-win-release-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 2200b96e86e3..b82f14e9e439 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -136,6 +136,12 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-win-release-x64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-aot-win-debug-arm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-aot-win-release-arm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-android-release-arm_x64-try"
   }
@@ -691,6 +697,16 @@ consoles {
     category: "vm|aot"
     short_name: "wr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-debug-arm64"
+    category: "vm|aot"
+    short_name: "wad"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-release-arm64"
+    category: "vm|aot"
+    short_name: "war"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm_x64"
     category: "vm|aot|android"
@@ -1465,6 +1481,16 @@ consoles {
     category: "vm|aot"
     short_name: "wr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-debug-arm64"
+    category: "vm|aot"
+    short_name: "wad"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-release-arm64"
+    category: "vm|aot"
+    short_name: "war"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm_x64"
     category: "vm|aot|android"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 2479679bd8aa..7e528ae05c9a 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -681,6 +681,17 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-win-debug-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -707,6 +718,17 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-win-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 78602195239e..7713c6a61b16 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1184,6 +1184,16 @@ job {
     builder: "vm-aot-ubsan-linux-release-x64"
   }
 }
+job {
+  id: "vm-aot-win-debug-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-win-debug-arm64"
+  }
+}
 job {
   id: "vm-aot-win-debug-x64c"
   realm: "ci.sandbox"
@@ -1204,6 +1214,16 @@ job {
     builder: "vm-aot-win-product-x64"
   }
 }
+job {
+  id: "vm-aot-win-release-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-win-release-arm64"
+  }
+}
 job {
   id: "vm-aot-win-release-x64"
   realm: "ci.sandbox"
@@ -2406,6 +2426,8 @@ trigger {
   triggers: "vm-aot-linux-release-x64"
   triggers: "vm-aot-mac-release-arm64"
   triggers: "vm-aot-mac-release-x64"
+  triggers: "vm-aot-win-debug-arm64"
+  triggers: "vm-aot-win-release-arm64"
   triggers: "vm-aot-win-release-x64"
   triggers: "vm-appjit-linux-debug-x64"
   triggers: "vm-appjit-linux-release-x64"
diff --git a/vm.star b/vm.star
index 2fa2c0552fda..40fa687d1659 100644
--- a/vm.star
+++ b/vm.star
@@ -258,6 +258,20 @@ _extra_builder(
     category = "vm|aot|wr",
     dimensions = windows,
 )
+_extra_builder(
+    "vm-aot-win-debug-arm64",
+    category = "vm|aot|wad",
+    channels = ["try"],
+    dimensions = [windows11, arm64, flutter_pool],
+    goma = False,  # no such package: infra_internal/goma/client/windows-arm64
+)
+_extra_builder(
+    "vm-aot-win-release-arm64",
+    category = "vm|aot|war",
+    channels = ["try"],
+    dimensions = [windows11, arm64, flutter_pool],
+    goma = False,  # no such package: infra_internal/goma/client/windows-arm64
+)
 
 # vm|aot|android
 _extra_builder(

From d5677673011e0975642807d6921d60674bab6447 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Wed, 26 Jul 2023 17:38:29 +0000
Subject: [PATCH 677/826] [infra] Change debian package builder name on dart-ci
 consoles

Change-Id: I58ee24ef9dc1391c286dc9045c20fbc48629e6d1
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/316421
Reviewed-by: Ryan Macnak <rmacnak@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/luci-milo.cfg | 10 +++++-----
 generated/project.cfg   |  2 +-
 sdk.star                |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index b82f14e9e439..a27e59189440 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -498,7 +498,7 @@ consoles {
     short_name: "wa"
   }
   builders {
-    name: "buildbucket/luci.dart-internal.ci/debianpackage-linux-main"
+    name: "buildbucket/luci.dart-internal.ci/debian-x64-main"
     category: "sdk"
     short_name: "dp"
   }
@@ -1142,7 +1142,7 @@ consoles {
     short_name: "wa"
   }
   builders {
-    name: "buildbucket/luci.dart-internal.ci/debianpackage-linux-main"
+    name: "buildbucket/luci.dart-internal.ci/debian-x64-main"
     category: "sdk"
     short_name: "dp"
   }
@@ -1786,7 +1786,7 @@ consoles {
     short_name: "wa"
   }
   builders {
-    name: "buildbucket/luci.dart-internal.ci/debianpackage-linux-dev"
+    name: "buildbucket/luci.dart-internal.ci/debian-x64-dev"
     category: "sdk"
     short_name: "dp"
   }
@@ -1875,7 +1875,7 @@ consoles {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart-internal.ci/debianpackage-linux-beta"
+    name: "buildbucket/luci.dart-internal.ci/debian-x64-beta"
     category: "sdk"
     short_name: "dp"
   }
@@ -2209,7 +2209,7 @@ consoles {
     short_name: "w"
   }
   builders {
-    name: "buildbucket/luci.dart-internal.ci/debianpackage-linux-stable"
+    name: "buildbucket/luci.dart-internal.ci/debian-x64-stable"
     category: "sdk"
     short_name: "dp"
   }
diff --git a/generated/project.cfg b/generated/project.cfg
index 7c42e6a2f300..dba681b48232 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.39.8"
+  version: "1.39.10"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/sdk.star b/sdk.star
index f23b69bacbfd..4a0dc83db050 100644
--- a/sdk.star
+++ b/sdk.star
@@ -46,7 +46,7 @@ def sdk_builder_category():
                 console_view = console,
             )
         luci.console_view_entry(
-            builder = "dart-internal:ci/debianpackage-linux-%s" % channel,
+            builder = "dart-internal:ci/debian-x64-%s" % channel,
             short_name = "dp",
             category = "sdk",
             console_view = console,

From 103f6bafe4eaf201b5dae9945f3093d730868952 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Tue, 8 Aug 2023 19:30:27 +0000
Subject: [PATCH 678/826] [infra] Build x64 Mac SDK tryjobs on ARM64 Mac bots

Bug: b/295013321
Change-Id: I4244f07ff6f8d59a7e493092b3fab96da438fccf
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/319041
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg |  2 +-
 generated/luci-milo.cfg      | 10 +++++-----
 generated/project.cfg        |  2 +-
 sdk.star                     |  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 6794d29a4452..8681e2615126 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -9832,7 +9832,7 @@ buckets {
     builders {
       name: "dart-sdk-mac-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index a27e59189440..03ae5a610a49 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -485,7 +485,7 @@ consoles {
   builders {
     name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-arm64-main"
     category: "sdk"
-    short_name: "m1"
+    short_name: "ma"
   }
   builders {
     name: "buildbucket/luci.dart-internal.ci/dart-sdk-win-main"
@@ -1129,7 +1129,7 @@ consoles {
   builders {
     name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-arm64-main"
     category: "sdk"
-    short_name: "m1"
+    short_name: "ma"
   }
   builders {
     name: "buildbucket/luci.dart-internal.ci/dart-sdk-win-main"
@@ -1773,7 +1773,7 @@ consoles {
   builders {
     name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-arm64-dev"
     category: "sdk"
-    short_name: "m1"
+    short_name: "ma"
   }
   builders {
     name: "buildbucket/luci.dart-internal.ci/dart-sdk-win-dev"
@@ -1867,7 +1867,7 @@ consoles {
   builders {
     name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-arm64-beta"
     category: "sdk"
-    short_name: "m1"
+    short_name: "ma"
   }
   builders {
     name: "buildbucket/luci.dart-internal.ci/dart-sdk-win-beta"
@@ -2201,7 +2201,7 @@ consoles {
   builders {
     name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-arm64-stable"
     category: "sdk"
-    short_name: "m1"
+    short_name: "ma"
   }
   builders {
     name: "buildbucket/luci.dart-internal.ci/dart-sdk-win-stable"
diff --git a/generated/project.cfg b/generated/project.cfg
index dba681b48232..e07914943d65 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.39.10"
+  version: "1.39.11"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/sdk.star b/sdk.star
index 4a0dc83db050..096034a1014e 100644
--- a/sdk.star
+++ b/sdk.star
@@ -30,7 +30,7 @@ def sdk_builder_category():
             ["linux-arm64", "la"],
             ["linux-riscv64", "lv"],
             ["mac", "m"],
-            ["mac-arm64", "m1"],
+            ["mac-arm64", "ma"],
             ["win", "w"],
             ["win-arm64", "wa"],
         ]:
@@ -97,7 +97,7 @@ dart.try_builder(
 
 dart.try_builder(
     "dart-sdk-mac",
-    dimensions = mac,
+    dimensions = [mac, arm64],
     properties = [{"archs": ["x64"], "disable_bcid": True}],
     location_filters = paths.to_location_filters(paths.release),
     recipe = "release/sdk",

From 3157f78cce6c08cba663a1b0ec59ac02317b36b7 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 14 Aug 2023 16:48:34 +0000
Subject: [PATCH 679/826] [infra] Set DEPS variable `download_fuchsia_deps` on
 the Fuchsia builders.

Also explicit set `download_android_deps` on the Android builder so the default can become false.

Change-Id: Ife0c3b1860f845922ffe77ed950c0660a01429a1
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/320160
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/cr-buildbucket.cfg | 108 +++++++++++++++++++++++++++++++++++
 lib/defaults.star            |   4 ++
 vm.star                      |  54 ++++++++++++++----
 3 files changed, 156 insertions(+), 10 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 8681e2615126..632e93c9a8f1 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -4460,6 +4460,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -4497,6 +4500,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -4534,6 +4540,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -4571,6 +4580,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -4608,6 +4620,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -4645,6 +4660,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -6481,6 +6499,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6517,6 +6538,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6553,6 +6577,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6589,6 +6616,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6625,6 +6655,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6661,6 +6694,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6697,6 +6733,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6733,6 +6772,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6769,6 +6811,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6805,6 +6850,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6841,6 +6889,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6877,6 +6928,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6913,6 +6967,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6949,6 +7006,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6985,6 +7045,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -7021,6 +7084,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -7057,6 +7123,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -7093,6 +7162,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -7381,6 +7453,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_fuchsia_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7418,6 +7493,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_fuchsia_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -11397,6 +11475,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -11434,6 +11515,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12548,6 +12632,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12584,6 +12671,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12620,6 +12710,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12656,6 +12749,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12692,6 +12788,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12728,6 +12827,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12836,6 +12938,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_fuchsia_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12872,6 +12977,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_fuchsia_deps": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
diff --git a/lib/defaults.star b/lib/defaults.star
index 47771cf4c359..89f04ea98d66 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -20,9 +20,11 @@ _CACHES = {
 # the wait_for_warm_cache field default to zero.
 _NO_CACHES = [swarming.cache("builder")]
 _NO_ANDROID = {"custom_vars": {"download_android_deps": False}}
+_ANDROID_DEPS = {"custom_vars": {"download_android_deps": True}}
 _CHROME = {"custom_vars": {"download_chrome": True}}
 _EMSCRIPTEN = {"custom_vars": {"download_emscripten": True}}
 _FIREFOX = {"custom_vars": {"download_firefox": True}}
+_FUCHSIA_DEPS = {"custom_vars": {"download_fuchsia_deps": True}}
 _JS_ENGINES = {"custom_vars": {"checkout_javascript_engines": True}}
 _SLOW_SHARDS = {"shard_timeout": (90 * time.minute) // time.second}
 
@@ -85,9 +87,11 @@ windows11 = _WINDOWS11
 
 # Properties
 
+android_deps = _ANDROID_DEPS
 chrome = _CHROME
 emscripten = _EMSCRIPTEN
 firefox = _FIREFOX
+fuchsia_deps = _FUCHSIA_DEPS
 js_engines = _JS_ENGINES
 no_android = _NO_ANDROID
 slow_shards = _SLOW_SHARDS
diff --git a/vm.star b/vm.star
index 40fa687d1659..12aa9c2f1f73 100644
--- a/vm.star
+++ b/vm.star
@@ -9,9 +9,11 @@ load("//lib/cron.star", "cron")
 load("//lib/dart.star", "dart")
 load(
     "//lib/defaults.star",
+    "android_deps",
     "arm64",
     "flutter_pool",
     "focal",
+    "fuchsia_deps",
     "mac",
     "no_android",
     "slow_shards",
@@ -277,12 +279,12 @@ _extra_builder(
 _extra_builder(
     "vm-aot-android-release-arm_x64",
     category = "vm|aot|android|a32",
-    properties = slow_shards,
+    properties = [android_deps, slow_shards],
 )
 _extra_builder(
     "vm-aot-android-release-arm64c",
     category = "vm|aot|android|a64",
-    properties = slow_shards,
+    properties = [android_deps, slow_shards],
 )
 
 # vm|aot|product
@@ -413,8 +415,16 @@ _nightly_builder(
     dimensions = windows,
     properties = slow_shards,
 )
-_low_priority_builder("vm-fuchsia-release-arm64", category = "vm|misc|f")
-_low_priority_builder("vm-fuchsia-release-x64", category = "vm|misc|f")
+_low_priority_builder(
+    "vm-fuchsia-release-arm64",
+    category = "vm|misc|f",
+    properties = [fuchsia_deps],
+)
+_low_priority_builder(
+    "vm-fuchsia-release-x64",
+    category = "vm|misc|f",
+    properties = [fuchsia_deps],
+)
 
 # Our sysroot does not support gcc, we can't use goma on RBE for this builder
 _nightly_builder(
@@ -440,12 +450,36 @@ _nightly_builder(
 )
 
 # vm|ffi
-_extra_builder("vm-ffi-android-debug-arm", category = "vm|ffi|d32")
-_extra_builder("vm-ffi-android-release-arm", category = "vm|ffi|r32")
-_extra_builder("vm-ffi-android-product-arm", category = "vm|ffi|p32")
-_extra_builder("vm-ffi-android-debug-arm64c", category = "vm|ffi|d64")
-_extra_builder("vm-ffi-android-release-arm64c", category = "vm|ffi|r64")
-_extra_builder("vm-ffi-android-product-arm64c", category = "vm|ffi|p64")
+_extra_builder(
+    "vm-ffi-android-debug-arm",
+    category = "vm|ffi|d32",
+    properties = [android_deps],
+)
+_extra_builder(
+    "vm-ffi-android-release-arm",
+    category = "vm|ffi|r32",
+    properties = [android_deps],
+)
+_extra_builder(
+    "vm-ffi-android-product-arm",
+    category = "vm|ffi|p32",
+    properties = [android_deps],
+)
+_extra_builder(
+    "vm-ffi-android-debug-arm64c",
+    category = "vm|ffi|d64",
+    properties = [android_deps],
+)
+_extra_builder(
+    "vm-ffi-android-release-arm64c",
+    category = "vm|ffi|r64",
+    properties = [android_deps],
+)
+_extra_builder(
+    "vm-ffi-android-product-arm64c",
+    category = "vm|ffi|p64",
+    properties = [android_deps],
+)
 _extra_builder(
     "vm-ffi-qemu-linux-release-arm",
     category = "vm|ffi|qa",

From e49717a0f6e5c26c512dfa871169dcd732611e60 Mon Sep 17 00:00:00 2001
From: Paul Berry <paulberry@google.com>
Date: Mon, 21 Aug 2023 08:10:15 +0000
Subject: [PATCH 680/826] Run analyzer trybots when `runtime/tools/dartfuzz`
 changes.

This would have caught the breakage in
https://dart-review.googlesource.com/c/sdk/+/321745 during presubmit.

Change-Id: Id3d54d9a41df4406534b24aae4f3241d0f92c16f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/321821
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
Auto-Submit: Paul Berry <paulberry@google.com>
---
 generated/commit-queue.cfg | 30 ++++++++++++++++++++++++++++++
 generated/project.cfg      |  2 +-
 lib/paths.star             |  2 ++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 889ac91cd0ac..a83885a9deec 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -214,6 +214,11 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "runtime/tools/dartfuzz/.+"
+        }
       }
       builders {
         name: "dart/try/analyzer-linux-release-try"
@@ -267,6 +272,11 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "runtime/tools/dartfuzz/.+"
+        }
       }
       builders {
         name: "dart/try/analyzer-mac-release-try"
@@ -1288,6 +1298,11 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "runtime/tools/dartfuzz/.+"
+        }
       }
       builders {
         name: "dart/try/analyzer-linux-release-try"
@@ -1341,6 +1356,11 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "runtime/tools/dartfuzz/.+"
+        }
       }
       builders {
         name: "dart/try/analyzer-mac-release-try"
@@ -2866,6 +2886,11 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "runtime/tools/dartfuzz/.+"
+        }
       }
       builders {
         name: "dart/try/analyzer-linux-release-try"
@@ -2919,6 +2944,11 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "runtime/tools/dartfuzz/.+"
+        }
       }
       builders {
         name: "dart/try/analyzer-mac-release-try"
diff --git a/generated/project.cfg b/generated/project.cfg
index e07914943d65..4e6a05dea676 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.39.11"
+  version: "1.39.14"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/lib/paths.star b/lib/paths.star
index d09bf503a1d6..797efaddc483 100644
--- a/lib/paths.star
+++ b/lib/paths.star
@@ -66,6 +66,8 @@ _ANALYZER_NNBD_PATHS = _STANDARD_PATHS + [
 _ANALYZER_PATHS = _STANDARD_PATHS + [
     # "analyzer" bots analyze everything under pkg
     "pkg/.+",
+    # "analyzer-analysis-server-linux" bot also analyzes dartfuzz
+    "runtime/tools/dartfuzz/.+",
 ]
 
 _DART2WASM_PATHS = _CFE_PATHS + [

From bfb99e41e9bf295a9d4ccda8d86bb4c2cd8312f5 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Mon, 21 Aug 2023 12:28:34 +0000
Subject: [PATCH 681/826] [infra] Add flute commit queue.

Bug: b/274424008
Change-Id: Ia934cbce80e470a994f1c0b810f2aed374986f01
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/321901
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 cq.star                    |  1 +
 generated/commit-queue.cfg | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/cq.star b/cq.star
index 523aceb8410c..72a16bc2c901 100644
--- a/cq.star
+++ b/cq.star
@@ -60,6 +60,7 @@ def basic_cq(repository):
 
 basic_cq("dart_ci")
 basic_cq("dart-docker")
+basic_cq("flute")
 basic_cq("homebrew-dart")
 basic_cq("recipes")
 
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index a83885a9deec..a20aa32d162d 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -65,6 +65,33 @@ config_groups {
     }
   }
 }
+config_groups {
+  name: "flute"
+  gerrit {
+    url: "https://dart-review.googlesource.com"
+    projects {
+      name: "flute"
+      ref_regexp: "refs/heads/main"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "project-dart-committers"
+      dry_run_access_list: "project-dart-tryjob-access"
+      allow_submit_with_open_deps: true
+    }
+    tree_status {
+      url: "https://dart-status.appspot.com"
+    }
+    tryjob {
+      builders {
+        name: "dart/try.shared/presubmit-try"
+        disable_reuse: true
+      }
+      retry_config {}
+    }
+  }
+}
 config_groups {
   name: "homebrew-dart"
   gerrit {

From f3131e2450a53b0288f6f5b30eed155f68f98bba Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Wed, 23 Aug 2023 14:11:32 +0000
Subject: [PATCH 682/826] [infra] Add generate_package_config to the standard
 paths.

Change-Id: I2223a791456922ac7cfd4a09ea5e2f6c3a4a1d24
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/322322
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 generated/commit-queue.cfg   | 350 +++++++++++++++++++++++++++++++++++
 generated/luci-scheduler.cfg |   8 +
 lib/paths.star               |   2 +
 3 files changed, 360 insertions(+)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index a20aa32d162d..f5e01b4da989 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -216,6 +216,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -274,6 +284,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -394,6 +414,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -488,6 +518,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -566,6 +606,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -648,6 +698,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -741,6 +801,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -798,6 +868,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -995,6 +1075,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1072,6 +1162,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1300,6 +1400,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1358,6 +1468,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1482,6 +1602,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1560,6 +1690,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1638,6 +1778,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1732,6 +1882,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1810,6 +1970,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1892,6 +2062,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1975,6 +2155,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2062,6 +2252,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2140,6 +2340,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2257,6 +2467,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2326,6 +2546,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2651,6 +2881,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2728,6 +2968,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2888,6 +3138,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2946,6 +3206,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3066,6 +3336,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3160,6 +3440,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3238,6 +3528,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3320,6 +3620,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3413,6 +3723,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3470,6 +3790,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3667,6 +3997,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3744,6 +4084,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 7713c6a61b16..870316252a24 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -2460,6 +2460,8 @@ trigger {
     path_regexps: "BUILD.gn"
     path_regexps: "sdk_args.gni"
     path_regexps: ".dart_tool/package_config.json"
+    path_regexps: "tools/generate_package_config.py"
+    path_regexps: "tools/generate_package_config.dart"
     path_regexps: "sdk/lib/[^_].+"
     path_regexps: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
     path_regexps: "tools/bots/test_matrix.json"
@@ -2495,6 +2497,8 @@ trigger {
     path_regexps: "BUILD.gn"
     path_regexps: "sdk_args.gni"
     path_regexps: ".dart_tool/package_config.json"
+    path_regexps: "tools/generate_package_config.py"
+    path_regexps: "tools/generate_package_config.dart"
     path_regexps: "sdk/lib/[^_].+"
     path_regexps: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
     path_regexps: "tools/bots/test_matrix.json"
@@ -2520,6 +2524,8 @@ trigger {
     path_regexps: "BUILD.gn"
     path_regexps: "sdk_args.gni"
     path_regexps: ".dart_tool/package_config.json"
+    path_regexps: "tools/generate_package_config.py"
+    path_regexps: "tools/generate_package_config.dart"
     path_regexps: "sdk/lib/[^_].+"
     path_regexps: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
     path_regexps: "tools/bots/test_matrix.json"
@@ -2545,6 +2551,8 @@ trigger {
     path_regexps: "BUILD.gn"
     path_regexps: "sdk_args.gni"
     path_regexps: ".dart_tool/package_config.json"
+    path_regexps: "tools/generate_package_config.py"
+    path_regexps: "tools/generate_package_config.dart"
     path_regexps: "sdk/lib/[^_].+"
     path_regexps: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
     path_regexps: "tools/bots/test_matrix.json"
diff --git a/lib/paths.star b/lib/paths.star
index 797efaddc483..8184b66167e0 100644
--- a/lib/paths.star
+++ b/lib/paths.star
@@ -15,6 +15,8 @@ _STANDARD_PATHS = [
     "sdk_args.gni",
     # core libraries
     ".dart_tool/package_config.json",
+    "tools/generate_package_config.py",
+    "tools/generate_package_config.dart",
     "sdk/lib/[^_].+",
     # testing
     _TEST_PY_PATHS,

From 1dbacb691e76d2b11ca76ade523835976d4acb5c Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 29 Aug 2023 22:57:55 +0000
Subject: [PATCH 683/826] [infra] Enable Windows ARM64 testing on release
 branches.

Change-Id: I1a4227b3ffd6f646bbb23be3d6a218dd63932d89
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/321784
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/commit-queue.cfg   |  32 +++++
 generated/cr-buildbucket.cfg | 264 +++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      |  45 ++++++
 generated/luci-scheduler.cfg |  88 ++++++++++++
 sdk.star                     |   4 +-
 vm.star                      |   4 -
 6 files changed, 430 insertions(+), 7 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index f5e01b4da989..42794b13f3e7 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -984,6 +984,14 @@ config_groups {
         name: "dart/try/vm-aot-mac-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-win-debug-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-win-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-win-release-x64-try"
         includable_only: true
@@ -1222,10 +1230,18 @@ config_groups {
         name: "dart/try/vm-mac-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-win-debug-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-win-debug-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-win-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-win-release-x64-try"
         includable_only: true
@@ -3906,6 +3922,14 @@ config_groups {
         name: "dart/try/vm-aot-mac-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-win-debug-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-win-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-win-release-x64-try"
         includable_only: true
@@ -4144,10 +4168,18 @@ config_groups {
         name: "dart/try/vm-mac-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-win-debug-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-win-debug-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-win-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-win-release-x64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 632e93c9a8f1..509faa8aa92e 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5759,6 +5759,72 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-win-debug-arm64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-aot-win-debug-arm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-win-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
@@ -5865,6 +5931,72 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-win-release-arm64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-aot-win-release-arm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -9138,6 +9270,72 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-win-debug-arm64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-win-debug-arm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-win-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -9318,6 +9516,72 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-win-release-arm64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-win-release-arm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-win-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 03ae5a610a49..a82bf0ebf1dc 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -1874,6 +1874,11 @@ consoles {
     category: "sdk"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-win-arm64-beta"
+    category: "sdk"
+    short_name: "wa"
+  }
   builders {
     name: "buildbucket/luci.dart-internal.ci/debian-x64-beta"
     category: "sdk"
@@ -1944,6 +1949,16 @@ consoles {
     category: "vm|jit"
     short_name: "wr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-arm64-beta"
+    category: "vm|jit"
+    short_name: "wad"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-arm64-beta"
+    category: "vm|jit"
+    short_name: "war"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-debug-x64-beta"
     category: "vm|appjit"
@@ -1984,6 +1999,16 @@ consoles {
     category: "vm|aot"
     short_name: "wr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-debug-arm64-beta"
+    category: "vm|aot"
+    short_name: "wad"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-release-arm64-beta"
+    category: "vm|aot"
+    short_name: "war"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm_x64-beta"
     category: "vm|aot|android"
@@ -2278,6 +2303,16 @@ consoles {
     category: "vm|jit"
     short_name: "wr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-arm64-stable"
+    category: "vm|jit"
+    short_name: "wad"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-arm64-stable"
+    category: "vm|jit"
+    short_name: "war"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-debug-x64-stable"
     category: "vm|appjit"
@@ -2318,6 +2353,16 @@ consoles {
     category: "vm|aot"
     short_name: "wr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-debug-arm64-stable"
+    category: "vm|aot"
+    short_name: "wad"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-release-arm64-stable"
+    category: "vm|aot"
+    short_name: "war"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm_x64-stable"
     category: "vm|aot|android"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 870316252a24..d95a7adcb09d 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1194,6 +1194,26 @@ job {
     builder: "vm-aot-win-debug-arm64"
   }
 }
+job {
+  id: "vm-aot-win-debug-arm64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-win-debug-arm64-beta"
+  }
+}
+job {
+  id: "vm-aot-win-debug-arm64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-win-debug-arm64-stable"
+  }
+}
 job {
   id: "vm-aot-win-debug-x64c"
   realm: "ci.sandbox"
@@ -1224,6 +1244,26 @@ job {
     builder: "vm-aot-win-release-arm64"
   }
 }
+job {
+  id: "vm-aot-win-release-arm64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-win-release-arm64-beta"
+  }
+}
+job {
+  id: "vm-aot-win-release-arm64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-win-release-arm64-stable"
+  }
+}
 job {
   id: "vm-aot-win-release-x64"
   realm: "ci.sandbox"
@@ -2084,6 +2124,26 @@ job {
     builder: "vm-win-debug-arm64"
   }
 }
+job {
+  id: "vm-win-debug-arm64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-win-debug-arm64-beta"
+  }
+}
+job {
+  id: "vm-win-debug-arm64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-win-debug-arm64-stable"
+  }
+}
 job {
   id: "vm-win-debug-x64"
   realm: "ci.sandbox"
@@ -2134,6 +2194,26 @@ job {
     builder: "vm-win-release-arm64"
   }
 }
+job {
+  id: "vm-win-release-arm64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-win-release-arm64-beta"
+  }
+}
+job {
+  id: "vm-win-release-arm64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-win-release-arm64-stable"
+  }
+}
 job {
   id: "vm-win-release-ia32"
   realm: "ci.sandbox"
@@ -2215,6 +2295,8 @@ trigger {
   triggers: "vm-aot-linux-release-simarm_x64-beta"
   triggers: "vm-aot-linux-release-x64-beta"
   triggers: "vm-aot-mac-release-x64-beta"
+  triggers: "vm-aot-win-debug-arm64-beta"
+  triggers: "vm-aot-win-release-arm64-beta"
   triggers: "vm-aot-win-release-x64-beta"
   triggers: "vm-appjit-linux-debug-x64-beta"
   triggers: "vm-appjit-linux-release-x64-beta"
@@ -2235,7 +2317,9 @@ trigger {
   triggers: "vm-mac-debug-x64-beta"
   triggers: "vm-mac-release-arm64-beta"
   triggers: "vm-mac-release-x64-beta"
+  triggers: "vm-win-debug-arm64-beta"
   triggers: "vm-win-debug-x64-beta"
+  triggers: "vm-win-release-arm64-beta"
   triggers: "vm-win-release-x64-beta"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
@@ -2329,6 +2413,8 @@ trigger {
   triggers: "vm-aot-linux-release-simarm_x64-stable"
   triggers: "vm-aot-linux-release-x64-stable"
   triggers: "vm-aot-mac-release-x64-stable"
+  triggers: "vm-aot-win-debug-arm64-stable"
+  triggers: "vm-aot-win-release-arm64-stable"
   triggers: "vm-aot-win-release-x64-stable"
   triggers: "vm-appjit-linux-debug-x64-stable"
   triggers: "vm-appjit-linux-release-x64-stable"
@@ -2349,7 +2435,9 @@ trigger {
   triggers: "vm-mac-debug-x64-stable"
   triggers: "vm-mac-release-arm64-stable"
   triggers: "vm-mac-release-x64-stable"
+  triggers: "vm-win-debug-arm64-stable"
   triggers: "vm-win-debug-x64-stable"
+  triggers: "vm-win-release-arm64-stable"
   triggers: "vm-win-release-x64-stable"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
diff --git a/sdk.star b/sdk.star
index 096034a1014e..99b692a72388 100644
--- a/sdk.star
+++ b/sdk.star
@@ -34,9 +34,7 @@ def sdk_builder_category():
             ["win", "w"],
             ["win-arm64", "wa"],
         ]:
-            if channel == "stable" and builder_type == "linux-riscv64":
-                continue
-            if channel in ["beta", "stable"] and builder_type == "win-arm64":
+            if channel == "stable" and builder_type in ["linux-riscv64", "win-arm64"]:
                 continue
             luci.console_view_entry(
                 builder = "dart-internal:ci/dart-sdk-%s-%s" %
diff --git a/vm.star b/vm.star
index 12aa9c2f1f73..3c07e80967f1 100644
--- a/vm.star
+++ b/vm.star
@@ -176,14 +176,12 @@ _builder(
 _extra_builder(
     "vm-win-debug-arm64",
     category = "vm|jit|wad",
-    channels = ["try"],
     dimensions = [windows11, arm64, flutter_pool],
     goma = False,  # no such package: infra_internal/goma/client/windows-arm64
 )
 _extra_builder(
     "vm-win-release-arm64",
     category = "vm|jit|war",
-    channels = ["try"],
     dimensions = [windows11, arm64, flutter_pool],
     goma = False,  # no such package: infra_internal/goma/client/windows-arm64
 )
@@ -263,14 +261,12 @@ _extra_builder(
 _extra_builder(
     "vm-aot-win-debug-arm64",
     category = "vm|aot|wad",
-    channels = ["try"],
     dimensions = [windows11, arm64, flutter_pool],
     goma = False,  # no such package: infra_internal/goma/client/windows-arm64
 )
 _extra_builder(
     "vm-aot-win-release-arm64",
     category = "vm|aot|war",
-    channels = ["try"],
     dimensions = [windows11, arm64, flutter_pool],
     goma = False,  # no such package: infra_internal/goma/client/windows-arm64
 )

From e9cb2b928c16ed42600aecbf18ee454e89232a94 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 11 Sep 2023 08:06:15 +0000
Subject: [PATCH 684/826] [infra] Add dart2wasm-linux-jscm-chrome

Also adds no_android to dart2wasm configurations.

Change-Id: I59414e1f3cd53700f77092a329f9bd67bbc654bc
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/324284
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 dart2wasm.star               | 14 ++++--
 generated/commit-queue.cfg   |  4 ++
 generated/cr-buildbucket.cfg | 86 ++++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      | 13 ++++++
 generated/luci-notify.cfg    | 10 +++++
 generated/luci-scheduler.cfg | 11 +++++
 6 files changed, 135 insertions(+), 3 deletions(-)

diff --git a/dart2wasm.star b/dart2wasm.star
index 9e33a253e039..81ba25f6c0e9 100644
--- a/dart2wasm.star
+++ b/dart2wasm.star
@@ -5,8 +5,9 @@
 Defines the dart2wasm builders.
 """
 
+load("//lib/cron.star", "cron")
 load("//lib/dart.star", "dart")
-load("//lib/defaults.star", "chrome", "emscripten")
+load("//lib/defaults.star", "chrome", "emscripten", "no_android")
 load("//lib/paths.star", "paths")
 
 dart.poller(
@@ -19,7 +20,7 @@ dart.ci_sandbox_builder(
     "dart2wasm-linux-d8",
     category = "d2w|d",
     channels = ["try"],
-    properties = emscripten,
+    properties = [emscripten, no_android],
     location_filters = paths.to_location_filters(paths.dart2wasm),
     triggered_by = ["dart2wasm-gitiles-trigger-%s"],
 )
@@ -28,7 +29,14 @@ dart.ci_sandbox_builder(
     "dart2wasm-linux-chrome",
     category = "d2w|c",
     channels = ["try"],
-    properties = [chrome, emscripten],
+    properties = [chrome, emscripten, no_android],
     location_filters = paths.to_location_filters(paths.dart2wasm),
     triggered_by = ["dart2wasm-gitiles-trigger-%s"],
 )
+
+cron.nightly_builder(
+    "dart2wasm-linux-jscm-chrome",
+    category = "d2w|cm",
+    channels = ["try"],
+    properties = [chrome, emscripten, no_android],
+)
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 42794b13f3e7..7923bda1461c 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -2237,6 +2237,10 @@ config_groups {
           path_regexp: "sdk/lib/_js_interop/.+"
         }
       }
+      builders {
+        name: "dart/try/dart2wasm-linux-jscm-chrome-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/ddc-canary-linux-chrome-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 509faa8aa92e..f23a117a7bbf 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -1678,6 +1678,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true,'
         '    "download_emscripten": true'
         '  },'
@@ -1718,6 +1719,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_emscripten": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -1730,6 +1732,47 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "dart2wasm-linux-jscm-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true,'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "ddc-canary-linux-chrome"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10770,6 +10813,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
         '    "download_chrome": true,'
         '    "download_emscripten": true'
         '  },'
@@ -10810,6 +10854,48 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2wasm-linux-jscm-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true,'
         '    "download_emscripten": true'
         '  },'
         '  "recipe": "dart/neo"'
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index a82bf0ebf1dc..0db44314f1d5 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -49,6 +49,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/dart2wasm-linux-chrome-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/dart2wasm-linux-jscm-chrome-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-linux-debug-x64-try"
   }
@@ -542,6 +545,11 @@ consoles {
     category: "d2w"
     short_name: "c"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-jscm-chrome"
+    category: "d2w"
+    short_name: "cm"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64"
     category: "vm|jit"
@@ -1186,6 +1194,11 @@ consoles {
     category: "d2w"
     short_name: "c"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-jscm-chrome"
+    category: "d2w"
+    short_name: "cm"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 7e528ae05c9a..a243d9351695 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -202,6 +202,16 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "dart2wasm-linux-jscm-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index d95a7adcb09d..ae44a6f8074e 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -424,6 +424,16 @@ job {
     builder: "dart2wasm-linux-d8"
   }
 }
+job {
+  id: "dart2wasm-linux-jscm-chrome"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "dart2wasm-linux-jscm-chrome"
+  }
+}
 job {
   id: "ddc-canary-linux-chrome"
   realm: "ci.sandbox"
@@ -2458,6 +2468,7 @@ trigger {
   id: "dart-nightly-trigger"
   realm: "ci"
   schedule: "0 5 * * *"
+  triggers: "dart2wasm-linux-jscm-chrome"
   triggers: "ddc-canary-linux-chrome"
   triggers: "front-end-nnbd-mac-release-x64"
   triggers: "front-end-nnbd-win-release-x64"

From 4d1f26d2a35a659fd961e22b56bfc50ffb647297 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Wed, 20 Sep 2023 17:12:59 +0000
Subject: [PATCH 685/826] [infra] Upgrade QEMU builders to Ubuntu-22.

Bug: https://github.com/dart-lang/sdk/issues/49791
Change-Id: I53f118c3ac7f57fcff2ccfd31311aefcd85acfc8
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/305000
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/cr-buildbucket.cfg | 20 ++++++++++----------
 lib/dart.star                |  5 +++--
 lib/defaults.star            |  2 ++
 vm.star                      |  8 ++++----
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index f23a117a7bbf..354624c8857a 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -7355,7 +7355,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7391,7 +7391,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7463,7 +7463,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7499,7 +7499,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7535,7 +7535,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7571,7 +7571,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7687,7 +7687,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13195,7 +13195,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13231,7 +13231,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13345,7 +13345,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
diff --git a/lib/dart.star b/lib/dart.star
index dc32aa482abb..517ef6555455 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -10,6 +10,7 @@ load(
     "//lib/defaults.star",
     "defaults",
     "focal",
+    "jammy",
     "linux",
     "mac",
     "windows",
@@ -74,7 +75,7 @@ def _with_goma(goma, dimensions, properties):
         goma_properties = {}
         goma_properties.update(_GOMA_RBE)
 
-        enable_ats = dimensions["os"] in (focal["os"], linux["os"])
+        enable_ats = dimensions["os"] in (focal["os"], jammy["os"], linux["os"])
 
         goma_properties["enable_ats"] = enable_ats
         updated_properties.setdefault("$build/goma", goma_properties)
@@ -221,7 +222,7 @@ def _builder(
             fail("builder %s should be a %s builder but was %s" % (name, expected_os, os))
 
     expect_os("-win", [windows["os"], windows11["os"]])
-    expect_os("-linux", [linux["os"], focal["os"]])
+    expect_os("-linux", [linux["os"], focal["os"], jammy["os"]])
     expect_os("-mac", mac["os"])
 
     cq_branches = ["main"] + [branch for branch in channels if branch != "try"]
diff --git a/lib/defaults.star b/lib/defaults.star
index 89f04ea98d66..19f6c8a77928 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -31,6 +31,7 @@ _SLOW_SHARDS = {"shard_timeout": (90 * time.minute) // time.second}
 _ARM64 = {"cpu": "arm64"}
 _MAC = {"os": "Mac"}
 _FOCAL = {"os": "Ubuntu-20"}
+_JAMMY = {"os": "Ubuntu-22"}
 _WINDOWS10 = {"os": "Windows-10"}
 _WINDOWS11 = {"os": "Windows-11"}
 
@@ -79,6 +80,7 @@ arm64 = _ARM64
 experimental = _EXPERIMENTAL
 flutter_pool = _FLUTTER_POOL
 focal = _FOCAL
+jammy = _JAMMY
 linux = _FOCAL
 mac = _MAC
 windows = _WINDOWS10
diff --git a/vm.star b/vm.star
index 3c07e80967f1..ea130b0f1356 100644
--- a/vm.star
+++ b/vm.star
@@ -12,8 +12,8 @@ load(
     "android_deps",
     "arm64",
     "flutter_pool",
-    "focal",
     "fuchsia_deps",
+    "jammy",
     "mac",
     "no_android",
     "slow_shards",
@@ -427,7 +427,7 @@ _nightly_builder(
     "vm-gcc-linux",
     category = "vm|misc|g",
     channels = ["try"],
-    dimensions = focal,
+    dimensions = jammy,
     execution_timeout = 5 * time.hour,
     goma = False,
     properties = {
@@ -479,12 +479,12 @@ _extra_builder(
 _extra_builder(
     "vm-ffi-qemu-linux-release-arm",
     category = "vm|ffi|qa",
-    dimensions = focal,
+    dimensions = jammy,
 )
 _extra_builder(
     "vm-ffi-qemu-linux-release-riscv64",
     category = "vm|ffi|qr",
-    dimensions = focal,
+    dimensions = jammy,
 )
 
 # vm|legacy|jit

From 17c03cf1f89a849f78d3e7ab8689b7ff653f19b9 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 25 Sep 2023 17:05:21 +0000
Subject: [PATCH 686/826] [infra] Define an AOT eager optimization builder.

Change-Id: I046b8f14461458ba55801cdd71304767b4064012
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/326723
Reviewed-by: Alexander Markov <alexmarkov@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/commit-queue.cfg   |  4 ++
 generated/cr-buildbucket.cfg | 73 +++++++++++++++++++++++++++++++++++-
 generated/luci-milo.cfg      | 21 +++++++++--
 generated/luci-notify.cfg    | 17 ++++++++-
 generated/luci-scheduler.cfg | 13 ++++++-
 generated/project.cfg        |  2 +-
 vm.star                      | 12 ++++--
 7 files changed, 131 insertions(+), 11 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 7923bda1461c..27c7bec6f2f2 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -2726,6 +2726,10 @@ config_groups {
         name: "dart/try/vm-aot-obfuscate-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-optimization-level-linux-release-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-tsan-linux-release-x64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 354624c8857a..d7e8082cbca5 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5697,6 +5697,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-optimization-level-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-tsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -6640,7 +6676,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
-      expiration_secs: 86400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12446,6 +12481,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-optimization-level-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-tsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 0db44314f1d5..09b0e96c0c52 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -172,6 +172,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-eager-optimization-linux-release-x64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-aot-optimization-level-linux-release-x64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-asan-linux-release-x64-try"
   }
@@ -753,12 +756,17 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-eager-optimization-linux-release-ia32"
     category: "vm|misc"
-    short_name: "o32"
+    short_name: "j"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-eager-optimization-linux-release-x64"
     category: "vm|misc"
-    short_name: "o64"
+    short_name: "j"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-optimization-level-linux-release-x64"
+    category: "vm|misc"
+    short_name: "a"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-asan-linux-release-x64"
@@ -1542,12 +1550,17 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-eager-optimization-linux-release-ia32"
     category: "vm|misc"
-    short_name: "o32"
+    short_name: "j"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-eager-optimization-linux-release-x64"
     category: "vm|misc"
-    short_name: "o64"
+    short_name: "j"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-optimization-level-linux-release-x64"
+    category: "vm|misc"
+    short_name: "a"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-asan-linux-release-x64"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index a243d9351695..7dfb74b1ffd0 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -665,6 +665,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-optimization-level-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -825,7 +838,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index ae44a6f8074e..88fbd15af4bd 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1174,6 +1174,16 @@ job {
     builder: "vm-aot-obfuscate-linux-release-x64"
   }
 }
+job {
+  id: "vm-aot-optimization-level-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-optimization-level-linux-release-x64"
+  }
+}
 job {
   id: "vm-aot-tsan-linux-release-x64"
   realm: "ci.sandbox"
@@ -2482,6 +2492,7 @@ trigger {
   triggers: "vm-aot-mac-product-arm64"
   triggers: "vm-aot-msan-linux-release-x64"
   triggers: "vm-aot-obfuscate-linux-release-x64"
+  triggers: "vm-aot-optimization-level-linux-release-x64"
   triggers: "vm-aot-tsan-linux-release-x64"
   triggers: "vm-aot-ubsan-linux-release-x64"
   triggers: "vm-aot-win-debug-x64c"
@@ -2489,6 +2500,7 @@ trigger {
   triggers: "vm-appjit-linux-product-x64"
   triggers: "vm-asan-linux-release-x64"
   triggers: "vm-eager-optimization-linux-release-ia32"
+  triggers: "vm-eager-optimization-linux-release-x64"
   triggers: "vm-gcc-linux"
   triggers: "vm-kernel-linux-debug-x64"
   triggers: "vm-kernel-linux-release-x64"
@@ -2531,7 +2543,6 @@ trigger {
   triggers: "vm-appjit-linux-debug-x64"
   triggers: "vm-appjit-linux-release-x64"
   triggers: "vm-checked-mac-release-arm64"
-  triggers: "vm-eager-optimization-linux-release-x64"
   triggers: "vm-ffi-android-debug-arm"
   triggers: "vm-ffi-android-debug-arm64c"
   triggers: "vm-ffi-android-product-arm"
diff --git a/generated/project.cfg b/generated/project.cfg
index 4e6a05dea676..76bea730fa13 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.39.14"
+  version: "1.39.15"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/vm.star b/vm.star
index ea130b0f1356..4c4532b52041 100644
--- a/vm.star
+++ b/vm.star
@@ -317,12 +317,18 @@ _nightly_builder(
 # vm|misc
 _nightly_builder(
     "vm-eager-optimization-linux-release-ia32",
-    category = "vm|misc|o32",
+    category = "vm|misc|j",
     channels = ["try"],
 )
-_low_priority_builder(
+_nightly_builder(
     "vm-eager-optimization-linux-release-x64",
-    category = "vm|misc|o64",
+    category = "vm|misc|j",
+    channels = ["try"],
+)
+_nightly_builder(
+    "vm-aot-optimization-level-linux-release-x64",
+    category = "vm|misc|a",
+    channels = ["try"],
 )
 
 def dart_vm_sanitizer_builder(name, **kwargs):

From 6710d97487107f7ee3273997403e0e5570b2595a Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Fri, 29 Sep 2023 16:01:39 +0000
Subject: [PATCH 687/826] [infra] Enable Linux ARM64 try jobs, step 2.

Change-Id: I7973cadd72cc1b29cbb2ccc990b0f23b8280e717
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/328383
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 generated/cr-buildbucket.cfg | 20 ++++++++------------
 generated/project.cfg        |  2 +-
 vm.star                      |  4 ++++
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index d7e8082cbca5..9f7a30e70c62 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5051,9 +5051,9 @@ buckets {
     builders {
       name: "vm-aot-linux-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5062,10 +5062,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -8117,9 +8115,9 @@ buckets {
     builders {
       name: "vm-linux-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8128,10 +8126,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
diff --git a/generated/project.cfg b/generated/project.cfg
index 76bea730fa13..d6483498cef3 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.39.15"
+  version: "1.39.19"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/vm.star b/vm.star
index 4c4532b52041..751e24d82de5 100644
--- a/vm.star
+++ b/vm.star
@@ -122,6 +122,8 @@ _extra_builder(
     "vm-linux-release-arm64",
     category = "vm|jit|a6",
     channels = [],
+    dimensions = [jammy, arm64],
+    goma = False,
     execution_timeout = 4 * time.hour,
     properties = {"shard_timeout": (120 * time.minute) // time.second},
 )
@@ -236,6 +238,8 @@ _nightly_builder(
     "vm-aot-linux-release-arm64",
     category = "vm|aot|a6",
     channels = [],
+    dimensions = [jammy, arm64],
+    goma = False,
     properties = {"shard_timeout": (120 * time.minute) // time.second},
 )
 _extra_builder(

From 4a60a8a09904d915871fcc99dab0346dfd9c1b0a Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Fri, 29 Sep 2023 17:39:27 +0000
Subject: [PATCH 688/826] Revert "[infra] Enable Linux ARM64 try jobs, step 2."

This reverts commit 6710d97487107f7ee3273997403e0e5570b2595a.

Reason for revert: no such package: dart/ci/builder_scripts/linux-arm64

Original change's description:
> [infra] Enable Linux ARM64 try jobs, step 2.
>
> Change-Id: I7973cadd72cc1b29cbb2ccc990b0f23b8280e717
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/328383
> Commit-Queue: Ryan Macnak <rmacnak@google.com>
> Reviewed-by: Jonas Termansen <sortie@google.com>

Change-Id: I303fd086075887226331c2bd2ffd2d554e8eb134
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/328762
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Alexander Aprelev <aam@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/cr-buildbucket.cfg | 20 ++++++++++++--------
 generated/project.cfg        |  2 +-
 vm.star                      |  4 ----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 9f7a30e70c62..d7e8082cbca5 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5051,9 +5051,9 @@ buckets {
     builders {
       name: "vm-aot-linux-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5062,8 +5062,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -8115,9 +8117,9 @@ buckets {
     builders {
       name: "vm-linux-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
+      dimensions: "os:Ubuntu-20"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8126,8 +8128,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
diff --git a/generated/project.cfg b/generated/project.cfg
index d6483498cef3..76bea730fa13 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.39.19"
+  version: "1.39.15"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/vm.star b/vm.star
index 751e24d82de5..4c4532b52041 100644
--- a/vm.star
+++ b/vm.star
@@ -122,8 +122,6 @@ _extra_builder(
     "vm-linux-release-arm64",
     category = "vm|jit|a6",
     channels = [],
-    dimensions = [jammy, arm64],
-    goma = False,
     execution_timeout = 4 * time.hour,
     properties = {"shard_timeout": (120 * time.minute) // time.second},
 )
@@ -238,8 +236,6 @@ _nightly_builder(
     "vm-aot-linux-release-arm64",
     category = "vm|aot|a6",
     channels = [],
-    dimensions = [jammy, arm64],
-    goma = False,
     properties = {"shard_timeout": (120 * time.minute) // time.second},
 )
 _extra_builder(

From acbecb20251afe150155238a5f5cc1f7676e8699 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Wed, 4 Oct 2023 21:30:57 +0000
Subject: [PATCH 689/826] [infra] Enable Linux ARM64 try jobs, step 2, again.

Change-Id: I74f85211748bcf0dd7eb703d97e1ccc3e0afec98
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/328764
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/cr-buildbucket.cfg | 20 ++++++++------------
 generated/project.cfg        |  2 +-
 vm.star                      |  4 ++++
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index d7e8082cbca5..9f7a30e70c62 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5051,9 +5051,9 @@ buckets {
     builders {
       name: "vm-aot-linux-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5062,10 +5062,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -8117,9 +8115,9 @@ buckets {
     builders {
       name: "vm-linux-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8128,10 +8126,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
diff --git a/generated/project.cfg b/generated/project.cfg
index 76bea730fa13..d6483498cef3 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.39.15"
+  version: "1.39.19"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/vm.star b/vm.star
index 4c4532b52041..751e24d82de5 100644
--- a/vm.star
+++ b/vm.star
@@ -122,6 +122,8 @@ _extra_builder(
     "vm-linux-release-arm64",
     category = "vm|jit|a6",
     channels = [],
+    dimensions = [jammy, arm64],
+    goma = False,
     execution_timeout = 4 * time.hour,
     properties = {"shard_timeout": (120 * time.minute) // time.second},
 )
@@ -236,6 +238,8 @@ _nightly_builder(
     "vm-aot-linux-release-arm64",
     category = "vm|aot|a6",
     channels = [],
+    dimensions = [jammy, arm64],
+    goma = False,
     properties = {"shard_timeout": (120 * time.minute) // time.second},
 )
 _extra_builder(

From beaa8841e998ffcbe86f5e83e53b5540b75c3011 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Thu, 5 Oct 2023 14:16:40 +0000
Subject: [PATCH 690/826] [infra] Enable Linux ARM64 try jobs, step 4.

Change-Id: If4c955909ccabab683b09b4afb637056acac6560
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/328400
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 generated/commit-queue.cfg   |  8 ++++
 generated/cr-buildbucket.cfg | 75 +++++++++++++++++++++++++++++++++---
 generated/luci-milo.cfg      |  6 +++
 vm.star                      |  7 +---
 4 files changed, 86 insertions(+), 10 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 27c7bec6f2f2..b271b90af350 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -2694,6 +2694,10 @@ config_groups {
         name: "dart/try/vm-aot-linux-product-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-linux-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-linux-release-simarm64-try"
         includable_only: true
@@ -2862,6 +2866,10 @@ config_groups {
         name: "dart/try/vm-linux-debug-x64c-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-linux-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-linux-release-ia32-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 9f7a30e70c62..344a0aaa8a42 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5072,8 +5072,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 7200'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 70
       build_numbers: YES
@@ -8136,11 +8135,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 7200'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      execution_timeout_secs: 14400
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12167,6 +12164,40 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-linux-release-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-linux-release-simarm64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13732,6 +13763,40 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-linux-release-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 09b0e96c0c52..52540199415e 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -73,6 +73,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-linux-debug-simriscv64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-linux-release-arm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-mac-debug-arm64-try"
   }
@@ -130,6 +133,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-linux-debug-simriscv64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-aot-linux-release-arm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-mac-release-arm64-try"
   }
diff --git a/vm.star b/vm.star
index 751e24d82de5..7b3e590cb5bf 100644
--- a/vm.star
+++ b/vm.star
@@ -121,11 +121,9 @@ _nightly_builder(
 _extra_builder(
     "vm-linux-release-arm64",
     category = "vm|jit|a6",
-    channels = [],
+    channels = ["try"],
     dimensions = [jammy, arm64],
     goma = False,
-    execution_timeout = 4 * time.hour,
-    properties = {"shard_timeout": (120 * time.minute) // time.second},
 )
 _extra_builder(
     "vm-mac-debug-arm64",
@@ -237,10 +235,9 @@ _nightly_builder(
 _nightly_builder(
     "vm-aot-linux-release-arm64",
     category = "vm|aot|a6",
-    channels = [],
+    channels = ["try"],
     dimensions = [jammy, arm64],
     goma = False,
-    properties = {"shard_timeout": (120 * time.minute) // time.second},
 )
 _extra_builder(
     "vm-aot-mac-release-arm64",

From e26a41dcd9c23a66b0079be7303109cd053edab2 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 9 Oct 2023 21:05:11 +0000
Subject: [PATCH 691/826] [infra] Remove Linux SIMARM64.

The real Linux ARM64 is now available with try jobs.

Change-Id: Iefef267d583e885c0d5a4078399579a61eed3776
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/328401
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/commit-queue.cfg   |  24 ---
 generated/cr-buildbucket.cfg | 288 -----------------------------------
 generated/luci-milo.cfg      |  46 ------
 generated/luci-notify.cfg    |  22 ---
 generated/luci-scheduler.cfg |  66 --------
 vm.star                      |   8 -
 6 files changed, 454 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index b271b90af350..50e51379f490 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -968,10 +968,6 @@ config_groups {
         name: "dart/try/vm-aot-linux-debug-simarm_x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-aot-linux-release-simarm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-aot-linux-release-simarm_x64-try"
         includable_only: true
@@ -1048,10 +1044,6 @@ config_groups {
         name: "dart/try/vm-linux-release-simarm-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-linux-release-simarm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-linux-release-x64-try"
         includable_only: true
@@ -2698,10 +2690,6 @@ config_groups {
         name: "dart/try/vm-aot-linux-release-arm64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-aot-linux-release-simarm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-aot-linux-release-simarm_x64-try"
         includable_only: true
@@ -2878,10 +2866,6 @@ config_groups {
         name: "dart/try/vm-linux-release-simarm-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-linux-release-simarm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-linux-release-x64-try"
         includable_only: true
@@ -3922,10 +3906,6 @@ config_groups {
         name: "dart/try/vm-aot-linux-debug-simarm_x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-aot-linux-release-simarm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-aot-linux-release-simarm_x64-try"
         includable_only: true
@@ -4002,10 +3982,6 @@ config_groups {
         name: "dart/try/vm-linux-release-simarm-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-linux-release-simarm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-linux-release-x64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 344a0aaa8a42..bb19eaf7dfa0 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5082,114 +5082,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-aot-linux-release-simarm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-aot-linux-release-simarm64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 60
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-aot-linux-release-simarm64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 60
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-aot-linux-release-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8289,114 +8181,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-linux-release-simarm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-linux-release-simarm64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 60
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-linux-release-simarm64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 60
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -12198,42 +11982,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-aot-linux-release-simarm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-aot-linux-release-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13869,42 +13617,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-linux-release-simarm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 52540199415e..e7b47589bebc 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -67,9 +67,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-linux-release-simarm-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-linux-release-simarm64-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-linux-debug-simriscv64-try"
   }
@@ -127,9 +124,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-linux-debug-x64-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-aot-linux-release-simarm64-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-linux-debug-simriscv64-try"
   }
@@ -584,11 +578,6 @@ consoles {
     category: "vm|jit"
     short_name: "ra"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64"
-    category: "vm|jit"
-    short_name: "ra6"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simriscv64"
     category: "vm|jit"
@@ -684,11 +673,6 @@ consoles {
     category: "vm|aot"
     short_name: "d"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-simarm64"
-    category: "vm|aot"
-    short_name: "ra6"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-debug-simriscv64"
     category: "vm|aot"
@@ -1378,11 +1362,6 @@ consoles {
     category: "vm|jit"
     short_name: "ra"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64"
-    category: "vm|jit"
-    short_name: "ra6"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simriscv64"
     category: "vm|jit"
@@ -1478,11 +1457,6 @@ consoles {
     category: "vm|aot"
     short_name: "d"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-simarm64"
-    category: "vm|aot"
-    short_name: "ra6"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-debug-simriscv64"
     category: "vm|aot"
@@ -1941,11 +1915,6 @@ consoles {
     category: "vm|jit"
     short_name: "ra"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64-beta"
-    category: "vm|jit"
-    short_name: "ra6"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-arm64-beta"
     category: "vm|jit"
@@ -2016,11 +1985,6 @@ consoles {
     category: "vm|aot"
     short_name: "ra"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-simarm64-beta"
-    category: "vm|aot"
-    short_name: "ra6"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-x64-beta"
     category: "vm|aot"
@@ -2295,11 +2259,6 @@ consoles {
     category: "vm|jit"
     short_name: "ra"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm64-stable"
-    category: "vm|jit"
-    short_name: "ra6"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-arm64-stable"
     category: "vm|jit"
@@ -2370,11 +2329,6 @@ consoles {
     category: "vm|aot"
     short_name: "ra"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-simarm64-stable"
-    category: "vm|aot"
-    short_name: "ra6"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-x64-stable"
     category: "vm|aot"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 7dfb74b1ffd0..7a9f5e173554 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -571,17 +571,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-aot-linux-release-simarm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1123,17 +1112,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-linux-release-simarm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 88fbd15af4bd..33bc37b2eee7 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1014,36 +1014,6 @@ job {
     builder: "vm-aot-linux-release-arm64"
   }
 }
-job {
-  id: "vm-aot-linux-release-simarm64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-aot-linux-release-simarm64"
-  }
-}
-job {
-  id: "vm-aot-linux-release-simarm64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-aot-linux-release-simarm64-beta"
-  }
-}
-job {
-  id: "vm-aot-linux-release-simarm64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-aot-linux-release-simarm64-stable"
-  }
-}
 job {
   id: "vm-aot-linux-release-simarm_x64"
   realm: "ci.sandbox"
@@ -1874,36 +1844,6 @@ job {
     builder: "vm-linux-release-simarm-stable"
   }
 }
-job {
-  id: "vm-linux-release-simarm64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-linux-release-simarm64"
-  }
-}
-job {
-  id: "vm-linux-release-simarm64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-linux-release-simarm64-beta"
-  }
-}
-job {
-  id: "vm-linux-release-simarm64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-linux-release-simarm64-stable"
-  }
-}
 job {
   id: "vm-linux-release-x64"
   realm: "ci.sandbox"
@@ -2311,7 +2251,6 @@ trigger {
   triggers: "vm-aot-android-release-arm64c-beta"
   triggers: "vm-aot-android-release-arm_x64-beta"
   triggers: "vm-aot-linux-debug-simarm_x64-beta"
-  triggers: "vm-aot-linux-release-simarm64-beta"
   triggers: "vm-aot-linux-release-simarm_x64-beta"
   triggers: "vm-aot-linux-release-x64-beta"
   triggers: "vm-aot-mac-release-x64-beta"
@@ -2331,7 +2270,6 @@ trigger {
   triggers: "vm-ffi-qemu-linux-release-riscv64-beta"
   triggers: "vm-linux-debug-x64-beta"
   triggers: "vm-linux-release-simarm-beta"
-  triggers: "vm-linux-release-simarm64-beta"
   triggers: "vm-linux-release-x64-beta"
   triggers: "vm-mac-debug-arm64-beta"
   triggers: "vm-mac-debug-x64-beta"
@@ -2429,7 +2367,6 @@ trigger {
   triggers: "vm-aot-android-release-arm64c-stable"
   triggers: "vm-aot-android-release-arm_x64-stable"
   triggers: "vm-aot-linux-debug-simarm_x64-stable"
-  triggers: "vm-aot-linux-release-simarm64-stable"
   triggers: "vm-aot-linux-release-simarm_x64-stable"
   triggers: "vm-aot-linux-release-x64-stable"
   triggers: "vm-aot-mac-release-x64-stable"
@@ -2449,7 +2386,6 @@ trigger {
   triggers: "vm-ffi-qemu-linux-release-riscv64-stable"
   triggers: "vm-linux-debug-x64-stable"
   triggers: "vm-linux-release-simarm-stable"
-  triggers: "vm-linux-release-simarm64-stable"
   triggers: "vm-linux-release-x64-stable"
   triggers: "vm-mac-debug-arm64-stable"
   triggers: "vm-mac-debug-x64-stable"
@@ -2532,7 +2468,6 @@ trigger {
   triggers: "vm-aot-android-release-arm64c"
   triggers: "vm-aot-android-release-arm_x64"
   triggers: "vm-aot-linux-debug-simarm_x64"
-  triggers: "vm-aot-linux-release-simarm64"
   triggers: "vm-aot-linux-release-simarm_x64"
   triggers: "vm-aot-linux-release-x64"
   triggers: "vm-aot-mac-release-arm64"
@@ -2556,7 +2491,6 @@ trigger {
   triggers: "vm-linux-debug-x64"
   triggers: "vm-linux-release-arm64"
   triggers: "vm-linux-release-simarm"
-  triggers: "vm-linux-release-simarm64"
   triggers: "vm-linux-release-x64"
   triggers: "vm-mac-debug-arm64"
   triggers: "vm-mac-release-arm64"
diff --git a/vm.star b/vm.star
index 7b3e590cb5bf..67fb551b74a8 100644
--- a/vm.star
+++ b/vm.star
@@ -109,10 +109,6 @@ _extra_builder(
     "vm-linux-release-simarm",
     category = "vm|jit|ra",
 )
-_extra_builder(
-    "vm-linux-release-simarm64",
-    category = "vm|jit|ra6",
-)
 _nightly_builder(
     "vm-linux-debug-simriscv64",
     category = "vm|jit|rv",
@@ -222,10 +218,6 @@ _nightly_builder(
     channels = ["try"],
     properties = slow_shards,
 )
-_extra_builder(
-    "vm-aot-linux-release-simarm64",
-    category = "vm|aot|ra6",
-)
 _nightly_builder(
     "vm-aot-linux-debug-simriscv64",
     category = "vm|aot|rv",

From bbe6d9a2bfd8335af6df74bd9f31072d9d2d4272 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Fri, 13 Oct 2023 15:09:37 +0000
Subject: [PATCH 692/826] [infra] Enable Linux ARM64 testing on release
 channels.

Change-Id: Id0c17f5181e0e485c503d2f31abd381235af0341
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/330033
Reviewed-by: Jonas Termansen <sortie@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/commit-queue.cfg   |  16 +++++
 generated/cr-buildbucket.cfg | 136 +++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      |  20 ++++++
 generated/luci-scheduler.cfg |  44 ++++++++++++
 generated/project.cfg        |   2 +-
 vm.star                      |   2 -
 6 files changed, 217 insertions(+), 3 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 50e51379f490..a9fe6a28bfcb 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -968,6 +968,10 @@ config_groups {
         name: "dart/try/vm-aot-linux-debug-simarm_x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-linux-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-linux-release-simarm_x64-try"
         includable_only: true
@@ -1040,6 +1044,10 @@ config_groups {
         name: "dart/try/vm-linux-debug-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-linux-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-linux-release-simarm-try"
         includable_only: true
@@ -3906,6 +3914,10 @@ config_groups {
         name: "dart/try/vm-aot-linux-debug-simarm_x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-linux-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-linux-release-simarm_x64-try"
         includable_only: true
@@ -3978,6 +3990,10 @@ config_groups {
         name: "dart/try/vm-linux-debug-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-linux-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-linux-release-simarm-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index bb19eaf7dfa0..d62d8fd95aaa 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5082,6 +5082,74 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-linux-release-arm64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 80
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-aot-linux-release-arm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 80
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-linux-release-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8037,6 +8105,74 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-linux-release-arm64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-linux-release-arm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index e7b47589bebc..e6a58e217355 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -1915,6 +1915,11 @@ consoles {
     category: "vm|jit"
     short_name: "ra"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-arm64-beta"
+    category: "vm|jit"
+    short_name: "a6"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-arm64-beta"
     category: "vm|jit"
@@ -1985,6 +1990,11 @@ consoles {
     category: "vm|aot"
     short_name: "ra"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-arm64-beta"
+    category: "vm|aot"
+    short_name: "a6"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-x64-beta"
     category: "vm|aot"
@@ -2259,6 +2269,11 @@ consoles {
     category: "vm|jit"
     short_name: "ra"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-arm64-stable"
+    category: "vm|jit"
+    short_name: "a6"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-arm64-stable"
     category: "vm|jit"
@@ -2329,6 +2344,11 @@ consoles {
     category: "vm|aot"
     short_name: "ra"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-arm64-stable"
+    category: "vm|aot"
+    short_name: "a6"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-x64-stable"
     category: "vm|aot"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 33bc37b2eee7..f65868608cdb 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1014,6 +1014,26 @@ job {
     builder: "vm-aot-linux-release-arm64"
   }
 }
+job {
+  id: "vm-aot-linux-release-arm64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-linux-release-arm64-beta"
+  }
+}
+job {
+  id: "vm-aot-linux-release-arm64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-linux-release-arm64-stable"
+  }
+}
 job {
   id: "vm-aot-linux-release-simarm_x64"
   realm: "ci.sandbox"
@@ -1804,6 +1824,26 @@ job {
     builder: "vm-linux-release-arm64"
   }
 }
+job {
+  id: "vm-linux-release-arm64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-linux-release-arm64-beta"
+  }
+}
+job {
+  id: "vm-linux-release-arm64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-linux-release-arm64-stable"
+  }
+}
 job {
   id: "vm-linux-release-ia32"
   realm: "ci.sandbox"
@@ -2269,6 +2309,7 @@ trigger {
   triggers: "vm-ffi-qemu-linux-release-arm-beta"
   triggers: "vm-ffi-qemu-linux-release-riscv64-beta"
   triggers: "vm-linux-debug-x64-beta"
+  triggers: "vm-linux-release-arm64-beta"
   triggers: "vm-linux-release-simarm-beta"
   triggers: "vm-linux-release-x64-beta"
   triggers: "vm-mac-debug-arm64-beta"
@@ -2385,6 +2426,7 @@ trigger {
   triggers: "vm-ffi-qemu-linux-release-arm-stable"
   triggers: "vm-ffi-qemu-linux-release-riscv64-stable"
   triggers: "vm-linux-debug-x64-stable"
+  triggers: "vm-linux-release-arm64-stable"
   triggers: "vm-linux-release-simarm-stable"
   triggers: "vm-linux-release-x64-stable"
   triggers: "vm-mac-debug-arm64-stable"
@@ -2425,6 +2467,8 @@ trigger {
   triggers: "vm-aot-linux-debug-x64c"
   triggers: "vm-aot-linux-product-x64"
   triggers: "vm-aot-linux-release-arm64"
+  triggers: "vm-aot-linux-release-arm64-beta"
+  triggers: "vm-aot-linux-release-arm64-stable"
   triggers: "vm-aot-mac-product-arm64"
   triggers: "vm-aot-msan-linux-release-x64"
   triggers: "vm-aot-obfuscate-linux-release-x64"
diff --git a/generated/project.cfg b/generated/project.cfg
index d6483498cef3..285018079ddb 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.39.19"
+  version: "1.39.20"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/vm.star b/vm.star
index 67fb551b74a8..f5ab8ff75824 100644
--- a/vm.star
+++ b/vm.star
@@ -117,7 +117,6 @@ _nightly_builder(
 _extra_builder(
     "vm-linux-release-arm64",
     category = "vm|jit|a6",
-    channels = ["try"],
     dimensions = [jammy, arm64],
     goma = False,
 )
@@ -227,7 +226,6 @@ _nightly_builder(
 _nightly_builder(
     "vm-aot-linux-release-arm64",
     category = "vm|aot|a6",
-    channels = ["try"],
     dimensions = [jammy, arm64],
     goma = False,
 )

From 02d8d3c67d29175e825e74615b8991fb784ca546 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Fri, 13 Oct 2023 16:10:36 +0000
Subject: [PATCH 693/826] [infra] Run dart-sdk-linux-arm64-try on arm64 to
 match the normal builder.

Bug: b/302156166
Change-Id: Id25b7a577debb46617cd799baaef7d0204d3d592
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/330165
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 generated/cr-buildbucket.cfg | 7 ++-----
 sdk.star                     | 5 ++---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index d62d8fd95aaa..6583b163ed63 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -9981,9 +9981,9 @@ buckets {
     builders {
       name: "dart-sdk-linux-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9997,9 +9997,6 @@ buckets {
         '    "server_host": "goma.chromium.org",'
         '    "use_luci_auth": true'
         '  },'
-        '  "$dart/build": {'
-        '    "timeout": 6000'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
diff --git a/sdk.star b/sdk.star
index 99b692a72388..fa83b6334e12 100644
--- a/sdk.star
+++ b/sdk.star
@@ -9,6 +9,7 @@ load("//lib/dart.star", "dart")
 load(
     "//lib/defaults.star",
     "arm64",
+    "jammy",
     "mac",
     "no_android",
     "windows",
@@ -69,10 +70,8 @@ dart.try_builder(
 
 dart.try_builder(
     "dart-sdk-linux-arm64",
+    dimensions = [jammy, arm64],
     properties = {
-        "$dart/build": {
-            "timeout": 100 * 60,  # 100 minutes,
-        },
         "archs": ["arm", "arm64"],
         "disable_bcid": True,
     },

From 593562b31460abcf36d19c15aac09a058f8003e5 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 16 Oct 2023 17:04:45 +0000
Subject: [PATCH 694/826] [infra] Disable Goma on dart-sdk-linux-arm64-try.

Change-Id: I54f485fba6d0502a664293c9bf343dbb167de701
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/330560
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/cr-buildbucket.cfg | 6 ++----
 sdk.star                     | 1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 6583b163ed63..a40253c61d75 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -9992,10 +9992,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
diff --git a/sdk.star b/sdk.star
index fa83b6334e12..3e841c34c6f1 100644
--- a/sdk.star
+++ b/sdk.star
@@ -77,6 +77,7 @@ dart.try_builder(
     },
     location_filters = paths.to_location_filters(paths.release),
     recipe = "release/sdk",
+    goma = False,  # no such package: infra_internal/goma/client/linux-arm64
 )
 
 dart.try_builder(

From b449c1bd78cc94af303a628f09db741756bda297 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Wed, 18 Oct 2023 14:37:05 +0000
Subject: [PATCH 695/826] [infra] Move vm-ffi-qemu-linux-release-riscv64 to
 ARM64.

The ARM64 pool is both faster and has higher capacity.

This builder was already unable to use Goma because Fuchsia Clang is missing linux-riscv64 support.

Change-Id: Ic9cea8494cd3ea98bde62a29e9386eb524d0457d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/330950
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 generated/cr-buildbucket.cfg | 32 ++++++++++++--------------------
 vm.star                      |  3 ++-
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index a40253c61d75..33ee5d7a7bf0 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -7489,7 +7489,7 @@ buckets {
     builders {
       name: "vm-ffi-qemu-linux-release-riscv64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
@@ -7500,10 +7500,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -7525,7 +7523,7 @@ buckets {
     builders {
       name: "vm-ffi-qemu-linux-release-riscv64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
@@ -7536,10 +7534,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -7561,7 +7557,7 @@ buckets {
     builders {
       name: "vm-ffi-qemu-linux-release-riscv64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
@@ -7572,10 +7568,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -13206,7 +13200,7 @@ buckets {
     builders {
       name: "vm-ffi-qemu-linux-release-riscv64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
@@ -13217,10 +13211,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
diff --git a/vm.star b/vm.star
index f5ab8ff75824..18999d7e6d8a 100644
--- a/vm.star
+++ b/vm.star
@@ -481,7 +481,8 @@ _extra_builder(
 _extra_builder(
     "vm-ffi-qemu-linux-release-riscv64",
     category = "vm|ffi|qr",
-    dimensions = jammy,
+    dimensions = [jammy, arm64],
+    goma = False,  # no such package: infra_internal/goma/client/linux-arm64
 )
 
 # vm|legacy|jit

From 000e3b964121143eabdf589469174bcf4191d5d7 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 24 Oct 2023 17:53:09 +0000
Subject: [PATCH 696/826] [infra] Move Windows ARM64 builders to
 luci.flutter.prod.

At the time these builders were setup, all the Windows ARM64 machines were in luci.flutter.staging.

Change-Id: Ibe6057f3359ac2095fc57ea00f9493a9fdc92226
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/331845
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Godofredo Contreras <godofredoc@google.com>
---
 generated/commit-queue.cfg   |  2 +-
 generated/cr-buildbucket.cfg | 34 +++++++++++++++++-----------------
 generated/luci-logdog.cfg    |  2 +-
 generated/luci-milo.cfg      |  2 +-
 generated/luci-notify.cfg    |  2 +-
 generated/luci-scheduler.cfg |  2 +-
 generated/project.cfg        |  4 ++--
 generated/realms.cfg         |  2 +-
 lib/dart.star                |  4 ++--
 lib/defaults.star            |  2 +-
 10 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index a9fe6a28bfcb..f9871d535e5b 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -2,7 +2,7 @@
 # Do not modify manually.
 #
 # For the schema of this file, see Config message:
-#   https://luci-config.appspot.com/schemas/projects:commit-queue.cfg
+#   https://config.luci.app/schemas/projects:commit-queue.cfg
 
 cq_status_host: "chromium-cq-status.appspot.com"
 submit_options {
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 33ee5d7a7bf0..b4750e9b5e5e 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -2,7 +2,7 @@
 # Do not modify manually.
 #
 # For the schema of this file, see BuildbucketCfg message:
-#   https://luci-config.appspot.com/schemas/projects:buildbucket.cfg
+#   https://config.luci.app/schemas/projects:buildbucket.cfg
 
 buckets {
   name: "ci"
@@ -5767,7 +5767,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
+      dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
@@ -5800,7 +5800,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
+      dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
@@ -5833,7 +5833,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
+      dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
@@ -5939,7 +5939,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
+      dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
@@ -5972,7 +5972,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
+      dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
@@ -6005,7 +6005,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
+      dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
@@ -9227,7 +9227,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
+      dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
@@ -9260,7 +9260,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
+      dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
@@ -9293,7 +9293,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
+      dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
@@ -9473,7 +9473,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
+      dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
@@ -9506,7 +9506,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
+      dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
@@ -9539,7 +9539,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
+      dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
@@ -12494,7 +12494,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
+      dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
@@ -12600,7 +12600,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
+      dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
@@ -14240,7 +14240,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
+      dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
@@ -14346,7 +14346,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
+      dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
diff --git a/generated/luci-logdog.cfg b/generated/luci-logdog.cfg
index adc75bef4980..01a391261d5a 100644
--- a/generated/luci-logdog.cfg
+++ b/generated/luci-logdog.cfg
@@ -2,7 +2,7 @@
 # Do not modify manually.
 #
 # For the schema of this file, see ProjectConfig message:
-#   https://luci-config.appspot.com/schemas/projects:luci-logdog.cfg
+#   https://config.luci.app/schemas/projects:luci-logdog.cfg
 
 reader_auth_groups: "all"
 writer_auth_groups: "luci-logdog-chromium-writers"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index e6a58e217355..28988f034f5e 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -2,7 +2,7 @@
 # Do not modify manually.
 #
 # For the schema of this file, see Project message:
-#   https://luci-config.appspot.com/schemas/projects:luci-milo.cfg
+#   https://config.luci.app/schemas/projects:luci-milo.cfg
 
 consoles {
   id: "cq"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 7a9f5e173554..83982624b3cd 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -2,7 +2,7 @@
 # Do not modify manually.
 #
 # For the schema of this file, see ProjectConfig message:
-#   https://luci-config.appspot.com/schemas/projects:luci-notify.cfg
+#   https://config.luci.app/schemas/projects:luci-notify.cfg
 
 notifiers {
   notifications {
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index f65868608cdb..285b3742966b 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -2,7 +2,7 @@
 # Do not modify manually.
 #
 # For the schema of this file, see ProjectConfig message:
-#   https://luci-config.appspot.com/schemas/projects:luci-scheduler.cfg
+#   https://config.luci.app/schemas/projects:luci-scheduler.cfg
 
 job {
   id: "analyzer-analysis-server-linux"
diff --git a/generated/project.cfg b/generated/project.cfg
index 285018079ddb..7729f8331733 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -2,12 +2,12 @@
 # Do not modify manually.
 #
 # For the schema of this file, see ProjectCfg message:
-#   https://luci-config.appspot.com/schemas/projects:project.cfg
+#   https://config.luci.app/schemas/projects:project.cfg
 
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.39.20"
+  version: "1.40.0"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/generated/realms.cfg b/generated/realms.cfg
index d3ca10bdc43e..22c2173c2ca8 100644
--- a/generated/realms.cfg
+++ b/generated/realms.cfg
@@ -2,7 +2,7 @@
 # Do not modify manually.
 #
 # For the schema of this file, see RealmsCfg message:
-#   https://luci-config.appspot.com/schemas/projects:realms.cfg
+#   https://config.luci.app/schemas/projects:realms.cfg
 
 realms {
   name: "@root"
diff --git a/lib/dart.star b/lib/dart.star
index 517ef6555455..d2770f684485 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -124,7 +124,7 @@ def _try_builder(
 
     # TODO(https://github.com/flutter/flutter/issues/127691): Remove filtering
     # of host_class.
-    if dimensions["pool"] == "luci.flutter.staging":
+    if dimensions["pool"] == "luci.flutter.prod":
         dimensions.pop("host_class")
     properties = defaults.properties(properties)
     builder_properties = _with_goma(goma, dimensions, properties)
@@ -211,7 +211,7 @@ def _builder(
 
     # TODO(https://github.com/flutter/flutter/issues/127691): Remove filtering
     # of host_class.
-    if dimensions["pool"] == "luci.flutter.staging":
+    if dimensions["pool"] == "luci.flutter.prod":
         dimensions.pop("host_class")
     properties = defaults.properties(properties)
 
diff --git a/lib/defaults.star b/lib/defaults.star
index 19f6c8a77928..45be0ab1b39e 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -35,7 +35,7 @@ _JAMMY = {"os": "Ubuntu-22"}
 _WINDOWS10 = {"os": "Windows-10"}
 _WINDOWS11 = {"os": "Windows-11"}
 
-_FLUTTER_POOL = {"pool": "luci.flutter.staging"}
+_FLUTTER_POOL = {"pool": "luci.flutter.prod"}
 _EXPERIMENTAL = {"host_class": "experimental"}
 
 def _union(x, overrides):

From 606612aa979b15f3c844b95f4fb0d3e2bcfb3eca Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 30 Oct 2023 23:57:26 +0000
Subject: [PATCH 697/826] [infra] UBSAN works fine with Goma/sysroot.

Change-Id: I215babb663fbcbeda6ab2d17da3bf392bb43daaf
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/332447
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 24 ++++++++++++++++--------
 vm.star                      |  6 ++----
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index b4750e9b5e5e..f22320179c25 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5741,8 +5741,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -9201,8 +9203,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -12468,8 +12472,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -14214,8 +14220,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
diff --git a/vm.star b/vm.star
index 18999d7e6d8a..8346aab3e9ee 100644
--- a/vm.star
+++ b/vm.star
@@ -345,8 +345,7 @@ dart_vm_sanitizer_builder(
 dart_vm_sanitizer_builder(
     "vm-ubsan-linux-release-x64",
     category = "vm|misc|sanitizer|u",
-    goma = False,
-)  # ubsan is not compatible with our sysroot.
+)
 dart_vm_sanitizer_builder(
     "vm-aot-asan-linux-release-x64",
     category = "vm|misc|sanitizer|a",
@@ -362,8 +361,7 @@ dart_vm_sanitizer_builder(
 dart_vm_sanitizer_builder(
     "vm-aot-ubsan-linux-release-x64",
     category = "vm|misc|sanitizer|u",
-    goma = False,
-)  # ubsan is not compatible with our sysroot.
+)
 _nightly_builder(
     "vm-reload-linux-debug-x64",
     category = "vm|misc|reload|d",

From ab05b994445acd6d275dd30374654378af002a38 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 31 Oct 2023 11:10:56 +0000
Subject: [PATCH 698/826] [infra] Remove obsolete dart.use_update_scripts
 experiment

Change-Id: Id0ef73cba638ade7b0fe9016d31d57819acfb916
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/332980
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Auto-Submit: Alexander Thomas <athom@google.com>
---
 analyzer.star                |  1 -
 generated/cr-buildbucket.cfg | 56 ------------------------------------
 pkg.star                     |  2 --
 vm.star                      |  1 -
 4 files changed, 60 deletions(-)

diff --git a/analyzer.star b/analyzer.star
index c5fc1a86d3d9..6b8ce7fa7854 100644
--- a/analyzer.star
+++ b/analyzer.star
@@ -42,5 +42,4 @@ dart.ci_sandbox_builder(
     category = "analyzer|w",
     channels = dart.channels,
     dimensions = windows,
-    experiments = {"dart.use_update_script": 100},
 )
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index f22320179c25..727cdab60256 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -385,10 +385,6 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
@@ -425,10 +421,6 @@ buckets {
       priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
@@ -465,10 +457,6 @@ buckets {
       priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
@@ -4251,10 +4239,6 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
@@ -4382,10 +4366,6 @@ buckets {
       priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
@@ -4425,10 +4405,6 @@ buckets {
       priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
@@ -4468,10 +4444,6 @@ buckets {
       priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
@@ -6471,10 +6443,6 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
@@ -6516,10 +6484,6 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
@@ -6561,10 +6525,6 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
@@ -9885,10 +9845,6 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
@@ -11601,10 +11557,6 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
@@ -11688,10 +11640,6 @@ buckets {
       priority: 30
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
@@ -12852,10 +12800,6 @@ buckets {
       }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "dart.use_update_script"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
diff --git a/pkg.star b/pkg.star
index 463bf054cae0..a94c281746e6 100644
--- a/pkg.star
+++ b/pkg.star
@@ -34,14 +34,12 @@ dart.ci_sandbox_builder(
     channels = ["try"],
     dimensions = [mac, arm64],
     properties = [chrome, no_android],
-    experiments = {"dart.use_update_script": 100},
 )
 dart.ci_sandbox_builder(
     "pkg-win-release",
     category = "pkg|w",
     dimensions = windows,
     properties = chrome,
-    experiments = {"dart.use_update_script": 100},
 )
 dart.ci_sandbox_builder(
     "pkg-linux-debug",
diff --git a/vm.star b/vm.star
index 8346aab3e9ee..ae4ef23f7531 100644
--- a/vm.star
+++ b/vm.star
@@ -144,7 +144,6 @@ _extra_builder(
     "vm-checked-mac-release-arm64",
     category = "vm|jit|rc",
     dimensions = [mac, arm64],
-    experiments = {"dart.use_update_script": 100},
 )
 _builder(
     "vm-mac-release-x64",

From 1d2c91a8ea2d693151f09f94b951e509948a6f5a Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 31 Oct 2023 18:25:16 +0000
Subject: [PATCH 699/826] [infra] Reduce varieties of VM builders.

 - vm-{mac,windows}-{debug,release}-x64 reduced from triggering on all commits to triggering on VM commits
 - vm-fuchsia-release-{x64,arm64} increased from low priority to normal priority

This leaves only builders triggered by VM commits and builders triggered nightly.

Change-Id: I8bf18b1841830cf09523dbe5137101c25b10cfd1
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/332744
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg |   6 +--
 generated/luci-scheduler.cfg |   8 +--
 vm.star                      | 100 ++++++++++++++++-------------------
 3 files changed, 51 insertions(+), 63 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 727cdab60256..e4806a34f265 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -7581,8 +7581,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      expiration_secs: 86400
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -7621,8 +7620,7 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
-      expiration_secs: 86400
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 285b3742966b..27cb5b2d90d8 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -2362,10 +2362,6 @@ trigger {
   triggers: "pkg-mac-release"
   triggers: "pkg-mac-release-arm64"
   triggers: "pkg-win-release"
-  triggers: "vm-mac-debug-x64"
-  triggers: "vm-mac-release-x64"
-  triggers: "vm-win-debug-x64"
-  triggers: "vm-win-release-x64"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/main"
@@ -2537,9 +2533,13 @@ trigger {
   triggers: "vm-linux-release-simarm"
   triggers: "vm-linux-release-x64"
   triggers: "vm-mac-debug-arm64"
+  triggers: "vm-mac-debug-x64"
   triggers: "vm-mac-release-arm64"
+  triggers: "vm-mac-release-x64"
   triggers: "vm-win-debug-arm64"
+  triggers: "vm-win-debug-x64"
   triggers: "vm-win-release-arm64"
+  triggers: "vm-win-release-x64"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/main"
diff --git a/vm.star b/vm.star
index ae4ef23f7531..7d428303d920 100644
--- a/vm.star
+++ b/vm.star
@@ -21,7 +21,6 @@ load(
     "windows11",
 )
 load("//lib/paths.star", "paths")
-load("//lib/priority.star", "priority")
 
 _postponed_alt_console_entries = []
 
@@ -32,41 +31,30 @@ luci.notifier(
     notify_emails = ["dart-vm-team-breakages@google.com"],
 )
 
-def _builder(name, category = None, **kwargs):
-    dart.ci_sandbox_builder(name, category = category, **kwargs)
-    _postponed_alt_console_entry(name, category)
-
-def _extra_builder(name, on_cq = False, location_filters = None, **kwargs):
+def _vm_builder(name, category = None, on_cq = False, location_filters = None, **kwargs):
     """
     Creates a Dart builder that is only triggered by VM commits.
 
     Args:
         name: The builder name.
+        category: The column heading for the builder on a console.
         on_cq: Whether the build is added to the default set of CQ tryjobs.
         location_filters: Locations that trigger this builder.
         **kwargs: Extra arguments are passed on to dart_ci_sandbox_builder.
     """
-    triggered_by = ["dart-vm-gitiles-trigger-%s"]
     if on_cq and not location_filters:
-        # Don't add extra builders to the default CQ, trigger only on VM paths.
+        # Don't add VM builders to the default CQ, trigger only on VM paths.
         location_filters = paths.to_location_filters(paths.vm)
         on_cq = False
-    _builder(
+    dart.ci_sandbox_builder(
         name,
-        triggered_by = triggered_by,
+        category = category,
+        triggered_by = ["dart-vm-gitiles-trigger-%s"],
         on_cq = on_cq,
         location_filters = location_filters,
         **kwargs
     )
-
-def _low_priority_builder(name, **kwargs):
-    _extra_builder(
-        name,
-        channels = ["try"],
-        priority = priority.low,
-        expiration_timeout = time.day,
-        **kwargs
-    )
+    _postponed_alt_console_entry(name, category)
 
 def _nightly_builder(name, category, **kwargs):
     cron.nightly_builder(name, category = category, notifies = "dart-vm-team", **kwargs)
@@ -86,11 +74,11 @@ def add_postponed_alt_console_entries():
         luci.console_view_entry(console_view = "alt", **entry)
 
 # vm|jit
-_extra_builder(
+_vm_builder(
     "vm-linux-debug-x64",
     category = "vm|jit|d",
 )
-_extra_builder(
+_vm_builder(
     "vm-linux-release-x64",
     category = "vm|jit|r",
 )
@@ -105,7 +93,7 @@ _nightly_builder(
     category = "vm|jit|r3",
     channels = ["try"],
 )
-_extra_builder(
+_vm_builder(
     "vm-linux-release-simarm",
     category = "vm|jit|ra",
 )
@@ -114,38 +102,38 @@ _nightly_builder(
     category = "vm|jit|rv",
     channels = ["try"],
 )
-_extra_builder(
+_vm_builder(
     "vm-linux-release-arm64",
     category = "vm|jit|a6",
     dimensions = [jammy, arm64],
     goma = False,
 )
-_extra_builder(
+_vm_builder(
     "vm-mac-debug-arm64",
     category = "vm|jit|m1d",
     dimensions = [mac, arm64],
     properties = [no_android, slow_shards],
     on_cq = True,
 )
-_builder(
+_vm_builder(
     "vm-mac-debug-x64",
     category = "vm|jit|md",
     dimensions = mac,
     properties = slow_shards,
 )
-_extra_builder(
+_vm_builder(
     "vm-mac-release-arm64",
     category = "vm|jit|m1r",
     dimensions = [mac, arm64],
     properties = no_android,
     on_cq = True,
 )
-_extra_builder(
+_vm_builder(
     "vm-checked-mac-release-arm64",
     category = "vm|jit|rc",
     dimensions = [mac, arm64],
 )
-_builder(
+_vm_builder(
     "vm-mac-release-x64",
     category = "vm|jit|mr",
     dimensions = mac,
@@ -156,24 +144,24 @@ _nightly_builder(
     channels = ["try"],
     dimensions = windows,
 )
-_builder(
+_vm_builder(
     "vm-win-debug-x64",
     category = "vm|jit|wd",
     properties = slow_shards,
     dimensions = windows,
 )
-_builder(
+_vm_builder(
     "vm-win-release-x64",
     category = "vm|jit|wr",
     dimensions = windows,
 )
-_extra_builder(
+_vm_builder(
     "vm-win-debug-arm64",
     category = "vm|jit|wad",
     dimensions = [windows11, arm64, flutter_pool],
     goma = False,  # no such package: infra_internal/goma/client/windows-arm64
 )
-_extra_builder(
+_vm_builder(
     "vm-win-release-arm64",
     category = "vm|jit|war",
     dimensions = [windows11, arm64, flutter_pool],
@@ -181,12 +169,12 @@ _extra_builder(
 )
 
 # vm|appjit
-_extra_builder(
+_vm_builder(
     "vm-appjit-linux-debug-x64",
     category = "vm|appjit|d",
     properties = slow_shards,
 )
-_extra_builder(
+_vm_builder(
     "vm-appjit-linux-release-x64",
     category = "vm|appjit|r",
 )
@@ -197,16 +185,16 @@ _nightly_builder(
 )
 
 # vm|aot
-_extra_builder(
+_vm_builder(
     "vm-aot-linux-release-x64",
     category = "vm|aot|r",
 )
-_extra_builder(
+_vm_builder(
     "vm-aot-linux-debug-simarm_x64",
     category = "vm|aot|da",
     properties = slow_shards,
 )
-_extra_builder(
+_vm_builder(
     "vm-aot-linux-release-simarm_x64",
     category = "vm|aot|ra",
 )
@@ -228,14 +216,14 @@ _nightly_builder(
     dimensions = [jammy, arm64],
     goma = False,
 )
-_extra_builder(
+_vm_builder(
     "vm-aot-mac-release-arm64",
     category = "vm|aot|m1",
     channels = ["try"],
     dimensions = [mac, arm64],
     properties = [no_android, slow_shards],
 )
-_extra_builder(
+_vm_builder(
     "vm-aot-mac-release-x64",
     category = "vm|aot|m",
     # The x64 Mac pool contains a mix of 4- and 8-core machines. This build
@@ -243,18 +231,18 @@ _extra_builder(
     dimensions = [mac, {"cores": "8"}],
     properties = slow_shards,
 )
-_extra_builder(
+_vm_builder(
     "vm-aot-win-release-x64",
     category = "vm|aot|wr",
     dimensions = windows,
 )
-_extra_builder(
+_vm_builder(
     "vm-aot-win-debug-arm64",
     category = "vm|aot|wad",
     dimensions = [windows11, arm64, flutter_pool],
     goma = False,  # no such package: infra_internal/goma/client/windows-arm64
 )
-_extra_builder(
+_vm_builder(
     "vm-aot-win-release-arm64",
     category = "vm|aot|war",
     dimensions = [windows11, arm64, flutter_pool],
@@ -262,12 +250,12 @@ _extra_builder(
 )
 
 # vm|aot|android
-_extra_builder(
+_vm_builder(
     "vm-aot-android-release-arm_x64",
     category = "vm|aot|android|a32",
     properties = [android_deps, slow_shards],
 )
-_extra_builder(
+_vm_builder(
     "vm-aot-android-release-arm64c",
     category = "vm|aot|android|a64",
     properties = [android_deps, slow_shards],
@@ -405,14 +393,16 @@ _nightly_builder(
     dimensions = windows,
     properties = slow_shards,
 )
-_low_priority_builder(
+_vm_builder(
     "vm-fuchsia-release-arm64",
     category = "vm|misc|f",
+    channels = ["try"],
     properties = [fuchsia_deps],
 )
-_low_priority_builder(
+_vm_builder(
     "vm-fuchsia-release-x64",
     category = "vm|misc|f",
+    channels = ["try"],
     properties = [fuchsia_deps],
 )
 
@@ -440,42 +430,42 @@ _nightly_builder(
 )
 
 # vm|ffi
-_extra_builder(
+_vm_builder(
     "vm-ffi-android-debug-arm",
     category = "vm|ffi|d32",
     properties = [android_deps],
 )
-_extra_builder(
+_vm_builder(
     "vm-ffi-android-release-arm",
     category = "vm|ffi|r32",
     properties = [android_deps],
 )
-_extra_builder(
+_vm_builder(
     "vm-ffi-android-product-arm",
     category = "vm|ffi|p32",
     properties = [android_deps],
 )
-_extra_builder(
+_vm_builder(
     "vm-ffi-android-debug-arm64c",
     category = "vm|ffi|d64",
     properties = [android_deps],
 )
-_extra_builder(
+_vm_builder(
     "vm-ffi-android-release-arm64c",
     category = "vm|ffi|r64",
     properties = [android_deps],
 )
-_extra_builder(
+_vm_builder(
     "vm-ffi-android-product-arm64c",
     category = "vm|ffi|p64",
     properties = [android_deps],
 )
-_extra_builder(
+_vm_builder(
     "vm-ffi-qemu-linux-release-arm",
     category = "vm|ffi|qa",
     dimensions = jammy,
 )
-_extra_builder(
+_vm_builder(
     "vm-ffi-qemu-linux-release-riscv64",
     category = "vm|ffi|qr",
     dimensions = [jammy, arm64],
@@ -507,7 +497,7 @@ _nightly_builder(
 )
 
 # Isolate stress test builder
-_extra_builder(
+_vm_builder(
     "iso-stress-linux",
     channels = [],
     notifies = "dart-vm-team",

From fe3b2208161c2cdc743f59ee661b19a388b4c651 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Thu, 2 Nov 2023 08:24:57 +0000
Subject: [PATCH 700/826] [infra] Add pkg builder for Linux ARM64.

Change-Id: Ib3bf8c3f41a35f5972484dd2a74b4486d3b366a5
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/330381
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 generated/commit-queue.cfg   |  12 ++++
 generated/cr-buildbucket.cfg | 136 +++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      |  27 ++++++-
 generated/luci-notify.cfg    |  11 +++
 generated/luci-scheduler.cfg |  33 +++++++++
 pkg.star                     |   9 ++-
 6 files changed, 225 insertions(+), 3 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index f9871d535e5b..a4255b72d4be 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -841,6 +841,10 @@ config_groups {
         name: "dart/try/gclient-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/pkg-linux-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/pkg-linux-release-try"
         location_filters {
@@ -2539,6 +2543,10 @@ config_groups {
         name: "dart/try/pkg-linux-debug-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/pkg-linux-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/pkg-linux-release-try"
         location_filters {
@@ -3787,6 +3795,10 @@ config_groups {
         name: "dart/try/gclient-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/pkg-linux-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/pkg-linux-release-try"
         location_filters {
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index e4806a34f265..98831280e160 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -4077,6 +4077,108 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "pkg-linux-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-linux-release-arm64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-linux-release-arm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "pkg-linux-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
@@ -11476,6 +11578,40 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "pkg-linux-release-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "pkg-linux-release-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 28988f034f5e..581075ecc6da 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -274,6 +274,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/pkg-linux-release-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/pkg-linux-release-arm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/pkg-mac-release-try"
   }
@@ -923,6 +926,11 @@ consoles {
     category: "pkg"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-arm64"
+    category: "pkg"
+    short_name: "la"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
     category: "pkg"
@@ -931,7 +939,7 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-arm64"
     category: "pkg"
-    short_name: "m1"
+    short_name: "ma"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
@@ -1202,6 +1210,11 @@ consoles {
     category: "pkg"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-arm64"
+    category: "pkg"
+    short_name: "la"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release"
     category: "pkg"
@@ -1210,7 +1223,7 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-arm64"
     category: "pkg"
-    short_name: "m1"
+    short_name: "ma"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release"
@@ -2070,6 +2083,11 @@ consoles {
     category: "pkg"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-arm64-beta"
+    category: "pkg"
+    short_name: "la"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-beta"
     category: "pkg"
@@ -2424,6 +2442,11 @@ consoles {
     category: "pkg"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release-arm64-stable"
+    category: "pkg"
+    short_name: "la"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-stable"
     category: "pkg"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 83982624b3cd..2dff9ba279b9 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -414,6 +414,17 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "pkg-linux-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 27cb5b2d90d8..d8280955573e 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -764,6 +764,36 @@ job {
     builder: "pkg-linux-release"
   }
 }
+job {
+  id: "pkg-linux-release-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "pkg-linux-release-arm64"
+  }
+}
+job {
+  id: "pkg-linux-release-arm64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "pkg-linux-release-arm64-beta"
+  }
+}
+job {
+  id: "pkg-linux-release-arm64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "pkg-linux-release-arm64-stable"
+  }
+}
 job {
   id: "pkg-linux-release-beta"
   realm: "ci.sandbox"
@@ -2285,6 +2315,7 @@ trigger {
   triggers: "front-end-linux-release-x64-beta"
   triggers: "front-end-nnbd-linux-release-x64-beta"
   triggers: "gclient-beta"
+  triggers: "pkg-linux-release-arm64-beta"
   triggers: "pkg-linux-release-beta"
   triggers: "pkg-mac-release-beta"
   triggers: "pkg-win-release-beta"
@@ -2359,6 +2390,7 @@ trigger {
   triggers: "gclient"
   triggers: "pkg-linux-debug"
   triggers: "pkg-linux-release"
+  triggers: "pkg-linux-release-arm64"
   triggers: "pkg-mac-release"
   triggers: "pkg-mac-release-arm64"
   triggers: "pkg-win-release"
@@ -2398,6 +2430,7 @@ trigger {
   triggers: "front-end-linux-release-x64-stable"
   triggers: "front-end-nnbd-linux-release-x64-stable"
   triggers: "gclient-stable"
+  triggers: "pkg-linux-release-arm64-stable"
   triggers: "pkg-linux-release-stable"
   triggers: "pkg-mac-release-stable"
   triggers: "pkg-win-release-stable"
diff --git a/pkg.star b/pkg.star
index a94c281746e6..b87bbc264d26 100644
--- a/pkg.star
+++ b/pkg.star
@@ -10,6 +10,7 @@ load(
     "//lib/defaults.star",
     "arm64",
     "chrome",
+    "jammy",
     "mac",
     "no_android",
     "windows",
@@ -22,6 +23,12 @@ dart.ci_sandbox_builder(
     location_filters = paths.to_location_filters(paths.pkg),
     properties = chrome,
 )
+dart.ci_sandbox_builder(
+    "pkg-linux-release-arm64",
+    category = "pkg|la",
+    dimensions = [jammy, arm64],
+    goma = False,
+)
 dart.ci_sandbox_builder(
     "pkg-mac-release",
     category = "pkg|m",
@@ -30,7 +37,7 @@ dart.ci_sandbox_builder(
 )
 dart.ci_sandbox_builder(
     "pkg-mac-release-arm64",
-    category = "pkg|m1",
+    category = "pkg|ma",
     channels = ["try"],
     dimensions = [mac, arm64],
     properties = [chrome, no_android],

From 92c85068c92fd85e7d6ef0e36f34ee8254966c82 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Thu, 2 Nov 2023 12:13:11 +0000
Subject: [PATCH 701/826] [infra/config] Increase flutter-analyze builder
 timeout to 60 minutes

The builder is consistently taking around 45 minutes, which is the
current timeout. It is starting to fail due to this.

The timeout was increased from 25 minutes to 45 minutes in
https://dart-review.googlesource.com/c/sdk/+/201680

The timeout is not increased to the default 3 hours because
it is important to know when the time taken to analyze
Flutter source increases significantly.

Change-Id: Ic927610769819561d4726ab42a8fbe4418825dec
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/332962
Reviewed-by: Samuel Rawlins <srawlins@google.com>
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: Devon Carew <devoncarew@google.com>
---
 analyzer.star                | 2 +-
 generated/cr-buildbucket.cfg | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/analyzer.star b/analyzer.star
index 6b8ce7fa7854..557f2c54b43f 100644
--- a/analyzer.star
+++ b/analyzer.star
@@ -17,7 +17,7 @@ dart.ci_sandbox_builder(
     "flutter-analyze",
     category = "analyzer|fa",
     channels = ["try"],
-    execution_timeout = 45 * time.minute,
+    execution_timeout = 60 * time.minute,
 )
 dart.ci_sandbox_builder(
     "analyzer-analysis-server-linux",
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 98831280e160..03684bc01d4b 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -2285,7 +2285,7 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      execution_timeout_secs: 2700
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11222,7 +11222,7 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 2700
+      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {

From dd75029d7c885988777a989ec875580694e0a64d Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Thu, 2 Nov 2023 16:11:51 +0000
Subject: [PATCH 702/826] [infra] Allow incremental builds for builders without
 Goma.

Change-Id: Ie41897bb3dc0b027b28bd31f94de15a1df09fdcc
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/333120
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/cr-buildbucket.cfg | 64 ++++++++++++++++++------------------
 pkg.star                     |  3 +-
 vm.star                      | 11 +++++--
 3 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 03684bc01d4b..d3e8364e674b 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -4100,7 +4100,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4134,7 +4134,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -4168,7 +4168,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -5145,7 +5145,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -5179,7 +5179,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 80
@@ -5213,7 +5213,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 80
@@ -5860,7 +5860,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5893,7 +5893,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -5926,7 +5926,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6032,7 +6032,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6065,7 +6065,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6098,7 +6098,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -7573,7 +7573,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -7607,7 +7607,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -7641,7 +7641,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8150,7 +8150,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8184,7 +8184,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8218,7 +8218,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -9308,7 +9308,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -9341,7 +9341,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -9374,7 +9374,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -9554,7 +9554,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -9587,7 +9587,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -9620,7 +9620,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -11601,7 +11601,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12182,7 +12182,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12599,7 +12599,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12705,7 +12705,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13304,7 +13304,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13741,7 +13741,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14343,7 +14343,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14449,7 +14449,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
diff --git a/pkg.star b/pkg.star
index b87bbc264d26..0a824806e686 100644
--- a/pkg.star
+++ b/pkg.star
@@ -27,7 +27,8 @@ dart.ci_sandbox_builder(
     "pkg-linux-release-arm64",
     category = "pkg|la",
     dimensions = [jammy, arm64],
-    goma = False,
+    goma = False,  # no such package: infra_internal/goma/client/linux-arm64
+    properties = {"clobber": False},
 )
 dart.ci_sandbox_builder(
     "pkg-mac-release",
diff --git a/vm.star b/vm.star
index 7d428303d920..ac81744cd9a2 100644
--- a/vm.star
+++ b/vm.star
@@ -106,7 +106,8 @@ _vm_builder(
     "vm-linux-release-arm64",
     category = "vm|jit|a6",
     dimensions = [jammy, arm64],
-    goma = False,
+    goma = False,  # no such package: infra_internal/goma/client/linux-arm64
+    properties = {"clobber": False},
 )
 _vm_builder(
     "vm-mac-debug-arm64",
@@ -160,12 +161,14 @@ _vm_builder(
     category = "vm|jit|wad",
     dimensions = [windows11, arm64, flutter_pool],
     goma = False,  # no such package: infra_internal/goma/client/windows-arm64
+    properties = {"clobber": False},
 )
 _vm_builder(
     "vm-win-release-arm64",
     category = "vm|jit|war",
     dimensions = [windows11, arm64, flutter_pool],
     goma = False,  # no such package: infra_internal/goma/client/windows-arm64
+    properties = {"clobber": False},
 )
 
 # vm|appjit
@@ -214,7 +217,8 @@ _nightly_builder(
     "vm-aot-linux-release-arm64",
     category = "vm|aot|a6",
     dimensions = [jammy, arm64],
-    goma = False,
+    goma = False,  # no such package: infra_internal/goma/client/linux-arm64
+    properties = {"clobber": False},
 )
 _vm_builder(
     "vm-aot-mac-release-arm64",
@@ -241,12 +245,14 @@ _vm_builder(
     category = "vm|aot|wad",
     dimensions = [windows11, arm64, flutter_pool],
     goma = False,  # no such package: infra_internal/goma/client/windows-arm64
+    properties = {"clobber": False},
 )
 _vm_builder(
     "vm-aot-win-release-arm64",
     category = "vm|aot|war",
     dimensions = [windows11, arm64, flutter_pool],
     goma = False,  # no such package: infra_internal/goma/client/windows-arm64
+    properties = {"clobber": False},
 )
 
 # vm|aot|android
@@ -470,6 +476,7 @@ _vm_builder(
     category = "vm|ffi|qr",
     dimensions = [jammy, arm64],
     goma = False,  # no such package: infra_internal/goma/client/linux-arm64
+    properties = {"clobber": False},
 )
 
 # vm|legacy|jit

From 28dbd6012815b349a176c62567d3df394ba2a1de Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Thu, 2 Nov 2023 19:47:02 +0000
Subject: [PATCH 703/826] [infra] Add pkg builder for Windows ARM64.

Change-Id: Ia241b2c56c80b8f7889d6272b8b1e4d254e88964
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/333041
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   |  12 ++++
 generated/cr-buildbucket.cfg | 132 +++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      |  23 ++++++
 generated/luci-notify.cfg    |  11 +++
 generated/luci-scheduler.cfg |  33 +++++++++
 lib/dart.star                |   4 +-
 lib/defaults.star            |   2 +
 pkg.star                     |   9 +++
 8 files changed, 224 insertions(+), 2 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index a4255b72d4be..a31f12d70b52 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -952,6 +952,10 @@ config_groups {
         name: "dart/try/pkg-mac-release-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/pkg-win-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/pkg-win-release-try"
         includable_only: true
@@ -2658,6 +2662,10 @@ config_groups {
         name: "dart/try/pkg-mac-release-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/pkg-win-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/pkg-win-release-try"
         includable_only: true
@@ -3906,6 +3914,10 @@ config_groups {
         name: "dart/try/pkg-mac-release-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/pkg-win-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/pkg-win-release-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index d3e8364e674b..f5a10d3a3f5f 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -4473,6 +4473,105 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "pkg-win-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-win-release-arm64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-win-release-arm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "pkg-win-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
@@ -11740,6 +11839,39 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "pkg-win-release-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.staging"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "pkg-win-release-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 581075ecc6da..aa484ff97866 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -286,6 +286,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/pkg-win-release-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/pkg-win-release-arm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/pkg-linux-debug-try"
   }
@@ -946,6 +949,11 @@ consoles {
     category: "pkg"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-arm64"
+    category: "pkg"
+    short_name: "wa"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
     category: "pkg"
@@ -1230,6 +1238,11 @@ consoles {
     category: "pkg"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-arm64"
+    category: "pkg"
+    short_name: "wa"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-debug"
     category: "pkg"
@@ -2098,6 +2111,11 @@ consoles {
     category: "pkg"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-arm64-beta"
+    category: "pkg"
+    short_name: "wa"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-linux-d8-beta"
     category: "dart2js|d8"
@@ -2457,6 +2475,11 @@ consoles {
     category: "pkg"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-arm64-stable"
+    category: "pkg"
+    short_name: "wa"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-minified-linux-d8-stable"
     category: "dart2js|d8"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 2dff9ba279b9..2af3b558044c 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -458,6 +458,17 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "pkg-win-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index d8280955573e..8577ff07c86a 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -864,6 +864,36 @@ job {
     builder: "pkg-win-release"
   }
 }
+job {
+  id: "pkg-win-release-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "pkg-win-release-arm64"
+  }
+}
+job {
+  id: "pkg-win-release-arm64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "pkg-win-release-arm64-beta"
+  }
+}
+job {
+  id: "pkg-win-release-arm64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "pkg-win-release-arm64-stable"
+  }
+}
 job {
   id: "pkg-win-release-beta"
   realm: "ci.sandbox"
@@ -2318,6 +2348,7 @@ trigger {
   triggers: "pkg-linux-release-arm64-beta"
   triggers: "pkg-linux-release-beta"
   triggers: "pkg-mac-release-beta"
+  triggers: "pkg-win-release-arm64-beta"
   triggers: "pkg-win-release-beta"
   triggers: "vm-aot-android-release-arm64c-beta"
   triggers: "vm-aot-android-release-arm_x64-beta"
@@ -2394,6 +2425,7 @@ trigger {
   triggers: "pkg-mac-release"
   triggers: "pkg-mac-release-arm64"
   triggers: "pkg-win-release"
+  triggers: "pkg-win-release-arm64"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/main"
@@ -2433,6 +2465,7 @@ trigger {
   triggers: "pkg-linux-release-arm64-stable"
   triggers: "pkg-linux-release-stable"
   triggers: "pkg-mac-release-stable"
+  triggers: "pkg-win-release-arm64-stable"
   triggers: "pkg-win-release-stable"
   triggers: "vm-aot-android-release-arm64c-stable"
   triggers: "vm-aot-android-release-arm_x64-stable"
diff --git a/lib/dart.star b/lib/dart.star
index d2770f684485..55f72f7f4c29 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -124,7 +124,7 @@ def _try_builder(
 
     # TODO(https://github.com/flutter/flutter/issues/127691): Remove filtering
     # of host_class.
-    if dimensions["pool"] == "luci.flutter.prod":
+    if dimensions["pool"] in ["luci.flutter.prod", "luci.flutter.staging"]:
         dimensions.pop("host_class")
     properties = defaults.properties(properties)
     builder_properties = _with_goma(goma, dimensions, properties)
@@ -211,7 +211,7 @@ def _builder(
 
     # TODO(https://github.com/flutter/flutter/issues/127691): Remove filtering
     # of host_class.
-    if dimensions["pool"] == "luci.flutter.prod":
+    if dimensions["pool"] in ["luci.flutter.prod", "luci.flutter.staging"]:
         dimensions.pop("host_class")
     properties = defaults.properties(properties)
 
diff --git a/lib/defaults.star b/lib/defaults.star
index 45be0ab1b39e..39206d5cd4f1 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -36,6 +36,7 @@ _WINDOWS10 = {"os": "Windows-10"}
 _WINDOWS11 = {"os": "Windows-11"}
 
 _FLUTTER_POOL = {"pool": "luci.flutter.prod"}
+_FLUTTER_STAGING_POOL = {"pool": "luci.flutter.staging"}
 _EXPERIMENTAL = {"host_class": "experimental"}
 
 def _union(x, overrides):
@@ -79,6 +80,7 @@ defaults = struct(
 arm64 = _ARM64
 experimental = _EXPERIMENTAL
 flutter_pool = _FLUTTER_POOL
+flutter_staging_pool = _FLUTTER_STAGING_POOL
 focal = _FOCAL
 jammy = _JAMMY
 linux = _FOCAL
diff --git a/pkg.star b/pkg.star
index 0a824806e686..24ecb7af8487 100644
--- a/pkg.star
+++ b/pkg.star
@@ -10,10 +10,12 @@ load(
     "//lib/defaults.star",
     "arm64",
     "chrome",
+    "flutter_staging_pool",
     "jammy",
     "mac",
     "no_android",
     "windows",
+    "windows11",
 )
 load("//lib/paths.star", "paths")
 
@@ -49,6 +51,13 @@ dart.ci_sandbox_builder(
     dimensions = windows,
     properties = chrome,
 )
+dart.ci_sandbox_builder(
+    "pkg-win-release-arm64",
+    category = "pkg|wa",
+    dimensions = [windows11, arm64, flutter_staging_pool],
+    goma = False,  # no such package: infra_internal/goma/client/windows-arm64
+    properties = {"clobber": False},
+)
 dart.ci_sandbox_builder(
     "pkg-linux-debug",
     category = "pkg|ld",

From 02804df4cd174d5e0d0c250d2d77ac34efd40598 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Thu, 2 Nov 2023 21:45:41 +0000
Subject: [PATCH 704/826] [infra] Enable bisection for all VM nightly builders.

Also removes the irregular case of nightly builders on the release channels. These don't seem to work, using commits from the main branch instead of the release branch.

Change-Id: I6213d9c6574b0899f61ef4890a7a492eb2484d1e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/332745
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/commit-queue.cfg   |   8 ---
 generated/cr-buildbucket.cfg | 128 ++++++++++++++++-------------------
 generated/luci-milo.cfg      |  10 ---
 generated/luci-scheduler.cfg |  22 ------
 lib/defaults.star            |  36 ++--------
 lib/helpers.star             |  36 ++++++++++
 vm.star                      |  59 ++++------------
 7 files changed, 112 insertions(+), 187 deletions(-)
 create mode 100644 lib/helpers.star

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index a31f12d70b52..4a70380eee33 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -976,10 +976,6 @@ config_groups {
         name: "dart/try/vm-aot-linux-debug-simarm_x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-aot-linux-release-arm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-aot-linux-release-simarm_x64-try"
         includable_only: true
@@ -3938,10 +3934,6 @@ config_groups {
         name: "dart/try/vm-aot-linux-debug-simarm_x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-aot-linux-release-arm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-aot-linux-release-simarm_x64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index f5a10d3a3f5f..22882945b3fd 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -4952,6 +4952,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -5099,6 +5100,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
@@ -5136,6 +5138,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
@@ -5173,6 +5176,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
@@ -5210,6 +5214,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -5244,6 +5249,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
@@ -5255,74 +5261,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-aot-linux-release-arm64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 80
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-aot-linux-release-arm64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 80
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-aot-linux-release-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -5564,6 +5502,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -5816,6 +5755,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -5852,6 +5792,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -6061,6 +6002,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
@@ -6098,6 +6040,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -6452,6 +6395,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -6756,6 +6700,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -6792,6 +6737,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -7853,6 +7799,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -7890,6 +7837,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -7926,6 +7874,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -7962,6 +7911,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -7998,6 +7948,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -8034,6 +7985,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
@@ -8071,6 +8023,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -8215,6 +8168,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -8353,6 +8307,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -9156,6 +9111,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -9192,6 +9148,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -9228,6 +9185,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -9264,6 +9222,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -9300,6 +9259,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -9620,6 +9580,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -9755,6 +9716,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -12096,6 +12058,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -12169,6 +12132,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
@@ -12206,6 +12170,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
@@ -12243,6 +12208,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
@@ -12280,6 +12246,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -12314,6 +12281,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
@@ -12422,6 +12390,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -12588,6 +12557,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -12624,6 +12594,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -12767,6 +12738,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
@@ -12804,6 +12776,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -12946,6 +12919,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -13096,6 +13070,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -13132,6 +13107,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -13549,6 +13525,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -13586,6 +13563,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -13622,6 +13600,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -13658,6 +13637,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -13694,6 +13674,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -13730,6 +13711,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
@@ -13767,6 +13749,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -13839,6 +13822,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -13909,6 +13893,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -14224,6 +14209,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -14260,6 +14246,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -14296,6 +14283,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -14332,6 +14320,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -14368,6 +14357,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -14548,6 +14538,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -14617,6 +14608,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index aa484ff97866..d6e59c662ef7 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -2016,11 +2016,6 @@ consoles {
     category: "vm|aot"
     short_name: "ra"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-arm64-beta"
-    category: "vm|aot"
-    short_name: "a6"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-x64-beta"
     category: "vm|aot"
@@ -2380,11 +2375,6 @@ consoles {
     category: "vm|aot"
     short_name: "ra"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-arm64-stable"
-    category: "vm|aot"
-    short_name: "a6"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-x64-stable"
     category: "vm|aot"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 8577ff07c86a..28b3f185419e 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1074,26 +1074,6 @@ job {
     builder: "vm-aot-linux-release-arm64"
   }
 }
-job {
-  id: "vm-aot-linux-release-arm64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-aot-linux-release-arm64-beta"
-  }
-}
-job {
-  id: "vm-aot-linux-release-arm64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-aot-linux-release-arm64-stable"
-  }
-}
 job {
   id: "vm-aot-linux-release-simarm_x64"
   realm: "ci.sandbox"
@@ -2529,8 +2509,6 @@ trigger {
   triggers: "vm-aot-linux-debug-x64c"
   triggers: "vm-aot-linux-product-x64"
   triggers: "vm-aot-linux-release-arm64"
-  triggers: "vm-aot-linux-release-arm64-beta"
-  triggers: "vm-aot-linux-release-arm64-stable"
   triggers: "vm-aot-mac-product-arm64"
   triggers: "vm-aot-msan-linux-release-x64"
   triggers: "vm-aot-obfuscate-linux-release-x64"
diff --git a/lib/defaults.star b/lib/defaults.star
index 39206d5cd4f1..b5d389d14d6a 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -5,6 +5,8 @@
 Defaults for properties and dimensions used in main.star.
 """
 
+load("//lib/helpers.star", "union")
+
 _PROPERTIES = {"clobber": True}
 _DIMENSIONS = {
     "cpu": "x86-64",
@@ -39,40 +41,10 @@ _FLUTTER_POOL = {"pool": "luci.flutter.prod"}
 _FLUTTER_STAGING_POOL = {"pool": "luci.flutter.staging"}
 _EXPERIMENTAL = {"host_class": "experimental"}
 
-def _union(x, overrides):
-    """ Creates a new dict with the values from all passed dictionaries
-
-    If dicts contain the same keys, their values are merged if the values are
-    dicts. This merging only happens at the top level, not recursively into
-    dicts containing dicts.
-    Otherwise, the earlier value is overwritten by the value from the
-    later override.
-
-    Args:
-        x (dict): A dict.
-        overrides (list): dicts to merge with x.
-
-    Returns:
-        dict: The merged dict.
-    """
-    z = {}
-    z.update(x)
-    if type(overrides) == type({}):
-        overrides = [overrides]
-    for y in overrides or []:
-        for k in y.keys():
-            v = z.get(k)
-            if v and type(v) == type({}):
-                v = dict(v, **y[k])
-                z[k] = v
-            else:
-                z[k] = y[k]
-    return z
-
 defaults = struct(
     caches = lambda os: _CACHES.get(os),
-    dimensions = lambda overrides: _union(_DIMENSIONS, overrides),
-    properties = lambda overrides: _union(_PROPERTIES, overrides),
+    dimensions = lambda overrides: union(_DIMENSIONS, overrides),
+    properties = lambda overrides: union(_PROPERTIES, overrides),
 )
 
 # Dimensions
diff --git a/lib/helpers.star b/lib/helpers.star
new file mode 100644
index 000000000000..af49d91f9325
--- /dev/null
+++ b/lib/helpers.star
@@ -0,0 +1,36 @@
+# Copyright (c) 2019 The Dart project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+Utility functions.
+"""
+
+def union(x, overrides):
+    """ Creates a new dict with the values from all passed dictionaries
+
+    If dicts contain the same keys, their values are merged if the values are
+    dicts. This merging only happens at the top level, not recursively into
+    dicts containing dicts.
+    Otherwise, the earlier value is overwritten by the value from the
+    later override.
+
+    Args:
+        x (dict): A dict.
+        overrides (list): dicts to merge with x.
+
+    Returns:
+        dict: The merged dict.
+    """
+    z = {}
+    z.update(x)
+    if type(overrides) == type({}):
+        overrides = [overrides]
+    for y in overrides or []:
+        for k in y.keys():
+            v = z.get(k)
+            if v and type(v) == type({}):
+                v = dict(v, **y[k])
+                z[k] = v
+            else:
+                z[k] = y[k]
+    return z
diff --git a/vm.star b/vm.star
index ac81744cd9a2..56de8817a192 100644
--- a/vm.star
+++ b/vm.star
@@ -20,6 +20,7 @@ load(
     "windows",
     "windows11",
 )
+load("//lib/helpers.star", "union")
 load("//lib/paths.star", "paths")
 
 _postponed_alt_console_entries = []
@@ -56,8 +57,9 @@ def _vm_builder(name, category = None, on_cq = False, location_filters = None, *
     )
     _postponed_alt_console_entry(name, category)
 
-def _nightly_builder(name, category, **kwargs):
-    cron.nightly_builder(name, category = category, notifies = "dart-vm-team", **kwargs)
+def _nightly_builder(name, category, channels = ["try"], properties = {}, **kwargs):
+    properties = union({"bisection_enabled": True}, properties)
+    cron.nightly_builder(name, category = category, channels = channels, properties = properties, notifies = "dart-vm-team", **kwargs)
     _postponed_alt_console_entry(name, category)
 
 def _postponed_alt_console_entry(name, category):
@@ -85,13 +87,11 @@ _vm_builder(
 _nightly_builder(
     "vm-linux-debug-ia32",
     category = "vm|jit|d3",
-    channels = ["try"],
     properties = slow_shards,
 )
 _nightly_builder(
     "vm-linux-release-ia32",
     category = "vm|jit|r3",
-    channels = ["try"],
 )
 _vm_builder(
     "vm-linux-release-simarm",
@@ -100,7 +100,6 @@ _vm_builder(
 _nightly_builder(
     "vm-linux-debug-simriscv64",
     category = "vm|jit|rv",
-    channels = ["try"],
 )
 _vm_builder(
     "vm-linux-release-arm64",
@@ -142,7 +141,6 @@ _vm_builder(
 _nightly_builder(
     "vm-win-release-ia32",
     category = "vm|jit|wr3",
-    channels = ["try"],
     dimensions = windows,
 )
 _vm_builder(
@@ -184,7 +182,6 @@ _vm_builder(
 _nightly_builder(
     "vm-appjit-linux-product-x64",
     category = "vm|appjit|p",
-    channels = ["try"],
 )
 
 # vm|aot
@@ -204,13 +201,11 @@ _vm_builder(
 _nightly_builder(
     "vm-aot-linux-debug-x64",
     category = "vm|aot|d",
-    channels = ["try"],
     properties = slow_shards,
 )
 _nightly_builder(
     "vm-aot-linux-debug-simriscv64",
     category = "vm|aot|rv",
-    channels = ["try"],
     properties = [slow_shards],
 )
 _nightly_builder(
@@ -271,18 +266,15 @@ _vm_builder(
 _nightly_builder(
     "vm-aot-linux-product-x64",
     category = "vm|aot|product|l",
-    channels = ["try"],
 )
 _nightly_builder(
     "vm-aot-mac-product-arm64",
     category = "vm|aot|product|m",
-    channels = ["try"],
     dimensions = [mac, arm64],
 )
 _nightly_builder(
     "vm-aot-win-product-x64",
     category = "vm|aot|product|w",
-    channels = ["try"],
     dimensions = windows,
 )
 
@@ -290,112 +282,91 @@ _nightly_builder(
 _nightly_builder(
     "vm-aot-obfuscate-linux-release-x64",
     category = "vm|aot|o",
-    channels = ["try"],
 )
 _nightly_builder(
     "vm-aot-dwarf-linux-product-x64",
     category = "vm|aot|dw",
-    channels = ["try"],
 )
 
 # vm|misc
 _nightly_builder(
     "vm-eager-optimization-linux-release-ia32",
     category = "vm|misc|j",
-    channels = ["try"],
 )
 _nightly_builder(
     "vm-eager-optimization-linux-release-x64",
     category = "vm|misc|j",
-    channels = ["try"],
 )
 _nightly_builder(
     "vm-aot-optimization-level-linux-release-x64",
     category = "vm|misc|a",
-    channels = ["try"],
 )
 
-def dart_vm_sanitizer_builder(name, **kwargs):
-    _nightly_builder(
-        name,
-        channels = ["try"],
-        properties = {"bisection_enabled": True},
-        **kwargs
-    )
-
-dart_vm_sanitizer_builder(
+_nightly_builder(
     "vm-asan-linux-release-x64",
     category = "vm|misc|sanitizer|a",
 )
-dart_vm_sanitizer_builder(
+_nightly_builder(
     "vm-msan-linux-release-x64",
     category = "vm|misc|sanitizer|m",
 )
-dart_vm_sanitizer_builder(
+_nightly_builder(
     "vm-tsan-linux-release-x64",
     category = "vm|misc|sanitizer|t",
 )
-dart_vm_sanitizer_builder(
+_nightly_builder(
     "vm-ubsan-linux-release-x64",
     category = "vm|misc|sanitizer|u",
 )
-dart_vm_sanitizer_builder(
+_nightly_builder(
     "vm-aot-asan-linux-release-x64",
     category = "vm|misc|sanitizer|a",
 )
-dart_vm_sanitizer_builder(
+_nightly_builder(
     "vm-aot-msan-linux-release-x64",
     category = "vm|misc|sanitizer|m",
 )
-dart_vm_sanitizer_builder(
+_nightly_builder(
     "vm-aot-tsan-linux-release-x64",
     category = "vm|misc|sanitizer|t",
 )
-dart_vm_sanitizer_builder(
+_nightly_builder(
     "vm-aot-ubsan-linux-release-x64",
     category = "vm|misc|sanitizer|u",
 )
 _nightly_builder(
     "vm-reload-linux-debug-x64",
     category = "vm|misc|reload|d",
-    channels = ["try"],
 )
 _nightly_builder(
     "vm-reload-linux-release-x64",
     category = "vm|misc|reload|r",
-    channels = ["try"],
 )
 _nightly_builder(
     "vm-reload-rollback-linux-debug-x64",
     category = "vm|misc|reload|drb",
-    channels = ["try"],
 )
 _nightly_builder(
     "vm-reload-rollback-linux-release-x64",
     category = "vm|misc|reload|rrb",
-    channels = ["try"],
 )
 _nightly_builder(
     "vm-linux-debug-x64c",
     category = "vm|misc|compressed|jl",
-    channels = ["try"],
 )
 _nightly_builder(
     "vm-aot-linux-debug-x64c",
     category = "vm|misc|compressed|al",
-    channels = ["try"],
     properties = slow_shards,
 )
 _nightly_builder(
     "vm-win-debug-x64c",
     category = "vm|misc|compressed|jw",
-    channels = ["try"],
     dimensions = windows,
 )
 _nightly_builder(
     "vm-aot-win-debug-x64c",
     category = "vm|misc|compressed|aw",
-    channels = ["try"],
     dimensions = windows,
     properties = slow_shards,
 )
@@ -416,7 +387,6 @@ _vm_builder(
 _nightly_builder(
     "vm-gcc-linux",
     category = "vm|misc|g",
-    channels = ["try"],
     dimensions = jammy,
     execution_timeout = 5 * time.hour,
     goma = False,
@@ -430,7 +400,6 @@ _nightly_builder(
 _nightly_builder(
     "vm-msvc-windows",
     category = "vm|misc|m",
-    channels = ["try"],
     dimensions = windows,
     goma = False,
 )
@@ -483,24 +452,20 @@ _vm_builder(
 _nightly_builder(
     "vm-kernel-linux-debug-x64",
     category = "vm|legacy|jit|d",
-    channels = ["try"],
 )
 _nightly_builder(
     "vm-kernel-linux-release-x64",
     category = "vm|legacy|jit|r",
-    channels = ["try"],
 )
 
 # vm|legacy|aot
 _nightly_builder(
     "vm-kernel-precomp-linux-debug-x64",
     category = "vm|legacy|aot|d",
-    channels = ["try"],
 )
 _nightly_builder(
     "vm-kernel-precomp-linux-release-x64",
     category = "vm|legacy|aot|r",
-    channels = ["try"],
 )
 
 # Isolate stress test builder

From e78f89619d7a2f5a943f2d1de5ca39e1f6e37839 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Thu, 9 Nov 2023 09:52:10 +0000
Subject: [PATCH 705/826] [infra] Don't clobber the monorepo builders

The Flutter engine CI does not clobber on its builders.

The monorepo builders have started failing the 1 hour timeout
when checking out the engine source dependencies, because
clobber also erases the git cache with clones of the dependency
repositories.

It seems appropriate for the monorepo builders to do the same
thing as the Flutter engine builders. There is no reason why
they would benefit from a clobber more than a normal engine build.

Change-Id: I356d0f7a06360be4bcf0e19f5652ce8f8a4f754e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/334466
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 8 ++++----
 monorepo.star                | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 22882945b3fd..c62a3e05b577 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -2357,7 +2357,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "config_name": "host_linux",'
         '  "environment": "unused",'
         '  "goma_jobs": "200",'
@@ -3436,7 +3436,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "config_name": "web_linux",'
         '  "environment": "unused",'
         '  "goma_jobs": "200",'
@@ -11356,7 +11356,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "builder_name_suffix": "-try",'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "config_name": "host_linux",'
         '  "environment": "unused",'
         '  "goma_jobs": "200",'
@@ -11400,7 +11400,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "builder_name_suffix": "-try",'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "config_name": "web_linux",'
         '  "environment": "unused",'
         '  "goma_jobs": "200",'
diff --git a/monorepo.star b/monorepo.star
index 5abb4e41d564..8185f2c5ab0f 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -48,6 +48,7 @@ dart.ci_sandbox_builder(
     priority = priority.normal,
     properties = {
         "$flutter/goma": {"server": "goma.chromium.org"},
+        "clobber": False,
         "config_name": "host_linux",
         "environment": "unused",
         "goma_jobs": "200",
@@ -74,6 +75,7 @@ dart.try_builder(
     properties = {
         "$flutter/goma": {"server": "goma.chromium.org"},
         "builder_name_suffix": "-try",
+        "clobber": False,
         "config_name": "host_linux",
         "environment": "unused",
         "goma_jobs": "200",
@@ -91,6 +93,7 @@ dart.ci_sandbox_builder(
     priority = priority.normal,
     properties = {
         "$flutter/goma": {"server": "goma.chromium.org"},
+        "clobber": False,
         "config_name": "web_linux",
         "environment": "unused",
         "goma_jobs": "200",
@@ -117,6 +120,7 @@ dart.try_builder(
     properties = {
         "$flutter/goma": {"server": "goma.chromium.org"},
         "builder_name_suffix": "-try",
+        "clobber": False,
         "config_name": "web_linux",
         "environment": "unused",
         "goma_jobs": "200",

From 92b5eb11cac5b3d925d266529cb7bbcae66ee3f4 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 17 Nov 2023 09:09:14 +0000
Subject: [PATCH 706/826] [infra] Remove vm-kernel-precomp-linux-debug-x64

https://dart-review.googlesource.com/c/sdk/+/335460 removes this builder
from the test_matrix.json. This builder was only running `_2` suites.

Bug: b/310114753
Change-Id: I48b845a2174e3d031aa585de14b5fcd7e00b5d8e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/336880
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: Martin Kustermann <kustermann@google.com>
Auto-Submit: Alexander Thomas <athom@google.com>
Commit-Queue: Martin Kustermann <kustermann@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 generated/commit-queue.cfg   |  4 --
 generated/cr-buildbucket.cfg | 74 ------------------------------------
 generated/luci-milo.cfg      | 13 -------
 generated/luci-notify.cfg    | 13 -------
 generated/luci-scheduler.cfg | 11 ------
 vm.star                      |  4 --
 6 files changed, 119 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 4a70380eee33..915858e5fa9c 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -2850,10 +2850,6 @@ config_groups {
         name: "dart/try/vm-kernel-linux-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-debug-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index c62a3e05b577..214487bc3a37 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -7886,43 +7886,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-precomp-linux-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-precomp-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13612,43 +13575,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-precomp-linux-debug-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-kernel-precomp-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index d6e59c662ef7..abacb95f6cf7 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -265,9 +265,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-debug-x64-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-x64-try"
   }
@@ -914,11 +911,6 @@ consoles {
     category: "vm|legacy|jit"
     short_name: "r"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
-    category: "vm|legacy|aot"
-    short_name: "d"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
     category: "vm|legacy|aot"
@@ -1718,11 +1710,6 @@ consoles {
     category: "vm|legacy|jit"
     short_name: "r"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-debug-x64"
-    category: "vm|legacy|aot"
-    short_name: "d"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
     category: "vm|legacy|aot"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 2af3b558044c..a1c3d64942d8 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -1023,19 +1023,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 28b3f185419e..304477865c20 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1774,16 +1774,6 @@ job {
     builder: "vm-kernel-linux-release-x64"
   }
 }
-job {
-  id: "vm-kernel-precomp-linux-debug-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-debug-x64"
-  }
-}
 job {
   id: "vm-kernel-precomp-linux-release-x64"
   realm: "ci.sandbox"
@@ -2524,7 +2514,6 @@ trigger {
   triggers: "vm-gcc-linux"
   triggers: "vm-kernel-linux-debug-x64"
   triggers: "vm-kernel-linux-release-x64"
-  triggers: "vm-kernel-precomp-linux-debug-x64"
   triggers: "vm-kernel-precomp-linux-release-x64"
   triggers: "vm-linux-debug-ia32"
   triggers: "vm-linux-debug-simriscv64"
diff --git a/vm.star b/vm.star
index 56de8817a192..f865ea68c3f0 100644
--- a/vm.star
+++ b/vm.star
@@ -459,10 +459,6 @@ _nightly_builder(
 )
 
 # vm|legacy|aot
-_nightly_builder(
-    "vm-kernel-precomp-linux-debug-x64",
-    category = "vm|legacy|aot|d",
-)
 _nightly_builder(
     "vm-kernel-precomp-linux-release-x64",
     category = "vm|legacy|aot|r",

From 2dd72bcd802ae96f058df2cd4cb1ba4d54e519b5 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 22 Nov 2023 09:28:28 +0000
Subject: [PATCH 707/826] [infra] Trigger benchmark-linux-try only on main CLs

Change-Id: I0c02b2a3fb735211b5f3824ed2a3350db2cbe655
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/337583
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 generated/commit-queue.cfg | 9 ---------
 main.star                  | 7 ++++++-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 915858e5fa9c..bc757529f3ba 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -333,9 +333,6 @@ config_groups {
         name: "dart/try/analyzer-win-release-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/benchmark-linux-try"
-      }
       builders {
         name: "dart/try/beta-try"
         includable_only: true
@@ -1277,9 +1274,6 @@ config_groups {
         name: "dart/try.shared/presubmit-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/benchmark-linux-try"
-      }
       builders {
         name: "dart/try/beta-try"
         includable_only: true
@@ -3287,9 +3281,6 @@ config_groups {
         name: "dart/try/analyzer-win-release-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/benchmark-linux-try"
-      }
       builders {
         name: "dart/try/beta-try"
         includable_only: true
diff --git a/main.star b/main.star
index 4c2ee6904b8c..50b5b17a2034 100755
--- a/main.star
+++ b/main.star
@@ -173,7 +173,12 @@ dart.ci_sandbox_builder(
 )
 
 # Try only builders
-dart.try_builder("benchmark-linux", on_cq = True, properties = js_engines)
+dart.try_builder(
+    "benchmark-linux",
+    cq_branches = ["main"],
+    on_cq = True,
+    properties = js_engines,
+)
 
 dart.try_builder(
     "presubmit",

From 52e7fbe8b460aacacdeb9d280a014422baa942a8 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Wed, 22 Nov 2023 13:55:18 +0000
Subject: [PATCH 708/826] Disable Goma on riscv.

Goma isn't support on this architecture since it uses gcc for
cross-compilation and the builds silently succeed. However RBE gets used
instead as of the upcoming migration, which is destabilizing the bots
with a too high -j option for local compilation. The right solution is
to simply disble remote compilation on these builders since it's not
working anyway.

Bug: b/296994239
Change-Id: I92c1d4ea082c02ebae9f2ba11196954de556902f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/337800
Commit-Queue: Jonas Termansen <sortie@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 30 +++++++++---------------------
 sdk.star                     |  1 +
 vm.star                      |  2 ++
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 214487bc3a37..d513085746bf 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5089,10 +5089,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -7975,10 +7973,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -10109,12 +10105,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$dart/build": {'
+        '    "disable_goma": true,'
         '    "timeout": 7200'
         '  },'
         '  "$recipe_engine/isolated": {'
@@ -12084,10 +12076,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -13664,10 +13654,8 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
+        '  "$dart/build": {'
+        '    "disable_goma": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
diff --git a/sdk.star b/sdk.star
index 3e841c34c6f1..5f82ce7f2bae 100644
--- a/sdk.star
+++ b/sdk.star
@@ -91,6 +91,7 @@ dart.try_builder(
         "disable_bcid": True,
     },
     recipe = "release/sdk",
+    goma = False,  # RBE gcc cross-compilation isn't supported yet
 )
 
 dart.try_builder(
diff --git a/vm.star b/vm.star
index f865ea68c3f0..e51e74b09ee3 100644
--- a/vm.star
+++ b/vm.star
@@ -100,6 +100,7 @@ _vm_builder(
 _nightly_builder(
     "vm-linux-debug-simriscv64",
     category = "vm|jit|rv",
+    goma = False,  # RBE gcc cross-compilation isn't supported yet
 )
 _vm_builder(
     "vm-linux-release-arm64",
@@ -207,6 +208,7 @@ _nightly_builder(
     "vm-aot-linux-debug-simriscv64",
     category = "vm|aot|rv",
     properties = [slow_shards],
+    goma = False,  # RBE gcc cross-compilation isn't supported yet
 )
 _nightly_builder(
     "vm-aot-linux-release-arm64",

From 4faf0d51a883bf8dbb86d8c94d42e71046c26fa1 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Wed, 22 Nov 2023 14:47:47 +0000
Subject: [PATCH 709/826] [infra] Enable try-jobs for the isolate stress test
 builder.

Useful for CLs like https://dart-review.googlesource.com/c/sdk/+/337600

Change-Id: I1a2e903e7b128d6192fa8972281bd3ae3e6ecf64
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/337601
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Aprelev <aam@google.com>
Reviewed-by: Alexander Aprelev <aam@google.com>
---
 generated/commit-queue.cfg   |  4 ++++
 generated/cr-buildbucket.cfg | 37 ++++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      |  3 +++
 vm.star                      |  2 +-
 4 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index bc757529f3ba..47e3e2a89702 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -2533,6 +2533,10 @@ config_groups {
         name: "dart/try/gclient-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/iso-stress-linux-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/pkg-linux-debug-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index d513085746bf..00ad02d5b1ec 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -11555,6 +11555,43 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "iso-stress-linux-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "pkg-linux-debug-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index abacb95f6cf7..c1d475286c74 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -268,6 +268,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-x64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/iso-stress-linux-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/pkg-linux-release-try"
   }
diff --git a/vm.star b/vm.star
index e51e74b09ee3..ae689736dce1 100644
--- a/vm.star
+++ b/vm.star
@@ -469,7 +469,7 @@ _nightly_builder(
 # Isolate stress test builder
 _vm_builder(
     "iso-stress-linux",
-    channels = [],
+    channels = ["try"],
     notifies = "dart-vm-team",
     properties = slow_shards,
 )

From e0fb9ce04fd582cf7c9f3a71538e064e6a42a58d Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 23 Nov 2023 08:15:09 +0000
Subject: [PATCH 710/826] [infra] Add dart2wasm-linux-firefox builder

Change-Id: Ifeafa8bcb1b8066464f20818b58e5b87996dd902
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/337960
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: Martin Kustermann <kustermann@google.com>
Commit-Queue: Martin Kustermann <kustermann@google.com>
---
 dart2wasm.star               | 10 +++-
 generated/commit-queue.cfg   | 93 ++++++++++++++++++++++++++++++++++++
 generated/cr-buildbucket.cfg | 82 +++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      | 13 +++++
 generated/luci-notify.cfg    | 10 ++++
 generated/luci-scheduler.cfg | 11 +++++
 6 files changed, 218 insertions(+), 1 deletion(-)

diff --git a/dart2wasm.star b/dart2wasm.star
index 81ba25f6c0e9..39415e89799c 100644
--- a/dart2wasm.star
+++ b/dart2wasm.star
@@ -7,7 +7,7 @@ Defines the dart2wasm builders.
 
 load("//lib/cron.star", "cron")
 load("//lib/dart.star", "dart")
-load("//lib/defaults.star", "chrome", "emscripten", "no_android")
+load("//lib/defaults.star", "chrome", "emscripten", "firefox", "no_android")
 load("//lib/paths.star", "paths")
 
 dart.poller(
@@ -40,3 +40,11 @@ cron.nightly_builder(
     channels = ["try"],
     properties = [chrome, emscripten, no_android],
 )
+
+cron.nightly_builder(
+    "dart2wasm-linux-firefox",
+    category = "d2w|f",
+    channels = ["try"],
+    properties = [firefox, emscripten, no_android],
+    location_filters = paths.to_location_filters(paths.dart2wasm),
+)
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 47e3e2a89702..6a78e9714271 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -2235,6 +2235,99 @@ config_groups {
           path_regexp: "sdk/lib/_js_interop/.+"
         }
       }
+      builders {
+        name: "dart/try/dart2wasm-linux-firefox-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm_shared/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/wasm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+      }
       builders {
         name: "dart/try/dart2wasm-linux-jscm-chrome-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 00ad02d5b1ec..9cabf1b28fea 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -1720,6 +1720,47 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "dart2wasm-linux-firefox"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_emscripten": true,'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "dart2wasm-linux-jscm-chrome"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10880,6 +10921,47 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "dart2wasm-linux-firefox-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_emscripten": true,'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "dart2wasm-linux-jscm-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index c1d475286c74..25d966d253ae 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -52,6 +52,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/dart2wasm-linux-jscm-chrome-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/dart2wasm-linux-firefox-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-linux-debug-x64-try"
   }
@@ -559,6 +562,11 @@ consoles {
     category: "d2w"
     short_name: "cm"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-firefox"
+    category: "d2w"
+    short_name: "f"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64"
     category: "vm|jit"
@@ -1208,6 +1216,11 @@ consoles {
     category: "d2w"
     short_name: "cm"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-firefox"
+    category: "d2w"
+    short_name: "f"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index a1c3d64942d8..0127654670d3 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -202,6 +202,16 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "dart2wasm-linux-firefox"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 304477865c20..b4a7ee8bee98 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -424,6 +424,16 @@ job {
     builder: "dart2wasm-linux-d8"
   }
 }
+job {
+  id: "dart2wasm-linux-firefox"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "dart2wasm-linux-firefox"
+  }
+}
 job {
   id: "dart2wasm-linux-jscm-chrome"
   realm: "ci.sandbox"
@@ -2488,6 +2498,7 @@ trigger {
   id: "dart-nightly-trigger"
   realm: "ci"
   schedule: "0 5 * * *"
+  triggers: "dart2wasm-linux-firefox"
   triggers: "dart2wasm-linux-jscm-chrome"
   triggers: "ddc-canary-linux-chrome"
   triggers: "front-end-nnbd-mac-release-x64"

From 5971e8d8a5102e17a07829e2bd2e4ba38fa35cfb Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 27 Nov 2023 09:50:11 +0000
Subject: [PATCH 711/826] [infra] Remove dart2wasm-firefox from the CQ

It seems to have deflaking issues and is a new nightly builder.

Change-Id: Iabaf244a330605aac1a39365672581024c7e2f67
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/338341
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
Commit-Queue: William Hesse <whesse@google.com>
Auto-Submit: Alexander Thomas <athom@google.com>
---
 dart2wasm.star             |  1 -
 generated/commit-queue.cfg | 91 +-------------------------------------
 2 files changed, 1 insertion(+), 91 deletions(-)

diff --git a/dart2wasm.star b/dart2wasm.star
index 39415e89799c..ceb1a6e4a721 100644
--- a/dart2wasm.star
+++ b/dart2wasm.star
@@ -46,5 +46,4 @@ cron.nightly_builder(
     category = "d2w|f",
     channels = ["try"],
     properties = [firefox, emscripten, no_android],
-    location_filters = paths.to_location_filters(paths.dart2wasm),
 )
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 6a78e9714271..939328b102c4 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -2237,96 +2237,7 @@ config_groups {
       }
       builders {
         name: "dart/try/dart2wasm-linux-firefox-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/generate_package_config.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/generate_package_config.dart"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm_shared/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/wasm.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
-        }
+        includable_only: true
       }
       builders {
         name: "dart/try/dart2wasm-linux-jscm-chrome-try"

From 9343dfb85f3d88e3b9eeaf9096087ab1d0a68c42 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Fri, 1 Dec 2023 17:20:46 +0000
Subject: [PATCH 712/826] [infra] simriscv64 builders are clang non-cross
 builds.

Only dart-sdk-linux-riscv64-* and vm-ffi-qemu-linux-release-riscv64 are gcc cross builds.

Change-Id: I196ac621e654e2573c94a0bcfb40b3af0c97ea17
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/338944
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/cr-buildbucket.cfg | 24 ++++++++++++++++--------
 vm.star                      |  2 --
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 9cabf1b28fea..c3025beb5911 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5130,8 +5130,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -8014,8 +8016,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -12195,8 +12199,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -13773,8 +13779,10 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
diff --git a/vm.star b/vm.star
index ae689736dce1..c2bb760a4b54 100644
--- a/vm.star
+++ b/vm.star
@@ -100,7 +100,6 @@ _vm_builder(
 _nightly_builder(
     "vm-linux-debug-simriscv64",
     category = "vm|jit|rv",
-    goma = False,  # RBE gcc cross-compilation isn't supported yet
 )
 _vm_builder(
     "vm-linux-release-arm64",
@@ -208,7 +207,6 @@ _nightly_builder(
     "vm-aot-linux-debug-simriscv64",
     category = "vm|aot|rv",
     properties = [slow_shards],
-    goma = False,  # RBE gcc cross-compilation isn't supported yet
 )
 _nightly_builder(
     "vm-aot-linux-release-arm64",

From c6a02b4176c98787bb8ee88e649bdd91efdda491 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Fri, 1 Dec 2023 19:22:58 +0000
Subject: [PATCH 713/826] [infra] Change RV builder from nightly to normal so
 it runs on the release channels.

Change-Id: Ie77e1e868884c7303ac23a45b425399e45e7a284
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/338943
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   |  8 ++++
 generated/cr-buildbucket.cfg | 76 ++++++++++++++++++++++++++++++++++--
 generated/luci-milo.cfg      | 10 +++++
 generated/luci-notify.cfg    |  4 +-
 generated/luci-scheduler.cfg | 24 +++++++++++-
 vm.star                      |  2 +-
 6 files changed, 116 insertions(+), 8 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 939328b102c4..745ea2e3b501 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -1041,6 +1041,10 @@ config_groups {
         name: "dart/try/vm-ffi-qemu-linux-release-riscv64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-linux-debug-simriscv64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-linux-debug-x64-try"
         includable_only: true
@@ -3997,6 +4001,10 @@ config_groups {
         name: "dart/try/vm-ffi-qemu-linux-release-riscv64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-linux-debug-simriscv64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-linux-debug-x64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index c3025beb5911..bdb31e15e9bc 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -8027,11 +8027,82 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-linux-debug-simriscv64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-linux-debug-simriscv64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13790,7 +13861,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 25d966d253ae..ef4364843b1e 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -1944,6 +1944,11 @@ consoles {
     category: "vm|jit"
     short_name: "ra"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simriscv64-beta"
+    category: "vm|jit"
+    short_name: "rv"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-arm64-beta"
     category: "vm|jit"
@@ -2303,6 +2308,11 @@ consoles {
     category: "vm|jit"
     short_name: "ra"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simriscv64-stable"
+    category: "vm|jit"
+    short_name: "rv"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-arm64-stable"
     category: "vm|jit"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 0127654670d3..749fbc030dd2 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -1062,9 +1062,7 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index b4a7ee8bee98..9e790eb57f14 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1814,6 +1814,26 @@ job {
     builder: "vm-linux-debug-simriscv64"
   }
 }
+job {
+  id: "vm-linux-debug-simriscv64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-linux-debug-simriscv64-beta"
+  }
+}
+job {
+  id: "vm-linux-debug-simriscv64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-linux-debug-simriscv64-stable"
+  }
+}
 job {
   id: "vm-linux-debug-x64"
   realm: "ci.sandbox"
@@ -2350,6 +2370,7 @@ trigger {
   triggers: "vm-ffi-android-release-arm64c-beta"
   triggers: "vm-ffi-qemu-linux-release-arm-beta"
   triggers: "vm-ffi-qemu-linux-release-riscv64-beta"
+  triggers: "vm-linux-debug-simriscv64-beta"
   triggers: "vm-linux-debug-x64-beta"
   triggers: "vm-linux-release-arm64-beta"
   triggers: "vm-linux-release-simarm-beta"
@@ -2467,6 +2488,7 @@ trigger {
   triggers: "vm-ffi-android-release-arm64c-stable"
   triggers: "vm-ffi-qemu-linux-release-arm-stable"
   triggers: "vm-ffi-qemu-linux-release-riscv64-stable"
+  triggers: "vm-linux-debug-simriscv64-stable"
   triggers: "vm-linux-debug-x64-stable"
   triggers: "vm-linux-release-arm64-stable"
   triggers: "vm-linux-release-simarm-stable"
@@ -2527,7 +2549,6 @@ trigger {
   triggers: "vm-kernel-linux-release-x64"
   triggers: "vm-kernel-precomp-linux-release-x64"
   triggers: "vm-linux-debug-ia32"
-  triggers: "vm-linux-debug-simriscv64"
   triggers: "vm-linux-debug-x64c"
   triggers: "vm-linux-release-ia32"
   triggers: "vm-msan-linux-release-x64"
@@ -2572,6 +2593,7 @@ trigger {
   triggers: "vm-ffi-qemu-linux-release-riscv64"
   triggers: "vm-fuchsia-release-arm64"
   triggers: "vm-fuchsia-release-x64"
+  triggers: "vm-linux-debug-simriscv64"
   triggers: "vm-linux-debug-x64"
   triggers: "vm-linux-release-arm64"
   triggers: "vm-linux-release-simarm"
diff --git a/vm.star b/vm.star
index c2bb760a4b54..27c656ebbb87 100644
--- a/vm.star
+++ b/vm.star
@@ -97,7 +97,7 @@ _vm_builder(
     "vm-linux-release-simarm",
     category = "vm|jit|ra",
 )
-_nightly_builder(
+_vm_builder(
     "vm-linux-debug-simriscv64",
     category = "vm|jit|rv",
 )

From 0468289094858d84be123cfd3297457ef8cd12aa Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Fri, 8 Dec 2023 11:38:23 +0000
Subject: [PATCH 714/826] Add docker and homebrew commit queue.

Bug: b/315139272
Change-Id: Ibfd89b0983ea63cd58aca698966029faf508af87
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/340221
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 cq.star                      | 16 ++++++--
 generated/commit-queue.cfg   | 38 +++++++++++++++++
 generated/cr-buildbucket.cfg | 79 ++++++++++++++++++++++++++++++++----
 generated/luci-milo.cfg      |  6 +++
 generated/project.cfg        |  2 +-
 main.star                    | 14 +++++--
 6 files changed, 138 insertions(+), 17 deletions(-)

diff --git a/cq.star b/cq.star
index 72a16bc2c901..a3732d9d6f77 100644
--- a/cq.star
+++ b/cq.star
@@ -48,20 +48,28 @@ luci.cq_group(
     verifiers = default_verifiers(),
 )
 
-def basic_cq(repository):
+def basic_cq(repository, extra_verifies = []):
     luci.cq_group(
         name = repository,
         watch = cq.refset(DART_GERRIT + repository, refs = ["refs/heads/main"]),
         allow_submit_with_open_deps = True,
         tree_status_host = "dart-status.appspot.com",
         retry_config = cq.RETRY_NONE,
-        verifiers = default_verifiers(),
+        verifiers = default_verifiers() + extra_verifies,
     )
 
 basic_cq("dart_ci")
-basic_cq("dart-docker")
+basic_cq("dart-docker", [
+    luci.cq_tryjob_verifier(
+        builder = "docker-try",
+    ),
+])
 basic_cq("flute")
-basic_cq("homebrew-dart")
+basic_cq("homebrew-dart", [
+    luci.cq_tryjob_verifier(
+        builder = "homebrew-try",
+    ),
+])
 basic_cq("recipes")
 
 def empty_cq(repository):
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 745ea2e3b501..2e83c46ae115 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -34,6 +34,9 @@ config_groups {
         name: "dart/try.shared/presubmit-try"
         disable_reuse: true
       }
+      builders {
+        name: "dart/try/docker-try"
+      }
       retry_config {}
     }
   }
@@ -115,6 +118,9 @@ config_groups {
         name: "dart/try.shared/presubmit-try"
         disable_reuse: true
       }
+      builders {
+        name: "dart/try/homebrew-try"
+      }
       retry_config {}
     }
   }
@@ -768,6 +774,10 @@ config_groups {
         name: "dart/try/dev-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/docker-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/front-end-linux-release-x64-try"
       }
@@ -838,6 +848,10 @@ config_groups {
         name: "dart/try/gclient-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/homebrew-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/pkg-linux-release-arm64-try"
         includable_only: true
@@ -1333,6 +1347,14 @@ config_groups {
         name: "dart/try/dev-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/docker-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/homebrew-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/stable-try"
         includable_only: true
@@ -2443,6 +2465,10 @@ config_groups {
         name: "dart/try/dev-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/docker-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/flutter-analyze-try"
         includable_only: true
@@ -2541,6 +2567,10 @@ config_groups {
         name: "dart/try/gclient-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/homebrew-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/iso-stress-linux-try"
         includable_only: true
@@ -3728,6 +3758,10 @@ config_groups {
         name: "dart/try/dev-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/docker-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/front-end-linux-release-x64-try"
       }
@@ -3798,6 +3832,10 @@ config_groups {
         name: "dart/try/gclient-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/homebrew-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/pkg-linux-release-arm64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index bdb31e15e9bc..2b40a07353f1 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -10159,10 +10159,6 @@ buckets {
       execution_timeout_secs: 900
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.non_production"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
@@ -11358,9 +11354,42 @@ buckets {
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
-        key: "luci.non_production"
+        key: "luci.recipes.use_python3"
         value: 100
       }
+    }
+    builders {
+      name: "docker-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "release/merge",'
+        '  "version": "1.2.3"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
@@ -11712,6 +11741,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "homebrew-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "release/merge"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "iso-stress-linux-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -12056,10 +12121,6 @@ buckets {
       execution_timeout_secs: 900
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.non_production"
-        value: 100
-      }
       experiments {
         key: "luci.recipes.use_python3"
         value: 100
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index ef4364843b1e..0a9c2a29cb55 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -379,6 +379,12 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/stable-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/docker-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/homebrew-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/flutter-linux-try"
   }
diff --git a/generated/project.cfg b/generated/project.cfg
index 7729f8331733..69b42df85e6e 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.40.0"
+  version: "1.42.1"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/main.star b/main.star
index 50b5b17a2034..3c9567166e77 100755
--- a/main.star
+++ b/main.star
@@ -209,7 +209,6 @@ luci.list_view_entry(
 
 dart.try_builder(
     "dev",
-    experiments = {"luci.non_production": 100},
     recipe = "release/merge",
     execution_timeout = 15 * time.minute,
     properties = {"from_ref": "refs/heads/lkgr", "to_ref": "refs/heads/dev"},
@@ -217,7 +216,6 @@ dart.try_builder(
 
 dart.try_builder(
     "beta",
-    experiments = {"luci.non_production": 100},
     recipe = "release/merge",
     execution_timeout = 15 * time.minute,
     properties = {"from_ref": "refs/heads/dev", "to_ref": "refs/heads/beta"},
@@ -225,10 +223,20 @@ dart.try_builder(
 
 dart.try_builder(
     "stable",
-    experiments = {"luci.non_production": 100},
     recipe = "release/merge",
     execution_timeout = 15 * time.minute,
     properties = {"from_ref": "refs/heads/beta", "to_ref": "refs/heads/stable"},
 )
 
+dart.try_builder(
+    "docker",
+    recipe = "release/merge",
+    # Use a fake stable version since it's only used to detect the channel.
+    properties = {"version": "1.2.3"},
+)
+
+dart.try_builder(
+    "homebrew",
+    recipe = "release/merge",
+)
 exec("//monorepo.star")

From d98863ff0fffcf88304eaae777bff269ae569f06 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Fri, 8 Dec 2023 12:28:02 +0000
Subject: [PATCH 715/826] Fix docker and homebrew commit queue.

Bug: b/315139272
Change-Id: Iab6f06d2794db409455aaa2198acb916cffaa5c7
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/340449
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 generated/commit-queue.cfg   | 32 --------------------------------
 generated/cr-buildbucket.cfg |  4 ++--
 main.star                    |  7 +++++--
 3 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 2e83c46ae115..97e82eb5512f 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -774,10 +774,6 @@ config_groups {
         name: "dart/try/dev-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/docker-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/front-end-linux-release-x64-try"
       }
@@ -848,10 +844,6 @@ config_groups {
         name: "dart/try/gclient-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/homebrew-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/pkg-linux-release-arm64-try"
         includable_only: true
@@ -1347,14 +1339,6 @@ config_groups {
         name: "dart/try/dev-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/docker-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/homebrew-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/stable-try"
         includable_only: true
@@ -2465,10 +2449,6 @@ config_groups {
         name: "dart/try/dev-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/docker-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/flutter-analyze-try"
         includable_only: true
@@ -2567,10 +2547,6 @@ config_groups {
         name: "dart/try/gclient-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/homebrew-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/iso-stress-linux-try"
         includable_only: true
@@ -3758,10 +3734,6 @@ config_groups {
         name: "dart/try/dev-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/docker-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/front-end-linux-release-x64-try"
       }
@@ -3832,10 +3804,6 @@ config_groups {
         name: "dart/try/gclient-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/homebrew-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/pkg-linux-release-arm64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 2b40a07353f1..50f6038d0e66 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -11384,7 +11384,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "release/merge",'
+        '  "recipe": "release/docker",'
         '  "version": "1.2.3"'
         '}'
       priority: 30
@@ -11767,7 +11767,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "release/merge"'
+        '  "recipe": "release/homebrew"'
         '}'
       priority: 30
       build_numbers: YES
diff --git a/main.star b/main.star
index 3c9567166e77..eeda4c2ab452 100755
--- a/main.star
+++ b/main.star
@@ -230,13 +230,16 @@ dart.try_builder(
 
 dart.try_builder(
     "docker",
-    recipe = "release/merge",
+    recipe = "release/docker",
     # Use a fake stable version since it's only used to detect the channel.
     properties = {"version": "1.2.3"},
+    cq_branches = [],
 )
 
 dart.try_builder(
     "homebrew",
-    recipe = "release/merge",
+    recipe = "release/homebrew",
+    cq_branches = [],
 )
+
 exec("//monorepo.star")

From 032fa739a3dfb1a59f63050259c51a63e959f84e Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Tue, 12 Dec 2023 11:18:59 +0000
Subject: [PATCH 716/826] Add flutter-linux-customer-testing builder for
 monorepo

Bug: https://github.com/dart-lang/sdk/issues/51042
Change-Id: Id2aeec14c23d105f7d61516d5949b216dccda2c0
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/341220
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 74 ++++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      | 12 ++++++
 monorepo.star                | 19 +++++++--
 3 files changed, 102 insertions(+), 3 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 50f6038d0e66..fcf2f56ebe09 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -2783,6 +2783,43 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "flutter-linux-customer-testing"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/tester"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 5400
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "flutter-linux-flutter-plugins"
       swarming_host: "chromium-swarm.appspot.com"
@@ -15208,6 +15245,43 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "flutter-linux-customer-testing-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/tester"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 5400
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "flutter-linux-flutter-plugins-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 0a9c2a29cb55..04b5a697649c 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -448,6 +448,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try.monorepo/flutter-linux-tool-tests-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-customer-testing-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try.monorepo/flutter-linux-web-tests-0-try"
   }
@@ -2744,6 +2747,11 @@ consoles {
     category: "flutter-engine"
     short_name: "tool"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-customer-testing"
+    category: "flutter-engine"
+    short_name: "customer_testing"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-0"
     category: "flutter-web"
@@ -2920,6 +2928,10 @@ consoles {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-tool-tests"
     short_name: "tool"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-customer-testing"
+    short_name: "customer_testing"
+  }
   header {
     links {
       name: "Consoles"
diff --git a/monorepo.star b/monorepo.star
index 8185f2c5ab0f..445102ce3967 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -162,9 +162,21 @@ def monorepo_builder(name, short_name, console):
         cq_branches = [],
     )
 
-monorepo_builder("flutter-linux-android_debug", "android-debug", "flutter-engine")
-monorepo_builder("flutter-linux-android_profile", "android-profile", "flutter-engine")
-monorepo_builder("flutter-linux-android_release", "android-release", "flutter-engine")
+monorepo_builder(
+    "flutter-linux-android_debug",
+    "android-debug",
+    "flutter-engine",
+)
+monorepo_builder(
+    "flutter-linux-android_profile",
+    "android-profile",
+    "flutter-engine",
+)
+monorepo_builder(
+    "flutter-linux-android_release",
+    "android-release",
+    "flutter-engine",
+)
 monorepo_builder(
     "flutter-linux-android_debug_arm64",
     "android-debug-arm64",
@@ -243,6 +255,7 @@ monorepo_tester("flutter-linux-flutter-plugins", "plugins", "flutter-engine")
 monorepo_tester("flutter-linux-framework-coverage", "coverage", "flutter-engine")
 monorepo_tester("flutter-linux-framework-tests", "tests", "flutter-engine")
 monorepo_tester("flutter-linux-tool-tests", "tool", "flutter-engine")
+monorepo_tester("flutter-linux-customer-testing", "customer_testing", "flutter-engine")
 monorepo_tester("flutter-linux-web-tests-0", "wt0", "flutter-web")
 monorepo_tester("flutter-linux-web-tests-1", "wt1", "flutter-web")
 monorepo_tester("flutter-linux-web-tests-2", "wt2", "flutter-web")

From 3a64b8c20cca36053c75c0f7c6f69ef257dedd4a Mon Sep 17 00:00:00 2001
From: Martin Kustermann <kustermann@google.com>
Date: Wed, 13 Dec 2023 10:28:45 +0000
Subject: [PATCH 717/826] Start running dart2wasm-linux-{-jscm-chrome,firefox}
 on every commit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ia972b667a7ffeb20bee8b6978e014ae9e80a8c39
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/341480
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Martin Kustermann <kustermann@google.com>
Reviewed-by: Ömer Ağacan <omersa@google.com>
---
 dart2wasm.star               |   14 +-
 generated/commit-queue.cfg   | 2478 +++++++++++++++++++++++-----------
 generated/cr-buildbucket.cfg |  330 ++++-
 generated/luci-milo.cfg      |   40 +
 generated/luci-notify.cfg    |    2 +
 generated/luci-scheduler.cfg |  170 ++-
 6 files changed, 2244 insertions(+), 790 deletions(-)

diff --git a/dart2wasm.star b/dart2wasm.star
index ceb1a6e4a721..cfb906b67971 100644
--- a/dart2wasm.star
+++ b/dart2wasm.star
@@ -5,21 +5,18 @@
 Defines the dart2wasm builders.
 """
 
-load("//lib/cron.star", "cron")
 load("//lib/dart.star", "dart")
 load("//lib/defaults.star", "chrome", "emscripten", "firefox", "no_android")
 load("//lib/paths.star", "paths")
 
 dart.poller(
     "dart2wasm-gitiles-trigger",
-    branches = ["main"],
     paths = paths.dart2wasm,
 )
 
 dart.ci_sandbox_builder(
     "dart2wasm-linux-d8",
     category = "d2w|d",
-    channels = ["try"],
     properties = [emscripten, no_android],
     location_filters = paths.to_location_filters(paths.dart2wasm),
     triggered_by = ["dart2wasm-gitiles-trigger-%s"],
@@ -28,22 +25,23 @@ dart.ci_sandbox_builder(
 dart.ci_sandbox_builder(
     "dart2wasm-linux-chrome",
     category = "d2w|c",
-    channels = ["try"],
     properties = [chrome, emscripten, no_android],
     location_filters = paths.to_location_filters(paths.dart2wasm),
     triggered_by = ["dart2wasm-gitiles-trigger-%s"],
 )
 
-cron.nightly_builder(
+dart.ci_sandbox_builder(
     "dart2wasm-linux-jscm-chrome",
     category = "d2w|cm",
-    channels = ["try"],
     properties = [chrome, emscripten, no_android],
+    location_filters = paths.to_location_filters(paths.dart2wasm),
+    triggered_by = ["dart2wasm-gitiles-trigger-%s"],
 )
 
-cron.nightly_builder(
+dart.ci_sandbox_builder(
     "dart2wasm-linux-firefox",
     category = "d2w|f",
-    channels = ["try"],
     properties = [firefox, emscripten, no_android],
+    location_filters = paths.to_location_filters(paths.dart2wasm),
+    triggered_by = ["dart2wasm-gitiles-trigger-%s"],
 )
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 97e82eb5512f..af998dd8441e 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -675,7 +675,7 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/ddc-linux-chrome-try"
+        name: "dart/try/dart2wasm-linux-chrome-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -739,46 +739,36 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
+          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/js.+"
+          path_regexp: "sdk/lib/_internal/vm_shared/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(build_integration|dev_compiler|meta)/.+"
+          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "utils/dartdevc/.+"
+          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+          path_regexp: "sdk/lib/_internal/wasm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
         }
       }
       builders {
-        name: "dart/try/ddc-mac-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/ddc-win-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dev-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/front-end-linux-release-x64-try"
-      }
-      builders {
-        name: "dart/try/front-end-nnbd-linux-release-x64-try"
+        name: "dart/try/dart2wasm-linux-d8-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -839,17 +829,39 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm_shared/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/wasm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
       }
       builders {
-        name: "dart/try/gclient-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/pkg-linux-release-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/pkg-linux-release-try"
+        name: "dart/try/dart2wasm-linux-firefox-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -913,162 +925,36 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/vm/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "runtime/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_http/.+"
+          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm.+"
+          path_regexp: "sdk/lib/_internal/vm_shared/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/.+"
+          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "third_party/pkg/.+"
+          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "tools/package_deps/.+"
+          path_regexp: "sdk/lib/_internal/wasm.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "tools/.*\\.dart"
+          path_regexp: "sdk/lib/_js_interop/.+"
         }
       }
       builders {
-        name: "dart/try/pkg-mac-release-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/pkg-win-release-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/pkg-win-release-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/stable-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-aot-android-release-arm64c-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-aot-android-release-arm_x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-aot-linux-debug-simarm_x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-aot-linux-release-simarm_x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-aot-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-aot-mac-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-aot-win-debug-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-aot-win-release-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-aot-win-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-appjit-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-appjit-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-checked-mac-release-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-ffi-android-debug-arm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-ffi-android-debug-arm64c-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-ffi-android-product-arm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-ffi-android-product-arm64c-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-ffi-android-release-arm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-ffi-android-release-arm64c-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-ffi-qemu-linux-release-arm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-ffi-qemu-linux-release-riscv64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-linux-debug-simriscv64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-linux-release-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-linux-release-simarm-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-mac-debug-arm64-try"
+        name: "dart/try/dart2wasm-linux-jscm-chrome-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1132,30 +1018,36 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/vm/.+"
+          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "runtime/.+"
+          path_regexp: "sdk/lib/_internal/vm_shared/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_http/.+"
+          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm.+"
+          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/wasm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
         }
       }
       builders {
-        name: "dart/try/vm-mac-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-mac-release-arm64-try"
+        name: "dart/try/ddc-linux-chrome-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1219,186 +1111,46 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/vm/.+"
+          path_regexp: "sdk/lib/_js_interop/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "runtime/.+"
+          path_regexp: "sdk/lib/_internal/js.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_http/.+"
+          path_regexp: "pkg/(build_integration|dev_compiler|meta)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm.+"
+          path_regexp: "utils/dartdevc/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
       builders {
-        name: "dart/try/vm-mac-release-x64-try"
+        name: "dart/try/ddc-mac-chrome-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-win-debug-arm64-try"
+        name: "dart/try/ddc-win-chrome-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-win-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-win-release-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-win-release-x64-try"
-        includable_only: true
-      }
-      retry_config {}
-    }
-  }
-}
-config_groups {
-  name: "sdk-dev"
-  gerrit {
-    url: "https://dart-review.googlesource.com"
-    projects {
-      name: "sdk"
-      ref_regexp: "refs/heads/dev"
-    }
-  }
-  verifiers {
-    gerrit_cq_ability {
-      committer_list: "project-dart-committers"
-      dry_run_access_list: "project-dart-tryjob-access"
-      allow_submit_with_open_deps: true
-    }
-    tree_status {
-      url: "https://dart-status.appspot.com"
-    }
-    tryjob {
-      builders {
-        name: "dart/try.shared/presubmit-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/beta-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart-sdk-linux-arm64-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/VERSION"
-        }
-      }
-      builders {
-        name: "dart/try/dart-sdk-linux-riscv64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart-sdk-linux-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/VERSION"
-        }
-      }
-      builders {
-        name: "dart/try/dart-sdk-mac-arm64-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/VERSION"
-        }
-      }
-      builders {
-        name: "dart/try/dart-sdk-mac-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/VERSION"
-        }
-      }
-      builders {
-        name: "dart/try/dart-sdk-win-arm64-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/VERSION"
-        }
-      }
-      builders {
-        name: "dart/try/dart-sdk-win-try"
-      }
       builders {
         name: "dart/try/dev-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/stable-try"
-        includable_only: true
-      }
-      retry_config {}
-    }
-  }
-}
-config_groups {
-  name: "sdk-infra-config"
-  gerrit {
-    url: "https://dart-review.googlesource.com"
-    projects {
-      name: "sdk"
-      ref_regexp: "refs/heads/infra/config"
-    }
-  }
-  verifiers {
-    gerrit_cq_ability {
-      committer_list: "project-dart-committers"
-      dry_run_access_list: "project-dart-tryjob-access"
-      allow_submit_with_open_deps: true
-    }
-    tree_status {
-      url: "https://dart-status.appspot.com"
-    }
-    tryjob {
-      builders {
-        name: "dart/try.shared/presubmit-try"
-        disable_reuse: true
-      }
-      retry_config {}
-    }
-  }
-}
-config_groups {
-  name: "sdk-main"
-  gerrit {
-    url: "https://dart-review.googlesource.com"
-    projects {
-      name: "sdk"
-      ref_regexp: "refs/heads/main"
-    }
-  }
-  verifiers {
-    gerrit_cq_ability {
-      committer_list: "project-dart-committers"
-      dry_run_access_list: "project-dart-tryjob-access"
-      allow_submit_with_open_deps: true
-    }
-    tree_status {
-      url: "https://dart-status.appspot.com"
-    }
-    tryjob {
-      builders {
-        name: "dart/try.shared/presubmit-try"
-        includable_only: true
+        name: "dart/try/front-end-linux-release-x64-try"
       }
       builders {
-        name: "dart/try/analyzer-analysis-server-linux-try"
+        name: "dart/try/front-end-nnbd-linux-release-x64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1457,16 +1209,19 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "runtime/tools/dartfuzz/.+"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
       }
       builders {
-        name: "dart/try/analyzer-linux-release-try"
+        name: "dart/try/gclient-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/pkg-linux-release-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/pkg-linux-release-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1522,6 +1277,31 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "tests/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "runtime/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_http/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1530,77 +1310,137 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "runtime/tools/dartfuzz/.+"
+          path_regexp: "third_party/pkg/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/package_deps/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/.*\\.dart"
         }
       }
       builders {
-        name: "dart/try/analyzer-mac-release-try"
+        name: "dart/try/pkg-mac-release-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/analyzer-win-release-try"
+        name: "dart/try/pkg-win-release-arm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/benchmark-linux-try"
+        name: "dart/try/pkg-win-release-try"
+        includable_only: true
       }
       builders {
-        name: "dart/try/beta-try"
+        name: "dart/try/stable-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/dart-sdk-linux-arm64-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/VERSION"
-        }
+        name: "dart/try/vm-aot-android-release-arm64c-try"
+        includable_only: true
       }
       builders {
-        name: "dart/try/dart-sdk-linux-riscv64-try"
+        name: "dart/try/vm-aot-android-release-arm_x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/dart-sdk-linux-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/VERSION"
-        }
+        name: "dart/try/vm-aot-linux-debug-simarm_x64-try"
+        includable_only: true
       }
       builders {
-        name: "dart/try/dart-sdk-mac-arm64-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/VERSION"
-        }
+        name: "dart/try/vm-aot-linux-release-simarm_x64-try"
+        includable_only: true
       }
       builders {
-        name: "dart/try/dart-sdk-mac-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/VERSION"
-        }
+        name: "dart/try/vm-aot-linux-release-x64-try"
+        includable_only: true
       }
       builders {
-        name: "dart/try/dart-sdk-win-arm64-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/VERSION"
-        }
+        name: "dart/try/vm-aot-mac-release-x64-try"
+        includable_only: true
       }
       builders {
-        name: "dart/try/dart-sdk-win-try"
+        name: "dart/try/vm-aot-win-debug-arm64-try"
+        includable_only: true
       }
       builders {
-        name: "dart/try/dart2js-canary-linux-try"
+        name: "dart/try/vm-aot-win-release-arm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/dart2js-hostasserts-linux-d8-try"
+        name: "dart/try/vm-aot-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-appjit-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-appjit-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-checked-mac-release-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-android-debug-arm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-android-debug-arm64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-android-product-arm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-android-product-arm64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-android-release-arm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-android-release-arm64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-qemu-linux-release-arm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-qemu-linux-release-riscv64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-linux-debug-simriscv64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-linux-release-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-linux-release-simarm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-mac-debug-arm64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1664,31 +1504,30 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/js.+"
+          path_regexp: "pkg/vm/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+          path_regexp: "runtime/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "utils/compiler/.+"
+          path_regexp: "sdk/lib/_http/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+          path_regexp: "sdk/lib/_internal/vm.+"
         }
       }
       builders {
-        name: "dart/try/dart2js-hostasserts-linux-unsound-try"
+        name: "dart/try/vm-mac-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-mac-release-arm64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1752,135 +1591,254 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
+          path_regexp: "pkg/vm/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/js.+"
+          path_regexp: "runtime/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+          path_regexp: "sdk/lib/_http/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "utils/compiler/.+"
+          path_regexp: "sdk/lib/_internal/vm.+"
         }
+      }
+      builders {
+        name: "dart/try/vm-mac-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-win-debug-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-win-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-win-release-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-win-release-x64-try"
+        includable_only: true
+      }
+      retry_config {}
+    }
+  }
+}
+config_groups {
+  name: "sdk-dev"
+  gerrit {
+    url: "https://dart-review.googlesource.com"
+    projects {
+      name: "sdk"
+      ref_regexp: "refs/heads/dev"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "project-dart-committers"
+      dry_run_access_list: "project-dart-tryjob-access"
+      allow_submit_with_open_deps: true
+    }
+    tree_status {
+      url: "https://dart-status.appspot.com"
+    }
+    tryjob {
+      builders {
+        name: "dart/try.shared/presubmit-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/beta-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-linux-arm64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+          path_regexp: "tools/VERSION"
         }
       }
       builders {
-        name: "dart/try/dart2js-linux-chrome-try"
+        name: "dart/try/dart-sdk-linux-riscv64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-linux-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
+          path_regexp: "tools/VERSION"
         }
+      }
+      builders {
+        name: "dart/try/dart-sdk-mac-arm64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
+          path_regexp: "tools/VERSION"
         }
+      }
+      builders {
+        name: "dart/try/dart-sdk-mac-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
+          path_regexp: "tools/VERSION"
         }
+      }
+      builders {
+        name: "dart/try/dart-sdk-win-arm64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
+          path_regexp: "tools/VERSION"
         }
+      }
+      builders {
+        name: "dart/try/dart-sdk-win-try"
+      }
+      builders {
+        name: "dart/try/dev-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/stable-try"
+        includable_only: true
+      }
+      retry_config {}
+    }
+  }
+}
+config_groups {
+  name: "sdk-infra-config"
+  gerrit {
+    url: "https://dart-review.googlesource.com"
+    projects {
+      name: "sdk"
+      ref_regexp: "refs/heads/infra/config"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "project-dart-committers"
+      dry_run_access_list: "project-dart-tryjob-access"
+      allow_submit_with_open_deps: true
+    }
+    tree_status {
+      url: "https://dart-status.appspot.com"
+    }
+    tryjob {
+      builders {
+        name: "dart/try.shared/presubmit-try"
+        disable_reuse: true
+      }
+      retry_config {}
+    }
+  }
+}
+config_groups {
+  name: "sdk-main"
+  gerrit {
+    url: "https://dart-review.googlesource.com"
+    projects {
+      name: "sdk"
+      ref_regexp: "refs/heads/main"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "project-dart-committers"
+      dry_run_access_list: "project-dart-tryjob-access"
+      allow_submit_with_open_deps: true
+    }
+    tree_status {
+      url: "https://dart-status.appspot.com"
+    }
+    tryjob {
+      builders {
+        name: "dart/try.shared/presubmit-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/analyzer-analysis-server-linux-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
+          path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "tools/generate_package_config.py"
+          path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "tools/generate_package_config.dart"
+          path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
+          path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+          path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
+          path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
+          path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+          path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/js.+"
+          path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+          path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "utils/compiler/.+"
+          path_regexp: "pkg/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+          path_regexp: "runtime/tools/dartfuzz/.+"
         }
       }
       builders {
-        name: "dart/try/dart2js-linux-firefox-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-mac-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-mac-safari-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-minified-csp-linux-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-minified-linux-d8-try"
+        name: "dart/try/analyzer-linux-release-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1939,36 +1897,82 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+          path_regexp: "pkg/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
+          path_regexp: "runtime/tools/dartfuzz/.+"
         }
+      }
+      builders {
+        name: "dart/try/analyzer-mac-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/analyzer-win-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/benchmark-linux-try"
+      }
+      builders {
+        name: "dart/try/beta-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-linux-arm64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/js.+"
+          path_regexp: "tools/VERSION"
+        }
+      }
+      builders {
+        name: "dart/try/dart-sdk-linux-riscv64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart-sdk-linux-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/VERSION"
         }
+      }
+      builders {
+        name: "dart/try/dart-sdk-mac-arm64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+          path_regexp: "tools/VERSION"
         }
+      }
+      builders {
+        name: "dart/try/dart-sdk-mac-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "utils/compiler/.+"
+          path_regexp: "tools/VERSION"
         }
+      }
+      builders {
+        name: "dart/try/dart-sdk-win-arm64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+          path_regexp: "tools/VERSION"
         }
       }
       builders {
-        name: "dart/try/dart2js-unit-linux-x64-release-try"
+        name: "dart/try/dart-sdk-win-try"
+      }
+      builders {
+        name: "dart/try/dart2js-canary-linux-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-hostasserts-linux-d8-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2056,11 +2060,7 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/dart2js-win-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2wasm-linux-chrome-try"
+        name: "dart/try/dart2js-hostasserts-linux-unsound-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2124,36 +2124,31 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm_shared/.+"
+          path_regexp: "sdk/lib/_js_interop/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
+          path_regexp: "sdk/lib/_internal/js.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/wasm.+"
+          path_regexp: "utils/compiler/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
       builders {
-        name: "dart/try/dart2wasm-linux-d8-try"
+        name: "dart/try/dart2js-linux-chrome-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2217,48 +2212,47 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm_shared/.+"
+          path_regexp: "sdk/lib/_js_interop/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
+          path_regexp: "sdk/lib/_internal/js.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/wasm.+"
+          path_regexp: "utils/compiler/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
       builders {
-        name: "dart/try/dart2wasm-linux-firefox-try"
+        name: "dart/try/dart2js-linux-firefox-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/dart2wasm-linux-jscm-chrome-try"
+        name: "dart/try/dart2js-mac-chrome-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/ddc-canary-linux-chrome-try"
+        name: "dart/try/dart2js-mac-safari-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/ddc-linux-chrome-try"
+        name: "dart/try/dart2js-minified-csp-linux-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-minified-linux-d8-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2332,12 +2326,12 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(build_integration|dev_compiler|meta)/.+"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "utils/dartdevc/.+"
+          path_regexp: "utils/compiler/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -2346,7 +2340,7 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/ddc-linux-chrome-unsound-try"
+        name: "dart/try/dart2js-unit-linux-x64-release-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2420,12 +2414,12 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(build_integration|dev_compiler|meta)/.+"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "utils/dartdevc/.+"
+          path_regexp: "utils/compiler/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -2434,46 +2428,11 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/ddc-linux-firefox-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/ddc-mac-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/ddc-win-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dev-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/flutter-analyze-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/flutter-frontend-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-      }
-      builders {
-        name: "dart/try/flutter-linux-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/flutter-web-try"
+        name: "dart/try/dart2js-win-chrome-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/front-end-linux-release-x64-try"
-      }
-      builders {
-        name: "dart/try/front-end-nnbd-linux-release-x64-try"
+        name: "dart/try/dart2wasm-linux-chrome-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2534,33 +2493,39 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm_shared/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/wasm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
       }
       builders {
-        name: "dart/try/front-end-nnbd-mac-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/front-end-nnbd-win-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/gclient-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/iso-stress-linux-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/pkg-linux-debug-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/pkg-linux-release-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/pkg-linux-release-try"
+        name: "dart/try/dart2wasm-linux-d8-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2624,22 +2589,607 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/vm/.+"
+          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "runtime/.+"
+          path_regexp: "sdk/lib/_internal/vm_shared/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_http/.+"
+          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm.+"
+          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/wasm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+      }
+      builders {
+        name: "dart/try/dart2wasm-linux-firefox-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm_shared/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/wasm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+      }
+      builders {
+        name: "dart/try/dart2wasm-linux-jscm-chrome-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm_shared/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/wasm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+      }
+      builders {
+        name: "dart/try/ddc-canary-linux-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/ddc-linux-chrome-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(build_integration|dev_compiler|meta)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/dartdevc/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/ddc-linux-chrome-unsound-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(build_integration|dev_compiler|meta)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/dartdevc/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/ddc-linux-firefox-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/ddc-mac-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/ddc-win-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dev-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/flutter-analyze-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/flutter-frontend-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/flutter-linux-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/flutter-web-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/front-end-linux-release-x64-try"
+      }
+      builders {
+        name: "dart/try/front-end-nnbd-linux-release-x64-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/front-end-nnbd-mac-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/front-end-nnbd-win-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/gclient-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/iso-stress-linux-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/pkg-linux-debug-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/pkg-linux-release-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/pkg-linux-release-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "runtime/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_http/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
@@ -2663,243 +3213,695 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/pkg-mac-release-arm64-try"
+        name: "dart/try/pkg-mac-release-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/pkg-mac-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/pkg-win-release-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/pkg-win-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/stable-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-android-release-arm64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-android-release-arm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-asan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-dwarf-linux-product-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-linux-debug-simarm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-linux-debug-simriscv64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-linux-debug-x64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-linux-product-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-linux-release-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-linux-release-simarm_x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-mac-product-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-mac-release-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-mac-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-msan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-obfuscate-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-optimization-level-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-tsan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-ubsan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-win-debug-arm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/pkg-mac-release-try"
+        name: "dart/try/vm-aot-win-debug-x64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/pkg-win-release-arm64-try"
+        name: "dart/try/vm-aot-win-product-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/pkg-win-release-try"
+        name: "dart/try/vm-aot-win-release-arm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/stable-try"
+        name: "dart/try/vm-aot-win-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-android-release-arm64c-try"
+        name: "dart/try/vm-appjit-linux-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-android-release-arm_x64-try"
+        name: "dart/try/vm-appjit-linux-product-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-asan-linux-release-x64-try"
+        name: "dart/try/vm-appjit-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-dwarf-linux-product-x64-try"
+        name: "dart/try/vm-asan-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-linux-debug-simarm_x64-try"
+        name: "dart/try/vm-checked-mac-release-arm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-linux-debug-simriscv64-try"
+        name: "dart/try/vm-eager-optimization-linux-release-ia32-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-linux-debug-x64-try"
+        name: "dart/try/vm-eager-optimization-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-linux-debug-x64c-try"
+        name: "dart/try/vm-ffi-android-debug-arm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-linux-product-x64-try"
+        name: "dart/try/vm-ffi-android-debug-arm64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-linux-release-arm64-try"
+        name: "dart/try/vm-ffi-android-product-arm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-linux-release-simarm_x64-try"
+        name: "dart/try/vm-ffi-android-product-arm64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-linux-release-x64-try"
+        name: "dart/try/vm-ffi-android-release-arm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-mac-product-arm64-try"
+        name: "dart/try/vm-ffi-android-release-arm64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-mac-release-arm64-try"
+        name: "dart/try/vm-ffi-qemu-linux-release-arm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-mac-release-x64-try"
+        name: "dart/try/vm-ffi-qemu-linux-release-riscv64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-msan-linux-release-x64-try"
+        name: "dart/try/vm-fuchsia-release-arm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-obfuscate-linux-release-x64-try"
+        name: "dart/try/vm-fuchsia-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-optimization-level-linux-release-x64-try"
+        name: "dart/try/vm-gcc-linux-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-tsan-linux-release-x64-try"
+        name: "dart/try/vm-kernel-linux-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-ubsan-linux-release-x64-try"
+        name: "dart/try/vm-kernel-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-win-debug-arm64-try"
+        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-win-debug-x64c-try"
+        name: "dart/try/vm-linux-debug-ia32-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-win-product-x64-try"
+        name: "dart/try/vm-linux-debug-simriscv64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-win-release-arm64-try"
+        name: "dart/try/vm-linux-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-aot-win-release-x64-try"
+        name: "dart/try/vm-linux-debug-x64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-appjit-linux-debug-x64-try"
+        name: "dart/try/vm-linux-release-arm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-appjit-linux-product-x64-try"
+        name: "dart/try/vm-linux-release-ia32-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-appjit-linux-release-x64-try"
+        name: "dart/try/vm-linux-release-simarm-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-asan-linux-release-x64-try"
+        name: "dart/try/vm-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-checked-mac-release-arm64-try"
+        name: "dart/try/vm-mac-debug-arm64-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "runtime/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_http/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm.+"
+        }
+      }
+      builders {
+        name: "dart/try/vm-mac-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-eager-optimization-linux-release-ia32-try"
+        name: "dart/try/vm-mac-release-arm64-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "runtime/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_http/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm.+"
+        }
+      }
+      builders {
+        name: "dart/try/vm-mac-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-eager-optimization-linux-release-x64-try"
+        name: "dart/try/vm-msan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-msvc-windows-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-reload-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-reload-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-reload-rollback-linux-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-android-debug-arm-try"
+        name: "dart/try/vm-reload-rollback-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-android-debug-arm64c-try"
+        name: "dart/try/vm-tsan-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-android-product-arm-try"
+        name: "dart/try/vm-ubsan-linux-release-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-android-product-arm64c-try"
+        name: "dart/try/vm-win-debug-arm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-android-release-arm-try"
+        name: "dart/try/vm-win-debug-x64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-android-release-arm64c-try"
+        name: "dart/try/vm-win-debug-x64c-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-qemu-linux-release-arm-try"
+        name: "dart/try/vm-win-release-arm64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-ffi-qemu-linux-release-riscv64-try"
+        name: "dart/try/vm-win-release-ia32-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-fuchsia-release-arm64-try"
+        name: "dart/try/vm-win-release-x64-try"
         includable_only: true
       }
+      retry_config {}
+    }
+  }
+}
+config_groups {
+  name: "sdk-stable"
+  gerrit {
+    url: "https://dart-review.googlesource.com"
+    projects {
+      name: "sdk"
+      ref_regexp: "refs/heads/stable"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "project-dart-committers"
+      dry_run_access_list: "project-dart-tryjob-access"
+      allow_submit_with_open_deps: true
+    }
+    tree_status {
+      url: "https://dart-status.appspot.com"
+    }
+    tryjob {
       builders {
-        name: "dart/try/vm-fuchsia-release-x64-try"
+        name: "dart/try.shared/presubmit-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-gcc-linux-try"
-        includable_only: true
+        name: "dart/try/analyzer-analysis-server-linux-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "runtime/tools/dartfuzz/.+"
+        }
       }
       builders {
-        name: "dart/try/vm-kernel-linux-debug-x64-try"
-        includable_only: true
+        name: "dart/try/analyzer-linux-release-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "runtime/tools/dartfuzz/.+"
+        }
       }
       builders {
-        name: "dart/try/vm-kernel-linux-release-x64-try"
+        name: "dart/try/analyzer-mac-release-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
+        name: "dart/try/analyzer-win-release-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-linux-debug-ia32-try"
+        name: "dart/try/beta-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-linux-debug-simriscv64-try"
-        includable_only: true
+        name: "dart/try/dart-sdk-linux-arm64-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/VERSION"
+        }
       }
       builders {
-        name: "dart/try/vm-linux-debug-x64-try"
+        name: "dart/try/dart-sdk-linux-riscv64-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-linux-debug-x64c-try"
-        includable_only: true
+        name: "dart/try/dart-sdk-linux-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/VERSION"
+        }
       }
       builders {
-        name: "dart/try/vm-linux-release-arm64-try"
-        includable_only: true
+        name: "dart/try/dart-sdk-mac-arm64-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/VERSION"
+        }
       }
       builders {
-        name: "dart/try/vm-linux-release-ia32-try"
-        includable_only: true
+        name: "dart/try/dart-sdk-mac-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/VERSION"
+        }
       }
       builders {
-        name: "dart/try/vm-linux-release-simarm-try"
-        includable_only: true
+        name: "dart/try/dart-sdk-win-arm64-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/VERSION"
+        }
       }
       builders {
-        name: "dart/try/vm-linux-release-x64-try"
-        includable_only: true
+        name: "dart/try/dart-sdk-win-try"
       }
       builders {
-        name: "dart/try/vm-mac-debug-arm64-try"
+        name: "dart/try/dart2js-linux-chrome-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2963,30 +3965,47 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/vm/.+"
+          path_regexp: "sdk/lib/_js_interop/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "runtime/.+"
+          path_regexp: "sdk/lib/_internal/js.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_http/.+"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm.+"
+          path_regexp: "utils/compiler/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
+      }
+      builders {
+        name: "dart/try/dart2js-linux-firefox-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-mac-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-mac-safari-try"
+        includable_only: true
       }
       builders {
-        name: "dart/try/vm-mac-debug-x64-try"
+        name: "dart/try/dart2js-minified-csp-linux-chrome-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-mac-release-arm64-try"
+        name: "dart/try/dart2js-minified-linux-d8-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3050,113 +4069,31 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/vm/.+"
+          path_regexp: "sdk/lib/_js_interop/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "runtime/.+"
+          path_regexp: "sdk/lib/_internal/js.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_http/.+"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm.+"
+          path_regexp: "utils/compiler/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
       builders {
-        name: "dart/try/vm-mac-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-msan-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-msvc-windows-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-reload-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-reload-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-reload-rollback-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-reload-rollback-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-tsan-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-ubsan-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-win-debug-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-win-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-win-debug-x64c-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-win-release-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-win-release-ia32-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-win-release-x64-try"
-        includable_only: true
-      }
-      retry_config {}
-    }
-  }
-}
-config_groups {
-  name: "sdk-stable"
-  gerrit {
-    url: "https://dart-review.googlesource.com"
-    projects {
-      name: "sdk"
-      ref_regexp: "refs/heads/stable"
-    }
-  }
-  verifiers {
-    gerrit_cq_ability {
-      committer_list: "project-dart-committers"
-      dry_run_access_list: "project-dart-tryjob-access"
-      allow_submit_with_open_deps: true
-    }
-    tree_status {
-      url: "https://dart-status.appspot.com"
-    }
-    tryjob {
-      builders {
-        name: "dart/try.shared/presubmit-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/analyzer-analysis-server-linux-try"
+        name: "dart/try/dart2js-unit-linux-x64-release-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3215,16 +4152,40 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/.+"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "runtime/tools/dartfuzz/.+"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/js.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "utils/compiler/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
       builders {
-        name: "dart/try/analyzer-linux-release-try"
+        name: "dart/try/dart2js-win-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2wasm-linux-chrome-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3283,75 +4244,41 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/.+"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "runtime/tools/dartfuzz/.+"
+          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
         }
-      }
-      builders {
-        name: "dart/try/analyzer-mac-release-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/analyzer-win-release-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/beta-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart-sdk-linux-arm64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "tools/VERSION"
+          path_regexp: "sdk/lib/_internal/vm_shared/.+"
         }
-      }
-      builders {
-        name: "dart/try/dart-sdk-linux-riscv64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart-sdk-linux-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "tools/VERSION"
+          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
         }
-      }
-      builders {
-        name: "dart/try/dart-sdk-mac-arm64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "tools/VERSION"
+          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
         }
-      }
-      builders {
-        name: "dart/try/dart-sdk-mac-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "tools/VERSION"
+          path_regexp: "sdk/lib/_internal/wasm.+"
         }
-      }
-      builders {
-        name: "dart/try/dart-sdk-win-arm64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "tools/VERSION"
+          path_regexp: "sdk/lib/_js_interop/.+"
         }
       }
       builders {
-        name: "dart/try/dart-sdk-win-try"
-      }
-      builders {
-        name: "dart/try/dart2js-linux-chrome-try"
+        name: "dart/try/dart2wasm-linux-d8-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3415,47 +4342,36 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
+          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/js.+"
+          path_regexp: "sdk/lib/_internal/vm_shared/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "utils/compiler/.+"
+          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+          path_regexp: "sdk/lib/_internal/wasm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
         }
       }
       builders {
-        name: "dart/try/dart2js-linux-firefox-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-mac-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-mac-safari-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-minified-csp-linux-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-minified-linux-d8-try"
+        name: "dart/try/dart2wasm-linux-firefox-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3519,31 +4435,36 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
+          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/js.+"
+          path_regexp: "sdk/lib/_internal/vm_shared/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "utils/compiler/.+"
+          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+          path_regexp: "sdk/lib/_internal/wasm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
         }
       }
       builders {
-        name: "dart/try/dart2js-unit-linux-x64-release-try"
+        name: "dart/try/dart2wasm-linux-jscm-chrome-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3607,32 +4528,33 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
+          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/js.+"
+          path_regexp: "sdk/lib/_internal/vm_shared/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
+          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "utils/compiler/.+"
+          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+          path_regexp: "sdk/lib/_internal/wasm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
         }
-      }
-      builders {
-        name: "dart/try/dart2js-win-chrome-try"
-        includable_only: true
       }
       builders {
         name: "dart/try/ddc-linux-chrome-try"
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index fcf2f56ebe09..418c2ffea775 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -1680,6 +1680,88 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "dart2wasm-linux-chrome-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true,'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2wasm-linux-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true,'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "dart2wasm-linux-d8"
       swarming_host: "chromium-swarm.appspot.com"
@@ -1720,6 +1802,86 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "dart2wasm-linux-d8-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2wasm-linux-d8-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "dart2wasm-linux-firefox"
       swarming_host: "chromium-swarm.appspot.com"
@@ -1753,7 +1915,89 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2wasm-linux-firefox-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_emscripten": true,'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2wasm-linux-firefox-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_emscripten": true,'
+        '    "download_firefox": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -1794,7 +2038,89 @@ buckets {
         '  },'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2wasm-linux-jscm-chrome-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true,'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2wasm-linux-jscm-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true,'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 04b5a697649c..63c4bd4e0ab2 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -1938,6 +1938,26 @@ consoles {
     category: "cfe|nnbd"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-d8-beta"
+    category: "d2w"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-chrome-beta"
+    category: "d2w"
+    short_name: "c"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-jscm-chrome-beta"
+    category: "d2w"
+    short_name: "cm"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-firefox-beta"
+    category: "d2w"
+    short_name: "f"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64-beta"
     category: "vm|jit"
@@ -2302,6 +2322,26 @@ consoles {
     category: "cfe|nnbd"
     short_name: "l"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-d8-stable"
+    category: "d2w"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-chrome-stable"
+    category: "d2w"
+    short_name: "c"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-jscm-chrome-stable"
+    category: "d2w"
+    short_name: "cm"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-firefox-stable"
+    category: "d2w"
+    short_name: "f"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64-stable"
     category: "vm|jit"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 749fbc030dd2..51dc2475fdeb 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -205,6 +205,7 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
@@ -215,6 +216,7 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 9e790eb57f14..e3cc93745103 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -414,6 +414,26 @@ job {
     builder: "dart2wasm-linux-chrome"
   }
 }
+job {
+  id: "dart2wasm-linux-chrome-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "dart2wasm-linux-chrome-beta"
+  }
+}
+job {
+  id: "dart2wasm-linux-chrome-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "dart2wasm-linux-chrome-stable"
+  }
+}
 job {
   id: "dart2wasm-linux-d8"
   realm: "ci.sandbox"
@@ -424,6 +444,26 @@ job {
     builder: "dart2wasm-linux-d8"
   }
 }
+job {
+  id: "dart2wasm-linux-d8-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "dart2wasm-linux-d8-beta"
+  }
+}
+job {
+  id: "dart2wasm-linux-d8-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "dart2wasm-linux-d8-stable"
+  }
+}
 job {
   id: "dart2wasm-linux-firefox"
   realm: "ci.sandbox"
@@ -434,6 +474,26 @@ job {
     builder: "dart2wasm-linux-firefox"
   }
 }
+job {
+  id: "dart2wasm-linux-firefox-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "dart2wasm-linux-firefox-beta"
+  }
+}
+job {
+  id: "dart2wasm-linux-firefox-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "dart2wasm-linux-firefox-stable"
+  }
+}
 job {
   id: "dart2wasm-linux-jscm-chrome"
   realm: "ci.sandbox"
@@ -444,6 +504,26 @@ job {
     builder: "dart2wasm-linux-jscm-chrome"
   }
 }
+job {
+  id: "dart2wasm-linux-jscm-chrome-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "dart2wasm-linux-jscm-chrome-beta"
+  }
+}
+job {
+  id: "dart2wasm-linux-jscm-chrome-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "dart2wasm-linux-jscm-chrome-stable"
+  }
+}
 job {
   id: "ddc-canary-linux-chrome"
   realm: "ci.sandbox"
@@ -2520,8 +2600,6 @@ trigger {
   id: "dart-nightly-trigger"
   realm: "ci"
   schedule: "0 5 * * *"
-  triggers: "dart2wasm-linux-firefox"
-  triggers: "dart2wasm-linux-jscm-chrome"
   triggers: "ddc-canary-linux-chrome"
   triggers: "front-end-nnbd-mac-release-x64"
   triggers: "front-end-nnbd-win-release-x64"
@@ -2665,11 +2743,69 @@ trigger {
     path_regexps: "pkg/(js|modular_test|sourcemap_testing)/.+"
   }
 }
+trigger {
+  id: "dart2wasm-gitiles-trigger-beta"
+  realm: "ci"
+  triggers: "dart2wasm-linux-chrome-beta"
+  triggers: "dart2wasm-linux-d8-beta"
+  triggers: "dart2wasm-linux-firefox-beta"
+  triggers: "dart2wasm-linux-jscm-chrome-beta"
+  gitiles {
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/beta"
+    path_regexps: "DEPS"
+    path_regexps: "build/.+"
+    path_regexps: "BUILD.gn"
+    path_regexps: "sdk_args.gni"
+    path_regexps: ".dart_tool/package_config.json"
+    path_regexps: "tools/generate_package_config.py"
+    path_regexps: "tools/generate_package_config.dart"
+    path_regexps: "sdk/lib/[^_].+"
+    path_regexps: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+    path_regexps: "tools/bots/test_matrix.json"
+    path_regexps: "tests/.+"
+    path_regexps: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+    path_regexps: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
+    path_regexps: "sdk/lib/_internal/vm_shared/.+"
+    path_regexps: "sdk/lib/_internal/vm/lib/ffi_.+"
+    path_regexps: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
+    path_regexps: "sdk/lib/_internal/wasm.+"
+    path_regexps: "sdk/lib/_js_interop/.+"
+  }
+}
+trigger {
+  id: "dart2wasm-gitiles-trigger-dev"
+  realm: "ci"
+  gitiles {
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/dev"
+    path_regexps: "DEPS"
+    path_regexps: "build/.+"
+    path_regexps: "BUILD.gn"
+    path_regexps: "sdk_args.gni"
+    path_regexps: ".dart_tool/package_config.json"
+    path_regexps: "tools/generate_package_config.py"
+    path_regexps: "tools/generate_package_config.dart"
+    path_regexps: "sdk/lib/[^_].+"
+    path_regexps: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+    path_regexps: "tools/bots/test_matrix.json"
+    path_regexps: "tests/.+"
+    path_regexps: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+    path_regexps: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
+    path_regexps: "sdk/lib/_internal/vm_shared/.+"
+    path_regexps: "sdk/lib/_internal/vm/lib/ffi_.+"
+    path_regexps: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
+    path_regexps: "sdk/lib/_internal/wasm.+"
+    path_regexps: "sdk/lib/_js_interop/.+"
+  }
+}
 trigger {
   id: "dart2wasm-gitiles-trigger-main"
   realm: "ci"
   triggers: "dart2wasm-linux-chrome"
   triggers: "dart2wasm-linux-d8"
+  triggers: "dart2wasm-linux-firefox"
+  triggers: "dart2wasm-linux-jscm-chrome"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/main"
@@ -2693,6 +2829,36 @@ trigger {
     path_regexps: "sdk/lib/_js_interop/.+"
   }
 }
+trigger {
+  id: "dart2wasm-gitiles-trigger-stable"
+  realm: "ci"
+  triggers: "dart2wasm-linux-chrome-stable"
+  triggers: "dart2wasm-linux-d8-stable"
+  triggers: "dart2wasm-linux-firefox-stable"
+  triggers: "dart2wasm-linux-jscm-chrome-stable"
+  gitiles {
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/stable"
+    path_regexps: "DEPS"
+    path_regexps: "build/.+"
+    path_regexps: "BUILD.gn"
+    path_regexps: "sdk_args.gni"
+    path_regexps: ".dart_tool/package_config.json"
+    path_regexps: "tools/generate_package_config.py"
+    path_regexps: "tools/generate_package_config.dart"
+    path_regexps: "sdk/lib/[^_].+"
+    path_regexps: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+    path_regexps: "tools/bots/test_matrix.json"
+    path_regexps: "tests/.+"
+    path_regexps: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+    path_regexps: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
+    path_regexps: "sdk/lib/_internal/vm_shared/.+"
+    path_regexps: "sdk/lib/_internal/vm/lib/ffi_.+"
+    path_regexps: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
+    path_regexps: "sdk/lib/_internal/wasm.+"
+    path_regexps: "sdk/lib/_js_interop/.+"
+  }
+}
 trigger {
   id: "ddc-gitiles-trigger-main"
   realm: "ci"

From 2c93161ad5337b6fd08f9f8c69e91da321d8b080 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Fri, 15 Dec 2023 21:46:34 +0000
Subject: [PATCH 718/826] [infra] Reduce debug Windows ARM64 builders to
 nightly.

Change-Id: I6adf71b5df5e21273ec2b68848bd5fb705691d66
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/342086
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Yusuf Mohsinally <mohsinally@google.com>
---
 generated/commit-queue.cfg   |  16 ----
 generated/cr-buildbucket.cfg | 140 ++---------------------------------
 generated/luci-milo.cfg      |  20 -----
 generated/luci-notify.cfg    |   8 +-
 generated/luci-scheduler.cfg |  48 +-----------
 generated/project.cfg        |   2 +-
 vm.star                      |   4 +-
 7 files changed, 17 insertions(+), 221 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index af998dd8441e..e3b9a417fbd9 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -1363,10 +1363,6 @@ config_groups {
         name: "dart/try/vm-aot-mac-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-aot-win-debug-arm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-aot-win-release-arm64-try"
         includable_only: true
@@ -1613,10 +1609,6 @@ config_groups {
         name: "dart/try/vm-mac-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-win-debug-arm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-win-debug-x64-try"
         includable_only: true
@@ -4873,10 +4865,6 @@ config_groups {
         name: "dart/try/vm-aot-mac-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-aot-win-debug-arm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-aot-win-release-arm64-try"
         includable_only: true
@@ -5123,10 +5111,6 @@ config_groups {
         name: "dart/try/vm-mac-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-win-debug-arm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-win-debug-x64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 418c2ffea775..de8f2aa59c5c 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -6304,76 +6304,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-aot-win-debug-arm64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.prod"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 60
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-aot-win-debug-arm64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.prod"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 60
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9805,76 +9740,11 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-win-debug-arm64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.prod"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 60
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-win-debug-arm64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.prod"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 60
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13275,6 +13145,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
@@ -15000,6 +14871,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 63c4bd4e0ab2..590e8d84ee0c 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -2018,11 +2018,6 @@ consoles {
     category: "vm|jit"
     short_name: "wr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-arm64-beta"
-    category: "vm|jit"
-    short_name: "wad"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-arm64-beta"
     category: "vm|jit"
@@ -2063,11 +2058,6 @@ consoles {
     category: "vm|aot"
     short_name: "wr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-debug-arm64-beta"
-    category: "vm|aot"
-    short_name: "wad"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-release-arm64-beta"
     category: "vm|aot"
@@ -2402,11 +2392,6 @@ consoles {
     category: "vm|jit"
     short_name: "wr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-arm64-stable"
-    category: "vm|jit"
-    short_name: "wad"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-arm64-stable"
     category: "vm|jit"
@@ -2447,11 +2432,6 @@ consoles {
     category: "vm|aot"
     short_name: "wr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-debug-arm64-stable"
-    category: "vm|aot"
-    short_name: "wad"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-release-arm64-stable"
     category: "vm|aot"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 51dc2475fdeb..0137fdc8d864 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -730,7 +730,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
@@ -1293,7 +1295,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index e3cc93745103..c6c090467946 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1334,26 +1334,6 @@ job {
     builder: "vm-aot-win-debug-arm64"
   }
 }
-job {
-  id: "vm-aot-win-debug-arm64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-aot-win-debug-arm64-beta"
-  }
-}
-job {
-  id: "vm-aot-win-debug-arm64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-aot-win-debug-arm64-stable"
-  }
-}
 job {
   id: "vm-aot-win-debug-x64c"
   realm: "ci.sandbox"
@@ -2264,26 +2244,6 @@ job {
     builder: "vm-win-debug-arm64"
   }
 }
-job {
-  id: "vm-win-debug-arm64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-win-debug-arm64-beta"
-  }
-}
-job {
-  id: "vm-win-debug-arm64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-win-debug-arm64-stable"
-  }
-}
 job {
   id: "vm-win-debug-x64"
   realm: "ci.sandbox"
@@ -2436,7 +2396,6 @@ trigger {
   triggers: "vm-aot-linux-release-simarm_x64-beta"
   triggers: "vm-aot-linux-release-x64-beta"
   triggers: "vm-aot-mac-release-x64-beta"
-  triggers: "vm-aot-win-debug-arm64-beta"
   triggers: "vm-aot-win-release-arm64-beta"
   triggers: "vm-aot-win-release-x64-beta"
   triggers: "vm-appjit-linux-debug-x64-beta"
@@ -2459,7 +2418,6 @@ trigger {
   triggers: "vm-mac-debug-x64-beta"
   triggers: "vm-mac-release-arm64-beta"
   triggers: "vm-mac-release-x64-beta"
-  triggers: "vm-win-debug-arm64-beta"
   triggers: "vm-win-debug-x64-beta"
   triggers: "vm-win-release-arm64-beta"
   triggers: "vm-win-release-x64-beta"
@@ -2554,7 +2512,6 @@ trigger {
   triggers: "vm-aot-linux-release-simarm_x64-stable"
   triggers: "vm-aot-linux-release-x64-stable"
   triggers: "vm-aot-mac-release-x64-stable"
-  triggers: "vm-aot-win-debug-arm64-stable"
   triggers: "vm-aot-win-release-arm64-stable"
   triggers: "vm-aot-win-release-x64-stable"
   triggers: "vm-appjit-linux-debug-x64-stable"
@@ -2577,7 +2534,6 @@ trigger {
   triggers: "vm-mac-debug-x64-stable"
   triggers: "vm-mac-release-arm64-stable"
   triggers: "vm-mac-release-x64-stable"
-  triggers: "vm-win-debug-arm64-stable"
   triggers: "vm-win-debug-x64-stable"
   triggers: "vm-win-release-arm64-stable"
   triggers: "vm-win-release-x64-stable"
@@ -2616,6 +2572,7 @@ trigger {
   triggers: "vm-aot-optimization-level-linux-release-x64"
   triggers: "vm-aot-tsan-linux-release-x64"
   triggers: "vm-aot-ubsan-linux-release-x64"
+  triggers: "vm-aot-win-debug-arm64"
   triggers: "vm-aot-win-debug-x64c"
   triggers: "vm-aot-win-product-x64"
   triggers: "vm-appjit-linux-product-x64"
@@ -2637,6 +2594,7 @@ trigger {
   triggers: "vm-reload-rollback-linux-release-x64"
   triggers: "vm-tsan-linux-release-x64"
   triggers: "vm-ubsan-linux-release-x64"
+  triggers: "vm-win-debug-arm64"
   triggers: "vm-win-debug-x64c"
   triggers: "vm-win-release-ia32"
   gitiles {
@@ -2655,7 +2613,6 @@ trigger {
   triggers: "vm-aot-linux-release-x64"
   triggers: "vm-aot-mac-release-arm64"
   triggers: "vm-aot-mac-release-x64"
-  triggers: "vm-aot-win-debug-arm64"
   triggers: "vm-aot-win-release-arm64"
   triggers: "vm-aot-win-release-x64"
   triggers: "vm-appjit-linux-debug-x64"
@@ -2680,7 +2637,6 @@ trigger {
   triggers: "vm-mac-debug-x64"
   triggers: "vm-mac-release-arm64"
   triggers: "vm-mac-release-x64"
-  triggers: "vm-win-debug-arm64"
   triggers: "vm-win-debug-x64"
   triggers: "vm-win-release-arm64"
   triggers: "vm-win-release-x64"
diff --git a/generated/project.cfg b/generated/project.cfg
index 69b42df85e6e..f9918ea3d22a 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.42.1"
+  version: "1.43.1"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/vm.star b/vm.star
index 27c656ebbb87..e621d4a90334 100644
--- a/vm.star
+++ b/vm.star
@@ -154,7 +154,7 @@ _vm_builder(
     category = "vm|jit|wr",
     dimensions = windows,
 )
-_vm_builder(
+_nightly_builder(
     "vm-win-debug-arm64",
     category = "vm|jit|wad",
     dimensions = [windows11, arm64, flutter_pool],
@@ -235,7 +235,7 @@ _vm_builder(
     category = "vm|aot|wr",
     dimensions = windows,
 )
-_vm_builder(
+_nightly_builder(
     "vm-aot-win-debug-arm64",
     category = "vm|aot|wad",
     dimensions = [windows11, arm64, flutter_pool],

From 0ad4133846bc72f3599f88ae799ccc5e387f1a9f Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 19 Dec 2023 09:56:37 +0000
Subject: [PATCH 719/826] [infra] Remove some dart2wasm builders from the
 default CQ
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Firefox in particular blocks CQs with false positives. In general, we don't want experimental configurations on the CQ by default.

Change-Id: Id28698f2cd967d1c6a2a40520e051fd318e2eedc
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/342580
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: Ömer Ağacan <omersa@google.com>
---
 dart2wasm.star             |   2 -
 generated/commit-queue.cfg | 636 +++----------------------------------
 generated/project.cfg      |   2 +-
 3 files changed, 52 insertions(+), 588 deletions(-)

diff --git a/dart2wasm.star b/dart2wasm.star
index cfb906b67971..d0ecad59a09c 100644
--- a/dart2wasm.star
+++ b/dart2wasm.star
@@ -34,7 +34,6 @@ dart.ci_sandbox_builder(
     "dart2wasm-linux-jscm-chrome",
     category = "d2w|cm",
     properties = [chrome, emscripten, no_android],
-    location_filters = paths.to_location_filters(paths.dart2wasm),
     triggered_by = ["dart2wasm-gitiles-trigger-%s"],
 )
 
@@ -42,6 +41,5 @@ dart.ci_sandbox_builder(
     "dart2wasm-linux-firefox",
     category = "d2w|f",
     properties = [firefox, emscripten, no_android],
-    location_filters = paths.to_location_filters(paths.dart2wasm),
     triggered_by = ["dart2wasm-gitiles-trigger-%s"],
 )
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index e3b9a417fbd9..154b7355caad 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -862,189 +862,11 @@ config_groups {
       }
       builders {
         name: "dart/try/dart2wasm-linux-firefox-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/generate_package_config.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/generate_package_config.dart"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm_shared/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/wasm.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
-        }
+        includable_only: true
       }
       builders {
         name: "dart/try/dart2wasm-linux-jscm-chrome-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/generate_package_config.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/generate_package_config.dart"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm_shared/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/wasm.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
-        }
+        includable_only: true
       }
       builders {
         name: "dart/try/ddc-linux-chrome-try"
@@ -2044,207 +1866,15 @@ config_groups {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
           path_regexp: "utils/compiler/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
-        }
-      }
-      builders {
-        name: "dart/try/dart2js-hostasserts-linux-unsound-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/generate_package_config.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/generate_package_config.dart"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/js.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "utils/compiler/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
-        }
-      }
-      builders {
-        name: "dart/try/dart2js-linux-chrome-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/generate_package_config.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/generate_package_config.dart"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/js.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "utils/compiler/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
-        }
-      }
-      builders {
-        name: "dart/try/dart2js-linux-firefox-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-mac-chrome-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-mac-safari-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/dart2js-minified-csp-linux-chrome-try"
-        includable_only: true
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
+        }
       }
       builders {
-        name: "dart/try/dart2js-minified-linux-d8-try"
+        name: "dart/try/dart2js-hostasserts-linux-unsound-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2332,7 +1962,7 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/dart2js-unit-linux-x64-release-try"
+        name: "dart/try/dart2js-linux-chrome-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2420,11 +2050,23 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/dart2js-win-chrome-try"
+        name: "dart/try/dart2js-linux-firefox-try"
         includable_only: true
       }
       builders {
-        name: "dart/try/dart2wasm-linux-chrome-try"
+        name: "dart/try/dart2js-mac-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-mac-safari-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-minified-csp-linux-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2js-minified-linux-d8-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2488,36 +2130,31 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm_shared/.+"
+          path_regexp: "sdk/lib/_js_interop/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
+          path_regexp: "sdk/lib/_internal/js.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/wasm.+"
+          path_regexp: "utils/compiler/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
       builders {
-        name: "dart/try/dart2wasm-linux-d8-try"
+        name: "dart/try/dart2js-unit-linux-x64-release-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2581,36 +2218,35 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm_shared/.+"
+          path_regexp: "sdk/lib/_js_interop/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
+          path_regexp: "sdk/lib/_internal/js.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
+          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/wasm.+"
+          path_regexp: "utils/compiler/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
+          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
       builders {
-        name: "dart/try/dart2wasm-linux-firefox-try"
+        name: "dart/try/dart2js-win-chrome-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2wasm-linux-chrome-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2703,7 +2339,7 @@ config_groups {
         }
       }
       builders {
-        name: "dart/try/dart2wasm-linux-jscm-chrome-try"
+        name: "dart/try/dart2wasm-linux-d8-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2795,6 +2431,14 @@ config_groups {
           path_regexp: "sdk/lib/_js_interop/.+"
         }
       }
+      builders {
+        name: "dart/try/dart2wasm-linux-firefox-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/dart2wasm-linux-jscm-chrome-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/ddc-canary-linux-chrome-try"
         includable_only: true
@@ -4364,189 +4008,11 @@ config_groups {
       }
       builders {
         name: "dart/try/dart2wasm-linux-firefox-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/generate_package_config.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/generate_package_config.dart"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm_shared/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/wasm.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
-        }
+        includable_only: true
       }
       builders {
         name: "dart/try/dart2wasm-linux-jscm-chrome-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/generate_package_config.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/generate_package_config.dart"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm_shared/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/wasm.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
-        }
+        includable_only: true
       }
       builders {
         name: "dart/try/ddc-linux-chrome-try"
diff --git a/generated/project.cfg b/generated/project.cfg
index f9918ea3d22a..69b42df85e6e 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.43.1"
+  version: "1.42.1"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"

From 11734e74335c2ef3b22ad00956fdde3e3d401b02 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 9 Jan 2024 17:37:24 +0000
Subject: [PATCH 720/826] [infra] Add vm-aot-win-debug-x64 builder.

Bug: https://github.com/dart-lang/sdk/issues/54206
Change-Id: Iadb16a7bad69c7f66163201cb207061561f7acf0
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/340022
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/commit-queue.cfg   |  4 ++
 generated/cr-buildbucket.cfg | 74 ++++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      | 13 +++++++
 generated/luci-notify.cfg    | 13 +++++++
 generated/luci-scheduler.cfg | 11 ++++++
 generated/project.cfg        |  2 +-
 vm.star                      |  5 +++
 7 files changed, 121 insertions(+), 1 deletion(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 154b7355caad..8e89c7041cda 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -2952,6 +2952,10 @@ config_groups {
         name: "dart/try/vm-aot-win-debug-arm64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-win-debug-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-win-debug-x64c-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index de8f2aa59c5c..323db167b3c4 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -6316,6 +6316,43 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-win-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-win-debug-x64c"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13157,6 +13194,43 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-win-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": false,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-win-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 590e8d84ee0c..bfa82d56c447 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -139,6 +139,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-mac-release-x64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-aot-win-debug-x64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-win-release-x64-try"
   }
@@ -716,6 +719,11 @@ consoles {
     category: "vm|aot"
     short_name: "m"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-debug-x64"
+    category: "vm|aot"
+    short_name: "wd"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-release-x64"
     category: "vm|aot"
@@ -1520,6 +1528,11 @@ consoles {
     category: "vm|aot"
     short_name: "m"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-debug-x64"
+    category: "vm|aot"
+    short_name: "wd"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-release-x64"
     category: "vm|aot"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 0137fdc8d864..f14b743d75df 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -740,6 +740,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-win-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index c6c090467946..9e06ecf7cbff 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1334,6 +1334,16 @@ job {
     builder: "vm-aot-win-debug-arm64"
   }
 }
+job {
+  id: "vm-aot-win-debug-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-win-debug-x64"
+  }
+}
 job {
   id: "vm-aot-win-debug-x64c"
   realm: "ci.sandbox"
@@ -2573,6 +2583,7 @@ trigger {
   triggers: "vm-aot-tsan-linux-release-x64"
   triggers: "vm-aot-ubsan-linux-release-x64"
   triggers: "vm-aot-win-debug-arm64"
+  triggers: "vm-aot-win-debug-x64"
   triggers: "vm-aot-win-debug-x64c"
   triggers: "vm-aot-win-product-x64"
   triggers: "vm-appjit-linux-product-x64"
diff --git a/generated/project.cfg b/generated/project.cfg
index 69b42df85e6e..148d9d223da0 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.42.1"
+  version: "1.43.3"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/vm.star b/vm.star
index e621d4a90334..eb77cce5440e 100644
--- a/vm.star
+++ b/vm.star
@@ -230,6 +230,11 @@ _vm_builder(
     dimensions = [mac, {"cores": "8"}],
     properties = slow_shards,
 )
+_nightly_builder(
+    "vm-aot-win-debug-x64",
+    category = "vm|aot|wd",
+    dimensions = windows,
+)
 _vm_builder(
     "vm-aot-win-release-x64",
     category = "vm|aot|wr",

From 05546cea9424d090ab0f10042d58a447313eba82 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 9 Jan 2024 18:09:48 +0000
Subject: [PATCH 721/826] [infra] Run Windows tests on CQ.

Change-Id: Id2cdf240ada009ae81144348d126f8b4a14e1ed1
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/342101
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/commit-queue.cfg | 188 +++++++++++++++++++------------------
 sdk.star                   |   1 -
 vm.star                    |   2 +-
 3 files changed, 97 insertions(+), 94 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 8e89c7041cda..9b76c1061b75 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -389,6 +389,7 @@ config_groups {
       }
       builders {
         name: "dart/try/dart-sdk-win-try"
+        includable_only: true
       }
       builders {
         name: "dart/try/dart2js-linux-chrome-try"
@@ -1346,6 +1347,22 @@ config_groups {
       }
       builders {
         name: "dart/try/vm-mac-release-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-mac-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-win-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-win-release-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-win-release-x64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1427,22 +1444,6 @@ config_groups {
           path_regexp: "sdk/lib/_internal/vm.+"
         }
       }
-      builders {
-        name: "dart/try/vm-mac-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-win-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-win-release-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-win-release-x64-try"
-        includable_only: true
-      }
       retry_config {}
     }
   }
@@ -1520,6 +1521,7 @@ config_groups {
       }
       builders {
         name: "dart/try/dart-sdk-win-try"
+        includable_only: true
       }
       builders {
         name: "dart/try/dev-try"
@@ -1780,6 +1782,7 @@ config_groups {
       }
       builders {
         name: "dart/try/dart-sdk-win-try"
+        includable_only: true
       }
       builders {
         name: "dart/try/dart2js-canary-linux-try"
@@ -3177,6 +3180,66 @@ config_groups {
       }
       builders {
         name: "dart/try/vm-mac-release-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-mac-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-msan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-msvc-windows-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-reload-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-reload-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-reload-rollback-linux-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-reload-rollback-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-tsan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ubsan-linux-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-win-debug-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-win-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-win-debug-x64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-win-release-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-win-release-ia32-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-win-release-x64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3258,66 +3321,6 @@ config_groups {
           path_regexp: "sdk/lib/_internal/vm.+"
         }
       }
-      builders {
-        name: "dart/try/vm-mac-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-msan-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-msvc-windows-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-reload-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-reload-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-reload-rollback-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-reload-rollback-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-tsan-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-ubsan-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-win-debug-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-win-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-win-debug-x64c-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-win-release-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-win-release-ia32-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-win-release-x64-try"
-        includable_only: true
-      }
       retry_config {}
     }
   }
@@ -3539,6 +3542,7 @@ config_groups {
       }
       builders {
         name: "dart/try/dart-sdk-win-try"
+        includable_only: true
       }
       builders {
         name: "dart/try/dart2js-linux-chrome-try"
@@ -4496,6 +4500,22 @@ config_groups {
       }
       builders {
         name: "dart/try/vm-mac-release-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-mac-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-win-debug-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-win-release-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-win-release-x64-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -4577,22 +4597,6 @@ config_groups {
           path_regexp: "sdk/lib/_internal/vm.+"
         }
       }
-      builders {
-        name: "dart/try/vm-mac-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-win-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-win-release-arm64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-win-release-x64-try"
-        includable_only: true
-      }
       retry_config {}
     }
   }
diff --git a/sdk.star b/sdk.star
index 5f82ce7f2bae..3d7d1e493724 100644
--- a/sdk.star
+++ b/sdk.star
@@ -118,7 +118,6 @@ dart.try_builder(
     dimensions = windows,
     properties = {"archs": ["ia32", "x64"], "disable_bcid": True},
     recipe = "release/sdk",
-    on_cq = True,
 )
 
 dart.try_builder(
diff --git a/vm.star b/vm.star
index eb77cce5440e..3ce5a6265e32 100644
--- a/vm.star
+++ b/vm.star
@@ -126,7 +126,6 @@ _vm_builder(
     category = "vm|jit|m1r",
     dimensions = [mac, arm64],
     properties = no_android,
-    on_cq = True,
 )
 _vm_builder(
     "vm-checked-mac-release-arm64",
@@ -153,6 +152,7 @@ _vm_builder(
     "vm-win-release-x64",
     category = "vm|jit|wr",
     dimensions = windows,
+    on_cq = True,
 )
 _nightly_builder(
     "vm-win-debug-arm64",

From 090829e5c831cd8a18edd39ba4b58366abef3432 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Thu, 11 Jan 2024 10:05:46 +0000
Subject: [PATCH 722/826] [infra] Changes to package:vm_service should trigger
 VM builders.

These tests used to run on pkg builders but now run on vm builders since https://dart-review.googlesource.com/c/sdk/+/337300.

Change-Id: I841ebc327d4635879e28a33b1f8109e8979897da
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/345582
Reviewed-by: Ben Konyi <bkonyi@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
Reviewed-by: Alexander Aprelev <aam@google.com>
---
 generated/commit-queue.cfg   | 45 ++++++++++++++++++++++++++++++++++++
 generated/luci-scheduler.cfg |  1 +
 lib/paths.star               |  3 +++
 3 files changed, 49 insertions(+)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 9b76c1061b75..c8e28fa87c74 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -1125,6 +1125,11 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm_service/.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1340,6 +1345,11 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm_service/.+"
+        }
       }
       builders {
         name: "dart/try/vm-mac-debug-x64-try"
@@ -1443,6 +1453,11 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm_service/.+"
+        }
       }
       retry_config {}
     }
@@ -2830,6 +2845,11 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm_service/.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3173,6 +3193,11 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm_service/.+"
+        }
       }
       builders {
         name: "dart/try/vm-mac-debug-x64-try"
@@ -3320,6 +3345,11 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm_service/.+"
+        }
       }
       retry_config {}
     }
@@ -4278,6 +4308,11 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm_service/.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -4493,6 +4528,11 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm_service/.+"
+        }
       }
       builders {
         name: "dart/try/vm-mac-debug-x64-try"
@@ -4596,6 +4636,11 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/vm_service/.+"
+        }
       }
       retry_config {}
     }
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 9e06ecf7cbff..865d08d2b0af 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -2670,6 +2670,7 @@ trigger {
     path_regexps: "runtime/.+"
     path_regexps: "sdk/lib/_http/.+"
     path_regexps: "sdk/lib/_internal/vm.+"
+    path_regexps: "pkg/vm_service/.+"
   }
 }
 trigger {
diff --git a/lib/paths.star b/lib/paths.star
index 8184b66167e0..34310059495c 100644
--- a/lib/paths.star
+++ b/lib/paths.star
@@ -37,6 +37,9 @@ _VM_PATHS = _CFE_PATHS + [
     "runtime/.+",
     "sdk/lib/_http/.+",
     "sdk/lib/_internal/vm.+",
+
+    # Tests that run on VM builders
+    "pkg/vm_service/.+",
 ]
 
 _WEB_PATHS = _CFE_PATHS + [

From 5a4d075ffc91cfe1d868f1396748521c0c7fde08 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 22 Jan 2024 17:26:53 +0000
Subject: [PATCH 723/826] [infra] Make changes to double-conversion and
 fallback_root_certificates trigger VM builders again.

double-conversion used to live under runtime

fallback_root_certificates used to be a separate repo and trigger VM builders because a new version would require changing the DEPS file.

Change-Id: I3ed70452a2b8e4679d21638fc209b90b139a9982
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/347386
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/commit-queue.cfg   | 90 ++++++++++++++++++++++++++++++++++++
 generated/luci-scheduler.cfg |  2 +
 lib/paths.star               |  4 ++
 3 files changed, 96 insertions(+)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index c8e28fa87c74..9489addd34e6 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -1125,6 +1125,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "third_party/double-conversion/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "third_party/fallback_root_certificates/.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1345,6 +1355,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "third_party/double-conversion/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "third_party/fallback_root_certificates/.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1453,6 +1473,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "third_party/double-conversion/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "third_party/fallback_root_certificates/.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2845,6 +2875,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "third_party/double-conversion/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "third_party/fallback_root_certificates/.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3193,6 +3233,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "third_party/double-conversion/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "third_party/fallback_root_certificates/.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3345,6 +3395,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "third_party/double-conversion/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "third_party/fallback_root_certificates/.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -4308,6 +4368,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "third_party/double-conversion/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "third_party/fallback_root_certificates/.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -4528,6 +4598,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "third_party/double-conversion/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "third_party/fallback_root_certificates/.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -4636,6 +4716,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "third_party/double-conversion/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "third_party/fallback_root_certificates/.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 865d08d2b0af..5adfb829d359 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -2670,6 +2670,8 @@ trigger {
     path_regexps: "runtime/.+"
     path_regexps: "sdk/lib/_http/.+"
     path_regexps: "sdk/lib/_internal/vm.+"
+    path_regexps: "third_party/double-conversion/.+"
+    path_regexps: "third_party/fallback_root_certificates/.+"
     path_regexps: "pkg/vm_service/.+"
   }
 }
diff --git a/lib/paths.star b/lib/paths.star
index 34310059495c..d17b85e6b7dd 100644
--- a/lib/paths.star
+++ b/lib/paths.star
@@ -38,6 +38,10 @@ _VM_PATHS = _CFE_PATHS + [
     "sdk/lib/_http/.+",
     "sdk/lib/_internal/vm.+",
 
+    # Dependencies that are copied into the SDK repo: can change without changing DEPS.
+    "third_party/double-conversion/.+",
+    "third_party/fallback_root_certificates/.+",
+
     # Tests that run on VM builders
     "pkg/vm_service/.+",
 ]

From 26b7b5293603ab1dc82d9b83d2546e52ec89d47a Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Tue, 23 Jan 2024 13:58:05 +0000
Subject: [PATCH 724/826] Add monorepo sharded builders for framework test
 subshards

Separating the builds for subshards of framework_test lets us
skip the impeller subshard, which is not ready to run on ci yet.

Dropping the existing builder from the console immedately is
correct because it has been failing for a week.

Bug: b/321903616
Bug: https://github.com/flutter/flutter/issues/141446
Change-Id: I27ae57cf95a3bcc53f177d2c00cb09be8b948c7e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/347920
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 226 ++++++++++++++++++++++++++++++++++-
 generated/luci-milo.cfg      |  46 ++++++-
 monorepo.star                |   5 +-
 3 files changed, 269 insertions(+), 8 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 323db167b3c4..65825e880bfe 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -3221,7 +3221,118 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-framework-tests"
+      name: "flutter-linux-framework-tests-libraries"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/tester"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 5400
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-linux-framework-tests-misc"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/tester"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 5400
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-linux-framework-tests-slow"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/tester"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 5400
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-linux-framework-tests-widgets"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -15629,7 +15740,118 @@ buckets {
       }
     }
     builders {
-      name: "flutter-linux-framework-tests-try"
+      name: "flutter-linux-framework-tests-libraries-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/tester"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 5400
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-linux-framework-tests-misc-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/tester"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 5400
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-linux-framework-tests-slow-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/tester"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 5400
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-linux-framework-tests-widgets-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index bfa82d56c447..e683e06f5071 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -446,7 +446,16 @@ consoles {
     name: "buildbucket/luci.dart.try.monorepo/flutter-linux-framework-coverage-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-framework-tests-try"
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-framework-tests-libraries-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-framework-tests-misc-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-framework-tests-slow-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-framework-tests-widgets-try"
   }
   builders {
     name: "buildbucket/luci.dart.try.monorepo/flutter-linux-tool-tests-try"
@@ -2771,9 +2780,24 @@ consoles {
     short_name: "coverage"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-framework-tests"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-framework-tests-libraries"
     category: "flutter-engine"
-    short_name: "tests"
+    short_name: "fl"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-framework-tests-misc"
+    category: "flutter-engine"
+    short_name: "fm"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-framework-tests-slow"
+    category: "flutter-engine"
+    short_name: "fs"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-framework-tests-widgets"
+    category: "flutter-engine"
+    short_name: "fw"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-tool-tests"
@@ -2954,8 +2978,20 @@ consoles {
     short_name: "coverage"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-framework-tests"
-    short_name: "tests"
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-framework-tests-libraries"
+    short_name: "fl"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-framework-tests-misc"
+    short_name: "fm"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-framework-tests-slow"
+    short_name: "fs"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-framework-tests-widgets"
+    short_name: "fw"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-tool-tests"
diff --git a/monorepo.star b/monorepo.star
index 445102ce3967..f3795c062ff7 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -253,7 +253,10 @@ def monorepo_tester(name, short_name, console):
 
 monorepo_tester("flutter-linux-flutter-plugins", "plugins", "flutter-engine")
 monorepo_tester("flutter-linux-framework-coverage", "coverage", "flutter-engine")
-monorepo_tester("flutter-linux-framework-tests", "tests", "flutter-engine")
+monorepo_tester("flutter-linux-framework-tests-libraries", "fl", "flutter-engine")
+monorepo_tester("flutter-linux-framework-tests-misc", "fm", "flutter-engine")
+monorepo_tester("flutter-linux-framework-tests-slow", "fs", "flutter-engine")
+monorepo_tester("flutter-linux-framework-tests-widgets", "fw", "flutter-engine")
 monorepo_tester("flutter-linux-tool-tests", "tool", "flutter-engine")
 monorepo_tester("flutter-linux-customer-testing", "customer_testing", "flutter-engine")
 monorepo_tester("flutter-linux-web-tests-0", "wt0", "flutter-web")

From 1574225244e345608b47d4e020fd26ab73d5d9a1 Mon Sep 17 00:00:00 2001
From: Martin Kustermann <kustermann@google.com>
Date: Thu, 25 Jan 2024 22:59:53 +0000
Subject: [PATCH 725/826] Add dart2wasm-linux-optimized-jsc builder

Change-Id: I7c47411c350fcc2786f0863a3f28275214108d74
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/348560
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Martin Kustermann <kustermann@google.com>
---
 dart2wasm.star               |  10 +-
 generated/commit-queue.cfg   | 279 +++++++++++++++++++++++++++++++++++
 generated/cr-buildbucket.cfg | 164 ++++++++++++++++++++
 generated/luci-milo.cfg      |  23 +++
 generated/luci-notify.cfg    |  11 ++
 generated/luci-scheduler.cfg |  33 +++++
 6 files changed, 519 insertions(+), 1 deletion(-)

diff --git a/dart2wasm.star b/dart2wasm.star
index d0ecad59a09c..e9a1b53d9da2 100644
--- a/dart2wasm.star
+++ b/dart2wasm.star
@@ -6,7 +6,7 @@ Defines the dart2wasm builders.
 """
 
 load("//lib/dart.star", "dart")
-load("//lib/defaults.star", "chrome", "emscripten", "firefox", "no_android")
+load("//lib/defaults.star", "chrome", "emscripten", "firefox", "js_engines", "no_android")
 load("//lib/paths.star", "paths")
 
 dart.poller(
@@ -22,6 +22,14 @@ dart.ci_sandbox_builder(
     triggered_by = ["dart2wasm-gitiles-trigger-%s"],
 )
 
+dart.ci_sandbox_builder(
+    "dart2wasm-linux-optimized-jsc",
+    category = "d2w|j",
+    properties = [js_engines, emscripten, no_android],
+    location_filters = paths.to_location_filters(paths.dart2wasm),
+    triggered_by = ["dart2wasm-gitiles-trigger-%s"],
+)
+
 dart.ci_sandbox_builder(
     "dart2wasm-linux-chrome",
     category = "d2w|c",
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 9489addd34e6..37081db29b1f 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -869,6 +869,99 @@ config_groups {
         name: "dart/try/dart2wasm-linux-jscm-chrome-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/dart2wasm-linux-optimized-jsc-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm_shared/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/wasm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+      }
       builders {
         name: "dart/try/ddc-linux-chrome-try"
         location_filters {
@@ -2487,6 +2580,99 @@ config_groups {
         name: "dart/try/dart2wasm-linux-jscm-chrome-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/dart2wasm-linux-optimized-jsc-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm_shared/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/wasm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+      }
       builders {
         name: "dart/try/ddc-canary-linux-chrome-try"
         includable_only: true
@@ -4112,6 +4298,99 @@ config_groups {
         name: "dart/try/dart2wasm-linux-jscm-chrome-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/dart2wasm-linux-optimized-jsc-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm_shared/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/wasm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+      }
       builders {
         name: "dart/try/ddc-linux-chrome-try"
         location_filters {
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 65825e880bfe..367481405a9d 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -2128,6 +2128,129 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "dart2wasm-linux-optimized-jsc"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "checkout_javascript_engines": true,'
+        '    "download_android_deps": false,'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2wasm-linux-optimized-jsc-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "checkout_javascript_engines": true,'
+        '    "download_android_deps": false,'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2wasm-linux-optimized-jsc-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "checkout_javascript_engines": true,'
+        '    "download_android_deps": false,'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "ddc-canary-linux-chrome"
       swarming_host: "chromium-swarm.appspot.com"
@@ -11455,6 +11578,47 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "dart2wasm-linux-optimized-jsc-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "enable_ats": true,'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "checkout_javascript_engines": true,'
+        '    "download_android_deps": false,'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "ddc-canary-linux-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index e683e06f5071..9a6731677a8e 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -46,6 +46,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/dart2wasm-linux-d8-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/dart2wasm-linux-optimized-jsc-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/dart2wasm-linux-chrome-try"
   }
@@ -573,6 +576,11 @@ consoles {
     category: "d2w"
     short_name: "d"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-optimized-jsc"
+    category: "d2w"
+    short_name: "j"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-chrome"
     category: "d2w"
@@ -1232,6 +1240,11 @@ consoles {
     category: "d2w"
     short_name: "d"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-optimized-jsc"
+    category: "d2w"
+    short_name: "j"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-chrome"
     category: "d2w"
@@ -1965,6 +1978,11 @@ consoles {
     category: "d2w"
     short_name: "d"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-optimized-jsc-beta"
+    category: "d2w"
+    short_name: "j"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-chrome-beta"
     category: "d2w"
@@ -2339,6 +2357,11 @@ consoles {
     category: "d2w"
     short_name: "d"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-optimized-jsc-stable"
+    category: "d2w"
+    short_name: "j"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-chrome-stable"
     category: "d2w"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index f14b743d75df..200a619bdc80 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -224,6 +224,17 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "dart2wasm-linux-optimized-jsc"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 5adfb829d359..e396875a05ee 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -524,6 +524,36 @@ job {
     builder: "dart2wasm-linux-jscm-chrome-stable"
   }
 }
+job {
+  id: "dart2wasm-linux-optimized-jsc"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "dart2wasm-linux-optimized-jsc"
+  }
+}
+job {
+  id: "dart2wasm-linux-optimized-jsc-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "dart2wasm-linux-optimized-jsc-beta"
+  }
+}
+job {
+  id: "dart2wasm-linux-optimized-jsc-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "dart2wasm-linux-optimized-jsc-stable"
+  }
+}
 job {
   id: "ddc-canary-linux-chrome"
   realm: "ci.sandbox"
@@ -2720,6 +2750,7 @@ trigger {
   triggers: "dart2wasm-linux-d8-beta"
   triggers: "dart2wasm-linux-firefox-beta"
   triggers: "dart2wasm-linux-jscm-chrome-beta"
+  triggers: "dart2wasm-linux-optimized-jsc-beta"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/beta"
@@ -2776,6 +2807,7 @@ trigger {
   triggers: "dart2wasm-linux-d8"
   triggers: "dart2wasm-linux-firefox"
   triggers: "dart2wasm-linux-jscm-chrome"
+  triggers: "dart2wasm-linux-optimized-jsc"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/main"
@@ -2806,6 +2838,7 @@ trigger {
   triggers: "dart2wasm-linux-d8-stable"
   triggers: "dart2wasm-linux-firefox-stable"
   triggers: "dart2wasm-linux-jscm-chrome-stable"
+  triggers: "dart2wasm-linux-optimized-jsc-stable"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/stable"

From 021920dfe458a145c59e3d98454eb666cbda23df Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 26 Jan 2024 09:43:56 +0000
Subject: [PATCH 726/826] [infra] Remove dart2wasm-jsc from the default CQ

It is currently purple, and we don't know how well it works on CI, yet.

Change-Id: I57a79574be5b011fb7f751c59f3f1a65af1aeec7
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/348502
Reviewed-by: Martin Kustermann <kustermann@google.com>
Auto-Submit: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 dart2wasm.star             |   1 -
 generated/commit-queue.cfg | 273 +------------------------------------
 2 files changed, 3 insertions(+), 271 deletions(-)

diff --git a/dart2wasm.star b/dart2wasm.star
index e9a1b53d9da2..7a473113a664 100644
--- a/dart2wasm.star
+++ b/dart2wasm.star
@@ -26,7 +26,6 @@ dart.ci_sandbox_builder(
     "dart2wasm-linux-optimized-jsc",
     category = "d2w|j",
     properties = [js_engines, emscripten, no_android],
-    location_filters = paths.to_location_filters(paths.dart2wasm),
     triggered_by = ["dart2wasm-gitiles-trigger-%s"],
 )
 
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 37081db29b1f..6d183c0639bc 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -871,96 +871,7 @@ config_groups {
       }
       builders {
         name: "dart/try/dart2wasm-linux-optimized-jsc-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/generate_package_config.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/generate_package_config.dart"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm_shared/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/wasm.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
-        }
+        includable_only: true
       }
       builders {
         name: "dart/try/ddc-linux-chrome-try"
@@ -2582,96 +2493,7 @@ config_groups {
       }
       builders {
         name: "dart/try/dart2wasm-linux-optimized-jsc-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/generate_package_config.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/generate_package_config.dart"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm_shared/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/wasm.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
-        }
+        includable_only: true
       }
       builders {
         name: "dart/try/ddc-canary-linux-chrome-try"
@@ -4300,96 +4122,7 @@ config_groups {
       }
       builders {
         name: "dart/try/dart2wasm-linux-optimized-jsc-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/generate_package_config.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/generate_package_config.dart"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm_shared/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/wasm.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
-        }
+        includable_only: true
       }
       builders {
         name: "dart/try/ddc-linux-chrome-try"

From f765ed9f3f0b39d74499813e6d8990fbeeb33c3b Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Wed, 31 Jan 2024 17:46:28 +0000
Subject: [PATCH 727/826] [infra] Include linux-riscv64 and win-arm64 builders
 in the stable SDK console.

Change-Id: I61f37a143e3228968b0288c90f9f0cde135bec87
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/349442
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/luci-milo.cfg | 10 ++++++++++
 sdk.star                |  2 --
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 9a6731677a8e..be61d6bd260d 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -2322,6 +2322,11 @@ consoles {
     category: "sdk"
     short_name: "la"
   }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-linux-riscv64-stable"
+    category: "sdk"
+    short_name: "lv"
+  }
   builders {
     name: "buildbucket/luci.dart-internal.ci/dart-sdk-mac-stable"
     category: "sdk"
@@ -2337,6 +2342,11 @@ consoles {
     category: "sdk"
     short_name: "w"
   }
+  builders {
+    name: "buildbucket/luci.dart-internal.ci/dart-sdk-win-arm64-stable"
+    category: "sdk"
+    short_name: "wa"
+  }
   builders {
     name: "buildbucket/luci.dart-internal.ci/debian-x64-stable"
     category: "sdk"
diff --git a/sdk.star b/sdk.star
index 3d7d1e493724..9db4af44549c 100644
--- a/sdk.star
+++ b/sdk.star
@@ -35,8 +35,6 @@ def sdk_builder_category():
             ["win", "w"],
             ["win-arm64", "wa"],
         ]:
-            if channel == "stable" and builder_type in ["linux-riscv64", "win-arm64"]:
-                continue
             luci.console_view_entry(
                 builder = "dart-internal:ci/dart-sdk-%s-%s" %
                           (builder_type, channel),

From f25fe38bd2b628f56d8e1c77088b6e1fdbd1f5aa Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Wed, 7 Feb 2024 11:46:47 +0000
Subject: [PATCH 728/826] Add commit queue for deps.

Bug: b/323834062
Change-Id: Iade6ddbf8e7bdb1b8a1ee1fa2189134292d5d4bd
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/350301
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 cq.star                    |  1 +
 generated/commit-queue.cfg | 27 +++++++++++++++++++++++++++
 generated/project.cfg      |  2 +-
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/cq.star b/cq.star
index a3732d9d6f77..eef8a86c1d0b 100644
--- a/cq.star
+++ b/cq.star
@@ -64,6 +64,7 @@ basic_cq("dart-docker", [
         builder = "docker-try",
     ),
 ])
+basic_cq("deps")
 basic_cq("flute")
 basic_cq("homebrew-dart", [
     luci.cq_tryjob_verifier(
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 6d183c0639bc..e6f3c99c2309 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -68,6 +68,33 @@ config_groups {
     }
   }
 }
+config_groups {
+  name: "deps"
+  gerrit {
+    url: "https://dart-review.googlesource.com"
+    projects {
+      name: "deps"
+      ref_regexp: "refs/heads/main"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "project-dart-committers"
+      dry_run_access_list: "project-dart-tryjob-access"
+      allow_submit_with_open_deps: true
+    }
+    tree_status {
+      url: "https://dart-status.appspot.com"
+    }
+    tryjob {
+      builders {
+        name: "dart/try.shared/presubmit-try"
+        disable_reuse: true
+      }
+      retry_config {}
+    }
+  }
+}
 config_groups {
   name: "flute"
   gerrit {
diff --git a/generated/project.cfg b/generated/project.cfg
index 148d9d223da0..0490305cf263 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.43.3"
+  version: "1.43.4"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"

From d402f598327ad141b447272d7521440ad77f9696 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Wed, 14 Feb 2024 21:17:30 +0000
Subject: [PATCH 729/826] [infra] Move pkg-win-release-arm64 to the
 luci.flutter.prod pool.

Change-Id: I6f94762e35144afe586dc2a0254b255a66c5d8fd
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/352721
Reviewed-by: Yusuf Mohsinally <mohsinally@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/cr-buildbucket.cfg | 8 ++++----
 lib/defaults.star            | 2 --
 pkg.star                     | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 367481405a9d..a91feb0d8e5c 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5116,7 +5116,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
+      dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
@@ -5149,7 +5149,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
+      dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
@@ -5182,7 +5182,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
+      dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
@@ -12565,7 +12565,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
       dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.staging"
+      dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
diff --git a/lib/defaults.star b/lib/defaults.star
index b5d389d14d6a..6c3203bec110 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -38,7 +38,6 @@ _WINDOWS10 = {"os": "Windows-10"}
 _WINDOWS11 = {"os": "Windows-11"}
 
 _FLUTTER_POOL = {"pool": "luci.flutter.prod"}
-_FLUTTER_STAGING_POOL = {"pool": "luci.flutter.staging"}
 _EXPERIMENTAL = {"host_class": "experimental"}
 
 defaults = struct(
@@ -52,7 +51,6 @@ defaults = struct(
 arm64 = _ARM64
 experimental = _EXPERIMENTAL
 flutter_pool = _FLUTTER_POOL
-flutter_staging_pool = _FLUTTER_STAGING_POOL
 focal = _FOCAL
 jammy = _JAMMY
 linux = _FOCAL
diff --git a/pkg.star b/pkg.star
index 24ecb7af8487..246c670af87b 100644
--- a/pkg.star
+++ b/pkg.star
@@ -10,7 +10,7 @@ load(
     "//lib/defaults.star",
     "arm64",
     "chrome",
-    "flutter_staging_pool",
+    "flutter_pool",
     "jammy",
     "mac",
     "no_android",
@@ -54,7 +54,7 @@ dart.ci_sandbox_builder(
 dart.ci_sandbox_builder(
     "pkg-win-release-arm64",
     category = "pkg|wa",
-    dimensions = [windows11, arm64, flutter_staging_pool],
+    dimensions = [windows11, arm64, flutter_pool],
     goma = False,  # no such package: infra_internal/goma/client/windows-arm64
     properties = {"clobber": False},
 )

From ff824cea46a7fbac6ecaebe2d4bb947e215fad66 Mon Sep 17 00:00:00 2001
From: Martin Kustermann <kustermann@google.com>
Date: Fri, 16 Feb 2024 08:09:29 +0000
Subject: [PATCH 730/826] Remove --no-clang from dart-sdk-linux-riscv64 builder

* almost all developers use all clang
* we test mostly with clang ourselves as well as CI
* GCC sometimes has build failures that Clang doesn't have

Better to rely on clang for building as it has most test coverage and
least chance of breaking the build after CLs land.

This is a revert of [0].
=> It seems that `tools/build.py -mrelease -ariscv64 create_sdk` builds
juts fine. Seemingly no need for --no-clang anymore

[0]  https://dart-review.googlesource.com/c/sdk/+/278902

Change-Id: I7a223e16e307992127102ea240ea29ab46bc5fed
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/351124
Reviewed-by: Jonas Termansen <sortie@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 3 ---
 sdk.star                     | 1 -
 2 files changed, 4 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index a91feb0d8e5c..1e7d5ca7897b 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -10734,9 +10734,6 @@ buckets {
         '  "archs": ['
         '    "riscv64"'
         '  ],'
-        '  "args": ['
-        '    "--no-clang"'
-        '  ],'
         '  "clobber": true,'
         '  "disable_bcid": true,'
         '  "recipe": "release/sdk"'
diff --git a/sdk.star b/sdk.star
index 9db4af44549c..4a6943a77a04 100644
--- a/sdk.star
+++ b/sdk.star
@@ -85,7 +85,6 @@ dart.try_builder(
             "timeout": 120 * 60,  # 120 minutes,
         },
         "archs": ["riscv64"],
-        "args": ["--no-clang"],
         "disable_bcid": True,
     },
     recipe = "release/sdk",

From f4cc0511e5ed5ac5ae9530b72dbbc5c234678ffa Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Wed, 28 Feb 2024 14:36:13 +0000
Subject: [PATCH 731/826] [infra] Don't download reclient on windows-arm64.

No such cipd package is available.

Bug: b/296994239
Change-Id: I92ea5b7d33ef621e641605d13ae81a602cd20f4d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/354901
Commit-Queue: William Hesse <whesse@google.com>
Auto-Submit: Jonas Termansen <sortie@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 48 ++++++++++++++++++++++++++++++++++++
 lib/defaults.star            |  2 ++
 pkg.star                     |  3 ++-
 vm.star                      |  9 ++++---
 4 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 1e7d5ca7897b..fca5449a3b7d 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5134,6 +5134,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "download_reclient": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5167,6 +5170,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "download_reclient": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -5200,6 +5206,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "download_reclient": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6540,6 +6549,9 @@ buckets {
         '  },'
         '  "bisection_enabled": true,'
         '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "download_reclient": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6685,6 +6697,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "download_reclient": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6718,6 +6733,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "download_reclient": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6751,6 +6769,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "download_reclient": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -10013,6 +10034,9 @@ buckets {
         '  },'
         '  "bisection_enabled": true,'
         '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "download_reclient": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -10194,6 +10218,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "download_reclient": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -10227,6 +10254,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "download_reclient": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -10260,6 +10290,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "download_reclient": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -12580,6 +12613,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "download_reclient": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13456,6 +13492,9 @@ buckets {
         '  },'
         '  "bisection_enabled": true,'
         '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "download_reclient": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13601,6 +13640,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "download_reclient": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -15219,6 +15261,9 @@ buckets {
         '  },'
         '  "bisection_enabled": true,'
         '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "download_reclient": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -15326,6 +15371,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "download_reclient": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
diff --git a/lib/defaults.star b/lib/defaults.star
index 6c3203bec110..6e00af76c969 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -22,6 +22,7 @@ _CACHES = {
 # the wait_for_warm_cache field default to zero.
 _NO_CACHES = [swarming.cache("builder")]
 _NO_ANDROID = {"custom_vars": {"download_android_deps": False}}
+_NO_RECLIENT = {"custom_vars": {"download_reclient": False}}
 _ANDROID_DEPS = {"custom_vars": {"download_android_deps": True}}
 _CHROME = {"custom_vars": {"download_chrome": True}}
 _EMSCRIPTEN = {"custom_vars": {"download_emscripten": True}}
@@ -70,3 +71,4 @@ js_engines = _JS_ENGINES
 no_android = _NO_ANDROID
 slow_shards = _SLOW_SHARDS
 no_caches = _NO_CACHES
+no_reclient = _NO_RECLIENT
diff --git a/pkg.star b/pkg.star
index 246c670af87b..e96068a79943 100644
--- a/pkg.star
+++ b/pkg.star
@@ -14,6 +14,7 @@ load(
     "jammy",
     "mac",
     "no_android",
+    "no_reclient",
     "windows",
     "windows11",
 )
@@ -56,7 +57,7 @@ dart.ci_sandbox_builder(
     category = "pkg|wa",
     dimensions = [windows11, arm64, flutter_pool],
     goma = False,  # no such package: infra_internal/goma/client/windows-arm64
-    properties = {"clobber": False},
+    properties = [{"clobber": False}, no_reclient],
 )
 dart.ci_sandbox_builder(
     "pkg-linux-debug",
diff --git a/vm.star b/vm.star
index 3ce5a6265e32..2e8a0b238ef7 100644
--- a/vm.star
+++ b/vm.star
@@ -16,6 +16,7 @@ load(
     "jammy",
     "mac",
     "no_android",
+    "no_reclient",
     "slow_shards",
     "windows",
     "windows11",
@@ -159,14 +160,14 @@ _nightly_builder(
     category = "vm|jit|wad",
     dimensions = [windows11, arm64, flutter_pool],
     goma = False,  # no such package: infra_internal/goma/client/windows-arm64
-    properties = {"clobber": False},
+    properties = [{"clobber": False}, no_reclient],
 )
 _vm_builder(
     "vm-win-release-arm64",
     category = "vm|jit|war",
     dimensions = [windows11, arm64, flutter_pool],
     goma = False,  # no such package: infra_internal/goma/client/windows-arm64
-    properties = {"clobber": False},
+    properties = [{"clobber": False}, no_reclient],
 )
 
 # vm|appjit
@@ -245,14 +246,14 @@ _nightly_builder(
     category = "vm|aot|wad",
     dimensions = [windows11, arm64, flutter_pool],
     goma = False,  # no such package: infra_internal/goma/client/windows-arm64
-    properties = {"clobber": False},
+    properties = [{"clobber": False}, no_reclient],
 )
 _vm_builder(
     "vm-aot-win-release-arm64",
     category = "vm|aot|war",
     dimensions = [windows11, arm64, flutter_pool],
     goma = False,  # no such package: infra_internal/goma/client/windows-arm64
-    properties = {"clobber": False},
+    properties = [{"clobber": False}, no_reclient],
 )
 
 # vm|aot|android

From 87669e51cf6eea777eb6605a7a4c34f0b096db01 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 5 Mar 2024 09:34:12 +0000
Subject: [PATCH 732/826] [infra] Move vm-aot-mac-release-x64 from 8-core to
 12-core machines.

Change-Id: I23c8ed5187694aff6c50580e5b8dba3cf819ec8d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/355503
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Daco Harkes <dacoharkes@google.com>
---
 generated/cr-buildbucket.cfg | 8 ++++----
 generated/project.cfg        | 2 +-
 vm.star                      | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index fca5449a3b7d..976fd7691f32 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -6214,7 +6214,7 @@ buckets {
     builders {
       name: "vm-aot-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:8"
+      dimensions: "cores:12"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -6257,7 +6257,7 @@ buckets {
     builders {
       name: "vm-aot-mac-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:8"
+      dimensions: "cores:12"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -6300,7 +6300,7 @@ buckets {
     builders {
       name: "vm-aot-mac-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:8"
+      dimensions: "cores:12"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -13243,7 +13243,7 @@ buckets {
     builders {
       name: "vm-aot-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:8"
+      dimensions: "cores:12"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
diff --git a/generated/project.cfg b/generated/project.cfg
index 0490305cf263..5ace4e004329 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.43.4"
+  version: "1.43.5"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/vm.star b/vm.star
index 2e8a0b238ef7..93b806a9125b 100644
--- a/vm.star
+++ b/vm.star
@@ -226,9 +226,9 @@ _vm_builder(
 _vm_builder(
     "vm-aot-mac-release-x64",
     category = "vm|aot|m",
-    # The x64 Mac pool contains a mix of 4- and 8-core machines. This build
+    # The x64 Mac pool contains a mix of 4- and 12-core machines. This build
     # times out on a 4-core machine.
-    dimensions = [mac, {"cores": "8"}],
+    dimensions = [mac, {"cores": "12"}],
     properties = slow_shards,
 )
 _nightly_builder(

From 82cfa4bb651e80685bdd01c07208f69f5f0c54bb Mon Sep 17 00:00:00 2001
From: Oleh Prypin <oprypin@google.com>
Date: Tue, 5 Mar 2024 09:52:23 +0000
Subject: [PATCH 733/826] Define an internal-only tryjob in the commit queue

-initially as include-only

Bug: b/294808886
Change-Id: I4a42d11eaa03ebf8205ab084a939a5026a365325
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/355680
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Oleh Prypin <oprypin@google.com>
---
 generated/commit-queue.cfg | 4 ++++
 sdk.star                   | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index e6f3c99c2309..b9ee71af29be 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -1657,6 +1657,10 @@ config_groups {
       url: "https://dart-status.appspot.com"
     }
     tryjob {
+      builders {
+        name: "dart-internal/g3.dart-internal.try/g3-cbuild-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try.shared/presubmit-try"
         includable_only: true
diff --git a/sdk.star b/sdk.star
index 4a6943a77a04..daa59bbf89ba 100644
--- a/sdk.star
+++ b/sdk.star
@@ -135,3 +135,10 @@ dart.ci_sandbox_builder(
     priority = priority.highest,
     triggered_by = None,
 )
+
+# Include a tryjob from dart-internal
+luci.cq_tryjob_verifier(
+    builder = "dart-internal:g3.dart-internal.try/g3-cbuild-try",
+    cq_group = "sdk-main",
+    includable_only = True,
+)

From 83612cabb6eacbad5cc7ce000c424be0a6e475fa Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Thu, 7 Mar 2024 20:03:08 +0000
Subject: [PATCH 734/826] [infra] End VM legacy testing.

Change-Id: I679446702c2392815b7945a69f344d5594eff4ad
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/329587
Reviewed-by: Alexander Thomas <athom@google.com>
Reviewed-by: Siva Annamalai <asiva@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Markov <alexmarkov@google.com>
Reviewed-by: Slava Egorov <vegorov@google.com>
---
 generated/commit-queue.cfg   |  12 --
 generated/cr-buildbucket.cfg | 222 -----------------------------------
 generated/luci-milo.cfg      |  39 ------
 generated/luci-notify.cfg    |  39 ------
 generated/luci-scheduler.cfg |  33 ------
 vm.star                      |  16 ---
 6 files changed, 361 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index b9ee71af29be..a5486d2ed6df 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -3146,18 +3146,6 @@ config_groups {
         name: "dart/try/vm-gcc-linux-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-kernel-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-kernel-precomp-linux-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-linux-debug-ia32-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 976fd7691f32..e321e25863ea 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -8443,117 +8443,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-linux-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-linux-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
@@ -14370,117 +14259,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-kernel-linux-debug-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-kernel-precomp-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-linux-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index be61d6bd260d..e2bcdfd0b855 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -268,15 +268,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-ffi-qemu-linux-release-riscv64-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-debug-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-linux-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-kernel-precomp-linux-release-x64-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/iso-stress-linux-try"
   }
@@ -946,21 +937,6 @@ consoles {
     category: "vm|ffi"
     short_name: "qr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
-    category: "vm|legacy|jit"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
-    category: "vm|legacy|jit"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
-    category: "vm|legacy|aot"
-    short_name: "r"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
@@ -1760,21 +1736,6 @@ consoles {
     category: "vm|ffi"
     short_name: "qr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-debug-x64"
-    category: "vm|legacy|jit"
-    short_name: "d"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-linux-release-x64"
-    category: "vm|legacy|jit"
-    short_name: "r"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-kernel-precomp-linux-release-x64"
-    category: "vm|legacy|aot"
-    short_name: "r"
-  }
   header {
     links {
       name: "Consoles"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 200a619bdc80..aea368e514ff 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -1035,45 +1035,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-kernel-precomp-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index e396875a05ee..ff452ca9c351 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1864,36 +1864,6 @@ job {
     builder: "vm-gcc-linux"
   }
 }
-job {
-  id: "vm-kernel-linux-debug-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-debug-x64"
-  }
-}
-job {
-  id: "vm-kernel-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-linux-release-x64"
-  }
-}
-job {
-  id: "vm-kernel-precomp-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-kernel-precomp-linux-release-x64"
-  }
-}
 job {
   id: "vm-linux-debug-ia32"
   realm: "ci.sandbox"
@@ -2621,9 +2591,6 @@ trigger {
   triggers: "vm-eager-optimization-linux-release-ia32"
   triggers: "vm-eager-optimization-linux-release-x64"
   triggers: "vm-gcc-linux"
-  triggers: "vm-kernel-linux-debug-x64"
-  triggers: "vm-kernel-linux-release-x64"
-  triggers: "vm-kernel-precomp-linux-release-x64"
   triggers: "vm-linux-debug-ia32"
   triggers: "vm-linux-debug-x64c"
   triggers: "vm-linux-release-ia32"
diff --git a/vm.star b/vm.star
index 93b806a9125b..7a1edfe530e3 100644
--- a/vm.star
+++ b/vm.star
@@ -454,22 +454,6 @@ _vm_builder(
     properties = {"clobber": False},
 )
 
-# vm|legacy|jit
-_nightly_builder(
-    "vm-kernel-linux-debug-x64",
-    category = "vm|legacy|jit|d",
-)
-_nightly_builder(
-    "vm-kernel-linux-release-x64",
-    category = "vm|legacy|jit|r",
-)
-
-# vm|legacy|aot
-_nightly_builder(
-    "vm-kernel-precomp-linux-release-x64",
-    category = "vm|legacy|aot|r",
-)
-
 # Isolate stress test builder
 _vm_builder(
     "iso-stress-linux",

From 93290f35a3ca81eeb46bd4ac68ade1989dce17d0 Mon Sep 17 00:00:00 2001
From: Oleh Prypin <oprypin@google.com>
Date: Mon, 18 Mar 2024 14:09:15 +0000
Subject: [PATCH 735/826] Upgrade the internal-only tryjob from include-only to
 100% experiment

Before: never runs unless requested.
After: always runs but doesn't affect the CQ outcome.

Bug: b/294808886
Change-Id: I5af4459bdade1c5b9d4f91ed6a946e9eb194dc16
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/358180
Auto-Submit: Oleh Prypin <oprypin@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 generated/commit-queue.cfg | 2 +-
 sdk.star                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index a5486d2ed6df..13aa017c5d56 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -1659,7 +1659,7 @@ config_groups {
     tryjob {
       builders {
         name: "dart-internal/g3.dart-internal.try/g3-cbuild-try"
-        includable_only: true
+        experiment_percentage: 100
       }
       builders {
         name: "dart/try.shared/presubmit-try"
diff --git a/sdk.star b/sdk.star
index daa59bbf89ba..0e2da4b1423d 100644
--- a/sdk.star
+++ b/sdk.star
@@ -140,5 +140,5 @@ dart.ci_sandbox_builder(
 luci.cq_tryjob_verifier(
     builder = "dart-internal:g3.dart-internal.try/g3-cbuild-try",
     cq_group = "sdk-main",
-    includable_only = True,
+    experiment_percentage = 100,
 )

From 1023bc886e7156c2e54e0f227ea40a4f8d5a4aec Mon Sep 17 00:00:00 2001
From: Oleh Prypin <oprypin@google.com>
Date: Tue, 19 Mar 2024 09:28:22 +0000
Subject: [PATCH 736/826] Upgrade the internal-only tryjob to be required for
 submission

Before: always runs but doesn't affect the CQ outcome.
After: always runs and blocks submission

Bug: b/294808886
Change-Id: I6817cfe1dcada44c0eade4ae84b96bc7fffa59eb
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/358340
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Oleh Prypin <oprypin@google.com>
---
 generated/commit-queue.cfg | 1 -
 sdk.star                   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 13aa017c5d56..75f14b94875e 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -1659,7 +1659,6 @@ config_groups {
     tryjob {
       builders {
         name: "dart-internal/g3.dart-internal.try/g3-cbuild-try"
-        experiment_percentage: 100
       }
       builders {
         name: "dart/try.shared/presubmit-try"
diff --git a/sdk.star b/sdk.star
index 0e2da4b1423d..c8bfdce61ea9 100644
--- a/sdk.star
+++ b/sdk.star
@@ -140,5 +140,4 @@ dart.ci_sandbox_builder(
 luci.cq_tryjob_verifier(
     builder = "dart-internal:g3.dart-internal.try/g3-cbuild-try",
     cq_group = "sdk-main",
-    experiment_percentage = 100,
 )

From 6c4eb8b483a8a83766dc5b030dc1b09236044903 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Tue, 19 Mar 2024 14:23:31 +0000
Subject: [PATCH 737/826] [infra] Add RBE configuration to monorepo builders

Monorepo builders, like Flutter engine builders,
get their RBE config through builder properties
and an internal reclient_cfgs CIPD package.

Set these builder properties for the monorepo
coordinator builders. The properties will be
passed down to the builders and testers triggered
by the coordinator.

These changes are based on the Flutter changes
https://flutter-review.googlesource.com/c/infra/+/50860
https://flutter-review.googlesource.com/c/infra/+/50980

Bug: b/330287220
Change-Id: I113419b41abe5479e1067acf88046f692247958c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/357606
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
---
 generated/cr-buildbucket.cfg | 20 ++++++++++++++++
 monorepo.star                | 45 +++++++++++++++---------------------
 2 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index e321e25863ea..71343eef8f7c 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -2841,6 +2841,10 @@ buckets {
         '  "$flutter/goma": {'
         '    "server": "goma.chromium.org"'
         '  },'
+        '  "$flutter/rbe": {'
+        '    "instance": "projects/flutter-rbe-prod/instances/default",'
+        '    "platform": "container-image=docker://gcr.io/cloud-marketplace/google/debian11@sha256:69e2789c9f3d28c6a0f13b25062c240ee7772be1f5e6d41bb4680b63eae6b304"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2851,6 +2855,7 @@ buckets {
         '  "config_name": "host_linux",'
         '  "environment": "unused",'
         '  "goma_jobs": "200",'
+        '  "rbe_jobs": "200",'
         '  "recipe": "engine_v2/engine_v2"'
         '}'
       priority: 50
@@ -4068,6 +4073,10 @@ buckets {
         '  "$flutter/goma": {'
         '    "server": "goma.chromium.org"'
         '  },'
+        '  "$flutter/rbe": {'
+        '    "instance": "projects/flutter-rbe-prod/instances/default",'
+        '    "platform": "container-image=docker://gcr.io/cloud-marketplace/google/debian11@sha256:69e2789c9f3d28c6a0f13b25062c240ee7772be1f5e6d41bb4680b63eae6b304"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4078,6 +4087,7 @@ buckets {
         '  "config_name": "web_linux",'
         '  "environment": "unused",'
         '  "goma_jobs": "200",'
+        '  "rbe_jobs": "200",'
         '  "recipe": "engine_v2/engine_v2"'
         '}'
       priority: 50
@@ -11954,6 +11964,10 @@ buckets {
         '  "$flutter/goma": {'
         '    "server": "goma.chromium.org"'
         '  },'
+        '  "$flutter/rbe": {'
+        '    "instance": "projects/flutter-rbe-prod/instances/default",'
+        '    "platform": "container-image=docker://gcr.io/cloud-marketplace/google/debian11@sha256:69e2789c9f3d28c6a0f13b25062c240ee7772be1f5e6d41bb4680b63eae6b304"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11965,6 +11979,7 @@ buckets {
         '  "config_name": "host_linux",'
         '  "environment": "unused",'
         '  "goma_jobs": "200",'
+        '  "rbe_jobs": "200",'
         '  "recipe": "engine_v2/engine_v2"'
         '}'
       priority: 30
@@ -11998,6 +12013,10 @@ buckets {
         '  "$flutter/goma": {'
         '    "server": "goma.chromium.org"'
         '  },'
+        '  "$flutter/rbe": {'
+        '    "instance": "projects/flutter-rbe-prod/instances/default",'
+        '    "platform": "container-image=docker://gcr.io/cloud-marketplace/google/debian11@sha256:69e2789c9f3d28c6a0f13b25062c240ee7772be1f5e6d41bb4680b63eae6b304"'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12009,6 +12028,7 @@ buckets {
         '  "config_name": "web_linux",'
         '  "environment": "unused",'
         '  "goma_jobs": "200",'
+        '  "rbe_jobs": "200",'
         '  "recipe": "engine_v2/engine_v2"'
         '}'
       priority: 30
diff --git a/monorepo.star b/monorepo.star
index f3795c062ff7..83c48955f61e 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -6,8 +6,21 @@ Defines the monorepo builders.
 """
 
 load("//lib/dart.star", "dart")
+load("//lib/defaults.star", "defaults")
 load("//lib/priority.star", "priority")
 
+monorepo_properties = {
+    "$flutter/goma": {"server": "goma.chromium.org"},
+    "$flutter/rbe": {
+        "instance": "projects/flutter-rbe-prod/instances/default",
+        "platform": "container-image=docker://gcr.io/cloud-marketplace/google/debian11@sha256:69e2789c9f3d28c6a0f13b25062c240ee7772be1f5e6d41bb4680b63eae6b304",
+    },
+    "clobber": False,
+    "environment": "unused",
+    "goma_jobs": "200",
+    "rbe_jobs": "200",
+}
+
 luci.gitiles_poller(
     name = "dart-gitiles-trigger-monorepo",
     bucket = "ci",
@@ -46,13 +59,7 @@ dart.ci_sandbox_builder(
     execution_timeout = 180 * time.minute,
     notifies = None,
     priority = priority.normal,
-    properties = {
-        "$flutter/goma": {"server": "goma.chromium.org"},
-        "clobber": False,
-        "config_name": "host_linux",
-        "environment": "unused",
-        "goma_jobs": "200",
-    },
+    properties = defaults.properties([monorepo_properties, {"config_name": "host_linux"}]),
     triggered_by = ["dart-gitiles-trigger-monorepo"],
     schedule = "triggered",
 )
@@ -72,14 +79,10 @@ dart.try_builder(
     "flutter-linux",
     executable = dart.flutter_recipe("engine_v2/engine_v2"),
     execution_timeout = 180 * time.minute,
-    properties = {
-        "$flutter/goma": {"server": "goma.chromium.org"},
+    properties = defaults.properties([monorepo_properties, {
         "builder_name_suffix": "-try",
-        "clobber": False,
         "config_name": "host_linux",
-        "environment": "unused",
-        "goma_jobs": "200",
-    },
+    }]),
     on_cq = False,
     cq_branches = ["main"],
 )
@@ -91,13 +94,7 @@ dart.ci_sandbox_builder(
     execution_timeout = 180 * time.minute,
     notifies = None,
     priority = priority.normal,
-    properties = {
-        "$flutter/goma": {"server": "goma.chromium.org"},
-        "clobber": False,
-        "config_name": "web_linux",
-        "environment": "unused",
-        "goma_jobs": "200",
-    },
+    properties = defaults.properties([monorepo_properties, {"config_name": "web_linux"}]),
     triggered_by = ["dart-gitiles-trigger-monorepo"],
     schedule = "triggered",
 )
@@ -117,14 +114,10 @@ dart.try_builder(
     "flutter-web",
     executable = dart.flutter_recipe("engine_v2/engine_v2"),
     execution_timeout = 180 * time.minute,
-    properties = {
-        "$flutter/goma": {"server": "goma.chromium.org"},
+    properties = defaults.properties([monorepo_properties, {
         "builder_name_suffix": "-try",
-        "clobber": False,
         "config_name": "web_linux",
-        "environment": "unused",
-        "goma_jobs": "200",
-    },
+    }]),
     on_cq = False,
     cq_branches = ["main"],
 )

From cd16bc56c6310f0cd58841320f778b39ca311008 Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Thu, 21 Mar 2024 12:49:50 +0000
Subject: [PATCH 738/826] [infra] Add build scripts to standard paths.

Change-Id: Ifc1fe30127dde80b9dbc9d146631c1fd7539e1c3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/357609
Auto-Submit: Jonas Termansen <sortie@google.com>
Commit-Queue: William Hesse <whesse@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 generated/commit-queue.cfg   | 390 +++++++++++++++++++++++++++++++++++
 generated/luci-scheduler.cfg |  14 ++
 lib/paths.star               |   2 +
 3 files changed, 406 insertions(+)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 75f14b94875e..4fe9fb6d649b 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -244,6 +244,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -312,6 +322,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -440,6 +460,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -544,6 +574,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -632,6 +672,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -724,6 +774,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -817,6 +877,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -922,6 +992,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1025,6 +1105,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1096,6 +1186,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1326,6 +1426,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1444,6 +1554,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1686,6 +1806,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1754,6 +1884,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1889,6 +2029,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1977,6 +2127,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2065,6 +2225,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2169,6 +2339,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2257,6 +2437,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2349,6 +2539,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2442,6 +2642,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2551,6 +2761,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2639,6 +2859,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2766,6 +2996,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2853,6 +3093,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3199,6 +3449,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3361,6 +3621,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3486,6 +3756,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3554,6 +3834,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3682,6 +3972,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3786,6 +4086,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3874,6 +4184,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3966,6 +4286,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -4059,6 +4389,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -4164,6 +4504,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -4267,6 +4617,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -4338,6 +4698,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -4568,6 +4938,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -4686,6 +5066,16 @@ config_groups {
           gerrit_project_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index ff452ca9c351..cc49364ef8b7 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -2655,6 +2655,8 @@ trigger {
     path_regexps: "build/.+"
     path_regexps: "BUILD.gn"
     path_regexps: "sdk_args.gni"
+    path_regexps: "tools/gn.py"
+    path_regexps: "tools/build.py"
     path_regexps: ".dart_tool/package_config.json"
     path_regexps: "tools/generate_package_config.py"
     path_regexps: "tools/generate_package_config.dart"
@@ -2695,6 +2697,8 @@ trigger {
     path_regexps: "build/.+"
     path_regexps: "BUILD.gn"
     path_regexps: "sdk_args.gni"
+    path_regexps: "tools/gn.py"
+    path_regexps: "tools/build.py"
     path_regexps: ".dart_tool/package_config.json"
     path_regexps: "tools/generate_package_config.py"
     path_regexps: "tools/generate_package_config.dart"
@@ -2725,6 +2729,8 @@ trigger {
     path_regexps: "build/.+"
     path_regexps: "BUILD.gn"
     path_regexps: "sdk_args.gni"
+    path_regexps: "tools/gn.py"
+    path_regexps: "tools/build.py"
     path_regexps: ".dart_tool/package_config.json"
     path_regexps: "tools/generate_package_config.py"
     path_regexps: "tools/generate_package_config.dart"
@@ -2751,6 +2757,8 @@ trigger {
     path_regexps: "build/.+"
     path_regexps: "BUILD.gn"
     path_regexps: "sdk_args.gni"
+    path_regexps: "tools/gn.py"
+    path_regexps: "tools/build.py"
     path_regexps: ".dart_tool/package_config.json"
     path_regexps: "tools/generate_package_config.py"
     path_regexps: "tools/generate_package_config.dart"
@@ -2782,6 +2790,8 @@ trigger {
     path_regexps: "build/.+"
     path_regexps: "BUILD.gn"
     path_regexps: "sdk_args.gni"
+    path_regexps: "tools/gn.py"
+    path_regexps: "tools/build.py"
     path_regexps: ".dart_tool/package_config.json"
     path_regexps: "tools/generate_package_config.py"
     path_regexps: "tools/generate_package_config.dart"
@@ -2813,6 +2823,8 @@ trigger {
     path_regexps: "build/.+"
     path_regexps: "BUILD.gn"
     path_regexps: "sdk_args.gni"
+    path_regexps: "tools/gn.py"
+    path_regexps: "tools/build.py"
     path_regexps: ".dart_tool/package_config.json"
     path_regexps: "tools/generate_package_config.py"
     path_regexps: "tools/generate_package_config.dart"
@@ -2840,6 +2852,8 @@ trigger {
     path_regexps: "build/.+"
     path_regexps: "BUILD.gn"
     path_regexps: "sdk_args.gni"
+    path_regexps: "tools/gn.py"
+    path_regexps: "tools/build.py"
     path_regexps: ".dart_tool/package_config.json"
     path_regexps: "tools/generate_package_config.py"
     path_regexps: "tools/generate_package_config.dart"
diff --git a/lib/paths.star b/lib/paths.star
index d17b85e6b7dd..e23e2017dde8 100644
--- a/lib/paths.star
+++ b/lib/paths.star
@@ -13,6 +13,8 @@ _STANDARD_PATHS = [
     "build/.+",
     "BUILD.gn",
     "sdk_args.gni",
+    "tools/gn.py",
+    "tools/build.py",
     # core libraries
     ".dart_tool/package_config.json",
     "tools/generate_package_config.py",

From 5c0942d69fbac2a4176db92981e7c04f04ac880d Mon Sep 17 00:00:00 2001
From: Jonas Termansen <sortie@google.com>
Date: Fri, 22 Mar 2024 10:43:55 +0000
Subject: [PATCH 739/826] Remove Goma config and rename remnants to RBE.

This change needs to land together with the matching recipe change:
https://dart-review.googlesource.com/c/recipes/+/357626

Bug: b/296994239
Change-Id: Ie5ad58b0afc6f968c5faadecbc7c8739388e60a4
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/358903
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
---
 generated/cr-buildbucket.cfg | 2063 +---------------------------------
 lib/dart.star                |   46 +-
 pkg.star                     |    2 -
 sdk.star                     |    3 +-
 vm.star                      |   13 +-
 5 files changed, 24 insertions(+), 2103 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 71343eef8f7c..036bce2592b8 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -29,11 +29,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -65,11 +60,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -101,11 +91,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -137,11 +122,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -173,11 +153,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -209,11 +184,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -245,11 +215,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -286,11 +251,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -327,11 +287,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -368,11 +323,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -404,11 +354,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -440,11 +385,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -476,11 +416,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -513,11 +448,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -553,11 +483,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -592,11 +517,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -632,11 +552,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -672,11 +587,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -712,11 +622,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -752,11 +657,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -792,11 +692,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -832,11 +727,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -872,11 +762,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -917,11 +802,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -962,11 +842,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1007,11 +882,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1051,11 +921,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1095,11 +960,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1139,11 +999,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1179,11 +1034,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1219,11 +1069,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1259,11 +1104,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1298,11 +1138,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1337,11 +1172,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1376,11 +1206,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1415,11 +1240,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1454,11 +1274,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1493,11 +1308,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1533,11 +1343,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1573,11 +1378,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1613,11 +1413,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1653,11 +1448,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1694,11 +1484,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1735,11 +1520,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1776,11 +1556,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1816,11 +1591,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1856,11 +1626,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1896,11 +1661,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1937,11 +1697,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -1978,11 +1733,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2019,11 +1769,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2060,11 +1805,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2101,11 +1841,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2142,11 +1877,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2183,11 +1913,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2224,11 +1949,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2265,11 +1985,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2305,11 +2020,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2345,11 +2055,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2385,11 +2090,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2425,11 +2125,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2465,11 +2160,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2505,11 +2195,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2550,11 +2235,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2595,11 +2275,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2640,11 +2315,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2680,11 +2350,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2720,11 +2385,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2760,11 +2420,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2797,11 +2452,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2833,11 +2483,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$flutter/goma": {'
         '    "server": "goma.chromium.org"'
         '  },'
@@ -2881,11 +2526,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2918,11 +2558,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2955,11 +2590,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -2992,11 +2622,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3029,11 +2654,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3066,11 +2686,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3103,11 +2718,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3140,11 +2750,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3177,11 +2782,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3214,11 +2814,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3251,11 +2846,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3288,11 +2878,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3325,11 +2910,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3362,11 +2942,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3399,11 +2974,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3436,11 +3006,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3473,11 +3038,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3510,11 +3070,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3547,11 +3102,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3584,11 +3134,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3621,11 +3166,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3658,11 +3198,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3695,11 +3230,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3732,11 +3262,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3769,11 +3294,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3806,11 +3326,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3843,11 +3358,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3880,11 +3390,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3917,11 +3422,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3954,11 +3454,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -3991,11 +3486,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4028,11 +3518,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4065,11 +3550,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$flutter/goma": {'
         '    "server": "goma.chromium.org"'
         '  },'
@@ -4113,11 +3593,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4149,11 +3624,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4185,11 +3655,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4221,11 +3686,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4257,11 +3717,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4293,11 +3748,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4329,11 +3779,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4370,11 +3815,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4406,11 +3846,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4443,11 +3878,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4479,11 +3909,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4515,11 +3940,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4551,11 +3971,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4587,11 +4002,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4624,11 +4034,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4661,11 +4066,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4700,11 +4100,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4739,9 +4134,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4773,9 +4165,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4807,9 +4196,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4841,11 +4227,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4880,11 +4261,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4919,11 +4295,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4963,11 +4334,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5008,11 +4374,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5052,11 +4413,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5096,11 +4452,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5134,9 +4485,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5170,9 +4518,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5206,9 +4551,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5243,11 +4585,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5282,11 +4619,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5321,11 +4653,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5361,11 +4688,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5401,11 +4723,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5441,11 +4758,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5481,11 +4793,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5521,11 +4828,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5561,11 +4863,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5598,11 +4895,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5635,11 +4927,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5672,11 +4959,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5709,11 +4991,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5746,11 +5023,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5784,11 +5056,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5822,11 +5089,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5860,11 +5122,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5897,9 +5154,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5932,11 +5186,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5968,11 +5217,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6004,11 +5248,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6040,11 +5279,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6076,11 +5310,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6112,11 +5341,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6148,11 +5372,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6190,11 +5409,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6236,11 +5450,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6279,11 +5488,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6322,11 +5526,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6364,11 +5563,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6401,11 +5595,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6438,11 +5627,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6475,11 +5659,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6512,11 +5691,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6548,9 +5722,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6586,11 +5757,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6623,11 +5789,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6661,11 +5822,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6697,9 +5853,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6733,9 +5886,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6769,9 +5919,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6806,11 +5953,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6842,11 +5984,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6878,11 +6015,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6914,11 +6046,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6951,11 +6078,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6988,11 +6110,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7025,11 +6142,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7062,11 +6174,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7098,11 +6205,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7134,11 +6236,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7170,11 +6267,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7207,11 +6299,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7248,11 +6335,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7289,11 +6371,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7330,11 +6407,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7367,11 +6439,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7404,11 +6471,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7443,11 +6505,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7482,11 +6539,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7521,11 +6573,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7560,11 +6607,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7599,11 +6641,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7638,11 +6675,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7677,11 +6709,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7716,11 +6743,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7755,11 +6777,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7794,11 +6811,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7833,11 +6845,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7872,11 +6879,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7911,11 +6913,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7950,11 +6947,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7989,11 +6981,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8028,11 +7015,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8067,11 +7049,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8106,11 +7083,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8142,11 +7114,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8178,11 +7145,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8214,11 +7176,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8250,9 +7207,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8284,9 +7238,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8318,9 +7269,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8352,11 +7300,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8391,11 +7334,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8431,7 +7369,7 @@ buckets {
       properties:
         '{'
         '  "$dart/build": {'
-        '    "disable_goma": true,'
+        '    "disable_rbe": true,'
         '    "timeout": 4500'
         '  },'
         '  "$recipe_engine/isolated": {'
@@ -8467,11 +7405,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8505,11 +7438,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8541,11 +7469,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8577,11 +7500,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8613,11 +7531,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8649,11 +7562,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8685,11 +7593,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8721,11 +7624,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8758,9 +7656,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8792,9 +7687,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8826,9 +7718,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8860,11 +7749,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8897,11 +7781,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8933,11 +7812,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8969,11 +7843,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9005,11 +7874,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9041,11 +7905,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9077,11 +7936,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9113,11 +7967,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9158,11 +8007,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9203,11 +8047,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9248,11 +8087,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9290,11 +8124,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9332,11 +8161,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9374,11 +8198,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9418,11 +8237,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9462,11 +8276,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9506,11 +8315,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9547,11 +8351,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9588,11 +8387,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9629,11 +8423,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9667,7 +8456,7 @@ buckets {
       properties:
         '{'
         '  "$dart/build": {'
-        '    "disable_goma": true'
+        '    "disable_rbe": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -9701,11 +8490,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9738,11 +8522,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9775,11 +8554,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9812,11 +8586,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9849,11 +8618,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9886,11 +8650,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9922,9 +8681,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9960,11 +8716,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9997,11 +8748,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10034,11 +8780,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10071,11 +8812,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10107,9 +8843,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10143,9 +8876,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10179,9 +8909,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10216,11 +8943,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10253,11 +8975,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10289,11 +9006,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10325,11 +9037,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10387,11 +9094,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10423,11 +9125,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10459,11 +9156,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10500,11 +9192,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10536,11 +9223,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10575,11 +9257,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10614,9 +9291,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10654,7 +9328,7 @@ buckets {
       properties:
         '{'
         '  "$dart/build": {'
-        '    "disable_goma": true,'
+        '    "disable_rbe": true,'
         '    "timeout": 7200'
         '  },'
         '  "$recipe_engine/isolated": {'
@@ -10692,11 +9366,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$dart/build": {'
         '    "timeout": 6000'
         '  },'
@@ -10738,11 +9407,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10786,11 +9450,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10831,11 +9490,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10871,11 +9525,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10912,11 +9561,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10952,11 +9596,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10991,11 +9630,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11031,11 +9665,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11071,11 +9700,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11111,11 +9735,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11156,11 +9775,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11200,11 +9814,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11240,11 +9849,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11279,11 +9883,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11318,11 +9917,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11358,11 +9952,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11399,11 +9988,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11439,11 +10023,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11480,11 +10059,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11521,11 +10095,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11562,11 +10131,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11602,11 +10166,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11642,11 +10201,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11682,11 +10236,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11722,11 +10271,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11767,11 +10311,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11807,11 +10346,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11846,11 +10380,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11883,11 +10412,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11920,11 +10444,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11956,11 +10475,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$flutter/goma": {'
         '    "server": "goma.chromium.org"'
         '  },'
@@ -12005,11 +10519,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$flutter/goma": {'
         '    "server": "goma.chromium.org"'
         '  },'
@@ -12054,11 +10563,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12090,11 +10594,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12126,11 +10625,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12167,11 +10661,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12203,11 +10692,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12239,11 +10723,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12275,11 +10754,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12312,11 +10786,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12351,9 +10820,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12385,11 +10851,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12424,11 +10885,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12469,11 +10925,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12512,9 +10963,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12549,11 +10997,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12588,11 +11031,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12627,11 +11065,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12667,11 +11100,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12707,11 +11135,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12744,11 +11167,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12781,11 +11199,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12818,11 +11231,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12856,11 +11264,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12894,11 +11297,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12932,11 +11330,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12969,9 +11362,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13004,11 +11394,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13040,11 +11425,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13076,11 +11456,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13118,11 +11493,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13164,11 +11534,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13206,11 +11571,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13243,11 +11603,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13280,11 +11635,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13317,11 +11667,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13354,11 +11699,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13390,9 +11730,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13428,11 +11765,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13465,11 +11797,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13503,11 +11830,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13539,9 +11861,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13576,11 +11895,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13612,11 +11926,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13649,11 +11958,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13686,11 +11990,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13722,11 +12021,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13759,11 +12053,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13800,11 +12089,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13837,11 +12121,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13874,11 +12153,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13913,11 +12187,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13952,11 +12221,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13991,11 +12255,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14030,11 +12289,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14069,11 +12323,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14108,11 +12357,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14144,9 +12388,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14178,11 +12419,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14217,11 +12453,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14257,7 +12488,7 @@ buckets {
       properties:
         '{'
         '  "$dart/build": {'
-        '    "disable_goma": true,'
+        '    "disable_rbe": true,'
         '    "timeout": 4500'
         '  },'
         '  "$recipe_engine/isolated": {'
@@ -14293,11 +12524,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14331,11 +12557,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14367,11 +12588,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14403,11 +12619,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14440,9 +12651,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14474,11 +12682,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14511,11 +12714,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14547,11 +12745,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14583,11 +12776,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14628,11 +12816,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14670,11 +12853,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14714,11 +12892,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14755,11 +12928,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14793,7 +12961,7 @@ buckets {
       properties:
         '{'
         '  "$dart/build": {'
-        '    "disable_goma": true'
+        '    "disable_rbe": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -14827,11 +12995,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14864,11 +13027,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14901,11 +13059,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14938,11 +13091,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14975,11 +13123,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15012,11 +13155,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15048,9 +13186,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15086,11 +13221,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15123,11 +13253,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15159,9 +13284,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_goma": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15196,11 +13318,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15233,11 +13350,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": false,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15279,11 +13391,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15316,11 +13423,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15353,11 +13455,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15390,11 +13487,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15427,11 +13519,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15464,11 +13551,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15501,11 +13583,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15538,11 +13615,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15575,11 +13647,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15612,11 +13679,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15649,11 +13711,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15686,11 +13743,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15723,11 +13775,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15760,11 +13807,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15797,11 +13839,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15834,11 +13871,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15871,11 +13903,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15908,11 +13935,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15945,11 +13967,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -15982,11 +13999,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16019,11 +14031,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16056,11 +14063,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16093,11 +14095,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16130,11 +14127,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16167,11 +14159,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16204,11 +14191,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16241,11 +14223,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16278,11 +14255,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16315,11 +14287,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16352,11 +14319,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16389,11 +14351,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16426,11 +14383,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -16487,11 +14439,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$build/goma": {'
-        '    "enable_ats": true,'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
         '  "$depot_tools/presubmit": {'
         '    "runhooks": true'
         '  },'
diff --git a/lib/dart.star b/lib/dart.star
index 55f72f7f4c29..7a46395c4771 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -19,11 +19,6 @@ load(
 load("//lib/paths.star", "paths")
 load("//lib/priority.star", "priority")
 
-_GOMA_RBE = {
-    "server_host": "goma.chromium.org",
-    "use_luci_auth": True,
-}
-
 _RELEASE_CHANNELS = ["beta", "dev", "stable"]
 _CHANNELS = ["beta", "stable", "try"]
 _BRANCHES = ["main"] + _RELEASE_CHANNELS
@@ -56,33 +51,23 @@ def _flutter_recipe(name):
         use_bbagent = True,
     )
 
-def _with_goma(goma, dimensions, properties):
-    """Decorates the properties to setup goma.
+def _with_rbe(rbe, properties):
+    """Decorates the properties to setup RBE.
 
-       Adds the $build/goma property when goma is used and disables goma via
-       the $dart/build property if not.
+       Enables/disables RBE via the $dart/build property.
 
     Args:
-        goma: Opt-in (True), opt-out (False) or default (None).
-        dimensions: The dimensions of the builder.
+        rbe: Opt-in (True), opt-out (False) or default (None).
         properties: The properties object to set $build/goma on (if opted-in).
 
     Returns:
-        A copy of the properties with goma related properties set if applicable.
+        A copy of the properties with RBE related properties set if applicable.
     """
     updated_properties = dict(properties)
-    if goma in (None, True):
-        goma_properties = {}
-        goma_properties.update(_GOMA_RBE)
-
-        enable_ats = dimensions["os"] in (focal["os"], jammy["os"], linux["os"])
-
-        goma_properties["enable_ats"] = enable_ats
-        updated_properties.setdefault("$build/goma", goma_properties)
-    else:
+    if rbe == False:
         updated_properties = dict(properties)
         updated_properties.setdefault("$dart/build", {})
-        updated_properties["$dart/build"].setdefault("disable_goma", True)
+        updated_properties["$dart/build"].setdefault("disable_rbe", True)
     return updated_properties
 
 def _try_builder(
@@ -96,7 +81,7 @@ def _try_builder(
         execution_timeout = None,
         experiment_percentage = None,
         experiments = None,
-        goma = None,
+        rbe = None,
         location_filters = None,
         properties = None,
         on_cq = False):
@@ -113,7 +98,7 @@ def _try_builder(
         execution_timeout: Time to allow for the build to run.
         experiment_percentage: What experiment percentage to use.
         experiments: Experiments to run on this builder, with percentages.
-        goma: Whether to use goma or not.
+        rbe: Whether to use RBE.
         location_filters: Locations that trigger this tryjob.
         properties: Extra properties to set for builds.
         on_cq: Whether the build is added to the default set of CQ tryjobs.
@@ -127,7 +112,7 @@ def _try_builder(
     if dimensions["pool"] in ["luci.flutter.prod", "luci.flutter.staging"]:
         dimensions.pop("host_class")
     properties = defaults.properties(properties)
-    builder_properties = _with_goma(goma, dimensions, properties)
+    builder_properties = _with_rbe(rbe, properties)
     builder = name + "-try"
     caches = caches if caches != None else defaults.caches(dimensions["os"])
     luci.builder(
@@ -168,7 +153,7 @@ def _builder(
         experimental = None,
         experiments = None,
         expiration_timeout = None,
-        goma = None,
+        rbe = None,
         notifies = "dart",
         priority = priority.normal,
         properties = None,
@@ -195,7 +180,7 @@ def _builder(
         experimental: Whether the build is experimental or not.
         experiments: Experiments to run on this builder, with percentages.
         expiration_timeout: How long builds should wait for a bot to run on.
-        goma: Whether to use goma or not.
+        rbe: Whether to use RBE or not.
         notifies: Which luci notifier group to notify (default: "dart").
         priority: What swarming priority this builder gets (default: NORMAL).
         properties: Extra properties to set for builds.
@@ -240,13 +225,12 @@ def _builder(
                 execution_timeout = execution_timeout,
                 experiment_percentage = experiment_percentage,
                 experiments = experiments,
-                goma = goma,
+                rbe = rbe,
                 location_filters = location_filters,
             )
         else:
-            builder_properties = _with_goma(
-                goma if service_account == accounts.try_builder else False,
-                dimensions,
+            builder_properties = _with_rbe(
+                rbe if service_account == accounts.try_builder else False,
                 properties,
             )
             builder = name + "-" + channel if channel else name
diff --git a/pkg.star b/pkg.star
index e96068a79943..5b925e24d134 100644
--- a/pkg.star
+++ b/pkg.star
@@ -30,7 +30,6 @@ dart.ci_sandbox_builder(
     "pkg-linux-release-arm64",
     category = "pkg|la",
     dimensions = [jammy, arm64],
-    goma = False,  # no such package: infra_internal/goma/client/linux-arm64
     properties = {"clobber": False},
 )
 dart.ci_sandbox_builder(
@@ -56,7 +55,6 @@ dart.ci_sandbox_builder(
     "pkg-win-release-arm64",
     category = "pkg|wa",
     dimensions = [windows11, arm64, flutter_pool],
-    goma = False,  # no such package: infra_internal/goma/client/windows-arm64
     properties = [{"clobber": False}, no_reclient],
 )
 dart.ci_sandbox_builder(
diff --git a/sdk.star b/sdk.star
index c8bfdce61ea9..4e9554e40506 100644
--- a/sdk.star
+++ b/sdk.star
@@ -75,7 +75,6 @@ dart.try_builder(
     },
     location_filters = paths.to_location_filters(paths.release),
     recipe = "release/sdk",
-    goma = False,  # no such package: infra_internal/goma/client/linux-arm64
 )
 
 dart.try_builder(
@@ -88,7 +87,7 @@ dart.try_builder(
         "disable_bcid": True,
     },
     recipe = "release/sdk",
-    goma = False,  # RBE gcc cross-compilation isn't supported yet
+    rbe = False,  # RBE gcc cross-compilation isn't supported yet
 )
 
 dart.try_builder(
diff --git a/vm.star b/vm.star
index 7a1edfe530e3..6838578e600f 100644
--- a/vm.star
+++ b/vm.star
@@ -106,7 +106,6 @@ _vm_builder(
     "vm-linux-release-arm64",
     category = "vm|jit|a6",
     dimensions = [jammy, arm64],
-    goma = False,  # no such package: infra_internal/goma/client/linux-arm64
     properties = {"clobber": False},
 )
 _vm_builder(
@@ -159,14 +158,12 @@ _nightly_builder(
     "vm-win-debug-arm64",
     category = "vm|jit|wad",
     dimensions = [windows11, arm64, flutter_pool],
-    goma = False,  # no such package: infra_internal/goma/client/windows-arm64
     properties = [{"clobber": False}, no_reclient],
 )
 _vm_builder(
     "vm-win-release-arm64",
     category = "vm|jit|war",
     dimensions = [windows11, arm64, flutter_pool],
-    goma = False,  # no such package: infra_internal/goma/client/windows-arm64
     properties = [{"clobber": False}, no_reclient],
 )
 
@@ -213,7 +210,6 @@ _nightly_builder(
     "vm-aot-linux-release-arm64",
     category = "vm|aot|a6",
     dimensions = [jammy, arm64],
-    goma = False,  # no such package: infra_internal/goma/client/linux-arm64
     properties = {"clobber": False},
 )
 _vm_builder(
@@ -245,14 +241,12 @@ _nightly_builder(
     "vm-aot-win-debug-arm64",
     category = "vm|aot|wad",
     dimensions = [windows11, arm64, flutter_pool],
-    goma = False,  # no such package: infra_internal/goma/client/windows-arm64
     properties = [{"clobber": False}, no_reclient],
 )
 _vm_builder(
     "vm-aot-win-release-arm64",
     category = "vm|aot|war",
     dimensions = [windows11, arm64, flutter_pool],
-    goma = False,  # no such package: infra_internal/goma/client/windows-arm64
     properties = [{"clobber": False}, no_reclient],
 )
 
@@ -389,13 +383,13 @@ _vm_builder(
     properties = [fuchsia_deps],
 )
 
-# Our sysroot does not support gcc, we can't use goma on RBE for this builder
+# Our sysroot does not support gcc, we can't use RBE for this builder
 _nightly_builder(
     "vm-gcc-linux",
     category = "vm|misc|g",
     dimensions = jammy,
     execution_timeout = 5 * time.hour,
-    goma = False,
+    rbe = False,
     properties = {
         "$dart/build": {
             "timeout": 75 * 60,  # 100 minutes,
@@ -407,7 +401,7 @@ _nightly_builder(
     "vm-msvc-windows",
     category = "vm|misc|m",
     dimensions = windows,
-    goma = False,
+    rbe = False,
 )
 
 # vm|ffi
@@ -450,7 +444,6 @@ _vm_builder(
     "vm-ffi-qemu-linux-release-riscv64",
     category = "vm|ffi|qr",
     dimensions = [jammy, arm64],
-    goma = False,  # no such package: infra_internal/goma/client/linux-arm64
     properties = {"clobber": False},
 )
 

From 9711f4140d4bbeac4a32f7f98d6864641c8fb465 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 25 Mar 2024 17:08:08 +0000
Subject: [PATCH 740/826] [infra] Run vm-aot-mac-release-arm64 and
 pkg-mac-release-arm64 on release branches.

Change-Id: Ie71dba8fc09fd20100dcac9fa634c23536f4ced3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/359120
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/commit-queue.cfg   |  16 ++++
 generated/cr-buildbucket.cfg | 160 +++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      |  20 +++++
 generated/luci-scheduler.cfg |  44 ++++++++++
 pkg.star                     |   1 -
 vm.star                      |   1 -
 6 files changed, 240 insertions(+), 2 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 4fe9fb6d649b..e48d5a1ebf7b 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -1292,6 +1292,10 @@ config_groups {
           path_regexp: "tools/.*\\.dart"
         }
       }
+      builders {
+        name: "dart/try/pkg-mac-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/pkg-mac-release-try"
         includable_only: true
@@ -1328,6 +1332,10 @@ config_groups {
         name: "dart/try/vm-aot-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-mac-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-mac-release-x64-try"
         includable_only: true
@@ -4804,6 +4812,10 @@ config_groups {
           path_regexp: "tools/.*\\.dart"
         }
       }
+      builders {
+        name: "dart/try/pkg-mac-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/pkg-mac-release-try"
         includable_only: true
@@ -4840,6 +4852,10 @@ config_groups {
         name: "dart/try/vm-aot-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-mac-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-mac-release-x64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 036bce2592b8..1ee6b98e030c 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -4360,6 +4360,86 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "pkg-mac-release-arm64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "pkg-mac-release-arm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "pkg-mac-release-beta"
       swarming_host: "chromium-swarm.appspot.com"
@@ -5435,6 +5515,86 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-mac-release-arm64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 60
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-aot-mac-release-arm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 60
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index e2bcdfd0b855..9bc21891fa2f 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -2049,6 +2049,11 @@ consoles {
     category: "vm|aot"
     short_name: "ra"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-arm64-beta"
+    category: "vm|aot"
+    short_name: "m1"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-x64-beta"
     category: "vm|aot"
@@ -2129,6 +2134,11 @@ consoles {
     category: "pkg"
     short_name: "m"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-arm64-beta"
+    category: "pkg"
+    short_name: "ma"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-beta"
     category: "pkg"
@@ -2438,6 +2448,11 @@ consoles {
     category: "vm|aot"
     short_name: "ra"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-arm64-stable"
+    category: "vm|aot"
+    short_name: "m1"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-x64-stable"
     category: "vm|aot"
@@ -2518,6 +2533,11 @@ consoles {
     category: "pkg"
     short_name: "m"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/pkg-mac-release-arm64-stable"
+    category: "pkg"
+    short_name: "ma"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-win-release-stable"
     category: "pkg"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index cc49364ef8b7..9ac280d3df19 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -954,6 +954,26 @@ job {
     builder: "pkg-mac-release-arm64"
   }
 }
+job {
+  id: "pkg-mac-release-arm64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "pkg-mac-release-arm64-beta"
+  }
+}
+job {
+  id: "pkg-mac-release-arm64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "pkg-mac-release-arm64-stable"
+  }
+}
 job {
   id: "pkg-mac-release-beta"
   realm: "ci.sandbox"
@@ -1274,6 +1294,26 @@ job {
     builder: "vm-aot-mac-release-arm64"
   }
 }
+job {
+  id: "vm-aot-mac-release-arm64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-mac-release-arm64-beta"
+  }
+}
+job {
+  id: "vm-aot-mac-release-arm64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-mac-release-arm64-stable"
+  }
+}
 job {
   id: "vm-aot-mac-release-x64"
   realm: "ci.sandbox"
@@ -2397,6 +2437,7 @@ trigger {
   triggers: "gclient-beta"
   triggers: "pkg-linux-release-arm64-beta"
   triggers: "pkg-linux-release-beta"
+  triggers: "pkg-mac-release-arm64-beta"
   triggers: "pkg-mac-release-beta"
   triggers: "pkg-win-release-arm64-beta"
   triggers: "pkg-win-release-beta"
@@ -2405,6 +2446,7 @@ trigger {
   triggers: "vm-aot-linux-debug-simarm_x64-beta"
   triggers: "vm-aot-linux-release-simarm_x64-beta"
   triggers: "vm-aot-linux-release-x64-beta"
+  triggers: "vm-aot-mac-release-arm64-beta"
   triggers: "vm-aot-mac-release-x64-beta"
   triggers: "vm-aot-win-release-arm64-beta"
   triggers: "vm-aot-win-release-x64-beta"
@@ -2513,6 +2555,7 @@ trigger {
   triggers: "gclient-stable"
   triggers: "pkg-linux-release-arm64-stable"
   triggers: "pkg-linux-release-stable"
+  triggers: "pkg-mac-release-arm64-stable"
   triggers: "pkg-mac-release-stable"
   triggers: "pkg-win-release-arm64-stable"
   triggers: "pkg-win-release-stable"
@@ -2521,6 +2564,7 @@ trigger {
   triggers: "vm-aot-linux-debug-simarm_x64-stable"
   triggers: "vm-aot-linux-release-simarm_x64-stable"
   triggers: "vm-aot-linux-release-x64-stable"
+  triggers: "vm-aot-mac-release-arm64-stable"
   triggers: "vm-aot-mac-release-x64-stable"
   triggers: "vm-aot-win-release-arm64-stable"
   triggers: "vm-aot-win-release-x64-stable"
diff --git a/pkg.star b/pkg.star
index 5b925e24d134..7e4984f72fa8 100644
--- a/pkg.star
+++ b/pkg.star
@@ -41,7 +41,6 @@ dart.ci_sandbox_builder(
 dart.ci_sandbox_builder(
     "pkg-mac-release-arm64",
     category = "pkg|ma",
-    channels = ["try"],
     dimensions = [mac, arm64],
     properties = [chrome, no_android],
 )
diff --git a/vm.star b/vm.star
index 6838578e600f..9af2ccadb31a 100644
--- a/vm.star
+++ b/vm.star
@@ -215,7 +215,6 @@ _nightly_builder(
 _vm_builder(
     "vm-aot-mac-release-arm64",
     category = "vm|aot|m1",
-    channels = ["try"],
     dimensions = [mac, arm64],
     properties = [no_android, slow_shards],
 )

From d9292cb71f2f76a618ed62040f34ab6cde252ba4 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Thu, 4 Apr 2024 15:35:14 +0000
Subject: [PATCH 741/826] Add ddc-hostasserts-linux-d8 nightly builder

The builder was added to the test matrix in
https://dart-review.googlesource.com/c/sdk/+/349361
and has been baselined and failures approved for triage,
triage issue https://github.com/dart-lang/sdk/issues/55378

Change-Id: I1059f3352bc88c2b9f5130ad4f8b0e725ced1e59
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/361163
Auto-Submit: William Hesse <whesse@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 ddc.star                     |  7 ++++
 generated/commit-queue.cfg   |  4 +++
 generated/cr-buildbucket.cfg | 68 ++++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      | 13 +++++++
 generated/luci-notify.cfg    | 10 ++++++
 generated/luci-scheduler.cfg | 11 ++++++
 6 files changed, 113 insertions(+)

diff --git a/ddc.star b/ddc.star
index 1b406f323144..885a52f56e93 100644
--- a/ddc.star
+++ b/ddc.star
@@ -63,3 +63,10 @@ cron.nightly_builder(
     channels = ["try"],
     properties = [chrome, no_android],
 )
+
+cron.nightly_builder(
+    "ddc-hostasserts-linux-d8",
+    category = "ddc|h",
+    channels = ["try"],
+    properties = [no_android],
+)
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index e48d5a1ebf7b..22767d1da9c4 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -2747,6 +2747,10 @@ config_groups {
         name: "dart/try/ddc-canary-linux-chrome-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/ddc-hostasserts-linux-d8-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/ddc-linux-chrome-try"
         location_filters {
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 1ee6b98e030c..8dd81e0117fb 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -2006,6 +2006,40 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "ddc-hostasserts-linux-d8"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "ddc-linux-chrome"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10312,6 +10346,40 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "ddc-hostasserts-linux-d8-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "ddc-linux-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 9bc21891fa2f..c9b4408ddc6f 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -343,6 +343,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/ddc-canary-linux-chrome-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/ddc-hostasserts-linux-d8-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/flutter-analyze-try"
   }
@@ -1057,6 +1060,11 @@ consoles {
     category: "ddc"
     short_name: "c"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-hostasserts-linux-d8"
+    category: "ddc"
+    short_name: "h"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
     category: "analyzer"
@@ -1356,6 +1364,11 @@ consoles {
     category: "ddc"
     short_name: "c"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-hostasserts-linux-d8"
+    category: "ddc"
+    short_name: "h"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-analyze"
     category: "analyzer"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index aea368e514ff..e0e6afd28f28 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -245,6 +245,16 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "ddc-hostasserts-linux-d8"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 9ac280d3df19..7fb881d3581b 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -564,6 +564,16 @@ job {
     builder: "ddc-canary-linux-chrome"
   }
 }
+job {
+  id: "ddc-hostasserts-linux-d8"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "ddc-hostasserts-linux-d8"
+  }
+}
 job {
   id: "ddc-linux-chrome"
   realm: "ci.sandbox"
@@ -2611,6 +2621,7 @@ trigger {
   realm: "ci"
   schedule: "0 5 * * *"
   triggers: "ddc-canary-linux-chrome"
+  triggers: "ddc-hostasserts-linux-d8"
   triggers: "front-end-nnbd-mac-release-x64"
   triggers: "front-end-nnbd-win-release-x64"
   triggers: "vm-aot-asan-linux-release-x64"

From 63703a08b1e0df87c5936614ad59de9c8a4ef752 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 5 Apr 2024 09:07:42 +0000
Subject: [PATCH 742/826] [infra] Raise shard timeout on vm-aot-win-debug-x64

Shards take close to 60 minutes to complete, some are frequently above
the limit.

Change-Id: If1e1df3cc27756122452ad2a952ada84977a348b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/361360
Commit-Queue: William Hesse <whesse@google.com>
Auto-Submit: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
---
 generated/cr-buildbucket.cfg | 6 ++++--
 vm.star                      | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 8dd81e0117fb..36e1aaf575d4 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5959,7 +5959,8 @@ buckets {
         '  },'
         '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 70
       build_numbers: YES
@@ -12001,7 +12002,8 @@ buckets {
         '  },'
         '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
diff --git a/vm.star b/vm.star
index 9af2ccadb31a..1df105dfd51c 100644
--- a/vm.star
+++ b/vm.star
@@ -230,6 +230,7 @@ _nightly_builder(
     "vm-aot-win-debug-x64",
     category = "vm|aot|wd",
     dimensions = windows,
+    properties = slow_shards,
 )
 _vm_builder(
     "vm-aot-win-release-x64",

From fb6d440bbde1fd3bdec43a5dc939b29c023381fc Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 5 Apr 2024 09:11:39 +0000
Subject: [PATCH 743/826] [infra] Remove obsolete cores dimension from
 vm-aot-mac-release-x64

We only have a single macOS x64 machine type in our pools now.

Change-Id: Ie980f33b6190a1204b3ae72fae25c921b97ba777
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/361361
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: William Hesse <whesse@google.com>
Auto-Submit: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 4 ----
 vm.star                      | 4 +---
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 36e1aaf575d4..f1b59d228840 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5632,7 +5632,6 @@ buckets {
     builders {
       name: "vm-aot-mac-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:12"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -5670,7 +5669,6 @@ buckets {
     builders {
       name: "vm-aot-mac-release-x64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:12"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -5708,7 +5706,6 @@ buckets {
     builders {
       name: "vm-aot-mac-release-x64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:12"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
@@ -11751,7 +11748,6 @@ buckets {
     builders {
       name: "vm-aot-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cores:12"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
diff --git a/vm.star b/vm.star
index 1df105dfd51c..c5735d4209d0 100644
--- a/vm.star
+++ b/vm.star
@@ -221,9 +221,7 @@ _vm_builder(
 _vm_builder(
     "vm-aot-mac-release-x64",
     category = "vm|aot|m",
-    # The x64 Mac pool contains a mix of 4- and 12-core machines. This build
-    # times out on a 4-core machine.
-    dimensions = [mac, {"cores": "12"}],
+    dimensions = mac,
     properties = slow_shards,
 )
 _nightly_builder(

From c16acf5d824919e25627aa9d5d83898c5cbfa634 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 19 Apr 2024 14:45:38 +0000
Subject: [PATCH 744/826] [infra] Add presubmit-try to the SDK CQ

Change-Id: Ie21bef3e8cbe183ec7d251c9b5378d43f1d66cb7
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/363681
Reviewed-by: Daco Harkes <dacoharkes@google.com>
Commit-Queue: Daco Harkes <dacoharkes@google.com>
Auto-Submit: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg | 4 ----
 generated/project.cfg      | 2 +-
 main.star                  | 1 +
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 22767d1da9c4..a1698b4205d8 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -220,7 +220,6 @@ config_groups {
     tryjob {
       builders {
         name: "dart/try.shared/presubmit-try"
-        includable_only: true
       }
       builders {
         name: "dart/try/analyzer-analysis-server-linux-try"
@@ -1673,7 +1672,6 @@ config_groups {
     tryjob {
       builders {
         name: "dart/try.shared/presubmit-try"
-        includable_only: true
       }
       builders {
         name: "dart/try/beta-try"
@@ -1790,7 +1788,6 @@ config_groups {
       }
       builders {
         name: "dart/try.shared/presubmit-try"
-        includable_only: true
       }
       builders {
         name: "dart/try/analyzer-analysis-server-linux-try"
@@ -3744,7 +3741,6 @@ config_groups {
     tryjob {
       builders {
         name: "dart/try.shared/presubmit-try"
-        includable_only: true
       }
       builders {
         name: "dart/try/analyzer-analysis-server-linux-try"
diff --git a/generated/project.cfg b/generated/project.cfg
index 5ace4e004329..bbd54e21fa47 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.43.5"
+  version: "1.43.6"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/main.star b/main.star
index eeda4c2ab452..7ae19512ef9e 100755
--- a/main.star
+++ b/main.star
@@ -185,6 +185,7 @@ dart.try_builder(
     bucket = "try.shared",
     caches = no_caches,
     execution_timeout = 10 * time.minute,
+    on_cq = True,
     properties = {
         "$depot_tools/presubmit": {
             "runhooks": True,

From c57d009b92cdeb92e9420c2dbca213e1b606aa47 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Wed, 24 Apr 2024 16:27:29 +0000
Subject: [PATCH 745/826] [infra] Route vm-fuchsia-release-x64 to machines with
 KVM.

Change-Id: Ic2c92eceefeecc8bf3d0347bf1eee27b29339fe6
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/364166
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/cr-buildbucket.cfg | 8 ++++----
 vm.star                      | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index f1b59d228840..d0cb7233065f 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -7516,8 +7516,8 @@ buckets {
       name: "vm-fuchsia-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "host_class:virtualization"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12669,8 +12669,8 @@ buckets {
       name: "vm-fuchsia-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "host_class:virtualization"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
diff --git a/vm.star b/vm.star
index c5735d4209d0..5674e00c0b85 100644
--- a/vm.star
+++ b/vm.star
@@ -378,6 +378,7 @@ _vm_builder(
     "vm-fuchsia-release-x64",
     category = "vm|misc|f",
     channels = ["try"],
+    dimensions = [jammy, {"host_class": "virtualization"}],
     properties = [fuchsia_deps],
 )
 

From 1a99e8a36f55e687012bb7081781b88b7d8fae46 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 8 May 2024 15:10:41 +0000
Subject: [PATCH 746/826] [infra] Turn down DDC unsound builder

No Dart code runs on DDC in unsound mode anymore.

Change-Id: I21c817f482006e0f10c50eb1adc72c65867a41f5
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/365582
Auto-Submit: Alexander Thomas <athom@google.com>
Commit-Queue: Nicholas Shahan <nshahan@google.com>
Reviewed-by: Nicholas Shahan <nshahan@google.com>
---
 ddc.star                     |  8 ---
 generated/commit-queue.cfg   | 98 ------------------------------------
 generated/cr-buildbucket.cfg | 70 --------------------------
 generated/luci-milo.cfg      | 13 -----
 generated/luci-notify.cfg    | 11 ----
 generated/luci-scheduler.cfg | 11 ----
 6 files changed, 211 deletions(-)

diff --git a/ddc.star b/ddc.star
index 885a52f56e93..0e0f50f7f1c1 100644
--- a/ddc.star
+++ b/ddc.star
@@ -49,14 +49,6 @@ dart.ci_sandbox_builder(
     triggered_by = ["ddc-gitiles-trigger-%s"],
 )
 
-dart.ci_sandbox_builder(
-    "ddc-linux-chrome-unsound",
-    category = "ddc|u",
-    channels = ["try"],
-    location_filters = paths.to_location_filters(paths.ddc),
-    properties = [chrome, no_android],
-)
-
 cron.nightly_builder(
     "ddc-canary-linux-chrome",
     category = "ddc|c",
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index a1698b4205d8..cdd81afa8724 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -2846,104 +2846,6 @@ config_groups {
           path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
-      builders {
-        name: "dart/try/ddc-linux-chrome-unsound-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/gn.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/build.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/generate_package_config.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/generate_package_config.dart"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/js.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(build_integration|dev_compiler|meta)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "utils/dartdevc/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
-        }
-      }
       builders {
         name: "dart/try/ddc-linux-firefox-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index d0cb7233065f..dbd0583a461b 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -2145,41 +2145,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "ddc-linux-chrome-unsound"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "ddc-linux-firefox"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10413,41 +10378,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "ddc-linux-chrome-unsound-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "ddc-linux-firefox-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index c9b4408ddc6f..496e50f5781b 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -337,9 +337,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/ddc-linux-firefox-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/ddc-linux-chrome-unsound-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/ddc-canary-linux-chrome-try"
   }
@@ -1050,11 +1047,6 @@ consoles {
     category: "ddc"
     short_name: "f"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome-unsound"
-    category: "ddc"
-    short_name: "u"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-canary-linux-chrome"
     category: "ddc"
@@ -1354,11 +1346,6 @@ consoles {
     category: "ddc"
     short_name: "f"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome-unsound"
-    category: "ddc"
-    short_name: "u"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-canary-linux-chrome"
     category: "ddc"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index e0e6afd28f28..65d6c09abcad 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -266,17 +266,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "ddc-linux-chrome-unsound"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 7fb881d3581b..ad855ce6fc05 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -604,16 +604,6 @@ job {
     builder: "ddc-linux-chrome-stable"
   }
 }
-job {
-  id: "ddc-linux-chrome-unsound"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "ddc-linux-chrome-unsound"
-  }
-}
 job {
   id: "ddc-linux-firefox"
   realm: "ci.sandbox"
@@ -2512,7 +2502,6 @@ trigger {
   triggers: "dart2js-unit-linux-x64-release"
   triggers: "dart2js-win-chrome"
   triggers: "ddc-linux-chrome"
-  triggers: "ddc-linux-chrome-unsound"
   triggers: "ddc-mac-chrome"
   triggers: "ddc-win-chrome"
   triggers: "flutter-analyze"

From 7b943a76d0821b193028a2bf3dda336697c849ed Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Fri, 17 May 2024 17:09:58 +0000
Subject: [PATCH 747/826] [infra] Add nightly builders for ARM64 sanitizers.

Change-Id: I0703a53966780d3798e152236926077f97ccf27c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/365980
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/commit-queue.cfg   |  16 +++
 generated/cr-buildbucket.cfg | 256 +++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      |  52 +++++++
 generated/luci-notify.cfg    |  52 +++++++
 generated/luci-scheduler.cfg |  44 ++++++
 vm.star                      |  24 ++++
 6 files changed, 444 insertions(+)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index cdd81afa8724..218681ef98df 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -3246,6 +3246,10 @@ config_groups {
         name: "dart/try/vm-appjit-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-asan-linux-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-asan-linux-release-x64-try"
         includable_only: true
@@ -3458,6 +3462,10 @@ config_groups {
         name: "dart/try/vm-mac-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-msan-linux-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-msan-linux-release-x64-try"
         includable_only: true
@@ -3482,10 +3490,18 @@ config_groups {
         name: "dart/try/vm-reload-rollback-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-tsan-linux-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-tsan-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-ubsan-linux-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-ubsan-linux-release-x64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index dbd0583a461b..a12536827066 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -6410,6 +6410,38 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-asan-linux-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-asan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8566,6 +8598,38 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-msan-linux-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-msan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8761,6 +8825,38 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-tsan-linux-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-tsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8793,6 +8889,38 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-ubsan-linux-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-ubsan-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -12163,6 +12291,38 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-asan-linux-release-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-asan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13070,6 +13230,38 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-msan-linux-release-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-msan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13265,6 +13457,38 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-tsan-linux-release-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-tsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13297,6 +13521,38 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-ubsan-linux-release-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-ubsan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 496e50f5781b..69c34ab866f5 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -208,6 +208,18 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-ubsan-linux-release-x64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-asan-linux-release-arm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-msan-linux-release-arm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-tsan-linux-release-arm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-ubsan-linux-release-arm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-reload-linux-debug-x64-try"
   }
@@ -837,6 +849,26 @@ consoles {
     category: "vm|misc|sanitizer"
     short_name: "u"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-linux-release-arm64"
+    category: "vm|misc|sanitizer"
+    short_name: "a"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-msan-linux-release-arm64"
+    category: "vm|misc|sanitizer"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-tsan-linux-release-arm64"
+    category: "vm|misc|sanitizer"
+    short_name: "t"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ubsan-linux-release-arm64"
+    category: "vm|misc|sanitizer"
+    short_name: "u"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-debug-x64"
     category: "vm|misc|reload"
@@ -1636,6 +1668,26 @@ consoles {
     category: "vm|misc|sanitizer"
     short_name: "u"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-linux-release-arm64"
+    category: "vm|misc|sanitizer"
+    short_name: "a"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-msan-linux-release-arm64"
+    category: "vm|misc|sanitizer"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-tsan-linux-release-arm64"
+    category: "vm|misc|sanitizer"
+    short_name: "t"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ubsan-linux-release-arm64"
+    category: "vm|misc|sanitizer"
+    short_name: "u"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-reload-linux-debug-x64"
     category: "vm|misc|reload"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 65d6c09abcad..8ba967b2a7ae 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -846,6 +846,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-asan-linux-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1172,6 +1185,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-msan-linux-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1250,6 +1276,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-tsan-linux-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1263,6 +1302,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-ubsan-linux-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index ad855ce6fc05..7774046f6e93 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1564,6 +1564,16 @@ job {
     builder: "vm-appjit-linux-release-x64-stable"
   }
 }
+job {
+  id: "vm-asan-linux-release-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-asan-linux-release-arm64"
+  }
+}
 job {
   id: "vm-asan-linux-release-x64"
   realm: "ci.sandbox"
@@ -2204,6 +2214,16 @@ job {
     builder: "vm-mac-release-x64-stable"
   }
 }
+job {
+  id: "vm-msan-linux-release-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-msan-linux-release-arm64"
+  }
+}
 job {
   id: "vm-msan-linux-release-x64"
   realm: "ci.sandbox"
@@ -2264,6 +2284,16 @@ job {
     builder: "vm-reload-rollback-linux-release-x64"
   }
 }
+job {
+  id: "vm-tsan-linux-release-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-tsan-linux-release-arm64"
+  }
+}
 job {
   id: "vm-tsan-linux-release-x64"
   realm: "ci.sandbox"
@@ -2274,6 +2304,16 @@ job {
     builder: "vm-tsan-linux-release-x64"
   }
 }
+job {
+  id: "vm-ubsan-linux-release-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-ubsan-linux-release-arm64"
+  }
+}
 job {
   id: "vm-ubsan-linux-release-x64"
   realm: "ci.sandbox"
@@ -2631,6 +2671,7 @@ trigger {
   triggers: "vm-aot-win-debug-x64c"
   triggers: "vm-aot-win-product-x64"
   triggers: "vm-appjit-linux-product-x64"
+  triggers: "vm-asan-linux-release-arm64"
   triggers: "vm-asan-linux-release-x64"
   triggers: "vm-eager-optimization-linux-release-ia32"
   triggers: "vm-eager-optimization-linux-release-x64"
@@ -2638,13 +2679,16 @@ trigger {
   triggers: "vm-linux-debug-ia32"
   triggers: "vm-linux-debug-x64c"
   triggers: "vm-linux-release-ia32"
+  triggers: "vm-msan-linux-release-arm64"
   triggers: "vm-msan-linux-release-x64"
   triggers: "vm-msvc-windows"
   triggers: "vm-reload-linux-debug-x64"
   triggers: "vm-reload-linux-release-x64"
   triggers: "vm-reload-rollback-linux-debug-x64"
   triggers: "vm-reload-rollback-linux-release-x64"
+  triggers: "vm-tsan-linux-release-arm64"
   triggers: "vm-tsan-linux-release-x64"
+  triggers: "vm-ubsan-linux-release-arm64"
   triggers: "vm-ubsan-linux-release-x64"
   triggers: "vm-win-debug-arm64"
   triggers: "vm-win-debug-x64c"
diff --git a/vm.star b/vm.star
index 5674e00c0b85..fc7970ceb7dd 100644
--- a/vm.star
+++ b/vm.star
@@ -332,6 +332,30 @@ _nightly_builder(
     "vm-aot-ubsan-linux-release-x64",
     category = "vm|misc|sanitizer|u",
 )
+_nightly_builder(
+    "vm-asan-linux-release-arm64",
+    category = "vm|misc|sanitizer|a",
+    dimensions = [jammy, arm64],
+    properties = {"clobber": False},
+)
+_nightly_builder(
+    "vm-msan-linux-release-arm64",
+    category = "vm|misc|sanitizer|m",
+    dimensions = [jammy, arm64],
+    properties = {"clobber": False},
+)
+_nightly_builder(
+    "vm-tsan-linux-release-arm64",
+    category = "vm|misc|sanitizer|t",
+    dimensions = [jammy, arm64],
+    properties = {"clobber": False},
+)
+_nightly_builder(
+    "vm-ubsan-linux-release-arm64",
+    category = "vm|misc|sanitizer|u",
+    dimensions = [jammy, arm64],
+    properties = {"clobber": False},
+)
 _nightly_builder(
     "vm-reload-linux-debug-x64",
     category = "vm|misc|reload|d",

From de30562a0e7b43dbf7bf8849e9ba62f09036d795 Mon Sep 17 00:00:00 2001
From: Martin Kustermann <kustermann@google.com>
Date: Tue, 11 Jun 2024 09:04:13 +0000
Subject: [PATCH 748/826] Add dart2wasm-asserts-linux-chrome builder

The corresponding change adding this to `test_matrix.json` is in [0]

[0] https://dart-review.googlesource.com/c/sdk/+/370620

Change-Id: I568fbeab982418d9d36c6e4703d9ce8e5b72ca43
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/370641
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 dart2wasm.star               |   8 +
 generated/commit-queue.cfg   | 309 +++++++++++++++++++++++++++++++++++
 generated/cr-buildbucket.cfg | 144 ++++++++++++++++
 generated/luci-milo.cfg      |  23 +++
 generated/luci-notify.cfg    |  11 ++
 generated/luci-scheduler.cfg |  33 ++++
 6 files changed, 528 insertions(+)

diff --git a/dart2wasm.star b/dart2wasm.star
index 7a473113a664..18fa45bc8bf9 100644
--- a/dart2wasm.star
+++ b/dart2wasm.star
@@ -29,6 +29,14 @@ dart.ci_sandbox_builder(
     triggered_by = ["dart2wasm-gitiles-trigger-%s"],
 )
 
+dart.ci_sandbox_builder(
+    "dart2wasm-asserts-linux-chrome",
+    category = "d2w|ca",
+    properties = [chrome, emscripten, no_android],
+    location_filters = paths.to_location_filters(paths.dart2wasm),
+    triggered_by = ["dart2wasm-gitiles-trigger-%s"],
+)
+
 dart.ci_sandbox_builder(
     "dart2wasm-linux-chrome",
     category = "d2w|c",
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 218681ef98df..0d596de3735e 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -751,6 +751,109 @@ config_groups {
         name: "dart/try/dart2js-win-chrome-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/dart2wasm-asserts-linux-chrome-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm_shared/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/wasm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+      }
       builders {
         name: "dart/try/dart2wasm-linux-chrome-try"
         location_filters {
@@ -2522,6 +2625,109 @@ config_groups {
         name: "dart/try/dart2js-win-chrome-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/dart2wasm-asserts-linux-chrome-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm_shared/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/wasm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+      }
       builders {
         name: "dart/try/dart2wasm-linux-chrome-try"
         location_filters {
@@ -4190,6 +4396,109 @@ config_groups {
         name: "dart/try/dart2js-win-chrome-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/dart2wasm-asserts-linux-chrome-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm_shared/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/wasm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
+      }
       builders {
         name: "dart/try/dart2wasm-linux-chrome-try"
         location_filters {
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index a12536827066..1087bd382db7 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -1434,6 +1434,114 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "dart2wasm-asserts-linux-chrome"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true,'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2wasm-asserts-linux-chrome-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true,'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2wasm-asserts-linux-chrome-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true,'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "dart2wasm-linux-chrome"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10223,6 +10331,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "dart2wasm-asserts-linux-chrome-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true,'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "dart2wasm-linux-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 69c34ab866f5..d6432b653505 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -49,6 +49,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/dart2wasm-linux-optimized-jsc-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/dart2wasm-asserts-linux-chrome-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/dart2wasm-linux-chrome-try"
   }
@@ -584,6 +587,11 @@ consoles {
     category: "d2w"
     short_name: "j"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-asserts-linux-chrome"
+    category: "d2w"
+    short_name: "ca"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-chrome"
     category: "d2w"
@@ -1253,6 +1261,11 @@ consoles {
     category: "d2w"
     short_name: "j"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-asserts-linux-chrome"
+    category: "d2w"
+    short_name: "ca"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-chrome"
     category: "d2w"
@@ -1996,6 +2009,11 @@ consoles {
     category: "d2w"
     short_name: "j"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-asserts-linux-chrome-beta"
+    category: "d2w"
+    short_name: "ca"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-chrome-beta"
     category: "d2w"
@@ -2395,6 +2413,11 @@ consoles {
     category: "d2w"
     short_name: "j"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-asserts-linux-chrome-stable"
+    category: "d2w"
+    short_name: "ca"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-chrome-stable"
     category: "d2w"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 8ba967b2a7ae..4357910c7abe 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -180,6 +180,17 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "dart2wasm-asserts-linux-chrome"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 7774046f6e93..eb3cddc18b75 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -404,6 +404,36 @@ job {
     builder: "dart2js-win-chrome-stable"
   }
 }
+job {
+  id: "dart2wasm-asserts-linux-chrome"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "dart2wasm-asserts-linux-chrome"
+  }
+}
+job {
+  id: "dart2wasm-asserts-linux-chrome-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "dart2wasm-asserts-linux-chrome-beta"
+  }
+}
+job {
+  id: "dart2wasm-asserts-linux-chrome-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "dart2wasm-asserts-linux-chrome-stable"
+  }
+}
 job {
   id: "dart2wasm-linux-chrome"
   realm: "ci.sandbox"
@@ -2805,6 +2835,7 @@ trigger {
 trigger {
   id: "dart2wasm-gitiles-trigger-beta"
   realm: "ci"
+  triggers: "dart2wasm-asserts-linux-chrome-beta"
   triggers: "dart2wasm-linux-chrome-beta"
   triggers: "dart2wasm-linux-d8-beta"
   triggers: "dart2wasm-linux-firefox-beta"
@@ -2866,6 +2897,7 @@ trigger {
 trigger {
   id: "dart2wasm-gitiles-trigger-main"
   realm: "ci"
+  triggers: "dart2wasm-asserts-linux-chrome"
   triggers: "dart2wasm-linux-chrome"
   triggers: "dart2wasm-linux-d8"
   triggers: "dart2wasm-linux-firefox"
@@ -2899,6 +2931,7 @@ trigger {
 trigger {
   id: "dart2wasm-gitiles-trigger-stable"
   realm: "ci"
+  triggers: "dart2wasm-asserts-linux-chrome-stable"
   triggers: "dart2wasm-linux-chrome-stable"
   triggers: "dart2wasm-linux-d8-stable"
   triggers: "dart2wasm-linux-firefox-stable"

From 351b097ef5696ddf9236e704d5592ea74ba10640 Mon Sep 17 00:00:00 2001
From: Martin Kustermann <kustermann@google.com>
Date: Tue, 18 Jun 2024 08:20:32 +0000
Subject: [PATCH 749/826] [dart2wasm] Add dart2wasm-linux-jscm-chrome builder
 to CQ
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I0df24b623543906a0348b9f823980be35b75bcec
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/371542
Commit-Queue: Martin Kustermann <kustermann@google.com>
Reviewed-by: Ömer Ağacan <omersa@google.com>
---
 dart2wasm.star             |   1 +
 generated/commit-queue.cfg | 303 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 301 insertions(+), 3 deletions(-)

diff --git a/dart2wasm.star b/dart2wasm.star
index 18fa45bc8bf9..524db463ccf0 100644
--- a/dart2wasm.star
+++ b/dart2wasm.star
@@ -49,6 +49,7 @@ dart.ci_sandbox_builder(
     "dart2wasm-linux-jscm-chrome",
     category = "d2w|cm",
     properties = [chrome, emscripten, no_android],
+    location_filters = paths.to_location_filters(paths.dart2wasm),
     triggered_by = ["dart2wasm-gitiles-trigger-%s"],
 )
 
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 0d596de3735e..b865c0fd79fb 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -1066,7 +1066,106 @@ config_groups {
       }
       builders {
         name: "dart/try/dart2wasm-linux-jscm-chrome-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm_shared/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/wasm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
       }
       builders {
         name: "dart/try/dart2wasm-linux-optimized-jsc-try"
@@ -2940,7 +3039,106 @@ config_groups {
       }
       builders {
         name: "dart/try/dart2wasm-linux-jscm-chrome-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm_shared/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/wasm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
       }
       builders {
         name: "dart/try/dart2wasm-linux-optimized-jsc-try"
@@ -4711,7 +4909,106 @@ config_groups {
       }
       builders {
         name: "dart/try/dart2wasm-linux-jscm-chrome-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm_shared/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/wasm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          path_regexp: "sdk/lib/_js_interop/.+"
+        }
       }
       builders {
         name: "dart/try/dart2wasm-linux-optimized-jsc-try"

From b13b3015010ea36343038264b4ed5665e097d66d Mon Sep 17 00:00:00 2001
From: Martin Kustermann <kustermann@google.com>
Date: Thu, 20 Jun 2024 09:58:36 +0000
Subject: [PATCH 750/826] Update OWNERS: Remove Xooglers's @google.com emails
 as those won't be received

Change-Id: I4203febe8e27f417146bffaf7be24809715f74cf
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/372061
Commit-Queue: Martin Kustermann <kustermann@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 OWNERS                    | 2 --
 codereview.settings       | 2 +-
 generated/luci-notify.cfg | 2 --
 main.star                 | 2 --
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/OWNERS b/OWNERS
index da84daa5949b..4e645ade3918 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,7 +1,5 @@
 # primary
 athom@google.com
-sortie@google.com
-whesse@google.com
 
 # secondary
 kustermann@google.com
diff --git a/codereview.settings b/codereview.settings
index ea2fa057e008..c372a17ae7ac 100644
--- a/codereview.settings
+++ b/codereview.settings
@@ -1,4 +1,4 @@
 GERRIT_HOST: True
 CODE_REVIEW_SERVER: https://dart-review.googlesource.com
-CC_LIST: whesse@google.com
+CC_LIST:
 VIEW_VC: https://dart.googlesource.com/sdk/+/
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 4357910c7abe..02d9384c5c14 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -1002,8 +1002,6 @@ notifiers {
     on_new_failure: true
     email {
       recipients: "athom@google.com"
-      recipients: "sortie@google.com"
-      recipients: "whesse@google.com"
     }
   }
   builders {
diff --git a/main.star b/main.star
index 7ae19512ef9e..c868bddeae33 100755
--- a/main.star
+++ b/main.star
@@ -115,8 +115,6 @@ luci.notifier(
     on_new_failure = True,
     notify_emails = [
         "athom@google.com",
-        "sortie@google.com",
-        "whesse@google.com",
     ],
 )
 

From 6ee6b27c061ef89054a360fdd0fb78d254e21fd8 Mon Sep 17 00:00:00 2001
From: Martin Kustermann <kustermann@google.com>
Date: Thu, 11 Jul 2024 07:21:22 +0000
Subject: [PATCH 751/826] [dart2wasm] Temporarily remove unstable jsc builder

Change-Id: I3d4a5d70909f9b0c3d5123ebc3bd6ef24a4a891b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/375102
Commit-Queue: Martin Kustermann <kustermann@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 dart2wasm.star               |   9 +--
 generated/commit-queue.cfg   |  12 ---
 generated/cr-buildbucket.cfg | 144 -----------------------------------
 generated/luci-milo.cfg      |  23 ------
 generated/luci-notify.cfg    |  11 ---
 generated/luci-scheduler.cfg |  33 --------
 generated/project.cfg        |   2 +-
 7 files changed, 2 insertions(+), 232 deletions(-)

diff --git a/dart2wasm.star b/dart2wasm.star
index 524db463ccf0..cd33025d0378 100644
--- a/dart2wasm.star
+++ b/dart2wasm.star
@@ -6,7 +6,7 @@ Defines the dart2wasm builders.
 """
 
 load("//lib/dart.star", "dart")
-load("//lib/defaults.star", "chrome", "emscripten", "firefox", "js_engines", "no_android")
+load("//lib/defaults.star", "chrome", "emscripten", "firefox", "no_android")
 load("//lib/paths.star", "paths")
 
 dart.poller(
@@ -22,13 +22,6 @@ dart.ci_sandbox_builder(
     triggered_by = ["dart2wasm-gitiles-trigger-%s"],
 )
 
-dart.ci_sandbox_builder(
-    "dart2wasm-linux-optimized-jsc",
-    category = "d2w|j",
-    properties = [js_engines, emscripten, no_android],
-    triggered_by = ["dart2wasm-gitiles-trigger-%s"],
-)
-
 dart.ci_sandbox_builder(
     "dart2wasm-asserts-linux-chrome",
     category = "d2w|ca",
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index b865c0fd79fb..ab810899d175 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -1167,10 +1167,6 @@ config_groups {
           path_regexp: "sdk/lib/_js_interop/.+"
         }
       }
-      builders {
-        name: "dart/try/dart2wasm-linux-optimized-jsc-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/ddc-linux-chrome-try"
         location_filters {
@@ -3140,10 +3136,6 @@ config_groups {
           path_regexp: "sdk/lib/_js_interop/.+"
         }
       }
-      builders {
-        name: "dart/try/dart2wasm-linux-optimized-jsc-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/ddc-canary-linux-chrome-try"
         includable_only: true
@@ -5010,10 +5002,6 @@ config_groups {
           path_regexp: "sdk/lib/_js_interop/.+"
         }
       }
-      builders {
-        name: "dart/try/dart2wasm-linux-optimized-jsc-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/ddc-linux-chrome-try"
         location_filters {
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 1087bd382db7..6f1f1afa6fb3 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -1971,114 +1971,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "dart2wasm-linux-optimized-jsc"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "checkout_javascript_engines": true,'
-        '    "download_android_deps": false,'
-        '    "download_emscripten": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2wasm-linux-optimized-jsc-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "checkout_javascript_engines": true,'
-        '    "download_android_deps": false,'
-        '    "download_emscripten": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 60
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "dart2wasm-linux-optimized-jsc-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "checkout_javascript_engines": true,'
-        '    "download_android_deps": false,'
-        '    "download_emscripten": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 60
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "ddc-canary-linux-chrome"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10510,42 +10402,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "dart2wasm-linux-optimized-jsc-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "checkout_javascript_engines": true,'
-        '    "download_android_deps": false,'
-        '    "download_emscripten": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "ddc-canary-linux-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index d6432b653505..7aabd715cba0 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -46,9 +46,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/dart2wasm-linux-d8-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/dart2wasm-linux-optimized-jsc-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/dart2wasm-asserts-linux-chrome-try"
   }
@@ -582,11 +579,6 @@ consoles {
     category: "d2w"
     short_name: "d"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-optimized-jsc"
-    category: "d2w"
-    short_name: "j"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-asserts-linux-chrome"
     category: "d2w"
@@ -1256,11 +1248,6 @@ consoles {
     category: "d2w"
     short_name: "d"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-optimized-jsc"
-    category: "d2w"
-    short_name: "j"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-asserts-linux-chrome"
     category: "d2w"
@@ -2004,11 +1991,6 @@ consoles {
     category: "d2w"
     short_name: "d"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-optimized-jsc-beta"
-    category: "d2w"
-    short_name: "j"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-asserts-linux-chrome-beta"
     category: "d2w"
@@ -2408,11 +2390,6 @@ consoles {
     category: "d2w"
     short_name: "d"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-optimized-jsc-stable"
-    category: "d2w"
-    short_name: "j"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-asserts-linux-chrome-stable"
     category: "d2w"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 02d9384c5c14..a15c93b9529a 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -235,17 +235,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "dart2wasm-linux-optimized-jsc"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index eb3cddc18b75..d48c081b9fe2 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -554,36 +554,6 @@ job {
     builder: "dart2wasm-linux-jscm-chrome-stable"
   }
 }
-job {
-  id: "dart2wasm-linux-optimized-jsc"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "dart2wasm-linux-optimized-jsc"
-  }
-}
-job {
-  id: "dart2wasm-linux-optimized-jsc-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "dart2wasm-linux-optimized-jsc-beta"
-  }
-}
-job {
-  id: "dart2wasm-linux-optimized-jsc-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "dart2wasm-linux-optimized-jsc-stable"
-  }
-}
 job {
   id: "ddc-canary-linux-chrome"
   realm: "ci.sandbox"
@@ -2840,7 +2810,6 @@ trigger {
   triggers: "dart2wasm-linux-d8-beta"
   triggers: "dart2wasm-linux-firefox-beta"
   triggers: "dart2wasm-linux-jscm-chrome-beta"
-  triggers: "dart2wasm-linux-optimized-jsc-beta"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/beta"
@@ -2902,7 +2871,6 @@ trigger {
   triggers: "dart2wasm-linux-d8"
   triggers: "dart2wasm-linux-firefox"
   triggers: "dart2wasm-linux-jscm-chrome"
-  triggers: "dart2wasm-linux-optimized-jsc"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/main"
@@ -2936,7 +2904,6 @@ trigger {
   triggers: "dart2wasm-linux-d8-stable"
   triggers: "dart2wasm-linux-firefox-stable"
   triggers: "dart2wasm-linux-jscm-chrome-stable"
-  triggers: "dart2wasm-linux-optimized-jsc-stable"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/stable"
diff --git a/generated/project.cfg b/generated/project.cfg
index bbd54e21fa47..b9719b389f39 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.43.6"
+  version: "1.43.8"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"

From 985b3f6cc2013a5e999efbadadf9986a266701c2 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Wed, 17 Jul 2024 17:06:03 +0000
Subject: [PATCH 752/826] [infra] Upgrade GCC builder to Ubuntu Noble.

Change-Id: I9d9f1bbd1e203a75d15bd62f42f4dda6d7105dff
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/376026
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 4 ++--
 generated/project.cfg        | 2 +-
 lib/dart.star                | 3 ++-
 lib/defaults.star            | 2 ++
 vm.star                      | 3 ++-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 6f1f1afa6fb3..67dbfc63310b 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -7548,7 +7548,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
+      dimensions: "os:Ubuntu-24"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12794,7 +12794,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
+      dimensions: "os:Ubuntu-24"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
diff --git a/generated/project.cfg b/generated/project.cfg
index b9719b389f39..7c518bb1fcdd 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.43.8"
+  version: "1.43.9"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/lib/dart.star b/lib/dart.star
index 7a46395c4771..9dbc003f3c93 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -13,6 +13,7 @@ load(
     "jammy",
     "linux",
     "mac",
+    "noble",
     "windows",
     "windows11",
 )
@@ -207,7 +208,7 @@ def _builder(
             fail("builder %s should be a %s builder but was %s" % (name, expected_os, os))
 
     expect_os("-win", [windows["os"], windows11["os"]])
-    expect_os("-linux", [linux["os"], focal["os"], jammy["os"]])
+    expect_os("-linux", [linux["os"], focal["os"], jammy["os"], noble["os"]])
     expect_os("-mac", mac["os"])
 
     cq_branches = ["main"] + [branch for branch in channels if branch != "try"]
diff --git a/lib/defaults.star b/lib/defaults.star
index 6e00af76c969..1efbf8858399 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -35,6 +35,7 @@ _ARM64 = {"cpu": "arm64"}
 _MAC = {"os": "Mac"}
 _FOCAL = {"os": "Ubuntu-20"}
 _JAMMY = {"os": "Ubuntu-22"}
+_NOBLE = {"os": "Ubuntu-24"}
 _WINDOWS10 = {"os": "Windows-10"}
 _WINDOWS11 = {"os": "Windows-11"}
 
@@ -56,6 +57,7 @@ focal = _FOCAL
 jammy = _JAMMY
 linux = _FOCAL
 mac = _MAC
+noble = _NOBLE
 windows = _WINDOWS10
 windows10 = _WINDOWS10
 windows11 = _WINDOWS11
diff --git a/vm.star b/vm.star
index fc7970ceb7dd..2e1a213995ee 100644
--- a/vm.star
+++ b/vm.star
@@ -17,6 +17,7 @@ load(
     "mac",
     "no_android",
     "no_reclient",
+    "noble",
     "slow_shards",
     "windows",
     "windows11",
@@ -410,7 +411,7 @@ _vm_builder(
 _nightly_builder(
     "vm-gcc-linux",
     category = "vm|misc|g",
-    dimensions = jammy,
+    dimensions = noble,
     execution_timeout = 5 * time.hour,
     rbe = False,
     properties = {

From 3e51fb41c7d254d7d7c940265f113ce5db9be154 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 23 Jul 2024 11:37:27 +0000
Subject: [PATCH 753/826] [infra] Disable RBE on Windows/Linux ARM64 builders

Change-Id: Ie6a012decdab7b811699cc52da65af28a8ec7609
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/377221
Reviewed-by: Tess Strickland <sstrickl@google.com>
Auto-Submit: Alexander Thomas <athom@google.com>
Commit-Queue: Tess Strickland <sstrickl@google.com>
---
 generated/cr-buildbucket.cfg | 114 +++++++++++++++++++++++++++++++++++
 pkg.star                     |   2 +
 vm.star                      |  11 ++++
 3 files changed, 127 insertions(+)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 67dbfc63310b..d84ba2553235 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -4133,6 +4133,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4164,6 +4167,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4195,6 +4201,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4564,6 +4573,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4597,6 +4609,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4630,6 +4645,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5233,6 +5251,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5878,6 +5899,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6010,6 +6034,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6043,6 +6070,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6076,6 +6106,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6424,6 +6457,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7396,6 +7432,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7427,6 +7466,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7458,6 +7500,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7845,6 +7890,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7876,6 +7924,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -7907,6 +7958,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8612,6 +8666,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8839,6 +8896,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8903,6 +8963,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -8966,6 +9029,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9128,6 +9194,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9161,6 +9230,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9194,6 +9266,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11104,6 +11179,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11247,6 +11325,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11646,6 +11727,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12013,6 +12097,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12145,6 +12232,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12305,6 +12395,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12704,6 +12797,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12967,6 +13063,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13244,6 +13343,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13471,6 +13573,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13535,6 +13640,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13598,6 +13706,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13696,6 +13807,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
diff --git a/pkg.star b/pkg.star
index 7e4984f72fa8..d8306e05a8dc 100644
--- a/pkg.star
+++ b/pkg.star
@@ -31,6 +31,7 @@ dart.ci_sandbox_builder(
     category = "pkg|la",
     dimensions = [jammy, arm64],
     properties = {"clobber": False},
+    rbe = False,  # b/306641265
 )
 dart.ci_sandbox_builder(
     "pkg-mac-release",
@@ -55,6 +56,7 @@ dart.ci_sandbox_builder(
     category = "pkg|wa",
     dimensions = [windows11, arm64, flutter_pool],
     properties = [{"clobber": False}, no_reclient],
+    rbe = False,
 )
 dart.ci_sandbox_builder(
     "pkg-linux-debug",
diff --git a/vm.star b/vm.star
index 2e1a213995ee..99ff529dd0d0 100644
--- a/vm.star
+++ b/vm.star
@@ -108,6 +108,7 @@ _vm_builder(
     category = "vm|jit|a6",
     dimensions = [jammy, arm64],
     properties = {"clobber": False},
+    rbe = False,  # b/306641265
 )
 _vm_builder(
     "vm-mac-debug-arm64",
@@ -160,12 +161,14 @@ _nightly_builder(
     category = "vm|jit|wad",
     dimensions = [windows11, arm64, flutter_pool],
     properties = [{"clobber": False}, no_reclient],
+    rbe = False,
 )
 _vm_builder(
     "vm-win-release-arm64",
     category = "vm|jit|war",
     dimensions = [windows11, arm64, flutter_pool],
     properties = [{"clobber": False}, no_reclient],
+    rbe = False,
 )
 
 # vm|appjit
@@ -212,6 +215,7 @@ _nightly_builder(
     category = "vm|aot|a6",
     dimensions = [jammy, arm64],
     properties = {"clobber": False},
+    rbe = False,  # b/306641265
 )
 _vm_builder(
     "vm-aot-mac-release-arm64",
@@ -241,12 +245,14 @@ _nightly_builder(
     category = "vm|aot|wad",
     dimensions = [windows11, arm64, flutter_pool],
     properties = [{"clobber": False}, no_reclient],
+    rbe = False,
 )
 _vm_builder(
     "vm-aot-win-release-arm64",
     category = "vm|aot|war",
     dimensions = [windows11, arm64, flutter_pool],
     properties = [{"clobber": False}, no_reclient],
+    rbe = False,
 )
 
 # vm|aot|android
@@ -338,24 +344,28 @@ _nightly_builder(
     category = "vm|misc|sanitizer|a",
     dimensions = [jammy, arm64],
     properties = {"clobber": False},
+    rbe = False,  # b/306641265
 )
 _nightly_builder(
     "vm-msan-linux-release-arm64",
     category = "vm|misc|sanitizer|m",
     dimensions = [jammy, arm64],
     properties = {"clobber": False},
+    rbe = False,  # b/306641265
 )
 _nightly_builder(
     "vm-tsan-linux-release-arm64",
     category = "vm|misc|sanitizer|t",
     dimensions = [jammy, arm64],
     properties = {"clobber": False},
+    rbe = False,  # b/306641265
 )
 _nightly_builder(
     "vm-ubsan-linux-release-arm64",
     category = "vm|misc|sanitizer|u",
     dimensions = [jammy, arm64],
     properties = {"clobber": False},
+    rbe = False,  # b/306641265
 )
 _nightly_builder(
     "vm-reload-linux-debug-x64",
@@ -469,6 +479,7 @@ _vm_builder(
     category = "vm|ffi|qr",
     dimensions = [jammy, arm64],
     properties = {"clobber": False},
+    rbe = False,  # b/306641265
 )
 
 # Isolate stress test builder

From 3325361c92d24f78fcd2bc19effac47aa87187f9 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 29 Jul 2024 16:29:33 +0000
Subject: [PATCH 754/826] [infra] Disable RBE on arm64 SDK try builder

Change-Id: Iff187bcef606bff62933eb2fa10e0dafd7c7a9b0
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/377823
Reviewed-by: Ryan Macnak <rmacnak@google.com>
Auto-Submit: Alexander Thomas <athom@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/cr-buildbucket.cfg | 1 +
 sdk.star                     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index d84ba2553235..762e37c04a0c 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -9663,6 +9663,7 @@ buckets {
         '  ],'
         '  "clobber": true,'
         '  "disable_bcid": true,'
+        '  "disable_rbe": true,'
         '  "recipe": "release/sdk"'
         '}'
       priority: 30
diff --git a/sdk.star b/sdk.star
index 4e9554e40506..8297bbcbc65e 100644
--- a/sdk.star
+++ b/sdk.star
@@ -72,6 +72,7 @@ dart.try_builder(
     properties = {
         "archs": ["arm", "arm64"],
         "disable_bcid": True,
+        "disable_rbe": True,
     },
     location_filters = paths.to_location_filters(paths.release),
     recipe = "release/sdk",

From 0cd550c48db505296d88929ba208bbabe515f43f Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Wed, 31 Jul 2024 16:32:10 +0000
Subject: [PATCH 755/826] [infra] Upgrade vm-ffi-qemu-linux-release-riscv64 to
 Ubuntu Noble.

Bug: https://github.com/dart-lang/sdk/issues/49791
Change-Id: I44977f71c9b86b4413740038343a80dffe7fd8c6
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/378060
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 36 ++++++++++++------------------------
 generated/project.cfg        |  2 +-
 vm.star                      |  6 ++----
 3 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 762e37c04a0c..4402c98d847f 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -7421,9 +7421,9 @@ buckets {
     builders {
       name: "vm-ffi-qemu-linux-release-riscv64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
+      dimensions: "os:Ubuntu-24"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7432,16 +7432,13 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -7455,9 +7452,9 @@ buckets {
     builders {
       name: "vm-ffi-qemu-linux-release-riscv64-beta"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
+      dimensions: "os:Ubuntu-24"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7466,16 +7463,13 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -7489,9 +7483,9 @@ buckets {
     builders {
       name: "vm-ffi-qemu-linux-release-riscv64-stable"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
+      dimensions: "os:Ubuntu-24"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7500,16 +7494,13 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -12787,9 +12778,9 @@ buckets {
     builders {
       name: "vm-ffi-qemu-linux-release-riscv64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
+      dimensions: "os:Ubuntu-24"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12798,16 +12789,13 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
diff --git a/generated/project.cfg b/generated/project.cfg
index 7c518bb1fcdd..726c64a2e127 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.43.9"
+  version: "1.43.10"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/vm.star b/vm.star
index 99ff529dd0d0..30d0044895f2 100644
--- a/vm.star
+++ b/vm.star
@@ -472,14 +472,12 @@ _vm_builder(
 _vm_builder(
     "vm-ffi-qemu-linux-release-arm",
     category = "vm|ffi|qa",
-    dimensions = jammy,
+    dimensions = jammy,  # Pre-Jammy ARM QEMU has flaky crashes
 )
 _vm_builder(
     "vm-ffi-qemu-linux-release-riscv64",
     category = "vm|ffi|qr",
-    dimensions = [jammy, arm64],
-    properties = {"clobber": False},
-    rbe = False,  # b/306641265
+    dimensions = noble,  # Pre-Noble RISC-V QEMU is missing extensions
 )
 
 # Isolate stress test builder

From 34bcd27a4bef8857997c1077015f4cf20581441e Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Thu, 1 Aug 2024 07:39:52 +0000
Subject: [PATCH 756/826] [infra] Disable RBE on arm64 SDK try builder, take 2.

Also stop disabling RBE for riscv SDK try builder, which is no longer a gcc build.

Change-Id: I9723922084490bc51b94ce1f7ccab766150a9403
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/378300
Auto-Submit: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 5 +++--
 sdk.star                     | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 4402c98d847f..18c5c262efb6 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -9642,6 +9642,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9654,7 +9657,6 @@ buckets {
         '  ],'
         '  "clobber": true,'
         '  "disable_bcid": true,'
-        '  "disable_rbe": true,'
         '  "recipe": "release/sdk"'
         '}'
       priority: 30
@@ -9680,7 +9682,6 @@ buckets {
       properties:
         '{'
         '  "$dart/build": {'
-        '    "disable_rbe": true,'
         '    "timeout": 7200'
         '  },'
         '  "$recipe_engine/isolated": {'
diff --git a/sdk.star b/sdk.star
index 8297bbcbc65e..1ab7837208fa 100644
--- a/sdk.star
+++ b/sdk.star
@@ -72,10 +72,10 @@ dart.try_builder(
     properties = {
         "archs": ["arm", "arm64"],
         "disable_bcid": True,
-        "disable_rbe": True,
     },
     location_filters = paths.to_location_filters(paths.release),
     recipe = "release/sdk",
+    rbe = False,
 )
 
 dart.try_builder(
@@ -88,7 +88,6 @@ dart.try_builder(
         "disable_bcid": True,
     },
     recipe = "release/sdk",
-    rbe = False,  # RBE gcc cross-compilation isn't supported yet
 )
 
 dart.try_builder(

From 1ab77c331e0284901fd387f9329d328f26cdba36 Mon Sep 17 00:00:00 2001
From: Alexander Markov <alexmarkov@google.com>
Date: Mon, 19 Aug 2024 16:53:11 +0000
Subject: [PATCH 757/826] Add vm-aot-dyn-linux-debug-x64 builder

Corresponding test_matrix.json change:
https://dart-review.googlesource.com/c/sdk/+/380584

Change-Id: Ief9d6cd5fa15b568e297dcda0fe4e13045a36c62
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/380585
Commit-Queue: Alexander Markov <alexmarkov@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   | 864 +++++++++++++++++++++++++++++++++++
 generated/cr-buildbucket.cfg |  64 +++
 generated/luci-milo.cfg      |  13 +
 generated/luci-notify.cfg    |  13 +
 generated/luci-scheduler.cfg |  11 +
 generated/project.cfg        |   2 +-
 vm.star                      |   5 +
 7 files changed, 971 insertions(+), 1 deletion(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index ab810899d175..e1813b55f877 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -226,76 +226,91 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "runtime/tools/dartfuzz/.+"
         }
       }
@@ -304,76 +319,91 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "runtime/tools/dartfuzz/.+"
         }
       }
@@ -394,6 +424,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
       }
@@ -406,6 +437,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
       }
@@ -414,6 +446,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
       }
@@ -422,6 +455,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
       }
@@ -430,6 +464,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
       }
@@ -442,96 +477,115 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/js.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "utils/compiler/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
@@ -556,96 +610,115 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/js.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "utils/compiler/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
@@ -654,96 +727,115 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/js.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "utils/compiler/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
@@ -756,101 +848,121 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm_shared/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/wasm.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
       }
@@ -859,101 +971,121 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm_shared/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/wasm.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
       }
@@ -962,101 +1094,121 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm_shared/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/wasm.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
       }
@@ -1069,101 +1221,121 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm_shared/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/wasm.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
       }
@@ -1172,96 +1344,115 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/js.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(build_integration|dev_compiler|meta)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "utils/dartdevc/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
@@ -1285,71 +1476,85 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
       }
@@ -1366,126 +1571,151 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/vm/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "runtime/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_http/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "third_party/double-conversion/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "third_party/fallback_root_certificates/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/vm_service/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "third_party/pkg/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/package_deps/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/.*\\.dart"
         }
       }
@@ -1614,106 +1844,127 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/vm/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "runtime/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_http/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "third_party/double-conversion/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "third_party/fallback_root_certificates/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/vm_service/.+"
         }
       }
@@ -1742,106 +1993,127 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/vm/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "runtime/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_http/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "third_party/double-conversion/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "third_party/fallback_root_certificates/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/vm_service/.+"
         }
       }
@@ -1880,6 +2152,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
       }
@@ -1892,6 +2165,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
       }
@@ -1900,6 +2174,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
       }
@@ -1908,6 +2183,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
       }
@@ -1916,6 +2192,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
       }
@@ -1992,76 +2269,91 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "runtime/tools/dartfuzz/.+"
         }
       }
@@ -2070,76 +2362,91 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "runtime/tools/dartfuzz/.+"
         }
       }
@@ -2163,6 +2470,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
       }
@@ -2175,6 +2483,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
       }
@@ -2183,6 +2492,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
       }
@@ -2191,6 +2501,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
       }
@@ -2199,6 +2510,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
       }
@@ -2215,96 +2527,115 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/js.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "utils/compiler/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
@@ -2313,96 +2644,115 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/js.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "utils/compiler/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
@@ -2411,96 +2761,115 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/js.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "utils/compiler/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
@@ -2525,96 +2894,115 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/js.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "utils/compiler/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
@@ -2623,96 +3011,115 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/js.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "utils/compiler/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
@@ -2725,101 +3132,121 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm_shared/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/wasm.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
       }
@@ -2828,101 +3255,121 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm_shared/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/wasm.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
       }
@@ -2931,101 +3378,121 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm_shared/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/wasm.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
       }
@@ -3038,101 +3505,121 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm_shared/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/wasm.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
       }
@@ -3149,96 +3636,115 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/js.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(build_integration|dev_compiler|meta)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "utils/dartdevc/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
@@ -3267,6 +3773,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
       }
@@ -3286,71 +3793,85 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
       }
@@ -3383,126 +3904,151 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/vm/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "runtime/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_http/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "third_party/double-conversion/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "third_party/fallback_root_certificates/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/vm_service/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "third_party/pkg/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/package_deps/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/.*\\.dart"
         }
       }
@@ -3542,6 +4088,10 @@ config_groups {
         name: "dart/try/vm-aot-dwarf-linux-product-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-dyn-linux-debug-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-linux-debug-simarm_x64-try"
         includable_only: true
@@ -3743,106 +4293,127 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/vm/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "runtime/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_http/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "third_party/double-conversion/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "third_party/fallback_root_certificates/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/vm_service/.+"
         }
       }
@@ -3927,106 +4498,127 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/vm/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "runtime/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_http/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "third_party/double-conversion/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "third_party/fallback_root_certificates/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/vm_service/.+"
         }
       }
@@ -4061,76 +4653,91 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "runtime/tools/dartfuzz/.+"
         }
       }
@@ -4139,76 +4746,91 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "runtime/tools/dartfuzz/.+"
         }
       }
@@ -4229,6 +4851,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
       }
@@ -4241,6 +4864,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
       }
@@ -4249,6 +4873,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
       }
@@ -4257,6 +4882,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
       }
@@ -4265,6 +4891,7 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
       }
@@ -4277,96 +4904,115 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/js.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "utils/compiler/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
@@ -4391,96 +5037,115 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/js.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "utils/compiler/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
@@ -4489,96 +5154,115 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/js.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "utils/compiler/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
@@ -4591,101 +5275,121 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm_shared/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/wasm.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
       }
@@ -4694,101 +5398,121 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm_shared/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/wasm.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
       }
@@ -4797,101 +5521,121 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm_shared/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/wasm.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
       }
@@ -4904,101 +5648,121 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(dart2wasm|vm|wasm_builder|_js_interop_checks)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm_shared/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm/lib/ffi_.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/wasm.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
       }
@@ -5007,96 +5771,115 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/js.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(build_integration|dev_compiler|meta)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "utils/dartdevc/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
@@ -5120,71 +5903,85 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
       }
@@ -5201,126 +5998,151 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/vm/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "runtime/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_http/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "third_party/double-conversion/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "third_party/fallback_root_certificates/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/vm_service/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "third_party/pkg/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/package_deps/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/.*\\.dart"
         }
       }
@@ -5449,106 +6271,127 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/vm/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "runtime/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_http/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "third_party/double-conversion/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "third_party/fallback_root_certificates/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/vm_service/.+"
         }
       }
@@ -5577,106 +6420,127 @@ config_groups {
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "DEPS"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "build/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk_args.gni"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/gn.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/build.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: ".dart_tool/package_config.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.py"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/generate_package_config.dart"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/[^_].+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tools/bots/test_matrix.json"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "tests/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/vm/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "runtime/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_http/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_internal/vm.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "third_party/double-conversion/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "third_party/fallback_root_certificates/.+"
         }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
           path_regexp: "pkg/vm_service/.+"
         }
       }
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 18c5c262efb6..9f0719bf4cb1 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5010,6 +5010,38 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-dyn-linux-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-linux-debug-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -11543,6 +11575,38 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-dyn-linux-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-linux-debug-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 7aabd715cba0..4905dd1d8c7b 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -175,6 +175,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-dwarf-linux-product-x64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-aot-dyn-linux-debug-x64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-eager-optimization-linux-release-ia32-try"
   }
@@ -794,6 +797,11 @@ consoles {
     category: "vm|aot"
     short_name: "dw"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-dyn-linux-debug-x64"
+    category: "vm|aot"
+    short_name: "dm"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-eager-optimization-linux-release-ia32"
     category: "vm|misc"
@@ -1613,6 +1621,11 @@ consoles {
     category: "vm|aot"
     short_name: "dw"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-dyn-linux-debug-x64"
+    category: "vm|aot"
+    short_name: "dm"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-eager-optimization-linux-release-ia32"
     category: "vm|misc"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index a15c93b9529a..249d4b3248f8 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -539,6 +539,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-dyn-linux-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index d48c081b9fe2..a86543071ae2 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1134,6 +1134,16 @@ job {
     builder: "vm-aot-dwarf-linux-product-x64"
   }
 }
+job {
+  id: "vm-aot-dyn-linux-debug-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-dyn-linux-debug-x64"
+  }
+}
 job {
   id: "vm-aot-linux-debug-simarm_x64"
   realm: "ci.sandbox"
@@ -2655,6 +2665,7 @@ trigger {
   triggers: "front-end-nnbd-win-release-x64"
   triggers: "vm-aot-asan-linux-release-x64"
   triggers: "vm-aot-dwarf-linux-product-x64"
+  triggers: "vm-aot-dyn-linux-debug-x64"
   triggers: "vm-aot-linux-debug-simriscv64"
   triggers: "vm-aot-linux-debug-x64"
   triggers: "vm-aot-linux-debug-x64c"
diff --git a/generated/project.cfg b/generated/project.cfg
index 726c64a2e127..b8a93bf9a6bf 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.43.10"
+  version: "1.43.12"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/vm.star b/vm.star
index 30d0044895f2..6cb47e2ef03e 100644
--- a/vm.star
+++ b/vm.star
@@ -292,6 +292,11 @@ _nightly_builder(
     "vm-aot-dwarf-linux-product-x64",
     category = "vm|aot|dw",
 )
+_nightly_builder(
+    "vm-aot-dyn-linux-debug-x64",
+    category = "vm|aot|dm",
+    channels = ["try"],
+)
 
 # vm|misc
 _nightly_builder(

From 2bdc662a1e3504ae2897cc948d37ced480899b6d Mon Sep 17 00:00:00 2001
From: Martin Kustermann <kustermann@google.com>
Date: Tue, 20 Aug 2024 08:08:23 +0000
Subject: [PATCH 758/826] Revert "[dart2wasm] Temporarily remove unstable jsc
 builder"

This reverts commit 6ee6b27c061ef89054a360fdd0fb78d254e21fd8.

We've rolled a new version of JSC in [0] which (at least in local
testing) seems much more stable

[0] https://dart-review.googlesource.com/c/sdk/+/381241

Change-Id: Ie86d40aeefaeebbcb2cfebee99e8e3f36b14235f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/381360
Commit-Queue: Martin Kustermann <kustermann@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 dart2wasm.star               |   9 ++-
 generated/commit-queue.cfg   |  12 +++
 generated/cr-buildbucket.cfg | 144 +++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      |  23 ++++++
 generated/luci-notify.cfg    |  11 +++
 generated/luci-scheduler.cfg |  33 ++++++++
 6 files changed, 231 insertions(+), 1 deletion(-)

diff --git a/dart2wasm.star b/dart2wasm.star
index cd33025d0378..524db463ccf0 100644
--- a/dart2wasm.star
+++ b/dart2wasm.star
@@ -6,7 +6,7 @@ Defines the dart2wasm builders.
 """
 
 load("//lib/dart.star", "dart")
-load("//lib/defaults.star", "chrome", "emscripten", "firefox", "no_android")
+load("//lib/defaults.star", "chrome", "emscripten", "firefox", "js_engines", "no_android")
 load("//lib/paths.star", "paths")
 
 dart.poller(
@@ -22,6 +22,13 @@ dart.ci_sandbox_builder(
     triggered_by = ["dart2wasm-gitiles-trigger-%s"],
 )
 
+dart.ci_sandbox_builder(
+    "dart2wasm-linux-optimized-jsc",
+    category = "d2w|j",
+    properties = [js_engines, emscripten, no_android],
+    triggered_by = ["dart2wasm-gitiles-trigger-%s"],
+)
+
 dart.ci_sandbox_builder(
     "dart2wasm-asserts-linux-chrome",
     category = "d2w|ca",
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index e1813b55f877..bcbedceb9f75 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -1339,6 +1339,10 @@ config_groups {
           path_regexp: "sdk/lib/_js_interop/.+"
         }
       }
+      builders {
+        name: "dart/try/dart2wasm-linux-optimized-jsc-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/ddc-linux-chrome-try"
         location_filters {
@@ -3623,6 +3627,10 @@ config_groups {
           path_regexp: "sdk/lib/_js_interop/.+"
         }
       }
+      builders {
+        name: "dart/try/dart2wasm-linux-optimized-jsc-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/ddc-canary-linux-chrome-try"
         includable_only: true
@@ -5766,6 +5774,10 @@ config_groups {
           path_regexp: "sdk/lib/_js_interop/.+"
         }
       }
+      builders {
+        name: "dart/try/dart2wasm-linux-optimized-jsc-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/ddc-linux-chrome-try"
         location_filters {
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 9f0719bf4cb1..681e214f8de1 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -1971,6 +1971,114 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "dart2wasm-linux-optimized-jsc"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "checkout_javascript_engines": true,'
+        '    "download_android_deps": false,'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2wasm-linux-optimized-jsc-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "checkout_javascript_engines": true,'
+        '    "download_android_deps": false,'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2wasm-linux-optimized-jsc-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "checkout_javascript_engines": true,'
+        '    "download_android_deps": false,'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "ddc-canary-linux-chrome"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10502,6 +10610,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "dart2wasm-linux-optimized-jsc-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "checkout_javascript_engines": true,'
+        '    "download_android_deps": false,'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "ddc-canary-linux-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 4905dd1d8c7b..79584477a68b 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -46,6 +46,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/dart2wasm-linux-d8-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/dart2wasm-linux-optimized-jsc-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/dart2wasm-asserts-linux-chrome-try"
   }
@@ -582,6 +585,11 @@ consoles {
     category: "d2w"
     short_name: "d"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-optimized-jsc"
+    category: "d2w"
+    short_name: "j"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-asserts-linux-chrome"
     category: "d2w"
@@ -1256,6 +1264,11 @@ consoles {
     category: "d2w"
     short_name: "d"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-optimized-jsc"
+    category: "d2w"
+    short_name: "j"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-asserts-linux-chrome"
     category: "d2w"
@@ -2004,6 +2017,11 @@ consoles {
     category: "d2w"
     short_name: "d"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-optimized-jsc-beta"
+    category: "d2w"
+    short_name: "j"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-asserts-linux-chrome-beta"
     category: "d2w"
@@ -2403,6 +2421,11 @@ consoles {
     category: "d2w"
     short_name: "d"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-optimized-jsc-stable"
+    category: "d2w"
+    short_name: "j"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-asserts-linux-chrome-stable"
     category: "d2w"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 249d4b3248f8..87ae33204c83 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -235,6 +235,17 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "dart2wasm-linux-optimized-jsc"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index a86543071ae2..e841b1c7fddd 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -554,6 +554,36 @@ job {
     builder: "dart2wasm-linux-jscm-chrome-stable"
   }
 }
+job {
+  id: "dart2wasm-linux-optimized-jsc"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "dart2wasm-linux-optimized-jsc"
+  }
+}
+job {
+  id: "dart2wasm-linux-optimized-jsc-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "dart2wasm-linux-optimized-jsc-beta"
+  }
+}
+job {
+  id: "dart2wasm-linux-optimized-jsc-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "dart2wasm-linux-optimized-jsc-stable"
+  }
+}
 job {
   id: "ddc-canary-linux-chrome"
   realm: "ci.sandbox"
@@ -2821,6 +2851,7 @@ trigger {
   triggers: "dart2wasm-linux-d8-beta"
   triggers: "dart2wasm-linux-firefox-beta"
   triggers: "dart2wasm-linux-jscm-chrome-beta"
+  triggers: "dart2wasm-linux-optimized-jsc-beta"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/beta"
@@ -2882,6 +2913,7 @@ trigger {
   triggers: "dart2wasm-linux-d8"
   triggers: "dart2wasm-linux-firefox"
   triggers: "dart2wasm-linux-jscm-chrome"
+  triggers: "dart2wasm-linux-optimized-jsc"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/main"
@@ -2915,6 +2947,7 @@ trigger {
   triggers: "dart2wasm-linux-d8-stable"
   triggers: "dart2wasm-linux-firefox-stable"
   triggers: "dart2wasm-linux-jscm-chrome-stable"
+  triggers: "dart2wasm-linux-optimized-jsc-stable"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/stable"

From 55dbd3063ea45ecd14c16297d4a872be0d262129 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Wed, 21 Aug 2024 20:13:17 +0000
Subject: [PATCH 759/826] [infra] Improve analyzer commit queue coverage.

- Swap analyzer-linux-release for analyzer-win-release. Adds coverage for Windows path issues. Posix remains covered by analyzer-analysis-server-linux.
- Add flutter-analyze. Breakages here are particularly disruptive by holding up Dart->Engine rolls.
- Remove non-default 60 minute timeout from flutter-analyze. This predates our switch from e2 machines to t2d machines. This builder currently takes ~20 minutes.

Change-Id: Ibbd5f100767e76596b336b0dfd926875f7762b66
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/381702
Reviewed-by: Samuel Rawlins <srawlins@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 analyzer.star                |   4 +-
 generated/commit-queue.cfg   | 139 ++++++++++++++++++++++++++++-------
 generated/cr-buildbucket.cfg |   2 -
 3 files changed, 116 insertions(+), 29 deletions(-)

diff --git a/analyzer.star b/analyzer.star
index 557f2c54b43f..edd941f7073c 100644
--- a/analyzer.star
+++ b/analyzer.star
@@ -17,7 +17,7 @@ dart.ci_sandbox_builder(
     "flutter-analyze",
     category = "analyzer|fa",
     channels = ["try"],
-    execution_timeout = 60 * time.minute,
+    location_filters = paths.to_location_filters(paths.analyzer),
 )
 dart.ci_sandbox_builder(
     "analyzer-analysis-server-linux",
@@ -29,7 +29,6 @@ dart.ci_sandbox_builder(
     "analyzer-linux-release",
     category = "analyzer|l",
     channels = dart.channels,
-    location_filters = paths.to_location_filters(paths.analyzer),
 )
 dart.ci_sandbox_builder(
     "analyzer-mac-release",
@@ -42,4 +41,5 @@ dart.ci_sandbox_builder(
     category = "analyzer|w",
     channels = dart.channels,
     dimensions = windows,
+    location_filters = paths.to_location_filters(paths.analyzer),
 )
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index bcbedceb9f75..4ae08f69cec1 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -316,6 +316,14 @@ config_groups {
       }
       builders {
         name: "dart/try/analyzer-linux-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/analyzer-mac-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/analyzer-win-release-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -407,14 +415,6 @@ config_groups {
           path_regexp: "runtime/tools/dartfuzz/.+"
         }
       }
-      builders {
-        name: "dart/try/analyzer-mac-release-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/analyzer-win-release-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/beta-try"
         includable_only: true
@@ -2363,6 +2363,14 @@ config_groups {
       }
       builders {
         name: "dart/try/analyzer-linux-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/analyzer-mac-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/analyzer-win-release-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2454,14 +2462,6 @@ config_groups {
           path_regexp: "runtime/tools/dartfuzz/.+"
         }
       }
-      builders {
-        name: "dart/try/analyzer-mac-release-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/analyzer-win-release-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/benchmark-linux-try"
       }
@@ -3774,7 +3774,96 @@ config_groups {
       }
       builders {
         name: "dart/try/flutter-analyze-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "pkg/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "runtime/tools/dartfuzz/.+"
+        }
       }
       builders {
         name: "dart/try/flutter-frontend-try"
@@ -4751,6 +4840,14 @@ config_groups {
       }
       builders {
         name: "dart/try/analyzer-linux-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/analyzer-mac-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/analyzer-win-release-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -4842,14 +4939,6 @@ config_groups {
           path_regexp: "runtime/tools/dartfuzz/.+"
         }
       }
-      builders {
-        name: "dart/try/analyzer-mac-release-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/analyzer-win-release-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/beta-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 681e214f8de1..d468b382aef4 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -2537,7 +2537,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
-      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -10950,7 +10949,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 3600
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {

From 807105129d223d5d472c433da24c87c95dd5d288 Mon Sep 17 00:00:00 2001
From: Alexander Aprelev <aam@google.com>
Date: Tue, 10 Sep 2024 23:35:05 +0000
Subject: [PATCH 760/826] [infra] Add vm-aot-linux-release-x64 to default
 presubmit jobs.

It is useful to have at least one aot bot in the default list of try jobs.

Change-Id: I59b7ce7e1e908cad43b2f1b57fd59840da8d8ebc
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/384586
Reviewed-by: Ryan Macnak <rmacnak@google.com>
Commit-Queue: Alexander Aprelev <aam@google.com>
---
 generated/commit-queue.cfg | 381 ++++++++++++++++++++++++++++++++++++-
 generated/project.cfg      |   2 +-
 vm.star                    |   1 +
 3 files changed, 380 insertions(+), 4 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 4ae08f69cec1..127309fe5139 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -1761,7 +1761,132 @@ config_groups {
       }
       builders {
         name: "dart/try/vm-aot-linux-release-x64-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "pkg/vm/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "runtime/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "sdk/lib/_http/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "third_party/double-conversion/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "third_party/fallback_root_certificates/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "pkg/vm_service/.+"
+        }
       }
       builders {
         name: "dart/try/vm-aot-mac-release-arm64-try"
@@ -4219,7 +4344,132 @@ config_groups {
       }
       builders {
         name: "dart/try/vm-aot-linux-release-x64-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "pkg/vm/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "runtime/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "sdk/lib/_http/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "third_party/double-conversion/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "third_party/fallback_root_certificates/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "pkg/vm_service/.+"
+        }
       }
       builders {
         name: "dart/try/vm-aot-mac-product-arm64-try"
@@ -6285,7 +6535,132 @@ config_groups {
       }
       builders {
         name: "dart/try/vm-aot-linux-release-x64-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "DEPS"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "build/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "BUILD.gn"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "sdk_args.gni"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/gn.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/build.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: ".dart_tool/package_config.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/generate_package_config.py"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/generate_package_config.dart"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "sdk/lib/[^_].+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/bots/test_matrix.json"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tests/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "pkg/vm/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "runtime/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "sdk/lib/_http/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "sdk/lib/_internal/vm.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "third_party/double-conversion/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "third_party/fallback_root_certificates/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "pkg/vm_service/.+"
+        }
       }
       builders {
         name: "dart/try/vm-aot-mac-release-arm64-try"
diff --git a/generated/project.cfg b/generated/project.cfg
index b8a93bf9a6bf..93de28489490 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.43.12"
+  version: "1.43.13"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/vm.star b/vm.star
index 6cb47e2ef03e..3c3e8a5f0051 100644
--- a/vm.star
+++ b/vm.star
@@ -190,6 +190,7 @@ _nightly_builder(
 _vm_builder(
     "vm-aot-linux-release-x64",
     category = "vm|aot|r",
+    on_cq = True,
 )
 _vm_builder(
     "vm-aot-linux-debug-simarm_x64",

From 71f6e9262bce12c4f43bcafff9566a35175250b3 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 13 Sep 2024 10:42:24 +0000
Subject: [PATCH 761/826] [infra] Add chrome-dart2wasm-skwasm-ui to monorepo
 testing

See also: https://dart-review.googlesource.com/c/monorepo/+/385260

Change-Id: I734a100e4c5690d25adb8ee052453827bfb7e3de
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/384286
Reviewed-by: Martin Kustermann <kustermann@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 64 ++++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      | 12 +++++++
 monorepo.star                | 12 +++++--
 3 files changed, 85 insertions(+), 3 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index d468b382aef4..9e7a4a640ec0 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -2938,6 +2938,38 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "flutter-linux-chrome-dart2wasm-skwasm-ui"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/tester_engine"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 5400
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "flutter-linux-customer-testing"
       swarming_host: "chromium-swarm.appspot.com"
@@ -14419,6 +14451,38 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "flutter-linux-chrome-dart2wasm-skwasm-ui-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/tester_engine"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 5400
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "flutter-linux-customer-testing-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 79584477a68b..e4bc3ccc7799 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -502,6 +502,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try.monorepo/flutter-linux-web-tool-tests-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-chrome-dart2wasm-skwasm-ui-try"
+  }
   builder_view_only: true
 }
 consoles {
@@ -2956,6 +2959,11 @@ consoles {
     category: "flutter-web"
     short_name: "wtool"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-chrome-dart2wasm-skwasm-ui"
+    category: "flutter-web"
+    short_name: "skwasm-ui"
+  }
   header {
     links {
       name: "Consoles"
@@ -3202,6 +3210,10 @@ consoles {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tool-tests"
     short_name: "wtool"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-chrome-dart2wasm-skwasm-ui"
+    short_name: "skwasm-ui"
+  }
   header {
     links {
       name: "Consoles"
diff --git a/monorepo.star b/monorepo.star
index 83c48955f61e..0ac97e0356f9 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -211,12 +211,12 @@ monorepo_builder("flutter-linux-host_profile", "profile", "flutter-engine")
 monorepo_builder("flutter-linux-host_release", "release", "flutter-engine")
 monorepo_builder("flutter-linux-wasm_release", "wasm", "flutter-web")
 
-def monorepo_tester(name, short_name, console):
+def monorepo_tester(name, short_name, console, recipe = "engine_v2/tester"):
     dart.ci_sandbox_builder(
         name = name,
         channels = [],
         dimensions = {"pool": "dart.tests"},
-        executable = dart.flutter_recipe("engine_v2/tester"),
+        executable = dart.flutter_recipe(recipe),
         execution_timeout = 90 * time.minute,
         notifies = None,
         priority = priority.normal,
@@ -237,7 +237,7 @@ def monorepo_tester(name, short_name, console):
     dart.try_builder(
         name,
         bucket = "try.monorepo",
-        executable = dart.flutter_recipe("engine_v2/tester"),
+        executable = dart.flutter_recipe(recipe),
         execution_timeout = 90 * time.minute,
         dimensions = {"pool": "dart.tests"},
         on_cq = False,
@@ -261,3 +261,9 @@ monorepo_tester("flutter-linux-web-tests-5", "wt5", "flutter-web")
 monorepo_tester("flutter-linux-web-tests-6", "wt6", "flutter-web")
 monorepo_tester("flutter-linux-web-tests-7-last", "wt7", "flutter-web")
 monorepo_tester("flutter-linux-web-tool-tests", "wtool", "flutter-web")
+monorepo_tester(
+    "flutter-linux-chrome-dart2wasm-skwasm-ui",
+    "skwasm-ui",
+    "flutter-web",
+    recipe = "engine_v2/tester_engine",
+)

From 3ddb66792c7b0c257cca60658f17a288c28f178c Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 16 Sep 2024 19:06:42 +0000
Subject: [PATCH 762/826] [infra] Downgrade RISCV64 QEMU builder to Jammy.

The QEMU in Noble might have a bug that leads to flaky crashes.

Downgrading will cause a small number of tests using the bit-manipulation extensions to fail.

Bug: https://github.com/dart-lang/sdk/issues/49791
Bug: https://github.com/dart-lang/sdk/issues/56549
Bug: https://github.com/dart-lang/sdk/issues/56731
Change-Id: Iacd3b080993ce9e156151e187f19a02f15716f6d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/385500
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 8 ++++----
 vm.star                      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 9e7a4a640ec0..07115d310b05 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -7594,7 +7594,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-24"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7625,7 +7625,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-24"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7656,7 +7656,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-24"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13019,7 +13019,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-24"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
diff --git a/vm.star b/vm.star
index 3c3e8a5f0051..46257974fb9a 100644
--- a/vm.star
+++ b/vm.star
@@ -483,7 +483,7 @@ _vm_builder(
 _vm_builder(
     "vm-ffi-qemu-linux-release-riscv64",
     category = "vm|ffi|qr",
-    dimensions = noble,  # Pre-Noble RISC-V QEMU is missing extensions
+    dimensions = jammy,  # The bit-manipulation extensions are only available starting with Noble, but Noble is suspected to have a bug that leads to flaky crashes
 )
 
 # Isolate stress test builder

From 3cdb5a524cfc9d95bc241f65c66ae67241502fff Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 23 Sep 2024 08:51:51 +0000
Subject: [PATCH 763/826] Add checkout_flute to dart2wasm builders

Change-Id: I2f8af30b2aeac0b35a925932ac012e1bfb4d218f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/386160
Reviewed-by: Martin Kustermann <kustermann@google.com>
Auto-Submit: Alexander Thomas <athom@google.com>
Commit-Queue: Martin Kustermann <kustermann@google.com>
---
 dart2wasm.star               | 50 ++++++++++++++++++++++--------------
 generated/cr-buildbucket.cfg | 24 +++++++++++++++++
 lib/defaults.star            |  2 ++
 3 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/dart2wasm.star b/dart2wasm.star
index 524db463ccf0..96b2873fecb7 100644
--- a/dart2wasm.star
+++ b/dart2wasm.star
@@ -6,56 +6,68 @@ Defines the dart2wasm builders.
 """
 
 load("//lib/dart.star", "dart")
-load("//lib/defaults.star", "chrome", "emscripten", "firefox", "js_engines", "no_android")
+load(
+    "//lib/defaults.star",
+    "chrome",
+    "emscripten",
+    "firefox",
+    "flute",
+    "js_engines",
+    "no_android",
+)
+load("//lib/helpers.star", "union")
 load("//lib/paths.star", "paths")
 
+def _dart2wasm_builder(name, category = None, properties = [], **kwargs):
+    default_properties = union({}, [emscripten, flute, no_android])
+    dart.ci_sandbox_builder(
+        name,
+        category = category,
+        properties = union(default_properties, properties),
+        triggered_by = ["dart2wasm-gitiles-trigger-%s"],
+        **kwargs
+    )
+
 dart.poller(
     "dart2wasm-gitiles-trigger",
     paths = paths.dart2wasm,
 )
 
-dart.ci_sandbox_builder(
+_dart2wasm_builder(
     "dart2wasm-linux-d8",
     category = "d2w|d",
-    properties = [emscripten, no_android],
     location_filters = paths.to_location_filters(paths.dart2wasm),
-    triggered_by = ["dart2wasm-gitiles-trigger-%s"],
 )
 
-dart.ci_sandbox_builder(
+_dart2wasm_builder(
     "dart2wasm-linux-optimized-jsc",
     category = "d2w|j",
-    properties = [js_engines, emscripten, no_android],
-    triggered_by = ["dart2wasm-gitiles-trigger-%s"],
+    properties = [js_engines],
 )
 
-dart.ci_sandbox_builder(
+_dart2wasm_builder(
     "dart2wasm-asserts-linux-chrome",
     category = "d2w|ca",
-    properties = [chrome, emscripten, no_android],
+    properties = [chrome],
     location_filters = paths.to_location_filters(paths.dart2wasm),
-    triggered_by = ["dart2wasm-gitiles-trigger-%s"],
 )
 
-dart.ci_sandbox_builder(
+_dart2wasm_builder(
     "dart2wasm-linux-chrome",
     category = "d2w|c",
-    properties = [chrome, emscripten, no_android],
+    properties = [chrome],
     location_filters = paths.to_location_filters(paths.dart2wasm),
-    triggered_by = ["dart2wasm-gitiles-trigger-%s"],
 )
 
-dart.ci_sandbox_builder(
+_dart2wasm_builder(
     "dart2wasm-linux-jscm-chrome",
     category = "d2w|cm",
-    properties = [chrome, emscripten, no_android],
+    properties = [chrome],
     location_filters = paths.to_location_filters(paths.dart2wasm),
-    triggered_by = ["dart2wasm-gitiles-trigger-%s"],
 )
 
-dart.ci_sandbox_builder(
+_dart2wasm_builder(
     "dart2wasm-linux-firefox",
     category = "d2w|f",
-    properties = [firefox, emscripten, no_android],
-    triggered_by = ["dart2wasm-gitiles-trigger-%s"],
+    properties = [firefox],
 )
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 07115d310b05..ffb047668a78 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -1456,6 +1456,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_android_deps": false,'
         '    "download_chrome": true,'
         '    "download_emscripten": true'
@@ -1492,6 +1493,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_android_deps": false,'
         '    "download_chrome": true,'
         '    "download_emscripten": true'
@@ -1528,6 +1530,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_android_deps": false,'
         '    "download_chrome": true,'
         '    "download_emscripten": true'
@@ -1564,6 +1567,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_android_deps": false,'
         '    "download_chrome": true,'
         '    "download_emscripten": true'
@@ -1600,6 +1604,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_android_deps": false,'
         '    "download_chrome": true,'
         '    "download_emscripten": true'
@@ -1636,6 +1641,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_android_deps": false,'
         '    "download_chrome": true,'
         '    "download_emscripten": true'
@@ -1672,6 +1678,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_android_deps": false,'
         '    "download_emscripten": true'
         '  },'
@@ -1707,6 +1714,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_android_deps": false,'
         '    "download_emscripten": true'
         '  },'
@@ -1742,6 +1750,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_android_deps": false,'
         '    "download_emscripten": true'
         '  },'
@@ -1777,6 +1786,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_android_deps": false,'
         '    "download_emscripten": true,'
         '    "download_firefox": true'
@@ -1813,6 +1823,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_android_deps": false,'
         '    "download_emscripten": true,'
         '    "download_firefox": true'
@@ -1849,6 +1860,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_android_deps": false,'
         '    "download_emscripten": true,'
         '    "download_firefox": true'
@@ -1885,6 +1897,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_android_deps": false,'
         '    "download_chrome": true,'
         '    "download_emscripten": true'
@@ -1921,6 +1934,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_android_deps": false,'
         '    "download_chrome": true,'
         '    "download_emscripten": true'
@@ -1957,6 +1971,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_android_deps": false,'
         '    "download_chrome": true,'
         '    "download_emscripten": true'
@@ -1993,6 +2008,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
         '    "download_android_deps": false,'
         '    "download_emscripten": true'
@@ -2029,6 +2045,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
         '    "download_android_deps": false,'
         '    "download_emscripten": true'
@@ -2065,6 +2082,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
         '    "download_android_deps": false,'
         '    "download_emscripten": true'
@@ -10484,6 +10502,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_android_deps": false,'
         '    "download_chrome": true,'
         '    "download_emscripten": true'
@@ -10520,6 +10539,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_android_deps": false,'
         '    "download_chrome": true,'
         '    "download_emscripten": true'
@@ -10556,6 +10576,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_android_deps": false,'
         '    "download_emscripten": true'
         '  },'
@@ -10591,6 +10612,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_android_deps": false,'
         '    "download_emscripten": true,'
         '    "download_firefox": true'
@@ -10627,6 +10649,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_android_deps": false,'
         '    "download_chrome": true,'
         '    "download_emscripten": true'
@@ -10663,6 +10686,7 @@ buckets {
         '  },'
         '  "clobber": true,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
         '    "download_android_deps": false,'
         '    "download_emscripten": true'
diff --git a/lib/defaults.star b/lib/defaults.star
index 1efbf8858399..57730c3ae274 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -29,6 +29,7 @@ _EMSCRIPTEN = {"custom_vars": {"download_emscripten": True}}
 _FIREFOX = {"custom_vars": {"download_firefox": True}}
 _FUCHSIA_DEPS = {"custom_vars": {"download_fuchsia_deps": True}}
 _JS_ENGINES = {"custom_vars": {"checkout_javascript_engines": True}}
+_FLUTE = {"custom_vars": {"checkout_flute": True}}
 _SLOW_SHARDS = {"shard_timeout": (90 * time.minute) // time.second}
 
 _ARM64 = {"cpu": "arm64"}
@@ -68,6 +69,7 @@ android_deps = _ANDROID_DEPS
 chrome = _CHROME
 emscripten = _EMSCRIPTEN
 firefox = _FIREFOX
+flute = _FLUTE
 fuchsia_deps = _FUCHSIA_DEPS
 js_engines = _JS_ENGINES
 no_android = _NO_ANDROID

From c06ec055ff8a1882a41f4cab98fb8923d739a506 Mon Sep 17 00:00:00 2001
From: Paul Berry <paulberry@google.com>
Date: Tue, 24 Sep 2024 16:46:44 +0000
Subject: [PATCH 764/826] Partially revert "[infra] Improve analyzer commit
 queue coverage."

Changes reverted:

- Swap analyzer-linux-release for analyzer-win-release. It turns out
  that analyzer-win-release did not have co19 coverage, and the
  efforts to add co19 coverage
  (https://dart-review.googlesource.com/c/sdk/+/385080) are taking
  longer than expected. So we are switching back to
  analyzer-linux-release for now, until the co19 coverage issue is
  addressed.

Changes not reverted:

- Add flutter-analyze. This has been useful for checking analyzer
  commits, and hasn't caused too much extra trybot load.

- Remove non-default 60 minute timeout from flutter-analyze. This
  change didn't cause any problems that I know of, so no need to
  revert it.

Change-Id: Ie5c0d61c1d10ae9f25d6062e2bd3f27e3a8f6a5b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/386601
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Auto-Submit: Paul Berry <paulberry@google.com>
Reviewed-by: Ryan Macnak <rmacnak@google.com>
---
 analyzer.star              |  2 +-
 generated/commit-queue.cfg | 48 +++++++++++++++++++-------------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/analyzer.star b/analyzer.star
index edd941f7073c..d3be83ced0c7 100644
--- a/analyzer.star
+++ b/analyzer.star
@@ -29,6 +29,7 @@ dart.ci_sandbox_builder(
     "analyzer-linux-release",
     category = "analyzer|l",
     channels = dart.channels,
+    location_filters = paths.to_location_filters(paths.analyzer),
 )
 dart.ci_sandbox_builder(
     "analyzer-mac-release",
@@ -41,5 +42,4 @@ dart.ci_sandbox_builder(
     category = "analyzer|w",
     channels = dart.channels,
     dimensions = windows,
-    location_filters = paths.to_location_filters(paths.analyzer),
 )
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 127309fe5139..9baa874157a6 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -316,14 +316,6 @@ config_groups {
       }
       builders {
         name: "dart/try/analyzer-linux-release-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/analyzer-mac-release-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/analyzer-win-release-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -415,6 +407,14 @@ config_groups {
           path_regexp: "runtime/tools/dartfuzz/.+"
         }
       }
+      builders {
+        name: "dart/try/analyzer-mac-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/analyzer-win-release-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/beta-try"
         includable_only: true
@@ -2488,14 +2488,6 @@ config_groups {
       }
       builders {
         name: "dart/try/analyzer-linux-release-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/analyzer-mac-release-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/analyzer-win-release-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2587,6 +2579,14 @@ config_groups {
           path_regexp: "runtime/tools/dartfuzz/.+"
         }
       }
+      builders {
+        name: "dart/try/analyzer-mac-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/analyzer-win-release-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/benchmark-linux-try"
       }
@@ -5090,14 +5090,6 @@ config_groups {
       }
       builders {
         name: "dart/try/analyzer-linux-release-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/analyzer-mac-release-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/analyzer-win-release-try"
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -5189,6 +5181,14 @@ config_groups {
           path_regexp: "runtime/tools/dartfuzz/.+"
         }
       }
+      builders {
+        name: "dart/try/analyzer-mac-release-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/analyzer-win-release-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/beta-try"
         includable_only: true

From 3914a030aca745ff92bb4d3d8d3a0ee00e55e6d5 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 26 Sep 2024 09:33:52 +0000
Subject: [PATCH 765/826] Replace deprecated uses of tree_status_host

Change-Id: Ief1cb7e3592269b9cbf2556e75e2598ebdd9d6ab
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/386781
Reviewed-by: Martin Kustermann <kustermann@google.com>
Auto-Submit: Alexander Thomas <athom@google.com>
Commit-Queue: Martin Kustermann <kustermann@google.com>
---
 console-header.textpb      |  2 +-
 cq.star                    |  8 ++++----
 generated/commit-queue.cfg | 24 ++++++++++++------------
 generated/luci-milo.cfg    | 16 ++++++++--------
 generated/project.cfg      |  1 +
 main.star                  |  2 +-
 6 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/console-header.textpb b/console-header.textpb
index d0e1eb150fc5..e3bcf5597c04 100644
--- a/console-header.textpb
+++ b/console-header.textpb
@@ -42,4 +42,4 @@ console_groups: {
     console_ids: "dart/flutter-web"
     console_ids: "dart/iso-stress"
 }
-tree_status_host: "dart-status.appspot.com"
+tree_name: "dart"
diff --git a/cq.star b/cq.star
index eef8a86c1d0b..586096cede70 100644
--- a/cq.star
+++ b/cq.star
@@ -32,7 +32,7 @@ def sdk_cq_groups():
                 refs = ["refs/heads/%s" % branch],
             ),
             allow_submit_with_open_deps = True,
-            tree_status_host = "dart-status.appspot.com",
+            tree_status_name = "dart",
             retry_config = cq.RETRY_NONE,
             verifiers = None,
         )
@@ -43,7 +43,7 @@ luci.cq_group(
     name = "sdk-infra-config",
     watch = cq.refset(DART_GERRIT + "sdk", refs = ["refs/heads/infra/config"]),
     allow_submit_with_open_deps = True,
-    tree_status_host = "dart-status.appspot.com",
+    tree_status_name = "dart",
     retry_config = cq.RETRY_NONE,
     verifiers = default_verifiers(),
 )
@@ -53,7 +53,7 @@ def basic_cq(repository, extra_verifies = []):
         name = repository,
         watch = cq.refset(DART_GERRIT + repository, refs = ["refs/heads/main"]),
         allow_submit_with_open_deps = True,
-        tree_status_host = "dart-status.appspot.com",
+        tree_status_name = "dart",
         retry_config = cq.RETRY_NONE,
         verifiers = default_verifiers() + extra_verifies,
     )
@@ -78,7 +78,7 @@ def empty_cq(repository):
         name = repository,
         watch = cq.refset(DART_GERRIT + repository, refs = ["refs/heads/main"]),
         allow_submit_with_open_deps = True,
-        tree_status_host = "dart-status.appspot.com",
+        tree_status_name = "dart",
         retry_config = cq.RETRY_NONE,
         verifiers = None,
     )
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 9baa874157a6..9a0d2e2fd369 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -27,7 +27,7 @@ config_groups {
       allow_submit_with_open_deps: true
     }
     tree_status {
-      url: "https://dart-status.appspot.com"
+      tree_name: "dart"
     }
     tryjob {
       builders {
@@ -57,7 +57,7 @@ config_groups {
       allow_submit_with_open_deps: true
     }
     tree_status {
-      url: "https://dart-status.appspot.com"
+      tree_name: "dart"
     }
     tryjob {
       builders {
@@ -84,7 +84,7 @@ config_groups {
       allow_submit_with_open_deps: true
     }
     tree_status {
-      url: "https://dart-status.appspot.com"
+      tree_name: "dart"
     }
     tryjob {
       builders {
@@ -111,7 +111,7 @@ config_groups {
       allow_submit_with_open_deps: true
     }
     tree_status {
-      url: "https://dart-status.appspot.com"
+      tree_name: "dart"
     }
     tryjob {
       builders {
@@ -138,7 +138,7 @@ config_groups {
       allow_submit_with_open_deps: true
     }
     tree_status {
-      url: "https://dart-status.appspot.com"
+      tree_name: "dart"
     }
     tryjob {
       builders {
@@ -168,7 +168,7 @@ config_groups {
       allow_submit_with_open_deps: true
     }
     tree_status {
-      url: "https://dart-status.appspot.com"
+      tree_name: "dart"
     }
   }
 }
@@ -188,7 +188,7 @@ config_groups {
       allow_submit_with_open_deps: true
     }
     tree_status {
-      url: "https://dart-status.appspot.com"
+      tree_name: "dart"
     }
     tryjob {
       builders {
@@ -215,7 +215,7 @@ config_groups {
       allow_submit_with_open_deps: true
     }
     tree_status {
-      url: "https://dart-status.appspot.com"
+      tree_name: "dart"
     }
     tryjob {
       builders {
@@ -2266,7 +2266,7 @@ config_groups {
       allow_submit_with_open_deps: true
     }
     tree_status {
-      url: "https://dart-status.appspot.com"
+      tree_name: "dart"
     }
     tryjob {
       builders {
@@ -2357,7 +2357,7 @@ config_groups {
       allow_submit_with_open_deps: true
     }
     tree_status {
-      url: "https://dart-status.appspot.com"
+      tree_name: "dart"
     }
     tryjob {
       builders {
@@ -2384,7 +2384,7 @@ config_groups {
       allow_submit_with_open_deps: true
     }
     tree_status {
-      url: "https://dart-status.appspot.com"
+      tree_name: "dart"
     }
     tryjob {
       builders {
@@ -4989,7 +4989,7 @@ config_groups {
       allow_submit_with_open_deps: true
     }
     tree_status {
-      url: "https://dart-status.appspot.com"
+      tree_name: "dart"
     }
     tryjob {
       builders {
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index e4bc3ccc7799..bf7872cd2751 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -1183,7 +1183,7 @@ consoles {
       console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
     }
-    tree_status_host: "dart-status.appspot.com"
+    tree_name: "dart"
   }
 }
 consoles {
@@ -1862,7 +1862,7 @@ consoles {
       console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
     }
-    tree_status_host: "dart-status.appspot.com"
+    tree_name: "dart"
   }
 }
 consoles {
@@ -1956,7 +1956,7 @@ consoles {
       console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
     }
-    tree_status_host: "dart-status.appspot.com"
+    tree_name: "dart"
   }
 }
 consoles {
@@ -2360,7 +2360,7 @@ consoles {
       console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
     }
-    tree_status_host: "dart-status.appspot.com"
+    tree_name: "dart"
   }
 }
 consoles {
@@ -2764,7 +2764,7 @@ consoles {
       console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
     }
-    tree_status_host: "dart-status.appspot.com"
+    tree_name: "dart"
   }
 }
 consoles {
@@ -3009,7 +3009,7 @@ consoles {
       console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
     }
-    tree_status_host: "dart-status.appspot.com"
+    tree_name: "dart"
   }
 }
 consoles {
@@ -3156,7 +3156,7 @@ consoles {
       console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
     }
-    tree_status_host: "dart-status.appspot.com"
+    tree_name: "dart"
   }
 }
 consoles {
@@ -3259,7 +3259,7 @@ consoles {
       console_ids: "dart/flutter-web"
       console_ids: "dart/iso-stress"
     }
-    tree_status_host: "dart-status.appspot.com"
+    tree_name: "dart"
   }
 }
 logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png"
diff --git a/generated/project.cfg b/generated/project.cfg
index 93de28489490..cdac2769e91a 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -13,4 +13,5 @@ lucicfg {
   entry_point: "main.star"
   experiments: "crbug.com/1182002"
   experiments: "crbug.com/1347252"
+  experiments: "crbug.com/1496969"
 }
diff --git a/main.star b/main.star
index c868bddeae33..a47b43d04d48 100755
--- a/main.star
+++ b/main.star
@@ -22,7 +22,7 @@ load(
     "no_caches",
 )
 
-lucicfg.check_version("1.33.7")
+lucicfg.check_version("1.43.13")
 
 # Use LUCI Scheduler BBv2 names and add Scheduler realms configs.
 lucicfg.enable_experiment("crbug.com/1182002")

From b3929c16640044cc4588c8c6d60dcd368648e7a9 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 4 Oct 2024 06:34:06 +0000
Subject: [PATCH 766/826] [infra] Align DDC console with dart2js

Change-Id: I41e8f8a098a8597ae73541db8152cd3b34876793
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/388004
Auto-Submit: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: Nicholas Shahan <nshahan@google.com>
---
 ddc.star                |  6 +++---
 generated/luci-milo.cfg | 24 ++++++++++++------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ddc.star b/ddc.star
index 0e0f50f7f1c1..c2133dbc8c6b 100644
--- a/ddc.star
+++ b/ddc.star
@@ -22,21 +22,21 @@ dart.poller("ddc-gitiles-trigger", branches = ["main"], paths = paths.ddc)
 
 dart.ci_sandbox_builder(
     "ddc-linux-chrome",
-    category = "ddc|l",
+    category = "ddc|chrome|l",
     properties = [chrome, no_android],
     location_filters = paths.to_location_filters(paths.ddc),
 )
 
 dart.ci_sandbox_builder(
     "ddc-mac-chrome",
-    category = "ddc|m",
+    category = "ddc|chrome|m",
     dimensions = [arm64, mac],
     properties = [chrome, no_android],
 )
 
 dart.ci_sandbox_builder(
     "ddc-win-chrome",
-    category = "ddc|w",
+    category = "ddc|chrome|w",
     dimensions = windows,
     properties = [chrome, no_android],
 )
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index bf7872cd2751..aae4e1a6273c 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -1080,17 +1080,17 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome"
-    category: "ddc"
+    category: "ddc|chrome"
     short_name: "l"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-chrome"
-    category: "ddc"
+    category: "ddc|chrome"
     short_name: "m"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-win-chrome"
-    category: "ddc"
+    category: "ddc|chrome"
     short_name: "w"
   }
   builders {
@@ -1384,17 +1384,17 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome"
-    category: "ddc"
+    category: "ddc|chrome"
     short_name: "l"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-chrome"
-    category: "ddc"
+    category: "ddc|chrome"
     short_name: "m"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-win-chrome"
-    category: "ddc"
+    category: "ddc|chrome"
     short_name: "w"
   }
   builders {
@@ -2277,17 +2277,17 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome-beta"
-    category: "ddc"
+    category: "ddc|chrome"
     short_name: "l"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-chrome-beta"
-    category: "ddc"
+    category: "ddc|chrome"
     short_name: "m"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-win-chrome-beta"
-    category: "ddc"
+    category: "ddc|chrome"
     short_name: "w"
   }
   builders {
@@ -2681,17 +2681,17 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-linux-chrome-stable"
-    category: "ddc"
+    category: "ddc|chrome"
     short_name: "l"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-chrome-stable"
-    category: "ddc"
+    category: "ddc|chrome"
     short_name: "m"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-win-chrome-stable"
-    category: "ddc"
+    category: "ddc|chrome"
     short_name: "w"
   }
   builders {

From e8913ec2d92aac7498c503ba7f02de09fe1c67e5 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 4 Oct 2024 06:59:56 +0000
Subject: [PATCH 767/826] [infra] Add ddc-mac-safari builder

Change-Id: Ie5df36f974c95d685fe4e665b11132787415ec9c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/385460
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: Nicholas Shahan <nshahan@google.com>
---
 ddc.star                     |  8 ++++
 generated/commit-queue.cfg   |  4 ++
 generated/cr-buildbucket.cfg | 80 ++++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      | 13 ++++++
 generated/luci-notify.cfg    | 11 +++++
 generated/luci-scheduler.cfg | 11 +++++
 6 files changed, 127 insertions(+)

diff --git a/ddc.star b/ddc.star
index c2133dbc8c6b..166868b919bc 100644
--- a/ddc.star
+++ b/ddc.star
@@ -49,6 +49,14 @@ dart.ci_sandbox_builder(
     triggered_by = ["ddc-gitiles-trigger-%s"],
 )
 
+dart.ci_sandbox_builder(
+    "ddc-mac-safari",
+    category = "ddc|safari|s",
+    channels = ["try"],
+    dimensions = [arm64, mac],
+    properties = [chrome, no_android],
+)
+
 cron.nightly_builder(
     "ddc-canary-linux-chrome",
     category = "ddc|c",
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 9a0d2e2fd369..36d7527cc03b 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -3889,6 +3889,10 @@ config_groups {
         name: "dart/try/ddc-mac-chrome-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/ddc-mac-safari-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/ddc-win-chrome-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index ffb047668a78..5b7ed66b1551 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -2426,6 +2426,46 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "ddc-mac-safari"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "ddc-win-chrome"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10880,6 +10920,46 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "ddc-mac-safari-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false,'
+        '    "download_chrome": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "ddc-win-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index aae4e1a6273c..9e04eb2bdb28 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -355,6 +355,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/ddc-linux-firefox-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/ddc-mac-safari-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/ddc-canary-linux-chrome-try"
   }
@@ -1098,6 +1101,11 @@ consoles {
     category: "ddc"
     short_name: "f"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-safari"
+    category: "ddc|safari"
+    short_name: "s"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-canary-linux-chrome"
     category: "ddc"
@@ -1402,6 +1410,11 @@ consoles {
     category: "ddc"
     short_name: "f"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-safari"
+    category: "ddc|safari"
+    short_name: "s"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-canary-linux-chrome"
     category: "ddc"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 87ae33204c83..e6ce49fad95b 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -299,6 +299,17 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "ddc-mac-safari"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index e841b1c7fddd..dfef00cca2d7 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -674,6 +674,16 @@ job {
     builder: "ddc-mac-chrome-stable"
   }
 }
+job {
+  id: "ddc-mac-safari"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "ddc-mac-safari"
+  }
+}
 job {
   id: "ddc-win-chrome"
   realm: "ci.sandbox"
@@ -2583,6 +2593,7 @@ trigger {
   triggers: "dart2js-win-chrome"
   triggers: "ddc-linux-chrome"
   triggers: "ddc-mac-chrome"
+  triggers: "ddc-mac-safari"
   triggers: "ddc-win-chrome"
   triggers: "flutter-analyze"
   triggers: "flutter-frontend"

From d49d880379f1f835c3fa24d8ab9719809a75c299 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 4 Oct 2024 08:14:45 +0000
Subject: [PATCH 768/826] [infra] Remove DDC 'safari' category

Change-Id: I4b99bc6a68e495bab40a7891438c072a48386c4c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/388301
Commit-Queue: Martin Kustermann <kustermann@google.com>
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: Martin Kustermann <kustermann@google.com>
---
 ddc.star                | 2 +-
 generated/luci-milo.cfg | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ddc.star b/ddc.star
index 166868b919bc..5df16f363cd3 100644
--- a/ddc.star
+++ b/ddc.star
@@ -51,7 +51,7 @@ dart.ci_sandbox_builder(
 
 dart.ci_sandbox_builder(
     "ddc-mac-safari",
-    category = "ddc|safari|s",
+    category = "ddc|s",
     channels = ["try"],
     dimensions = [arm64, mac],
     properties = [chrome, no_android],
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 9e04eb2bdb28..a6e9ef49e423 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -1103,7 +1103,7 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-safari"
-    category: "ddc|safari"
+    category: "ddc"
     short_name: "s"
   }
   builders {
@@ -1412,7 +1412,7 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/ddc-mac-safari"
-    category: "ddc|safari"
+    category: "ddc"
     short_name: "s"
   }
   builders {

From 7ceaa9609332a3b1611d73dd5af810121f96a085 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 4 Oct 2024 09:55:58 +0000
Subject: [PATCH 769/826] [infra] Add missing monorepo builders for dart2wasm
 testing

Change-Id: Iac9b20c91c169648a52ef09da59274acb24ab7a7
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/385520
Reviewed-by: Martin Kustermann <kustermann@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 128 +++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      |  24 +++++++
 monorepo.star                |   6 ++
 3 files changed, 158 insertions(+)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 5b7ed66b1551..b4e6ca116bbc 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -3732,6 +3732,70 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "flutter-linux-web_tests-artifacts"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-linux-web_tests-test_bundles-dart2wasm-skwasm-ui"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 50
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "flutter-web"
       swarming_host: "chromium-swarm.appspot.com"
@@ -15291,6 +15355,70 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "flutter-linux-web_tests-artifacts-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "flutter-linux-web_tests-test_bundles-dart2wasm-skwasm-ui-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:dart.tests"
+      exe {
+        cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "engine_v2/builder"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 3600
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
   }
   shadow: "try.monorepo.shadow"
   constraints {
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index a6e9ef49e423..c5e03fc02f99 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -454,6 +454,12 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try.monorepo/flutter-linux-wasm_release-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-web_tests-artifacts-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try.monorepo/flutter-linux-web_tests-test_bundles-dart2wasm-skwasm-ui-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try.monorepo/flutter-linux-flutter-plugins-try"
   }
@@ -2887,6 +2893,16 @@ consoles {
     category: "flutter-web"
     short_name: "wasm"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web_tests-artifacts"
+    category: "flutter-web"
+    short_name: "web-tests"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web_tests-test_bundles-dart2wasm-skwasm-ui"
+    category: "flutter-web"
+    short_name: "skwasm-ui-tests"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-flutter-plugins"
     category: "flutter-engine"
@@ -3187,6 +3203,14 @@ consoles {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-wasm_release"
     short_name: "wasm"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web_tests-artifacts"
+    short_name: "web-tests"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web_tests-test_bundles-dart2wasm-skwasm-ui"
+    short_name: "skwasm-ui-tests"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-0"
     short_name: "wt0"
diff --git a/monorepo.star b/monorepo.star
index 0ac97e0356f9..f1579d41cc6e 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -210,6 +210,12 @@ monorepo_builder("flutter-linux-host_debug_unopt", "debug-unopt", "flutter-engin
 monorepo_builder("flutter-linux-host_profile", "profile", "flutter-engine")
 monorepo_builder("flutter-linux-host_release", "release", "flutter-engine")
 monorepo_builder("flutter-linux-wasm_release", "wasm", "flutter-web")
+monorepo_builder("flutter-linux-web_tests-artifacts", "web-tests", "flutter-web")
+monorepo_builder(
+    "flutter-linux-web_tests-test_bundles-dart2wasm-skwasm-ui",
+    "skwasm-ui-tests",
+    "flutter-web",
+)
 
 def monorepo_tester(name, short_name, console, recipe = "engine_v2/tester"):
     dart.ci_sandbox_builder(

From a6547c58f6cff5b608938d553d6fccdb59879ffc Mon Sep 17 00:00:00 2001
From: Alexander Aprelev <aam@google.com>
Date: Mon, 4 Nov 2024 17:44:59 +0000
Subject: [PATCH 770/826] Add simriscv32 builders to nightly runs.

BUG=https://github.com/dart-lang/sdk/issues/57021

Change-Id: I332deba7d27aff1f7b024e20f8807049c817d8c8
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/393380
Commit-Queue: Alexander Aprelev <aam@google.com>
Reviewed-by: Ryan Macnak <rmacnak@google.com>
---
 generated/commit-queue.cfg   |   8 +++
 generated/cr-buildbucket.cfg | 130 +++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      |  26 +++++++
 generated/luci-notify.cfg    |  26 +++++++
 generated/luci-scheduler.cfg |  22 ++++++
 generated/project.cfg        |   2 +-
 vm.star                      |   9 +++
 7 files changed, 222 insertions(+), 1 deletion(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 36d7527cc03b..b172204c61e4 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -4322,6 +4322,10 @@ config_groups {
         name: "dart/try/vm-aot-linux-debug-simarm_x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-linux-debug-simriscv32-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-linux-debug-simriscv64-try"
         includable_only: true
@@ -4611,6 +4615,10 @@ config_groups {
         name: "dart/try/vm-linux-debug-ia32-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-linux-debug-simriscv32-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-linux-debug-simriscv64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index b4e6ca116bbc..af57c04b93d2 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5399,6 +5399,39 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-linux-debug-simriscv32"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-linux-debug-simriscv64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -7942,6 +7975,38 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-linux-debug-simriscv32"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-linux-debug-simriscv64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -11981,6 +12046,39 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-linux-debug-simriscv32-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-linux-debug-simriscv64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13351,6 +13449,38 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-linux-debug-simriscv32-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-20"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-linux-debug-simriscv64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index c5e03fc02f99..fe86350fdd2e 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -76,6 +76,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-linux-release-simarm-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-linux-debug-simriscv32-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-linux-debug-simriscv64-try"
   }
@@ -133,6 +136,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-linux-debug-x64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-aot-linux-debug-simriscv32-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-linux-debug-simriscv64-try"
   }
@@ -647,6 +653,11 @@ consoles {
     category: "vm|jit"
     short_name: "ra"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simriscv32"
+    category: "vm|jit"
+    short_name: "rv"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simriscv64"
     category: "vm|jit"
@@ -742,6 +753,11 @@ consoles {
     category: "vm|aot"
     short_name: "d"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-debug-simriscv32"
+    category: "vm|aot"
+    short_name: "rv"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-debug-simriscv64"
     category: "vm|aot"
@@ -1486,6 +1502,11 @@ consoles {
     category: "vm|jit"
     short_name: "ra"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simriscv32"
+    category: "vm|jit"
+    short_name: "rv"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-simriscv64"
     category: "vm|jit"
@@ -1581,6 +1602,11 @@ consoles {
     category: "vm|aot"
     short_name: "d"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-debug-simriscv32"
+    category: "vm|aot"
+    short_name: "rv"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-debug-simriscv64"
     category: "vm|aot"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index e6ce49fad95b..6158dc0f93db 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -585,6 +585,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-linux-debug-simriscv32"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1093,6 +1106,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-linux-debug-simriscv32"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index dfef00cca2d7..3ae2b375fb0a 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1214,6 +1214,16 @@ job {
     builder: "vm-aot-linux-debug-simarm_x64-stable"
   }
 }
+job {
+  id: "vm-aot-linux-debug-simriscv32"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-linux-debug-simriscv32"
+  }
+}
 job {
   id: "vm-aot-linux-debug-simriscv64"
   realm: "ci.sandbox"
@@ -1974,6 +1984,16 @@ job {
     builder: "vm-linux-debug-ia32"
   }
 }
+job {
+  id: "vm-linux-debug-simriscv32"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-linux-debug-simriscv32"
+  }
+}
 job {
   id: "vm-linux-debug-simriscv64"
   realm: "ci.sandbox"
@@ -2707,6 +2727,7 @@ trigger {
   triggers: "vm-aot-asan-linux-release-x64"
   triggers: "vm-aot-dwarf-linux-product-x64"
   triggers: "vm-aot-dyn-linux-debug-x64"
+  triggers: "vm-aot-linux-debug-simriscv32"
   triggers: "vm-aot-linux-debug-simriscv64"
   triggers: "vm-aot-linux-debug-x64"
   triggers: "vm-aot-linux-debug-x64c"
@@ -2729,6 +2750,7 @@ trigger {
   triggers: "vm-eager-optimization-linux-release-x64"
   triggers: "vm-gcc-linux"
   triggers: "vm-linux-debug-ia32"
+  triggers: "vm-linux-debug-simriscv32"
   triggers: "vm-linux-debug-x64c"
   triggers: "vm-linux-release-ia32"
   triggers: "vm-msan-linux-release-arm64"
diff --git a/generated/project.cfg b/generated/project.cfg
index cdac2769e91a..670200ba2139 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.43.13"
+  version: "1.43.14"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/vm.star b/vm.star
index 46257974fb9a..a2ff75095d7f 100644
--- a/vm.star
+++ b/vm.star
@@ -99,6 +99,10 @@ _vm_builder(
     "vm-linux-release-simarm",
     category = "vm|jit|ra",
 )
+_nightly_builder(
+    "vm-linux-debug-simriscv32",
+    category = "vm|jit|rv",
+)
 _vm_builder(
     "vm-linux-debug-simriscv64",
     category = "vm|jit|rv",
@@ -206,6 +210,11 @@ _nightly_builder(
     category = "vm|aot|d",
     properties = slow_shards,
 )
+_nightly_builder(
+    "vm-aot-linux-debug-simriscv32",
+    category = "vm|aot|rv",
+    properties = [slow_shards],
+)
 _nightly_builder(
     "vm-aot-linux-debug-simriscv64",
     category = "vm|aot|rv",

From a5833071d21a60126ed4d50a6313482bf80abeea Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Wed, 13 Nov 2024 18:45:51 +0000
Subject: [PATCH 771/826] [infra] Also trigger dart2wasm builders on changes to
 binaryen's GN.

Sometimes this is changed without also changing the version of binaryen via DEPS.

Change-Id: I60c86117498c12cab538a5935873ece610047e40
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/395120
Reviewed-by: Alexander Aprelev <aam@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/commit-queue.cfg   | 72 ++++++++++++++++++++++++++++++++++++
 generated/luci-scheduler.cfg |  4 ++
 lib/paths.star               |  1 +
 3 files changed, 77 insertions(+)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index b172204c61e4..db976aae6423 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -965,6 +965,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "third_party/binaryen/.+"
+        }
       }
       builders {
         name: "dart/try/dart2wasm-linux-chrome-try"
@@ -1088,6 +1094,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "third_party/binaryen/.+"
+        }
       }
       builders {
         name: "dart/try/dart2wasm-linux-d8-try"
@@ -1211,6 +1223,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "third_party/binaryen/.+"
+        }
       }
       builders {
         name: "dart/try/dart2wasm-linux-firefox-try"
@@ -1338,6 +1356,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "third_party/binaryen/.+"
+        }
       }
       builders {
         name: "dart/try/dart2wasm-linux-optimized-jsc-try"
@@ -3378,6 +3402,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "third_party/binaryen/.+"
+        }
       }
       builders {
         name: "dart/try/dart2wasm-linux-chrome-try"
@@ -3501,6 +3531,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "third_party/binaryen/.+"
+        }
       }
       builders {
         name: "dart/try/dart2wasm-linux-d8-try"
@@ -3624,6 +3660,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "third_party/binaryen/.+"
+        }
       }
       builders {
         name: "dart/try/dart2wasm-linux-firefox-try"
@@ -3751,6 +3793,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "third_party/binaryen/.+"
+        }
       }
       builders {
         name: "dart/try/dart2wasm-linux-optimized-jsc-try"
@@ -5751,6 +5799,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "third_party/binaryen/.+"
+        }
       }
       builders {
         name: "dart/try/dart2wasm-linux-chrome-try"
@@ -5874,6 +5928,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "third_party/binaryen/.+"
+        }
       }
       builders {
         name: "dart/try/dart2wasm-linux-d8-try"
@@ -5997,6 +6057,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "third_party/binaryen/.+"
+        }
       }
       builders {
         name: "dart/try/dart2wasm-linux-firefox-try"
@@ -6124,6 +6190,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "sdk/lib/_js_interop/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "third_party/binaryen/.+"
+        }
       }
       builders {
         name: "dart/try/dart2wasm-linux-optimized-jsc-try"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 3ae2b375fb0a..5e58f54a3276 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -2908,6 +2908,7 @@ trigger {
     path_regexps: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
     path_regexps: "sdk/lib/_internal/wasm.+"
     path_regexps: "sdk/lib/_js_interop/.+"
+    path_regexps: "third_party/binaryen/.+"
   }
 }
 trigger {
@@ -2936,6 +2937,7 @@ trigger {
     path_regexps: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
     path_regexps: "sdk/lib/_internal/wasm.+"
     path_regexps: "sdk/lib/_js_interop/.+"
+    path_regexps: "third_party/binaryen/.+"
   }
 }
 trigger {
@@ -2970,6 +2972,7 @@ trigger {
     path_regexps: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
     path_regexps: "sdk/lib/_internal/wasm.+"
     path_regexps: "sdk/lib/_js_interop/.+"
+    path_regexps: "third_party/binaryen/.+"
   }
 }
 trigger {
@@ -3004,6 +3007,7 @@ trigger {
     path_regexps: "sdk/lib/_internal/vm/lib/typed_data_patch.dart"
     path_regexps: "sdk/lib/_internal/wasm.+"
     path_regexps: "sdk/lib/_js_interop/.+"
+    path_regexps: "third_party/binaryen/.+"
   }
 }
 trigger {
diff --git a/lib/paths.star b/lib/paths.star
index e23e2017dde8..b4938e33db69 100644
--- a/lib/paths.star
+++ b/lib/paths.star
@@ -88,6 +88,7 @@ _DART2WASM_PATHS = _CFE_PATHS + [
     "sdk/lib/_internal/vm/lib/typed_data_patch.dart",
     "sdk/lib/_internal/wasm.+",
     "sdk/lib/_js_interop/.+",
+    "third_party/binaryen/.+",
 ]
 
 _PKG_PATHS = _VM_PATHS + [

From 92d1d8573f6f56a35dfe04c53abac54abb64b92f Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Wed, 11 Dec 2024 10:01:16 -0800
Subject: [PATCH 772/826] [infra] Increase timeout for
 dart-sdk-linux-arm64-try.

dart-sdk-linux-try and dart-sdk-linux-riscv64-try use RBE and currently take ~10 minutes, so the default build timeout is fine.

dart-sdk-linux-arm64-try cannot use RBE because there is as yet no linux-arm64 RBE client and currently takes the entire 50 minutes. It times out on my try jobs to add building the Debian packages.

Note this only affects the try-jobs. The real SDK builders are configured in the internal project.

Change-Id: Ie70067f20dd85215a9538fb1b5d2470c33e94399
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/400143
Reviewed-by: Alexander Aprelev <aam@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/cr-buildbucket.cfg | 9 ++-------
 generated/project.cfg        | 2 +-
 sdk.star                     | 9 +++------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index af57c04b93d2..1504813a6a94 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -10001,7 +10001,8 @@ buckets {
       properties:
         '{'
         '  "$dart/build": {'
-        '    "disable_rbe": true'
+        '    "disable_rbe": true,'
+        '    "timeout": 4200'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -10039,9 +10040,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "timeout": 7200'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10077,9 +10075,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "timeout": 6000'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
diff --git a/generated/project.cfg b/generated/project.cfg
index 670200ba2139..bd5cd825b195 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.43.14"
+  version: "1.43.16"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/sdk.star b/sdk.star
index 1ab7837208fa..5454494c2965 100644
--- a/sdk.star
+++ b/sdk.star
@@ -54,9 +54,6 @@ sdk_builder_category()
 dart.try_builder(
     "dart-sdk-linux",
     properties = {
-        "$dart/build": {
-            "timeout": 100 * 60,  # 100 minutes,
-        },
         "archs": ["ia32", "x64"],
         "dartdoc_arch": "x64",
         "disable_bcid": True,
@@ -70,6 +67,9 @@ dart.try_builder(
     "dart-sdk-linux-arm64",
     dimensions = [jammy, arm64],
     properties = {
+        "$dart/build": {
+            "timeout": 70 * 60,  # 70 minutes, non-RBE-build
+        },
         "archs": ["arm", "arm64"],
         "disable_bcid": True,
     },
@@ -81,9 +81,6 @@ dart.try_builder(
 dart.try_builder(
     "dart-sdk-linux-riscv64",
     properties = {
-        "$dart/build": {
-            "timeout": 120 * 60,  # 120 minutes,
-        },
         "archs": ["riscv64"],
         "disable_bcid": True,
     },

From d6606d95ef4d9074ec1e2735e571e86f83538e67 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 12 Feb 2025 00:46:42 -0800
Subject: [PATCH 773/826] [monorepo] Hide broken monorepo builders from
 consoles

These aren't working, yet, but they are causing confusion.

Change-Id: I56822a2ee873fa1c16a99593e673b77cdbd8ae2b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/409142
Commit-Queue: Martin Kustermann <kustermann@google.com>
Reviewed-by: Martin Kustermann <kustermann@google.com>
Auto-Submit: Alexander Thomas <athom@google.com>
---
 generated/luci-milo.cfg |  27 ---------
 monorepo.star           | 124 ++++++++++++++++++++--------------------
 2 files changed, 63 insertions(+), 88 deletions(-)

diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index fe86350fdd2e..081e655d27f3 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -2919,16 +2919,6 @@ consoles {
     category: "flutter-web"
     short_name: "wasm"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web_tests-artifacts"
-    category: "flutter-web"
-    short_name: "web-tests"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web_tests-test_bundles-dart2wasm-skwasm-ui"
-    category: "flutter-web"
-    short_name: "skwasm-ui-tests"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-flutter-plugins"
     category: "flutter-engine"
@@ -3014,11 +3004,6 @@ consoles {
     category: "flutter-web"
     short_name: "wtool"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-chrome-dart2wasm-skwasm-ui"
-    category: "flutter-web"
-    short_name: "skwasm-ui"
-  }
   header {
     links {
       name: "Consoles"
@@ -3229,14 +3214,6 @@ consoles {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-wasm_release"
     short_name: "wasm"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web_tests-artifacts"
-    short_name: "web-tests"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web_tests-test_bundles-dart2wasm-skwasm-ui"
-    short_name: "skwasm-ui-tests"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tests-0"
     short_name: "wt0"
@@ -3273,10 +3250,6 @@ consoles {
     name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-web-tool-tests"
     short_name: "wtool"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/flutter-linux-chrome-dart2wasm-skwasm-ui"
-    short_name: "skwasm-ui"
-  }
   header {
     links {
       name: "Consoles"
diff --git a/monorepo.star b/monorepo.star
index f1579d41cc6e..4a667cbd5162 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -122,7 +122,7 @@ dart.try_builder(
     cq_branches = ["main"],
 )
 
-def monorepo_builder(name, short_name, console):
+def _monorepo_builder(name, short_name, console):
     dart.ci_sandbox_builder(
         name = name,
         channels = [],
@@ -134,17 +134,6 @@ def monorepo_builder(name, short_name, console):
         triggered_by = [],
         schedule = None,
     )
-    luci.console_view_entry(
-        builder = name,
-        short_name = short_name,
-        category = console,
-        console_view = "monorepo",
-    )
-    luci.console_view_entry(
-        builder = name,
-        short_name = short_name,
-        console_view = console,
-    )
     dart.try_builder(
         name,
         bucket = "try.monorepo",
@@ -154,70 +143,82 @@ def monorepo_builder(name, short_name, console):
         on_cq = False,
         cq_branches = [],
     )
+    if console:
+        luci.console_view_entry(
+            builder = name,
+            short_name = short_name,
+            category = console,
+            console_view = "monorepo",
+        )
+        luci.console_view_entry(
+            builder = name,
+            short_name = short_name,
+            console_view = console,
+        )
 
-monorepo_builder(
+_monorepo_builder(
     "flutter-linux-android_debug",
     "android-debug",
     "flutter-engine",
 )
-monorepo_builder(
+_monorepo_builder(
     "flutter-linux-android_profile",
     "android-profile",
     "flutter-engine",
 )
-monorepo_builder(
+_monorepo_builder(
     "flutter-linux-android_release",
     "android-release",
     "flutter-engine",
 )
-monorepo_builder(
+_monorepo_builder(
     "flutter-linux-android_debug_arm64",
     "android-debug-arm64",
     "flutter-engine",
 )
-monorepo_builder(
+_monorepo_builder(
     "flutter-linux-android_profile_arm64",
     "android-profile-arm64",
     "flutter-engine",
 )
-monorepo_builder(
+_monorepo_builder(
     "flutter-linux-android_release_arm64",
     "android-release-arm64",
     "flutter-engine",
 )
-monorepo_builder(
+_monorepo_builder(
     "flutter-linux-android_debug_x64",
     "android-debug-x64",
     "flutter-engine",
 )
-monorepo_builder(
+_monorepo_builder(
     "flutter-linux-android_profile_x64",
     "android-profile-x64",
     "flutter-engine",
 )
-monorepo_builder(
+_monorepo_builder(
     "flutter-linux-android_release_x64",
     "android-release-x64",
     "flutter-engine",
 )
-monorepo_builder(
+_monorepo_builder(
     "flutter-linux-android_debug_x86",
     "android-debug-x86",
     "flutter-engine",
 )
-monorepo_builder("flutter-linux-host_debug", "debug", "flutter-engine")
-monorepo_builder("flutter-linux-host_debug_unopt", "debug-unopt", "flutter-engine")
-monorepo_builder("flutter-linux-host_profile", "profile", "flutter-engine")
-monorepo_builder("flutter-linux-host_release", "release", "flutter-engine")
-monorepo_builder("flutter-linux-wasm_release", "wasm", "flutter-web")
-monorepo_builder("flutter-linux-web_tests-artifacts", "web-tests", "flutter-web")
-monorepo_builder(
+_monorepo_builder("flutter-linux-host_debug", "debug", "flutter-engine")
+_monorepo_builder("flutter-linux-host_debug_unopt", "debug-unopt", "flutter-engine")
+_monorepo_builder("flutter-linux-host_profile", "profile", "flutter-engine")
+_monorepo_builder("flutter-linux-host_release", "release", "flutter-engine")
+_monorepo_builder("flutter-linux-wasm_release", "wasm", "flutter-web")
+_monorepo_builder("flutter-linux-web_tests-artifacts", "web-tests", None)
+_monorepo_builder(
     "flutter-linux-web_tests-test_bundles-dart2wasm-skwasm-ui",
     "skwasm-ui-tests",
-    "flutter-web",
+    None,
 )
 
-def monorepo_tester(name, short_name, console, recipe = "engine_v2/tester"):
+def _monorepo_tester(name, short_name, console, recipe = "engine_v2/tester"):
     dart.ci_sandbox_builder(
         name = name,
         channels = [],
@@ -229,17 +230,6 @@ def monorepo_tester(name, short_name, console, recipe = "engine_v2/tester"):
         triggered_by = [],
         schedule = None,
     )
-    luci.console_view_entry(
-        builder = name,
-        short_name = short_name,
-        category = console,
-        console_view = "monorepo",
-    )
-    luci.console_view_entry(
-        builder = name,
-        short_name = short_name,
-        console_view = console,
-    )
     dart.try_builder(
         name,
         bucket = "try.monorepo",
@@ -249,27 +239,39 @@ def monorepo_tester(name, short_name, console, recipe = "engine_v2/tester"):
         on_cq = False,
         cq_branches = [],
     )
+    if console:
+        luci.console_view_entry(
+            builder = name,
+            short_name = short_name,
+            category = console,
+            console_view = "monorepo",
+        )
+        luci.console_view_entry(
+            builder = name,
+            short_name = short_name,
+            console_view = console,
+        )
 
-monorepo_tester("flutter-linux-flutter-plugins", "plugins", "flutter-engine")
-monorepo_tester("flutter-linux-framework-coverage", "coverage", "flutter-engine")
-monorepo_tester("flutter-linux-framework-tests-libraries", "fl", "flutter-engine")
-monorepo_tester("flutter-linux-framework-tests-misc", "fm", "flutter-engine")
-monorepo_tester("flutter-linux-framework-tests-slow", "fs", "flutter-engine")
-monorepo_tester("flutter-linux-framework-tests-widgets", "fw", "flutter-engine")
-monorepo_tester("flutter-linux-tool-tests", "tool", "flutter-engine")
-monorepo_tester("flutter-linux-customer-testing", "customer_testing", "flutter-engine")
-monorepo_tester("flutter-linux-web-tests-0", "wt0", "flutter-web")
-monorepo_tester("flutter-linux-web-tests-1", "wt1", "flutter-web")
-monorepo_tester("flutter-linux-web-tests-2", "wt2", "flutter-web")
-monorepo_tester("flutter-linux-web-tests-3", "wt3", "flutter-web")
-monorepo_tester("flutter-linux-web-tests-4", "wt4", "flutter-web")
-monorepo_tester("flutter-linux-web-tests-5", "wt5", "flutter-web")
-monorepo_tester("flutter-linux-web-tests-6", "wt6", "flutter-web")
-monorepo_tester("flutter-linux-web-tests-7-last", "wt7", "flutter-web")
-monorepo_tester("flutter-linux-web-tool-tests", "wtool", "flutter-web")
-monorepo_tester(
+_monorepo_tester("flutter-linux-flutter-plugins", "plugins", "flutter-engine")
+_monorepo_tester("flutter-linux-framework-coverage", "coverage", "flutter-engine")
+_monorepo_tester("flutter-linux-framework-tests-libraries", "fl", "flutter-engine")
+_monorepo_tester("flutter-linux-framework-tests-misc", "fm", "flutter-engine")
+_monorepo_tester("flutter-linux-framework-tests-slow", "fs", "flutter-engine")
+_monorepo_tester("flutter-linux-framework-tests-widgets", "fw", "flutter-engine")
+_monorepo_tester("flutter-linux-tool-tests", "tool", "flutter-engine")
+_monorepo_tester("flutter-linux-customer-testing", "customer_testing", "flutter-engine")
+_monorepo_tester("flutter-linux-web-tests-0", "wt0", "flutter-web")
+_monorepo_tester("flutter-linux-web-tests-1", "wt1", "flutter-web")
+_monorepo_tester("flutter-linux-web-tests-2", "wt2", "flutter-web")
+_monorepo_tester("flutter-linux-web-tests-3", "wt3", "flutter-web")
+_monorepo_tester("flutter-linux-web-tests-4", "wt4", "flutter-web")
+_monorepo_tester("flutter-linux-web-tests-5", "wt5", "flutter-web")
+_monorepo_tester("flutter-linux-web-tests-6", "wt6", "flutter-web")
+_monorepo_tester("flutter-linux-web-tests-7-last", "wt7", "flutter-web")
+_monorepo_tester("flutter-linux-web-tool-tests", "wtool", "flutter-web")
+_monorepo_tester(
     "flutter-linux-chrome-dart2wasm-skwasm-ui",
     "skwasm-ui",
-    "flutter-web",
+    None,
     recipe = "engine_v2/tester_engine",
 )

From 645247817363fe8ae0d781fc3d0555b7a1c5490d Mon Sep 17 00:00:00 2001
From: Alexander Aprelev <aam@google.com>
Date: Mon, 24 Feb 2025 11:20:43 -0800
Subject: [PATCH 774/826] [tree-status] Add realm to allow non-authenticated
 users see project status.

Use https://chromium-review.googlesource.com/c/chromium/src/+/5815670 as inspiration.

Bug: go/darto tree status is shown in purple for signed-out chrome users
Change-Id: I82f6d80f19094282ea14fde40775ed875d697499
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/411760
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Aprelev <aam@google.com>
---
 generated/realms.cfg | 17 +++++++++++++++++
 project.star         | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/generated/realms.cfg b/generated/realms.cfg
index 22c2173c2ca8..a1a3eb116f2a 100644
--- a/generated/realms.cfg
+++ b/generated/realms.cfg
@@ -4,6 +4,23 @@
 # For the schema of this file, see RealmsCfg message:
 #   https://config.luci.app/schemas/projects:realms.cfg
 
+realms {
+  name: "@project"
+  bindings {
+    role: "role/treestatus.limitedReader"
+    principals: "group:all"
+  }
+  bindings {
+    role: "role/treestatus.reader"
+    principals: "group:googlers"
+    principals: "user:luci-notify-dev@appspot.gserviceaccount.com"
+  }
+  bindings {
+    role: "role/treestatus.writer"
+    principals: "group:googlers"
+    principals: "user:luci-notify-dev@appspot.gserviceaccount.com"
+  }
+}
 realms {
   name: "@root"
   bindings {
diff --git a/project.star b/project.star
index a2574da230ab..61743b653bf2 100644
--- a/project.star
+++ b/project.star
@@ -270,6 +270,41 @@ led_users(
     ],
 )
 
+# @project realm.
+luci.realm(
+    name = "@project",
+    bindings = [
+        # Allow everyone (including non-logged-in users) to see chromium
+        # tree status.
+        luci.binding(
+            roles = "role/treestatus.limitedReader",
+            groups = [
+                "all",
+            ],
+        ),
+        # Only allow Googlers to see PII.
+        luci.binding(
+            roles = "role/treestatus.reader",
+            groups = [
+                "googlers",
+            ],
+            users = [
+                "luci-notify-dev@appspot.gserviceaccount.com",
+            ],
+        ),
+        # Only allow Googlers and service accounts.
+        luci.binding(
+            roles = "role/treestatus.writer",
+            groups = [
+                "googlers",
+            ],
+            users = [
+                "luci-notify-dev@appspot.gserviceaccount.com",
+            ],
+        ),
+    ],
+)
+
 luci.milo(
     logo = "https://storage.googleapis.com/chrome-infra-public/logo/dartlang.png",
 )

From 71b070c41bb46edee4dfdcb845d1ef0d08b89326 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 25 Feb 2025 07:41:00 -0800
Subject: [PATCH 775/826] [infra] Delete the dart2js-hostasserts-linux-unsound
 builder

This configuration no longer needs to be tested.

Change-Id: I77e89c88479424f214f6cee5dfe0e6c358d906a4
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/412081
Auto-Submit: Alexander Thomas <athom@google.com>
Commit-Queue: Nate Biggs <natebiggs@google.com>
Reviewed-by: Nate Biggs <natebiggs@google.com>
---
 dart2js.star                 |   8 ---
 generated/commit-queue.cfg   | 117 -----------------------------------
 generated/cr-buildbucket.cfg |  70 ---------------------
 generated/luci-milo.cfg      |  13 ----
 generated/luci-notify.cfg    |  11 ----
 generated/luci-scheduler.cfg |  11 ----
 6 files changed, 230 deletions(-)

diff --git a/dart2js.star b/dart2js.star
index 801b8ae70198..2f05cfa86437 100644
--- a/dart2js.star
+++ b/dart2js.star
@@ -69,14 +69,6 @@ dart.ci_sandbox_builder(
     dimensions = windows,
     properties = [chrome, no_android],
 )
-dart.ci_sandbox_builder(
-    "dart2js-hostasserts-linux-unsound",
-    category = "dart2js|chrome|un",
-    channels = ["try"],
-    location_filters = paths.to_location_filters(paths.dart2js),
-    properties = [chrome, no_android],
-    triggered_by = ["dart2js-gitiles-trigger-%s"],
-)
 dart.ci_sandbox_builder(
     "dart2js-linux-firefox",
     category = "dart2js|firefox|l",
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index db976aae6423..5717608ae379 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -2792,123 +2792,6 @@ config_groups {
           path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
         }
       }
-      builders {
-        name: "dart/try/dart2js-hostasserts-linux-unsound-try"
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          gerrit_ref_regexp: ".*"
-          path_regexp: "DEPS"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          gerrit_ref_regexp: ".*"
-          path_regexp: "build/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          gerrit_ref_regexp: ".*"
-          path_regexp: "BUILD.gn"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          gerrit_ref_regexp: ".*"
-          path_regexp: "sdk_args.gni"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          gerrit_ref_regexp: ".*"
-          path_regexp: "tools/gn.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          gerrit_ref_regexp: ".*"
-          path_regexp: "tools/build.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          gerrit_ref_regexp: ".*"
-          path_regexp: ".dart_tool/package_config.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          gerrit_ref_regexp: ".*"
-          path_regexp: "tools/generate_package_config.py"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          gerrit_ref_regexp: ".*"
-          path_regexp: "tools/generate_package_config.dart"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          gerrit_ref_regexp: ".*"
-          path_regexp: "sdk/lib/[^_].+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          gerrit_ref_regexp: ".*"
-          path_regexp: "pkg/(async_helper|expect|smith|status_file|test_runner)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          gerrit_ref_regexp: ".*"
-          path_regexp: "tools/bots/test_matrix.json"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          gerrit_ref_regexp: ".*"
-          path_regexp: "tests/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          gerrit_ref_regexp: ".*"
-          path_regexp: "pkg/(front_end|kernel|testing|_fe_analyzer_shared)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          gerrit_ref_regexp: ".*"
-          path_regexp: "sdk/lib/_js_interop/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          gerrit_ref_regexp: ".*"
-          path_regexp: "sdk/lib/_internal/js.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          gerrit_ref_regexp: ".*"
-          path_regexp: "pkg/(compiler|dart2js_tools|js_ast)/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          gerrit_ref_regexp: ".*"
-          path_regexp: "utils/compiler/.+"
-        }
-        location_filters {
-          gerrit_host_regexp: ".*"
-          gerrit_project_regexp: ".*"
-          gerrit_ref_regexp: ".*"
-          path_regexp: "pkg/(js|modular_test|sourcemap_testing)/.+"
-        }
-      }
       builders {
         name: "dart/try/dart2js-linux-chrome-try"
         location_filters {
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 1504813a6a94..d88dbe300c2f 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -503,41 +503,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "dart2js-hostasserts-linux-unsound"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "dart2js-linux-chrome"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10322,41 +10287,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "dart2js-hostasserts-linux-unsound-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false,'
-        '    "download_chrome": true'
-        '  },'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "dart2js-linux-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 081e655d27f3..7ad65b8c8a9d 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -340,9 +340,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/dart2js-win-chrome-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/dart2js-hostasserts-linux-unsound-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/dart2js-linux-firefox-try"
   }
@@ -1088,11 +1085,6 @@ consoles {
     category: "dart2js|chrome"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostasserts-linux-unsound"
-    category: "dart2js|chrome"
-    short_name: "un"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-firefox"
     category: "dart2js|firefox"
@@ -1397,11 +1389,6 @@ consoles {
     category: "dart2js|chrome"
     short_name: "w"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/dart2js-hostasserts-linux-unsound"
-    category: "dart2js|chrome"
-    short_name: "un"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2js-linux-firefox"
     category: "dart2js|firefox"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 6158dc0f93db..a137a38adf17 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -81,17 +81,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "dart2js-hostasserts-linux-unsound"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 5e58f54a3276..bf4182e2f90d 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -154,16 +154,6 @@ job {
     builder: "dart2js-hostasserts-linux-d8"
   }
 }
-job {
-  id: "dart2js-hostasserts-linux-unsound"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "dart2js-hostasserts-linux-unsound"
-  }
-}
 job {
   id: "dart2js-linux-chrome"
   realm: "ci.sandbox"
@@ -2851,7 +2841,6 @@ trigger {
   realm: "ci"
   triggers: "dart2js-canary-linux"
   triggers: "dart2js-hostasserts-linux-d8"
-  triggers: "dart2js-hostasserts-linux-unsound"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/main"

From 24ce12ca929f1431c3fe7ce51331da25d43286ff Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 25 Feb 2025 14:16:36 -0800
Subject: [PATCH 776/826] [infra] Add builders for simarm64_arm64.

Bug: https://github.com/dart-lang/sdk/issues/60204
Change-Id: Ief7ff5fe549a5ee109d75b232c0898d16ee6d60e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/412200
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
---
 generated/commit-queue.cfg   |   8 ++
 generated/cr-buildbucket.cfg | 146 +++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      |  26 +++++++
 generated/luci-notify.cfg    |  24 ++++++
 generated/luci-scheduler.cfg |  22 ++++++
 vm.star                      |  12 +++
 6 files changed, 238 insertions(+)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 5717608ae379..150b26c8ad0c 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -4522,6 +4522,14 @@ config_groups {
         name: "dart/try/vm-ffi-android-release-arm64c-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-ffi-mac-debug-simarm64_arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-mac-release-simarm64_arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-ffi-qemu-linux-release-arm-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index d88dbe300c2f..9ae4ea0aa4f7 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -7585,6 +7585,79 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-ffi-mac-debug-simarm64_arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-mac-release-simarm64_arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-ffi-qemu-linux-release-arm"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13174,6 +13247,79 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-ffi-mac-debug-simarm64_arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-mac-release-simarm64_arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-ffi-qemu-linux-release-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 7ad65b8c8a9d..8dee28392131 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -292,6 +292,12 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-ffi-qemu-linux-release-riscv64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-ffi-mac-debug-simarm64_arm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-ffi-mac-release-simarm64_arm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/iso-stress-linux-try"
   }
@@ -1010,6 +1016,16 @@ consoles {
     category: "vm|ffi"
     short_name: "qr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-mac-debug-simarm64_arm64"
+    category: "vm|ffi"
+    short_name: "ad"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-mac-release-simarm64_arm64"
+    category: "vm|ffi"
+    short_name: "ar"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
@@ -1849,6 +1865,16 @@ consoles {
     category: "vm|ffi"
     short_name: "qr"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-mac-debug-simarm64_arm64"
+    category: "vm|ffi"
+    short_name: "ad"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-mac-release-simarm64_arm64"
+    category: "vm|ffi"
+    short_name: "ar"
+  }
   header {
     links {
       name: "Consoles"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index a137a38adf17..ac77a3ba77b5 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -1012,6 +1012,30 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-ffi-mac-debug-simarm64_arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-ffi-mac-release-simarm64_arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index bf4182e2f90d..ea4fe0d3d172 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1864,6 +1864,26 @@ job {
     builder: "vm-ffi-android-release-arm64c-stable"
   }
 }
+job {
+  id: "vm-ffi-mac-debug-simarm64_arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-ffi-mac-debug-simarm64_arm64"
+  }
+}
+job {
+  id: "vm-ffi-mac-release-simarm64_arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-ffi-mac-release-simarm64_arm64"
+  }
+}
 job {
   id: "vm-ffi-qemu-linux-release-arm"
   realm: "ci.sandbox"
@@ -2738,6 +2758,7 @@ trigger {
   triggers: "vm-asan-linux-release-x64"
   triggers: "vm-eager-optimization-linux-release-ia32"
   triggers: "vm-eager-optimization-linux-release-x64"
+  triggers: "vm-ffi-mac-release-simarm64_arm64"
   triggers: "vm-gcc-linux"
   triggers: "vm-linux-debug-ia32"
   triggers: "vm-linux-debug-simriscv32"
@@ -2784,6 +2805,7 @@ trigger {
   triggers: "vm-ffi-android-product-arm64c"
   triggers: "vm-ffi-android-release-arm"
   triggers: "vm-ffi-android-release-arm64c"
+  triggers: "vm-ffi-mac-debug-simarm64_arm64"
   triggers: "vm-ffi-qemu-linux-release-arm"
   triggers: "vm-ffi-qemu-linux-release-riscv64"
   triggers: "vm-fuchsia-release-arm64"
diff --git a/vm.star b/vm.star
index a2ff75095d7f..95d7fd675500 100644
--- a/vm.star
+++ b/vm.star
@@ -494,6 +494,18 @@ _vm_builder(
     category = "vm|ffi|qr",
     dimensions = jammy,  # The bit-manipulation extensions are only available starting with Noble, but Noble is suspected to have a bug that leads to flaky crashes
 )
+_vm_builder(
+    "vm-ffi-mac-debug-simarm64_arm64",
+    category = "vm|ffi|ad",
+    channels = ["try"],
+    dimensions = [mac, arm64],
+)
+_nightly_builder(
+    "vm-ffi-mac-release-simarm64_arm64",
+    category = "vm|ffi|ar",
+    channels = ["try"],
+    dimensions = [mac, arm64],
+)
 
 # Isolate stress test builder
 _vm_builder(

From 50816a0014d08921b05f304176c7f896bd083603 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Thu, 27 Feb 2025 00:29:25 -0800
Subject: [PATCH 777/826] [infra] Remove unsound CFE builder

Change-Id: I43cbfa5559437ead89ead37ea2ae4b4a7a630e84
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/412560
Reviewed-by: Johnni Winther <johnniwinther@google.com>
Auto-Submit: Alexander Thomas <athom@google.com>
Commit-Queue: Johnni Winther <johnniwinther@google.com>
---
 cfe.star                     |   5 --
 generated/commit-queue.cfg   |   9 ---
 generated/cr-buildbucket.cfg | 124 -----------------------------------
 generated/luci-milo.cfg      |  23 -------
 generated/luci-notify.cfg    |  11 ----
 generated/luci-scheduler.cfg |  33 ----------
 6 files changed, 205 deletions(-)

diff --git a/cfe.star b/cfe.star
index 94ca353b0b31..3d3de225f9dd 100644
--- a/cfe.star
+++ b/cfe.star
@@ -20,11 +20,6 @@ luci.notifier(
     notify_emails = ["jensj@google.com"],
 )
 
-dart.ci_sandbox_builder(
-    "front-end-linux-release-x64",
-    category = "cfe|l",
-    on_cq = True,
-)
 dart.ci_sandbox_builder(
     "front-end-nnbd-linux-release-x64",
     category = "cfe|nnbd|l",
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 150b26c8ad0c..6e682202ce78 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -1496,9 +1496,6 @@ config_groups {
         name: "dart/try/dev-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/front-end-linux-release-x64-try"
-      }
       builders {
         name: "dart/try/front-end-nnbd-linux-release-x64-try"
         location_filters {
@@ -3942,9 +3939,6 @@ config_groups {
         name: "dart/try/flutter-web-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/front-end-linux-release-x64-try"
-      }
       builders {
         name: "dart/try/front-end-nnbd-linux-release-x64-try"
         location_filters {
@@ -6221,9 +6215,6 @@ config_groups {
         name: "dart/try/dev-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/front-end-linux-release-x64-try"
-      }
       builders {
         name: "dart/try/front-end-nnbd-linux-release-x64-try"
         location_filters {
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 9ae4ea0aa4f7..22a7480c5a8c 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -3804,99 +3804,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "front-end-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-linux-release-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 60
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "front-end-linux-release-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 60
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "front-end-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -11338,37 +11245,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "front-end-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "front-end-nnbd-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 8dee28392131..f70bc6b6c1a9 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -28,9 +28,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/dart-sdk-win-arm64-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/front-end-linux-release-x64-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/front-end-nnbd-linux-release-x64-try"
   }
@@ -576,11 +573,6 @@ consoles {
     category: "sdk"
     short_name: "g3"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
-    category: "cfe"
-    short_name: "l"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64"
     category: "cfe|nnbd"
@@ -1275,11 +1267,6 @@ consoles {
     category: "sdk"
     short_name: "g3"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
-    category: "cfe"
-    short_name: "l"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64"
     category: "cfe|nnbd"
@@ -2063,11 +2050,6 @@ consoles {
     category: "sdk"
     short_name: "dp"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-beta"
-    category: "cfe"
-    short_name: "l"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-beta"
     category: "cfe|nnbd"
@@ -2467,11 +2449,6 @@ consoles {
     category: "sdk"
     short_name: "dp"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-stable"
-    category: "cfe"
-    short_name: "l"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-stable"
     category: "cfe|nnbd"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index ac77a3ba77b5..ce6be9c43789 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -334,17 +334,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "front-end-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index ea4fe0d3d172..3aaf0b9277ed 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -744,36 +744,6 @@ job {
     builder: "flutter-web"
   }
 }
-job {
-  id: "front-end-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "front-end-linux-release-x64"
-  }
-}
-job {
-  id: "front-end-linux-release-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "front-end-linux-release-x64-beta"
-  }
-}
-job {
-  id: "front-end-linux-release-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "front-end-linux-release-x64-stable"
-  }
-}
 job {
   id: "front-end-nnbd-linux-release-x64"
   realm: "ci.sandbox"
@@ -2552,7 +2522,6 @@ trigger {
   triggers: "ddc-linux-chrome-beta"
   triggers: "ddc-mac-chrome-beta"
   triggers: "ddc-win-chrome-beta"
-  triggers: "front-end-linux-release-x64-beta"
   triggers: "front-end-nnbd-linux-release-x64-beta"
   triggers: "gclient-beta"
   triggers: "pkg-linux-release-arm64-beta"
@@ -2627,7 +2596,6 @@ trigger {
   triggers: "ddc-win-chrome"
   triggers: "flutter-analyze"
   triggers: "flutter-frontend"
-  triggers: "front-end-linux-release-x64"
   triggers: "front-end-nnbd-linux-release-x64"
   triggers: "gclient"
   triggers: "pkg-linux-debug"
@@ -2670,7 +2638,6 @@ trigger {
   triggers: "ddc-linux-chrome-stable"
   triggers: "ddc-mac-chrome-stable"
   triggers: "ddc-win-chrome-stable"
-  triggers: "front-end-linux-release-x64-stable"
   triggers: "front-end-nnbd-linux-release-x64-stable"
   triggers: "gclient-stable"
   triggers: "pkg-linux-release-arm64-stable"

From 130e9dc0c8c3ce6043c20e83cf72ac2f31520cee Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 4 Mar 2025 13:02:25 -0800
Subject: [PATCH 778/826] [infra] Stop specifying a particular version of
 Ubuntu for Linux builders by default.

Test shards already have this weaker constraint. Weakening this constraint makes it easier to upgrade machines to the next Ubunutu LTS release, which would otherwise require changes in this repository and the GCE configuration to be deployed at the same time or a staged upgrade that temporarily reduces the effective pool capacity. Since Dart is supposed to support all the LTS releases in the machine pool anyway, it seems appropriate for the main shards to also have the weaker constraint.

Change-Id: If2744d36f838f00f238f0f9d38074a27f7fa5307
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/413323
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/cr-buildbucket.cfg | 598 +++++++++++++++++------------------
 lib/defaults.star            |   5 +-
 2 files changed, 302 insertions(+), 301 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 22a7480c5a8c..af4435477927 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -20,7 +20,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -51,7 +51,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -82,7 +82,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -113,7 +113,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -144,7 +144,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -175,7 +175,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -407,7 +407,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -439,7 +439,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -474,7 +474,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -508,7 +508,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -543,7 +543,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -578,7 +578,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -613,7 +613,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -648,7 +648,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -683,7 +683,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -955,7 +955,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -990,7 +990,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1025,7 +1025,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1060,7 +1060,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1094,7 +1094,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1128,7 +1128,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1162,7 +1162,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1196,7 +1196,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1230,7 +1230,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1404,7 +1404,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1441,7 +1441,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1478,7 +1478,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1515,7 +1515,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1552,7 +1552,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1589,7 +1589,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1626,7 +1626,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1662,7 +1662,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1698,7 +1698,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1734,7 +1734,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1771,7 +1771,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1808,7 +1808,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1845,7 +1845,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1882,7 +1882,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1919,7 +1919,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1956,7 +1956,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1993,7 +1993,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2030,7 +2030,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2067,7 +2067,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2102,7 +2102,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2136,7 +2136,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2171,7 +2171,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2206,7 +2206,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2241,7 +2241,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2541,7 +2541,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2572,7 +2572,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2603,7 +2603,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2646,7 +2646,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2678,7 +2678,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2710,7 +2710,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2742,7 +2742,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2774,7 +2774,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2806,7 +2806,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2838,7 +2838,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2870,7 +2870,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2902,7 +2902,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2934,7 +2934,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2966,7 +2966,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2998,7 +2998,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3030,7 +3030,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3062,7 +3062,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3094,7 +3094,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3126,7 +3126,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3158,7 +3158,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3190,7 +3190,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3222,7 +3222,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3254,7 +3254,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3286,7 +3286,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3318,7 +3318,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3350,7 +3350,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3382,7 +3382,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3414,7 +3414,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3446,7 +3446,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3478,7 +3478,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3510,7 +3510,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3542,7 +3542,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3574,7 +3574,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3606,7 +3606,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3638,7 +3638,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3670,7 +3670,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3702,7 +3702,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3734,7 +3734,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3766,7 +3766,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3809,7 +3809,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3840,7 +3840,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3871,7 +3871,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3969,7 +3969,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4001,7 +4001,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4032,7 +4032,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4063,7 +4063,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4094,7 +4094,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4125,7 +4125,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4157,7 +4157,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4189,7 +4189,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4223,7 +4223,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4359,7 +4359,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4393,7 +4393,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4874,7 +4874,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4909,7 +4909,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4944,7 +4944,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4979,7 +4979,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5014,7 +5014,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5049,7 +5049,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5084,7 +5084,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5116,7 +5116,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5148,7 +5148,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5180,7 +5180,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5212,7 +5212,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5244,7 +5244,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5276,7 +5276,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5309,7 +5309,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5342,7 +5342,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5375,7 +5375,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5408,7 +5408,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5475,7 +5475,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5506,7 +5506,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5537,7 +5537,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5568,7 +5568,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5599,7 +5599,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5630,7 +5630,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5929,7 +5929,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5961,7 +5961,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5993,7 +5993,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6025,7 +6025,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6057,7 +6057,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6425,7 +6425,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6457,7 +6457,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6489,7 +6489,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6521,7 +6521,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6553,7 +6553,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6584,7 +6584,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6615,7 +6615,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6681,7 +6681,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6821,7 +6821,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6853,7 +6853,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6885,7 +6885,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6919,7 +6919,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6953,7 +6953,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6987,7 +6987,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7021,7 +7021,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7055,7 +7055,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7089,7 +7089,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7123,7 +7123,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7157,7 +7157,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7191,7 +7191,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7225,7 +7225,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7259,7 +7259,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7293,7 +7293,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7327,7 +7327,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7361,7 +7361,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7395,7 +7395,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7429,7 +7429,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7463,7 +7463,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7787,7 +7787,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7892,7 +7892,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7925,7 +7925,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7957,7 +7957,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7988,7 +7988,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8019,7 +8019,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8050,7 +8050,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8081,7 +8081,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8112,7 +8112,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8143,7 +8143,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8277,7 +8277,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8309,7 +8309,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8340,7 +8340,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8371,7 +8371,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8402,7 +8402,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8433,7 +8433,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8464,7 +8464,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8986,7 +8986,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9053,7 +9053,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9085,7 +9085,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9117,7 +9117,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9149,7 +9149,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9216,7 +9216,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9283,7 +9283,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9739,7 +9739,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9770,7 +9770,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9868,7 +9868,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9902,7 +9902,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9976,7 +9976,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10011,7 +10011,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10203,7 +10203,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10238,7 +10238,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10272,7 +10272,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10307,7 +10307,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10421,7 +10421,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10456,7 +10456,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10490,7 +10490,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10559,7 +10559,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10596,7 +10596,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10633,7 +10633,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10669,7 +10669,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10706,7 +10706,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10743,7 +10743,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10780,7 +10780,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10815,7 +10815,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10849,7 +10849,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10884,7 +10884,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11034,7 +11034,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11068,7 +11068,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11100,7 +11100,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11131,7 +11131,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11162,7 +11162,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -11206,7 +11206,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -11250,7 +11250,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11348,7 +11348,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11379,7 +11379,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11410,7 +11410,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11442,7 +11442,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11510,7 +11510,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11693,7 +11693,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11727,7 +11727,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11762,7 +11762,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11797,7 +11797,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11829,7 +11829,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11861,7 +11861,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11893,7 +11893,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11925,7 +11925,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11958,7 +11958,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11991,7 +11991,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12024,7 +12024,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12057,7 +12057,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12124,7 +12124,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12155,7 +12155,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12300,7 +12300,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12332,7 +12332,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12364,7 +12364,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12396,7 +12396,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12428,7 +12428,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12662,7 +12662,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12694,7 +12694,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12726,7 +12726,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12792,7 +12792,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12860,7 +12860,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12892,7 +12892,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12924,7 +12924,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12958,7 +12958,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12992,7 +12992,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13026,7 +13026,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13060,7 +13060,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13094,7 +13094,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13263,7 +13263,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13368,7 +13368,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13401,7 +13401,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13433,7 +13433,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13464,7 +13464,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13495,7 +13495,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13561,7 +13561,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13593,7 +13593,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13624,7 +13624,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13842,7 +13842,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13909,7 +13909,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13941,7 +13941,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13973,7 +13973,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14005,7 +14005,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14072,7 +14072,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14139,7 +14139,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14381,7 +14381,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14413,7 +14413,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14445,7 +14445,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14477,7 +14477,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14509,7 +14509,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14541,7 +14541,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14573,7 +14573,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14605,7 +14605,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14637,7 +14637,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14669,7 +14669,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14701,7 +14701,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14733,7 +14733,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14765,7 +14765,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14797,7 +14797,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14829,7 +14829,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14861,7 +14861,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14893,7 +14893,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14925,7 +14925,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14957,7 +14957,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14989,7 +14989,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15021,7 +15021,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15053,7 +15053,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15085,7 +15085,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15117,7 +15117,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15149,7 +15149,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15181,7 +15181,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15213,7 +15213,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15245,7 +15245,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15277,7 +15277,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15309,7 +15309,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15341,7 +15341,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15373,7 +15373,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15405,7 +15405,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15437,7 +15437,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15469,7 +15469,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15525,7 +15525,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-20"
+      dimensions: "os:Linux"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
diff --git a/lib/defaults.star b/lib/defaults.star
index 57730c3ae274..dc787c3800de 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -11,7 +11,7 @@ _PROPERTIES = {"clobber": True}
 _DIMENSIONS = {
     "cpu": "x86-64",
     "host_class": "default",
-    "os": "Ubuntu-20",
+    "os": "Linux",
     "pool": "luci.dart.try",
 }
 _CACHES = {
@@ -34,6 +34,7 @@ _SLOW_SHARDS = {"shard_timeout": (90 * time.minute) // time.second}
 
 _ARM64 = {"cpu": "arm64"}
 _MAC = {"os": "Mac"}
+_LINUX = {"os": "Linux"}
 _FOCAL = {"os": "Ubuntu-20"}
 _JAMMY = {"os": "Ubuntu-22"}
 _NOBLE = {"os": "Ubuntu-24"}
@@ -56,7 +57,7 @@ experimental = _EXPERIMENTAL
 flutter_pool = _FLUTTER_POOL
 focal = _FOCAL
 jammy = _JAMMY
-linux = _FOCAL
+linux = _LINUX
 mac = _MAC
 noble = _NOBLE
 windows = _WINDOWS10

From 53896385883974cecf2ef6beeba77dc2d6c4e332 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Wed, 5 Mar 2025 07:09:21 -0800
Subject: [PATCH 779/826] Revert "[infra] Remove unsound CFE builder"

This reverts commit 50816a0014d08921b05f304176c7f896bd083603.

Reason for revert: This builder ran unit tests for the CFE.

Original change's description:
> [infra] Remove unsound CFE builder
>
> Change-Id: I43cbfa5559437ead89ead37ea2ae4b4a7a630e84
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/412560
> Reviewed-by: Johnni Winther <johnniwinther@google.com>
> Auto-Submit: Alexander Thomas <athom@google.com>
> Commit-Queue: Johnni Winther <johnniwinther@google.com>

Change-Id: I7b2cbd9c423919bc5d3d8f7c3d0f7e7218f3c220
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/413760
Reviewed-by: Johnni Winther <johnniwinther@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 cfe.star                     |   5 ++
 generated/commit-queue.cfg   |   9 +++
 generated/cr-buildbucket.cfg | 124 +++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      |  23 +++++++
 generated/luci-notify.cfg    |  11 ++++
 generated/luci-scheduler.cfg |  33 ++++++++++
 6 files changed, 205 insertions(+)

diff --git a/cfe.star b/cfe.star
index 3d3de225f9dd..94ca353b0b31 100644
--- a/cfe.star
+++ b/cfe.star
@@ -20,6 +20,11 @@ luci.notifier(
     notify_emails = ["jensj@google.com"],
 )
 
+dart.ci_sandbox_builder(
+    "front-end-linux-release-x64",
+    category = "cfe|l",
+    on_cq = True,
+)
 dart.ci_sandbox_builder(
     "front-end-nnbd-linux-release-x64",
     category = "cfe|nnbd|l",
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 6e682202ce78..150b26c8ad0c 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -1496,6 +1496,9 @@ config_groups {
         name: "dart/try/dev-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/front-end-linux-release-x64-try"
+      }
       builders {
         name: "dart/try/front-end-nnbd-linux-release-x64-try"
         location_filters {
@@ -3939,6 +3942,9 @@ config_groups {
         name: "dart/try/flutter-web-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/front-end-linux-release-x64-try"
+      }
       builders {
         name: "dart/try/front-end-nnbd-linux-release-x64-try"
         location_filters {
@@ -6215,6 +6221,9 @@ config_groups {
         name: "dart/try/dev-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/front-end-linux-release-x64-try"
+      }
       builders {
         name: "dart/try/front-end-nnbd-linux-release-x64-try"
         location_filters {
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index af4435477927..d55d6b11c10b 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -3804,6 +3804,99 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "front-end-linux-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "front-end-linux-release-x64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "front-end-linux-release-x64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "front-end-nnbd-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -11245,6 +11338,37 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "front-end-linux-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "front-end-nnbd-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index f70bc6b6c1a9..8dee28392131 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -28,6 +28,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/dart-sdk-win-arm64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/front-end-linux-release-x64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/front-end-nnbd-linux-release-x64-try"
   }
@@ -573,6 +576,11 @@ consoles {
     category: "sdk"
     short_name: "g3"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
+    category: "cfe"
+    short_name: "l"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64"
     category: "cfe|nnbd"
@@ -1267,6 +1275,11 @@ consoles {
     category: "sdk"
     short_name: "g3"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64"
+    category: "cfe"
+    short_name: "l"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64"
     category: "cfe|nnbd"
@@ -2050,6 +2063,11 @@ consoles {
     category: "sdk"
     short_name: "dp"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-beta"
+    category: "cfe"
+    short_name: "l"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-beta"
     category: "cfe|nnbd"
@@ -2449,6 +2467,11 @@ consoles {
     category: "sdk"
     short_name: "dp"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-stable"
+    category: "cfe"
+    short_name: "l"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-nnbd-linux-release-x64-stable"
     category: "cfe|nnbd"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index ce6be9c43789..ac77a3ba77b5 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -334,6 +334,17 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "front-end-linux-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 3aaf0b9277ed..ea4fe0d3d172 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -744,6 +744,36 @@ job {
     builder: "flutter-web"
   }
 }
+job {
+  id: "front-end-linux-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "front-end-linux-release-x64"
+  }
+}
+job {
+  id: "front-end-linux-release-x64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "front-end-linux-release-x64-beta"
+  }
+}
+job {
+  id: "front-end-linux-release-x64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "front-end-linux-release-x64-stable"
+  }
+}
 job {
   id: "front-end-nnbd-linux-release-x64"
   realm: "ci.sandbox"
@@ -2522,6 +2552,7 @@ trigger {
   triggers: "ddc-linux-chrome-beta"
   triggers: "ddc-mac-chrome-beta"
   triggers: "ddc-win-chrome-beta"
+  triggers: "front-end-linux-release-x64-beta"
   triggers: "front-end-nnbd-linux-release-x64-beta"
   triggers: "gclient-beta"
   triggers: "pkg-linux-release-arm64-beta"
@@ -2596,6 +2627,7 @@ trigger {
   triggers: "ddc-win-chrome"
   triggers: "flutter-analyze"
   triggers: "flutter-frontend"
+  triggers: "front-end-linux-release-x64"
   triggers: "front-end-nnbd-linux-release-x64"
   triggers: "gclient"
   triggers: "pkg-linux-debug"
@@ -2638,6 +2670,7 @@ trigger {
   triggers: "ddc-linux-chrome-stable"
   triggers: "ddc-mac-chrome-stable"
   triggers: "ddc-win-chrome-stable"
+  triggers: "front-end-linux-release-x64-stable"
   triggers: "front-end-nnbd-linux-release-x64-stable"
   triggers: "gclient-stable"
   triggers: "pkg-linux-release-arm64-stable"

From 254eca60269fefc35731aeb7df2b7d5ef1265d58 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Wed, 5 Mar 2025 12:51:02 -0800
Subject: [PATCH 780/826] [infra] Tighten Linux builders' default to Jammy.

The machines have been upgraded from Focal to Jammy.

Change-Id: I6992ec888c3b35b3da3fb15ccc00ea4108b6a4ca
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/413620
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/cr-buildbucket.cfg | 606 +++++++++++++++++------------------
 lib/defaults.star            |   5 +-
 2 files changed, 305 insertions(+), 306 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index d55d6b11c10b..b9863356e676 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -20,7 +20,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -51,7 +51,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -82,7 +82,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -113,7 +113,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -144,7 +144,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -175,7 +175,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -407,7 +407,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -439,7 +439,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -474,7 +474,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -508,7 +508,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -543,7 +543,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -578,7 +578,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -613,7 +613,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -648,7 +648,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -683,7 +683,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -955,7 +955,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -990,7 +990,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1025,7 +1025,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1060,7 +1060,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1094,7 +1094,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1128,7 +1128,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1162,7 +1162,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1196,7 +1196,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1230,7 +1230,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1404,7 +1404,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1441,7 +1441,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1478,7 +1478,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1515,7 +1515,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1552,7 +1552,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1589,7 +1589,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1626,7 +1626,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1662,7 +1662,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1698,7 +1698,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1734,7 +1734,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1771,7 +1771,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1808,7 +1808,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1845,7 +1845,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1882,7 +1882,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1919,7 +1919,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1956,7 +1956,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1993,7 +1993,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2030,7 +2030,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2067,7 +2067,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2102,7 +2102,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2136,7 +2136,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2171,7 +2171,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2206,7 +2206,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2241,7 +2241,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2541,7 +2541,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2572,7 +2572,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2603,7 +2603,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2646,7 +2646,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2678,7 +2678,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2710,7 +2710,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2742,7 +2742,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2774,7 +2774,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2806,7 +2806,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2838,7 +2838,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2870,7 +2870,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2902,7 +2902,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2934,7 +2934,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2966,7 +2966,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -2998,7 +2998,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3030,7 +3030,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3062,7 +3062,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3094,7 +3094,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3126,7 +3126,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3158,7 +3158,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3190,7 +3190,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3222,7 +3222,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3254,7 +3254,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3286,7 +3286,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3318,7 +3318,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3350,7 +3350,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3382,7 +3382,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3414,7 +3414,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3446,7 +3446,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3478,7 +3478,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3510,7 +3510,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3542,7 +3542,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3574,7 +3574,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3606,7 +3606,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3638,7 +3638,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3670,7 +3670,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3702,7 +3702,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3734,7 +3734,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3766,7 +3766,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -3809,7 +3809,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3840,7 +3840,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3871,7 +3871,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3902,7 +3902,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3933,7 +3933,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -3964,7 +3964,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4062,7 +4062,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4094,7 +4094,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4125,7 +4125,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4156,7 +4156,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4187,7 +4187,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4218,7 +4218,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4250,7 +4250,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4282,7 +4282,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4316,7 +4316,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4452,7 +4452,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4486,7 +4486,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4967,7 +4967,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5002,7 +5002,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5037,7 +5037,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5072,7 +5072,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5107,7 +5107,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5142,7 +5142,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5177,7 +5177,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5209,7 +5209,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5241,7 +5241,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5273,7 +5273,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5305,7 +5305,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5337,7 +5337,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5369,7 +5369,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5402,7 +5402,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5435,7 +5435,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5468,7 +5468,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5501,7 +5501,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5568,7 +5568,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5599,7 +5599,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5630,7 +5630,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5661,7 +5661,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5692,7 +5692,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5723,7 +5723,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6022,7 +6022,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6054,7 +6054,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6086,7 +6086,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6118,7 +6118,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6150,7 +6150,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6518,7 +6518,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6550,7 +6550,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6582,7 +6582,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6614,7 +6614,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6646,7 +6646,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6677,7 +6677,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6708,7 +6708,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6774,7 +6774,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6914,7 +6914,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6946,7 +6946,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6978,7 +6978,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7012,7 +7012,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7046,7 +7046,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7080,7 +7080,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7114,7 +7114,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7148,7 +7148,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7182,7 +7182,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7216,7 +7216,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7250,7 +7250,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7284,7 +7284,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7318,7 +7318,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7352,7 +7352,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7386,7 +7386,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7420,7 +7420,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7454,7 +7454,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7488,7 +7488,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7522,7 +7522,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7556,7 +7556,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7880,7 +7880,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -7985,7 +7985,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8018,7 +8018,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8050,7 +8050,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8081,7 +8081,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8112,7 +8112,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8143,7 +8143,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8174,7 +8174,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8205,7 +8205,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8236,7 +8236,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8370,7 +8370,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8402,7 +8402,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8433,7 +8433,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8464,7 +8464,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8495,7 +8495,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8526,7 +8526,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -8557,7 +8557,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9079,7 +9079,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9146,7 +9146,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9178,7 +9178,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9210,7 +9210,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9242,7 +9242,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9309,7 +9309,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9376,7 +9376,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9832,7 +9832,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9863,7 +9863,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9961,7 +9961,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9995,7 +9995,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10069,7 +10069,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10104,7 +10104,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10296,7 +10296,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10331,7 +10331,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10365,7 +10365,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10400,7 +10400,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10514,7 +10514,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10549,7 +10549,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10583,7 +10583,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10652,7 +10652,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10689,7 +10689,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10726,7 +10726,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10762,7 +10762,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10799,7 +10799,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10836,7 +10836,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10873,7 +10873,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10908,7 +10908,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10942,7 +10942,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10977,7 +10977,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11127,7 +11127,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11161,7 +11161,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11193,7 +11193,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11224,7 +11224,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11255,7 +11255,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -11299,7 +11299,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -11343,7 +11343,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11374,7 +11374,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11472,7 +11472,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11503,7 +11503,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11534,7 +11534,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11566,7 +11566,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11634,7 +11634,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11817,7 +11817,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11851,7 +11851,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11886,7 +11886,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11921,7 +11921,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11953,7 +11953,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11985,7 +11985,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12017,7 +12017,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12049,7 +12049,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12082,7 +12082,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12115,7 +12115,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12148,7 +12148,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12181,7 +12181,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12248,7 +12248,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12279,7 +12279,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12424,7 +12424,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12456,7 +12456,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12488,7 +12488,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12520,7 +12520,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12552,7 +12552,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12786,7 +12786,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12818,7 +12818,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12850,7 +12850,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12916,7 +12916,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12984,7 +12984,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13016,7 +13016,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13048,7 +13048,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13082,7 +13082,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13116,7 +13116,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13150,7 +13150,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13184,7 +13184,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13218,7 +13218,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13387,7 +13387,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13492,7 +13492,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13525,7 +13525,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13557,7 +13557,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13588,7 +13588,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13619,7 +13619,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13685,7 +13685,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13717,7 +13717,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13748,7 +13748,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13966,7 +13966,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14033,7 +14033,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14065,7 +14065,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14097,7 +14097,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14129,7 +14129,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14196,7 +14196,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14263,7 +14263,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14505,7 +14505,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14537,7 +14537,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14569,7 +14569,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14601,7 +14601,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14633,7 +14633,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14665,7 +14665,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14697,7 +14697,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14729,7 +14729,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14761,7 +14761,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14793,7 +14793,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14825,7 +14825,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14857,7 +14857,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14889,7 +14889,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14921,7 +14921,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14953,7 +14953,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -14985,7 +14985,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15017,7 +15017,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15049,7 +15049,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15081,7 +15081,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15113,7 +15113,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15145,7 +15145,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15177,7 +15177,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15209,7 +15209,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15241,7 +15241,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15273,7 +15273,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15305,7 +15305,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15337,7 +15337,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15369,7 +15369,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15401,7 +15401,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15433,7 +15433,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15465,7 +15465,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15497,7 +15497,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15529,7 +15529,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15561,7 +15561,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15593,7 +15593,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:dart.tests"
       exe {
         cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -15649,7 +15649,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Linux"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
diff --git a/lib/defaults.star b/lib/defaults.star
index dc787c3800de..1cd92194dac0 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -11,7 +11,7 @@ _PROPERTIES = {"clobber": True}
 _DIMENSIONS = {
     "cpu": "x86-64",
     "host_class": "default",
-    "os": "Linux",
+    "os": "Ubuntu-22",
     "pool": "luci.dart.try",
 }
 _CACHES = {
@@ -34,7 +34,6 @@ _SLOW_SHARDS = {"shard_timeout": (90 * time.minute) // time.second}
 
 _ARM64 = {"cpu": "arm64"}
 _MAC = {"os": "Mac"}
-_LINUX = {"os": "Linux"}
 _FOCAL = {"os": "Ubuntu-20"}
 _JAMMY = {"os": "Ubuntu-22"}
 _NOBLE = {"os": "Ubuntu-24"}
@@ -57,7 +56,7 @@ experimental = _EXPERIMENTAL
 flutter_pool = _FLUTTER_POOL
 focal = _FOCAL
 jammy = _JAMMY
-linux = _LINUX
+linux = _JAMMY
 mac = _MAC
 noble = _NOBLE
 windows = _WINDOWS10

From 12eb2859b684d14bb2ffa229bc951de3194b0f91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96mer=20A=C4=9Facan?= <omersa@google.com>
Date: Tue, 25 Mar 2025 01:10:47 -0700
Subject: [PATCH 781/826] Add new dart2wasm builder to test minification

Change-Id: I1e218a53097da6f8e08e2e9ecb13296ff5040d43
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/416500
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Ivan Inozemtsev <iinozemtsev@google.com>
---
 dart2wasm.star               |   5 ++
 generated/commit-queue.cfg   |  12 +++
 generated/cr-buildbucket.cfg | 144 +++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      |  23 ++++++
 generated/luci-notify.cfg    |  11 +++
 generated/luci-scheduler.cfg |  33 ++++++++
 generated/project.cfg        |   2 +-
 7 files changed, 229 insertions(+), 1 deletion(-)

diff --git a/dart2wasm.star b/dart2wasm.star
index 96b2873fecb7..c14be453c62b 100644
--- a/dart2wasm.star
+++ b/dart2wasm.star
@@ -39,6 +39,11 @@ _dart2wasm_builder(
     location_filters = paths.to_location_filters(paths.dart2wasm),
 )
 
+_dart2wasm_builder(
+    "dart2wasm-asserts-minified-linux-d8",
+    category = "d2w|d|m",
+)
+
 _dart2wasm_builder(
     "dart2wasm-linux-optimized-jsc",
     category = "d2w|j",
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 150b26c8ad0c..45fd90510cec 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -972,6 +972,10 @@ config_groups {
           path_regexp: "third_party/binaryen/.+"
         }
       }
+      builders {
+        name: "dart/try/dart2wasm-asserts-minified-linux-d8-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/dart2wasm-linux-chrome-try"
         location_filters {
@@ -3292,6 +3296,10 @@ config_groups {
           path_regexp: "third_party/binaryen/.+"
         }
       }
+      builders {
+        name: "dart/try/dart2wasm-asserts-minified-linux-d8-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/dart2wasm-linux-chrome-try"
         location_filters {
@@ -5697,6 +5705,10 @@ config_groups {
           path_regexp: "third_party/binaryen/.+"
         }
       }
+      builders {
+        name: "dart/try/dart2wasm-asserts-minified-linux-d8-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/dart2wasm-linux-chrome-try"
         location_filters {
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index b9863356e676..857bd3cad8c1 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -1510,6 +1510,114 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "dart2wasm-asserts-minified-linux-d8"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "checkout_flute": true,'
+        '    "download_android_deps": false,'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2wasm-asserts-minified-linux-d8-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "checkout_flute": true,'
+        '    "download_android_deps": false,'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "dart2wasm-asserts-minified-linux-d8-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "checkout_flute": true,'
+        '    "download_android_deps": false,'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "dart2wasm-linux-chrome"
       swarming_host: "chromium-swarm.appspot.com"
@@ -10684,6 +10792,42 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "dart2wasm-asserts-minified-linux-d8-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": true,'
+        '  "custom_vars": {'
+        '    "checkout_flute": true,'
+        '    "download_android_deps": false,'
+        '    "download_emscripten": true'
+        '  },'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "dart2wasm-linux-chrome-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 8dee28392131..35c4881f739a 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -46,6 +46,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/dart2wasm-linux-d8-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/dart2wasm-asserts-minified-linux-d8-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/dart2wasm-linux-optimized-jsc-try"
   }
@@ -606,6 +609,11 @@ consoles {
     category: "d2w"
     short_name: "d"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-asserts-minified-linux-d8"
+    category: "d2w|d"
+    short_name: "m"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-optimized-jsc"
     category: "d2w"
@@ -1305,6 +1313,11 @@ consoles {
     category: "d2w"
     short_name: "d"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-asserts-minified-linux-d8"
+    category: "d2w|d"
+    short_name: "m"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-optimized-jsc"
     category: "d2w"
@@ -2078,6 +2091,11 @@ consoles {
     category: "d2w"
     short_name: "d"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-asserts-minified-linux-d8-beta"
+    category: "d2w|d"
+    short_name: "m"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-optimized-jsc-beta"
     category: "d2w"
@@ -2482,6 +2500,11 @@ consoles {
     category: "d2w"
     short_name: "d"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-asserts-minified-linux-d8-stable"
+    category: "d2w|d"
+    short_name: "m"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/dart2wasm-linux-optimized-jsc-stable"
     category: "d2w"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index ac77a3ba77b5..154a8cd29753 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -180,6 +180,17 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "dart2wasm-asserts-minified-linux-d8"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index ea4fe0d3d172..63973ac538f8 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -424,6 +424,36 @@ job {
     builder: "dart2wasm-asserts-linux-chrome-stable"
   }
 }
+job {
+  id: "dart2wasm-asserts-minified-linux-d8"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "dart2wasm-asserts-minified-linux-d8"
+  }
+}
+job {
+  id: "dart2wasm-asserts-minified-linux-d8-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "dart2wasm-asserts-minified-linux-d8-beta"
+  }
+}
+job {
+  id: "dart2wasm-asserts-minified-linux-d8-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "dart2wasm-asserts-minified-linux-d8-stable"
+  }
+}
 job {
   id: "dart2wasm-linux-chrome"
   realm: "ci.sandbox"
@@ -2891,6 +2921,7 @@ trigger {
   id: "dart2wasm-gitiles-trigger-beta"
   realm: "ci"
   triggers: "dart2wasm-asserts-linux-chrome-beta"
+  triggers: "dart2wasm-asserts-minified-linux-d8-beta"
   triggers: "dart2wasm-linux-chrome-beta"
   triggers: "dart2wasm-linux-d8-beta"
   triggers: "dart2wasm-linux-firefox-beta"
@@ -2955,6 +2986,7 @@ trigger {
   id: "dart2wasm-gitiles-trigger-main"
   realm: "ci"
   triggers: "dart2wasm-asserts-linux-chrome"
+  triggers: "dart2wasm-asserts-minified-linux-d8"
   triggers: "dart2wasm-linux-chrome"
   triggers: "dart2wasm-linux-d8"
   triggers: "dart2wasm-linux-firefox"
@@ -2990,6 +3022,7 @@ trigger {
   id: "dart2wasm-gitiles-trigger-stable"
   realm: "ci"
   triggers: "dart2wasm-asserts-linux-chrome-stable"
+  triggers: "dart2wasm-asserts-minified-linux-d8-stable"
   triggers: "dart2wasm-linux-chrome-stable"
   triggers: "dart2wasm-linux-d8-stable"
   triggers: "dart2wasm-linux-firefox-stable"
diff --git a/generated/project.cfg b/generated/project.cfg
index bd5cd825b195..ee57ff502f68 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.43.16"
+  version: "1.44.1"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"

From 286c11fd2858a7fca7993be1b46ed49b870b22a1 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 25 Mar 2025 10:04:01 -0700
Subject: [PATCH 782/826] [infra] Delete
 vm-ffi-qemu-linux-release-arm-experimental.

The image auto-roller uses this builder to validate new Focal images.

Change-Id: Ic5bca72cd466b8e2b0f1ee187560ba51bdbfd7bd
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/413842
Reviewed-by: Ivan Inozemtsev <iinozemtsev@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/cr-buildbucket.cfg | 31 -------------------------------
 generated/luci-notify.cfg    | 13 -------------
 generated/luci-scheduler.cfg | 20 --------------------
 lib/dart.star                |  3 +--
 lib/defaults.star            |  2 --
 main.star                    | 13 -------------
 6 files changed, 1 insertion(+), 81 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 857bd3cad8c1..a2502a70316a 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -7828,37 +7828,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-ffi-qemu-linux-release-arm-experimental"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:experimental"
-      dimensions: "os:Ubuntu-20"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-ffi-qemu-linux-release-arm-stable"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 154a8cd29753..374a88c6d6ca 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -1058,19 +1058,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "athom@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-ffi-qemu-linux-release-arm-experimental"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 63973ac538f8..1e2f512a82a9 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1934,16 +1934,6 @@ job {
     builder: "vm-ffi-qemu-linux-release-arm-beta"
   }
 }
-job {
-  id: "vm-ffi-qemu-linux-release-arm-experimental"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-ffi-qemu-linux-release-arm-experimental"
-  }
-}
 job {
   id: "vm-ffi-qemu-linux-release-arm-stable"
   realm: "ci.sandbox"
@@ -2746,16 +2736,6 @@ trigger {
     refs: "regexp:refs/heads/stable"
   }
 }
-trigger {
-  id: "dart-image-trigger"
-  realm: "ci"
-  schedule: "45 6 * * 1-5"
-  triggers: "vm-ffi-qemu-linux-release-arm-experimental"
-  gitiles {
-    repo: "https://dart.googlesource.com/sdk"
-    refs: "regexp:refs/heads/main"
-  }
-}
 trigger {
   id: "dart-nightly-trigger"
   realm: "ci"
diff --git a/lib/dart.star b/lib/dart.star
index 9dbc003f3c93..9b09cb4988c4 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -9,7 +9,6 @@ load("//lib/accounts.star", "accounts")
 load(
     "//lib/defaults.star",
     "defaults",
-    "focal",
     "jammy",
     "linux",
     "mac",
@@ -208,7 +207,7 @@ def _builder(
             fail("builder %s should be a %s builder but was %s" % (name, expected_os, os))
 
     expect_os("-win", [windows["os"], windows11["os"]])
-    expect_os("-linux", [linux["os"], focal["os"], jammy["os"], noble["os"]])
+    expect_os("-linux", [linux["os"], jammy["os"], noble["os"]])
     expect_os("-mac", mac["os"])
 
     cq_branches = ["main"] + [branch for branch in channels if branch != "try"]
diff --git a/lib/defaults.star b/lib/defaults.star
index 1cd92194dac0..750e0e465f2f 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -34,7 +34,6 @@ _SLOW_SHARDS = {"shard_timeout": (90 * time.minute) // time.second}
 
 _ARM64 = {"cpu": "arm64"}
 _MAC = {"os": "Mac"}
-_FOCAL = {"os": "Ubuntu-20"}
 _JAMMY = {"os": "Ubuntu-22"}
 _NOBLE = {"os": "Ubuntu-24"}
 _WINDOWS10 = {"os": "Windows-10"}
@@ -54,7 +53,6 @@ defaults = struct(
 arm64 = _ARM64
 experimental = _EXPERIMENTAL
 flutter_pool = _FLUTTER_POOL
-focal = _FOCAL
 jammy = _JAMMY
 linux = _JAMMY
 mac = _MAC
diff --git a/main.star b/main.star
index a47b43d04d48..0f11175944ea 100755
--- a/main.star
+++ b/main.star
@@ -12,12 +12,9 @@
 Generates the Luci configuration for the Dart project.
 """
 
-load("//lib/cron.star", "cron")
 load("//lib/dart.star", "dart")
 load(
     "//lib/defaults.star",
-    "experimental",
-    "focal",
     "js_engines",
     "no_caches",
 )
@@ -143,16 +140,6 @@ exec("//analyzer.star")
 # misc
 dart.ci_sandbox_builder("gclient", recipe = "dart/gclient", category = "misc|g")
 
-# Builders that test the dev Linux images. When the image autoroller detects
-# successful builds of these builders with a dev images, that dev image becomes
-# the new prod image. Newly created bots will than use the updated image.
-cron.image_builder(
-    "vm-ffi-qemu-linux-release-arm-experimental",
-    channels = [],
-    dimensions = [experimental, focal],
-    notifies = "infra",
-)
-
 dart.ci_sandbox_builder(
     "ci-test-data",
     channels = [],

From b7195b194cd27ab58d81a68152f986c77e710e34 Mon Sep 17 00:00:00 2001
From: Alexander Markov <alexmarkov@google.com>
Date: Wed, 2 Apr 2025 11:15:08 -0700
Subject: [PATCH 783/826] Add vm-aot-dyn-linux-debug-x64-try to CQ if
 pkg/dart2bytecode or pkg/dynamic_modules are changed

Change-Id: Ie7dcd22b92de64635cc7c9e4f19bf2658fbc0d82
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/419922
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Markov <alexmarkov@google.com>
---
 generated/commit-queue.cfg | 7 ++++++-
 lib/paths.star             | 5 +++++
 vm.star                    | 1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 45fd90510cec..2e0458102ee0 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -4255,7 +4255,12 @@ config_groups {
       }
       builders {
         name: "dart/try/vm-aot-dyn-linux-debug-x64-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "pkg/(dart2bytecode|dynamic_modules)/.+"
+        }
       }
       builders {
         name: "dart/try/vm-aot-linux-debug-simarm_x64-try"
diff --git a/lib/paths.star b/lib/paths.star
index b4938e33db69..c22e51d95334 100644
--- a/lib/paths.star
+++ b/lib/paths.star
@@ -48,6 +48,10 @@ _VM_PATHS = _CFE_PATHS + [
     "pkg/vm_service/.+",
 ]
 
+_DART2BYTECODE_PATHS = [
+    "pkg/(dart2bytecode|dynamic_modules)/.+",
+]
+
 _WEB_PATHS = _CFE_PATHS + [
     "sdk/lib/_js_interop/.+",
     "sdk/lib/_internal/js.+",
@@ -111,6 +115,7 @@ paths = struct(
     analyzer_nnbd = _ANALYZER_NNBD_PATHS,
     cfe = _CFE_PATHS,
     cfe_only = _CFE_PATHS_ONLY,
+    dart2bytecode = _DART2BYTECODE_PATHS,
     dart2js = _DART2JS_PATHS,
     dart2wasm = _DART2WASM_PATHS,
     ddc = _DDC_PATHS,
diff --git a/vm.star b/vm.star
index 95d7fd675500..197a29e16139 100644
--- a/vm.star
+++ b/vm.star
@@ -306,6 +306,7 @@ _nightly_builder(
     "vm-aot-dyn-linux-debug-x64",
     category = "vm|aot|dm",
     channels = ["try"],
+    location_filters = paths.to_location_filters(paths.dart2bytecode),
 )
 
 # vm|misc

From 099c4fcf0b162987a4725c262603ab5d3a507d0f Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Wed, 16 Apr 2025 12:51:28 -0700
Subject: [PATCH 784/826] [infra] Changes to utils/.*/BUILD.gn should also
 trigger default builds.

Change-Id: I8c27875d12d6f2a2dc12dbb4008519ecf8c1cef5
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/422843
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Ben Konyi <bkonyi@google.com>
Reviewed-by: Alexander Aprelev <aam@google.com>
---
 generated/commit-queue.cfg   | 282 +++++++++++++++++++++++++++++++++++
 generated/luci-scheduler.cfg |   7 +
 lib/paths.star               |   1 +
 3 files changed, 290 insertions(+)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 2e0458102ee0..144746951960 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -241,6 +241,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -334,6 +340,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -492,6 +504,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -625,6 +643,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -742,6 +766,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -863,6 +893,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -996,6 +1032,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1125,6 +1167,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1258,6 +1306,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1391,6 +1445,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1523,6 +1583,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1618,6 +1684,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -1807,6 +1879,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2016,6 +2094,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2165,6 +2249,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2441,6 +2531,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2534,6 +2630,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2699,6 +2801,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2816,6 +2924,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2949,6 +3063,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3066,6 +3186,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3187,6 +3313,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3320,6 +3452,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3449,6 +3587,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3582,6 +3726,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3723,6 +3873,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3860,6 +4016,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -3973,6 +4135,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -4084,6 +4252,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -4314,6 +4488,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -4619,6 +4799,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -4824,6 +5010,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -4979,6 +5171,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -5072,6 +5270,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -5230,6 +5434,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -5363,6 +5573,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -5480,6 +5696,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -5601,6 +5823,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -5734,6 +5962,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -5863,6 +6097,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -5996,6 +6236,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -6129,6 +6375,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -6261,6 +6513,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -6356,6 +6614,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -6545,6 +6809,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -6754,6 +7024,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -6903,6 +7179,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "BUILD.gn"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "utils/.*/BUILD.gn"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 1e2f512a82a9..2c70d5340da0 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -2838,6 +2838,7 @@ trigger {
     path_regexps: "DEPS"
     path_regexps: "build/.+"
     path_regexps: "BUILD.gn"
+    path_regexps: "utils/.*/BUILD.gn"
     path_regexps: "sdk_args.gni"
     path_regexps: "tools/gn.py"
     path_regexps: "tools/build.py"
@@ -2879,6 +2880,7 @@ trigger {
     path_regexps: "DEPS"
     path_regexps: "build/.+"
     path_regexps: "BUILD.gn"
+    path_regexps: "utils/.*/BUILD.gn"
     path_regexps: "sdk_args.gni"
     path_regexps: "tools/gn.py"
     path_regexps: "tools/build.py"
@@ -2913,6 +2915,7 @@ trigger {
     path_regexps: "DEPS"
     path_regexps: "build/.+"
     path_regexps: "BUILD.gn"
+    path_regexps: "utils/.*/BUILD.gn"
     path_regexps: "sdk_args.gni"
     path_regexps: "tools/gn.py"
     path_regexps: "tools/build.py"
@@ -2942,6 +2945,7 @@ trigger {
     path_regexps: "DEPS"
     path_regexps: "build/.+"
     path_regexps: "BUILD.gn"
+    path_regexps: "utils/.*/BUILD.gn"
     path_regexps: "sdk_args.gni"
     path_regexps: "tools/gn.py"
     path_regexps: "tools/build.py"
@@ -2978,6 +2982,7 @@ trigger {
     path_regexps: "DEPS"
     path_regexps: "build/.+"
     path_regexps: "BUILD.gn"
+    path_regexps: "utils/.*/BUILD.gn"
     path_regexps: "sdk_args.gni"
     path_regexps: "tools/gn.py"
     path_regexps: "tools/build.py"
@@ -3014,6 +3019,7 @@ trigger {
     path_regexps: "DEPS"
     path_regexps: "build/.+"
     path_regexps: "BUILD.gn"
+    path_regexps: "utils/.*/BUILD.gn"
     path_regexps: "sdk_args.gni"
     path_regexps: "tools/gn.py"
     path_regexps: "tools/build.py"
@@ -3044,6 +3050,7 @@ trigger {
     path_regexps: "DEPS"
     path_regexps: "build/.+"
     path_regexps: "BUILD.gn"
+    path_regexps: "utils/.*/BUILD.gn"
     path_regexps: "sdk_args.gni"
     path_regexps: "tools/gn.py"
     path_regexps: "tools/build.py"
diff --git a/lib/paths.star b/lib/paths.star
index c22e51d95334..2b7455a94057 100644
--- a/lib/paths.star
+++ b/lib/paths.star
@@ -12,6 +12,7 @@ _STANDARD_PATHS = [
     # build files
     "build/.+",
     "BUILD.gn",
+    "utils/.*/BUILD.gn",
     "sdk_args.gni",
     "tools/gn.py",
     "tools/build.py",

From 60dbd361b7b53d3003c73a98f86e091c3770f2cd Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Wed, 23 Apr 2025 14:53:48 -0700
Subject: [PATCH 785/826] Extend isolate stress testing to ARM64.

Change-Id: If86794653e917758a53d629e0f762fa1a4bf91c9
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/424080
Reviewed-by: Alexander Aprelev <aam@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/commit-queue.cfg   |  6 +++-
 generated/cr-buildbucket.cfg | 70 ++++++++++++++++++++++++++++++++++--
 generated/luci-milo.cfg      | 10 ++++--
 generated/luci-notify.cfg    | 15 +++++++-
 generated/luci-scheduler.cfg | 17 +++++++--
 main.star                    |  6 +++-
 vm.star                      |  9 ++++-
 7 files changed, 122 insertions(+), 11 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 144746951960..b08389d6fabb 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -4221,7 +4221,11 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/iso-stress-linux-try"
+        name: "dart/try/iso-stress-linux-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/iso-stress-linux-x64-try"
         includable_only: true
       }
       builders {
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index a2502a70316a..39f2a948f9be 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -4354,7 +4354,40 @@ buckets {
       }
     }
     builders {
-      name: "iso-stress-linux"
+      name: "iso-stress-linux-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "iso-stress-linux-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -11643,7 +11676,40 @@ buckets {
       }
     }
     builders {
-      name: "iso-stress-linux-try"
+      name: "iso-stress-linux-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "iso-stress-linux-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 35c4881f739a..566c8a84f8a2 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -302,7 +302,10 @@ consoles {
     name: "buildbucket/luci.dart.try/vm-ffi-mac-release-simarm64_arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/iso-stress-linux-try"
+    name: "buildbucket/luci.dart.try/iso-stress-linux-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/iso-stress-linux-arm64-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/pkg-linux-release-try"
@@ -2860,7 +2863,10 @@ consoles {
   id: "iso-stress"
   name: "VM Isolate Stress Test Console"
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/iso-stress-linux"
+    name: "buildbucket/luci.dart.ci.sandbox/iso-stress-linux-x64"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/iso-stress-linux-arm64"
   }
   builder_view_only: true
 }
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 374a88c6d6ca..81529526c8fa 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -432,7 +432,20 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "iso-stress-linux"
+    name: "iso-stress-linux-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "iso-stress-linux-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 2c70d5340da0..607557105727 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -915,13 +915,23 @@ job {
   }
 }
 job {
-  id: "iso-stress-linux"
+  id: "iso-stress-linux-arm64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "iso-stress-linux"
+    builder: "iso-stress-linux-arm64"
+  }
+}
+job {
+  id: "iso-stress-linux-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "iso-stress-linux-x64"
   }
 }
 job {
@@ -2744,6 +2754,7 @@ trigger {
   triggers: "ddc-hostasserts-linux-d8"
   triggers: "front-end-nnbd-mac-release-x64"
   triggers: "front-end-nnbd-win-release-x64"
+  triggers: "iso-stress-linux-arm64"
   triggers: "vm-aot-asan-linux-release-x64"
   triggers: "vm-aot-dwarf-linux-product-x64"
   triggers: "vm-aot-dyn-linux-debug-x64"
@@ -2796,7 +2807,7 @@ trigger {
 trigger {
   id: "dart-vm-gitiles-trigger-main"
   realm: "ci"
-  triggers: "iso-stress-linux"
+  triggers: "iso-stress-linux-x64"
   triggers: "vm-aot-android-release-arm64c"
   triggers: "vm-aot-android-release-arm_x64"
   triggers: "vm-aot-linux-debug-simarm_x64"
diff --git a/main.star b/main.star
index 0f11175944ea..44f4c6646123 100755
--- a/main.star
+++ b/main.star
@@ -189,7 +189,11 @@ luci.list_view_entry(
 
 # VM isolate stress test console
 luci.list_view_entry(
-    builder = "iso-stress-linux",
+    builder = "iso-stress-linux-x64",
+    list_view = "iso-stress",
+)
+luci.list_view_entry(
+    builder = "iso-stress-linux-arm64",
     list_view = "iso-stress",
 )
 
diff --git a/vm.star b/vm.star
index 197a29e16139..2563a4224510 100644
--- a/vm.star
+++ b/vm.star
@@ -510,8 +510,15 @@ _nightly_builder(
 
 # Isolate stress test builder
 _vm_builder(
-    "iso-stress-linux",
+    "iso-stress-linux-x64",
     channels = ["try"],
     notifies = "dart-vm-team",
     properties = slow_shards,
 )
+_nightly_builder(
+    "iso-stress-linux-arm64",
+    category = None,
+    channels = ["try"],
+    dimensions = [jammy, arm64],
+    properties = slow_shards,
+)

From 62fd1ba015564295521672d2df95e798908ace62 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Thu, 24 Apr 2025 08:00:13 -0700
Subject: [PATCH 786/826] Don't attempt to fetch non-existent RBE client on
 iso-stress-linux-arm64.

Change-Id: I3ae210f561f14ea89a330f5dc9097d61589a6418
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/424400
Reviewed-by: Alexander Aprelev <aam@google.com>
Commit-Queue: Alexander Aprelev <aam@google.com>
---
 generated/cr-buildbucket.cfg | 16 ++++++++++++++--
 vm.star                      |  3 ++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 39f2a948f9be..995ebdbcdb14 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -4367,6 +4367,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4374,7 +4377,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "download_reclient": false'
+        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -11689,6 +11695,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11696,7 +11705,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "download_reclient": false'
+        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
diff --git a/vm.star b/vm.star
index 2563a4224510..44de4da18a92 100644
--- a/vm.star
+++ b/vm.star
@@ -520,5 +520,6 @@ _nightly_builder(
     category = None,
     channels = ["try"],
     dimensions = [jammy, arm64],
-    properties = slow_shards,
+    properties = [slow_shards, {"clobber": False}, no_reclient],
+    rbe = False,  # b/306641265
 )

From 2787acc990af6a684d85a611b75b6dc2bbe42c00 Mon Sep 17 00:00:00 2001
From: Alexander Markov <alexmarkov@google.com>
Date: Fri, 2 May 2025 08:10:44 -0700
Subject: [PATCH 787/826] Add nightly bot for testing dynamic modules in JIT
 mode

Change-Id: I651440e8ce79824462c56f7efa92c956ad757018
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/425342
Commit-Queue: Alexander Markov <alexmarkov@google.com>
Reviewed-by: Sigmund Cherem <sigmund@google.com>
---
 generated/commit-queue.cfg   |  4 +++
 generated/cr-buildbucket.cfg | 64 ++++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      | 39 ++++++++++++++--------
 generated/luci-notify.cfg    | 13 ++++++++
 generated/luci-scheduler.cfg | 11 +++++++
 vm.star                      | 18 ++++++----
 6 files changed, 130 insertions(+), 19 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index b08389d6fabb..de6da872f0e5 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -4687,6 +4687,10 @@ config_groups {
         name: "dart/try/vm-checked-mac-release-arm64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-dyn-linux-debug-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-eager-optimization-linux-release-ia32-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 995ebdbcdb14..4f65336962e6 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -7056,6 +7056,38 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-dyn-linux-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-eager-optimization-linux-release-ia32"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13170,6 +13202,38 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-dyn-linux-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-eager-optimization-linux-release-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 566c8a84f8a2..b83382f41997 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -187,9 +187,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-dwarf-linux-product-x64-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-aot-dyn-linux-debug-x64-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-eager-optimization-linux-release-ia32-try"
   }
@@ -271,6 +268,12 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-msvc-windows-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-aot-dyn-linux-debug-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-dyn-linux-debug-x64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm-try"
   }
@@ -847,11 +850,6 @@ consoles {
     category: "vm|aot"
     short_name: "dw"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-dyn-linux-debug-x64"
-    category: "vm|aot"
-    short_name: "dm"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-eager-optimization-linux-release-ia32"
     category: "vm|misc"
@@ -987,6 +985,16 @@ consoles {
     category: "vm|misc"
     short_name: "m"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-dyn-linux-debug-x64"
+    category: "vm|misc"
+    short_name: "dm"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dyn-linux-debug-x64"
+    category: "vm|misc"
+    short_name: "dm"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
     category: "vm|ffi"
@@ -1701,11 +1709,6 @@ consoles {
     category: "vm|aot"
     short_name: "dw"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-dyn-linux-debug-x64"
-    category: "vm|aot"
-    short_name: "dm"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-eager-optimization-linux-release-ia32"
     category: "vm|misc"
@@ -1841,6 +1844,16 @@ consoles {
     category: "vm|misc"
     short_name: "m"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-dyn-linux-debug-x64"
+    category: "vm|misc"
+    short_name: "dm"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dyn-linux-debug-x64"
+    category: "vm|misc"
+    short_name: "dm"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
     category: "vm|ffi"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 81529526c8fa..c54de6ba226c 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -944,6 +944,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-dyn-linux-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 607557105727..8d4ab60bdf0e 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1704,6 +1704,16 @@ job {
     builder: "vm-checked-mac-release-arm64-stable"
   }
 }
+job {
+  id: "vm-dyn-linux-debug-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-dyn-linux-debug-x64"
+  }
+}
 job {
   id: "vm-eager-optimization-linux-release-ia32"
   realm: "ci.sandbox"
@@ -2777,6 +2787,7 @@ trigger {
   triggers: "vm-appjit-linux-product-x64"
   triggers: "vm-asan-linux-release-arm64"
   triggers: "vm-asan-linux-release-x64"
+  triggers: "vm-dyn-linux-debug-x64"
   triggers: "vm-eager-optimization-linux-release-ia32"
   triggers: "vm-eager-optimization-linux-release-x64"
   triggers: "vm-ffi-mac-release-simarm64_arm64"
diff --git a/vm.star b/vm.star
index 44de4da18a92..77f8a94aa0a2 100644
--- a/vm.star
+++ b/vm.star
@@ -302,12 +302,6 @@ _nightly_builder(
     "vm-aot-dwarf-linux-product-x64",
     category = "vm|aot|dw",
 )
-_nightly_builder(
-    "vm-aot-dyn-linux-debug-x64",
-    category = "vm|aot|dm",
-    channels = ["try"],
-    location_filters = paths.to_location_filters(paths.dart2bytecode),
-)
 
 # vm|misc
 _nightly_builder(
@@ -454,6 +448,18 @@ _nightly_builder(
     rbe = False,
 )
 
+_nightly_builder(
+    "vm-aot-dyn-linux-debug-x64",
+    category = "vm|misc|dm",
+    channels = ["try"],
+    location_filters = paths.to_location_filters(paths.dart2bytecode),
+)
+_nightly_builder(
+    "vm-dyn-linux-debug-x64",
+    category = "vm|misc|dm",
+    channels = ["try"],
+)
+
 # vm|ffi
 _vm_builder(
     "vm-ffi-android-debug-arm",

From 0e826e8757316ba78d7c1c8772f3cb2851ee7236 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Wed, 7 May 2025 14:33:38 -0700
Subject: [PATCH 788/826] [infra] Refactor X64 sanitizer builders to match
 ARM64.

Add builders for ASAN on Mac and Windows.

Combine reload and reload rollback into one builder.

Change-Id: I7e23ece705ac546c470ef110fcd7a3b1634d8bc2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/427320
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Aprelev <aam@google.com>
---
 generated/commit-queue.cfg   |  32 +--
 generated/cr-buildbucket.cfg | 520 +++++++++--------------------------
 generated/luci-milo.cfg      |  86 ++----
 generated/luci-notify.cfg    |  94 ++-----
 generated/luci-scheduler.cfg |  88 ++----
 generated/project.cfg        |   2 +-
 vm.star                      |  30 +-
 7 files changed, 214 insertions(+), 638 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index de6da872f0e5..ad528d9f57f4 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -4423,10 +4423,6 @@ config_groups {
         name: "dart/try/vm-aot-android-release-arm_x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-aot-asan-linux-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-aot-dwarf-linux-product-x64-try"
         includable_only: true
@@ -4619,10 +4615,6 @@ config_groups {
         name: "dart/try/vm-aot-mac-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-aot-msan-linux-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-aot-obfuscate-linux-release-x64-try"
         includable_only: true
@@ -4631,14 +4623,6 @@ config_groups {
         name: "dart/try/vm-aot-optimization-level-linux-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-aot-tsan-linux-release-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-aot-ubsan-linux-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-aot-win-debug-arm64-try"
         includable_only: true
@@ -4683,6 +4667,14 @@ config_groups {
         name: "dart/try/vm-asan-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-asan-mac-release-x64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-asan-win-release-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-checked-mac-release-arm64-try"
         includable_only: true
@@ -4954,14 +4946,6 @@ config_groups {
         name: "dart/try/vm-reload-linux-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-reload-rollback-linux-debug-x64-try"
-        includable_only: true
-      }
-      builders {
-        name: "dart/try/vm-reload-rollback-linux-release-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-tsan-linux-release-arm64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 4f65336962e6..741285735f02 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5319,38 +5319,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-aot-asan-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-aot-dwarf-linux-product-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -6164,38 +6132,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-aot-msan-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-aot-obfuscate-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -6260,70 +6196,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-aot-tsan-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-aot-ubsan-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-aot-win-debug-arm64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -6948,6 +6820,75 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-asan-mac-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-asan-win-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-checked-mac-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -9353,70 +9294,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-reload-rollback-linux-debug-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-reload-rollback-linux-release-x64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-tsan-linux-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -12139,38 +12016,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-aot-asan-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-aot-dwarf-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -12643,7 +12488,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-msan-linux-release-x64-try"
+      name: "vm-aot-obfuscate-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12675,7 +12520,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-obfuscate-linux-release-x64-try"
+      name: "vm-aot-optimization-level-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12707,12 +12552,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-optimization-level-linux-release-x64-try"
+      name: "vm-aot-win-debug-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
@@ -12720,6 +12564,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12727,7 +12574,10 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "download_reclient": false'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12739,11 +12589,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-tsan-linux-release-x64-try"
+      name: "vm-aot-win-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12760,7 +12610,8 @@ buckets {
         '  },'
         '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -12771,11 +12622,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-ubsan-linux-release-x64-try"
+      name: "vm-aot-win-debug-x64c-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12792,44 +12643,8 @@ buckets {
         '  },'
         '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-aot-win-debug-arm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.prod"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_reclient": false'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -12840,7 +12655,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-win-debug-x64-try"
+      name: "vm-aot-win-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12861,8 +12676,7 @@ buckets {
         '  },'
         '  "bisection_enabled": true,'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -12873,12 +12687,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-win-debug-x64c-try"
+      name: "vm-aot-win-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
+      dimensions: "cpu:arm64"
+      dimensions: "os:Windows-11"
+      dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
@@ -12886,16 +12699,20 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "download_reclient": false'
+        '  },'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -12906,7 +12723,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-win-product-x64-try"
+      name: "vm-aot-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -12925,7 +12742,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -12938,11 +12754,12 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-win-release-arm64-try"
+      name: "vm-appjit-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
-      dimensions: "pool:luci.flutter.prod"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
         cipd_version: "refs/heads/main"
@@ -12950,20 +12767,15 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_reclient": false'
-        '  },'
-        '  "recipe": "dart/neo"'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
         '}'
       priority: 30
       build_numbers: YES
@@ -12974,11 +12786,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-aot-win-release-x64-try"
+      name: "vm-appjit-linux-product-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12993,6 +12805,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -13005,7 +12818,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-debug-x64-try"
+      name: "vm-appjit-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13025,8 +12838,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -13037,9 +12849,9 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-product-x64-try"
+      name: "vm-asan-linux-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Ubuntu-22"
       dimensions: "pool:luci.dart.try"
@@ -13050,6 +12862,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13057,7 +12872,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13069,7 +12884,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-appjit-linux-release-x64-try"
+      name: "vm-asan-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -13088,6 +12903,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
@@ -13100,11 +12916,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-asan-linux-release-arm64-try"
+      name: "vm-asan-mac-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
+      dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
+      dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13113,9 +12929,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13123,10 +12936,15 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
+      }
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -13135,11 +12953,11 @@ buckets {
       }
     }
     builders {
-      name: "vm-asan-linux-release-x64-try"
+      name: "vm-asan-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
+      dimensions: "os:Windows-10"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14347,70 +14165,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-reload-rollback-linux-debug-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-reload-rollback-linux-release-x64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-tsan-linux-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index b83382f41997..18a08ace8fdb 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -200,25 +200,19 @@ consoles {
     name: "buildbucket/luci.dart.try/vm-asan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-msan-linux-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-tsan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-asan-mac-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-ubsan-linux-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-aot-asan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-asan-win-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-aot-msan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-msan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-aot-tsan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-tsan-linux-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-aot-ubsan-linux-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-ubsan-linux-release-x64-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-asan-linux-release-arm64-try"
@@ -238,12 +232,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-reload-linux-release-x64-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-reload-rollback-linux-debug-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-reload-rollback-linux-release-x64-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-linux-debug-x64c-try"
   }
@@ -871,37 +859,27 @@ consoles {
     short_name: "a"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-msan-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-mac-release-x64"
     category: "vm|misc|sanitizer"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-tsan-linux-release-x64"
-    category: "vm|misc|sanitizer"
-    short_name: "t"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ubsan-linux-release-x64"
-    category: "vm|misc|sanitizer"
-    short_name: "u"
+    short_name: "a"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-asan-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-win-release-x64"
     category: "vm|misc|sanitizer"
     short_name: "a"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-msan-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-msan-linux-release-x64"
     category: "vm|misc|sanitizer"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-tsan-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-tsan-linux-release-x64"
     category: "vm|misc|sanitizer"
     short_name: "t"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-ubsan-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ubsan-linux-release-x64"
     category: "vm|misc|sanitizer"
     short_name: "u"
   }
@@ -935,16 +913,6 @@ consoles {
     category: "vm|misc|reload"
     short_name: "r"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-debug-x64"
-    category: "vm|misc|reload"
-    short_name: "drb"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-release-x64"
-    category: "vm|misc|reload"
-    short_name: "rrb"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64c"
     category: "vm|misc|compressed"
@@ -1730,37 +1698,27 @@ consoles {
     short_name: "a"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-msan-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-mac-release-x64"
     category: "vm|misc|sanitizer"
-    short_name: "m"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-tsan-linux-release-x64"
-    category: "vm|misc|sanitizer"
-    short_name: "t"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ubsan-linux-release-x64"
-    category: "vm|misc|sanitizer"
-    short_name: "u"
+    short_name: "a"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-asan-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-win-release-x64"
     category: "vm|misc|sanitizer"
     short_name: "a"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-msan-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-msan-linux-release-x64"
     category: "vm|misc|sanitizer"
     short_name: "m"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-tsan-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-tsan-linux-release-x64"
     category: "vm|misc|sanitizer"
     short_name: "t"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-ubsan-linux-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ubsan-linux-release-x64"
     category: "vm|misc|sanitizer"
     short_name: "u"
   }
@@ -1794,16 +1752,6 @@ consoles {
     category: "vm|misc|reload"
     short_name: "r"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-debug-x64"
-    category: "vm|misc|reload"
-    short_name: "drb"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-reload-rollback-linux-release-x64"
-    category: "vm|misc|reload"
-    short_name: "rrb"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-x64c"
     category: "vm|misc|compressed"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index c54de6ba226c..42e42437aac1 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -548,19 +548,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-aot-asan-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -733,19 +720,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-aot-msan-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -781,7 +755,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-aot-tsan-linux-release-x64"
+    name: "vm-aot-win-debug-arm64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -794,7 +768,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-aot-ubsan-linux-release-x64"
+    name: "vm-aot-win-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -807,7 +781,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-aot-win-debug-arm64"
+    name: "vm-aot-win-debug-x64c"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -820,33 +794,29 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-aot-win-debug-x64"
+    name: "vm-aot-win-product-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-aot-win-debug-x64c"
+    name: "vm-aot-win-release-arm64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-aot-win-product-x64"
+    name: "vm-aot-win-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -857,18 +827,20 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-aot-win-release-arm64"
+    name: "vm-appjit-linux-debug-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-aot-win-release-x64"
+    name: "vm-appjit-linux-product-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -879,7 +851,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-appjit-linux-debug-x64"
+    name: "vm-appjit-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -892,18 +864,20 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-appjit-linux-product-x64"
+    name: "vm-asan-linux-release-arm64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-appjit-linux-release-x64"
+    name: "vm-asan-linux-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -916,7 +890,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-asan-linux-release-arm64"
+    name: "vm-asan-mac-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -929,7 +903,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-asan-linux-release-x64"
+    name: "vm-asan-win-release-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1346,32 +1320,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-reload-rollback-linux-debug-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-reload-rollback-linux-release-x64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 8d4ab60bdf0e..9062ae782b85 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1184,16 +1184,6 @@ job {
     builder: "vm-aot-android-release-arm_x64-stable"
   }
 }
-job {
-  id: "vm-aot-asan-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-aot-asan-linux-release-x64"
-  }
-}
 job {
   id: "vm-aot-dwarf-linux-product-x64"
   realm: "ci.sandbox"
@@ -1434,16 +1424,6 @@ job {
     builder: "vm-aot-mac-release-x64-stable"
   }
 }
-job {
-  id: "vm-aot-msan-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-aot-msan-linux-release-x64"
-  }
-}
 job {
   id: "vm-aot-obfuscate-linux-release-x64"
   realm: "ci.sandbox"
@@ -1464,26 +1444,6 @@ job {
     builder: "vm-aot-optimization-level-linux-release-x64"
   }
 }
-job {
-  id: "vm-aot-tsan-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-aot-tsan-linux-release-x64"
-  }
-}
-job {
-  id: "vm-aot-ubsan-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-aot-ubsan-linux-release-x64"
-  }
-}
 job {
   id: "vm-aot-win-debug-arm64"
   realm: "ci.sandbox"
@@ -1674,6 +1634,26 @@ job {
     builder: "vm-asan-linux-release-x64"
   }
 }
+job {
+  id: "vm-asan-mac-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-asan-mac-release-x64"
+  }
+}
+job {
+  id: "vm-asan-win-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-asan-win-release-x64"
+  }
+}
 job {
   id: "vm-checked-mac-release-arm64"
   realm: "ci.sandbox"
@@ -2384,26 +2364,6 @@ job {
     builder: "vm-reload-linux-release-x64"
   }
 }
-job {
-  id: "vm-reload-rollback-linux-debug-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-reload-rollback-linux-debug-x64"
-  }
-}
-job {
-  id: "vm-reload-rollback-linux-release-x64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-reload-rollback-linux-release-x64"
-  }
-}
 job {
   id: "vm-tsan-linux-release-arm64"
   realm: "ci.sandbox"
@@ -2765,7 +2725,6 @@ trigger {
   triggers: "front-end-nnbd-mac-release-x64"
   triggers: "front-end-nnbd-win-release-x64"
   triggers: "iso-stress-linux-arm64"
-  triggers: "vm-aot-asan-linux-release-x64"
   triggers: "vm-aot-dwarf-linux-product-x64"
   triggers: "vm-aot-dyn-linux-debug-x64"
   triggers: "vm-aot-linux-debug-simriscv32"
@@ -2775,11 +2734,8 @@ trigger {
   triggers: "vm-aot-linux-product-x64"
   triggers: "vm-aot-linux-release-arm64"
   triggers: "vm-aot-mac-product-arm64"
-  triggers: "vm-aot-msan-linux-release-x64"
   triggers: "vm-aot-obfuscate-linux-release-x64"
   triggers: "vm-aot-optimization-level-linux-release-x64"
-  triggers: "vm-aot-tsan-linux-release-x64"
-  triggers: "vm-aot-ubsan-linux-release-x64"
   triggers: "vm-aot-win-debug-arm64"
   triggers: "vm-aot-win-debug-x64"
   triggers: "vm-aot-win-debug-x64c"
@@ -2787,6 +2743,8 @@ trigger {
   triggers: "vm-appjit-linux-product-x64"
   triggers: "vm-asan-linux-release-arm64"
   triggers: "vm-asan-linux-release-x64"
+  triggers: "vm-asan-mac-release-x64"
+  triggers: "vm-asan-win-release-x64"
   triggers: "vm-dyn-linux-debug-x64"
   triggers: "vm-eager-optimization-linux-release-ia32"
   triggers: "vm-eager-optimization-linux-release-x64"
@@ -2801,8 +2759,6 @@ trigger {
   triggers: "vm-msvc-windows"
   triggers: "vm-reload-linux-debug-x64"
   triggers: "vm-reload-linux-release-x64"
-  triggers: "vm-reload-rollback-linux-debug-x64"
-  triggers: "vm-reload-rollback-linux-release-x64"
   triggers: "vm-tsan-linux-release-arm64"
   triggers: "vm-tsan-linux-release-x64"
   triggers: "vm-ubsan-linux-release-arm64"
diff --git a/generated/project.cfg b/generated/project.cfg
index ee57ff502f68..d8c4b18031f2 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.44.1"
+  version: "1.45.0"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/vm.star b/vm.star
index 77f8a94aa0a2..ffc976284ba5 100644
--- a/vm.star
+++ b/vm.star
@@ -322,31 +322,25 @@ _nightly_builder(
     category = "vm|misc|sanitizer|a",
 )
 _nightly_builder(
-    "vm-msan-linux-release-x64",
-    category = "vm|misc|sanitizer|m",
-)
-_nightly_builder(
-    "vm-tsan-linux-release-x64",
-    category = "vm|misc|sanitizer|t",
-)
-_nightly_builder(
-    "vm-ubsan-linux-release-x64",
-    category = "vm|misc|sanitizer|u",
+    "vm-asan-mac-release-x64",
+    category = "vm|misc|sanitizer|a",
+    dimensions = [mac],
 )
 _nightly_builder(
-    "vm-aot-asan-linux-release-x64",
+    "vm-asan-win-release-x64",
     category = "vm|misc|sanitizer|a",
+    dimensions = [windows],
 )
 _nightly_builder(
-    "vm-aot-msan-linux-release-x64",
+    "vm-msan-linux-release-x64",
     category = "vm|misc|sanitizer|m",
 )
 _nightly_builder(
-    "vm-aot-tsan-linux-release-x64",
+    "vm-tsan-linux-release-x64",
     category = "vm|misc|sanitizer|t",
 )
 _nightly_builder(
-    "vm-aot-ubsan-linux-release-x64",
+    "vm-ubsan-linux-release-x64",
     category = "vm|misc|sanitizer|u",
 )
 _nightly_builder(
@@ -385,14 +379,6 @@ _nightly_builder(
     "vm-reload-linux-release-x64",
     category = "vm|misc|reload|r",
 )
-_nightly_builder(
-    "vm-reload-rollback-linux-debug-x64",
-    category = "vm|misc|reload|drb",
-)
-_nightly_builder(
-    "vm-reload-rollback-linux-release-x64",
-    category = "vm|misc|reload|rrb",
-)
 _nightly_builder(
     "vm-linux-debug-x64c",
     category = "vm|misc|compressed|jl",

From 1ea854b0b7d45e1883f0bdea4ac357bd00034950 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Wed, 7 May 2025 14:51:13 -0700
Subject: [PATCH 789/826] [infra] Trigger analyzer-analysis-server-linux on
 changes to Observatory or the isolate stress test generator.

Change-Id: I8d57758d65407dc0cb1424135ecb858e24ae43af
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/427342
Reviewed-by: Paul Berry <paulberry@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/commit-queue.cfg | 84 ++++++++++++++++++++++++++++++++++++++
 lib/paths.star             |  4 +-
 2 files changed, 87 insertions(+), 1 deletion(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index ad528d9f57f4..9501805387ce 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -313,6 +313,18 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "pkg/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "runtime/observatory/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "runtime/tests/concurrency/.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -412,6 +424,18 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "pkg/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "runtime/observatory/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "runtime/tests/concurrency/.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2603,6 +2627,18 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "pkg/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "runtime/observatory/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "runtime/tests/concurrency/.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -2702,6 +2738,18 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "pkg/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "runtime/observatory/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "runtime/tests/concurrency/.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -4088,6 +4136,18 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "pkg/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "runtime/observatory/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "runtime/tests/concurrency/.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -5235,6 +5295,18 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "pkg/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "runtime/observatory/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "runtime/tests/concurrency/.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
@@ -5334,6 +5406,18 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "pkg/.+"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "runtime/observatory/.+"
+        }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "runtime/tests/concurrency/.+"
+        }
         location_filters {
           gerrit_host_regexp: ".*"
           gerrit_project_regexp: ".*"
diff --git a/lib/paths.star b/lib/paths.star
index 2b7455a94057..d13c0cd8695c 100644
--- a/lib/paths.star
+++ b/lib/paths.star
@@ -82,7 +82,9 @@ _ANALYZER_NNBD_PATHS = _STANDARD_PATHS + [
 _ANALYZER_PATHS = _STANDARD_PATHS + [
     # "analyzer" bots analyze everything under pkg
     "pkg/.+",
-    # "analyzer-analysis-server-linux" bot also analyzes dartfuzz
+    # "analyzer-analysis-server-linux" bot also analyzes dartfuzz, observatory and iso-stress
+    "runtime/observatory/.+",
+    "runtime/tests/concurrency/.+",
     "runtime/tools/dartfuzz/.+",
 ]
 

From a8f60b64f265145262a856768a5bdb0be678858e Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 12 May 2025 15:58:43 -0700
Subject: [PATCH 790/826] [infra] Disable presubmit-try for the dart_ci
 repository.

The presubmit script in this repository assumes `dart` is on the PATH, which is only true locally.

Change-Id: Id042c2862ed597e1cb33765a623977831db64305
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/428220
Reviewed-by: Alexander Aprelev <aam@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 cq.star                    | 10 +++++++---
 generated/commit-queue.cfg |  7 -------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/cq.star b/cq.star
index 586096cede70..cb8682a7e308 100644
--- a/cq.star
+++ b/cq.star
@@ -48,17 +48,21 @@ luci.cq_group(
     verifiers = default_verifiers(),
 )
 
-def basic_cq(repository, extra_verifies = []):
+def basic_cq(repository, extra_verifies = [], include_default_verifiers = True):
     luci.cq_group(
         name = repository,
         watch = cq.refset(DART_GERRIT + repository, refs = ["refs/heads/main"]),
         allow_submit_with_open_deps = True,
         tree_status_name = "dart",
         retry_config = cq.RETRY_NONE,
-        verifiers = default_verifiers() + extra_verifies,
+        verifiers = (default_verifiers() if include_default_verifiers else []) + extra_verifies,
     )
 
-basic_cq("dart_ci")
+basic_cq(
+    "dart_ci",
+    # The PRESUBMIT.py in this repo assumes `dart` is available on PATH, which is only true locally.
+    include_default_verifiers = False,
+)
 basic_cq("dart-docker", [
     luci.cq_tryjob_verifier(
         builder = "docker-try",
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 9501805387ce..eb17effba307 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -59,13 +59,6 @@ config_groups {
     tree_status {
       tree_name: "dart"
     }
-    tryjob {
-      builders {
-        name: "dart/try.shared/presubmit-try"
-        disable_reuse: true
-      }
-      retry_config {}
-    }
   }
 }
 config_groups {

From cd7eeb4276085ca51bfaf1ccbb8a80f309b37b23 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 19 May 2025 09:04:45 -0700
Subject: [PATCH 791/826] [infra] Add link for flaky tests dashboard next to
 the other test links.

Change-Id: If8ca3b5a6fee5d8936cc2257d3e9c770091766dd
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/429224
Reviewed-by: Alexander Aprelev <aam@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 console-header.textpb   |  16 ++++++-
 generated/luci-milo.cfg | 104 ++++++++++++++++++++++++++++++++++++----
 2 files changed, 111 insertions(+), 9 deletions(-)

diff --git a/console-header.textpb b/console-header.textpb
index e3bcf5597c04..c3db8ee0d53e 100644
--- a/console-header.textpb
+++ b/console-header.textpb
@@ -20,6 +20,10 @@ links: {
         url: "/p/dart/g/cq/builders"
         alt: "SDK CQ Status"
     }
+}
+
+links: {
+    name: "Tests"
     links: {
         text: "Results Feed"
         url: "https://dart-ci.firebaseapp.com/"
@@ -30,16 +34,26 @@ links: {
         url: "https://dart-ci.firebaseapp.com/current_results/"
         alt: "Current Test Results"
     }
+    links: {
+        text: "Flaky Tests"
+        url: "https://goto.google.com/dart-vm-flakiness/"
+        alt: "Flaky Tests"
+    }
+}
+
+links: {
+    name: "Resources"
     links: {
         text: "Dart Infrastructure Chat"
         url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
         alt: "Dart Infrastructure Chat"
     }
 }
+
 console_groups: {
     console_ids: "dart/dart-fuzz"
+    console_ids: "dart/iso-stress"
     console_ids: "dart/flutter-engine"
     console_ids: "dart/flutter-web"
-    console_ids: "dart/iso-stress"
 }
 tree_name: "dart"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 18a08ace8fdb..bbbe199959f1 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -1186,6 +1186,9 @@ consoles {
         url: "/p/dart/g/cq/builders"
         alt: "SDK CQ Status"
       }
+    }
+    links {
+      name: "Tests"
       links {
         text: "Results Feed"
         url: "https://dart-ci.firebaseapp.com/"
@@ -1196,6 +1199,14 @@ consoles {
         url: "https://dart-ci.firebaseapp.com/current_results/"
         alt: "Current Test Results"
       }
+      links {
+        text: "Flaky Tests"
+        url: "https://goto.google.com/dart-vm-flakiness/"
+        alt: "Flaky Tests"
+      }
+    }
+    links {
+      name: "Resources"
       links {
         text: "Dart Infrastructure Chat"
         url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
@@ -1204,9 +1215,9 @@ consoles {
     }
     console_groups {
       console_ids: "dart/dart-fuzz"
+      console_ids: "dart/iso-stress"
       console_ids: "dart/flutter-engine"
       console_ids: "dart/flutter-web"
-      console_ids: "dart/iso-stress"
     }
     tree_name: "dart"
   }
@@ -1875,6 +1886,9 @@ consoles {
         url: "/p/dart/g/cq/builders"
         alt: "SDK CQ Status"
       }
+    }
+    links {
+      name: "Tests"
       links {
         text: "Results Feed"
         url: "https://dart-ci.firebaseapp.com/"
@@ -1885,6 +1899,14 @@ consoles {
         url: "https://dart-ci.firebaseapp.com/current_results/"
         alt: "Current Test Results"
       }
+      links {
+        text: "Flaky Tests"
+        url: "https://goto.google.com/dart-vm-flakiness/"
+        alt: "Flaky Tests"
+      }
+    }
+    links {
+      name: "Resources"
       links {
         text: "Dart Infrastructure Chat"
         url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
@@ -1893,9 +1915,9 @@ consoles {
     }
     console_groups {
       console_ids: "dart/dart-fuzz"
+      console_ids: "dart/iso-stress"
       console_ids: "dart/flutter-engine"
       console_ids: "dart/flutter-web"
-      console_ids: "dart/iso-stress"
     }
     tree_name: "dart"
   }
@@ -1969,6 +1991,9 @@ consoles {
         url: "/p/dart/g/cq/builders"
         alt: "SDK CQ Status"
       }
+    }
+    links {
+      name: "Tests"
       links {
         text: "Results Feed"
         url: "https://dart-ci.firebaseapp.com/"
@@ -1979,6 +2004,14 @@ consoles {
         url: "https://dart-ci.firebaseapp.com/current_results/"
         alt: "Current Test Results"
       }
+      links {
+        text: "Flaky Tests"
+        url: "https://goto.google.com/dart-vm-flakiness/"
+        alt: "Flaky Tests"
+      }
+    }
+    links {
+      name: "Resources"
       links {
         text: "Dart Infrastructure Chat"
         url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
@@ -1987,9 +2020,9 @@ consoles {
     }
     console_groups {
       console_ids: "dart/dart-fuzz"
+      console_ids: "dart/iso-stress"
       console_ids: "dart/flutter-engine"
       console_ids: "dart/flutter-web"
-      console_ids: "dart/iso-stress"
     }
     tree_name: "dart"
   }
@@ -2378,6 +2411,9 @@ consoles {
         url: "/p/dart/g/cq/builders"
         alt: "SDK CQ Status"
       }
+    }
+    links {
+      name: "Tests"
       links {
         text: "Results Feed"
         url: "https://dart-ci.firebaseapp.com/"
@@ -2388,6 +2424,14 @@ consoles {
         url: "https://dart-ci.firebaseapp.com/current_results/"
         alt: "Current Test Results"
       }
+      links {
+        text: "Flaky Tests"
+        url: "https://goto.google.com/dart-vm-flakiness/"
+        alt: "Flaky Tests"
+      }
+    }
+    links {
+      name: "Resources"
       links {
         text: "Dart Infrastructure Chat"
         url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
@@ -2396,9 +2440,9 @@ consoles {
     }
     console_groups {
       console_ids: "dart/dart-fuzz"
+      console_ids: "dart/iso-stress"
       console_ids: "dart/flutter-engine"
       console_ids: "dart/flutter-web"
-      console_ids: "dart/iso-stress"
     }
     tree_name: "dart"
   }
@@ -2787,6 +2831,9 @@ consoles {
         url: "/p/dart/g/cq/builders"
         alt: "SDK CQ Status"
       }
+    }
+    links {
+      name: "Tests"
       links {
         text: "Results Feed"
         url: "https://dart-ci.firebaseapp.com/"
@@ -2797,6 +2844,14 @@ consoles {
         url: "https://dart-ci.firebaseapp.com/current_results/"
         alt: "Current Test Results"
       }
+      links {
+        text: "Flaky Tests"
+        url: "https://goto.google.com/dart-vm-flakiness/"
+        alt: "Flaky Tests"
+      }
+    }
+    links {
+      name: "Resources"
       links {
         text: "Dart Infrastructure Chat"
         url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
@@ -2805,9 +2860,9 @@ consoles {
     }
     console_groups {
       console_ids: "dart/dart-fuzz"
+      console_ids: "dart/iso-stress"
       console_ids: "dart/flutter-engine"
       console_ids: "dart/flutter-web"
-      console_ids: "dart/iso-stress"
     }
     tree_name: "dart"
   }
@@ -3030,6 +3085,9 @@ consoles {
         url: "/p/dart/g/cq/builders"
         alt: "SDK CQ Status"
       }
+    }
+    links {
+      name: "Tests"
       links {
         text: "Results Feed"
         url: "https://dart-ci.firebaseapp.com/"
@@ -3040,6 +3098,14 @@ consoles {
         url: "https://dart-ci.firebaseapp.com/current_results/"
         alt: "Current Test Results"
       }
+      links {
+        text: "Flaky Tests"
+        url: "https://goto.google.com/dart-vm-flakiness/"
+        alt: "Flaky Tests"
+      }
+    }
+    links {
+      name: "Resources"
       links {
         text: "Dart Infrastructure Chat"
         url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
@@ -3048,9 +3114,9 @@ consoles {
     }
     console_groups {
       console_ids: "dart/dart-fuzz"
+      console_ids: "dart/iso-stress"
       console_ids: "dart/flutter-engine"
       console_ids: "dart/flutter-web"
-      console_ids: "dart/iso-stress"
     }
     tree_name: "dart"
   }
@@ -3177,6 +3243,9 @@ consoles {
         url: "/p/dart/g/cq/builders"
         alt: "SDK CQ Status"
       }
+    }
+    links {
+      name: "Tests"
       links {
         text: "Results Feed"
         url: "https://dart-ci.firebaseapp.com/"
@@ -3187,6 +3256,14 @@ consoles {
         url: "https://dart-ci.firebaseapp.com/current_results/"
         alt: "Current Test Results"
       }
+      links {
+        text: "Flaky Tests"
+        url: "https://goto.google.com/dart-vm-flakiness/"
+        alt: "Flaky Tests"
+      }
+    }
+    links {
+      name: "Resources"
       links {
         text: "Dart Infrastructure Chat"
         url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
@@ -3195,9 +3272,9 @@ consoles {
     }
     console_groups {
       console_ids: "dart/dart-fuzz"
+      console_ids: "dart/iso-stress"
       console_ids: "dart/flutter-engine"
       console_ids: "dart/flutter-web"
-      console_ids: "dart/iso-stress"
     }
     tree_name: "dart"
   }
@@ -3276,6 +3353,9 @@ consoles {
         url: "/p/dart/g/cq/builders"
         alt: "SDK CQ Status"
       }
+    }
+    links {
+      name: "Tests"
       links {
         text: "Results Feed"
         url: "https://dart-ci.firebaseapp.com/"
@@ -3286,6 +3366,14 @@ consoles {
         url: "https://dart-ci.firebaseapp.com/current_results/"
         alt: "Current Test Results"
       }
+      links {
+        text: "Flaky Tests"
+        url: "https://goto.google.com/dart-vm-flakiness/"
+        alt: "Flaky Tests"
+      }
+    }
+    links {
+      name: "Resources"
       links {
         text: "Dart Infrastructure Chat"
         url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
@@ -3294,9 +3382,9 @@ consoles {
     }
     console_groups {
       console_ids: "dart/dart-fuzz"
+      console_ids: "dart/iso-stress"
       console_ids: "dart/flutter-engine"
       console_ids: "dart/flutter-web"
-      console_ids: "dart/iso-stress"
     }
     tree_name: "dart"
   }

From 93b679fe073ca100d8234edb9e359ab6dc6ca3b2 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 19 May 2025 09:28:19 -0700
Subject: [PATCH 792/826] [infra] Show commits along with iso-stress builds.

Change-Id: I86056627968a88ed7416a468d976a8c4b6b1e2b8
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/428906
Reviewed-by: Alexander Aprelev <aam@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/luci-milo.cfg | 62 ++++++++++++++++++++++++++++++++++++++++-
 main.star               | 13 +++++----
 2 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index bbbe199959f1..e5b32cfe75c3 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -2878,13 +2878,73 @@ consoles {
 consoles {
   id: "iso-stress"
   name: "VM Isolate Stress Test Console"
+  repo_url: "https://dart.googlesource.com/sdk"
+  refs: "regexp:refs/heads/main"
+  manifest_name: "REVISION"
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/iso-stress-linux-x64"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/iso-stress-linux-arm64"
   }
-  builder_view_only: true
+  header {
+    links {
+      name: "Consoles"
+      links {
+        text: "Main Console"
+        url: "/p/dart/g/be/console"
+        alt: "Main SDK Console"
+      }
+      links {
+        text: "Main Console (VM last)"
+        url: "/p/dart/g/alt/console"
+        alt: "Main SDK Console (VM last)"
+      }
+      links {
+        text: "LKGR Console"
+        url: "/p/dart-internal/g/lkgr/console"
+        alt: "SDK LKGR Console"
+      }
+      links {
+        text: "SDK CQ Status"
+        url: "/p/dart/g/cq/builders"
+        alt: "SDK CQ Status"
+      }
+    }
+    links {
+      name: "Tests"
+      links {
+        text: "Results Feed"
+        url: "https://dart-ci.firebaseapp.com/"
+        alt: "Results Feed"
+      }
+      links {
+        text: "Current Test Results"
+        url: "https://dart-ci.firebaseapp.com/current_results/"
+        alt: "Current Test Results"
+      }
+      links {
+        text: "Flaky Tests"
+        url: "https://goto.google.com/dart-vm-flakiness/"
+        alt: "Flaky Tests"
+      }
+    }
+    links {
+      name: "Resources"
+      links {
+        text: "Dart Infrastructure Chat"
+        url: "https://chat.google.com/preview/room/AAAAtyvwZMA"
+        alt: "Dart Infrastructure Chat"
+      }
+    }
+    console_groups {
+      console_ids: "dart/dart-fuzz"
+      console_ids: "dart/iso-stress"
+      console_ids: "dart/flutter-engine"
+      console_ids: "dart/flutter-web"
+    }
+    tree_name: "dart"
+  }
 }
 consoles {
   id: "monorepo"
diff --git a/main.star b/main.star
index 44f4c6646123..b1e337a447ce 100755
--- a/main.star
+++ b/main.star
@@ -86,9 +86,12 @@ luci.list_view(
     title = "Dart Fuzzer Console",
 )
 
-luci.list_view(
+luci.console_view(
     name = "iso-stress",
+    repo = "https://dart.googlesource.com/sdk",
     title = "VM Isolate Stress Test Console",
+    refs = ["refs/heads/main"],
+    header = "console-header.textpb",
 )
 
 luci.gitiles_poller(
@@ -188,13 +191,13 @@ luci.list_view_entry(
 )
 
 # VM isolate stress test console
-luci.list_view_entry(
+luci.console_view_entry(
     builder = "iso-stress-linux-x64",
-    list_view = "iso-stress",
+    console_view = "iso-stress",
 )
-luci.list_view_entry(
+luci.console_view_entry(
     builder = "iso-stress-linux-arm64",
-    list_view = "iso-stress",
+    console_view = "iso-stress",
 )
 
 dart.try_builder(

From 9388b2c200debbfe334eb251578f51624f0ce886 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 19 May 2025 11:17:00 -0700
Subject: [PATCH 793/826] [infra] Remove IA32 from SDK try builders.

This mirrors https://dart-internal-review.googlesource.com/c/dart-internal/+/7220

Bug: https://github.com/dart-lang/sdk/issues/49969
Change-Id: Id17dd6dcfdcd1486782051a27126618d2d55ebc9
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/429442
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Aprelev <aam@google.com>
---
 generated/cr-buildbucket.cfg | 2 --
 sdk.star                     | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 741285735f02..e20af1a6c885 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -10145,7 +10145,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "archs": ['
-        '    "ia32",'
         '    "x64"'
         '  ],'
         '  "clobber": true,'
@@ -10301,7 +10300,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "archs": ['
-        '    "ia32",'
         '    "x64"'
         '  ],'
         '  "clobber": true,'
diff --git a/sdk.star b/sdk.star
index 5454494c2965..dea5501b941f 100644
--- a/sdk.star
+++ b/sdk.star
@@ -54,7 +54,7 @@ sdk_builder_category()
 dart.try_builder(
     "dart-sdk-linux",
     properties = {
-        "archs": ["ia32", "x64"],
+        "archs": ["x64"],
         "dartdoc_arch": "x64",
         "disable_bcid": True,
         "upload_version": True,
@@ -109,7 +109,7 @@ dart.try_builder(
 dart.try_builder(
     "dart-sdk-win",
     dimensions = windows,
-    properties = {"archs": ["ia32", "x64"], "disable_bcid": True},
+    properties = {"archs": ["x64"], "disable_bcid": True},
     recipe = "release/sdk",
 )
 

From d1f789969a4bde76d0aab336de9fcf3a232f4ca0 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 19 May 2025 16:45:42 -0700
Subject: [PATCH 794/826] [infra] Reduce IA32 testing.

This leaves only vm-linux-{debug,release}-ia32.

Bug: https://github.com/dart-lang/sdk/issues/49969
Change-Id: Ie3c019f8adbb68f9013bd32622cae7d9bf5ac92a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/429461
Reviewed-by: Alexander Markov <alexmarkov@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/commit-queue.cfg   |   8 ---
 generated/cr-buildbucket.cfg | 128 -----------------------------------
 generated/luci-milo.cfg      |  26 -------
 generated/luci-notify.cfg    |  26 -------
 generated/luci-scheduler.cfg |  22 ------
 vm.star                      |   9 ---
 6 files changed, 219 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index eb17effba307..bad1821509b0 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -4736,10 +4736,6 @@ config_groups {
         name: "dart/try/vm-dyn-linux-debug-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-eager-optimization-linux-release-ia32-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-eager-optimization-linux-release-x64-try"
         includable_only: true
@@ -5031,10 +5027,6 @@ config_groups {
         name: "dart/try/vm-win-release-arm64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-win-release-ia32-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-win-release-x64-try"
         location_filters {
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index e20af1a6c885..357e04a52b39 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -7029,38 +7029,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-eager-optimization-linux-release-ia32"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-eager-optimization-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -9701,38 +9669,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-win-release-ia32"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 70
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-win-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13050,38 +12986,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-eager-optimization-linux-release-ia32-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-eager-optimization-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -14434,38 +14338,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-win-release-ia32-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "bisection_enabled": true,'
-        '  "clobber": true,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-win-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index e5b32cfe75c3..ef7c94b5492b 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -103,9 +103,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-mac-release-x64-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-win-release-ia32-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-win-debug-x64-try"
   }
@@ -187,9 +184,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-dwarf-linux-product-x64-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-eager-optimization-linux-release-ia32-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-eager-optimization-linux-release-x64-try"
   }
@@ -698,11 +692,6 @@ consoles {
     category: "vm|jit"
     short_name: "mr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-ia32"
-    category: "vm|jit"
-    short_name: "wr3"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64"
     category: "vm|jit"
@@ -838,11 +827,6 @@ consoles {
     category: "vm|aot"
     short_name: "dw"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-eager-optimization-linux-release-ia32"
-    category: "vm|misc"
-    short_name: "j"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-eager-optimization-linux-release-x64"
     category: "vm|misc"
@@ -1548,11 +1532,6 @@ consoles {
     category: "vm|jit"
     short_name: "mr"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-win-release-ia32"
-    category: "vm|jit"
-    short_name: "wr3"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64"
     category: "vm|jit"
@@ -1688,11 +1667,6 @@ consoles {
     category: "vm|aot"
     short_name: "dw"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-eager-optimization-linux-release-ia32"
-    category: "vm|misc"
-    short_name: "j"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-eager-optimization-linux-release-x64"
     category: "vm|misc"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 42e42437aac1..20ca3e816f3a 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -931,19 +931,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-eager-optimization-linux-release-ia32"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1420,19 +1407,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-win-release-ia32"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 9062ae782b85..9ace2b4b20f1 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1694,16 +1694,6 @@ job {
     builder: "vm-dyn-linux-debug-x64"
   }
 }
-job {
-  id: "vm-eager-optimization-linux-release-ia32"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-eager-optimization-linux-release-ia32"
-  }
-}
 job {
   id: "vm-eager-optimization-linux-release-x64"
   realm: "ci.sandbox"
@@ -2484,16 +2474,6 @@ job {
     builder: "vm-win-release-arm64-stable"
   }
 }
-job {
-  id: "vm-win-release-ia32"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-win-release-ia32"
-  }
-}
 job {
   id: "vm-win-release-x64"
   realm: "ci.sandbox"
@@ -2746,7 +2726,6 @@ trigger {
   triggers: "vm-asan-mac-release-x64"
   triggers: "vm-asan-win-release-x64"
   triggers: "vm-dyn-linux-debug-x64"
-  triggers: "vm-eager-optimization-linux-release-ia32"
   triggers: "vm-eager-optimization-linux-release-x64"
   triggers: "vm-ffi-mac-release-simarm64_arm64"
   triggers: "vm-gcc-linux"
@@ -2765,7 +2744,6 @@ trigger {
   triggers: "vm-ubsan-linux-release-x64"
   triggers: "vm-win-debug-arm64"
   triggers: "vm-win-debug-x64c"
-  triggers: "vm-win-release-ia32"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/main"
diff --git a/vm.star b/vm.star
index ffc976284ba5..81c15fde0ae7 100644
--- a/vm.star
+++ b/vm.star
@@ -143,11 +143,6 @@ _vm_builder(
     category = "vm|jit|mr",
     dimensions = mac,
 )
-_nightly_builder(
-    "vm-win-release-ia32",
-    category = "vm|jit|wr3",
-    dimensions = windows,
-)
 _vm_builder(
     "vm-win-debug-x64",
     category = "vm|jit|wd",
@@ -304,10 +299,6 @@ _nightly_builder(
 )
 
 # vm|misc
-_nightly_builder(
-    "vm-eager-optimization-linux-release-ia32",
-    category = "vm|misc|j",
-)
 _nightly_builder(
     "vm-eager-optimization-linux-release-x64",
     category = "vm|misc|j",

From 037838b3b276db00feb0baa8544e28d2947c7632 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 20 May 2025 14:09:27 -0700
Subject: [PATCH 795/826] [infra] Enable Linux ARM64 RBE.

Change-Id: I5fdfc1b69335c49a7c1e024f1ecb408d5a4a5fe3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/429841
Reviewed-by: Alexander Aprelev <aam@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/cr-buildbucket.cfg | 98 ++++++++----------------------------
 vm.star                      | 15 ------
 2 files changed, 20 insertions(+), 93 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 357e04a52b39..4b197e1e4127 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -4367,9 +4367,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -4377,12 +4374,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_reclient": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 70
       build_numbers: YES
@@ -4413,8 +4406,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       build_numbers: YES
@@ -5657,9 +5649,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -5667,7 +5656,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6767,9 +6756,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6777,7 +6763,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -8334,16 +8320,13 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8368,16 +8351,13 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8402,16 +8382,13 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -9110,9 +9087,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9120,7 +9094,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9276,9 +9250,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9286,7 +9257,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9343,9 +9314,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9353,7 +9321,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -11538,9 +11506,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -11548,12 +11513,8 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_reclient": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -11584,8 +11545,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       build_numbers: YES
@@ -12224,9 +12184,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12234,7 +12191,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12796,9 +12753,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12806,7 +12760,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13635,16 +13589,13 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13915,9 +13866,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -13925,7 +13873,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14081,9 +14029,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14091,7 +14036,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14148,9 +14093,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14158,7 +14100,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
diff --git a/vm.star b/vm.star
index 81c15fde0ae7..37a175fc42c8 100644
--- a/vm.star
+++ b/vm.star
@@ -111,8 +111,6 @@ _vm_builder(
     "vm-linux-release-arm64",
     category = "vm|jit|a6",
     dimensions = [jammy, arm64],
-    properties = {"clobber": False},
-    rbe = False,  # b/306641265
 )
 _vm_builder(
     "vm-mac-debug-arm64",
@@ -219,8 +217,6 @@ _nightly_builder(
     "vm-aot-linux-release-arm64",
     category = "vm|aot|a6",
     dimensions = [jammy, arm64],
-    properties = {"clobber": False},
-    rbe = False,  # b/306641265
 )
 _vm_builder(
     "vm-aot-mac-release-arm64",
@@ -338,29 +334,21 @@ _nightly_builder(
     "vm-asan-linux-release-arm64",
     category = "vm|misc|sanitizer|a",
     dimensions = [jammy, arm64],
-    properties = {"clobber": False},
-    rbe = False,  # b/306641265
 )
 _nightly_builder(
     "vm-msan-linux-release-arm64",
     category = "vm|misc|sanitizer|m",
     dimensions = [jammy, arm64],
-    properties = {"clobber": False},
-    rbe = False,  # b/306641265
 )
 _nightly_builder(
     "vm-tsan-linux-release-arm64",
     category = "vm|misc|sanitizer|t",
     dimensions = [jammy, arm64],
-    properties = {"clobber": False},
-    rbe = False,  # b/306641265
 )
 _nightly_builder(
     "vm-ubsan-linux-release-arm64",
     category = "vm|misc|sanitizer|u",
     dimensions = [jammy, arm64],
-    properties = {"clobber": False},
-    rbe = False,  # b/306641265
 )
 _nightly_builder(
     "vm-reload-linux-debug-x64",
@@ -496,13 +484,10 @@ _vm_builder(
     "iso-stress-linux-x64",
     channels = ["try"],
     notifies = "dart-vm-team",
-    properties = slow_shards,
 )
 _nightly_builder(
     "iso-stress-linux-arm64",
     category = None,
     channels = ["try"],
     dimensions = [jammy, arm64],
-    properties = [slow_shards, {"clobber": False}, no_reclient],
-    rbe = False,  # b/306641265
 )

From 25ccd508667d06b8f34c4676386e9c53a39eeaa8 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 20 May 2025 15:26:04 -0700
Subject: [PATCH 796/826] [infra] Enable Windows ARM64 RBE.

Change-Id: Ie5c5b721d1456bba0a4dac54661f7385452da621
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/429840
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Aprelev <aam@google.com>
---
 generated/cr-buildbucket.cfg | 60 ++++++++----------------------------
 vm.star                      | 12 +++-----
 2 files changed, 16 insertions(+), 56 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 4b197e1e4127..36b734886f75 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -6198,9 +6198,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -6208,7 +6205,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -6333,16 +6330,13 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -6369,16 +6363,13 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -6405,16 +6396,13 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -9377,9 +9365,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -9387,7 +9372,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -9542,16 +9527,13 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -9578,16 +9560,13 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -9614,16 +9593,13 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -12455,9 +12431,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -12465,7 +12438,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -12590,16 +12563,13 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -14156,9 +14126,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -14166,7 +14133,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -14257,16 +14224,13 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
diff --git a/vm.star b/vm.star
index 37a175fc42c8..52b33b8c0d96 100644
--- a/vm.star
+++ b/vm.star
@@ -157,15 +157,13 @@ _nightly_builder(
     "vm-win-debug-arm64",
     category = "vm|jit|wad",
     dimensions = [windows11, arm64, flutter_pool],
-    properties = [{"clobber": False}, no_reclient],
-    rbe = False,
+    properties = [no_reclient],
 )
 _vm_builder(
     "vm-win-release-arm64",
     category = "vm|jit|war",
     dimensions = [windows11, arm64, flutter_pool],
-    properties = [{"clobber": False}, no_reclient],
-    rbe = False,
+    properties = [no_reclient],
 )
 
 # vm|appjit
@@ -245,15 +243,13 @@ _nightly_builder(
     "vm-aot-win-debug-arm64",
     category = "vm|aot|wad",
     dimensions = [windows11, arm64, flutter_pool],
-    properties = [{"clobber": False}, no_reclient],
-    rbe = False,
+    properties = [no_reclient],
 )
 _vm_builder(
     "vm-aot-win-release-arm64",
     category = "vm|aot|war",
     dimensions = [windows11, arm64, flutter_pool],
-    properties = [{"clobber": False}, no_reclient],
-    rbe = False,
+    properties = [no_reclient],
 )
 
 # vm|aot|android

From 8c7e4f053373ef5868a94886522432fd4b20270d Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Wed, 21 May 2025 09:10:18 -0700
Subject: [PATCH 797/826] [infra] Enable RBE for pkg-{linux,win}-release-arm64.

Change-Id: I7695aef24f832974629b65b630a2f459a227756a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/429843
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Aprelev <aam@google.com>
---
 generated/cr-buildbucket.cfg | 40 ++++++++----------------------------
 pkg.star                     |  5 +----
 2 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 36b734886f75..6c2530c0340b 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -4498,16 +4498,13 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4532,16 +4529,13 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -4566,16 +4560,13 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -4938,16 +4929,13 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -4974,16 +4962,13 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -5010,16 +4995,13 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -11579,16 +11561,13 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11725,16 +11704,13 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
diff --git a/pkg.star b/pkg.star
index d8306e05a8dc..11a96a8258ba 100644
--- a/pkg.star
+++ b/pkg.star
@@ -30,8 +30,6 @@ dart.ci_sandbox_builder(
     "pkg-linux-release-arm64",
     category = "pkg|la",
     dimensions = [jammy, arm64],
-    properties = {"clobber": False},
-    rbe = False,  # b/306641265
 )
 dart.ci_sandbox_builder(
     "pkg-mac-release",
@@ -55,8 +53,7 @@ dart.ci_sandbox_builder(
     "pkg-win-release-arm64",
     category = "pkg|wa",
     dimensions = [windows11, arm64, flutter_pool],
-    properties = [{"clobber": False}, no_reclient],
-    rbe = False,
+    properties = [no_reclient],
 )
 dart.ci_sandbox_builder(
     "pkg-linux-debug",

From f6bde8d2233b329a6c70a50b47acbcdc1d5e5c2e Mon Sep 17 00:00:00 2001
From: Alexander Markov <alexmarkov@google.com>
Date: Wed, 21 May 2025 12:36:04 -0700
Subject: [PATCH 798/826] Add vm-aot-dyn-linux-product-x64 nightly builder

Change-Id: Ied3215103f960563dc41469b16ed57e8e594e195
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/430123
Reviewed-by: Sigmund Cherem <sigmund@google.com>
Reviewed-by: Ryan Macnak <rmacnak@google.com>
Commit-Queue: Alexander Markov <alexmarkov@google.com>
---
 generated/commit-queue.cfg   | 11 ++++++-
 generated/cr-buildbucket.cfg | 64 ++++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      | 29 +++++++++++-----
 generated/luci-notify.cfg    | 13 ++++++++
 generated/luci-scheduler.cfg | 11 +++++++
 vm.star                      | 10 ++++--
 6 files changed, 127 insertions(+), 11 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index bad1821509b0..c6ed0597a7ba 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -4489,6 +4489,10 @@ config_groups {
           path_regexp: "pkg/(dart2bytecode|dynamic_modules)/.+"
         }
       }
+      builders {
+        name: "dart/try/vm-aot-dyn-linux-product-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-linux-debug-simarm_x64-try"
         includable_only: true
@@ -4734,7 +4738,12 @@ config_groups {
       }
       builders {
         name: "dart/try/vm-dyn-linux-debug-x64-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "pkg/(dart2bytecode|dynamic_modules)/.+"
+        }
       }
       builders {
         name: "dart/try/vm-eager-optimization-linux-release-x64-try"
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 6c2530c0340b..d3423629a786 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5357,6 +5357,38 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-dyn-linux-product-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-linux-debug-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -11926,6 +11958,38 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-dyn-linux-product-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-linux-debug-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index ef7c94b5492b..845bf44c2721 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -253,6 +253,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-dyn-linux-debug-x64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-aot-dyn-linux-product-x64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-dyn-linux-debug-x64-try"
   }
@@ -939,13 +942,18 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-dyn-linux-debug-x64"
-    category: "vm|misc"
-    short_name: "dm"
+    category: "vm|misc|dyn"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-dyn-linux-product-x64"
+    category: "vm|misc|dyn"
+    short_name: "p"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-dyn-linux-debug-x64"
-    category: "vm|misc"
-    short_name: "dm"
+    category: "vm|misc|dyn"
+    short_name: "j"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
@@ -1779,13 +1787,18 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-dyn-linux-debug-x64"
-    category: "vm|misc"
-    short_name: "dm"
+    category: "vm|misc|dyn"
+    short_name: "d"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-dyn-linux-product-x64"
+    category: "vm|misc|dyn"
+    short_name: "p"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-dyn-linux-debug-x64"
-    category: "vm|misc"
-    short_name: "dm"
+    category: "vm|misc|dyn"
+    short_name: "j"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 20ca3e816f3a..ddcef6b5269a 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -574,6 +574,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-dyn-linux-product-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 9ace2b4b20f1..2faca06ef004 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1204,6 +1204,16 @@ job {
     builder: "vm-aot-dyn-linux-debug-x64"
   }
 }
+job {
+  id: "vm-aot-dyn-linux-product-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-dyn-linux-product-x64"
+  }
+}
 job {
   id: "vm-aot-linux-debug-simarm_x64"
   realm: "ci.sandbox"
@@ -2707,6 +2717,7 @@ trigger {
   triggers: "iso-stress-linux-arm64"
   triggers: "vm-aot-dwarf-linux-product-x64"
   triggers: "vm-aot-dyn-linux-debug-x64"
+  triggers: "vm-aot-dyn-linux-product-x64"
   triggers: "vm-aot-linux-debug-simriscv32"
   triggers: "vm-aot-linux-debug-simriscv64"
   triggers: "vm-aot-linux-debug-x64"
diff --git a/vm.star b/vm.star
index 52b33b8c0d96..f726a7ad6baa 100644
--- a/vm.star
+++ b/vm.star
@@ -411,14 +411,20 @@ _nightly_builder(
 
 _nightly_builder(
     "vm-aot-dyn-linux-debug-x64",
-    category = "vm|misc|dm",
+    category = "vm|misc|dyn|d",
     channels = ["try"],
     location_filters = paths.to_location_filters(paths.dart2bytecode),
 )
+_nightly_builder(
+    "vm-aot-dyn-linux-product-x64",
+    category = "vm|misc|dyn|p",
+    channels = ["try"],
+)
 _nightly_builder(
     "vm-dyn-linux-debug-x64",
-    category = "vm|misc|dm",
+    category = "vm|misc|dyn|j",
     channels = ["try"],
+    location_filters = paths.to_location_filters(paths.dart2bytecode),
 )
 
 # vm|ffi

From ec460ff9180ef039b5d9982b309302650000ca82 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Wed, 28 May 2025 14:40:58 -0700
Subject: [PATCH 799/826] [infra] Trigger the SDK builders on CQ for changes to
 //tools/debian_package.

Remove extra timeout from dart-sdk-linux-arm64-try, which now has a faster machine type and separately can now run with RBE.

Bug: https://github.com/dart-lang/sdk/issues/26953
Change-Id: I8c2bb5460fcabb6c63ddbd7d9f6c2bb447e556ae
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/431763
Reviewed-by: Alexander Aprelev <aam@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/commit-queue.cfg   | 120 +++++++++++++++++++++++++++++++++++
 generated/cr-buildbucket.cfg |   4 --
 lib/paths.star               |   1 +
 sdk.star                     |   4 --
 4 files changed, 121 insertions(+), 8 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index c6ed0597a7ba..5337e757fc94 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -456,6 +456,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/debian_package/.+"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-linux-riscv64-try"
@@ -469,6 +475,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/debian_package/.+"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-mac-arm64-try"
@@ -478,6 +490,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/debian_package/.+"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-mac-try"
@@ -487,6 +505,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/debian_package/.+"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-win-arm64-try"
@@ -496,6 +520,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/debian_package/.+"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-win-try"
@@ -2419,6 +2449,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/debian_package/.+"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-linux-riscv64-try"
@@ -2432,6 +2468,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/debian_package/.+"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-mac-arm64-try"
@@ -2441,6 +2483,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/debian_package/.+"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-mac-try"
@@ -2450,6 +2498,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/debian_package/.+"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-win-arm64-try"
@@ -2459,6 +2513,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/debian_package/.+"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-win-try"
@@ -2773,6 +2833,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/debian_package/.+"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-linux-riscv64-try"
@@ -2786,6 +2852,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/debian_package/.+"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-mac-arm64-try"
@@ -2795,6 +2867,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/debian_package/.+"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-mac-try"
@@ -2804,6 +2882,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/debian_package/.+"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-win-arm64-try"
@@ -2813,6 +2897,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/debian_package/.+"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-win-try"
@@ -5439,6 +5529,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/debian_package/.+"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-linux-riscv64-try"
@@ -5452,6 +5548,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/debian_package/.+"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-mac-arm64-try"
@@ -5461,6 +5563,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/debian_package/.+"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-mac-try"
@@ -5470,6 +5578,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/debian_package/.+"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-win-arm64-try"
@@ -5479,6 +5593,12 @@ config_groups {
           gerrit_ref_regexp: ".*"
           path_regexp: "tools/VERSION"
         }
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "tools/debian_package/.+"
+        }
       }
       builders {
         name: "dart/try/dart-sdk-win-try"
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index d3423629a786..ee26fa03e054 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -9957,10 +9957,6 @@ buckets {
       }
       properties:
         '{'
-        '  "$dart/build": {'
-        '    "disable_rbe": true,'
-        '    "timeout": 4200'
-        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
diff --git a/lib/paths.star b/lib/paths.star
index d13c0cd8695c..e74bf0231391 100644
--- a/lib/paths.star
+++ b/lib/paths.star
@@ -108,6 +108,7 @@ _PKG_PATHS = _VM_PATHS + [
 _RELEASE_PATHS = [
     # Paths that trigger release tryjobs
     "tools/VERSION",
+    "tools/debian_package/.+",
 ]
 
 def _to_location_filters(paths):
diff --git a/sdk.star b/sdk.star
index dea5501b941f..e1acf69b1fe6 100644
--- a/sdk.star
+++ b/sdk.star
@@ -67,15 +67,11 @@ dart.try_builder(
     "dart-sdk-linux-arm64",
     dimensions = [jammy, arm64],
     properties = {
-        "$dart/build": {
-            "timeout": 70 * 60,  # 70 minutes, non-RBE-build
-        },
         "archs": ["arm", "arm64"],
         "disable_bcid": True,
     },
     location_filters = paths.to_location_filters(paths.release),
     recipe = "release/sdk",
-    rbe = False,
 )
 
 dart.try_builder(

From e096580eb21040d5127c07b26b5884e53f3c4a30 Mon Sep 17 00:00:00 2001
From: Alexander Markov <alexmarkov@google.com>
Date: Mon, 2 Jun 2025 09:25:32 -0700
Subject: [PATCH 800/826] Graduate vm-aot-dyn-linux-debug-x64 from nightly bot
 to continuously running

Flutter now builds an engine variant which uses dynamic modules.
So it would be nice to catch dynamic modules breakages earlier from
Dart CI rather than Dart->Flutter auto-roller.

Change-Id: I9d1d4deb9121d42387f5f31b2f064cd3e82e70e6
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/431960
Commit-Queue: Alexander Markov <alexmarkov@google.com>
Reviewed-by: Sigmund Cherem <sigmund@google.com>
Reviewed-by: Ivan Inozemtsev <iinozemtsev@google.com>
---
 generated/commit-queue.cfg   | 7 ++++++-
 generated/cr-buildbucket.cfg | 4 +---
 generated/luci-notify.cfg    | 4 +---
 generated/luci-scheduler.cfg | 2 +-
 vm.star                      | 3 ++-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 5337e757fc94..4f0c7d3ad597 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -4581,7 +4581,12 @@ config_groups {
       }
       builders {
         name: "dart/try/vm-aot-dyn-linux-product-x64-try"
-        includable_only: true
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "pkg/(dart2bytecode|dynamic_modules)/.+"
+        }
       }
       builders {
         name: "dart/try/vm-aot-linux-debug-simarm_x64-try"
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index ee26fa03e054..e167010fc952 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5345,11 +5345,10 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -11942,7 +11941,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index ddcef6b5269a..5dded4e5f108 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -564,9 +564,7 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 2faca06ef004..57fd00cfb31a 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -2716,7 +2716,6 @@ trigger {
   triggers: "front-end-nnbd-win-release-x64"
   triggers: "iso-stress-linux-arm64"
   triggers: "vm-aot-dwarf-linux-product-x64"
-  triggers: "vm-aot-dyn-linux-debug-x64"
   triggers: "vm-aot-dyn-linux-product-x64"
   triggers: "vm-aot-linux-debug-simriscv32"
   triggers: "vm-aot-linux-debug-simriscv64"
@@ -2766,6 +2765,7 @@ trigger {
   triggers: "iso-stress-linux-x64"
   triggers: "vm-aot-android-release-arm64c"
   triggers: "vm-aot-android-release-arm_x64"
+  triggers: "vm-aot-dyn-linux-debug-x64"
   triggers: "vm-aot-linux-debug-simarm_x64"
   triggers: "vm-aot-linux-release-simarm_x64"
   triggers: "vm-aot-linux-release-x64"
diff --git a/vm.star b/vm.star
index f726a7ad6baa..3828ca620218 100644
--- a/vm.star
+++ b/vm.star
@@ -409,7 +409,7 @@ _nightly_builder(
     rbe = False,
 )
 
-_nightly_builder(
+_vm_builder(
     "vm-aot-dyn-linux-debug-x64",
     category = "vm|misc|dyn|d",
     channels = ["try"],
@@ -419,6 +419,7 @@ _nightly_builder(
     "vm-aot-dyn-linux-product-x64",
     category = "vm|misc|dyn|p",
     channels = ["try"],
+    location_filters = paths.to_location_filters(paths.dart2bytecode),
 )
 _nightly_builder(
     "vm-dyn-linux-debug-x64",

From b87149356431a3e1ca8926d1e6783e2495e33cab Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 2 Jun 2025 15:10:16 -0700
Subject: [PATCH 801/826] [infra] Don't need to explicitly set Ubuntu version
 for ARM64 builders now that the X64 builders have caught up to Jammy.

Change-Id: I64f389367a1f189ee2efb509db9b3ded0362d0fa
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/432461
Reviewed-by: Alexander Aprelev <aam@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 pkg.star |  3 +--
 sdk.star |  3 +--
 vm.star  | 14 +++++++-------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkg.star b/pkg.star
index 11a96a8258ba..5cae9dcf263d 100644
--- a/pkg.star
+++ b/pkg.star
@@ -11,7 +11,6 @@ load(
     "arm64",
     "chrome",
     "flutter_pool",
-    "jammy",
     "mac",
     "no_android",
     "no_reclient",
@@ -29,7 +28,7 @@ dart.ci_sandbox_builder(
 dart.ci_sandbox_builder(
     "pkg-linux-release-arm64",
     category = "pkg|la",
-    dimensions = [jammy, arm64],
+    dimensions = [arm64],
 )
 dart.ci_sandbox_builder(
     "pkg-mac-release",
diff --git a/sdk.star b/sdk.star
index e1acf69b1fe6..ed7c01cb228d 100644
--- a/sdk.star
+++ b/sdk.star
@@ -9,7 +9,6 @@ load("//lib/dart.star", "dart")
 load(
     "//lib/defaults.star",
     "arm64",
-    "jammy",
     "mac",
     "no_android",
     "windows",
@@ -65,7 +64,7 @@ dart.try_builder(
 
 dart.try_builder(
     "dart-sdk-linux-arm64",
-    dimensions = [jammy, arm64],
+    dimensions = [arm64],
     properties = {
         "archs": ["arm", "arm64"],
         "disable_bcid": True,
diff --git a/vm.star b/vm.star
index 3828ca620218..748c7cb150bd 100644
--- a/vm.star
+++ b/vm.star
@@ -110,7 +110,7 @@ _vm_builder(
 _vm_builder(
     "vm-linux-release-arm64",
     category = "vm|jit|a6",
-    dimensions = [jammy, arm64],
+    dimensions = [arm64],
 )
 _vm_builder(
     "vm-mac-debug-arm64",
@@ -214,7 +214,7 @@ _nightly_builder(
 _nightly_builder(
     "vm-aot-linux-release-arm64",
     category = "vm|aot|a6",
-    dimensions = [jammy, arm64],
+    dimensions = [arm64],
 )
 _vm_builder(
     "vm-aot-mac-release-arm64",
@@ -329,22 +329,22 @@ _nightly_builder(
 _nightly_builder(
     "vm-asan-linux-release-arm64",
     category = "vm|misc|sanitizer|a",
-    dimensions = [jammy, arm64],
+    dimensions = [arm64],
 )
 _nightly_builder(
     "vm-msan-linux-release-arm64",
     category = "vm|misc|sanitizer|m",
-    dimensions = [jammy, arm64],
+    dimensions = [arm64],
 )
 _nightly_builder(
     "vm-tsan-linux-release-arm64",
     category = "vm|misc|sanitizer|t",
-    dimensions = [jammy, arm64],
+    dimensions = [arm64],
 )
 _nightly_builder(
     "vm-ubsan-linux-release-arm64",
     category = "vm|misc|sanitizer|u",
-    dimensions = [jammy, arm64],
+    dimensions = [arm64],
 )
 _nightly_builder(
     "vm-reload-linux-debug-x64",
@@ -492,5 +492,5 @@ _nightly_builder(
     "iso-stress-linux-arm64",
     category = None,
     channels = ["try"],
-    dimensions = [jammy, arm64],
+    dimensions = [arm64],
 )

From 8c96b89aa51a62b74195d657f2678a64ac3a7497 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 2 Jun 2025 15:46:03 -0700
Subject: [PATCH 802/826] [infra] Add vm-aot-mac-debug-{x64,arm64} as nightly
 builders.

We now have sharding working for Mac AOT, so these will no longer timeout.

Cf. 2565128cb0b7ca5e7d6eac321a7a83ba8494023b

Change-Id: I44c438eb35f6e530092a58b6135990c3e6b9ee36
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/432325
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Aprelev <aam@google.com>
---
 generated/commit-queue.cfg   |   8 ++
 generated/cr-buildbucket.cfg | 184 +++++++++++++++++++++++++++++------
 generated/luci-milo.cfg      |  56 ++++++++---
 generated/luci-notify.cfg    |  26 +++++
 generated/luci-scheduler.cfg |  22 +++++
 vm.star                      |  22 +++--
 6 files changed, 268 insertions(+), 50 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 4f0c7d3ad597..185f3b6a6987 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -4755,6 +4755,14 @@ config_groups {
           path_regexp: "pkg/vm_service/.+"
         }
       }
+      builders {
+        name: "dart/try/vm-aot-mac-debug-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-mac-debug-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-mac-product-arm64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index e167010fc952..23582890a4bd 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5866,6 +5866,80 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-mac-debug-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-aot-mac-debug-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-mac-product-arm64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -5924,11 +5998,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       caches {
@@ -5964,11 +6034,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 60
       caches {
@@ -6004,11 +6070,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 60
       caches {
@@ -6044,8 +6106,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 50
       caches {
@@ -6081,8 +6142,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 60
       caches {
@@ -6118,8 +6178,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 60
       caches {
@@ -12274,6 +12333,80 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-mac-debug-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-aot-mac-debug-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-mac-product-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -12332,11 +12465,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       caches {
@@ -12372,8 +12501,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": true,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
+        '  "recipe": "dart/neo"'
         '}'
       priority: 30
       caches {
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 845bf44c2721..961d455fed94 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -146,11 +146,17 @@ consoles {
     name: "buildbucket/luci.dart.try/vm-aot-linux-release-arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-aot-mac-release-arm64-try"
+    name: "buildbucket/luci.dart.try/vm-aot-mac-debug-x64-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-mac-release-x64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-aot-mac-debug-arm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-aot-mac-release-arm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-win-debug-x64-try"
   }
@@ -766,14 +772,24 @@ consoles {
     short_name: "a6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-debug-x64"
     category: "vm|aot"
-    short_name: "m1"
+    short_name: "md"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-x64"
     category: "vm|aot"
-    short_name: "m"
+    short_name: "mr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-debug-arm64"
+    category: "vm|aot"
+    short_name: "mda"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-arm64"
+    category: "vm|aot"
+    short_name: "mra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-debug-x64"
@@ -1611,14 +1627,24 @@ consoles {
     short_name: "a6"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-debug-x64"
     category: "vm|aot"
-    short_name: "m1"
+    short_name: "md"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-x64"
     category: "vm|aot"
-    short_name: "m"
+    short_name: "mr"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-debug-arm64"
+    category: "vm|aot"
+    short_name: "mda"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-arm64"
+    category: "vm|aot"
+    short_name: "mra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-debug-x64"
@@ -2196,14 +2222,14 @@ consoles {
     short_name: "ra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-arm64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-x64-beta"
     category: "vm|aot"
-    short_name: "m1"
+    short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-arm64-beta"
     category: "vm|aot"
-    short_name: "m"
+    short_name: "mra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-release-x64-beta"
@@ -2616,14 +2642,14 @@ consoles {
     short_name: "ra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-arm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-x64-stable"
     category: "vm|aot"
-    short_name: "m1"
+    short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-arm64-stable"
     category: "vm|aot"
-    short_name: "m"
+    short_name: "mra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-win-release-x64-stable"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 5dded4e5f108..4148dc45c547 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -696,6 +696,32 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-mac-debug-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-mac-debug-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 57fd00cfb31a..7fd6ac6656ac 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1364,6 +1364,26 @@ job {
     builder: "vm-aot-linux-release-x64-stable"
   }
 }
+job {
+  id: "vm-aot-mac-debug-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-mac-debug-arm64"
+  }
+}
+job {
+  id: "vm-aot-mac-debug-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-mac-debug-x64"
+  }
+}
 job {
   id: "vm-aot-mac-product-arm64"
   realm: "ci.sandbox"
@@ -2723,6 +2743,8 @@ trigger {
   triggers: "vm-aot-linux-debug-x64c"
   triggers: "vm-aot-linux-product-x64"
   triggers: "vm-aot-linux-release-arm64"
+  triggers: "vm-aot-mac-debug-arm64"
+  triggers: "vm-aot-mac-debug-x64"
   triggers: "vm-aot-mac-product-arm64"
   triggers: "vm-aot-obfuscate-linux-release-x64"
   triggers: "vm-aot-optimization-level-linux-release-x64"
diff --git a/vm.star b/vm.star
index 748c7cb150bd..ebf6d620265b 100644
--- a/vm.star
+++ b/vm.star
@@ -216,17 +216,25 @@ _nightly_builder(
     category = "vm|aot|a6",
     dimensions = [arm64],
 )
-_vm_builder(
-    "vm-aot-mac-release-arm64",
-    category = "vm|aot|m1",
-    dimensions = [mac, arm64],
-    properties = [no_android, slow_shards],
+_nightly_builder(
+    "vm-aot-mac-debug-x64",
+    category = "vm|aot|md",
+    dimensions = mac,
 )
 _vm_builder(
     "vm-aot-mac-release-x64",
-    category = "vm|aot|m",
+    category = "vm|aot|mr",
     dimensions = mac,
-    properties = slow_shards,
+)
+_nightly_builder(
+    "vm-aot-mac-debug-arm64",
+    category = "vm|aot|mda",
+    dimensions = [mac, arm64],
+)
+_vm_builder(
+    "vm-aot-mac-release-arm64",
+    category = "vm|aot|mra",
+    dimensions = [mac, arm64],
 )
 _nightly_builder(
     "vm-aot-win-debug-x64",

From f571bea85565bbad078192aac5b13ea35517b0c0 Mon Sep 17 00:00:00 2001
From: Yiwei Zhang <yiwzhang@google.com>
Date: Wed, 4 Jun 2025 12:24:08 -0700
Subject: [PATCH 803/826] specify the gerrit listener type to be legacy poller

I'm trying to move the config from service config[1] to project config.

[1]: https://chrome-internal.googlesource.com/infradata/config/+/a661f2eec00763dc5279dc4daf7b3586f6c66fec/configs/luci-change-verifier/listener-settings.cfg#70

Bug: 421431364
Change-Id: I61e4c56324f216c57485c79f0a487f05e312e07f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/432904
Reviewed-by: Alexander Aprelev <aam@google.com>
Commit-Queue: Alexander Aprelev <aam@google.com>
Auto-Submit: Yiwei Zhang <yiwzhang@google.com>
---
 cq.star                    | 1 +
 generated/commit-queue.cfg | 1 +
 generated/project.cfg      | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cq.star b/cq.star
index cb8682a7e308..bd1aa8cdca9e 100644
--- a/cq.star
+++ b/cq.star
@@ -11,6 +11,7 @@ luci.cq(
     submit_max_burst = 2,
     submit_burst_delay = 8 * time.minute,
     status_host = "chromium-cq-status.appspot.com",
+    gerrit_listener_type = cq.GERRIT_LISTENER_TYPE_LEGACY_POLLER,
 )
 
 def default_verifiers():
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 185f3b6a6987..2413e159dd91 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -7501,3 +7501,4 @@ config_groups {
     }
   }
 }
+gerrit_listener_type: GERRIT_LISTENER_TYPE_LEGACY_POLLER
diff --git a/generated/project.cfg b/generated/project.cfg
index d8c4b18031f2..2925bf59beaa 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.45.0"
+  version: "1.45.3"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"

From 4e924af3aef969049c49a43b32f810b24333ccd9 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 10 Jun 2025 09:39:39 -0700
Subject: [PATCH 804/826] [infra] Default to clobber=False.

The incremental build is more reliable these days.

Change-Id: I9b71477f31ec002d2acabc3a4daae16648efcada
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/433601
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/cr-buildbucket.cfg | 914 +++++++++++++++++------------------
 lib/defaults.star            |   2 +-
 2 files changed, 458 insertions(+), 458 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 23582890a4bd..41765d6a519c 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -35,7 +35,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -66,7 +66,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -97,7 +97,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -128,7 +128,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -159,7 +159,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -190,7 +190,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -221,7 +221,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -257,7 +257,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -293,7 +293,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -329,7 +329,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -360,7 +360,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -391,7 +391,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -423,7 +423,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -454,7 +454,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -489,7 +489,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -523,7 +523,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -558,7 +558,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -593,7 +593,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -628,7 +628,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -663,7 +663,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -698,7 +698,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -733,7 +733,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -773,7 +773,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -813,7 +813,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -853,7 +853,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -892,7 +892,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -931,7 +931,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -970,7 +970,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1005,7 +1005,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1040,7 +1040,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1075,7 +1075,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1109,7 +1109,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1143,7 +1143,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1177,7 +1177,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1211,7 +1211,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1245,7 +1245,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1279,7 +1279,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1314,7 +1314,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1349,7 +1349,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1384,7 +1384,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -1419,7 +1419,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1456,7 +1456,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1493,7 +1493,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1530,7 +1530,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1566,7 +1566,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1602,7 +1602,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1638,7 +1638,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1675,7 +1675,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1712,7 +1712,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1749,7 +1749,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1785,7 +1785,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1821,7 +1821,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1857,7 +1857,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1894,7 +1894,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1931,7 +1931,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1968,7 +1968,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -2005,7 +2005,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -2042,7 +2042,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -2079,7 +2079,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
@@ -2116,7 +2116,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
@@ -2153,7 +2153,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
@@ -2190,7 +2190,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2225,7 +2225,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -2259,7 +2259,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2294,7 +2294,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2329,7 +2329,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2364,7 +2364,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -2399,7 +2399,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2439,7 +2439,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2479,7 +2479,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2519,7 +2519,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2559,7 +2559,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2594,7 +2594,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2629,7 +2629,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2664,7 +2664,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -2695,7 +2695,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -2769,7 +2769,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2801,7 +2801,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2833,7 +2833,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2865,7 +2865,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2897,7 +2897,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2929,7 +2929,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2961,7 +2961,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2993,7 +2993,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3025,7 +3025,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3057,7 +3057,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3089,7 +3089,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester_engine"'
         '}'
       priority: 50
@@ -3121,7 +3121,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3153,7 +3153,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3185,7 +3185,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3217,7 +3217,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3249,7 +3249,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3281,7 +3281,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3313,7 +3313,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3345,7 +3345,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3377,7 +3377,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3409,7 +3409,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3441,7 +3441,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3473,7 +3473,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3505,7 +3505,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3537,7 +3537,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3569,7 +3569,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3601,7 +3601,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3633,7 +3633,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3665,7 +3665,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3697,7 +3697,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3729,7 +3729,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3761,7 +3761,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3793,7 +3793,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3825,7 +3825,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3857,7 +3857,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3932,7 +3932,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -3963,7 +3963,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -3994,7 +3994,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -4025,7 +4025,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4056,7 +4056,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -4087,7 +4087,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -4118,7 +4118,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -4154,7 +4154,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -4185,7 +4185,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -4217,7 +4217,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4248,7 +4248,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/gclient"'
         '}'
       priority: 50
@@ -4279,7 +4279,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/gclient"'
         '}'
       priority: 60
@@ -4310,7 +4310,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/gclient"'
         '}'
       priority: 60
@@ -4341,7 +4341,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/external"'
         '}'
       priority: 20
@@ -4374,7 +4374,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -4405,7 +4405,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4436,7 +4436,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4470,7 +4470,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4504,7 +4504,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4535,7 +4535,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -4566,7 +4566,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -4597,7 +4597,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4631,7 +4631,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4665,7 +4665,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4704,7 +4704,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -4744,7 +4744,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -4784,7 +4784,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -4824,7 +4824,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4863,7 +4863,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4902,7 +4902,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4935,7 +4935,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -4968,7 +4968,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -5001,7 +5001,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -5035,7 +5035,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -5069,7 +5069,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -5103,7 +5103,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5138,7 +5138,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5173,7 +5173,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5208,7 +5208,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5243,7 +5243,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5278,7 +5278,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5314,7 +5314,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -5345,7 +5345,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5377,7 +5377,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -5408,7 +5408,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5440,7 +5440,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5472,7 +5472,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5505,7 +5505,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5538,7 +5538,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5571,7 +5571,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5604,7 +5604,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5637,7 +5637,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -5669,7 +5669,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -5700,7 +5700,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5731,7 +5731,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -5762,7 +5762,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -5793,7 +5793,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5824,7 +5824,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -5855,7 +5855,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -5887,7 +5887,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -5924,7 +5924,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -5961,7 +5961,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -5997,7 +5997,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6033,7 +6033,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6069,7 +6069,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6105,7 +6105,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6141,7 +6141,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6177,7 +6177,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6214,7 +6214,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6246,7 +6246,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6277,7 +6277,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -6312,7 +6312,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -6345,7 +6345,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -6378,7 +6378,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6408,7 +6408,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -6441,7 +6441,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -6474,7 +6474,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -6508,7 +6508,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6539,7 +6539,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6570,7 +6570,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6601,7 +6601,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -6633,7 +6633,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -6665,7 +6665,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -6698,7 +6698,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6729,7 +6729,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6760,7 +6760,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6791,7 +6791,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6823,7 +6823,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6855,7 +6855,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6887,7 +6887,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6924,7 +6924,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6955,7 +6955,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6991,7 +6991,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -7027,7 +7027,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -7064,7 +7064,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7096,7 +7096,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7127,7 +7127,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7161,7 +7161,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7195,7 +7195,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7229,7 +7229,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7263,7 +7263,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7297,7 +7297,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7331,7 +7331,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7365,7 +7365,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7399,7 +7399,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7433,7 +7433,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7467,7 +7467,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7501,7 +7501,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7535,7 +7535,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7569,7 +7569,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7603,7 +7603,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7637,7 +7637,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7671,7 +7671,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7705,7 +7705,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7739,7 +7739,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -7776,7 +7776,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7812,7 +7812,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -7843,7 +7843,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -7874,7 +7874,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -7905,7 +7905,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -7936,7 +7936,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -7967,7 +7967,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -7998,7 +7998,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_fuchsia_deps": true'
         '  },'
@@ -8032,7 +8032,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_fuchsia_deps": true'
         '  },'
@@ -8071,7 +8071,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -8104,7 +8104,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -8137,7 +8137,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -8168,7 +8168,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8199,7 +8199,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8230,7 +8230,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8261,7 +8261,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8292,7 +8292,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8323,7 +8323,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8355,7 +8355,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -8386,7 +8386,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8417,7 +8417,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8448,7 +8448,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8480,7 +8480,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -8511,7 +8511,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8542,7 +8542,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8573,7 +8573,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8604,7 +8604,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8635,7 +8635,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8666,7 +8666,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8697,7 +8697,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -8737,7 +8737,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -8777,7 +8777,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -8817,7 +8817,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -8854,7 +8854,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -8891,7 +8891,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -8928,7 +8928,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -8967,7 +8967,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -9006,7 +9006,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -9045,7 +9045,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -9081,7 +9081,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -9117,7 +9117,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -9154,7 +9154,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9186,7 +9186,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9221,7 +9221,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9253,7 +9253,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9285,7 +9285,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9317,7 +9317,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9349,7 +9349,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9381,7 +9381,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9413,7 +9413,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9444,7 +9444,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -9478,7 +9478,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9510,7 +9510,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9542,7 +9542,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9575,7 +9575,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9605,7 +9605,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -9638,7 +9638,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -9671,7 +9671,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -9705,7 +9705,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -9736,7 +9736,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -9767,7 +9767,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -9824,7 +9824,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -9855,7 +9855,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -9886,7 +9886,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -9922,7 +9922,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -9953,7 +9953,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_javascript_engines": true'
         '  },'
@@ -9987,7 +9987,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "from_ref": "refs/heads/dev",'
         '  "recipe": "release/merge",'
         '  "to_ref": "refs/heads/beta"'
@@ -10025,7 +10025,7 @@ buckets {
         '    "arm",'
         '    "arm64"'
         '  ],'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "disable_bcid": true,'
         '  "recipe": "release/sdk"'
         '}'
@@ -10060,7 +10060,7 @@ buckets {
         '  "archs": ['
         '    "riscv64"'
         '  ],'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "disable_bcid": true,'
         '  "recipe": "release/sdk"'
         '}'
@@ -10095,7 +10095,7 @@ buckets {
         '  "archs": ['
         '    "x64"'
         '  ],'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "dartdoc_arch": "x64",'
         '  "disable_bcid": true,'
         '  "recipe": "release/sdk",'
@@ -10132,7 +10132,7 @@ buckets {
         '  "archs": ['
         '    "arm64"'
         '  ],'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -10175,7 +10175,7 @@ buckets {
         '  "archs": ['
         '    "x64"'
         '  ],'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "disable_bcid": true,'
         '  "recipe": "release/sdk"'
         '}'
@@ -10215,7 +10215,7 @@ buckets {
         '  "archs": ['
         '    "arm64"'
         '  ],'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "disable_bcid": true,'
         '  "recipe": "release/sdk"'
         '}'
@@ -10250,7 +10250,7 @@ buckets {
         '  "archs": ['
         '    "x64"'
         '  ],'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "disable_bcid": true,'
         '  "recipe": "release/sdk"'
         '}'
@@ -10282,7 +10282,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -10317,7 +10317,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -10351,7 +10351,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -10386,7 +10386,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -10421,7 +10421,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -10461,7 +10461,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -10500,7 +10500,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -10535,7 +10535,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -10569,7 +10569,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -10603,7 +10603,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -10638,7 +10638,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -10675,7 +10675,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -10711,7 +10711,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -10748,7 +10748,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -10784,7 +10784,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -10821,7 +10821,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -10858,7 +10858,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
@@ -10895,7 +10895,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -10930,7 +10930,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -10964,7 +10964,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -10999,7 +10999,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -11034,7 +11034,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -11074,7 +11074,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -11114,7 +11114,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -11149,7 +11149,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "from_ref": "refs/heads/lkgr",'
         '  "recipe": "release/merge",'
         '  "to_ref": "refs/heads/dev"'
@@ -11183,7 +11183,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "release/docker",'
         '  "version": "1.2.3"'
         '}'
@@ -11215,7 +11215,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11246,7 +11246,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11365,7 +11365,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11396,7 +11396,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11427,7 +11427,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11463,7 +11463,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11494,7 +11494,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/gclient"'
         '}'
       priority: 30
@@ -11525,7 +11525,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "release/homebrew"'
         '}'
       priority: 30
@@ -11557,7 +11557,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11588,7 +11588,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11619,7 +11619,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -11653,7 +11653,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11684,7 +11684,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -11718,7 +11718,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -11758,7 +11758,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -11796,7 +11796,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -11830,7 +11830,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -11864,7 +11864,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "from_ref": "refs/heads/beta",'
         '  "recipe": "release/merge",'
         '  "to_ref": "refs/heads/stable"'
@@ -11898,7 +11898,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -11933,7 +11933,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -11969,7 +11969,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12000,7 +12000,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12032,7 +12032,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12063,7 +12063,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12096,7 +12096,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12129,7 +12129,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12162,7 +12162,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12195,7 +12195,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12228,7 +12228,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12260,7 +12260,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12291,7 +12291,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12322,7 +12322,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12354,7 +12354,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12391,7 +12391,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12428,7 +12428,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12464,7 +12464,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12500,7 +12500,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12537,7 +12537,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12569,7 +12569,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12600,7 +12600,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -12635,7 +12635,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12668,7 +12668,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12701,7 +12701,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12731,7 +12731,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -12765,7 +12765,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12796,7 +12796,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12829,7 +12829,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12860,7 +12860,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12892,7 +12892,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12924,7 +12924,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12956,7 +12956,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12993,7 +12993,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13024,7 +13024,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13061,7 +13061,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13093,7 +13093,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13124,7 +13124,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13158,7 +13158,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13192,7 +13192,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13226,7 +13226,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13260,7 +13260,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13294,7 +13294,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13328,7 +13328,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13365,7 +13365,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13401,7 +13401,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13432,7 +13432,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13463,7 +13463,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_fuchsia_deps": true'
         '  },'
@@ -13497,7 +13497,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_fuchsia_deps": true'
         '  },'
@@ -13536,7 +13536,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13569,7 +13569,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -13602,7 +13602,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13633,7 +13633,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13664,7 +13664,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13696,7 +13696,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13727,7 +13727,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13759,7 +13759,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13790,7 +13790,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13821,7 +13821,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13852,7 +13852,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -13892,7 +13892,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -13929,7 +13929,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -13968,7 +13968,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14005,7 +14005,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14037,7 +14037,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14072,7 +14072,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14104,7 +14104,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14136,7 +14136,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14168,7 +14168,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14200,7 +14200,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14232,7 +14232,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14264,7 +14264,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14295,7 +14295,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -14329,7 +14329,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -14362,7 +14362,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14392,7 +14392,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -14426,7 +14426,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14467,7 +14467,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -14499,7 +14499,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -14531,7 +14531,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -14563,7 +14563,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -14595,7 +14595,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -14627,7 +14627,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -14659,7 +14659,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -14691,7 +14691,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -14723,7 +14723,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -14755,7 +14755,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -14787,7 +14787,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester_engine"'
         '}'
       priority: 30
@@ -14819,7 +14819,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -14851,7 +14851,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -14883,7 +14883,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -14915,7 +14915,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -14947,7 +14947,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -14979,7 +14979,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15011,7 +15011,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15043,7 +15043,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15075,7 +15075,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15107,7 +15107,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15139,7 +15139,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15171,7 +15171,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15203,7 +15203,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15235,7 +15235,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15267,7 +15267,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15299,7 +15299,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15331,7 +15331,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15363,7 +15363,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15395,7 +15395,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15427,7 +15427,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15459,7 +15459,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15491,7 +15491,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15523,7 +15523,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15555,7 +15555,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15614,7 +15614,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "presubmit/presubmit"'
         '}'
       priority: 30
diff --git a/lib/defaults.star b/lib/defaults.star
index 750e0e465f2f..2f9e15003ac0 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -7,7 +7,7 @@ Defaults for properties and dimensions used in main.star.
 
 load("//lib/helpers.star", "union")
 
-_PROPERTIES = {"clobber": True}
+_PROPERTIES = {"clobber": False}
 _DIMENSIONS = {
     "cpu": "x86-64",
     "host_class": "default",

From ad5dc118184dd841c4b087902b51966d09a1e92d Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 10 Jun 2025 14:31:02 -0700
Subject: [PATCH 805/826] [infra] Increase vm-aot-linux-release-arm64 to
 trigger on VM commits.

Change-Id: Ie800c0011efd77780d8860003d1e342f6341f8af
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/433861
Reviewed-by: Alexander Aprelev <aam@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/commit-queue.cfg   |  8 +++++
 generated/cr-buildbucket.cfg | 66 ++++++++++++++++++++++++++++++++++--
 generated/luci-milo.cfg      | 10 ++++++
 generated/luci-notify.cfg    |  4 +--
 generated/luci-scheduler.cfg | 24 ++++++++++++-
 vm.star                      |  2 +-
 6 files changed, 106 insertions(+), 8 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 2413e159dd91..bf45e3ff4247 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -1902,6 +1902,10 @@ config_groups {
         name: "dart/try/vm-aot-linux-debug-simarm_x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-linux-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-linux-release-simarm_x64-try"
         includable_only: true
@@ -6988,6 +6992,10 @@ config_groups {
         name: "dart/try/vm-aot-linux-debug-simarm_x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-linux-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-linux-release-simarm_x64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 41765d6a519c..72d05d9d95c4 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5668,11 +5668,72 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-aot-linux-release-arm64-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-aot-linux-release-arm64-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12259,7 +12320,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 961d455fed94..967f756de84b 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -2221,6 +2221,11 @@ consoles {
     category: "vm|aot"
     short_name: "ra"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-arm64-beta"
+    category: "vm|aot"
+    short_name: "a6"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-x64-beta"
     category: "vm|aot"
@@ -2641,6 +2646,11 @@ consoles {
     category: "vm|aot"
     short_name: "ra"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-arm64-stable"
+    category: "vm|aot"
+    short_name: "a6"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-x64-stable"
     category: "vm|aot"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 4148dc45c547..140468ad6902 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -664,9 +664,7 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 7fd6ac6656ac..ece9a58f60d3 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1304,6 +1304,26 @@ job {
     builder: "vm-aot-linux-release-arm64"
   }
 }
+job {
+  id: "vm-aot-linux-release-arm64-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-linux-release-arm64-beta"
+  }
+}
+job {
+  id: "vm-aot-linux-release-arm64-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-linux-release-arm64-stable"
+  }
+}
 job {
   id: "vm-aot-linux-release-simarm_x64"
   realm: "ci.sandbox"
@@ -2574,6 +2594,7 @@ trigger {
   triggers: "vm-aot-android-release-arm64c-beta"
   triggers: "vm-aot-android-release-arm_x64-beta"
   triggers: "vm-aot-linux-debug-simarm_x64-beta"
+  triggers: "vm-aot-linux-release-arm64-beta"
   triggers: "vm-aot-linux-release-simarm_x64-beta"
   triggers: "vm-aot-linux-release-x64-beta"
   triggers: "vm-aot-mac-release-arm64-beta"
@@ -2692,6 +2713,7 @@ trigger {
   triggers: "vm-aot-android-release-arm64c-stable"
   triggers: "vm-aot-android-release-arm_x64-stable"
   triggers: "vm-aot-linux-debug-simarm_x64-stable"
+  triggers: "vm-aot-linux-release-arm64-stable"
   triggers: "vm-aot-linux-release-simarm_x64-stable"
   triggers: "vm-aot-linux-release-x64-stable"
   triggers: "vm-aot-mac-release-arm64-stable"
@@ -2742,7 +2764,6 @@ trigger {
   triggers: "vm-aot-linux-debug-x64"
   triggers: "vm-aot-linux-debug-x64c"
   triggers: "vm-aot-linux-product-x64"
-  triggers: "vm-aot-linux-release-arm64"
   triggers: "vm-aot-mac-debug-arm64"
   triggers: "vm-aot-mac-debug-x64"
   triggers: "vm-aot-mac-product-arm64"
@@ -2789,6 +2810,7 @@ trigger {
   triggers: "vm-aot-android-release-arm_x64"
   triggers: "vm-aot-dyn-linux-debug-x64"
   triggers: "vm-aot-linux-debug-simarm_x64"
+  triggers: "vm-aot-linux-release-arm64"
   triggers: "vm-aot-linux-release-simarm_x64"
   triggers: "vm-aot-linux-release-x64"
   triggers: "vm-aot-mac-release-arm64"
diff --git a/vm.star b/vm.star
index ebf6d620265b..5c17208a9a48 100644
--- a/vm.star
+++ b/vm.star
@@ -211,7 +211,7 @@ _nightly_builder(
     category = "vm|aot|rv",
     properties = [slow_shards],
 )
-_nightly_builder(
+_vm_builder(
     "vm-aot-linux-release-arm64",
     category = "vm|aot|a6",
     dimensions = [arm64],

From 25fa3ae0b53c65fefa892290d5d2611f8c15c6d3 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 17 Jun 2025 14:58:34 -0700
Subject: [PATCH 806/826] [infra] Increase vm-linux-release-ia32 to run on VM
 commits.

Decrease vm-appjit-linux-debug-x64 to nightly.

Sort vm-aot-linux-debug-x64.

Change-Id: Ifeb5f22dfa66b12b3d0d401c69a4efb80b6d266f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/435321
Reviewed-by: Siva Annamalai <asiva@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/commit-queue.cfg   |  16 ++---
 generated/cr-buildbucket.cfg | 134 +++++++++++++++++------------------
 generated/luci-milo.cfg      |  46 ++++++------
 generated/luci-notify.cfg    |   8 +--
 generated/luci-scheduler.cfg |  48 ++++++-------
 vm.star                      |  14 ++--
 6 files changed, 132 insertions(+), 134 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index bf45e3ff4247..262c229fe7e1 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -2061,10 +2061,6 @@ config_groups {
         name: "dart/try/vm-aot-win-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-appjit-linux-debug-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-appjit-linux-release-x64-try"
         includable_only: true
@@ -2117,6 +2113,10 @@ config_groups {
         name: "dart/try/vm-linux-release-arm64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-linux-release-ia32-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-linux-release-simarm-try"
         includable_only: true
@@ -7151,10 +7151,6 @@ config_groups {
         name: "dart/try/vm-aot-win-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-appjit-linux-debug-x64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-appjit-linux-release-x64-try"
         includable_only: true
@@ -7207,6 +7203,10 @@ config_groups {
         name: "dart/try/vm-linux-release-arm64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-linux-release-ia32-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-linux-release-simarm-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 72d05d9d95c4..c3c4ba2a3b9f 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -6662,75 +6662,12 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
-      priority: 50
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-appjit-linux-debug-x64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 60
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-appjit-linux-debug-x64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "host_class:default"
-      dimensions: "os:Ubuntu-22"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "recipe": "dart/neo",'
-        '  "shard_timeout": 5400'
-        '}'
-      priority: 60
+      priority: 70
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -8540,11 +8477,72 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
-      priority: 70
+      priority: 50
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-linux-release-ia32-beta"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-linux-release-ia32-stable"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 60
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -12856,6 +12854,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
+        '  "bisection_enabled": true,'
         '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
@@ -13818,7 +13817,6 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "bisection_enabled": true,'
         '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 967f756de84b..b5d97916978d 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -124,6 +124,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-appjit-linux-product-x64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-aot-linux-debug-x64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-linux-release-x64-try"
   }
@@ -133,9 +136,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-linux-release-simarm_x64-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-aot-linux-debug-x64-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-linux-debug-simriscv32-try"
   }
@@ -736,6 +736,11 @@ consoles {
     category: "vm|appjit"
     short_name: "p"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-debug-x64"
+    category: "vm|aot"
+    short_name: "d"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-x64"
     category: "vm|aot"
@@ -751,11 +756,6 @@ consoles {
     category: "vm|aot"
     short_name: "ra"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-debug-x64"
-    category: "vm|aot"
-    short_name: "d"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-debug-simriscv32"
     category: "vm|aot"
@@ -1591,6 +1591,11 @@ consoles {
     category: "vm|appjit"
     short_name: "p"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-debug-x64"
+    category: "vm|aot"
+    short_name: "d"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-x64"
     category: "vm|aot"
@@ -1606,11 +1611,6 @@ consoles {
     category: "vm|aot"
     short_name: "ra"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-debug-x64"
-    category: "vm|aot"
-    short_name: "d"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-debug-simriscv32"
     category: "vm|aot"
@@ -2141,6 +2141,11 @@ consoles {
     category: "vm|jit"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-ia32-beta"
+    category: "vm|jit"
+    short_name: "r3"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm-beta"
     category: "vm|jit"
@@ -2196,11 +2201,6 @@ consoles {
     category: "vm|jit"
     short_name: "war"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-debug-x64-beta"
-    category: "vm|appjit"
-    short_name: "d"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-release-x64-beta"
     category: "vm|appjit"
@@ -2566,6 +2566,11 @@ consoles {
     category: "vm|jit"
     short_name: "r"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-ia32-stable"
+    category: "vm|jit"
+    short_name: "r3"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-simarm-stable"
     category: "vm|jit"
@@ -2621,11 +2626,6 @@ consoles {
     category: "vm|jit"
     short_name: "war"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-debug-x64-stable"
-    category: "vm|appjit"
-    short_name: "d"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-appjit-linux-release-x64-stable"
     category: "vm|appjit"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 140468ad6902..174a5a695a1b 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -858,7 +858,9 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    notify_blamelist {}
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
   }
   builders {
     bucket: "ci.sandbox"
@@ -1201,9 +1203,7 @@ notifiers {
 notifiers {
   notifications {
     on_new_failure: true
-    email {
-      recipients: "dart-vm-team-breakages@google.com"
-    }
+    notify_blamelist {}
   }
   builders {
     bucket: "ci.sandbox"
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index ece9a58f60d3..fa12b39e2832 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1604,26 +1604,6 @@ job {
     builder: "vm-appjit-linux-debug-x64"
   }
 }
-job {
-  id: "vm-appjit-linux-debug-x64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-appjit-linux-debug-x64-beta"
-  }
-}
-job {
-  id: "vm-appjit-linux-debug-x64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-appjit-linux-debug-x64-stable"
-  }
-}
 job {
   id: "vm-appjit-linux-product-x64"
   realm: "ci.sandbox"
@@ -2174,6 +2154,26 @@ job {
     builder: "vm-linux-release-ia32"
   }
 }
+job {
+  id: "vm-linux-release-ia32-beta"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-linux-release-ia32-beta"
+  }
+}
+job {
+  id: "vm-linux-release-ia32-stable"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-linux-release-ia32-stable"
+  }
+}
 job {
   id: "vm-linux-release-simarm"
   realm: "ci.sandbox"
@@ -2601,7 +2601,6 @@ trigger {
   triggers: "vm-aot-mac-release-x64-beta"
   triggers: "vm-aot-win-release-arm64-beta"
   triggers: "vm-aot-win-release-x64-beta"
-  triggers: "vm-appjit-linux-debug-x64-beta"
   triggers: "vm-appjit-linux-release-x64-beta"
   triggers: "vm-checked-mac-release-arm64-beta"
   triggers: "vm-ffi-android-debug-arm-beta"
@@ -2615,6 +2614,7 @@ trigger {
   triggers: "vm-linux-debug-simriscv64-beta"
   triggers: "vm-linux-debug-x64-beta"
   triggers: "vm-linux-release-arm64-beta"
+  triggers: "vm-linux-release-ia32-beta"
   triggers: "vm-linux-release-simarm-beta"
   triggers: "vm-linux-release-x64-beta"
   triggers: "vm-mac-debug-arm64-beta"
@@ -2720,7 +2720,6 @@ trigger {
   triggers: "vm-aot-mac-release-x64-stable"
   triggers: "vm-aot-win-release-arm64-stable"
   triggers: "vm-aot-win-release-x64-stable"
-  triggers: "vm-appjit-linux-debug-x64-stable"
   triggers: "vm-appjit-linux-release-x64-stable"
   triggers: "vm-checked-mac-release-arm64-stable"
   triggers: "vm-ffi-android-debug-arm-stable"
@@ -2734,6 +2733,7 @@ trigger {
   triggers: "vm-linux-debug-simriscv64-stable"
   triggers: "vm-linux-debug-x64-stable"
   triggers: "vm-linux-release-arm64-stable"
+  triggers: "vm-linux-release-ia32-stable"
   triggers: "vm-linux-release-simarm-stable"
   triggers: "vm-linux-release-x64-stable"
   triggers: "vm-mac-debug-arm64-stable"
@@ -2773,6 +2773,7 @@ trigger {
   triggers: "vm-aot-win-debug-x64"
   triggers: "vm-aot-win-debug-x64c"
   triggers: "vm-aot-win-product-x64"
+  triggers: "vm-appjit-linux-debug-x64"
   triggers: "vm-appjit-linux-product-x64"
   triggers: "vm-asan-linux-release-arm64"
   triggers: "vm-asan-linux-release-x64"
@@ -2785,7 +2786,6 @@ trigger {
   triggers: "vm-linux-debug-ia32"
   triggers: "vm-linux-debug-simriscv32"
   triggers: "vm-linux-debug-x64c"
-  triggers: "vm-linux-release-ia32"
   triggers: "vm-msan-linux-release-arm64"
   triggers: "vm-msan-linux-release-x64"
   triggers: "vm-msvc-windows"
@@ -2817,7 +2817,6 @@ trigger {
   triggers: "vm-aot-mac-release-x64"
   triggers: "vm-aot-win-release-arm64"
   triggers: "vm-aot-win-release-x64"
-  triggers: "vm-appjit-linux-debug-x64"
   triggers: "vm-appjit-linux-release-x64"
   triggers: "vm-checked-mac-release-arm64"
   triggers: "vm-ffi-android-debug-arm"
@@ -2834,6 +2833,7 @@ trigger {
   triggers: "vm-linux-debug-simriscv64"
   triggers: "vm-linux-debug-x64"
   triggers: "vm-linux-release-arm64"
+  triggers: "vm-linux-release-ia32"
   triggers: "vm-linux-release-simarm"
   triggers: "vm-linux-release-x64"
   triggers: "vm-mac-debug-arm64"
diff --git a/vm.star b/vm.star
index 5c17208a9a48..3946bd1428f9 100644
--- a/vm.star
+++ b/vm.star
@@ -91,7 +91,7 @@ _nightly_builder(
     category = "vm|jit|d3",
     properties = slow_shards,
 )
-_nightly_builder(
+_vm_builder(
     "vm-linux-release-ia32",
     category = "vm|jit|r3",
 )
@@ -167,7 +167,7 @@ _vm_builder(
 )
 
 # vm|appjit
-_vm_builder(
+_nightly_builder(
     "vm-appjit-linux-debug-x64",
     category = "vm|appjit|d",
     properties = slow_shards,
@@ -182,6 +182,11 @@ _nightly_builder(
 )
 
 # vm|aot
+_nightly_builder(
+    "vm-aot-linux-debug-x64",
+    category = "vm|aot|d",
+    properties = slow_shards,
+)
 _vm_builder(
     "vm-aot-linux-release-x64",
     category = "vm|aot|r",
@@ -196,11 +201,6 @@ _vm_builder(
     "vm-aot-linux-release-simarm_x64",
     category = "vm|aot|ra",
 )
-_nightly_builder(
-    "vm-aot-linux-debug-x64",
-    category = "vm|aot|d",
-    properties = slow_shards,
-)
 _nightly_builder(
     "vm-aot-linux-debug-simriscv32",
     category = "vm|aot|rv",

From 8291abe74a2b4bfd924bc6e5f030b17e03618435 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 17 Jun 2025 15:33:30 -0700
Subject: [PATCH 807/826] [infra] Allow Windows builders to run on Windows 11.

Change-Id: I73a975fff58d6cd6626e059a9a4fdca7780995bb
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/435340
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Aprelev <aam@google.com>
---
 generated/cr-buildbucket.cfg | 122 +++++++++++++++++------------------
 lib/dart.star                |   3 +-
 lib/defaults.star            |   7 +-
 pkg.star                     |   3 +-
 vm.star                      |   9 ++-
 5 files changed, 69 insertions(+), 75 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index c3c4ba2a3b9f..80ceb3999cf7 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -314,7 +314,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -345,7 +345,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -376,7 +376,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1264,7 +1264,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1299,7 +1299,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1334,7 +1334,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -1369,7 +1369,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2544,7 +2544,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2579,7 +2579,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -2614,7 +2614,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4139,7 +4139,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4887,7 +4887,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4920,7 +4920,7 @@ buckets {
       name: "pkg-win-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4953,7 +4953,7 @@ buckets {
       name: "pkg-win-release-arm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -4986,7 +4986,7 @@ buckets {
       name: "pkg-win-release-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5020,7 +5020,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -5054,7 +5054,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6322,7 +6322,7 @@ buckets {
       name: "vm-aot-win-debug-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6357,7 +6357,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6390,7 +6390,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6423,7 +6423,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6454,7 +6454,7 @@ buckets {
       name: "vm-aot-win-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6487,7 +6487,7 @@ buckets {
       name: "vm-aot-win-release-arm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6520,7 +6520,7 @@ buckets {
       name: "vm-aot-win-release-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6554,7 +6554,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6585,7 +6585,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6616,7 +6616,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -6906,7 +6906,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9261,7 +9261,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9487,7 +9487,7 @@ buckets {
       name: "vm-win-debug-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9522,7 +9522,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9554,7 +9554,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9586,7 +9586,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9618,7 +9618,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9649,7 +9649,7 @@ buckets {
       name: "vm-win-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9682,7 +9682,7 @@ buckets {
       name: "vm-win-release-arm64-beta"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9715,7 +9715,7 @@ buckets {
       name: "vm-win-release-arm64-stable"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9749,7 +9749,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9780,7 +9780,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9811,7 +9811,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -9966,7 +9966,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10256,7 +10256,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10291,7 +10291,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -10647,7 +10647,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11158,7 +11158,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11507,7 +11507,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11840,7 +11840,7 @@ buckets {
       name: "pkg-win-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -11874,7 +11874,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12642,7 +12642,7 @@ buckets {
       name: "vm-aot-win-debug-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12677,7 +12677,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12710,7 +12710,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12743,7 +12743,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12774,7 +12774,7 @@ buckets {
       name: "vm-aot-win-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -12808,7 +12808,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -13036,7 +13036,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14111,7 +14111,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14337,7 +14337,7 @@ buckets {
       name: "vm-win-debug-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14372,7 +14372,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14404,7 +14404,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14435,7 +14435,7 @@ buckets {
       name: "vm-win-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:arm64"
-      dimensions: "os:Windows-11"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.flutter.prod"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
@@ -14469,7 +14469,7 @@ buckets {
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
-      dimensions: "os:Windows-10"
+      dimensions: "os:Windows"
       dimensions: "pool:luci.dart.try"
       exe {
         cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
diff --git a/lib/dart.star b/lib/dart.star
index 9b09cb4988c4..69597805cbe0 100644
--- a/lib/dart.star
+++ b/lib/dart.star
@@ -14,7 +14,6 @@ load(
     "mac",
     "noble",
     "windows",
-    "windows11",
 )
 load("//lib/paths.star", "paths")
 load("//lib/priority.star", "priority")
@@ -206,7 +205,7 @@ def _builder(
         if os_pattern in name and os not in expected_os:
             fail("builder %s should be a %s builder but was %s" % (name, expected_os, os))
 
-    expect_os("-win", [windows["os"], windows11["os"]])
+    expect_os("-win", windows["os"])
     expect_os("-linux", [linux["os"], jammy["os"], noble["os"]])
     expect_os("-mac", mac["os"])
 
diff --git a/lib/defaults.star b/lib/defaults.star
index 2f9e15003ac0..023d28a5d61a 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -36,8 +36,7 @@ _ARM64 = {"cpu": "arm64"}
 _MAC = {"os": "Mac"}
 _JAMMY = {"os": "Ubuntu-22"}
 _NOBLE = {"os": "Ubuntu-24"}
-_WINDOWS10 = {"os": "Windows-10"}
-_WINDOWS11 = {"os": "Windows-11"}
+_WINDOWS = {"os": "Windows"}
 
 _FLUTTER_POOL = {"pool": "luci.flutter.prod"}
 _EXPERIMENTAL = {"host_class": "experimental"}
@@ -57,9 +56,7 @@ jammy = _JAMMY
 linux = _JAMMY
 mac = _MAC
 noble = _NOBLE
-windows = _WINDOWS10
-windows10 = _WINDOWS10
-windows11 = _WINDOWS11
+windows = _WINDOWS
 
 # Properties
 
diff --git a/pkg.star b/pkg.star
index 5cae9dcf263d..0d4aea9b6368 100644
--- a/pkg.star
+++ b/pkg.star
@@ -15,7 +15,6 @@ load(
     "no_android",
     "no_reclient",
     "windows",
-    "windows11",
 )
 load("//lib/paths.star", "paths")
 
@@ -51,7 +50,7 @@ dart.ci_sandbox_builder(
 dart.ci_sandbox_builder(
     "pkg-win-release-arm64",
     category = "pkg|wa",
-    dimensions = [windows11, arm64, flutter_pool],
+    dimensions = [windows, arm64, flutter_pool],
     properties = [no_reclient],
 )
 dart.ci_sandbox_builder(
diff --git a/vm.star b/vm.star
index 3946bd1428f9..4ca4d9c6adf8 100644
--- a/vm.star
+++ b/vm.star
@@ -20,7 +20,6 @@ load(
     "noble",
     "slow_shards",
     "windows",
-    "windows11",
 )
 load("//lib/helpers.star", "union")
 load("//lib/paths.star", "paths")
@@ -156,13 +155,13 @@ _vm_builder(
 _nightly_builder(
     "vm-win-debug-arm64",
     category = "vm|jit|wad",
-    dimensions = [windows11, arm64, flutter_pool],
+    dimensions = [windows, arm64, flutter_pool],
     properties = [no_reclient],
 )
 _vm_builder(
     "vm-win-release-arm64",
     category = "vm|jit|war",
-    dimensions = [windows11, arm64, flutter_pool],
+    dimensions = [windows, arm64, flutter_pool],
     properties = [no_reclient],
 )
 
@@ -250,13 +249,13 @@ _vm_builder(
 _nightly_builder(
     "vm-aot-win-debug-arm64",
     category = "vm|aot|wad",
-    dimensions = [windows11, arm64, flutter_pool],
+    dimensions = [windows, arm64, flutter_pool],
     properties = [no_reclient],
 )
 _vm_builder(
     "vm-aot-win-release-arm64",
     category = "vm|aot|war",
-    dimensions = [windows11, arm64, flutter_pool],
+    dimensions = [windows, arm64, flutter_pool],
     properties = [no_reclient],
 )
 

From 78c810a993f38dc7ad239c4d6e14b9745c0a319c Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 23 Jun 2025 15:15:33 -0700
Subject: [PATCH 808/826] [infra] Add vm-linux-debug-arm64 and
 vm-aot-linux-debug-arm64 as nightly builders.

Re-order some Mac builders for consistency.

Change-Id: I17b3eb08c44d31593dd4f0c5a4dad6bbe4e1257e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/436482
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Aprelev <aam@google.com>
---
 generated/commit-queue.cfg   |   8 +++
 generated/cr-buildbucket.cfg | 128 +++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      | 128 +++++++++++++++++++++--------------
 generated/luci-notify.cfg    |  26 +++++++
 generated/luci-scheduler.cfg |  22 ++++++
 generated/project.cfg        |   2 +-
 vm.star                      |  42 +++++++-----
 7 files changed, 288 insertions(+), 68 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 262c229fe7e1..a53dbd8337f9 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -4592,6 +4592,10 @@ config_groups {
           path_regexp: "pkg/(dart2bytecode|dynamic_modules)/.+"
         }
       }
+      builders {
+        name: "dart/try/vm-aot-linux-debug-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-linux-debug-simarm_x64-try"
         includable_only: true
@@ -4908,6 +4912,10 @@ config_groups {
         name: "dart/try/vm-gcc-linux-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-linux-debug-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-linux-debug-ia32-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 80ceb3999cf7..a4f9de8dfb45 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5388,6 +5388,38 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-linux-debug-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-linux-debug-simarm_x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -8081,6 +8113,38 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-linux-debug-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-linux-debug-ia32"
       swarming_host: "chromium-swarm.appspot.com"
@@ -12102,6 +12166,38 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-linux-debug-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-linux-debug-simarm_x64-try"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13607,6 +13703,38 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-linux-debug-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-linux-debug-ia32-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index b5d97916978d..bbec779a8221 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -86,22 +86,25 @@ consoles {
     name: "buildbucket/luci.dart.try/vm-linux-debug-simriscv64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-linux-release-arm64-try"
+    name: "buildbucket/luci.dart.try/vm-linux-debug-arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-mac-debug-arm64-try"
+    name: "buildbucket/luci.dart.try/vm-linux-release-arm64-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-mac-debug-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-mac-release-arm64-try"
+    name: "buildbucket/luci.dart.try/vm-mac-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-checked-mac-release-arm64-try"
+    name: "buildbucket/luci.dart.try/vm-mac-debug-arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-mac-release-x64-try"
+    name: "buildbucket/luci.dart.try/vm-mac-release-arm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-checked-mac-release-arm64-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-win-debug-x64-try"
@@ -142,6 +145,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-linux-debug-simriscv64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-aot-linux-debug-arm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-linux-release-arm64-try"
   }
@@ -672,14 +678,14 @@ consoles {
     short_name: "rv"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-arm64"
     category: "vm|jit"
-    short_name: "a6"
+    short_name: "da"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-arm64"
     category: "vm|jit"
-    short_name: "m1d"
+    short_name: "ra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64"
@@ -687,19 +693,24 @@ consoles {
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64"
     category: "vm|jit"
-    short_name: "m1r"
+    short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-checked-mac-release-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-arm64"
     category: "vm|jit"
-    short_name: "rc"
+    short_name: "mda"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-arm64"
     category: "vm|jit"
-    short_name: "mr"
+    short_name: "mra"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-checked-mac-release-arm64"
+    category: "vm|jit"
+    short_name: "mc"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64"
@@ -766,10 +777,15 @@ consoles {
     category: "vm|aot"
     short_name: "rv"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-debug-arm64"
+    category: "vm|aot"
+    short_name: "da"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-arm64"
     category: "vm|aot"
-    short_name: "a6"
+    short_name: "ra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-debug-x64"
@@ -1527,14 +1543,14 @@ consoles {
     short_name: "rv"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-debug-arm64"
     category: "vm|jit"
-    short_name: "a6"
+    short_name: "da"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-arm64"
     category: "vm|jit"
-    short_name: "m1d"
+    short_name: "ra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64"
@@ -1542,19 +1558,24 @@ consoles {
     short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64"
     category: "vm|jit"
-    short_name: "m1r"
+    short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-checked-mac-release-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-arm64"
+    category: "vm|jit"
+    short_name: "mda"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-arm64"
     category: "vm|jit"
-    short_name: "rc"
+    short_name: "mra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-checked-mac-release-arm64"
     category: "vm|jit"
-    short_name: "mr"
+    short_name: "mc"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64"
@@ -1621,10 +1642,15 @@ consoles {
     category: "vm|aot"
     short_name: "rv"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-debug-arm64"
+    category: "vm|aot"
+    short_name: "da"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-arm64"
     category: "vm|aot"
-    short_name: "a6"
+    short_name: "ra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-debug-x64"
@@ -2159,32 +2185,32 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-arm64-beta"
     category: "vm|jit"
-    short_name: "a6"
+    short_name: "ra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-arm64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64-beta"
     category: "vm|jit"
-    short_name: "m1d"
+    short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64-beta"
     category: "vm|jit"
-    short_name: "md"
+    short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-arm64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-arm64-beta"
     category: "vm|jit"
-    short_name: "m1r"
+    short_name: "mda"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-checked-mac-release-arm64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-arm64-beta"
     category: "vm|jit"
-    short_name: "rc"
+    short_name: "mra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64-beta"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-checked-mac-release-arm64-beta"
     category: "vm|jit"
-    short_name: "mr"
+    short_name: "mc"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64-beta"
@@ -2224,7 +2250,7 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-arm64-beta"
     category: "vm|aot"
-    short_name: "a6"
+    short_name: "ra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-x64-beta"
@@ -2584,32 +2610,32 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-linux-release-arm64-stable"
     category: "vm|jit"
-    short_name: "a6"
+    short_name: "ra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-arm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64-stable"
     category: "vm|jit"
-    short_name: "m1d"
+    short_name: "md"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64-stable"
     category: "vm|jit"
-    short_name: "md"
+    short_name: "mr"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-arm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-debug-arm64-stable"
     category: "vm|jit"
-    short_name: "m1r"
+    short_name: "mda"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-checked-mac-release-arm64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-arm64-stable"
     category: "vm|jit"
-    short_name: "rc"
+    short_name: "mra"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-mac-release-x64-stable"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-checked-mac-release-arm64-stable"
     category: "vm|jit"
-    short_name: "mr"
+    short_name: "mc"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64-stable"
@@ -2649,7 +2675,7 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-release-arm64-stable"
     category: "vm|aot"
-    short_name: "a6"
+    short_name: "ra"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-mac-release-x64-stable"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 174a5a695a1b..f9e655690039 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -585,6 +585,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-linux-debug-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
@@ -1128,6 +1141,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-linux-debug-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index fa12b39e2832..b976adb55382 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1214,6 +1214,16 @@ job {
     builder: "vm-aot-dyn-linux-product-x64"
   }
 }
+job {
+  id: "vm-aot-linux-debug-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-linux-debug-arm64"
+  }
+}
 job {
   id: "vm-aot-linux-debug-simarm_x64"
   realm: "ci.sandbox"
@@ -2024,6 +2034,16 @@ job {
     builder: "vm-gcc-linux"
   }
 }
+job {
+  id: "vm-linux-debug-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-linux-debug-arm64"
+  }
+}
 job {
   id: "vm-linux-debug-ia32"
   realm: "ci.sandbox"
@@ -2759,6 +2779,7 @@ trigger {
   triggers: "iso-stress-linux-arm64"
   triggers: "vm-aot-dwarf-linux-product-x64"
   triggers: "vm-aot-dyn-linux-product-x64"
+  triggers: "vm-aot-linux-debug-arm64"
   triggers: "vm-aot-linux-debug-simriscv32"
   triggers: "vm-aot-linux-debug-simriscv64"
   triggers: "vm-aot-linux-debug-x64"
@@ -2783,6 +2804,7 @@ trigger {
   triggers: "vm-eager-optimization-linux-release-x64"
   triggers: "vm-ffi-mac-release-simarm64_arm64"
   triggers: "vm-gcc-linux"
+  triggers: "vm-linux-debug-arm64"
   triggers: "vm-linux-debug-ia32"
   triggers: "vm-linux-debug-simriscv32"
   triggers: "vm-linux-debug-x64c"
diff --git a/generated/project.cfg b/generated/project.cfg
index 2925bf59beaa..c4dbb767920a 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.45.3"
+  version: "1.45.4"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/vm.star b/vm.star
index 4ca4d9c6adf8..8e8951414ebc 100644
--- a/vm.star
+++ b/vm.star
@@ -106,17 +106,15 @@ _vm_builder(
     "vm-linux-debug-simriscv64",
     category = "vm|jit|rv",
 )
-_vm_builder(
-    "vm-linux-release-arm64",
-    category = "vm|jit|a6",
+_nightly_builder(
+    "vm-linux-debug-arm64",
+    category = "vm|jit|da",
     dimensions = [arm64],
 )
 _vm_builder(
-    "vm-mac-debug-arm64",
-    category = "vm|jit|m1d",
-    dimensions = [mac, arm64],
-    properties = [no_android, slow_shards],
-    on_cq = True,
+    "vm-linux-release-arm64",
+    category = "vm|jit|ra",
+    dimensions = [arm64],
 )
 _vm_builder(
     "vm-mac-debug-x64",
@@ -124,22 +122,29 @@ _vm_builder(
     dimensions = mac,
     properties = slow_shards,
 )
+_vm_builder(
+    "vm-mac-release-x64",
+    category = "vm|jit|mr",
+    dimensions = mac,
+)
+_vm_builder(
+    "vm-mac-debug-arm64",
+    category = "vm|jit|mda",
+    dimensions = [mac, arm64],
+    properties = [no_android, slow_shards],
+    on_cq = True,
+)
 _vm_builder(
     "vm-mac-release-arm64",
-    category = "vm|jit|m1r",
+    category = "vm|jit|mra",
     dimensions = [mac, arm64],
     properties = no_android,
 )
 _vm_builder(
     "vm-checked-mac-release-arm64",
-    category = "vm|jit|rc",
+    category = "vm|jit|mc",
     dimensions = [mac, arm64],
 )
-_vm_builder(
-    "vm-mac-release-x64",
-    category = "vm|jit|mr",
-    dimensions = mac,
-)
 _vm_builder(
     "vm-win-debug-x64",
     category = "vm|jit|wd",
@@ -210,9 +215,14 @@ _nightly_builder(
     category = "vm|aot|rv",
     properties = [slow_shards],
 )
+_nightly_builder(
+    "vm-aot-linux-debug-arm64",
+    category = "vm|aot|da",
+    dimensions = [arm64],
+)
 _vm_builder(
     "vm-aot-linux-release-arm64",
-    category = "vm|aot|a6",
+    category = "vm|aot|ra",
     dimensions = [arm64],
 )
 _nightly_builder(

From a815bc32500d753ef57e889f28b33d1e3eb9a4bd Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 30 Jun 2025 09:36:47 -0700
Subject: [PATCH 809/826] [infra] Remove vm-checked-mac-release-arm64.

Checked mode doesn't exist any more. This builder just enables asserts, but there are plently of narrower tests of asserts.

Change-Id: I289a7bbfde591afae138b9bcfab23ddaebe5a74f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/437104
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Siva Annamalai <asiva@google.com>
---
 generated/commit-queue.cfg   |  12 ---
 generated/cr-buildbucket.cfg | 144 -----------------------------------
 generated/luci-milo.cfg      |  23 ------
 generated/luci-notify.cfg    |  11 ---
 generated/luci-scheduler.cfg |  33 --------
 generated/project.cfg        |   2 +-
 vm.star                      |   5 --
 7 files changed, 1 insertion(+), 229 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index a53dbd8337f9..5c682d2ab37b 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -2065,10 +2065,6 @@ config_groups {
         name: "dart/try/vm-appjit-linux-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-checked-mac-release-arm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-ffi-android-debug-arm-try"
         includable_only: true
@@ -4843,10 +4839,6 @@ config_groups {
         name: "dart/try/vm-asan-win-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-checked-mac-release-arm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-dyn-linux-debug-x64-try"
         location_filters {
@@ -7163,10 +7155,6 @@ config_groups {
         name: "dart/try/vm-appjit-linux-release-x64-try"
         includable_only: true
       }
-      builders {
-        name: "dart/try/vm-checked-mac-release-arm64-try"
-        includable_only: true
-      }
       builders {
         name: "dart/try/vm-ffi-android-debug-arm-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index a4f9de8dfb45..8a89a202c5f1 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -6965,114 +6965,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-checked-mac-release-arm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 50
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-        wait_for_warm_cache_secs: 60
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-checked-mac-release-arm64-beta"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 60
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-        wait_for_warm_cache_secs: 60
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "vm-checked-mac-release-arm64-stable"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 60
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-        wait_for_warm_cache_secs: 60
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-dyn-linux-debug-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13159,42 +13051,6 @@ buckets {
         value: 100
       }
     }
-    builders {
-      name: "vm-checked-mac-release-arm64-try"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:arm64"
-      dimensions: "host_class:default"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.dart.try"
-      exe {
-        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/swarming": {'
-        '    "server": "https://chromium-swarm.appspot.com"'
-        '  },'
-        '  "clobber": false,'
-        '  "recipe": "dart/neo"'
-        '}'
-      priority: 30
-      caches {
-        name: "osx_sdk"
-        path: "osx_sdk"
-        wait_for_warm_cache_secs: 60
-      }
-      build_numbers: YES
-      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
     builders {
       name: "vm-dyn-linux-debug-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index bbec779a8221..f361a82f978f 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -103,9 +103,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-mac-release-arm64-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-checked-mac-release-arm64-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-win-debug-x64-try"
   }
@@ -707,11 +704,6 @@ consoles {
     category: "vm|jit"
     short_name: "mra"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-checked-mac-release-arm64"
-    category: "vm|jit"
-    short_name: "mc"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64"
     category: "vm|jit"
@@ -1572,11 +1564,6 @@ consoles {
     category: "vm|jit"
     short_name: "mra"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-checked-mac-release-arm64"
-    category: "vm|jit"
-    short_name: "mc"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64"
     category: "vm|jit"
@@ -2207,11 +2194,6 @@ consoles {
     category: "vm|jit"
     short_name: "mra"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-checked-mac-release-arm64-beta"
-    category: "vm|jit"
-    short_name: "mc"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64-beta"
     category: "vm|jit"
@@ -2632,11 +2614,6 @@ consoles {
     category: "vm|jit"
     short_name: "mra"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-checked-mac-release-arm64-stable"
-    category: "vm|jit"
-    short_name: "mc"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-win-debug-x64-stable"
     category: "vm|jit"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index f9e655690039..94c09b11fa5f 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -957,17 +957,6 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
-notifiers {
-  notifications {
-    on_new_failure: true
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci.sandbox"
-    name: "vm-checked-mac-release-arm64"
-    repository: "https://dart.googlesource.com/sdk"
-  }
-}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index b976adb55382..7fb80d80a7bf 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1694,36 +1694,6 @@ job {
     builder: "vm-asan-win-release-x64"
   }
 }
-job {
-  id: "vm-checked-mac-release-arm64"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-checked-mac-release-arm64"
-  }
-}
-job {
-  id: "vm-checked-mac-release-arm64-beta"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-checked-mac-release-arm64-beta"
-  }
-}
-job {
-  id: "vm-checked-mac-release-arm64-stable"
-  realm: "ci.sandbox"
-  schedule: "triggered"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci.sandbox"
-    builder: "vm-checked-mac-release-arm64-stable"
-  }
-}
 job {
   id: "vm-dyn-linux-debug-x64"
   realm: "ci.sandbox"
@@ -2622,7 +2592,6 @@ trigger {
   triggers: "vm-aot-win-release-arm64-beta"
   triggers: "vm-aot-win-release-x64-beta"
   triggers: "vm-appjit-linux-release-x64-beta"
-  triggers: "vm-checked-mac-release-arm64-beta"
   triggers: "vm-ffi-android-debug-arm-beta"
   triggers: "vm-ffi-android-debug-arm64c-beta"
   triggers: "vm-ffi-android-product-arm-beta"
@@ -2741,7 +2710,6 @@ trigger {
   triggers: "vm-aot-win-release-arm64-stable"
   triggers: "vm-aot-win-release-x64-stable"
   triggers: "vm-appjit-linux-release-x64-stable"
-  triggers: "vm-checked-mac-release-arm64-stable"
   triggers: "vm-ffi-android-debug-arm-stable"
   triggers: "vm-ffi-android-debug-arm64c-stable"
   triggers: "vm-ffi-android-product-arm-stable"
@@ -2840,7 +2808,6 @@ trigger {
   triggers: "vm-aot-win-release-arm64"
   triggers: "vm-aot-win-release-x64"
   triggers: "vm-appjit-linux-release-x64"
-  triggers: "vm-checked-mac-release-arm64"
   triggers: "vm-ffi-android-debug-arm"
   triggers: "vm-ffi-android-debug-arm64c"
   triggers: "vm-ffi-android-product-arm"
diff --git a/generated/project.cfg b/generated/project.cfg
index c4dbb767920a..53a26e700d78 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.45.4"
+  version: "1.45.5"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/vm.star b/vm.star
index 8e8951414ebc..ca2421ea68fa 100644
--- a/vm.star
+++ b/vm.star
@@ -140,11 +140,6 @@ _vm_builder(
     dimensions = [mac, arm64],
     properties = no_android,
 )
-_vm_builder(
-    "vm-checked-mac-release-arm64",
-    category = "vm|jit|mc",
-    dimensions = [mac, arm64],
-)
 _vm_builder(
     "vm-win-debug-x64",
     category = "vm|jit|wd",

From 015c9b4620aafb61c919aff9ecd1935c022198cb Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 30 Jun 2025 10:54:50 -0700
Subject: [PATCH 810/826] [infra] Add nightly Android debug builders.

Change-Id: I1b982e9e7147faeda26eb354709ff7d98f3f5743
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/437122
Reviewed-by: Alexander Aprelev <aam@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/commit-queue.cfg   |   8 ++
 generated/cr-buildbucket.cfg | 144 +++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      |  42 ++++++++--
 generated/luci-notify.cfg    |  26 +++++++
 generated/luci-scheduler.cfg |  22 ++++++
 vm.star                      |  14 +++-
 6 files changed, 246 insertions(+), 10 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 5c682d2ab37b..43cde217ede3 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -4558,6 +4558,14 @@ config_groups {
         name: "dart/try/stable-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-aot-android-debug-arm64c-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-aot-android-debug-arm_x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-aot-android-release-arm64c-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 8a89a202c5f1..926bf9d1d62d 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -5083,6 +5083,78 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-android-debug-arm64c"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-aot-android-debug-arm_x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-android-release-arm64c"
       swarming_host: "chromium-swarm.appspot.com"
@@ -11893,6 +11965,78 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-aot-android-debug-arm64c-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-aot-android-debug-arm_x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-22"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "download_android_deps": true'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-aot-android-release-arm64c-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index f361a82f978f..2843274466fd 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -172,9 +172,15 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-win-release-arm64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-aot-android-debug-arm_x64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-android-release-arm_x64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-aot-android-debug-arm64c-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-android-release-arm64c-try"
   }
@@ -819,15 +825,25 @@ consoles {
     category: "vm|aot"
     short_name: "war"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-debug-arm_x64"
+    category: "vm|aot|android"
+    short_name: "d3"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm_x64"
     category: "vm|aot|android"
-    short_name: "a32"
+    short_name: "r3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-debug-arm64c"
+    category: "vm|aot|android"
+    short_name: "d6"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm64c"
     category: "vm|aot|android"
-    short_name: "a64"
+    short_name: "r6"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-product-x64"
@@ -1679,15 +1695,25 @@ consoles {
     category: "vm|aot"
     short_name: "war"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-debug-arm_x64"
+    category: "vm|aot|android"
+    short_name: "d3"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm_x64"
     category: "vm|aot|android"
-    short_name: "a32"
+    short_name: "r3"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-debug-arm64c"
+    category: "vm|aot|android"
+    short_name: "d6"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm64c"
     category: "vm|aot|android"
-    short_name: "a64"
+    short_name: "r6"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-linux-product-x64"
@@ -2257,12 +2283,12 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm_x64-beta"
     category: "vm|aot|android"
-    short_name: "a32"
+    short_name: "r3"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm64c-beta"
     category: "vm|aot|android"
-    short_name: "a64"
+    short_name: "r6"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-beta"
@@ -2677,12 +2703,12 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm_x64-stable"
     category: "vm|aot|android"
-    short_name: "a32"
+    short_name: "r3"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-aot-android-release-arm64c-stable"
     category: "vm|aot|android"
-    short_name: "a64"
+    short_name: "r6"
   }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm-stable"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 94c09b11fa5f..6af641f89800 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -526,6 +526,32 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-android-debug-arm64c"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-aot-android-debug-arm_x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 7fb80d80a7bf..01707dc0509b 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1124,6 +1124,26 @@ job {
     builder: "pkg-win-release-stable"
   }
 }
+job {
+  id: "vm-aot-android-debug-arm64c"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-android-debug-arm64c"
+  }
+}
+job {
+  id: "vm-aot-android-debug-arm_x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-aot-android-debug-arm_x64"
+  }
+}
 job {
   id: "vm-aot-android-release-arm64c"
   realm: "ci.sandbox"
@@ -2745,6 +2765,8 @@ trigger {
   triggers: "front-end-nnbd-mac-release-x64"
   triggers: "front-end-nnbd-win-release-x64"
   triggers: "iso-stress-linux-arm64"
+  triggers: "vm-aot-android-debug-arm64c"
+  triggers: "vm-aot-android-debug-arm_x64"
   triggers: "vm-aot-dwarf-linux-product-x64"
   triggers: "vm-aot-dyn-linux-product-x64"
   triggers: "vm-aot-linux-debug-arm64"
diff --git a/vm.star b/vm.star
index ca2421ea68fa..0bef625ba366 100644
--- a/vm.star
+++ b/vm.star
@@ -265,14 +265,24 @@ _vm_builder(
 )
 
 # vm|aot|android
+_nightly_builder(
+    "vm-aot-android-debug-arm_x64",
+    category = "vm|aot|android|d3",
+    properties = [android_deps, slow_shards],
+)
 _vm_builder(
     "vm-aot-android-release-arm_x64",
-    category = "vm|aot|android|a32",
+    category = "vm|aot|android|r3",
+    properties = [android_deps, slow_shards],
+)
+_nightly_builder(
+    "vm-aot-android-debug-arm64c",
+    category = "vm|aot|android|d6",
     properties = [android_deps, slow_shards],
 )
 _vm_builder(
     "vm-aot-android-release-arm64c",
-    category = "vm|aot|android|a64",
+    category = "vm|aot|android|r6",
     properties = [android_deps, slow_shards],
 )
 

From 2a4cc5c1eaa144c8c2a7214eafb2ef43a444daf6 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 15 Jul 2025 09:39:02 -0700
Subject: [PATCH 811/826] [infra] Enable clobbering on the front end builders
 to temporarily work around a test consuming stale inputs.

Bug: https://github.com/dart-lang/sdk/issues/61120
Change-Id: I489394c568c07840814b7a49fdf0bc61aa975930
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/440521
Reviewed-by: Ivan Inozemtsev <iinozemtsev@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Aprelev <aam@google.com>
---
 cfe.star                     |  6 ++++++
 generated/cr-buildbucket.cfg | 30 +++++++++++++++---------------
 generated/project.cfg        |  2 +-
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/cfe.star b/cfe.star
index 94ca353b0b31..7a0bfc5700b8 100644
--- a/cfe.star
+++ b/cfe.star
@@ -24,23 +24,27 @@ dart.ci_sandbox_builder(
     "front-end-linux-release-x64",
     category = "cfe|l",
     on_cq = True,
+    properties = {"clobber": True},  # https://github.com/dart-lang/sdk/issues/61120
 )
 dart.ci_sandbox_builder(
     "front-end-nnbd-linux-release-x64",
     category = "cfe|nnbd|l",
     location_filters = paths.to_location_filters(paths.cfe),
+    properties = {"clobber": True},  # https://github.com/dart-lang/sdk/issues/61120
 )
 cron.nightly_builder(
     "front-end-nnbd-mac-release-x64",
     category = "cfe|nnbd|m",
     channels = ["try"],
     dimensions = mac,
+    properties = {"clobber": True},  # https://github.com/dart-lang/sdk/issues/61120
 )
 cron.nightly_builder(
     "front-end-nnbd-win-release-x64",
     category = "cfe|nnbd|w",
     channels = ["try"],
     dimensions = windows,
+    properties = {"clobber": True},  # https://github.com/dart-lang/sdk/issues/61120
 )
 dart.ci_sandbox_builder(
     "flutter-frontend",
@@ -48,10 +52,12 @@ dart.ci_sandbox_builder(
     channels = ["try"],
     notifies = "frontend-team",
     location_filters = paths.to_location_filters(paths.cfe_only),
+    properties = {"clobber": True},  # https://github.com/dart-lang/sdk/issues/61120
 )
 cron.weekly_builder(
     "frontend-weekly",
     notifies = "frontend-team",
     channels = [],
     execution_timeout = 12 * time.hour,
+    properties = {"clobber": True},  # https://github.com/dart-lang/sdk/issues/61120
 )
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 926bf9d1d62d..bae5806ec87e 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -2695,7 +2695,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -3932,7 +3932,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -3963,7 +3963,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -3994,7 +3994,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -4025,7 +4025,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4056,7 +4056,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -4087,7 +4087,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -4118,7 +4118,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -4154,7 +4154,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -4185,7 +4185,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -11333,7 +11333,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11452,7 +11452,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11483,7 +11483,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11514,7 +11514,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11550,7 +11550,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
diff --git a/generated/project.cfg b/generated/project.cfg
index 53a26e700d78..3681a28eb68d 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.45.5"
+  version: "1.45.6"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"

From 53995eddf0f236777030103e2e2232f6e343f2fb Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 21 Jul 2025 09:57:42 -0700
Subject: [PATCH 812/826] [infra] Disable RBE and enable clobber on the SDK try
 builders to match the regular SDK builders.

Change-Id: I6c881bbd131041522130c41bba3a8ec9d4febe2c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/440522
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Ivan Inozemtsev <iinozemtsev@google.com>
---
 generated/cr-buildbucket.cfg | 35 +++++++++++++++++++++++++++-------
 sdk.star                     | 37 +++++++++++++++++++++++++++++-------
 2 files changed, 58 insertions(+), 14 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index bae5806ec87e..a49203c9441b 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -10102,6 +10102,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10112,7 +10115,7 @@ buckets {
         '    "arm",'
         '    "arm64"'
         '  ],'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "disable_bcid": true,'
         '  "recipe": "release/sdk"'
         '}'
@@ -10138,6 +10141,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10147,7 +10153,7 @@ buckets {
         '  "archs": ['
         '    "riscv64"'
         '  ],'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "disable_bcid": true,'
         '  "recipe": "release/sdk"'
         '}'
@@ -10173,6 +10179,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10182,7 +10191,7 @@ buckets {
         '  "archs": ['
         '    "x64"'
         '  ],'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "dartdoc_arch": "x64",'
         '  "disable_bcid": true,'
         '  "recipe": "release/sdk",'
@@ -10210,6 +10219,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10219,7 +10231,7 @@ buckets {
         '  "archs": ['
         '    "arm64"'
         '  ],'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -10253,6 +10265,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10262,7 +10277,7 @@ buckets {
         '  "archs": ['
         '    "x64"'
         '  ],'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "disable_bcid": true,'
         '  "recipe": "release/sdk"'
         '}'
@@ -10293,6 +10308,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10302,7 +10320,7 @@ buckets {
         '  "archs": ['
         '    "arm64"'
         '  ],'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "disable_bcid": true,'
         '  "recipe": "release/sdk"'
         '}'
@@ -10328,6 +10346,9 @@ buckets {
       }
       properties:
         '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
         '  },'
@@ -10337,7 +10358,7 @@ buckets {
         '  "archs": ['
         '    "x64"'
         '  ],'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "disable_bcid": true,'
         '  "recipe": "release/sdk"'
         '}'
diff --git a/sdk.star b/sdk.star
index ed7c01cb228d..4c5fb9c4dcce 100644
--- a/sdk.star
+++ b/sdk.star
@@ -54,12 +54,14 @@ dart.try_builder(
     "dart-sdk-linux",
     properties = {
         "archs": ["x64"],
+        "clobber": True,  # To match the regular SDK builder
         "dartdoc_arch": "x64",
         "disable_bcid": True,
         "upload_version": True,
     },
     location_filters = paths.to_location_filters(paths.release),
     recipe = "release/sdk",
+    rbe = False,  # To match the regular SDK builder
 )
 
 dart.try_builder(
@@ -67,53 +69,74 @@ dart.try_builder(
     dimensions = [arm64],
     properties = {
         "archs": ["arm", "arm64"],
+        "clobber": True,  # To match the regular SDK builder
         "disable_bcid": True,
     },
     location_filters = paths.to_location_filters(paths.release),
     recipe = "release/sdk",
+    rbe = False,  # To match the regular SDK builder
 )
 
 dart.try_builder(
     "dart-sdk-linux-riscv64",
     properties = {
         "archs": ["riscv64"],
+        "clobber": True,  # To match the regular SDK builder
         "disable_bcid": True,
     },
     recipe = "release/sdk",
+    rbe = False,  # To match the regular SDK builder
 )
 
 dart.try_builder(
     "dart-sdk-mac",
     dimensions = [mac, arm64],
-    properties = [{"archs": ["x64"], "disable_bcid": True}],
+    properties = {
+        "archs": ["x64"],
+        "clobber": True,  # To match the regular SDK builder
+        "disable_bcid": True,
+    },
     location_filters = paths.to_location_filters(paths.release),
     recipe = "release/sdk",
+    rbe = False,  # To match the regular SDK builder
 )
 
 dart.try_builder(
     "dart-sdk-mac-arm64",
     dimensions = [mac, arm64],
-    properties = [
-        no_android,
-        {"archs": ["arm64"], "disable_bcid": True},
-    ],
+    properties = [no_android, {
+        "archs": ["arm64"],
+        "clobber": True,  # To match the regular SDK builder
+        "disable_bcid": True,
+    }],
     location_filters = paths.to_location_filters(paths.release),
     recipe = "release/sdk",
+    rbe = False,  # To match the regular SDK builder
 )
 
 dart.try_builder(
     "dart-sdk-win",
     dimensions = windows,
-    properties = {"archs": ["x64"], "disable_bcid": True},
+    properties = {
+        "archs": ["x64"],
+        "clobber": True,  # To match the regular SDK builder
+        "disable_bcid": True,
+    },
     recipe = "release/sdk",
+    rbe = False,  # To match the regular SDK builder
 )
 
 dart.try_builder(
     "dart-sdk-win-arm64",
     dimensions = windows,
-    properties = {"archs": ["arm64"], "disable_bcid": True},
+    properties = {
+        "archs": ["arm64"],
+        "clobber": True,  # To match the regular SDK builder
+        "disable_bcid": True,
+    },
     location_filters = paths.to_location_filters(paths.release),
     recipe = "release/sdk",
+    rbe = False,  # To match the regular SDK builder
 )
 
 dart.ci_sandbox_builder(

From 1fdbe8c4bddba69240d13e0fc679ac8fee4b2926 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Mon, 11 Aug 2025 02:18:49 -0700
Subject: [PATCH 813/826] [infra] Remove deleted debian builders from consoles

Bug: https://github.com/dart-lang/sdk/issues/26953
Change-Id: If294e8abaa5d605c4e2e9085dace976d1359997a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/444560
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: Ivan Inozemtsev <iinozemtsev@google.com>
Commit-Queue: Ivan Inozemtsev <iinozemtsev@google.com>
---
 generated/luci-milo.cfg | 25 -------------------------
 sdk.star                |  6 ------
 2 files changed, 31 deletions(-)

diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 2843274466fd..59088ff5425a 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -575,11 +575,6 @@ consoles {
     category: "sdk"
     short_name: "wa"
   }
-  builders {
-    name: "buildbucket/luci.dart-internal.ci/debian-x64-main"
-    category: "sdk"
-    short_name: "dp"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/google"
     category: "sdk"
@@ -1295,11 +1290,6 @@ consoles {
     category: "sdk"
     short_name: "wa"
   }
-  builders {
-    name: "buildbucket/luci.dart-internal.ci/debian-x64-main"
-    category: "sdk"
-    short_name: "dp"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/google"
     category: "sdk"
@@ -2015,11 +2005,6 @@ consoles {
     category: "sdk"
     short_name: "wa"
   }
-  builders {
-    name: "buildbucket/luci.dart-internal.ci/debian-x64-dev"
-    category: "sdk"
-    short_name: "dp"
-  }
   header {
     links {
       name: "Consoles"
@@ -2120,11 +2105,6 @@ consoles {
     category: "sdk"
     short_name: "wa"
   }
-  builders {
-    name: "buildbucket/luci.dart-internal.ci/debian-x64-beta"
-    category: "sdk"
-    short_name: "dp"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-beta"
     category: "cfe"
@@ -2540,11 +2520,6 @@ consoles {
     category: "sdk"
     short_name: "wa"
   }
-  builders {
-    name: "buildbucket/luci.dart-internal.ci/debian-x64-stable"
-    category: "sdk"
-    short_name: "dp"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/front-end-linux-release-x64-stable"
     category: "cfe"
diff --git a/sdk.star b/sdk.star
index 4c5fb9c4dcce..26e353c593d6 100644
--- a/sdk.star
+++ b/sdk.star
@@ -41,12 +41,6 @@ def sdk_builder_category():
                 category = "sdk",
                 console_view = console,
             )
-        luci.console_view_entry(
-            builder = "dart-internal:ci/debian-x64-%s" % channel,
-            short_name = "dp",
-            category = "sdk",
-            console_view = console,
-        )
 
 sdk_builder_category()
 

From ead66c842dfae57bffa48c7180a474d0d8153f95 Mon Sep 17 00:00:00 2001
From: Alexander Markov <alexmarkov@google.com>
Date: Tue, 19 Aug 2025 13:12:24 -0700
Subject: [PATCH 814/826] Add vm-dyn-mac-debug-arm64 nightly bot

Change-Id: Ib4d1178d19a8ea98fc226a59cfa50f4818f1ef58
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/445963
Reviewed-by: Ryan Macnak <rmacnak@google.com>
Commit-Queue: Alexander Markov <alexmarkov@google.com>
---
 generated/commit-queue.cfg   |  9 ++++
 generated/cr-buildbucket.cfg | 82 ++++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      | 13 ++++++
 generated/luci-notify.cfg    | 13 ++++++
 generated/luci-scheduler.cfg | 11 +++++
 vm.star                      |  8 ++++
 6 files changed, 136 insertions(+)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 43cde217ede3..05e3cada41f7 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -4856,6 +4856,15 @@ config_groups {
           path_regexp: "pkg/(dart2bytecode|dynamic_modules)/.+"
         }
       }
+      builders {
+        name: "dart/try/vm-dyn-mac-debug-arm64-try"
+        location_filters {
+          gerrit_host_regexp: ".*"
+          gerrit_project_regexp: ".*"
+          gerrit_ref_regexp: ".*"
+          path_regexp: "pkg/(dart2bytecode|dynamic_modules)/.+"
+        }
+      }
       builders {
         name: "dart/try/vm-eager-optimization-linux-release-x64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index a49203c9441b..b81e2ac0c072 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -7069,6 +7069,47 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-dyn-mac-debug-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-eager-optimization-linux-release-x64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13248,6 +13289,47 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-dyn-mac-debug-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "download_android_deps": false'
+        '  },'
+        '  "recipe": "dart/neo",'
+        '  "shard_timeout": 5400'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-eager-optimization-linux-release-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 59088ff5425a..20a14802c89a 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -274,6 +274,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-dyn-linux-debug-x64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-dyn-mac-debug-arm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-ffi-android-debug-arm-try"
   }
@@ -990,6 +993,11 @@ consoles {
     category: "vm|misc|dyn"
     short_name: "j"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dyn-mac-debug-arm64"
+    category: "vm|misc|dyn"
+    short_name: "ja"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
     category: "vm|ffi"
@@ -1855,6 +1863,11 @@ consoles {
     category: "vm|misc|dyn"
     short_name: "j"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-dyn-mac-debug-arm64"
+    category: "vm|misc|dyn"
+    short_name: "ja"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-android-debug-arm"
     category: "vm|ffi"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 6af641f89800..d66d0368eb1c 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -996,6 +996,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-dyn-mac-debug-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 01707dc0509b..571392c5a667 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1724,6 +1724,16 @@ job {
     builder: "vm-dyn-linux-debug-x64"
   }
 }
+job {
+  id: "vm-dyn-mac-debug-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-dyn-mac-debug-arm64"
+  }
+}
 job {
   id: "vm-eager-optimization-linux-release-x64"
   realm: "ci.sandbox"
@@ -2791,6 +2801,7 @@ trigger {
   triggers: "vm-asan-mac-release-x64"
   triggers: "vm-asan-win-release-x64"
   triggers: "vm-dyn-linux-debug-x64"
+  triggers: "vm-dyn-mac-debug-arm64"
   triggers: "vm-eager-optimization-linux-release-x64"
   triggers: "vm-ffi-mac-release-simarm64_arm64"
   triggers: "vm-gcc-linux"
diff --git a/vm.star b/vm.star
index 0bef625ba366..eeeea55582e4 100644
--- a/vm.star
+++ b/vm.star
@@ -449,6 +449,14 @@ _nightly_builder(
     channels = ["try"],
     location_filters = paths.to_location_filters(paths.dart2bytecode),
 )
+_nightly_builder(
+    "vm-dyn-mac-debug-arm64",
+    category = "vm|misc|dyn|ja",
+    channels = ["try"],
+    dimensions = [mac, arm64],
+    properties = [no_android, slow_shards],
+    location_filters = paths.to_location_filters(paths.dart2bytecode),
+)
 
 # vm|ffi
 _vm_builder(

From 6a9cd8ea0f15842408dd3b770d9877bfcba40264 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 26 Aug 2025 13:28:44 -0700
Subject: [PATCH 815/826] [infra] Add vm-tsan-mac-release-arm64 builder.

Change-Id: Id9325a964c0cd21904be2777a86eff7366cda9d5
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/446984
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Aprelev <aam@google.com>
---
 generated/commit-queue.cfg   |  4 ++
 generated/cr-buildbucket.cfg | 74 ++++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      | 13 +++++++
 generated/luci-notify.cfg    | 13 +++++++
 generated/luci-scheduler.cfg | 11 ++++++
 vm.star                      |  5 +++
 6 files changed, 120 insertions(+)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 05e3cada41f7..86c2cc372459 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -5136,6 +5136,10 @@ config_groups {
         name: "dart/try/vm-tsan-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-tsan-mac-release-arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-ubsan-linux-release-arm64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index b81e2ac0c072..9ac3a604f2c0 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -9488,6 +9488,43 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-tsan-mac-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-ubsan-linux-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -14500,6 +14537,43 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-tsan-mac-release-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-ubsan-linux-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 20a14802c89a..0cd869a2fd2b 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -232,6 +232,9 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-tsan-linux-release-arm64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-tsan-mac-release-arm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-ubsan-linux-release-arm64-try"
   }
@@ -923,6 +926,11 @@ consoles {
     category: "vm|misc|sanitizer"
     short_name: "t"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-tsan-mac-release-arm64"
+    category: "vm|misc|sanitizer"
+    short_name: "t"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ubsan-linux-release-arm64"
     category: "vm|misc|sanitizer"
@@ -1793,6 +1801,11 @@ consoles {
     category: "vm|misc|sanitizer"
     short_name: "t"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-tsan-mac-release-arm64"
+    category: "vm|misc|sanitizer"
+    short_name: "t"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-ubsan-linux-release-arm64"
     category: "vm|misc|sanitizer"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index d66d0368eb1c..cafd3f556ae5 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -1422,6 +1422,19 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-tsan-mac-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 571392c5a667..e7afce805af9 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -2444,6 +2444,16 @@ job {
     builder: "vm-tsan-linux-release-x64"
   }
 }
+job {
+  id: "vm-tsan-mac-release-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-tsan-mac-release-arm64"
+  }
+}
 job {
   id: "vm-ubsan-linux-release-arm64"
   realm: "ci.sandbox"
@@ -2816,6 +2826,7 @@ trigger {
   triggers: "vm-reload-linux-release-x64"
   triggers: "vm-tsan-linux-release-arm64"
   triggers: "vm-tsan-linux-release-x64"
+  triggers: "vm-tsan-mac-release-arm64"
   triggers: "vm-ubsan-linux-release-arm64"
   triggers: "vm-ubsan-linux-release-x64"
   triggers: "vm-win-debug-arm64"
diff --git a/vm.star b/vm.star
index eeeea55582e4..fd286e27e397 100644
--- a/vm.star
+++ b/vm.star
@@ -363,6 +363,11 @@ _nightly_builder(
     category = "vm|misc|sanitizer|t",
     dimensions = [arm64],
 )
+_nightly_builder(
+    "vm-tsan-mac-release-arm64",
+    category = "vm|misc|sanitizer|t",
+    dimensions = [mac, arm64],
+)
 _nightly_builder(
     "vm-ubsan-linux-release-arm64",
     category = "vm|misc|sanitizer|u",

From 8bb5ef8204593f49a0dd03e5194d770fc80d6de5 Mon Sep 17 00:00:00 2001
From: Alexander Markov <alexmarkov@google.com>
Date: Thu, 28 Aug 2025 08:25:25 -0700
Subject: [PATCH 816/826] [infra] Add
 vm-ffi-dyn-mac-{debug,release}-simarm64_arm64 builders

Change-Id: I31d1404ab9cd181ceba26ad1ac4fdd0014f8c63b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/447601
Commit-Queue: Alexander Markov <alexmarkov@google.com>
Reviewed-by: Alexander Aprelev <aam@google.com>
---
 generated/commit-queue.cfg   |   8 ++
 generated/cr-buildbucket.cfg | 146 +++++++++++++++++++++++++++++++++++
 generated/luci-milo.cfg      |  26 +++++++
 generated/luci-notify.cfg    |  24 ++++++
 generated/luci-scheduler.cfg |  22 ++++++
 generated/project.cfg        |   2 +-
 vm.star                      |  12 +++
 7 files changed, 239 insertions(+), 1 deletion(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 86c2cc372459..9e98f9e72a21 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -4893,6 +4893,14 @@ config_groups {
         name: "dart/try/vm-ffi-android-release-arm64c-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-ffi-dyn-mac-debug-simarm64_arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ffi-dyn-mac-release-simarm64_arm64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-ffi-mac-debug-simarm64_arm64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 9ac3a604f2c0..23b7df2d9141 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -7754,6 +7754,79 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-ffi-dyn-mac-debug-simarm64_arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 50
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-dyn-mac-release-simarm64_arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-ffi-mac-debug-simarm64_arm64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13603,6 +13676,79 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-ffi-dyn-mac-debug-simarm64_arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ffi-dyn-mac-release-simarm64_arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": false,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-ffi-mac-debug-simarm64_arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index 0cd869a2fd2b..dd4bedf95c9b 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -310,6 +310,12 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-ffi-mac-release-simarm64_arm64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-ffi-dyn-mac-debug-simarm64_arm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-ffi-dyn-mac-release-simarm64_arm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/iso-stress-linux-x64-try"
   }
@@ -1056,6 +1062,16 @@ consoles {
     category: "vm|ffi"
     short_name: "ar"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-dyn-mac-debug-simarm64_arm64"
+    category: "vm|ffi"
+    short_name: "dd"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-dyn-mac-release-simarm64_arm64"
+    category: "vm|ffi"
+    short_name: "dr"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/pkg-linux-release"
     category: "pkg"
@@ -1931,6 +1947,16 @@ consoles {
     category: "vm|ffi"
     short_name: "ar"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-dyn-mac-debug-simarm64_arm64"
+    category: "vm|ffi"
+    short_name: "dd"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ffi-dyn-mac-release-simarm64_arm64"
+    category: "vm|ffi"
+    short_name: "dr"
+  }
   header {
     links {
       name: "Consoles"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index cafd3f556ae5..ac842a3b5de2 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -1088,6 +1088,30 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-ffi-dyn-mac-debug-simarm64_arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-ffi-dyn-mac-release-simarm64_arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index e7afce805af9..360265520b9b 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1924,6 +1924,26 @@ job {
     builder: "vm-ffi-android-release-arm64c-stable"
   }
 }
+job {
+  id: "vm-ffi-dyn-mac-debug-simarm64_arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-ffi-dyn-mac-debug-simarm64_arm64"
+  }
+}
+job {
+  id: "vm-ffi-dyn-mac-release-simarm64_arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-ffi-dyn-mac-release-simarm64_arm64"
+  }
+}
 job {
   id: "vm-ffi-mac-debug-simarm64_arm64"
   realm: "ci.sandbox"
@@ -2813,6 +2833,7 @@ trigger {
   triggers: "vm-dyn-linux-debug-x64"
   triggers: "vm-dyn-mac-debug-arm64"
   triggers: "vm-eager-optimization-linux-release-x64"
+  triggers: "vm-ffi-dyn-mac-release-simarm64_arm64"
   triggers: "vm-ffi-mac-release-simarm64_arm64"
   triggers: "vm-gcc-linux"
   triggers: "vm-linux-debug-arm64"
@@ -2858,6 +2879,7 @@ trigger {
   triggers: "vm-ffi-android-product-arm64c"
   triggers: "vm-ffi-android-release-arm"
   triggers: "vm-ffi-android-release-arm64c"
+  triggers: "vm-ffi-dyn-mac-debug-simarm64_arm64"
   triggers: "vm-ffi-mac-debug-simarm64_arm64"
   triggers: "vm-ffi-qemu-linux-release-arm"
   triggers: "vm-ffi-qemu-linux-release-riscv64"
diff --git a/generated/project.cfg b/generated/project.cfg
index 3681a28eb68d..d05e60c3203d 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "dart"
 access: "group:all"
 lucicfg {
-  version: "1.45.6"
+  version: "1.45.8"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/vm.star b/vm.star
index fd286e27e397..5a0dc252ce17 100644
--- a/vm.star
+++ b/vm.star
@@ -516,6 +516,18 @@ _nightly_builder(
     channels = ["try"],
     dimensions = [mac, arm64],
 )
+_vm_builder(
+    "vm-ffi-dyn-mac-debug-simarm64_arm64",
+    category = "vm|ffi|dd",
+    channels = ["try"],
+    dimensions = [mac, arm64],
+)
+_nightly_builder(
+    "vm-ffi-dyn-mac-release-simarm64_arm64",
+    category = "vm|ffi|dr",
+    channels = ["try"],
+    dimensions = [mac, arm64],
+)
 
 # Isolate stress test builder
 _vm_builder(

From 7d9946ad83fd05f0c579e76ff3fcecc81cbcc163 Mon Sep 17 00:00:00 2001
From: Alexander Aprelev <aam@google.com>
Date: Fri, 5 Sep 2025 00:55:32 -0700
Subject: [PATCH 817/826] Change default clobber properties to True

Bug: fix invalid kernel binary format version issue: https://ci.chromium.org/p/dart/builders/ci.sandbox/vm-linux-release-arm64/6029
Change-Id: Ic3dc3df6df8de3cea895dedbd4bf674ea0c0e3c7
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/448427
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 generated/cr-buildbucket.cfg | 898 +++++++++++++++++------------------
 lib/defaults.star            |   2 +-
 2 files changed, 450 insertions(+), 450 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 23b7df2d9141..3c28067c022b 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -35,7 +35,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -66,7 +66,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -97,7 +97,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -128,7 +128,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -159,7 +159,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -190,7 +190,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -221,7 +221,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -257,7 +257,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -293,7 +293,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -329,7 +329,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -360,7 +360,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -391,7 +391,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -423,7 +423,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -454,7 +454,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -489,7 +489,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -523,7 +523,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -558,7 +558,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -593,7 +593,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -628,7 +628,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -663,7 +663,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -698,7 +698,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -733,7 +733,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -773,7 +773,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -813,7 +813,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -853,7 +853,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -892,7 +892,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -931,7 +931,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -970,7 +970,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1005,7 +1005,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1040,7 +1040,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1075,7 +1075,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1109,7 +1109,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1143,7 +1143,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1177,7 +1177,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1211,7 +1211,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1245,7 +1245,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1279,7 +1279,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1314,7 +1314,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1349,7 +1349,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1384,7 +1384,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -1419,7 +1419,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1456,7 +1456,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1493,7 +1493,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1530,7 +1530,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1566,7 +1566,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1602,7 +1602,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1638,7 +1638,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1675,7 +1675,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1712,7 +1712,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1749,7 +1749,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1785,7 +1785,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1821,7 +1821,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1857,7 +1857,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1894,7 +1894,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1931,7 +1931,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1968,7 +1968,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -2005,7 +2005,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -2042,7 +2042,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -2079,7 +2079,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
@@ -2116,7 +2116,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
@@ -2153,7 +2153,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
@@ -2190,7 +2190,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2225,7 +2225,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -2259,7 +2259,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2294,7 +2294,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2329,7 +2329,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2364,7 +2364,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -2399,7 +2399,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2439,7 +2439,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2479,7 +2479,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2519,7 +2519,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2559,7 +2559,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2594,7 +2594,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2629,7 +2629,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2664,7 +2664,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -2769,7 +2769,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2801,7 +2801,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2833,7 +2833,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2865,7 +2865,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2897,7 +2897,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2929,7 +2929,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2961,7 +2961,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2993,7 +2993,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3025,7 +3025,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3057,7 +3057,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3089,7 +3089,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester_engine"'
         '}'
       priority: 50
@@ -3121,7 +3121,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3153,7 +3153,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3185,7 +3185,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3217,7 +3217,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3249,7 +3249,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3281,7 +3281,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3313,7 +3313,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3345,7 +3345,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3377,7 +3377,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3409,7 +3409,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3441,7 +3441,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3473,7 +3473,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3505,7 +3505,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3537,7 +3537,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3569,7 +3569,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3601,7 +3601,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3633,7 +3633,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3665,7 +3665,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3697,7 +3697,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3729,7 +3729,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3761,7 +3761,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3793,7 +3793,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3825,7 +3825,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3857,7 +3857,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -4217,7 +4217,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4248,7 +4248,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/gclient"'
         '}'
       priority: 50
@@ -4279,7 +4279,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/gclient"'
         '}'
       priority: 60
@@ -4310,7 +4310,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/gclient"'
         '}'
       priority: 60
@@ -4341,7 +4341,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/external"'
         '}'
       priority: 20
@@ -4374,7 +4374,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -4405,7 +4405,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4436,7 +4436,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4470,7 +4470,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4504,7 +4504,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4535,7 +4535,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -4566,7 +4566,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -4597,7 +4597,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4631,7 +4631,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4665,7 +4665,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4704,7 +4704,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -4744,7 +4744,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -4784,7 +4784,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -4824,7 +4824,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4863,7 +4863,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4902,7 +4902,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4935,7 +4935,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -4968,7 +4968,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -5001,7 +5001,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -5035,7 +5035,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -5069,7 +5069,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -5104,7 +5104,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5140,7 +5140,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5175,7 +5175,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5210,7 +5210,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5245,7 +5245,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5280,7 +5280,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5315,7 +5315,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5350,7 +5350,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5386,7 +5386,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -5417,7 +5417,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5449,7 +5449,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -5481,7 +5481,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -5512,7 +5512,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5544,7 +5544,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5576,7 +5576,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5609,7 +5609,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5642,7 +5642,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5675,7 +5675,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5708,7 +5708,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5741,7 +5741,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -5772,7 +5772,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5803,7 +5803,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -5834,7 +5834,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -5865,7 +5865,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5896,7 +5896,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -5927,7 +5927,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -5958,7 +5958,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5989,7 +5989,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6020,7 +6020,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6052,7 +6052,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6089,7 +6089,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6126,7 +6126,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6162,7 +6162,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6198,7 +6198,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6234,7 +6234,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6270,7 +6270,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6306,7 +6306,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6342,7 +6342,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6379,7 +6379,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6411,7 +6411,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6442,7 +6442,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -6477,7 +6477,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -6510,7 +6510,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -6543,7 +6543,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6573,7 +6573,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -6606,7 +6606,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -6639,7 +6639,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -6673,7 +6673,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6704,7 +6704,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6735,7 +6735,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6767,7 +6767,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -6800,7 +6800,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6831,7 +6831,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6862,7 +6862,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6893,7 +6893,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6925,7 +6925,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6957,7 +6957,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6989,7 +6989,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7026,7 +7026,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7058,7 +7058,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7090,7 +7090,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -7131,7 +7131,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7162,7 +7162,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7196,7 +7196,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7230,7 +7230,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7264,7 +7264,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7298,7 +7298,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7332,7 +7332,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7366,7 +7366,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7400,7 +7400,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7434,7 +7434,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7468,7 +7468,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7502,7 +7502,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7536,7 +7536,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7570,7 +7570,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7604,7 +7604,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7638,7 +7638,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7672,7 +7672,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7706,7 +7706,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7740,7 +7740,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7774,7 +7774,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -7811,7 +7811,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7847,7 +7847,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -7884,7 +7884,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7920,7 +7920,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -7951,7 +7951,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -7982,7 +7982,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8013,7 +8013,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8044,7 +8044,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8075,7 +8075,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8106,7 +8106,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_fuchsia_deps": true'
         '  },'
@@ -8140,7 +8140,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_fuchsia_deps": true'
         '  },'
@@ -8179,7 +8179,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -8212,7 +8212,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -8244,7 +8244,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -8277,7 +8277,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -8308,7 +8308,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8339,7 +8339,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8370,7 +8370,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8401,7 +8401,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8432,7 +8432,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8463,7 +8463,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8495,7 +8495,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -8526,7 +8526,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8557,7 +8557,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8588,7 +8588,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8619,7 +8619,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8650,7 +8650,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8681,7 +8681,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8712,7 +8712,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8743,7 +8743,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8774,7 +8774,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8805,7 +8805,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8836,7 +8836,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8867,7 +8867,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8898,7 +8898,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -8938,7 +8938,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -8978,7 +8978,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -9018,7 +9018,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9055,7 +9055,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9092,7 +9092,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9129,7 +9129,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -9168,7 +9168,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -9207,7 +9207,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -9246,7 +9246,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -9282,7 +9282,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -9318,7 +9318,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -9355,7 +9355,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9387,7 +9387,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9422,7 +9422,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9454,7 +9454,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9486,7 +9486,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9518,7 +9518,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9550,7 +9550,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9582,7 +9582,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9619,7 +9619,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9651,7 +9651,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9682,7 +9682,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -9716,7 +9716,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9748,7 +9748,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9780,7 +9780,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9813,7 +9813,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9843,7 +9843,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -9876,7 +9876,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -9909,7 +9909,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -9943,7 +9943,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -9974,7 +9974,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -10005,7 +10005,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -10062,7 +10062,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -10093,7 +10093,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -10124,7 +10124,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -10160,7 +10160,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -10191,7 +10191,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_javascript_engines": true'
         '  },'
@@ -10225,7 +10225,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "from_ref": "refs/heads/dev",'
         '  "recipe": "release/merge",'
         '  "to_ref": "refs/heads/beta"'
@@ -10541,7 +10541,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -10576,7 +10576,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -10610,7 +10610,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -10645,7 +10645,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -10680,7 +10680,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -10720,7 +10720,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -10759,7 +10759,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -10794,7 +10794,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -10828,7 +10828,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -10862,7 +10862,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -10897,7 +10897,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -10934,7 +10934,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -10970,7 +10970,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -11007,7 +11007,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -11043,7 +11043,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -11080,7 +11080,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -11117,7 +11117,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
@@ -11154,7 +11154,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -11189,7 +11189,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -11223,7 +11223,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -11258,7 +11258,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -11293,7 +11293,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -11333,7 +11333,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -11373,7 +11373,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -11408,7 +11408,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "from_ref": "refs/heads/lkgr",'
         '  "recipe": "release/merge",'
         '  "to_ref": "refs/heads/dev"'
@@ -11442,7 +11442,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "release/docker",'
         '  "version": "1.2.3"'
         '}'
@@ -11474,7 +11474,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11753,7 +11753,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/gclient"'
         '}'
       priority: 30
@@ -11784,7 +11784,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "release/homebrew"'
         '}'
       priority: 30
@@ -11816,7 +11816,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11847,7 +11847,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11878,7 +11878,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -11912,7 +11912,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11943,7 +11943,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -11977,7 +11977,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -12017,7 +12017,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -12055,7 +12055,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -12089,7 +12089,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -12123,7 +12123,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "from_ref": "refs/heads/beta",'
         '  "recipe": "release/merge",'
         '  "to_ref": "refs/heads/stable"'
@@ -12158,7 +12158,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -12194,7 +12194,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -12229,7 +12229,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -12264,7 +12264,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -12300,7 +12300,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12331,7 +12331,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12363,7 +12363,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12395,7 +12395,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12426,7 +12426,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12459,7 +12459,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12492,7 +12492,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12525,7 +12525,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12558,7 +12558,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12591,7 +12591,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12622,7 +12622,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12653,7 +12653,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12684,7 +12684,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12716,7 +12716,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12753,7 +12753,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12790,7 +12790,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12826,7 +12826,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12862,7 +12862,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12899,7 +12899,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12931,7 +12931,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12962,7 +12962,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -12997,7 +12997,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -13030,7 +13030,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -13063,7 +13063,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13093,7 +13093,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -13127,7 +13127,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13159,7 +13159,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -13192,7 +13192,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13223,7 +13223,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13255,7 +13255,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13287,7 +13287,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13319,7 +13319,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13356,7 +13356,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13388,7 +13388,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13420,7 +13420,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -13461,7 +13461,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13492,7 +13492,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13526,7 +13526,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13560,7 +13560,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13594,7 +13594,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13628,7 +13628,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13662,7 +13662,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13696,7 +13696,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13733,7 +13733,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13769,7 +13769,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13806,7 +13806,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13842,7 +13842,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13873,7 +13873,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13904,7 +13904,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_fuchsia_deps": true'
         '  },'
@@ -13938,7 +13938,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_fuchsia_deps": true'
         '  },'
@@ -13977,7 +13977,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14010,7 +14010,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14042,7 +14042,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -14075,7 +14075,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14106,7 +14106,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14137,7 +14137,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14169,7 +14169,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14200,7 +14200,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14231,7 +14231,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14262,7 +14262,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14293,7 +14293,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14324,7 +14324,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -14364,7 +14364,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -14401,7 +14401,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -14440,7 +14440,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14477,7 +14477,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14509,7 +14509,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14544,7 +14544,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14576,7 +14576,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14608,7 +14608,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14640,7 +14640,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14672,7 +14672,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14704,7 +14704,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14741,7 +14741,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14773,7 +14773,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14804,7 +14804,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -14838,7 +14838,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -14871,7 +14871,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14901,7 +14901,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -14935,7 +14935,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14976,7 +14976,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15008,7 +15008,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15040,7 +15040,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15072,7 +15072,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15104,7 +15104,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15136,7 +15136,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15168,7 +15168,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15200,7 +15200,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15232,7 +15232,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15264,7 +15264,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15296,7 +15296,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester_engine"'
         '}'
       priority: 30
@@ -15328,7 +15328,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15360,7 +15360,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15392,7 +15392,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15424,7 +15424,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15456,7 +15456,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15488,7 +15488,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15520,7 +15520,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15552,7 +15552,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15584,7 +15584,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15616,7 +15616,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15648,7 +15648,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15680,7 +15680,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15712,7 +15712,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15744,7 +15744,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15776,7 +15776,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15808,7 +15808,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15840,7 +15840,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15872,7 +15872,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15904,7 +15904,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15936,7 +15936,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15968,7 +15968,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -16000,7 +16000,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -16032,7 +16032,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -16064,7 +16064,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -16123,7 +16123,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "presubmit/presubmit"'
         '}'
       priority: 30
diff --git a/lib/defaults.star b/lib/defaults.star
index 023d28a5d61a..9a74ffcd93ee 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -7,7 +7,7 @@ Defaults for properties and dimensions used in main.star.
 
 load("//lib/helpers.star", "union")
 
-_PROPERTIES = {"clobber": False}
+_PROPERTIES = {"clobber": True}
 _DIMENSIONS = {
     "cpu": "x86-64",
     "host_class": "default",

From 96d7fec5902283a40f08ed1cd550cf2a7b7e5189 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Mon, 15 Sep 2025 17:55:38 -0700
Subject: [PATCH 818/826] [infra] Restore default clobber to False.

The incremental build was fixed in https://dart-review.googlesource.com/c/sdk/+/449584.

Change-Id: I6ee470215907f32884a6cd00a9f24e0faa747d2e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/449585
Reviewed-by: Alexander Aprelev <aam@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/cr-buildbucket.cfg | 898 +++++++++++++++++------------------
 lib/defaults.star            |   2 +-
 2 files changed, 450 insertions(+), 450 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 3c28067c022b..23b7df2d9141 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -35,7 +35,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -66,7 +66,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -97,7 +97,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -128,7 +128,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -159,7 +159,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -190,7 +190,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -221,7 +221,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -257,7 +257,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -293,7 +293,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -329,7 +329,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -360,7 +360,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -391,7 +391,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -423,7 +423,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -454,7 +454,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -489,7 +489,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -523,7 +523,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -558,7 +558,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -593,7 +593,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -628,7 +628,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -663,7 +663,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -698,7 +698,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -733,7 +733,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -773,7 +773,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -813,7 +813,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -853,7 +853,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -892,7 +892,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -931,7 +931,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -970,7 +970,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1005,7 +1005,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1040,7 +1040,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1075,7 +1075,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1109,7 +1109,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1143,7 +1143,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1177,7 +1177,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1211,7 +1211,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1245,7 +1245,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1279,7 +1279,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1314,7 +1314,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1349,7 +1349,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1384,7 +1384,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -1419,7 +1419,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1456,7 +1456,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1493,7 +1493,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1530,7 +1530,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1566,7 +1566,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1602,7 +1602,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1638,7 +1638,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1675,7 +1675,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1712,7 +1712,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1749,7 +1749,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1785,7 +1785,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1821,7 +1821,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1857,7 +1857,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1894,7 +1894,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1931,7 +1931,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1968,7 +1968,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -2005,7 +2005,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -2042,7 +2042,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -2079,7 +2079,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
@@ -2116,7 +2116,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
@@ -2153,7 +2153,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
@@ -2190,7 +2190,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2225,7 +2225,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -2259,7 +2259,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2294,7 +2294,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2329,7 +2329,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2364,7 +2364,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -2399,7 +2399,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2439,7 +2439,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2479,7 +2479,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2519,7 +2519,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2559,7 +2559,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2594,7 +2594,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2629,7 +2629,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2664,7 +2664,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -2769,7 +2769,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2801,7 +2801,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2833,7 +2833,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2865,7 +2865,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2897,7 +2897,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2929,7 +2929,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2961,7 +2961,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2993,7 +2993,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3025,7 +3025,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3057,7 +3057,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3089,7 +3089,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester_engine"'
         '}'
       priority: 50
@@ -3121,7 +3121,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3153,7 +3153,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3185,7 +3185,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3217,7 +3217,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3249,7 +3249,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3281,7 +3281,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3313,7 +3313,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3345,7 +3345,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3377,7 +3377,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3409,7 +3409,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3441,7 +3441,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3473,7 +3473,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3505,7 +3505,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3537,7 +3537,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3569,7 +3569,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3601,7 +3601,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3633,7 +3633,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3665,7 +3665,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3697,7 +3697,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3729,7 +3729,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3761,7 +3761,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3793,7 +3793,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3825,7 +3825,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3857,7 +3857,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -4217,7 +4217,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4248,7 +4248,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/gclient"'
         '}'
       priority: 50
@@ -4279,7 +4279,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/gclient"'
         '}'
       priority: 60
@@ -4310,7 +4310,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/gclient"'
         '}'
       priority: 60
@@ -4341,7 +4341,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/external"'
         '}'
       priority: 20
@@ -4374,7 +4374,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -4405,7 +4405,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4436,7 +4436,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4470,7 +4470,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4504,7 +4504,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4535,7 +4535,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -4566,7 +4566,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -4597,7 +4597,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4631,7 +4631,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4665,7 +4665,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4704,7 +4704,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -4744,7 +4744,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -4784,7 +4784,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -4824,7 +4824,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4863,7 +4863,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4902,7 +4902,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4935,7 +4935,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -4968,7 +4968,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -5001,7 +5001,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -5035,7 +5035,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -5069,7 +5069,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -5104,7 +5104,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5140,7 +5140,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5175,7 +5175,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5210,7 +5210,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5245,7 +5245,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5280,7 +5280,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5315,7 +5315,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5350,7 +5350,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5386,7 +5386,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -5417,7 +5417,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5449,7 +5449,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -5481,7 +5481,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -5512,7 +5512,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5544,7 +5544,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5576,7 +5576,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5609,7 +5609,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5642,7 +5642,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5675,7 +5675,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5708,7 +5708,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5741,7 +5741,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -5772,7 +5772,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5803,7 +5803,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -5834,7 +5834,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -5865,7 +5865,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5896,7 +5896,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -5927,7 +5927,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -5958,7 +5958,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5989,7 +5989,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6020,7 +6020,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6052,7 +6052,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6089,7 +6089,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6126,7 +6126,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6162,7 +6162,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6198,7 +6198,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6234,7 +6234,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6270,7 +6270,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6306,7 +6306,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6342,7 +6342,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6379,7 +6379,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6411,7 +6411,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6442,7 +6442,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -6477,7 +6477,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -6510,7 +6510,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -6543,7 +6543,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6573,7 +6573,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -6606,7 +6606,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -6639,7 +6639,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -6673,7 +6673,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6704,7 +6704,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6735,7 +6735,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6767,7 +6767,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -6800,7 +6800,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6831,7 +6831,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6862,7 +6862,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6893,7 +6893,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6925,7 +6925,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6957,7 +6957,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6989,7 +6989,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7026,7 +7026,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7058,7 +7058,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7090,7 +7090,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -7131,7 +7131,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7162,7 +7162,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7196,7 +7196,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7230,7 +7230,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7264,7 +7264,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7298,7 +7298,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7332,7 +7332,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7366,7 +7366,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7400,7 +7400,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7434,7 +7434,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7468,7 +7468,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7502,7 +7502,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7536,7 +7536,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7570,7 +7570,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7604,7 +7604,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7638,7 +7638,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7672,7 +7672,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7706,7 +7706,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7740,7 +7740,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7774,7 +7774,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -7811,7 +7811,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7847,7 +7847,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -7884,7 +7884,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7920,7 +7920,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -7951,7 +7951,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -7982,7 +7982,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8013,7 +8013,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8044,7 +8044,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8075,7 +8075,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8106,7 +8106,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_fuchsia_deps": true'
         '  },'
@@ -8140,7 +8140,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_fuchsia_deps": true'
         '  },'
@@ -8179,7 +8179,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -8212,7 +8212,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -8244,7 +8244,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -8277,7 +8277,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -8308,7 +8308,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8339,7 +8339,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8370,7 +8370,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8401,7 +8401,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8432,7 +8432,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8463,7 +8463,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8495,7 +8495,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -8526,7 +8526,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8557,7 +8557,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8588,7 +8588,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8619,7 +8619,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8650,7 +8650,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8681,7 +8681,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8712,7 +8712,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8743,7 +8743,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8774,7 +8774,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8805,7 +8805,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8836,7 +8836,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8867,7 +8867,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8898,7 +8898,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -8938,7 +8938,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -8978,7 +8978,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -9018,7 +9018,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9055,7 +9055,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9092,7 +9092,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9129,7 +9129,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -9168,7 +9168,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -9207,7 +9207,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -9246,7 +9246,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -9282,7 +9282,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -9318,7 +9318,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -9355,7 +9355,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9387,7 +9387,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9422,7 +9422,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9454,7 +9454,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9486,7 +9486,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9518,7 +9518,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9550,7 +9550,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9582,7 +9582,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9619,7 +9619,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9651,7 +9651,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9682,7 +9682,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -9716,7 +9716,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9748,7 +9748,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9780,7 +9780,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9813,7 +9813,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9843,7 +9843,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -9876,7 +9876,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -9909,7 +9909,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -9943,7 +9943,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -9974,7 +9974,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -10005,7 +10005,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -10062,7 +10062,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -10093,7 +10093,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -10124,7 +10124,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -10160,7 +10160,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -10191,7 +10191,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_javascript_engines": true'
         '  },'
@@ -10225,7 +10225,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "from_ref": "refs/heads/dev",'
         '  "recipe": "release/merge",'
         '  "to_ref": "refs/heads/beta"'
@@ -10541,7 +10541,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -10576,7 +10576,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -10610,7 +10610,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -10645,7 +10645,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -10680,7 +10680,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -10720,7 +10720,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -10759,7 +10759,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -10794,7 +10794,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -10828,7 +10828,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -10862,7 +10862,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -10897,7 +10897,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -10934,7 +10934,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -10970,7 +10970,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -11007,7 +11007,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -11043,7 +11043,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -11080,7 +11080,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -11117,7 +11117,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
@@ -11154,7 +11154,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -11189,7 +11189,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -11223,7 +11223,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -11258,7 +11258,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -11293,7 +11293,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -11333,7 +11333,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -11373,7 +11373,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -11408,7 +11408,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "from_ref": "refs/heads/lkgr",'
         '  "recipe": "release/merge",'
         '  "to_ref": "refs/heads/dev"'
@@ -11442,7 +11442,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "release/docker",'
         '  "version": "1.2.3"'
         '}'
@@ -11474,7 +11474,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11753,7 +11753,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/gclient"'
         '}'
       priority: 30
@@ -11784,7 +11784,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "release/homebrew"'
         '}'
       priority: 30
@@ -11816,7 +11816,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11847,7 +11847,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11878,7 +11878,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -11912,7 +11912,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11943,7 +11943,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -11977,7 +11977,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -12017,7 +12017,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -12055,7 +12055,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -12089,7 +12089,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -12123,7 +12123,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "from_ref": "refs/heads/beta",'
         '  "recipe": "release/merge",'
         '  "to_ref": "refs/heads/stable"'
@@ -12158,7 +12158,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -12194,7 +12194,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -12229,7 +12229,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -12264,7 +12264,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -12300,7 +12300,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12331,7 +12331,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12363,7 +12363,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12395,7 +12395,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12426,7 +12426,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12459,7 +12459,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12492,7 +12492,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12525,7 +12525,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12558,7 +12558,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12591,7 +12591,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12622,7 +12622,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12653,7 +12653,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12684,7 +12684,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12716,7 +12716,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12753,7 +12753,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12790,7 +12790,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12826,7 +12826,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12862,7 +12862,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12899,7 +12899,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12931,7 +12931,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12962,7 +12962,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -12997,7 +12997,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -13030,7 +13030,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -13063,7 +13063,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13093,7 +13093,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -13127,7 +13127,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13159,7 +13159,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -13192,7 +13192,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13223,7 +13223,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13255,7 +13255,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13287,7 +13287,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13319,7 +13319,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13356,7 +13356,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13388,7 +13388,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13420,7 +13420,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -13461,7 +13461,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13492,7 +13492,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13526,7 +13526,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13560,7 +13560,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13594,7 +13594,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13628,7 +13628,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13662,7 +13662,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13696,7 +13696,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13733,7 +13733,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13769,7 +13769,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13806,7 +13806,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13842,7 +13842,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13873,7 +13873,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13904,7 +13904,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_fuchsia_deps": true'
         '  },'
@@ -13938,7 +13938,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_fuchsia_deps": true'
         '  },'
@@ -13977,7 +13977,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14010,7 +14010,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14042,7 +14042,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -14075,7 +14075,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14106,7 +14106,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14137,7 +14137,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14169,7 +14169,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14200,7 +14200,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14231,7 +14231,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14262,7 +14262,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14293,7 +14293,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14324,7 +14324,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -14364,7 +14364,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -14401,7 +14401,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -14440,7 +14440,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14477,7 +14477,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14509,7 +14509,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14544,7 +14544,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14576,7 +14576,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14608,7 +14608,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14640,7 +14640,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14672,7 +14672,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14704,7 +14704,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14741,7 +14741,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14773,7 +14773,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14804,7 +14804,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -14838,7 +14838,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -14871,7 +14871,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14901,7 +14901,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -14935,7 +14935,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14976,7 +14976,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15008,7 +15008,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15040,7 +15040,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15072,7 +15072,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15104,7 +15104,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15136,7 +15136,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15168,7 +15168,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15200,7 +15200,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15232,7 +15232,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15264,7 +15264,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15296,7 +15296,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester_engine"'
         '}'
       priority: 30
@@ -15328,7 +15328,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15360,7 +15360,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15392,7 +15392,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15424,7 +15424,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15456,7 +15456,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15488,7 +15488,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15520,7 +15520,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15552,7 +15552,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15584,7 +15584,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15616,7 +15616,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15648,7 +15648,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15680,7 +15680,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15712,7 +15712,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15744,7 +15744,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15776,7 +15776,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15808,7 +15808,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15840,7 +15840,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15872,7 +15872,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15904,7 +15904,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15936,7 +15936,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15968,7 +15968,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -16000,7 +16000,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -16032,7 +16032,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -16064,7 +16064,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -16123,7 +16123,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "presubmit/presubmit"'
         '}'
       priority: 30
diff --git a/lib/defaults.star b/lib/defaults.star
index 9a74ffcd93ee..023d28a5d61a 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -7,7 +7,7 @@ Defaults for properties and dimensions used in main.star.
 
 load("//lib/helpers.star", "union")
 
-_PROPERTIES = {"clobber": True}
+_PROPERTIES = {"clobber": False}
 _DIMENSIONS = {
     "cpu": "x86-64",
     "host_class": "default",

From 4546396c89a8d639669b7a48b047a61ff6fe5a79 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Wed, 17 Sep 2025 15:47:43 -0700
Subject: [PATCH 819/826] [infra] Stagger the start times of nightly builders.

This should give space for more Mac sanitizers.

Change-Id: Ibb3a68f83e51c676a21098bb589bb14b6a6f8940
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/450260
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Aprelev <aam@google.com>
---
 generated/luci-scheduler.cfg | 76 ++++++++++++++++++++++++++----------
 lib/cron.star                | 21 +++++++++-
 2 files changed, 75 insertions(+), 22 deletions(-)

diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 360265520b9b..ca7ff78e6ab6 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -2797,7 +2797,7 @@ trigger {
   }
 }
 trigger {
-  id: "dart-nightly-trigger"
+  id: "dart-nightly-trigger-5-0"
   realm: "ci"
   schedule: "0 5 * * *"
   triggers: "ddc-canary-linux-chrome"
@@ -2805,6 +2805,32 @@ trigger {
   triggers: "front-end-nnbd-mac-release-x64"
   triggers: "front-end-nnbd-win-release-x64"
   triggers: "iso-stress-linux-arm64"
+  triggers: "vm-appjit-linux-debug-x64"
+  triggers: "vm-appjit-linux-product-x64"
+  triggers: "vm-dyn-linux-debug-x64"
+  triggers: "vm-dyn-mac-debug-arm64"
+  triggers: "vm-eager-optimization-linux-release-x64"
+  triggers: "vm-ffi-dyn-mac-release-simarm64_arm64"
+  triggers: "vm-ffi-mac-release-simarm64_arm64"
+  triggers: "vm-gcc-linux"
+  triggers: "vm-linux-debug-arm64"
+  triggers: "vm-linux-debug-ia32"
+  triggers: "vm-linux-debug-simriscv32"
+  triggers: "vm-linux-debug-x64c"
+  triggers: "vm-msvc-windows"
+  triggers: "vm-reload-linux-debug-x64"
+  triggers: "vm-reload-linux-release-x64"
+  triggers: "vm-win-debug-arm64"
+  triggers: "vm-win-debug-x64c"
+  gitiles {
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/main"
+  }
+}
+trigger {
+  id: "dart-nightly-trigger-5-30"
+  realm: "ci"
+  schedule: "30 5 * * *"
   triggers: "vm-aot-android-debug-arm64c"
   triggers: "vm-aot-android-debug-arm_x64"
   triggers: "vm-aot-dwarf-linux-product-x64"
@@ -2824,34 +2850,44 @@ trigger {
   triggers: "vm-aot-win-debug-x64"
   triggers: "vm-aot-win-debug-x64c"
   triggers: "vm-aot-win-product-x64"
-  triggers: "vm-appjit-linux-debug-x64"
-  triggers: "vm-appjit-linux-product-x64"
+  gitiles {
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/main"
+  }
+}
+trigger {
+  id: "dart-nightly-trigger-6-0"
+  realm: "ci"
+  schedule: "0 6 * * *"
   triggers: "vm-asan-linux-release-arm64"
   triggers: "vm-asan-linux-release-x64"
   triggers: "vm-asan-mac-release-x64"
   triggers: "vm-asan-win-release-x64"
-  triggers: "vm-dyn-linux-debug-x64"
-  triggers: "vm-dyn-mac-debug-arm64"
-  triggers: "vm-eager-optimization-linux-release-x64"
-  triggers: "vm-ffi-dyn-mac-release-simarm64_arm64"
-  triggers: "vm-ffi-mac-release-simarm64_arm64"
-  triggers: "vm-gcc-linux"
-  triggers: "vm-linux-debug-arm64"
-  triggers: "vm-linux-debug-ia32"
-  triggers: "vm-linux-debug-simriscv32"
-  triggers: "vm-linux-debug-x64c"
+  triggers: "vm-ubsan-linux-release-arm64"
+  triggers: "vm-ubsan-linux-release-x64"
+  gitiles {
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/main"
+  }
+}
+trigger {
+  id: "dart-nightly-trigger-6-20"
+  realm: "ci"
+  schedule: "20 6 * * *"
   triggers: "vm-msan-linux-release-arm64"
   triggers: "vm-msan-linux-release-x64"
-  triggers: "vm-msvc-windows"
-  triggers: "vm-reload-linux-debug-x64"
-  triggers: "vm-reload-linux-release-x64"
+  gitiles {
+    repo: "https://dart.googlesource.com/sdk"
+    refs: "regexp:refs/heads/main"
+  }
+}
+trigger {
+  id: "dart-nightly-trigger-6-40"
+  realm: "ci"
+  schedule: "40 6 * * *"
   triggers: "vm-tsan-linux-release-arm64"
   triggers: "vm-tsan-linux-release-x64"
   triggers: "vm-tsan-mac-release-arm64"
-  triggers: "vm-ubsan-linux-release-arm64"
-  triggers: "vm-ubsan-linux-release-x64"
-  triggers: "vm-win-debug-arm64"
-  triggers: "vm-win-debug-x64c"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/main"
diff --git a/lib/cron.star b/lib/cron.star
index 6602f7791407..d45c6de4bd5b 100644
--- a/lib/cron.star
+++ b/lib/cron.star
@@ -29,6 +29,23 @@ def _image_builder(name, notifies = None, **kwargs):
     )
 
 def _nightly_builder(name, notifies = None, **kwargs):
+    # Stagger the scheduled times so they don't all try to run at once. Note
+    # that MSAN and TSAN are particularlly expensive.
+    if name.find("-tsan-") > 0:
+        hour = 6
+        minute = 40
+    elif name.find("-msan-") > 0:
+        hour = 6
+        minute = 20
+    elif name.find("-asan-") > 0 or name.find("-lsan-") > 0 or name.find("-ubsan-") > 0:
+        hour = 6
+        minute = 0
+    elif name.find("-aot-") > 0:
+        hour = 5
+        minute = 30
+    else:
+        hour = 5
+        minute = 0
     dart.ci_sandbox_builder(
         name,
         notifies = notifies or [luci.notifier(
@@ -38,11 +55,11 @@ def _nightly_builder(name, notifies = None, **kwargs):
         on_cq = False,
         priority = priority.low,
         triggered_by = [luci.gitiles_poller(
-            name = "dart-nightly-trigger",
+            name = "dart-nightly-trigger-{}-{}".format(hour, minute),
             bucket = "ci",
             repo = dart.git,
             refs = ["refs/heads/main"],
-            schedule = "0 5 * * *",  # daily, at 05:00 UTC
+            schedule = "{} {} * * *".format(minute, hour),  # daily, at hh:mm UTC
         )],
         **kwargs
     )

From 94d6af2fc0afd73243fa04ba7f1fb9be5aa51d4e Mon Sep 17 00:00:00 2001
From: Alexander Aprelev <aam@google.com>
Date: Mon, 22 Sep 2025 12:56:15 -0700
Subject: [PATCH 820/826] Set default clobber to True to force-cycle bots after
 ninja upgrade.

https://dart-review.googlesource.com/c/sdk/+/450774 rolled ninja, which required the change to how '.d'-files are generated. This broke bots which were in incremental build state, which had old '.d'-files still present. So resulted in failures like https://logs.chromium.org/logs/dart/buildbucket/cr-buildbucket/8703007187688072097/+/u/build_dart/stdout.

Change-Id: I2d41b03e70490e56ef3e76fd90ad502674707ba6
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/450963
Reviewed-by: Ryan Macnak <rmacnak@google.com>
Commit-Queue: Alexander Aprelev <aam@google.com>
---
 generated/cr-buildbucket.cfg | 898 +++++++++++++++++------------------
 lib/defaults.star            |   2 +-
 2 files changed, 450 insertions(+), 450 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 23b7df2d9141..3c28067c022b 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -35,7 +35,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -66,7 +66,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -97,7 +97,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -128,7 +128,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -159,7 +159,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -190,7 +190,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -221,7 +221,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -257,7 +257,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -293,7 +293,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -329,7 +329,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -360,7 +360,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -391,7 +391,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -423,7 +423,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -454,7 +454,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -489,7 +489,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -523,7 +523,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -558,7 +558,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -593,7 +593,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -628,7 +628,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -663,7 +663,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -698,7 +698,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -733,7 +733,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -773,7 +773,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -813,7 +813,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -853,7 +853,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -892,7 +892,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -931,7 +931,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -970,7 +970,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1005,7 +1005,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1040,7 +1040,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1075,7 +1075,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1109,7 +1109,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1143,7 +1143,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1177,7 +1177,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1211,7 +1211,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1245,7 +1245,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1279,7 +1279,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1314,7 +1314,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1349,7 +1349,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1384,7 +1384,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -1419,7 +1419,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1456,7 +1456,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1493,7 +1493,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1530,7 +1530,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1566,7 +1566,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1602,7 +1602,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1638,7 +1638,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1675,7 +1675,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1712,7 +1712,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1749,7 +1749,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1785,7 +1785,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1821,7 +1821,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1857,7 +1857,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1894,7 +1894,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1931,7 +1931,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1968,7 +1968,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -2005,7 +2005,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -2042,7 +2042,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -2079,7 +2079,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
@@ -2116,7 +2116,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
@@ -2153,7 +2153,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
@@ -2190,7 +2190,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2225,7 +2225,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -2259,7 +2259,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2294,7 +2294,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2329,7 +2329,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2364,7 +2364,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -2399,7 +2399,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2439,7 +2439,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2479,7 +2479,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2519,7 +2519,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2559,7 +2559,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2594,7 +2594,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2629,7 +2629,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2664,7 +2664,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -2769,7 +2769,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2801,7 +2801,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2833,7 +2833,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2865,7 +2865,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2897,7 +2897,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2929,7 +2929,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2961,7 +2961,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2993,7 +2993,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3025,7 +3025,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3057,7 +3057,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3089,7 +3089,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester_engine"'
         '}'
       priority: 50
@@ -3121,7 +3121,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3153,7 +3153,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3185,7 +3185,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3217,7 +3217,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3249,7 +3249,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3281,7 +3281,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3313,7 +3313,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3345,7 +3345,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3377,7 +3377,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3409,7 +3409,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3441,7 +3441,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3473,7 +3473,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3505,7 +3505,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3537,7 +3537,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3569,7 +3569,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3601,7 +3601,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3633,7 +3633,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3665,7 +3665,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3697,7 +3697,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3729,7 +3729,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3761,7 +3761,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3793,7 +3793,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3825,7 +3825,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3857,7 +3857,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -4217,7 +4217,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4248,7 +4248,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/gclient"'
         '}'
       priority: 50
@@ -4279,7 +4279,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/gclient"'
         '}'
       priority: 60
@@ -4310,7 +4310,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/gclient"'
         '}'
       priority: 60
@@ -4341,7 +4341,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/external"'
         '}'
       priority: 20
@@ -4374,7 +4374,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -4405,7 +4405,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4436,7 +4436,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4470,7 +4470,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4504,7 +4504,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4535,7 +4535,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -4566,7 +4566,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -4597,7 +4597,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4631,7 +4631,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4665,7 +4665,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4704,7 +4704,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -4744,7 +4744,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -4784,7 +4784,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -4824,7 +4824,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4863,7 +4863,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4902,7 +4902,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4935,7 +4935,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -4968,7 +4968,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -5001,7 +5001,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -5035,7 +5035,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -5069,7 +5069,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -5104,7 +5104,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5140,7 +5140,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5175,7 +5175,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5210,7 +5210,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5245,7 +5245,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5280,7 +5280,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5315,7 +5315,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5350,7 +5350,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5386,7 +5386,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -5417,7 +5417,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5449,7 +5449,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -5481,7 +5481,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -5512,7 +5512,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5544,7 +5544,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5576,7 +5576,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5609,7 +5609,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5642,7 +5642,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5675,7 +5675,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5708,7 +5708,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5741,7 +5741,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -5772,7 +5772,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5803,7 +5803,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -5834,7 +5834,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -5865,7 +5865,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5896,7 +5896,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -5927,7 +5927,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -5958,7 +5958,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5989,7 +5989,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6020,7 +6020,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6052,7 +6052,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6089,7 +6089,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6126,7 +6126,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6162,7 +6162,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6198,7 +6198,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6234,7 +6234,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6270,7 +6270,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6306,7 +6306,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6342,7 +6342,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6379,7 +6379,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6411,7 +6411,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6442,7 +6442,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -6477,7 +6477,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -6510,7 +6510,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -6543,7 +6543,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6573,7 +6573,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -6606,7 +6606,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -6639,7 +6639,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -6673,7 +6673,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6704,7 +6704,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6735,7 +6735,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6767,7 +6767,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -6800,7 +6800,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6831,7 +6831,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6862,7 +6862,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6893,7 +6893,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6925,7 +6925,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6957,7 +6957,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6989,7 +6989,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7026,7 +7026,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7058,7 +7058,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7090,7 +7090,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -7131,7 +7131,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7162,7 +7162,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7196,7 +7196,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7230,7 +7230,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7264,7 +7264,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7298,7 +7298,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7332,7 +7332,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7366,7 +7366,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7400,7 +7400,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7434,7 +7434,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7468,7 +7468,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7502,7 +7502,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7536,7 +7536,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7570,7 +7570,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7604,7 +7604,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7638,7 +7638,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7672,7 +7672,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7706,7 +7706,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7740,7 +7740,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7774,7 +7774,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -7811,7 +7811,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7847,7 +7847,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -7884,7 +7884,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7920,7 +7920,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -7951,7 +7951,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -7982,7 +7982,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8013,7 +8013,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8044,7 +8044,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8075,7 +8075,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8106,7 +8106,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_fuchsia_deps": true'
         '  },'
@@ -8140,7 +8140,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_fuchsia_deps": true'
         '  },'
@@ -8179,7 +8179,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -8212,7 +8212,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -8244,7 +8244,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -8277,7 +8277,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -8308,7 +8308,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8339,7 +8339,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8370,7 +8370,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8401,7 +8401,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8432,7 +8432,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8463,7 +8463,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8495,7 +8495,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -8526,7 +8526,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8557,7 +8557,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8588,7 +8588,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8619,7 +8619,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8650,7 +8650,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8681,7 +8681,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8712,7 +8712,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8743,7 +8743,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8774,7 +8774,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8805,7 +8805,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8836,7 +8836,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8867,7 +8867,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8898,7 +8898,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -8938,7 +8938,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -8978,7 +8978,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -9018,7 +9018,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9055,7 +9055,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9092,7 +9092,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9129,7 +9129,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -9168,7 +9168,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -9207,7 +9207,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -9246,7 +9246,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -9282,7 +9282,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -9318,7 +9318,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -9355,7 +9355,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9387,7 +9387,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9422,7 +9422,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9454,7 +9454,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9486,7 +9486,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9518,7 +9518,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9550,7 +9550,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9582,7 +9582,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9619,7 +9619,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9651,7 +9651,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9682,7 +9682,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -9716,7 +9716,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9748,7 +9748,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9780,7 +9780,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9813,7 +9813,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9843,7 +9843,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -9876,7 +9876,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -9909,7 +9909,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -9943,7 +9943,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -9974,7 +9974,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -10005,7 +10005,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -10062,7 +10062,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -10093,7 +10093,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -10124,7 +10124,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -10160,7 +10160,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -10191,7 +10191,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_javascript_engines": true'
         '  },'
@@ -10225,7 +10225,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "from_ref": "refs/heads/dev",'
         '  "recipe": "release/merge",'
         '  "to_ref": "refs/heads/beta"'
@@ -10541,7 +10541,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -10576,7 +10576,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -10610,7 +10610,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -10645,7 +10645,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -10680,7 +10680,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -10720,7 +10720,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -10759,7 +10759,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -10794,7 +10794,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -10828,7 +10828,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -10862,7 +10862,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -10897,7 +10897,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -10934,7 +10934,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -10970,7 +10970,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -11007,7 +11007,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -11043,7 +11043,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -11080,7 +11080,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -11117,7 +11117,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
@@ -11154,7 +11154,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -11189,7 +11189,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -11223,7 +11223,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -11258,7 +11258,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -11293,7 +11293,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -11333,7 +11333,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -11373,7 +11373,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -11408,7 +11408,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "from_ref": "refs/heads/lkgr",'
         '  "recipe": "release/merge",'
         '  "to_ref": "refs/heads/dev"'
@@ -11442,7 +11442,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "release/docker",'
         '  "version": "1.2.3"'
         '}'
@@ -11474,7 +11474,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11753,7 +11753,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/gclient"'
         '}'
       priority: 30
@@ -11784,7 +11784,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "release/homebrew"'
         '}'
       priority: 30
@@ -11816,7 +11816,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11847,7 +11847,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11878,7 +11878,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -11912,7 +11912,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11943,7 +11943,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -11977,7 +11977,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -12017,7 +12017,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -12055,7 +12055,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -12089,7 +12089,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -12123,7 +12123,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "from_ref": "refs/heads/beta",'
         '  "recipe": "release/merge",'
         '  "to_ref": "refs/heads/stable"'
@@ -12158,7 +12158,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -12194,7 +12194,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -12229,7 +12229,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -12264,7 +12264,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -12300,7 +12300,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12331,7 +12331,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12363,7 +12363,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12395,7 +12395,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12426,7 +12426,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12459,7 +12459,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12492,7 +12492,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12525,7 +12525,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12558,7 +12558,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12591,7 +12591,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12622,7 +12622,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12653,7 +12653,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12684,7 +12684,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12716,7 +12716,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12753,7 +12753,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12790,7 +12790,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12826,7 +12826,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12862,7 +12862,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12899,7 +12899,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12931,7 +12931,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12962,7 +12962,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -12997,7 +12997,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -13030,7 +13030,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -13063,7 +13063,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13093,7 +13093,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -13127,7 +13127,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13159,7 +13159,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -13192,7 +13192,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13223,7 +13223,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13255,7 +13255,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13287,7 +13287,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13319,7 +13319,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13356,7 +13356,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13388,7 +13388,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13420,7 +13420,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -13461,7 +13461,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13492,7 +13492,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13526,7 +13526,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13560,7 +13560,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13594,7 +13594,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13628,7 +13628,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13662,7 +13662,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13696,7 +13696,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13733,7 +13733,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13769,7 +13769,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13806,7 +13806,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13842,7 +13842,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13873,7 +13873,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13904,7 +13904,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_fuchsia_deps": true'
         '  },'
@@ -13938,7 +13938,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_fuchsia_deps": true'
         '  },'
@@ -13977,7 +13977,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14010,7 +14010,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14042,7 +14042,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -14075,7 +14075,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14106,7 +14106,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14137,7 +14137,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14169,7 +14169,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14200,7 +14200,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14231,7 +14231,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14262,7 +14262,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14293,7 +14293,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14324,7 +14324,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -14364,7 +14364,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -14401,7 +14401,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -14440,7 +14440,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14477,7 +14477,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14509,7 +14509,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14544,7 +14544,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14576,7 +14576,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14608,7 +14608,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14640,7 +14640,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14672,7 +14672,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14704,7 +14704,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14741,7 +14741,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14773,7 +14773,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14804,7 +14804,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -14838,7 +14838,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -14871,7 +14871,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14901,7 +14901,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -14935,7 +14935,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14976,7 +14976,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15008,7 +15008,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15040,7 +15040,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15072,7 +15072,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15104,7 +15104,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15136,7 +15136,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15168,7 +15168,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15200,7 +15200,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15232,7 +15232,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15264,7 +15264,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15296,7 +15296,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester_engine"'
         '}'
       priority: 30
@@ -15328,7 +15328,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15360,7 +15360,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15392,7 +15392,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15424,7 +15424,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15456,7 +15456,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15488,7 +15488,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15520,7 +15520,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15552,7 +15552,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15584,7 +15584,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15616,7 +15616,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15648,7 +15648,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15680,7 +15680,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15712,7 +15712,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15744,7 +15744,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15776,7 +15776,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15808,7 +15808,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15840,7 +15840,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15872,7 +15872,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15904,7 +15904,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15936,7 +15936,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15968,7 +15968,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -16000,7 +16000,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -16032,7 +16032,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -16064,7 +16064,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -16123,7 +16123,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": false,'
+        '  "clobber": true,'
         '  "recipe": "presubmit/presubmit"'
         '}'
       priority: 30
diff --git a/lib/defaults.star b/lib/defaults.star
index 023d28a5d61a..9a74ffcd93ee 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -7,7 +7,7 @@ Defaults for properties and dimensions used in main.star.
 
 load("//lib/helpers.star", "union")
 
-_PROPERTIES = {"clobber": False}
+_PROPERTIES = {"clobber": True}
 _DIMENSIONS = {
     "cpu": "x86-64",
     "host_class": "default",

From 763c65879bf5387ea1f52368cbb9c7b02a61c81b Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 30 Sep 2025 11:02:47 -0700
Subject: [PATCH 821/826] [infra] Add UBSAN builders for Mac and Windows.

Change-Id: I80b979eb47c513e4be2b9315f547829b705b7a83
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/452522
Reviewed-by: Alexander Aprelev <aam@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
---
 generated/commit-queue.cfg   |  10 ++-
 generated/cr-buildbucket.cfg | 146 ++++++++++++++++++++++++++++++++++-
 generated/luci-milo.cfg      |  84 +++++++++++++-------
 generated/luci-notify.cfg    |  28 ++++++-
 generated/luci-scheduler.cfg |  28 ++++++-
 vm.star                      |  35 ++++++---
 6 files changed, 281 insertions(+), 50 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 9e98f9e72a21..97d9c0384713 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -4840,7 +4840,7 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-asan-mac-release-x64-try"
+        name: "dart/try/vm-asan-mac-release-arm64-try"
         includable_only: true
       }
       builders {
@@ -5156,6 +5156,14 @@ config_groups {
         name: "dart/try/vm-ubsan-linux-release-x64-try"
         includable_only: true
       }
+      builders {
+        name: "dart/try/vm-ubsan-mac-release-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-ubsan-win-release-x64-try"
+        includable_only: true
+      }
       builders {
         name: "dart/try/vm-win-debug-arm64-try"
         includable_only: true
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 3c28067c022b..f4c1578bb5b8 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -6969,9 +6969,9 @@ buckets {
       }
     }
     builders {
-      name: "vm-asan-mac-release-x64"
+      name: "vm-asan-mac-release-arm64"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
@@ -9662,6 +9662,75 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-ubsan-mac-release-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ubsan-win-release-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-win-debug-arm64"
       swarming_host: "chromium-swarm.appspot.com"
@@ -13299,9 +13368,9 @@ buckets {
       }
     }
     builders {
-      name: "vm-asan-mac-release-x64-try"
+      name: "vm-asan-mac-release-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
+      dimensions: "cpu:arm64"
       dimensions: "host_class:default"
       dimensions: "os:Mac"
       dimensions: "pool:luci.dart.try"
@@ -14784,6 +14853,75 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "vm-ubsan-mac-release-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:arm64"
+      dimensions: "host_class:default"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      caches {
+        name: "osx_sdk"
+        path: "osx_sdk"
+        wait_for_warm_cache_secs: 60
+      }
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-ubsan-win-release-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
     builders {
       name: "vm-win-debug-arm64-try"
       swarming_host: "chromium-swarm.appspot.com"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index dd4bedf95c9b..d0272a176ef7 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -208,12 +208,6 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-asan-linux-release-x64-try"
   }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-asan-mac-release-x64-try"
-  }
-  builders {
-    name: "buildbucket/luci.dart.try/vm-asan-win-release-x64-try"
-  }
   builders {
     name: "buildbucket/luci.dart.try/vm-msan-linux-release-x64-try"
   }
@@ -232,11 +226,23 @@ consoles {
   builders {
     name: "buildbucket/luci.dart.try/vm-tsan-linux-release-arm64-try"
   }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-ubsan-linux-release-arm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-asan-mac-release-arm64-try"
+  }
   builders {
     name: "buildbucket/luci.dart.try/vm-tsan-mac-release-arm64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-ubsan-linux-release-arm64-try"
+    name: "buildbucket/luci.dart.try/vm-ubsan-mac-release-arm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-asan-win-release-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-ubsan-win-release-x64-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-reload-linux-debug-x64-try"
@@ -892,16 +898,6 @@ consoles {
     category: "vm|misc|sanitizer"
     short_name: "a"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-mac-release-x64"
-    category: "vm|misc|sanitizer"
-    short_name: "a"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-win-release-x64"
-    category: "vm|misc|sanitizer"
-    short_name: "a"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-msan-linux-release-x64"
     category: "vm|misc|sanitizer"
@@ -932,13 +928,33 @@ consoles {
     category: "vm|misc|sanitizer"
     short_name: "t"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ubsan-linux-release-arm64"
+    category: "vm|misc|sanitizer"
+    short_name: "u"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-mac-release-arm64"
+    category: "vm|misc|sanitizer"
+    short_name: "a"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-tsan-mac-release-arm64"
     category: "vm|misc|sanitizer"
     short_name: "t"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ubsan-linux-release-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ubsan-mac-release-arm64"
+    category: "vm|misc|sanitizer"
+    short_name: "u"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-win-release-x64"
+    category: "vm|misc|sanitizer"
+    short_name: "a"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ubsan-win-release-x64"
     category: "vm|misc|sanitizer"
     short_name: "u"
   }
@@ -1777,16 +1793,6 @@ consoles {
     category: "vm|misc|sanitizer"
     short_name: "a"
   }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-mac-release-x64"
-    category: "vm|misc|sanitizer"
-    short_name: "a"
-  }
-  builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-win-release-x64"
-    category: "vm|misc|sanitizer"
-    short_name: "a"
-  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-msan-linux-release-x64"
     category: "vm|misc|sanitizer"
@@ -1817,13 +1823,33 @@ consoles {
     category: "vm|misc|sanitizer"
     short_name: "t"
   }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ubsan-linux-release-arm64"
+    category: "vm|misc|sanitizer"
+    short_name: "u"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-mac-release-arm64"
+    category: "vm|misc|sanitizer"
+    short_name: "a"
+  }
   builders {
     name: "buildbucket/luci.dart.ci.sandbox/vm-tsan-mac-release-arm64"
     category: "vm|misc|sanitizer"
     short_name: "t"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-ubsan-linux-release-arm64"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ubsan-mac-release-arm64"
+    category: "vm|misc|sanitizer"
+    short_name: "u"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-asan-win-release-x64"
+    category: "vm|misc|sanitizer"
+    short_name: "a"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-ubsan-win-release-x64"
     category: "vm|misc|sanitizer"
     short_name: "u"
   }
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index ac842a3b5de2..222fbd5d289f 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -966,7 +966,7 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-asan-mac-release-x64"
+    name: "vm-asan-mac-release-arm64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1485,6 +1485,32 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-ubsan-mac-release-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-ubsan-win-release-x64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index ca7ff78e6ab6..c7157f896228 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -1695,13 +1695,13 @@ job {
   }
 }
 job {
-  id: "vm-asan-mac-release-x64"
+  id: "vm-asan-mac-release-arm64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-asan-mac-release-x64"
+    builder: "vm-asan-mac-release-arm64"
   }
 }
 job {
@@ -2494,6 +2494,26 @@ job {
     builder: "vm-ubsan-linux-release-x64"
   }
 }
+job {
+  id: "vm-ubsan-mac-release-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-ubsan-mac-release-arm64"
+  }
+}
+job {
+  id: "vm-ubsan-win-release-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-ubsan-win-release-x64"
+  }
+}
 job {
   id: "vm-win-debug-arm64"
   realm: "ci.sandbox"
@@ -2861,10 +2881,12 @@ trigger {
   schedule: "0 6 * * *"
   triggers: "vm-asan-linux-release-arm64"
   triggers: "vm-asan-linux-release-x64"
-  triggers: "vm-asan-mac-release-x64"
+  triggers: "vm-asan-mac-release-arm64"
   triggers: "vm-asan-win-release-x64"
   triggers: "vm-ubsan-linux-release-arm64"
   triggers: "vm-ubsan-linux-release-x64"
+  triggers: "vm-ubsan-mac-release-arm64"
+  triggers: "vm-ubsan-win-release-x64"
   gitiles {
     repo: "https://dart.googlesource.com/sdk"
     refs: "regexp:refs/heads/main"
diff --git a/vm.star b/vm.star
index 5a0dc252ce17..a19f2742c2b6 100644
--- a/vm.star
+++ b/vm.star
@@ -326,16 +326,6 @@ _nightly_builder(
     "vm-asan-linux-release-x64",
     category = "vm|misc|sanitizer|a",
 )
-_nightly_builder(
-    "vm-asan-mac-release-x64",
-    category = "vm|misc|sanitizer|a",
-    dimensions = [mac],
-)
-_nightly_builder(
-    "vm-asan-win-release-x64",
-    category = "vm|misc|sanitizer|a",
-    dimensions = [windows],
-)
 _nightly_builder(
     "vm-msan-linux-release-x64",
     category = "vm|misc|sanitizer|m",
@@ -363,16 +353,37 @@ _nightly_builder(
     category = "vm|misc|sanitizer|t",
     dimensions = [arm64],
 )
+_nightly_builder(
+    "vm-ubsan-linux-release-arm64",
+    category = "vm|misc|sanitizer|u",
+    dimensions = [arm64],
+)
+_nightly_builder(
+    "vm-asan-mac-release-arm64",
+    category = "vm|misc|sanitizer|a",
+    dimensions = [mac, arm64],
+)
 _nightly_builder(
     "vm-tsan-mac-release-arm64",
     category = "vm|misc|sanitizer|t",
     dimensions = [mac, arm64],
 )
 _nightly_builder(
-    "vm-ubsan-linux-release-arm64",
+    "vm-ubsan-mac-release-arm64",
     category = "vm|misc|sanitizer|u",
-    dimensions = [arm64],
+    dimensions = [mac, arm64],
 )
+_nightly_builder(
+    "vm-asan-win-release-x64",
+    category = "vm|misc|sanitizer|a",
+    dimensions = [windows],
+)
+_nightly_builder(
+    "vm-ubsan-win-release-x64",
+    category = "vm|misc|sanitizer|u",
+    dimensions = [windows],
+)
+
 _nightly_builder(
     "vm-reload-linux-debug-x64",
     category = "vm|misc|reload|d",

From 4bce7f746b47c745442f0e74083557bc97e54810 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 30 Sep 2025 11:14:56 -0700
Subject: [PATCH 822/826] [infra] Split GCC and MSVC builders.

Change-Id: I23dc76adc8e1dfe76392c1e23ae7c8ae4360135a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/452540
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Aprelev <aam@google.com>
---
 generated/commit-queue.cfg   |  20 ++-
 generated/cr-buildbucket.cfg | 296 +++++++++++++++++++++++++++++++++--
 generated/luci-milo.cfg      |  72 +++++++--
 generated/luci-notify.cfg    |  56 ++++++-
 generated/luci-scheduler.cfg |  56 ++++++-
 vm.star                      |  41 +++--
 6 files changed, 500 insertions(+), 41 deletions(-)

diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 97d9c0384713..f056c683dfd2 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -4926,7 +4926,19 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-gcc-linux-try"
+        name: "dart/try/vm-gcc-linux-arm-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-gcc-linux-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-gcc-linux-riscv64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-gcc-linux-x64-try"
         includable_only: true
       }
       builders {
@@ -5125,7 +5137,11 @@ config_groups {
         includable_only: true
       }
       builders {
-        name: "dart/try/vm-msvc-windows-try"
+        name: "dart/try/vm-msvc-win-arm64-try"
+        includable_only: true
+      }
+      builders {
+        name: "dart/try/vm-msvc-win-x64-try"
         includable_only: true
       }
       builders {
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index f4c1578bb5b8..87d88cc2378d 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -8155,7 +8155,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-gcc-linux"
+      name: "vm-gcc-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -8169,8 +8169,112 @@ buckets {
       properties:
         '{'
         '  "$dart/build": {'
-        '    "disable_rbe": true,'
-        '    "timeout": 4500'
+        '    "disable_rbe": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-gcc-linux-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-24"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-gcc-linux-riscv64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-24"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-gcc-linux-x64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-24"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -8183,7 +8287,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
-      execution_timeout_secs: 18000
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -9399,7 +9502,42 @@ buckets {
       }
     }
     builders {
-      name: "vm-msvc-windows"
+      name: "vm-msvc-win-arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 70
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-msvc-win-x64"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14022,7 +14160,7 @@ buckets {
       }
     }
     builders {
-      name: "vm-gcc-linux-try"
+      name: "vm-gcc-linux-arm-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
@@ -14036,8 +14174,112 @@ buckets {
       properties:
         '{'
         '  "$dart/build": {'
-        '    "disable_rbe": true,'
-        '    "timeout": 4500'
+        '    "disable_rbe": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-gcc-linux-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-24"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-gcc-linux-riscv64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-24"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-gcc-linux-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Ubuntu-24"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
         '  },'
         '  "$recipe_engine/isolated": {'
         '    "server": "https://isolateserver.appspot.com"'
@@ -14050,7 +14292,6 @@ buckets {
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
-      execution_timeout_secs: 18000
       build_numbers: YES
       service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
       experiments {
@@ -14590,7 +14831,42 @@ buckets {
       }
     }
     builders {
-      name: "vm-msvc-windows-try"
+      name: "vm-msvc-win-arm64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "host_class:default"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.dart.try"
+      exe {
+        cipd_package: "dart/recipe_bundles/dart.googlesource.com/recipes"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$dart/build": {'
+        '    "disable_rbe": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/swarming": {'
+        '    "server": "https://chromium-swarm.appspot.com"'
+        '  },'
+        '  "bisection_enabled": true,'
+        '  "clobber": true,'
+        '  "recipe": "dart/neo"'
+        '}'
+      priority: 30
+      build_numbers: YES
+      service_account: "dart-luci-try-builder@dart-ci.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
+      name: "vm-msvc-win-x64-try"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "host_class:default"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index d0272a176ef7..da5537777403 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -269,10 +269,22 @@ consoles {
     name: "buildbucket/luci.dart.try/vm-fuchsia-release-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-gcc-linux-try"
+    name: "buildbucket/luci.dart.try/vm-gcc-linux-x64-try"
   }
   builders {
-    name: "buildbucket/luci.dart.try/vm-msvc-windows-try"
+    name: "buildbucket/luci.dart.try/vm-gcc-linux-arm-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-gcc-linux-arm64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-gcc-linux-riscv64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-msvc-win-x64-try"
+  }
+  builders {
+    name: "buildbucket/luci.dart.try/vm-msvc-win-arm64-try"
   }
   builders {
     name: "buildbucket/luci.dart.try/vm-aot-dyn-linux-debug-x64-try"
@@ -999,13 +1011,33 @@ consoles {
     short_name: "f"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-gcc-linux"
-    category: "vm|misc"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-gcc-linux-x64"
+    category: "vm|misc|toolchain"
     short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-msvc-windows"
-    category: "vm|misc"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-gcc-linux-arm"
+    category: "vm|misc|toolchain"
+    short_name: "g"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-gcc-linux-arm64"
+    category: "vm|misc|toolchain"
+    short_name: "g"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-gcc-linux-riscv64"
+    category: "vm|misc|toolchain"
+    short_name: "g"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-msvc-win-x64"
+    category: "vm|misc|toolchain"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-msvc-win-arm64"
+    category: "vm|misc|toolchain"
     short_name: "m"
   }
   builders {
@@ -1894,13 +1926,33 @@ consoles {
     short_name: "f"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-gcc-linux"
-    category: "vm|misc"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-gcc-linux-x64"
+    category: "vm|misc|toolchain"
     short_name: "g"
   }
   builders {
-    name: "buildbucket/luci.dart.ci.sandbox/vm-msvc-windows"
-    category: "vm|misc"
+    name: "buildbucket/luci.dart.ci.sandbox/vm-gcc-linux-arm"
+    category: "vm|misc|toolchain"
+    short_name: "g"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-gcc-linux-arm64"
+    category: "vm|misc|toolchain"
+    short_name: "g"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-gcc-linux-riscv64"
+    category: "vm|misc|toolchain"
+    short_name: "g"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-msvc-win-x64"
+    category: "vm|misc|toolchain"
+    short_name: "m"
+  }
+  builders {
+    name: "buildbucket/luci.dart.ci.sandbox/vm-msvc-win-arm64"
+    category: "vm|misc|toolchain"
     short_name: "m"
   }
   builders {
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 222fbd5d289f..e1706736f85b 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -1189,7 +1189,46 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-gcc-linux"
+    name: "vm-gcc-linux-arm"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-gcc-linux-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-gcc-linux-riscv64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-gcc-linux-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
@@ -1390,7 +1429,20 @@ notifiers {
   }
   builders {
     bucket: "ci.sandbox"
-    name: "vm-msvc-windows"
+    name: "vm-msvc-win-arm64"
+    repository: "https://dart.googlesource.com/sdk"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    email {
+      recipients: "dart-vm-team-breakages@google.com"
+    }
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "vm-msvc-win-x64"
     repository: "https://dart.googlesource.com/sdk"
   }
 }
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index c7157f896228..14ab1f47da07 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -2045,13 +2045,43 @@ job {
   }
 }
 job {
-  id: "vm-gcc-linux"
+  id: "vm-gcc-linux-arm"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-gcc-linux"
+    builder: "vm-gcc-linux-arm"
+  }
+}
+job {
+  id: "vm-gcc-linux-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-gcc-linux-arm64"
+  }
+}
+job {
+  id: "vm-gcc-linux-riscv64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-gcc-linux-riscv64"
+  }
+}
+job {
+  id: "vm-gcc-linux-x64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-gcc-linux-x64"
   }
 }
 job {
@@ -2415,13 +2445,23 @@ job {
   }
 }
 job {
-  id: "vm-msvc-windows"
+  id: "vm-msvc-win-arm64"
+  realm: "ci.sandbox"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci.sandbox"
+    builder: "vm-msvc-win-arm64"
+  }
+}
+job {
+  id: "vm-msvc-win-x64"
   realm: "ci.sandbox"
   schedule: "triggered"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci.sandbox"
-    builder: "vm-msvc-windows"
+    builder: "vm-msvc-win-x64"
   }
 }
 job {
@@ -2832,12 +2872,16 @@ trigger {
   triggers: "vm-eager-optimization-linux-release-x64"
   triggers: "vm-ffi-dyn-mac-release-simarm64_arm64"
   triggers: "vm-ffi-mac-release-simarm64_arm64"
-  triggers: "vm-gcc-linux"
+  triggers: "vm-gcc-linux-arm"
+  triggers: "vm-gcc-linux-arm64"
+  triggers: "vm-gcc-linux-riscv64"
+  triggers: "vm-gcc-linux-x64"
   triggers: "vm-linux-debug-arm64"
   triggers: "vm-linux-debug-ia32"
   triggers: "vm-linux-debug-simriscv32"
   triggers: "vm-linux-debug-x64c"
-  triggers: "vm-msvc-windows"
+  triggers: "vm-msvc-win-arm64"
+  triggers: "vm-msvc-win-x64"
   triggers: "vm-reload-linux-debug-x64"
   triggers: "vm-reload-linux-release-x64"
   triggers: "vm-win-debug-arm64"
diff --git a/vm.star b/vm.star
index a19f2742c2b6..4ba6a59c2d2d 100644
--- a/vm.star
+++ b/vm.star
@@ -426,23 +426,42 @@ _vm_builder(
     properties = [fuchsia_deps],
 )
 
-# Our sysroot does not support gcc, we can't use RBE for this builder
+# Our RBE setup doesn't work with GCC.
 _nightly_builder(
-    "vm-gcc-linux",
-    category = "vm|misc|g",
+    "vm-gcc-linux-x64",
+    category = "vm|misc|toolchain|g",
+    dimensions = noble,
+    rbe = False,
+)
+_nightly_builder(
+    "vm-gcc-linux-arm",
+    category = "vm|misc|toolchain|g",
+    dimensions = noble,
+    rbe = False,
+)
+_nightly_builder(
+    "vm-gcc-linux-arm64",
+    category = "vm|misc|toolchain|g",
+    dimensions = noble,
+    rbe = False,
+)
+_nightly_builder(
+    "vm-gcc-linux-riscv64",
+    category = "vm|misc|toolchain|g",
     dimensions = noble,
-    execution_timeout = 5 * time.hour,
     rbe = False,
-    properties = {
-        "$dart/build": {
-            "timeout": 75 * 60,  # 100 minutes,
-        },
-    },
 )
 
+# Our RBE setup doesn't work with MSVC.
+_nightly_builder(
+    "vm-msvc-win-x64",
+    category = "vm|misc|toolchain|m",
+    dimensions = windows,
+    rbe = False,
+)
 _nightly_builder(
-    "vm-msvc-windows",
-    category = "vm|misc|m",
+    "vm-msvc-win-arm64",
+    category = "vm|misc|toolchain|m",
     dimensions = windows,
     rbe = False,
 )

From 880ab5ec2031354a0fa0d7c1eed6b80b98db6aea Mon Sep 17 00:00:00 2001
From: Alexander Aprelev <aam@google.com>
Date: Tue, 30 Sep 2025 11:36:57 -0700
Subject: [PATCH 823/826] Revert "Set default clobber to True to force-cycle
 bots after ninja upgrade."

This reverts commit 94d6af2fc0afd73243fa04ba7f1fb9be5aa51d4e as it's
been over a week, should have been enough time for builders to get
updated.

Change-Id: I71c45b4b42bce57aa34f305e1cf3ab2c4513e9e1
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/452524
Commit-Queue: Alexander Aprelev <aam@google.com>
Reviewed-by: Ryan Macnak <rmacnak@google.com>
---
 generated/cr-buildbucket.cfg | 922 +++++++++++++++++------------------
 lib/defaults.star            |   2 +-
 2 files changed, 462 insertions(+), 462 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 87d88cc2378d..7c4e7cd08c97 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -35,7 +35,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -66,7 +66,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -97,7 +97,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -128,7 +128,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -159,7 +159,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -190,7 +190,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -221,7 +221,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -257,7 +257,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -293,7 +293,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -329,7 +329,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -360,7 +360,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -391,7 +391,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -423,7 +423,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -454,7 +454,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -489,7 +489,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -523,7 +523,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -558,7 +558,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -593,7 +593,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -628,7 +628,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -663,7 +663,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -698,7 +698,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -733,7 +733,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -773,7 +773,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -813,7 +813,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -853,7 +853,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -892,7 +892,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -931,7 +931,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -970,7 +970,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1005,7 +1005,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1040,7 +1040,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1075,7 +1075,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1109,7 +1109,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1143,7 +1143,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1177,7 +1177,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1211,7 +1211,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1245,7 +1245,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -1279,7 +1279,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1314,7 +1314,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1349,7 +1349,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -1384,7 +1384,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -1419,7 +1419,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1456,7 +1456,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1493,7 +1493,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1530,7 +1530,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1566,7 +1566,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1602,7 +1602,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1638,7 +1638,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1675,7 +1675,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1712,7 +1712,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1749,7 +1749,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1785,7 +1785,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1821,7 +1821,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1857,7 +1857,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1894,7 +1894,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1931,7 +1931,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -1968,7 +1968,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -2005,7 +2005,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -2042,7 +2042,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -2079,7 +2079,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
@@ -2116,7 +2116,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
@@ -2153,7 +2153,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
@@ -2190,7 +2190,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2225,7 +2225,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -2259,7 +2259,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2294,7 +2294,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2329,7 +2329,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2364,7 +2364,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -2399,7 +2399,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2439,7 +2439,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2479,7 +2479,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2519,7 +2519,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2559,7 +2559,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2594,7 +2594,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2629,7 +2629,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -2664,7 +2664,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -2769,7 +2769,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2801,7 +2801,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2833,7 +2833,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2865,7 +2865,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2897,7 +2897,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2929,7 +2929,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2961,7 +2961,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -2993,7 +2993,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3025,7 +3025,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3057,7 +3057,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3089,7 +3089,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester_engine"'
         '}'
       priority: 50
@@ -3121,7 +3121,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3153,7 +3153,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3185,7 +3185,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3217,7 +3217,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3249,7 +3249,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3281,7 +3281,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3313,7 +3313,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3345,7 +3345,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3377,7 +3377,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3409,7 +3409,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3441,7 +3441,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3473,7 +3473,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3505,7 +3505,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3537,7 +3537,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3569,7 +3569,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3601,7 +3601,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3633,7 +3633,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3665,7 +3665,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3697,7 +3697,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3729,7 +3729,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3761,7 +3761,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3793,7 +3793,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 50
@@ -3825,7 +3825,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -3857,7 +3857,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 50
@@ -4217,7 +4217,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4248,7 +4248,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/gclient"'
         '}'
       priority: 50
@@ -4279,7 +4279,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/gclient"'
         '}'
       priority: 60
@@ -4310,7 +4310,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/gclient"'
         '}'
       priority: 60
@@ -4341,7 +4341,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/external"'
         '}'
       priority: 20
@@ -4374,7 +4374,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -4405,7 +4405,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4436,7 +4436,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4470,7 +4470,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4504,7 +4504,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4535,7 +4535,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -4566,7 +4566,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -4597,7 +4597,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4631,7 +4631,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4665,7 +4665,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4704,7 +4704,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -4744,7 +4744,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -4784,7 +4784,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -4824,7 +4824,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4863,7 +4863,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4902,7 +4902,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -4935,7 +4935,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -4968,7 +4968,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -5001,7 +5001,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -5035,7 +5035,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -5069,7 +5069,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -5104,7 +5104,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5140,7 +5140,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5175,7 +5175,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5210,7 +5210,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5245,7 +5245,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5280,7 +5280,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5315,7 +5315,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5350,7 +5350,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -5386,7 +5386,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -5417,7 +5417,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5449,7 +5449,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -5481,7 +5481,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -5512,7 +5512,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5544,7 +5544,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5576,7 +5576,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5609,7 +5609,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5642,7 +5642,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5675,7 +5675,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5708,7 +5708,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -5741,7 +5741,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -5772,7 +5772,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5803,7 +5803,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -5834,7 +5834,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -5865,7 +5865,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5896,7 +5896,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -5927,7 +5927,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -5958,7 +5958,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -5989,7 +5989,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6020,7 +6020,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6052,7 +6052,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6089,7 +6089,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6126,7 +6126,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6162,7 +6162,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6198,7 +6198,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6234,7 +6234,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6270,7 +6270,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6306,7 +6306,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6342,7 +6342,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6379,7 +6379,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6411,7 +6411,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6442,7 +6442,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -6477,7 +6477,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -6510,7 +6510,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -6543,7 +6543,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6573,7 +6573,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -6606,7 +6606,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -6639,7 +6639,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -6673,7 +6673,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6704,7 +6704,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6735,7 +6735,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6767,7 +6767,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -6800,7 +6800,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6831,7 +6831,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -6862,7 +6862,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6893,7 +6893,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -6925,7 +6925,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6957,7 +6957,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -6989,7 +6989,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7026,7 +7026,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7058,7 +7058,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7090,7 +7090,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -7131,7 +7131,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7162,7 +7162,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7196,7 +7196,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7230,7 +7230,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7264,7 +7264,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7298,7 +7298,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7332,7 +7332,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7366,7 +7366,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7400,7 +7400,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7434,7 +7434,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7468,7 +7468,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7502,7 +7502,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7536,7 +7536,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7570,7 +7570,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7604,7 +7604,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7638,7 +7638,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7672,7 +7672,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7706,7 +7706,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7740,7 +7740,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -7774,7 +7774,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -7811,7 +7811,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7847,7 +7847,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -7884,7 +7884,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -7920,7 +7920,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -7951,7 +7951,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -7982,7 +7982,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8013,7 +8013,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8044,7 +8044,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8075,7 +8075,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8106,7 +8106,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_fuchsia_deps": true'
         '  },'
@@ -8140,7 +8140,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_fuchsia_deps": true'
         '  },'
@@ -8178,7 +8178,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -8213,7 +8213,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -8248,7 +8248,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -8283,7 +8283,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -8315,7 +8315,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -8347,7 +8347,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -8380,7 +8380,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -8411,7 +8411,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8442,7 +8442,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8473,7 +8473,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8504,7 +8504,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8535,7 +8535,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8566,7 +8566,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8598,7 +8598,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -8629,7 +8629,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8660,7 +8660,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8691,7 +8691,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8722,7 +8722,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8753,7 +8753,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8784,7 +8784,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8815,7 +8815,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8846,7 +8846,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8877,7 +8877,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8908,7 +8908,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -8939,7 +8939,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -8970,7 +8970,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -9001,7 +9001,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -9041,7 +9041,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -9081,7 +9081,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -9121,7 +9121,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9158,7 +9158,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9195,7 +9195,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9232,7 +9232,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -9271,7 +9271,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -9310,7 +9310,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -9349,7 +9349,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -9385,7 +9385,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -9421,7 +9421,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -9458,7 +9458,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9490,7 +9490,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9525,7 +9525,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9560,7 +9560,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9592,7 +9592,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9624,7 +9624,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9656,7 +9656,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9688,7 +9688,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9720,7 +9720,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9757,7 +9757,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9789,7 +9789,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9821,7 +9821,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9858,7 +9858,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -9889,7 +9889,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -9923,7 +9923,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9955,7 +9955,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9987,7 +9987,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -10020,7 +10020,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -10050,7 +10050,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -10083,7 +10083,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -10116,7 +10116,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -10150,7 +10150,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -10181,7 +10181,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -10212,7 +10212,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -10269,7 +10269,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -10300,7 +10300,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -10331,7 +10331,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -10367,7 +10367,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -10398,7 +10398,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_javascript_engines": true'
         '  },'
@@ -10432,7 +10432,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "from_ref": "refs/heads/dev",'
         '  "recipe": "release/merge",'
         '  "to_ref": "refs/heads/beta"'
@@ -10748,7 +10748,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -10783,7 +10783,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -10817,7 +10817,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -10852,7 +10852,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -10887,7 +10887,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -10927,7 +10927,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -10966,7 +10966,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -11001,7 +11001,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -11035,7 +11035,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -11069,7 +11069,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -11104,7 +11104,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -11141,7 +11141,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -11177,7 +11177,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -11214,7 +11214,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -11250,7 +11250,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -11287,7 +11287,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "download_android_deps": false,'
@@ -11324,7 +11324,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
@@ -11361,7 +11361,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -11396,7 +11396,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -11430,7 +11430,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -11465,7 +11465,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_firefox": true'
@@ -11500,7 +11500,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -11540,7 +11540,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -11580,7 +11580,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -11615,7 +11615,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "from_ref": "refs/heads/lkgr",'
         '  "recipe": "release/merge",'
         '  "to_ref": "refs/heads/dev"'
@@ -11649,7 +11649,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "release/docker",'
         '  "version": "1.2.3"'
         '}'
@@ -11681,7 +11681,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11960,7 +11960,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/gclient"'
         '}'
       priority: 30
@@ -11991,7 +11991,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "release/homebrew"'
         '}'
       priority: 30
@@ -12023,7 +12023,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12054,7 +12054,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12085,7 +12085,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -12119,7 +12119,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12150,7 +12150,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -12184,7 +12184,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false,'
         '    "download_chrome": true'
@@ -12224,7 +12224,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -12262,7 +12262,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -12296,7 +12296,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_chrome": true'
         '  },'
@@ -12330,7 +12330,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "from_ref": "refs/heads/beta",'
         '  "recipe": "release/merge",'
         '  "to_ref": "refs/heads/stable"'
@@ -12365,7 +12365,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -12401,7 +12401,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -12436,7 +12436,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -12471,7 +12471,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -12507,7 +12507,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12538,7 +12538,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12570,7 +12570,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12602,7 +12602,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12633,7 +12633,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12666,7 +12666,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12699,7 +12699,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12732,7 +12732,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12765,7 +12765,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -12798,7 +12798,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12829,7 +12829,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12860,7 +12860,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12891,7 +12891,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12923,7 +12923,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12960,7 +12960,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12997,7 +12997,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13033,7 +13033,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13069,7 +13069,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13106,7 +13106,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13138,7 +13138,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13169,7 +13169,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -13204,7 +13204,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -13237,7 +13237,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -13270,7 +13270,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13300,7 +13300,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -13334,7 +13334,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13366,7 +13366,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -13399,7 +13399,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13430,7 +13430,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13462,7 +13462,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13494,7 +13494,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13526,7 +13526,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13563,7 +13563,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13595,7 +13595,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13627,7 +13627,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -13668,7 +13668,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13699,7 +13699,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13733,7 +13733,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13767,7 +13767,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13801,7 +13801,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13835,7 +13835,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13869,7 +13869,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": true'
         '  },'
@@ -13903,7 +13903,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13940,7 +13940,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -13976,7 +13976,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14013,7 +14013,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14049,7 +14049,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14080,7 +14080,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14111,7 +14111,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_fuchsia_deps": true'
         '  },'
@@ -14145,7 +14145,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_fuchsia_deps": true'
         '  },'
@@ -14183,7 +14183,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14218,7 +14218,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14253,7 +14253,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14288,7 +14288,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14320,7 +14320,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14352,7 +14352,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -14385,7 +14385,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14416,7 +14416,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14447,7 +14447,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14479,7 +14479,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14510,7 +14510,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14541,7 +14541,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14572,7 +14572,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14603,7 +14603,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14634,7 +14634,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -14674,7 +14674,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -14711,7 +14711,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_android_deps": false'
         '  },'
@@ -14750,7 +14750,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14787,7 +14787,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14819,7 +14819,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14854,7 +14854,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14889,7 +14889,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14921,7 +14921,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14953,7 +14953,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -14985,7 +14985,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -15017,7 +15017,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -15049,7 +15049,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -15086,7 +15086,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -15118,7 +15118,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -15150,7 +15150,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -15187,7 +15187,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -15218,7 +15218,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -15252,7 +15252,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -15285,7 +15285,7 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "bisection_enabled": true,'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -15315,7 +15315,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "custom_vars": {'
         '    "download_reclient": false'
         '  },'
@@ -15349,7 +15349,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -15390,7 +15390,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15422,7 +15422,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15454,7 +15454,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15486,7 +15486,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15518,7 +15518,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15550,7 +15550,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15582,7 +15582,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15614,7 +15614,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15646,7 +15646,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15678,7 +15678,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15710,7 +15710,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester_engine"'
         '}'
       priority: 30
@@ -15742,7 +15742,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15774,7 +15774,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15806,7 +15806,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15838,7 +15838,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15870,7 +15870,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15902,7 +15902,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15934,7 +15934,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -15966,7 +15966,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -15998,7 +15998,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -16030,7 +16030,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -16062,7 +16062,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -16094,7 +16094,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -16126,7 +16126,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -16158,7 +16158,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -16190,7 +16190,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -16222,7 +16222,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -16254,7 +16254,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -16286,7 +16286,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -16318,7 +16318,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -16350,7 +16350,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -16382,7 +16382,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -16414,7 +16414,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/tester"'
         '}'
       priority: 30
@@ -16446,7 +16446,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -16478,7 +16478,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "engine_v2/builder"'
         '}'
       priority: 30
@@ -16537,7 +16537,7 @@ buckets {
         '  "$recipe_engine/swarming": {'
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
-        '  "clobber": true,'
+        '  "clobber": false,'
         '  "recipe": "presubmit/presubmit"'
         '}'
       priority: 30
diff --git a/lib/defaults.star b/lib/defaults.star
index 9a74ffcd93ee..023d28a5d61a 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -7,7 +7,7 @@ Defaults for properties and dimensions used in main.star.
 
 load("//lib/helpers.star", "union")
 
-_PROPERTIES = {"clobber": True}
+_PROPERTIES = {"clobber": False}
 _DIMENSIONS = {
     "cpu": "x86-64",
     "host_class": "default",

From 59846d5dbe0a61f882017707b6a1f379ae80a902 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Tue, 30 Sep 2025 14:50:33 -0700
Subject: [PATCH 824/826] [infra] Not downloading Android deps is the default.

Change-Id: I300de5e69af69aef0e3d8622f5c366c42bf57f05
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/433921
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Aprelev <aam@google.com>
---
 dart2js.star                 |  19 ++---
 dart2wasm.star               |   3 +-
 ddc.star                     |  14 ++--
 generated/cr-buildbucket.cfg | 154 -----------------------------------
 lib/defaults.star            |   2 -
 pkg.star                     |   3 +-
 sdk.star                     |   5 +-
 vm.star                      |   6 +-
 8 files changed, 19 insertions(+), 187 deletions(-)

diff --git a/dart2js.star b/dart2js.star
index 2f05cfa86437..44e499f54775 100644
--- a/dart2js.star
+++ b/dart2js.star
@@ -12,7 +12,6 @@ load(
     "chrome",
     "firefox",
     "mac",
-    "no_android",
     "windows",
 )
 load("//lib/paths.star", "paths")
@@ -23,7 +22,7 @@ dart.ci_sandbox_builder(
     "dart2js-canary-linux",
     category = "dart2js|c",
     channels = ["try"],
-    properties = [chrome, no_android],
+    properties = [chrome],
     triggered_by = ["dart2js-gitiles-trigger-%s"],
 )
 dart.ci_sandbox_builder(
@@ -31,58 +30,54 @@ dart.ci_sandbox_builder(
     category = "dart2js|d8|ha",
     channels = ["try"],
     location_filters = paths.to_location_filters(paths.dart2js),
-    properties = no_android,
     triggered_by = ["dart2js-gitiles-trigger-%s"],
 )
 dart.ci_sandbox_builder(
     "dart2js-minified-linux-d8",
     category = "dart2js|d8|mi",
     location_filters = paths.to_location_filters(paths.dart2js),
-    properties = no_android,
 )
 dart.ci_sandbox_builder(
     "dart2js-unit-linux-x64-release",
     category = "dart2js|d8|u",
     location_filters = paths.to_location_filters(paths.dart2js),
-    properties = no_android,
 )
 dart.ci_sandbox_builder(
     "dart2js-linux-chrome",
     category = "dart2js|chrome|l",
     location_filters = paths.to_location_filters(paths.dart2js),
-    properties = [chrome, no_android],
+    properties = [chrome],
 )
 dart.ci_sandbox_builder(
     "dart2js-minified-csp-linux-chrome",
     category = "dart2js|chrome|csp",
-    properties = [chrome, no_android],
+    properties = [chrome],
 )
 dart.ci_sandbox_builder(
     "dart2js-mac-chrome",
     category = "dart2js|chrome|m",
     dimensions = [arm64, mac],
-    properties = [chrome, no_android],
+    properties = [chrome],
 )
 dart.ci_sandbox_builder(
     "dart2js-win-chrome",
     category = "dart2js|chrome|w",
     dimensions = windows,
-    properties = [chrome, no_android],
+    properties = [chrome],
 )
 dart.ci_sandbox_builder(
     "dart2js-linux-firefox",
     category = "dart2js|firefox|l",
-    properties = [firefox, no_android],
+    properties = [firefox],
 )
 dart.ci_sandbox_builder(
     "dart2js-win-firefox",
     dimensions = windows,
     enabled = False,
-    properties = [firefox, no_android],
+    properties = [firefox],
 )
 dart.ci_sandbox_builder(
     "dart2js-mac-safari",
     category = "dart2js|safari|m",
     dimensions = [arm64, mac],
-    properties = no_android,
 )
diff --git a/dart2wasm.star b/dart2wasm.star
index c14be453c62b..50e9ed3605f8 100644
--- a/dart2wasm.star
+++ b/dart2wasm.star
@@ -13,13 +13,12 @@ load(
     "firefox",
     "flute",
     "js_engines",
-    "no_android",
 )
 load("//lib/helpers.star", "union")
 load("//lib/paths.star", "paths")
 
 def _dart2wasm_builder(name, category = None, properties = [], **kwargs):
-    default_properties = union({}, [emscripten, flute, no_android])
+    default_properties = union({}, [emscripten, flute])
     dart.ci_sandbox_builder(
         name,
         category = category,
diff --git a/ddc.star b/ddc.star
index 5df16f363cd3..9b68cfcecfdb 100644
--- a/ddc.star
+++ b/ddc.star
@@ -13,7 +13,6 @@ load(
     "chrome",
     "firefox",
     "mac",
-    "no_android",
     "windows",
 )
 load("//lib/paths.star", "paths")
@@ -23,7 +22,7 @@ dart.poller("ddc-gitiles-trigger", branches = ["main"], paths = paths.ddc)
 dart.ci_sandbox_builder(
     "ddc-linux-chrome",
     category = "ddc|chrome|l",
-    properties = [chrome, no_android],
+    properties = [chrome],
     location_filters = paths.to_location_filters(paths.ddc),
 )
 
@@ -31,21 +30,21 @@ dart.ci_sandbox_builder(
     "ddc-mac-chrome",
     category = "ddc|chrome|m",
     dimensions = [arm64, mac],
-    properties = [chrome, no_android],
+    properties = [chrome],
 )
 
 dart.ci_sandbox_builder(
     "ddc-win-chrome",
     category = "ddc|chrome|w",
     dimensions = windows,
-    properties = [chrome, no_android],
+    properties = [chrome],
 )
 
 dart.ci_sandbox_builder(
     "ddc-linux-firefox",
     category = "ddc|f",
     channels = ["try"],
-    properties = [firefox, no_android],
+    properties = [firefox],
     triggered_by = ["ddc-gitiles-trigger-%s"],
 )
 
@@ -54,19 +53,18 @@ dart.ci_sandbox_builder(
     category = "ddc|s",
     channels = ["try"],
     dimensions = [arm64, mac],
-    properties = [chrome, no_android],
+    properties = [chrome],
 )
 
 cron.nightly_builder(
     "ddc-canary-linux-chrome",
     category = "ddc|c",
     channels = ["try"],
-    properties = [chrome, no_android],
+    properties = [chrome],
 )
 
 cron.nightly_builder(
     "ddc-hostasserts-linux-d8",
     category = "ddc|h",
     channels = ["try"],
-    properties = [no_android],
 )
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 7c4e7cd08c97..5206f2319e03 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -456,7 +456,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -490,9 +489,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -525,7 +521,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -560,7 +555,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -595,7 +589,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -630,7 +623,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -665,7 +657,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -700,7 +691,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -735,7 +725,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -775,7 +764,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -815,7 +803,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -854,9 +841,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -893,9 +877,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -932,9 +913,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -972,7 +950,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -1007,7 +984,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -1042,7 +1018,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -1076,9 +1051,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -1110,9 +1082,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -1144,9 +1113,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -1178,9 +1144,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -1212,9 +1175,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -1246,9 +1206,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -1281,7 +1238,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -1316,7 +1272,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -1351,7 +1306,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -1386,7 +1340,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -1422,7 +1375,6 @@ buckets {
         '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
-        '    "download_android_deps": false,'
         '    "download_chrome": true,'
         '    "download_emscripten": true'
         '  },'
@@ -1459,7 +1411,6 @@ buckets {
         '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
-        '    "download_android_deps": false,'
         '    "download_chrome": true,'
         '    "download_emscripten": true'
         '  },'
@@ -1496,7 +1447,6 @@ buckets {
         '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
-        '    "download_android_deps": false,'
         '    "download_chrome": true,'
         '    "download_emscripten": true'
         '  },'
@@ -1533,7 +1483,6 @@ buckets {
         '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
-        '    "download_android_deps": false,'
         '    "download_emscripten": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -1569,7 +1518,6 @@ buckets {
         '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
-        '    "download_android_deps": false,'
         '    "download_emscripten": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -1605,7 +1553,6 @@ buckets {
         '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
-        '    "download_android_deps": false,'
         '    "download_emscripten": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -1641,7 +1588,6 @@ buckets {
         '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
-        '    "download_android_deps": false,'
         '    "download_chrome": true,'
         '    "download_emscripten": true'
         '  },'
@@ -1678,7 +1624,6 @@ buckets {
         '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
-        '    "download_android_deps": false,'
         '    "download_chrome": true,'
         '    "download_emscripten": true'
         '  },'
@@ -1715,7 +1660,6 @@ buckets {
         '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
-        '    "download_android_deps": false,'
         '    "download_chrome": true,'
         '    "download_emscripten": true'
         '  },'
@@ -1752,7 +1696,6 @@ buckets {
         '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
-        '    "download_android_deps": false,'
         '    "download_emscripten": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -1788,7 +1731,6 @@ buckets {
         '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
-        '    "download_android_deps": false,'
         '    "download_emscripten": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -1824,7 +1766,6 @@ buckets {
         '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
-        '    "download_android_deps": false,'
         '    "download_emscripten": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -1860,7 +1801,6 @@ buckets {
         '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
-        '    "download_android_deps": false,'
         '    "download_emscripten": true,'
         '    "download_firefox": true'
         '  },'
@@ -1897,7 +1837,6 @@ buckets {
         '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
-        '    "download_android_deps": false,'
         '    "download_emscripten": true,'
         '    "download_firefox": true'
         '  },'
@@ -1934,7 +1873,6 @@ buckets {
         '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
-        '    "download_android_deps": false,'
         '    "download_emscripten": true,'
         '    "download_firefox": true'
         '  },'
@@ -1971,7 +1909,6 @@ buckets {
         '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
-        '    "download_android_deps": false,'
         '    "download_chrome": true,'
         '    "download_emscripten": true'
         '  },'
@@ -2008,7 +1945,6 @@ buckets {
         '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
-        '    "download_android_deps": false,'
         '    "download_chrome": true,'
         '    "download_emscripten": true'
         '  },'
@@ -2045,7 +1981,6 @@ buckets {
         '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
-        '    "download_android_deps": false,'
         '    "download_chrome": true,'
         '    "download_emscripten": true'
         '  },'
@@ -2083,7 +2018,6 @@ buckets {
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
-        '    "download_android_deps": false,'
         '    "download_emscripten": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -2120,7 +2054,6 @@ buckets {
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
-        '    "download_android_deps": false,'
         '    "download_emscripten": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -2157,7 +2090,6 @@ buckets {
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
-        '    "download_android_deps": false,'
         '    "download_emscripten": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -2192,7 +2124,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -2226,9 +2157,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 70
@@ -2261,7 +2189,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -2296,7 +2223,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -2331,7 +2257,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -2366,7 +2291,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -2401,7 +2325,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -2441,7 +2364,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -2481,7 +2403,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -2521,7 +2442,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -2561,7 +2481,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -2596,7 +2515,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -2631,7 +2549,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4706,7 +4623,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4746,7 +4662,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4786,7 +4701,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -7091,9 +7005,6 @@ buckets {
         '  },'
         '  "bisection_enabled": true,'
         '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9002,9 +8913,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9042,9 +8950,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9082,9 +8987,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -9233,9 +9135,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -9272,9 +9171,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -9311,9 +9207,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -10590,9 +10483,6 @@ buckets {
         '    "arm64"'
         '  ],'
         '  "clobber": true,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "disable_bcid": true,'
         '  "recipe": "release/sdk"'
         '}'
@@ -10750,7 +10640,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -10784,9 +10673,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -10819,7 +10705,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -10854,7 +10739,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -10889,7 +10773,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -10928,9 +10811,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -10968,7 +10848,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -11002,9 +10881,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11036,9 +10912,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11071,7 +10944,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -11107,7 +10979,6 @@ buckets {
         '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
-        '    "download_android_deps": false,'
         '    "download_chrome": true,'
         '    "download_emscripten": true'
         '  },'
@@ -11144,7 +11015,6 @@ buckets {
         '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
-        '    "download_android_deps": false,'
         '    "download_emscripten": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -11180,7 +11050,6 @@ buckets {
         '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
-        '    "download_android_deps": false,'
         '    "download_chrome": true,'
         '    "download_emscripten": true'
         '  },'
@@ -11217,7 +11086,6 @@ buckets {
         '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
-        '    "download_android_deps": false,'
         '    "download_emscripten": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -11253,7 +11121,6 @@ buckets {
         '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
-        '    "download_android_deps": false,'
         '    "download_emscripten": true,'
         '    "download_firefox": true'
         '  },'
@@ -11290,7 +11157,6 @@ buckets {
         '  "clobber": false,'
         '  "custom_vars": {'
         '    "checkout_flute": true,'
-        '    "download_android_deps": false,'
         '    "download_chrome": true,'
         '    "download_emscripten": true'
         '  },'
@@ -11328,7 +11194,6 @@ buckets {
         '  "custom_vars": {'
         '    "checkout_flute": true,'
         '    "checkout_javascript_engines": true,'
-        '    "download_android_deps": false,'
         '    "download_emscripten": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -11363,7 +11228,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -11397,9 +11261,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -11432,7 +11293,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -11467,7 +11327,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_firefox": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -11502,7 +11361,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -11542,7 +11400,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -11582,7 +11439,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -12186,7 +12042,6 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
-        '    "download_android_deps": false,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -13628,9 +13483,6 @@ buckets {
         '  },'
         '  "bisection_enabled": true,'
         '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -14635,9 +14487,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo",'
         '  "shard_timeout": 5400'
         '}'
@@ -14712,9 +14561,6 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
-        '  "custom_vars": {'
-        '    "download_android_deps": false'
-        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
diff --git a/lib/defaults.star b/lib/defaults.star
index 023d28a5d61a..cdfe6e1fa1f5 100644
--- a/lib/defaults.star
+++ b/lib/defaults.star
@@ -21,7 +21,6 @@ _CACHES = {
 # Swarming has an implicit cache named builder and defining it explicitly makes
 # the wait_for_warm_cache field default to zero.
 _NO_CACHES = [swarming.cache("builder")]
-_NO_ANDROID = {"custom_vars": {"download_android_deps": False}}
 _NO_RECLIENT = {"custom_vars": {"download_reclient": False}}
 _ANDROID_DEPS = {"custom_vars": {"download_android_deps": True}}
 _CHROME = {"custom_vars": {"download_chrome": True}}
@@ -67,7 +66,6 @@ firefox = _FIREFOX
 flute = _FLUTE
 fuchsia_deps = _FUCHSIA_DEPS
 js_engines = _JS_ENGINES
-no_android = _NO_ANDROID
 slow_shards = _SLOW_SHARDS
 no_caches = _NO_CACHES
 no_reclient = _NO_RECLIENT
diff --git a/pkg.star b/pkg.star
index 0d4aea9b6368..b731404eed73 100644
--- a/pkg.star
+++ b/pkg.star
@@ -12,7 +12,6 @@ load(
     "chrome",
     "flutter_pool",
     "mac",
-    "no_android",
     "no_reclient",
     "windows",
 )
@@ -39,7 +38,7 @@ dart.ci_sandbox_builder(
     "pkg-mac-release-arm64",
     category = "pkg|ma",
     dimensions = [mac, arm64],
-    properties = [chrome, no_android],
+    properties = [chrome],
 )
 dart.ci_sandbox_builder(
     "pkg-win-release",
diff --git a/sdk.star b/sdk.star
index 26e353c593d6..50d6db0c5579 100644
--- a/sdk.star
+++ b/sdk.star
@@ -10,7 +10,6 @@ load(
     "//lib/defaults.star",
     "arm64",
     "mac",
-    "no_android",
     "windows",
 )
 load("//lib/paths.star", "paths")
@@ -98,11 +97,11 @@ dart.try_builder(
 dart.try_builder(
     "dart-sdk-mac-arm64",
     dimensions = [mac, arm64],
-    properties = [no_android, {
+    properties = {
         "archs": ["arm64"],
         "clobber": True,  # To match the regular SDK builder
         "disable_bcid": True,
-    }],
+    },
     location_filters = paths.to_location_filters(paths.release),
     recipe = "release/sdk",
     rbe = False,  # To match the regular SDK builder
diff --git a/vm.star b/vm.star
index 4ba6a59c2d2d..1affee8a8eff 100644
--- a/vm.star
+++ b/vm.star
@@ -15,7 +15,6 @@ load(
     "fuchsia_deps",
     "jammy",
     "mac",
-    "no_android",
     "no_reclient",
     "noble",
     "slow_shards",
@@ -131,14 +130,13 @@ _vm_builder(
     "vm-mac-debug-arm64",
     category = "vm|jit|mda",
     dimensions = [mac, arm64],
-    properties = [no_android, slow_shards],
+    properties = [slow_shards],
     on_cq = True,
 )
 _vm_builder(
     "vm-mac-release-arm64",
     category = "vm|jit|mra",
     dimensions = [mac, arm64],
-    properties = no_android,
 )
 _vm_builder(
     "vm-win-debug-x64",
@@ -489,7 +487,7 @@ _nightly_builder(
     category = "vm|misc|dyn|ja",
     channels = ["try"],
     dimensions = [mac, arm64],
-    properties = [no_android, slow_shards],
+    properties = [slow_shards],
     location_filters = paths.to_location_filters(paths.dart2bytecode),
 )
 

From 9bddec65210d4e30ce15624b24863fcc91ea70f1 Mon Sep 17 00:00:00 2001
From: Martin Kustermann <kustermann@google.com>
Date: Wed, 1 Oct 2025 02:55:51 -0700
Subject: [PATCH 825/826] Checkout flute on pkg builders

Change-Id: I4be2f8f8a7e2f13b9c9cf3e9e394809bd47fe964
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/452680
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Martin Kustermann <kustermann@google.com>
---
 generated/cr-buildbucket.cfg | 34 ++++++++++++++++++++++++++++++++++
 pkg.star                     | 26 +++++++++++++++++++-------
 2 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 5206f2319e03..2ae4169d1409 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -4355,6 +4355,7 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4389,6 +4390,7 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4422,6 +4424,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "checkout_flute": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 50
@@ -4453,6 +4458,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "checkout_flute": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -4484,6 +4492,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "checkout_flute": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 60
@@ -4516,6 +4527,7 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4550,6 +4562,7 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4584,6 +4597,7 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4623,6 +4637,7 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4662,6 +4677,7 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4701,6 +4717,7 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4740,6 +4757,7 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4779,6 +4797,7 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4818,6 +4837,7 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4851,6 +4871,7 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_reclient": false'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4884,6 +4905,7 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_reclient": false'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4917,6 +4939,7 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_reclient": false'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4951,6 +4974,7 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -4985,6 +5009,7 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -11943,6 +11968,7 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -11976,6 +12002,9 @@ buckets {
         '    "server": "https://chromium-swarm.appspot.com"'
         '  },'
         '  "clobber": false,'
+        '  "custom_vars": {'
+        '    "checkout_flute": true'
+        '  },'
         '  "recipe": "dart/neo"'
         '}'
       priority: 30
@@ -12008,6 +12037,7 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -12042,6 +12072,7 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -12081,6 +12112,7 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
@@ -12119,6 +12151,7 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_reclient": false'
         '  },'
         '  "recipe": "dart/neo"'
@@ -12153,6 +12186,7 @@ buckets {
         '  },'
         '  "clobber": false,'
         '  "custom_vars": {'
+        '    "checkout_flute": true,'
         '    "download_chrome": true'
         '  },'
         '  "recipe": "dart/neo"'
diff --git a/pkg.star b/pkg.star
index b731404eed73..fa1799958efe 100644
--- a/pkg.star
+++ b/pkg.star
@@ -10,49 +10,61 @@ load(
     "//lib/defaults.star",
     "arm64",
     "chrome",
+    "flute",
     "flutter_pool",
     "mac",
     "no_reclient",
     "windows",
 )
+load("//lib/helpers.star", "union")
 load("//lib/paths.star", "paths")
 
-dart.ci_sandbox_builder(
+def _pkg_builder(name, category = None, properties = [], **kwargs):
+    # Some pkg unittests need flute sources.
+    default_properties = union({}, [flute])
+    dart.ci_sandbox_builder(
+        name,
+        category = category,
+        properties = union(default_properties, properties),
+        **kwargs
+    )
+
+_pkg_builder(
     "pkg-linux-release",
     category = "pkg|l",
     location_filters = paths.to_location_filters(paths.pkg),
     properties = chrome,
 )
-dart.ci_sandbox_builder(
+_pkg_builder(
     "pkg-linux-release-arm64",
     category = "pkg|la",
     dimensions = [arm64],
 )
-dart.ci_sandbox_builder(
+_pkg_builder(
     "pkg-mac-release",
     category = "pkg|m",
     dimensions = mac,
     properties = chrome,
 )
-dart.ci_sandbox_builder(
+_pkg_builder(
     "pkg-mac-release-arm64",
     category = "pkg|ma",
     dimensions = [mac, arm64],
     properties = [chrome],
 )
-dart.ci_sandbox_builder(
+_pkg_builder(
     "pkg-win-release",
     category = "pkg|w",
     dimensions = windows,
     properties = chrome,
 )
-dart.ci_sandbox_builder(
+_pkg_builder(
     "pkg-win-release-arm64",
     category = "pkg|wa",
     dimensions = [windows, arm64, flutter_pool],
     properties = [no_reclient],
 )
-dart.ci_sandbox_builder(
+_pkg_builder(
     "pkg-linux-debug",
     category = "pkg|ld",
     channels = ["try"],

From bc158a87f6aef532ef4eff9f307335c66563211a Mon Sep 17 00:00:00 2001
From: Alexander Aprelev <aam@google.com>
Date: Wed, 1 Oct 2025 15:32:04 -0700
Subject: [PATCH 826/826] Ensure the team is email-notified about hh failures

Change-Id: Id28b474e3934ced94629c97a4d0077d16ba5d6d6
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/452888
Reviewed-by: Ryan Macnak <rmacnak@google.com>
Commit-Queue: Alexander Aprelev <aam@google.com>
---
 generated/luci-notify.cfg | 22 ++++++++++++++++++++++
 monorepo.star             |  2 --
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index e1706736f85b..fc4843b7f2db 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -345,6 +345,28 @@ notifiers {
     repository: "https://dart.googlesource.com/sdk"
   }
 }
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "flutter-linux"
+    repository: "https://dart.googlesource.com/monorepo/"
+  }
+}
+notifiers {
+  notifications {
+    on_new_failure: true
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "ci.sandbox"
+    name: "flutter-web"
+    repository: "https://dart.googlesource.com/monorepo/"
+  }
+}
 notifiers {
   notifications {
     on_new_failure: true
diff --git a/monorepo.star b/monorepo.star
index 4a667cbd5162..63ff5ba3c3de 100644
--- a/monorepo.star
+++ b/monorepo.star
@@ -57,7 +57,6 @@ dart.ci_sandbox_builder(
     channels = [],
     executable = dart.flutter_recipe("engine_v2/engine_v2"),
     execution_timeout = 180 * time.minute,
-    notifies = None,
     priority = priority.normal,
     properties = defaults.properties([monorepo_properties, {"config_name": "host_linux"}]),
     triggered_by = ["dart-gitiles-trigger-monorepo"],
@@ -92,7 +91,6 @@ dart.ci_sandbox_builder(
     channels = [],
     executable = dart.flutter_recipe("engine_v2/engine_v2"),
     execution_timeout = 180 * time.minute,
-    notifies = None,
     priority = priority.normal,
     properties = defaults.properties([monorepo_properties, {"config_name": "web_linux"}]),
     triggered_by = ["dart-gitiles-trigger-monorepo"],